projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h
[ardour.git]
/
libs
/
ardour
/
solo_isolate_control.cc
diff --git
a/libs/ardour/solo_isolate_control.cc
b/libs/ardour/solo_isolate_control.cc
index a913a9810e45b4b9691cbde9f5595751b7bff099..e4d551168b7f1437ae1bc2162dfbfd5b95667150 100644
(file)
--- a/
libs/ardour/solo_isolate_control.cc
+++ b/
libs/ardour/solo_isolate_control.cc
@@
-21,7
+21,7
@@
#include "ardour/session.h"
#include "ardour/solo_isolate_control.h"
#include "ardour/session.h"
#include "ardour/solo_isolate_control.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace ARDOUR;
using namespace std;
using namespace ARDOUR;
using namespace std;
@@
-146,8
+146,7
@@
double
SoloIsolateControl::get_value () const
{
if (slaved()) {
SoloIsolateControl::get_value () const
{
if (slaved()) {
- Glib::Threads::RWLock::ReaderLock lm (master_lock);
- return get_masters_value_locked () ? 1.0 : 0.0;
+ return solo_isolated() || get_masters_value ();
}
if (_list && boost::dynamic_pointer_cast<AutomationList>(_list)->automation_playback()) {
}
if (_list && boost::dynamic_pointer_cast<AutomationList>(_list)->automation_playback()) {
@@
-155,7
+154,7
@@
SoloIsolateControl::get_value () const
return AutomationControl::get_value();
}
return AutomationControl::get_value();
}
- return solo_isolated ()
? 1.0 : 0.0
;
+ return solo_isolated ();
}
int
}
int