ardour/livetrax
13
0
Fork 0
Code

extend/modify PresentationInfo to make searching for routes via Session::get_remote_nth_stripable() work

Browse Source
This commit is contained in:
Paul Davis 2016-06-05 20:49:14 -04:00
parent 9e28056fd2
commit 6520548fc2
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libs/ardour/ardour/presentation_info.h
View File

@ -128,9 +128,10 @@ class LIBARDOUR_API PresentationInfo : public PBD::Stateful
StatusMask = (Selected|Hidden) StatusMask = (Selected|Hidden)
}; };
static const Flag Route; static const Flag AllRoutes; /* mask to use for any route include master+monitor, but not auditioner */
static const Flag Track; static const Flag Route; /* mask for any route (bus or track */
static const Flag Bus; static const Flag Track; /* mask to use for any track */
static const Flag Bus; /* mask to use for any bus */
typedef uint32_t order_t; typedef uint32_t order_t;
typedef uint32_t color_t; typedef uint32_t color_t;
@ -193,11 +194,23 @@ class LIBARDOUR_API PresentationInfo : public PBD::Stateful
return true; return true;
} }
if (f == Route && (_flags & Route)) { if (f == Route && (_flags & Route)) {
/* any kind of route */ /* any kind of route, but not master, monitor in
or auditioner.
*/
return true; return true;
} }
return f == _flags; if (f == AllRoutes && (_flags & AllRoutes)) {
/* any kind of route, but not auditioner. Ask for that
specifically.
*/
return true;
}
/* compare without status mask - we already checked that above
*/
return (f &~ (StatusMask|OrderSet)) == (_flags &~ (StatusMask|OrderSet));
} }
int set_state (XMLNode const&, int); int set_state (XMLNode const&, int);

1
libs/ardour/presentation_info.cc
View File

@ -51,6 +51,7 @@ const PresentationInfo::order_t PresentationInfo::max_order = UINT32_MAX;
const PresentationInfo::Flag PresentationInfo::Bus = PresentationInfo::Flag (PresentationInfo::AudioBus|PresentationInfo::MidiBus); const PresentationInfo::Flag PresentationInfo::Bus = PresentationInfo::Flag (PresentationInfo::AudioBus|PresentationInfo::MidiBus);
const PresentationInfo::Flag PresentationInfo::Track = PresentationInfo::Flag (PresentationInfo::AudioTrack|PresentationInfo::MidiTrack); const PresentationInfo::Flag PresentationInfo::Track = PresentationInfo::Flag (PresentationInfo::AudioTrack|PresentationInfo::MidiTrack);
const PresentationInfo::Flag PresentationInfo::Route = PresentationInfo::Flag (PresentationInfo::Bus|PresentationInfo::Track); const PresentationInfo::Flag PresentationInfo::Route = PresentationInfo::Flag (PresentationInfo::Bus|PresentationInfo::Track);
const PresentationInfo::Flag PresentationInfo::AllRoutes = PresentationInfo::Flag (PresentationInfo::Route|PresentationInfo::MasterOut|PresentationInfo::MonitorOut);
void void
PresentationInfo::make_property_quarks () PresentationInfo::make_property_quarks ()