ardour/livetrax
13
0
Fork 0
Code

restore monitor section visibility, broken after the merged with tabbed

Browse Source
This commit is contained in:
Paul Davis 2016-02-25 11:53:59 -05:00
parent 67c4d45aac
commit e5ca1711bc
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk2_ardour/mixer_ui.cc
View File

@ -437,7 +437,8 @@ Mixer_UI::add_strips (RouteList& routes)
strip->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::strip_button_release_event), strip)); strip->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
} }
} catch (...) { } catch (const std::exception& e) {
error << string_compose (_("Error adding GUI elements for new tracks/busses %1"), e.what()) << endmsg;
} }
no_track_list_redisplay = false; no_track_list_redisplay = false;

6
gtk2_ardour/monitor_section.cc
View File

@ -185,9 +185,9 @@ MonitorSection::MonitorSection (Session* s)
toggle_processorbox_button.set_name (X_("monitor section processors toggle")); toggle_processorbox_button.set_name (X_("monitor section processors toggle"));
set_tooltip (&toggle_processorbox_button, _("Allow one to add monitor effect processors")); set_tooltip (&toggle_processorbox_button, _("Allow one to add monitor effect processors"));
proctoggle = ToggleAction::create (); proctoggle = myactions.register_toggle_action (monitor_actions, "toggle-monitor-processor-box", _("Toggle Monitor Section Processor Box"),
sigc::mem_fun(*this, &MonitorSection::update_processor_box));
toggle_processorbox_button.set_related_action (proctoggle); toggle_processorbox_button.set_related_action (proctoggle);
proctoggle->signal_toggled().connect (sigc::mem_fun(*this, &MonitorSection::update_processor_box), false);
/* Knobs */ /* Knobs */
Label* solo_boost_label; Label* solo_boost_label;
@ -508,7 +508,7 @@ MonitorSection::~MonitorSection ()
void void
MonitorSection::update_processor_box () MonitorSection::update_processor_box ()
{ {
bool show_processor_box = proctoggle->get_active (); bool show_processor_box = Glib::RefPtr<ToggleAction>::cast_dynamic (proctoggle)->get_active ();
if (count_processors () > 0 && !show_processor_box) { if (count_processors () > 0 && !show_processor_box) {
toggle_processorbox_button.set_name (X_("monitor section processors present")); toggle_processorbox_button.set_name (X_("monitor section processors present"));

2
gtk2_ardour/monitor_section.h
View File

@ -174,7 +174,7 @@ class MonitorSection : public RouteUI
uint32_t count_processors (); uint32_t count_processors ();
void processors_changed (ARDOUR::RouteProcessorChange); void processors_changed (ARDOUR::RouteProcessorChange);
Glib::RefPtr<Gtk::ToggleAction> proctoggle; Glib::RefPtr<Gtk::Action> proctoggle;
bool _ui_initialized; bool _ui_initialized;
private: private: