ardour/livetrax
13
0
Fork 0
Code

Slightly hacky fix for AFL/PFL button misbehaviour

Browse Source 
(#4484).


git-svn-id: svn://localhost/ardour2/branches/3.0@10705 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-11-19 17:04:48 +00:00
parent eb1d3e48c8
commit d8425b4a0f
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk2_ardour/monitor_section.cc
View File

@ -45,6 +45,7 @@ MonitorSection::MonitorSection (Session* s)
, pfl_button (_("PFL"), ArdourButton::led_default_elements)
, exclusive_solo_button (ArdourButton::led_default_elements)
, solo_mute_override_button (ArdourButton::led_default_elements)
, _inhibit_solo_model_update (false)
{
Glib::RefPtr<Action> act;
@ -728,7 +729,16 @@ MonitorSection::solo_use_in_place ()
if (act) {
Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (act);
if (ract) {
if (!ract->get_active ()) {
/* We are turning SiP off, which means that AFL or PFL will be turned on
shortly; don't update the solo model in the mean time, as if the currently
configured listen position is not the one that is about to be turned on,
things will go wrong.
*/
_inhibit_solo_model_update = true;
}
Config->set_solo_control_is_listen_control (!ract->get_active());
_inhibit_solo_model_update = false;
}
}
}
@ -815,6 +825,10 @@ MonitorSection::setup_knob_images ()
void
MonitorSection::update_solo_model ()
{
if (_inhibit_solo_model_update) {
return;
}
const char* action_name = 0;
Glib::RefPtr<Action> act;

2
gtk2_ardour/monitor_section.h
View File

@ -135,5 +135,7 @@ class MonitorSection : public RouteUI
PBD::ScopedConnection config_connection;
PBD::ScopedConnectionList control_connections;
bool _inhibit_solo_model_update;
void assign_controllables ();
};