projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into saveas
[ardour.git]
/
libs
/
ardour
/
mute_master.cc
diff --git
a/libs/ardour/mute_master.cc
b/libs/ardour/mute_master.cc
index c0e5ca836823324c285e701082909f031182676d..5734af8a3d812d6ce9af20e50721e232c88017b1 100644
(file)
--- a/
libs/ardour/mute_master.cc
+++ b/
libs/ardour/mute_master.cc
@@
-20,6
+20,7
@@
#include "pbd/enumwriter.h"
#include "pbd/xml++.h"
#include "pbd/enumwriter.h"
#include "pbd/xml++.h"
+#include "pbd/convert.h"
#include "ardour/types.h"
#include "ardour/mute_master.h"
#include "ardour/types.h"
#include "ardour/mute_master.h"
@@
-30,6
+31,9
@@
using namespace ARDOUR;
using namespace std;
using namespace ARDOUR;
using namespace std;
+const MuteMaster::MutePoint MuteMaster::AllPoints = MuteMaster::MutePoint(
+ PreFader|PostFader|Listen|Main);
+
MuteMaster::MuteMaster (Session& s, const std::string&)
: SessionHandleRef (s)
, _mute_point (MutePoint (0))
MuteMaster::MuteMaster (Session& s, const std::string&)
: SessionHandleRef (s)
, _mute_point (MutePoint (0))
@@
-37,7
+41,7
@@
MuteMaster::MuteMaster (Session& s, const std::string&)
, _soloed (false)
, _solo_ignore (false)
{
, _soloed (false)
, _solo_ignore (false)
{
-
+
if (Config->get_mute_affects_pre_fader ()) {
_mute_point = MutePoint (_mute_point | PreFader);
}
if (Config->get_mute_affects_pre_fader ()) {
_mute_point = MutePoint (_mute_point | PreFader);
}
@@
-109,7
+113,7
@@
MuteMaster::mute_gain_at (MutePoint mp) const
}
}
}
}
}
}
-
+
return gain;
}
return gain;
}
@@
-119,14
+123,14
@@
MuteMaster::set_mute_points (const std::string& mute_point)
MutePoint old = _mute_point;
_mute_point = (MutePoint) string_2_enum (mute_point, _mute_point);
MutePoint old = _mute_point;
_mute_point = (MutePoint) string_2_enum (mute_point, _mute_point);
-
+
if (old != _mute_point) {
MutePointChanged(); /* EMIT SIGNAL */
}
}
void
if (old != _mute_point) {
MutePointChanged(); /* EMIT SIGNAL */
}
}
void
-MuteMaster::set_mute_points (MutePoint mp)
+MuteMaster::set_mute_points (MutePoint mp)
{
if (_mute_point != mp) {
_mute_point = mp;
{
if (_mute_point != mp) {
_mute_point = mp;
@@
-144,7
+148,7
@@
MuteMaster::set_state (const XMLNode& node, int /*version*/)
}
if ((prop = node.property ("muted")) != 0) {
}
if ((prop = node.property ("muted")) != 0) {
- _muted_by_self = string_is_affirmative (prop->value());
+ _muted_by_self =
PBD::
string_is_affirmative (prop->value());
} else {
_muted_by_self = (_mute_point != MutePoint (0));
}
} else {
_muted_by_self = (_mute_point != MutePoint (0));
}
@@
-166,4
+170,4
@@
MuteMaster::muted_by_others_at (MutePoint mp) const
{
return (!_solo_ignore && _session.soloing() && (_mute_point & mp));
}
{
return (!_solo_ignore && _session.soloing() && (_mute_point & mp));
}
-
+