ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Fix MonotorProc's channel_solo_control 

Previously only ::set_solo() worked. Directly using the
controllable did not update `solo_cnt` and other channels
were not muted.
This commit is contained in:
Robin Gareus 2024-04-09 21:59:42 +02:00
parent cde26c5205
commit 8a7d92f196
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libs/ardour/monitor_processor.cc
View File

@ -108,6 +108,22 @@ MonitorProcessor::allocate_channels (uint32_t size)
while (_channels.size() < size) {
_channels.push_back (new ChannelRecord (n));
/* update solo_cnt when Solo changes */
std::shared_ptr<Controllable> sc = _channels.back()->soloed_control;
std::weak_ptr<Controllable> wc (sc);
sc->Changed.connect_same_thread (*this, [this, wc](bool, PBD::Controllable::GroupControlDisposition)
{
std::shared_ptr<Controllable> ac = wc.lock ();
if (ac && ac->get_value () > 0) {
solo_cnt++;
} else {
if (solo_cnt > 0) {
solo_cnt--;
}
}
update_monitor_state ();
});
}
}
@ -391,18 +407,8 @@ MonitorProcessor::set_cut (uint32_t chn, bool yn)
void
MonitorProcessor::set_solo (uint32_t chn, bool solo)
{
if (solo != _channels[chn]->soloed) {
_channels[chn]->soloed = solo;
if (solo) {
solo_cnt++;
} else {
if (solo_cnt > 0) {
solo_cnt--;
}
}
}
update_monitor_state ();
_channels[chn]->soloed = solo;
/* update_monitor_state is called via the Changed signal */
}
void