X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmonitor_section.cc;h=7fcfbd0810ff94a46b903af6e0afa1a1a9ed52f2;hb=7ad62ffbedb360260fd706b47849224b2e26ef6d;hp=e4abbc18bcd0e3c17115adca28c3c68de94fa71b;hpb=d1cfd95591201d35637076a87e624ed8026a432e;p=ardour.git diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index e4abbc18bc..7fcfbd0810 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -1,19 +1,19 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 Paul Davis - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -26,7 +26,6 @@ #include "gtkmm2ext/bindable_button.h" #include "gtkmm2ext/tearoff.h" #include "gtkmm2ext/actions.h" -#include "gtkmm2ext/motionfeedback.h" #include "gtkmm2ext/utils.h" #include @@ -37,19 +36,21 @@ #include "ardour/monitor_processor.h" #include "ardour/port.h" #include "ardour/route.h" +#include "ardour/solo_isolate_control.h" #include "ardour/user_bundle.h" #include "ardour/plugin_manager.h" +#include "ardour_ui.h" #include "gui_thread.h" +#include "mixer_ui.h" #include "monitor_section.h" #include "public_editor.h" #include "timers.h" #include "tooltips.h" -#include "volume_controller.h" #include "ui_config.h" #include "utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; @@ -59,15 +60,17 @@ using namespace PBD; using namespace std; Glib::RefPtr MonitorSection::monitor_actions; +Gtkmm2ext::ActionMap MonitorSection::myactions (X_("monitor section")); +Gtkmm2ext::Bindings* MonitorSection::bindings = 0; #define PX_SCALE(px) std::max((float)px, rintf((float)px * UIConfiguration::instance().get_ui_scale())) MonitorSection::MonitorSection (Session* s) - : AxisView (s) + : SessionHandlePtr (s) , RouteUI (s) , _tearoff (0) , channel_table_viewport (*channel_table_scroller.get_hadjustment() - , *channel_table_scroller.get_vadjustment ()) + , *channel_table_scroller.get_vadjustment ()) , gain_control (0) , dim_control (0) , solo_boost_control (0) @@ -92,13 +95,12 @@ MonitorSection::MonitorSection (Session* s) Glib::RefPtr act; if (!monitor_actions) { - - /* do some static stuff */ - register_actions (); - + load_bindings (); } + set_data ("ardour-bindings", bindings); + _plugin_selector = new PluginSelector (PluginManager::instance()); insert_box = new ProcessorBox (_session, boost::bind (&MonitorSection::plugin_selector, this), _rr_selection, 0); insert_box->set_no_show_all (); @@ -186,11 +188,10 @@ MonitorSection::MonitorSection (Session* s) /* Processor Box hide/shos */ toggle_processorbox_button.set_text (_("Processors")); toggle_processorbox_button.set_name (X_("monitor section processors toggle")); - set_tooltip (&toggle_processorbox_button, _("Allow to add monitor effect processors")); + set_tooltip (&toggle_processorbox_button, _("Allow one to add monitor effect processors")); - proctoggle = ToggleAction::create (); + proctoggle = ActionManager::get_action (X_("Monitor"), X_("toggle-monitor-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; @@ -394,7 +395,7 @@ MonitorSection::MonitorSection (Session* s) mono_dim_box->pack_start (mono_button, true, true); mono_dim_box->pack_end (dim_all_button, true, true); - // master gain + // master gain Label* spin_label = manage (new Label (_("Monitor"))); VBox* spin_packer = manage (new VBox); spin_packer->set_spacing (PX_SCALE(2)); @@ -411,7 +412,7 @@ MonitorSection::MonitorSection (Session* s) lower_packer->pack_start (*mono_dim_box, false, false, PX_SCALE(2)); lower_packer->pack_start (cut_all_button, false, false, PX_SCALE(2)); - // output port select + // output port select VBox* out_packer = manage (new VBox); out_packer->set_spacing (PX_SCALE(2)); out_packer->pack_start (*output_label, false, false); @@ -433,6 +434,8 @@ MonitorSection::MonitorSection (Session* s) hpacker.set_spacing (0); hpacker.pack_start (vpacker, true, true); + add (hpacker); + gain_control->show_all (); gain_display->show_all (); dim_control->show_all (); @@ -461,7 +464,11 @@ MonitorSection::MonitorSection (Session* s) output_button->signal_button_press_event().connect (sigc::mem_fun(*this, &MonitorSection::output_press), false); output_button->signal_button_release_event().connect (sigc::mem_fun(*this, &MonitorSection::output_release), false); - _tearoff = new TearOff (hpacker); + signal_enter_notify_event().connect (sigc::mem_fun (*this, &MonitorSection::enter_handler)); + signal_leave_notify_event().connect (sigc::mem_fun (*this, &MonitorSection::leave_handler)); + set_flags (CAN_FOCUS); + + _tearoff = new TearOff (*this); if (!UIConfiguration::instance().get_floating_monitor_section()) { /* if torn off, make this a normal window @@ -470,7 +477,7 @@ MonitorSection::MonitorSection (Session* s) _tearoff->tearoff_window().set_type_hint (Gdk::WINDOW_TYPE_HINT_NORMAL); } _tearoff->tearoff_window().set_title (X_("Monitor")); - _tearoff->tearoff_window().signal_key_press_event().connect (sigc::ptr_fun (forward_key_press), false); + _tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), (Gtk::Window*) &_tearoff->tearoff_window()), false); update_output_display (); update_processor_box (); @@ -492,26 +499,55 @@ MonitorSection::~MonitorSection () _channel_buttons.clear (); _output_changed_connection.disconnect (); - delete insert_box; - delete output_button; - delete gain_control; - delete gain_display; - delete dim_control; - delete dim_display; - delete solo_boost_control; - delete solo_boost_display; - delete solo_cut_control; - delete solo_cut_display; - delete _tearoff; - delete _output_selector; - _output_selector = 0; + delete insert_box; insert_box = 0; + delete output_button; output_button = 0; + delete gain_control; gain_control = 0; + delete gain_display; gain_display = 0; + delete dim_control; dim_control = 0; + delete dim_display; dim_display = 0; + delete solo_boost_control; solo_boost_control = 0; + delete solo_boost_display; solo_boost_display = 0; + delete solo_cut_control; solo_cut_control = 0; + delete solo_cut_display; solo_cut_display = 0; + delete _tearoff; _tearoff = 0; + delete _output_selector; _output_selector = 0; +} + +bool +MonitorSection::enter_handler (GdkEventCrossing* ev) +{ + grab_focus (); + return false; } +bool +MonitorSection::leave_handler (GdkEventCrossing* ev) +{ + switch (ev->detail) { + case GDK_NOTIFY_INFERIOR: + return false; + default: + break; + } + + /* cancel focus if we're not torn off. With X11 WM's that do + * focus-follows-mouse, focus will be taken from us anyway. + */ + + Widget* top = get_toplevel(); + + if (top->is_toplevel() && top != &_tearoff->tearoff_window()) { + Window* win = dynamic_cast (top); + gtk_window_set_focus (win->gobj(), 0); + } + + return false; +} void MonitorSection::update_processor_box () { - bool show_processor_box = proctoggle->get_active (); + bool show_processor_box = Glib::RefPtr::cast_dynamic (proctoggle)->get_active (); if (count_processors () > 0 && !show_processor_box) { toggle_processorbox_button.set_name (X_("monitor section processors present")); @@ -541,7 +577,7 @@ MonitorSection::update_processor_box () void MonitorSection::set_session (Session* s) { - AxisView::set_session (s); + RouteUI::set_session (s); _plugin_selector->set_session (_session); if (_session) { @@ -856,67 +892,67 @@ MonitorSection::register_actions () string action_descr; Glib::RefPtr act; - monitor_actions = ActionGroup::create (X_("Monitor")); - ActionManager::add_action_group (monitor_actions); + monitor_actions = myactions.create_action_group (X_("Monitor")); - ActionManager::register_toggle_action (monitor_actions, "monitor-mono", "", _("Switch monitor to mono"), - sigc::mem_fun (*this, &MonitorSection::mono)); + myactions.register_toggle_action (monitor_actions, "monitor-mono", _("Switch monitor to mono"), + sigc::bind (sigc::ptr_fun (MonitorSection::action_proxy0), MonitorMono)); - ActionManager::register_toggle_action (monitor_actions, "monitor-cut-all", "", _("Cut monitor"), - sigc::mem_fun (*this, &MonitorSection::cut_all)); + myactions.register_toggle_action (monitor_actions, "monitor-cut-all", _("Cut monitor"), + sigc::bind (sigc::ptr_fun (MonitorSection::action_proxy0), MonitorCutAll)); - ActionManager::register_toggle_action (monitor_actions, "monitor-dim-all", "", _("Dim monitor"), - sigc::mem_fun (*this, &MonitorSection::dim_all)); + myactions.register_toggle_action (monitor_actions, "monitor-dim-all", _("Dim monitor"), + sigc::bind (sigc::ptr_fun (MonitorSection::action_proxy0), MonitorDimAll)); - act = ActionManager::register_toggle_action (monitor_actions, "toggle-exclusive-solo", "", _("Toggle exclusive solo mode"), - sigc::mem_fun (*this, &MonitorSection::toggle_exclusive_solo)); + act = myactions.register_toggle_action (monitor_actions, "toggle-exclusive-solo", _("Toggle exclusive solo mode"), + sigc::bind (sigc::ptr_fun (MonitorSection::action_proxy0), ToggleExclusiveSolo)); Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); tact->set_active (Config->get_exclusive_solo()); - act = ActionManager::register_toggle_action (monitor_actions, "toggle-mute-overrides-solo", "", _("Toggle mute overrides solo mode"), - sigc::mem_fun (*this, &MonitorSection::toggle_mute_overrides_solo)); + act = myactions.register_toggle_action (monitor_actions, "toggle-mute-overrides-solo", _("Toggle mute overrides solo mode"), + sigc::bind (sigc::ptr_fun (MonitorSection::action_proxy0), ToggleMuteOverridesSolo)); tact = Glib::RefPtr::cast_dynamic(act); tact->set_active (Config->get_solo_mute_override()); - for (uint32_t chn = 0; chn < 16; ++chn) { action_name = string_compose (X_("monitor-cut-%1"), chn); action_descr = string_compose (_("Cut monitor channel %1"), chn); - ActionManager::register_toggle_action (monitor_actions, action_name.c_str(), "", action_descr.c_str(), - sigc::bind (sigc::mem_fun (*this, &MonitorSection::cut_channel), chn)); + myactions.register_toggle_action (monitor_actions, action_name.c_str(), action_descr.c_str(), + sigc::bind (sigc::ptr_fun (action_proxy1), CutChannel, chn)); action_name = string_compose (X_("monitor-dim-%1"), chn); action_descr = string_compose (_("Dim monitor channel %1"), chn); - ActionManager::register_toggle_action (monitor_actions, action_name.c_str(), "", action_descr.c_str(), - sigc::bind (sigc::mem_fun (*this, &MonitorSection::dim_channel), chn)); + myactions.register_toggle_action (monitor_actions, action_name.c_str(), action_descr.c_str(), + sigc::bind (sigc::ptr_fun (action_proxy1), DimChannel, chn)); action_name = string_compose (X_("monitor-solo-%1"), chn); action_descr = string_compose (_("Solo monitor channel %1"), chn); - ActionManager::register_toggle_action (monitor_actions, action_name.c_str(), "", action_descr.c_str(), - sigc::bind (sigc::mem_fun (*this, &MonitorSection::solo_channel), chn)); + myactions.register_toggle_action (monitor_actions, action_name.c_str(), action_descr.c_str(), + sigc::bind (sigc::ptr_fun (action_proxy1), SoloChannel, chn)); action_name = string_compose (X_("monitor-invert-%1"), chn); action_descr = string_compose (_("Invert monitor channel %1"), chn); - ActionManager::register_toggle_action (monitor_actions, action_name.c_str(), "", action_descr.c_str(), - sigc::bind (sigc::mem_fun (*this, &MonitorSection::invert_channel), chn)); + myactions.register_toggle_action (monitor_actions, action_name.c_str(), action_descr.c_str(), + sigc::bind (sigc::ptr_fun (action_proxy1), InvertChannel, chn)); } - Glib::RefPtr solo_actions = ActionGroup::create (X_("Solo")); + Glib::RefPtr solo_actions = myactions.create_action_group (X_("Solo")); RadioAction::Group solo_group; - ActionManager::register_radio_action (solo_actions, solo_group, "solo-use-in-place", "", _("In-place solo"), - sigc::mem_fun (*this, &MonitorSection::solo_use_in_place)); - ActionManager::register_radio_action (solo_actions, solo_group, "solo-use-afl", "", _("After Fade Listen (AFL) solo"), - sigc::mem_fun (*this, &MonitorSection::solo_use_afl)); - ActionManager::register_radio_action (solo_actions, solo_group, "solo-use-pfl", "", _("Pre Fade Listen (PFL) solo"), - sigc::mem_fun (*this, &MonitorSection::solo_use_pfl)); + myactions.register_radio_action (solo_actions, solo_group, "solo-use-in-place", _("In-place solo"), + sigc::bind (sigc::ptr_fun (MonitorSection::action_proxy0), SoloUseInPlace)); + myactions.register_radio_action (solo_actions, solo_group, "solo-use-afl", _("After Fade Listen (AFL) solo"), + sigc::bind (sigc::ptr_fun (MonitorSection::action_proxy0), SoloUseAFL)); + myactions.register_radio_action (solo_actions, solo_group, "solo-use-pfl", _("Pre Fade Listen (PFL) solo"), + sigc::bind (sigc::ptr_fun (MonitorSection::action_proxy0), SoloUsePFL)); + + myactions.register_toggle_action (monitor_actions, "toggle-monitor-processor-box", _("Toggle Monitor Section Processor Box"), + sigc::bind (sigc::ptr_fun (MonitorSection::action_proxy0), ToggleMonitorProcessorBox)); - ActionManager::add_action_group (solo_actions); } void @@ -1158,7 +1194,7 @@ MonitorSection::cancel_isolate (GdkEventButton*) { if (_session) { boost::shared_ptr rl (_session->get_routes ()); - _session->set_solo_isolated (rl, false, Session::rt_cleanup, true); + _session->set_controls (route_list_to_control_list (rl, &Stripable::solo_isolate_control), 0.0, Controllable::NoGroup); } return true; @@ -1578,6 +1614,12 @@ MonitorSection::port_connected_or_disconnected (boost::weak_ptr wa, boost: } } +void +MonitorSection::load_bindings () +{ + bindings = Bindings::get_bindings (X_("Monitor Section"), myactions); +} + void MonitorSection::help_count_processors (boost::weak_ptr p, uint32_t* cnt) const { @@ -1606,3 +1648,64 @@ MonitorSection::processors_changed (ARDOUR::RouteProcessorChange) { update_processor_box (); } + +void +MonitorSection::action_proxy0 (enum MonitorActions action) +{ + MonitorSection* ms = Mixer_UI::instance()->monitor_section (); + if (!ms) { + return; + } + switch (action) { + case MonitorMono: + ms->mono (); + break; + case MonitorCutAll: + ms->cut_all (); + break; + case MonitorDimAll: + ms->dim_all (); + break; + case ToggleExclusiveSolo: + ms->toggle_exclusive_solo (); + break; + case ToggleMuteOverridesSolo: + ms->toggle_mute_overrides_solo (); + break; + case SoloUseInPlace: + ms->solo_use_in_place (); + break; + case SoloUseAFL: + ms->solo_use_afl (); + break; + case SoloUsePFL: + ms->solo_use_pfl (); + break; + case ToggleMonitorProcessorBox: + ms->update_processor_box (); + break; + } +} + +void +MonitorSection::action_proxy1 (enum ChannelActions action, uint32_t chn) +{ + MonitorSection* ms = Mixer_UI::instance()->monitor_section (); + if (!ms) { + return; + } + switch (action) { + case CutChannel: + ms->cut_channel (chn); + break; + case DimChannel: + ms->dim_channel (chn); + break; + case SoloChannel: + ms->solo_channel (chn); + break; + case InvertChannel: + ms->invert_channel (chn); + break; + } +}