smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-17 04:06:26 +01:00
Code Issues Projects Releases Wiki Activity

fix PresentationInfo::flag_match() to match type bits

Browse source
This commit is contained in:
Paul Davis 2016-06-17 15:48:13 -04:00
parent d7a16786fc
commit 4847544144
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libs/ardour/ardour/presentation_info.h
View file

@ -125,7 +125,9 @@ class LIBARDOUR_API PresentationInfo : public PBD::Stateful
OrderSet = 0x400, OrderSet = 0x400,
/* special mask to delect out "state" bits */ /* special mask to delect out "state" bits */
StatusMask = (Selected|Hidden) StatusMask = (Selected|Hidden),
/* special mask to delect select type bits */
TypeMask = (AudioBus|AudioTrack|MidiTrack|MidiBus|VCA|MasterOut|MonitorOut|Auditioner)
}; };
static const Flag AllStripables; /* mask to use for any route or VCA (but not auditioner) */ static const Flag AllStripables; /* mask to use for any route or VCA (but not auditioner) */
@ -205,10 +207,13 @@ class LIBARDOUR_API PresentationInfo : public PBD::Stateful
return true; return true;
} }
/* compare without status mask - we already checked that above /* check for any matching type bits.
*
* Do comparisoon without status mask or order set bits - we
* already checked that above.
*/ */
return (_flags & (f &~ (StatusMask|OrderSet))) != 0; /* some flag matches */ return ((f & TypeMask) & _flags);
} }
int set_state (XMLNode const&, int); int set_state (XMLNode const&, int);