diff options
| author | Robin Gareus <robin@gareus.org> | 2019-04-12 21:34:14 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2019-04-12 21:37:51 +0200 |
| commit | 4199156263148cc5af4d840c0e04ad267958877a (patch) | |
| tree | 5464efa7c5d94aab36bb0ef9781bee2a43751299 /libs | |
| parent | 5c94bd00b5897050371f807b93e73baa76581417 (diff) | |
More Ardour/Mixbus codebase unification
Note Presentation-Info bits used by Mixbus to prevent conflicts
when sharing sessions.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/presentation_info.h | 7 | ||||
| -rw-r--r-- | libs/ardour/route.cc | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/libs/ardour/ardour/presentation_info.h b/libs/ardour/ardour/presentation_info.h index de728138cc..f5e1ed4531 100644 --- a/libs/ardour/ardour/presentation_info.h +++ b/libs/ardour/ardour/presentation_info.h @@ -111,12 +111,19 @@ class LIBARDOUR_API PresentationInfo : public PBD::Stateful MasterOut = 0x20, MonitorOut = 0x40, Auditioner = 0x80, +#ifdef MIXBUS + Mixbus = 0x1000, +#endif /* These are for sharing Stripable states between the GUI and other * user interfaces/control surfaces */ Hidden = 0x100, +#ifdef MIXBUS + MixbusEditorHidden = 0x800, +#endif /* single bit indicates that the group order is set */ OrderSet = 0x400, + /* bus type for monitor mixes */ FoldbackBus = 0x2000, diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 8f1918ed4c..5b43300d3b 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -1390,6 +1390,11 @@ Route::is_internal_processor (boost::shared_ptr<Processor> p) const if (p == _amp || p == _meter || p == _main_outs || p == _delayline || p == _trim || p == _polarity) { return true; } +#ifdef MIXBUS + if (p == _ch_pre || p == _ch_post || p == _ch_eq || p == _ch_comp) { + return true; + } +#endif return false; } |