diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-25 11:53:59 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-25 11:53:59 -0500 |
| commit | e5ca1711bcf88eb095a011e9ce6ff492f2a92e13 (patch) | |
| tree | 9de3b8218073fb581c9bd66e1ade936ca0de3546 /gtk2_ardour | |
| parent | 67c4d45aac5eeade834dd859141f22bc9422413a (diff) | |
restore monitor section visibility, broken after the merged with tabbed
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/mixer_ui.cc | 3 | ||||
| -rw-r--r-- | gtk2_ardour/monitor_section.cc | 6 | ||||
| -rw-r--r-- | gtk2_ardour/monitor_section.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 1f5a627936..fc2af3265d 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -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)); } - } 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; diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index 294ef822d4..4bc5e5ab47 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -185,9 +185,9 @@ MonitorSection::MonitorSection (Session* s) toggle_processorbox_button.set_name (X_("monitor section processors toggle")); 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); - proctoggle->signal_toggled().connect (sigc::mem_fun(*this, &MonitorSection::update_processor_box), false); /* Knobs */ Label* solo_boost_label; @@ -508,7 +508,7 @@ MonitorSection::~MonitorSection () void 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) { toggle_processorbox_button.set_name (X_("monitor section processors present")); diff --git a/gtk2_ardour/monitor_section.h b/gtk2_ardour/monitor_section.h index 2db5d54c1d..82d23336ab 100644 --- a/gtk2_ardour/monitor_section.h +++ b/gtk2_ardour/monitor_section.h @@ -174,7 +174,7 @@ class MonitorSection : public RouteUI uint32_t count_processors (); void processors_changed (ARDOUR::RouteProcessorChange); - Glib::RefPtr<Gtk::ToggleAction> proctoggle; + Glib::RefPtr<Gtk::Action> proctoggle; bool _ui_initialized; private: |