summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/solo_control.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2016-04-21 02:02:13 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2016-05-31 15:30:41 -0400
commit5b5e64d860f40c949cf58d75de81fc86914f1baa (patch)
treefcbd51677863e0a0cf5468dde8e489865b93d72a /libs/ardour/ardour/solo_control.h
parent01bba9f91054db7655c8eca42901f7c579b4bd24 (diff)
remove Route::listening_via_monitor()
This is better tested with direct use of the solo_control and Config->get_solo_controls_are_listen_controls()
Diffstat (limited to 'libs/ardour/ardour/solo_control.h')
-rw-r--r--libs/ardour/ardour/solo_control.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/libs/ardour/ardour/solo_control.h b/libs/ardour/ardour/solo_control.h
index bcb01344a4..24b8353dc1 100644
--- a/libs/ardour/ardour/solo_control.h
+++ b/libs/ardour/ardour/solo_control.h
@@ -60,6 +60,15 @@ class LIBARDOUR_API SoloControl : public SlavableAutomationControl
/* API to check different aspects of solo substate
*/
+ bool self_soloed () const {
+ return _self_solo;
+ }
+ bool soloed_by_masters () const {
+ return get_masters_value();
+ }
+ bool soloed_by_self_or_masters () const {
+ return self_soloed() || get_masters_value ();
+ }
bool soloed_by_others () const {
return _soloed_by_others_downstream || _soloed_by_others_downstream || get_masters_value ();
}
@@ -69,9 +78,6 @@ class LIBARDOUR_API SoloControl : public SlavableAutomationControl
uint32_t soloed_by_others_downstream () const {
return _soloed_by_others_downstream;
}
- bool self_soloed () const {
- return _self_solo;
- }
bool soloed() const { return self_soloed() || soloed_by_others(); }
/* The session object needs to respond to solo