diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-03-11 10:34:51 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:40 -0400 |
| commit | 5531c834963726d5a35db078e17a7508f2b9d72d (patch) | |
| tree | 79adf0c05ce8a665e2b239579734bc638d704b3b /libs/ardour/ardour/session.h | |
| parent | 36784ee94f30213ddbf4360b254e27da7d07c56a (diff) | |
change API of Controllable::Changed signal to include (from_self, GroupControlDisposition)
This allows the signal to convey more information, which may be required by some handlers of a control's Changed signal
Diffstat (limited to 'libs/ardour/ardour/session.h')
| -rw-r--r-- | libs/ardour/ardour/session.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index b3852b631d..18507ee5d9 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -67,7 +67,6 @@ #include "ardour/rc_configuration.h" #include "ardour/session_configuration.h" #include "ardour/session_event.h" -#include "ardour/session_solo_notifications.h" #include "ardour/interpolation.h" #include "ardour/plugin.h" #include "ardour/route.h" @@ -166,7 +165,7 @@ private: }; /** Ardour Session */ -class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionList, public SessionEventManager, public SessionSoloNotifications<Session> +class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionList, public SessionEventManager { public: enum RecordState { @@ -1684,13 +1683,12 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void reassign_track_numbers (); uint32_t _track_number_decimals; - /* solo/mute/notifications (see SessionSoloNotifications object) */ + /* solo/mute/notifications */ - friend class SessionSoloNotifications; - void _route_listen_changed (PBD::Controllable::GroupControlDisposition, boost::shared_ptr<Route>); - void _route_mute_changed (); - void _route_solo_changed (bool self_solo_change, PBD::Controllable::GroupControlDisposition group_override, boost::shared_ptr<Route>); - void _route_solo_isolated_changed (boost::shared_ptr<Route>); + void route_listen_changed (PBD::Controllable::GroupControlDisposition, boost::weak_ptr<Route>); + void route_mute_changed (); + void route_solo_changed (bool self_solo_change, PBD::Controllable::GroupControlDisposition group_override, boost::weak_ptr<Route>); + void route_solo_isolated_changed (boost::weak_ptr<Route>); void update_route_solo_state (boost::shared_ptr<RouteList> r = boost::shared_ptr<RouteList>()); |