diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/mute_master.h | 19 | ||||
| -rw-r--r-- | libs/ardour/ardour/route.h | 8 | ||||
| -rw-r--r-- | libs/ardour/ardour/types.h | 7 |
3 files changed, 6 insertions, 28 deletions
diff --git a/libs/ardour/ardour/mute_master.h b/libs/ardour/ardour/mute_master.h index ad383d8833..2a90a0284e 100644 --- a/libs/ardour/ardour/mute_master.h +++ b/libs/ardour/ardour/mute_master.h @@ -46,12 +46,8 @@ class MuteMaster : public SessionHandleRef, public PBD::Stateful MuteMaster (Session& s, const std::string& name); ~MuteMaster() {} - bool self_muted() const { return _self_muted && (_mute_point != MutePoint (0)); } - bool muted_by_others() const { return _muted_by_others && (_mute_point != MutePoint (0)); } - bool muted() const { return (_self_muted || (_muted_by_others > 0)) && (_mute_point != MutePoint (0)); } - bool muted_at (MutePoint mp) const { return (_self_muted || (_muted_by_others > 0)) && (_mute_point & mp); } - bool self_muted_at (MutePoint mp) const { return _self_muted && (_mute_point & mp); } - bool muted_by_others_at (MutePoint mp) const { return (_muted_by_others > 0) && (_mute_point & mp); } + bool muted() const { return _muted && (_mute_point != MutePoint (0)); } + bool muted_at (MutePoint mp) const { return _muted && (_mute_point & mp); } bool muted_pre_fader() const { return muted_at (PreFader); } bool muted_post_fader() const { return muted_at (PostFader); } @@ -60,9 +56,7 @@ class MuteMaster : public SessionHandleRef, public PBD::Stateful gain_t mute_gain_at (MutePoint) const; - void set_self_muted (bool yn) { _self_muted = yn; } - void mod_muted_by_others (int delta); - void clear_muted_by_others (); + void set_muted (bool yn) { _muted = yn; } void mute_at (MutePoint); void unmute_at (MutePoint); @@ -71,7 +65,7 @@ class MuteMaster : public SessionHandleRef, public PBD::Stateful void set_mute_points (MutePoint); MutePoint mute_points() const { return _mute_point; } - void set_solo_level (SoloLevel); + void set_soloed (bool); void set_solo_ignore (bool yn) { _solo_ignore = yn; } PBD::Signal0<void> MutePointChanged; @@ -81,9 +75,8 @@ class MuteMaster : public SessionHandleRef, public PBD::Stateful private: volatile MutePoint _mute_point; - volatile bool _self_muted; - volatile uint32_t _muted_by_others; - volatile SoloLevel _solo_level; + volatile bool _muted; + volatile bool _soloed; volatile bool _solo_ignore; }; diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index b4a392c23b..689090cd57 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -126,14 +126,7 @@ class Route : public SessionObject, public AutomatableControls, public RouteGrou MuteMaster::MutePoint mute_points() const { return _mute_points; } bool muted () const; - bool self_muted () const; - bool muted_by_others () const; - - bool path_muted_by_others() const { return _path_muted_by_others > 0; } - void mod_path_muted_by_others (int delta); - void set_mute (bool yn, void* src); - void mod_muted_by_others (int delta); /* controls use set_solo() to modify this route's solo state */ @@ -437,7 +430,6 @@ class Route : public SessionObject, public AutomatableControls, public RouteGrou boost::shared_ptr<MuteControllable> _mute_control; boost::shared_ptr<MuteMaster> _mute_master; MuteMaster::MutePoint _mute_points; - volatile uint32_t _path_muted_by_others; std::string _comment; bool _have_internal_generator; diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 39b763a41d..2bbb140bb2 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -306,13 +306,6 @@ namespace ARDOUR { PreFaderListen }; - enum SoloLevel { - NotSoloed, - DownstreamSoloed, - UpstreamSoloed, - SelfSoloed - }; - enum AutoConnectOption { ManualConnect = 0x0, AutoConnectPhysical = 0x1, |