summaryrefslogtreecommitdiff
path: root/libs/ardour/route.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-05-19 14:32:49 +0000
committerCarl Hetherington <carl@carlh.net>2010-05-19 14:32:49 +0000
commit6ad69a206ca325e9e50eff4f8f2088170b468f00 (patch)
tree24c716755fa2f36ccc68100cabf53a5ae4be4b7d /libs/ardour/route.cc
parente258b2622a4386b405c2216d79b34887c3ed55bf (diff)
When muting a route because another is soloed, take
into account the muting options (pre-fader/post-fader etc.) for the muted route. git-svn-id: svn://localhost/ardour2/branches/3.0@7119 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/route.cc')
-rw-r--r--libs/ardour/route.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 86b4b89d16..1dfa66a7b1 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -748,7 +748,7 @@ Route::set_mute_points (MuteMaster::MutePoint mp)
_mute_master->set_mute_points (mp);
mute_points_changed (); /* EMIT SIGNAL */
- if (_mute_master->muted()) {
+ if (_mute_master->muted_by_self()) {
mute_changed (this); /* EMIT SIGNAL */
}
}
@@ -762,7 +762,7 @@ Route::set_mute (bool yn, void *src)
}
if (muted() != yn) {
- _mute_master->set_muted (yn);
+ _mute_master->set_muted_by_self (yn);
mute_changed (src); /* EMIT SIGNAL */
}
}
@@ -770,7 +770,7 @@ Route::set_mute (bool yn, void *src)
bool
Route::muted () const
{
- return _mute_master->muted();
+ return _mute_master->muted_by_self();
}
#if 0