diff options
| author | Robin Gareus <robin@gareus.org> | 2015-10-07 01:44:02 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-10-07 01:44:02 +0200 |
| commit | 477d1f3f42b125b42271c873277dff2236a297ae (patch) | |
| tree | 43c0b49ebdf2c4477374053ebf24ee9ea8623d6b /libs/ardour/ardour | |
| parent | 87026c871ab549e5a976192b26234147e92c89c8 (diff) | |
implement solo group override
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/route.h | 8 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index cf7ec90fd1..94d8837246 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -158,7 +158,7 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou /* controls use set_solo() to modify this route's solo state */ - void set_solo (bool yn, void *src); + void set_solo (bool yn, void *src, bool group_override = false); bool soloed () const { return self_soloed () || soloed_by_others (); } void clear_all_solo_state (); @@ -173,7 +173,7 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou void set_solo_safe (bool yn, void *src); bool solo_safe() const; - void set_listen (bool yn, void* src); + void set_listen (bool yn, void* src, bool group_override = false); bool listening_via_monitor () const; void enable_monitor_send (); @@ -286,8 +286,8 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou PBD::Signal0<void> active_changed; PBD::Signal0<void> phase_invert_changed; PBD::Signal0<void> denormal_protection_changed; - PBD::Signal1<void,void*> listen_changed; - PBD::Signal2<void,bool,void*> solo_changed; + PBD::Signal2<void,void*,bool> listen_changed; + PBD::Signal3<void,bool,void*,bool> solo_changed; PBD::Signal1<void,void*> solo_safe_changed; PBD::Signal1<void,void*> solo_isolated_changed; PBD::Signal1<void,void*> comment_changed; diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 144b3c8670..4e9be4d02e 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -1536,9 +1536,9 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop /* mixer stuff */ - void route_listen_changed (void *src, boost::weak_ptr<Route>); + void route_listen_changed (bool leave_group_alone, boost::weak_ptr<Route>); void route_mute_changed (void *src); - void route_solo_changed (bool self_solo_change, void *src, boost::weak_ptr<Route>); + void route_solo_changed (bool self_solo_change, bool leave_group_alone, boost::weak_ptr<Route>); void route_solo_isolated_changed (void *src, boost::weak_ptr<Route>); void update_route_solo_state (boost::shared_ptr<RouteList> r = boost::shared_ptr<RouteList>()); |