projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
restore ability to create TOC and CUE files during export. this is an option in a...
[ardour.git]
/
libs
/
ardour
/
mute_master.cc
diff --git
a/libs/ardour/mute_master.cc
b/libs/ardour/mute_master.cc
index 5a261fb44fabd20543f6fd3ebb736fc8ad8c3a49..a58bb8a421d11edced397bd4e62c97b49d1564c1 100644
(file)
--- a/
libs/ardour/mute_master.cc
+++ b/
libs/ardour/mute_master.cc
@@
-37,7
+37,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);
}
@@
-88,28
+88,28
@@
MuteMaster::mute_gain_at (MutePoint mp) const
if (_soloed) {
gain = 1.0;
} else if (muted_by_self_at (mp)) {
if (_soloed) {
gain = 1.0;
} else if (muted_by_self_at (mp)) {
- gain =
Config->get_solo_mute_gain ()
;
+ gain =
0.0
;
} else {
if (muted_by_others_at (mp)) {
} else {
if (muted_by_others_at (mp)) {
- gain =
0.0
;
+ gain =
Config->get_solo_mute_gain ()
;
} else {
gain = 1.0;
}
}
} else {
if (muted_by_self_at (mp)) {
} else {
gain = 1.0;
}
}
} else {
if (muted_by_self_at (mp)) {
- gain =
Config->get_solo_mute_gain ()
;
+ gain =
0.0
;
} else if (_soloed) {
gain = 1.0;
} else {
if (muted_by_others_at (mp)) {
} else if (_soloed) {
gain = 1.0;
} else {
if (muted_by_others_at (mp)) {
- gain =
0.0
;
+ gain =
Config->get_solo_mute_gain ()
;
} else {
gain = 1.0;
}
}
}
} else {
gain = 1.0;
}
}
}
-
+
return gain;
}
return gain;
}
@@
-119,14
+119,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;
@@
-166,4
+166,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));
}
-
+