X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=591b4f42507f9106060f74d125dd85b7a2c19733;hb=33e56e58d7b60232d7024368aed4026a6f07a7d1;hp=d3031f117d1a079d2e16cbd8efa73cb04e4d6e7d;hpb=b7c4a255608646b9c2c06193b7a8e879ec69f7d5;p=ardour.git diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index d3031f117d..591b4f4250 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -34,6 +34,7 @@ #include #include +#include "ardour/amp.h" #include "ardour/audio_track.h" #include "ardour/audioengine.h" #include "ardour/internal_send.h" @@ -51,8 +52,9 @@ #include "ardour/session.h" #include "ardour/types.h" #include "ardour/user_bundle.h" +#include "ardour/vca.h" +#include "ardour/vca_manager.h" -#include "ardour_ui.h" #include "ardour_window.h" #include "mixer_strip.h" #include "mixer_ui.h" @@ -65,6 +67,8 @@ #include "gui_thread.h" #include "route_group_menu.h" #include "meter_patterns.h" +#include "tooltips.h" +#include "ui_config.h" #include "i18n.h" @@ -77,10 +81,9 @@ using namespace std; using namespace ArdourMeter; MixerStrip* MixerStrip::_entered_mixer_strip; - PBD::Signal1 MixerStrip::CatchDeletion; -static const int _button_vpad = 4; +static const uint32_t n_vca_buttons = 4; MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer) : AxisView(sess) @@ -91,14 +94,16 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer) , gpm (sess, 250) , panners (sess) , button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL)) - , button_table (3, 1) , rec_mon_table (2, 2) , solo_iso_table (1, 2) , mute_solo_table (1, 2) , bottom_button_table (1, 3) + , vca_table (1, 4) , meter_point_button (_("pre")) + , monitor_section_button (0) , midi_input_enable_button (0) , _comment_button (_("Comments")) + , trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero)) , _visibility (X_("mixer-element-visibility")) { init (); @@ -121,14 +126,16 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr rt , gpm (sess, 250) , panners (sess) , button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL)) - , button_table (3, 1) , rec_mon_table (2, 2) , solo_iso_table (1, 2) , mute_solo_table (1, 2) , bottom_button_table (1, 3) + , vca_table (1, 4) , meter_point_button (_("pre")) + , monitor_section_button (0) , midi_input_enable_button (0) , _comment_button (_("Comments")) + , trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero)) , _visibility (X_("mixer-element-visibility")) { init (); @@ -138,11 +145,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr rt void MixerStrip::init () { - int button_table_row = 0; - _entered_mixer_strip= 0; - input_selector = 0; - output_selector = 0; group_menu = 0; route_ops_menu = 0; ignore_comment_edit = false; @@ -158,62 +161,50 @@ MixerStrip::init () if (_mixer_owned) { t += string_compose (_("\n%1-%2-click to toggle the width of all strips."), Keyboard::primary_modifier_name(), Keyboard::tertiary_modifier_name ()); } - - width_button.set_image (::get_icon("strip_width")); - ARDOUR_UI::instance()->set_tip (width_button, t); - hide_button.set_image(::get_icon("hide")); - ARDOUR_UI::instance()->set_tip (&hide_button, _("Hide this mixer strip")); + width_button.set_icon (ArdourIcon::StripWidth); + set_tooltip (width_button, t); + + hide_button.set_icon (ArdourIcon::CloseCross); + set_tooltip (&hide_button, _("Hide this mixer strip")); + + input_button_box.set_spacing(2); input_button.set_text (_("Input")); input_button.set_name ("mixer strip button"); - input_button.set_size_request (-1, 20); input_button_box.pack_start (input_button, true, true); - Gtkmm2ext::set_height_request_to_display_any_text (input_button, _button_vpad); output_button.set_text (_("Output")); output_button.set_name ("mixer strip button"); - Gtkmm2ext::set_size_request_to_display_given_text (output_button, longest_label.c_str(), 4, 4); - Gtkmm2ext::set_height_request_to_display_any_text (output_button, _button_vpad); - ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Click to select metering point"), ""); + set_tooltip (&meter_point_button, _("Click to select metering point")); meter_point_button.set_name ("mixer strip button"); - /* TRANSLATORS: this string should be longest of the strings - used to describe meter points. In english, it's "input". - */ - set_size_request_to_display_given_text_width (meter_point_button, _("tupni"), 2, _button_vpad); - bottom_button_table.attach (meter_point_button, 2, 3, 0, 1); meter_point_button.signal_button_press_event().connect (sigc::mem_fun (gpm, &GainMeter::meter_press), false); meter_point_button.signal_button_release_event().connect (sigc::mem_fun (gpm, &GainMeter::meter_release), false); - - hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - monitor_input_button->set_diameter (3); - monitor_disk_button->set_diameter (3); + hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements)); - solo_isolated_led->show (); - solo_isolated_led->set_diameter (3); - solo_isolated_led->set_no_show_all (true); - solo_isolated_led->set_name (X_("solo isolate")); - solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release)); + solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements)); + solo_isolated_led->show (); + solo_isolated_led->set_no_show_all (true); + solo_isolated_led->set_name (X_("solo isolate")); + solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); + solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release), false); UI::instance()->set_tip (solo_isolated_led, _("Isolate Solo"), ""); - solo_safe_led = manage (new ArdourButton (ArdourButton::led_default_elements)); - solo_safe_led->show (); - solo_safe_led->set_diameter (3); - solo_safe_led->set_no_show_all (true); - solo_safe_led->set_name (X_("solo safe")); - solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release)); + solo_safe_led = manage (new ArdourButton (ArdourButton::led_default_elements)); + solo_safe_led->show (); + solo_safe_led->set_no_show_all (true); + solo_safe_led->set_name (X_("solo safe")); + solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); + solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release), false); UI::instance()->set_tip (solo_safe_led, _("Lock Solo Status"), ""); - solo_safe_led->set_text (_("lock")); - solo_isolated_led->set_text (_("iso")); + solo_safe_led->set_text (S_("SoloLock|Lock")); + solo_isolated_led->set_text (_("Iso")); solo_iso_table.set_homogeneous (true); solo_iso_table.set_spacings (2); @@ -223,6 +214,22 @@ MixerStrip::init () } solo_iso_table.show (); + vca_table.set_homogeneous (true); + vca_table.set_spacings (1); + for (uint32_t n = 0; n < n_vca_buttons; ++n) { + ArdourButton* v = manage (new ArdourButton (ArdourButton::default_elements)); + vca_buttons.push_back (v); /* no ownership transfer, button is managed by its container */ + v->set_no_show_all (true); + v->set_name (X_("vca assign")); + v->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); + v->signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &MixerStrip::vca_button_release), n), false); + UI::instance()->set_tip (*v, string_compose (_("VCA %1 assign"), n)); + v->set_text (_("v.")); + v->show (); + vca_table.attach (*v, n, n+1, 0, 1); + } + vca_table.show (); + rec_mon_table.set_homogeneous (true); rec_mon_table.set_row_spacings (2); rec_mon_table.set_col_spacings (2); @@ -236,9 +243,6 @@ MixerStrip::init () } rec_mon_table.show (); - button_table.set_homogeneous (false); - button_table.set_spacings (2); - if (solo_isolated_led) { button_size_group->add_widget (*solo_isolated_led); } @@ -257,15 +261,6 @@ MixerStrip::init () button_size_group->add_widget (*monitor_input_button); } } - - if (!ARDOUR::Profile->get_trx()) { - button_table.attach (name_button, 0, 1, button_table_row, button_table_row+1); - button_table_row++; - button_table.attach (input_button_box, 0, 2, button_table_row, button_table_row+1); - button_table_row++; - button_table.attach (_invert_button_box, 0, 2, button_table_row, button_table_row+1); - button_table_row++; - } mute_solo_table.set_homogeneous (true); mute_solo_table.set_spacings (2); @@ -276,20 +271,23 @@ MixerStrip::init () bottom_button_table.attach (gpm.gain_automation_state_button, 0, 1, 0, 1); name_button.set_name ("mixer strip button"); - name_button.set_text (" "); /* non empty text, forces creation of the layout */ - name_button.set_text (""); /* back to empty */ - name_button.layout()->set_ellipsize (Pango::ELLIPSIZE_END); + name_button.set_text_ellipsize (Pango::ELLIPSIZE_END); name_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::name_button_resized)); - name_button.set_size_request (-1, 20); - Gtkmm2ext::set_height_request_to_display_any_text (name_button, _button_vpad); - ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), ""); + set_tooltip (&group_button, _("Mix group")); group_button.set_name ("mixer strip button"); - Gtkmm2ext::set_size_request_to_display_given_text_width (group_button, "Grp", 2, _button_vpad); _comment_button.set_name (X_("mixer strip button")); _comment_button.signal_clicked.connect (sigc::mem_fun (*this, &RouteUI::toggle_comment_editor)); - Gtkmm2ext::set_size_request_to_display_given_text_width (_comment_button, "Cmt", 2, _button_vpad); + + // TODO implement ArdourKnob::on_size_request properly +#define PX_SCALE(px) std::max((float)px, rintf((float)px * UIConfiguration::instance().get_ui_scale())) + trim_control.set_size_request (PX_SCALE(19), PX_SCALE(19)); +#undef PX_SCALE + trim_control.set_tooltip_prefix (_("Trim: ")); + trim_control.set_name ("trim knob"); + trim_control.set_no_show_all (true); + input_button_box.pack_start (trim_control, false, false); global_vpacker.set_border_width (1); global_vpacker.set_spacing (0); @@ -300,22 +298,26 @@ MixerStrip::init () width_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::width_button_pressed), false); hide_button.signal_clicked.connect (sigc::mem_fun(*this, &MixerStrip::hide_clicked)); - width_hide_box.set_border_width (2); +// width_hide_box.set_border_width (1); width_hide_box.set_spacing (2); width_hide_box.pack_start (width_button, false, true); width_hide_box.pack_start (number_label, true, true); width_hide_box.pack_end (hide_button, false, true); number_label.set_text ("-"); + number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive)); number_label.set_no_show_all (); number_label.set_name ("tracknumber label"); number_label.set_fixed_colors (0x80808080, 0x80808080); number_label.set_alignment (.5, .5); + number_label.set_fallthrough_to_parent (true); global_vpacker.set_spacing (2); if (!ARDOUR::Profile->get_trx()) { global_vpacker.pack_start (width_hide_box, Gtk::PACK_SHRINK); - global_vpacker.pack_start (button_table, Gtk::PACK_SHRINK); + global_vpacker.pack_start (name_button, Gtk::PACK_SHRINK); + global_vpacker.pack_start (input_button_box, Gtk::PACK_SHRINK); + global_vpacker.pack_start (_invert_button_box, Gtk::PACK_SHRINK); global_vpacker.pack_start (processor_box, true, true); } global_vpacker.pack_start (panners, Gtk::PACK_SHRINK); @@ -323,6 +325,7 @@ MixerStrip::init () global_vpacker.pack_start (solo_iso_table, Gtk::PACK_SHRINK); global_vpacker.pack_start (mute_solo_table, Gtk::PACK_SHRINK); global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK); + global_vpacker.pack_start (vca_table, Gtk::PACK_SHRINK); global_vpacker.pack_start (bottom_button_table, Gtk::PACK_SHRINK); if (!ARDOUR::Profile->get_trx()) { global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK); @@ -349,12 +352,21 @@ MixerStrip::init () _session->engine().Running.connect (*this, invalidator (*this), boost::bind (&MixerStrip::engine_running, this), gui_context()); input_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::input_press), false); - output_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::output_press), false); + input_button.signal_button_release_event().connect (sigc::mem_fun(*this, &MixerStrip::input_release), false); + input_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::input_button_resized)); - /* ditto for this button and busses */ + input_button.set_text_ellipsize (Pango::ELLIPSIZE_MIDDLE); + output_button.set_text_ellipsize (Pango::ELLIPSIZE_MIDDLE); + + output_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::output_press), false); + output_button.signal_button_release_event().connect (sigc::mem_fun(*this, &MixerStrip::output_release), false); + output_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::output_button_resized)); number_label.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::number_button_button_press), false); + name_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_press), false); + name_button.signal_button_release_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_release), false); + group_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::select_route_group), false); _width = (Width) -1; @@ -395,9 +407,10 @@ MixerStrip::init () _visibility.add (&solo_iso_table, X_("SoloIsoLock"), _("Solo Iso / Lock"), false); _visibility.add (&output_button, X_("Output"), _("Output"), false); _visibility.add (&_comment_button, X_("Comments"), _("Comments"), false); + _visibility.add (&vca_table, X_("VCA"), _("VCA Assigns"), false); parameter_changed (X_("mixer-element-visibility")); - + UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &MixerStrip::parameter_changed)); Config->ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, boost::bind (&MixerStrip::parameter_changed, this, _1), gui_context()); _session->config.ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, boost::bind (&MixerStrip::parameter_changed, this, _1), gui_context()); @@ -414,19 +427,16 @@ MixerStrip::~MixerStrip () if (this ==_entered_mixer_strip) _entered_mixer_strip = NULL; - - delete input_selector; - delete output_selector; } bool -MixerStrip::mixer_strip_enter_event (GdkEventCrossing *ev) +MixerStrip::mixer_strip_enter_event (GdkEventCrossing* /*ev*/) { _entered_mixer_strip = this; - + //although we are triggering on the "enter", to the user it will appear that it is happenin on the "leave" //because the mixerstrip control is a parent that encompasses the strip - ARDOUR_UI::instance()->the_mixer()->deselect_all_strip_processors(); + deselect_all_processors(); return false; } @@ -438,14 +448,15 @@ MixerStrip::mixer_strip_leave_event (GdkEventCrossing *ev) if ( !(ev->detail == GDK_NOTIFY_INFERIOR) ) { _entered_mixer_strip= 0; - //clear keyboard focus in the gain display. this is cheesy but fixes a longstanding bug. + //clear keyboard focus in the gain display. this is cheesy but fixes a longstanding "bug" where the user starts typing in the gain entry, and leaves it active, thereby prohibiting other keybindings from working gpm.gain_display.set_sensitive(false); + gpm.show_gain(); gpm.gain_display.set_sensitive(true); //if we leave this mixer strip we need to clear out any selections //processor_box.processor_display.select_none(); //but this doesn't work, because it gets triggered when (for example) you open the menu or start a drag } - + return false; } @@ -470,7 +481,7 @@ MixerStrip::set_route (boost::shared_ptr rt) if (group_button.get_parent()) { bottom_button_table.remove (group_button); } - + RouteUI::set_route (rt); /* ProcessorBox needs access to _route so that it can read @@ -478,23 +489,12 @@ MixerStrip::set_route (boost::shared_ptr rt) */ processor_box.set_route (rt); - /* map the current state */ - - mute_changed (0); - update_solo_display (); - - delete input_selector; - input_selector = 0; - - delete output_selector; - output_selector = 0; - revert_to_default_display (); /* unpack these from the parent and stuff them into our own table */ - + if (gpm.peak_display.get_parent()) { gpm.peak_display.get_parent()->remove (gpm.peak_display); } @@ -503,9 +503,9 @@ MixerStrip::set_route (boost::shared_ptr rt) } gpm.set_type (rt->meter_type()); - + mute_solo_table.attach (gpm.gain_display,0,1,1,2, EXPAND|FILL, EXPAND); - mute_solo_table.attach (gpm.peak_display,1,2,1,2); + mute_solo_table.attach (gpm.peak_display,1,2,1,2, EXPAND|FILL, EXPAND); if (solo_button->get_parent()) { mute_solo_table.remove (*solo_button); @@ -516,10 +516,25 @@ MixerStrip::set_route (boost::shared_ptr rt) } if (route()->is_master()) { - mute_solo_table.attach (*mute_button, 0, 2, 0, 1); solo_button->hide (); mute_button->show (); rec_mon_table.hide (); + if (solo_iso_table.get_parent()) { + solo_iso_table.get_parent()->remove(solo_iso_table); + } + if (monitor_section_button == 0) { + Glib::RefPtr act = ActionManager::get_action ("Common", "ToggleMonitorSection"); + _session->MonitorChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::monitor_changed, this), gui_context()); + + monitor_section_button = manage (new ArdourButton); + monitor_changed (); + monitor_section_button->set_related_action (act); + set_tooltip (monitor_section_button, _("Show/Hide Monitoring Section")); + mute_solo_table.attach (*monitor_section_button, 1, 2, 0, 1); + monitor_section_button->show(); + monitor_section_button->unset_flags (Gtk::CAN_FOCUS); + } + parameter_changed ("use-monitor-bus"); } else { bottom_button_table.attach (group_button, 1, 2, 0, 1); mute_solo_table.attach (*mute_button, 0, 1, 0, 1); @@ -549,14 +564,24 @@ MixerStrip::set_route (boost::shared_ptr rt) monitor_disk_button->hide (); } + if (route()->trim() && route()->trim()->active()) { + trim_control.show (); + trim_control.set_controllable (route()->trim()->gain_control()); + } else { + trim_control.hide (); + boost::shared_ptr none; + trim_control.set_controllable (none); + } + if (is_midi_track()) { if (midi_input_enable_button == 0) { midi_input_enable_button = manage (new ArdourButton); midi_input_enable_button->set_name ("midi input button"); - midi_input_enable_button->set_image (::get_icon (X_("midi_socket_small"))); + midi_input_enable_button->set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon)); + midi_input_enable_button->set_icon (ArdourIcon::DinMidi); midi_input_enable_button->signal_button_press_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_press), false); midi_input_enable_button->signal_button_release_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_release), false); - ARDOUR_UI::instance()->set_tip (midi_input_enable_button, _("Enable/Disable MIDI input")); + set_tooltip (midi_input_enable_button, _("Enable/Disable MIDI input")); } else { input_button_box.remove (*midi_input_enable_button); } @@ -581,7 +606,6 @@ MixerStrip::set_route (boost::shared_ptr rt) if (is_track ()) { rec_mon_table.attach (*rec_enable_button, 0, 1, 0, ARDOUR::Profile->get_mixbus() ? 1 : 2); - rec_enable_button->set_sensitive (_session->writable()); rec_enable_button->show(); if (ARDOUR::Profile->get_mixbus()) { @@ -610,7 +634,7 @@ MixerStrip::set_route (boost::shared_ptr rt) route_ops_menu = 0; _route->meter_change.connect (route_connections, invalidator (*this), bind (&MixerStrip::meter_changed, this), gui_context()); - _route->input()->changed.connect (*this, invalidator (*this), boost::bind (&MixerStrip::update_output_display, this), gui_context()); + _route->input()->changed.connect (*this, invalidator (*this), boost::bind (&MixerStrip::update_input_display, this), gui_context()); _route->output()->changed.connect (*this, invalidator (*this), boost::bind (&MixerStrip::update_output_display, this), gui_context()); _route->route_group_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::route_group_changed, this), gui_context()); @@ -632,10 +656,10 @@ MixerStrip::set_route (boost::shared_ptr rt) /* now force an update of all the various elements */ - mute_changed (0); + update_mute_display (); update_solo_display (); name_changed (); - comment_changed (0); + comment_changed (); route_group_changed (); connect_to_pan (); @@ -669,7 +693,6 @@ MixerStrip::set_route (boost::shared_ptr rt) width_hide_box.show(); global_frame.show(); global_vpacker.show(); - button_table.show(); mute_solo_table.show(); bottom_button_table.show(); gpm.show_all (); @@ -682,6 +705,7 @@ MixerStrip::set_route (boost::shared_ptr rt) gpm.gain_automation_state_button.show(); parameter_changed ("mixer-element-visibility"); + map_frozen(); show (); } @@ -717,12 +741,13 @@ MixerStrip::set_width_enum (Width w, void* owner) set_button_names (); + const float scale = std::max(1.f, UIConfiguration::instance().get_ui_scale()); + switch (w) { case Wide: if (show_sends_button) { - show_sends_button->set_text (_("Aux\nSends")); - show_sends_button->layout()->set_alignment (Pango::ALIGN_CENTER); + show_sends_button->set_text (_("Aux")); } gpm.gain_automation_style_button.set_text ( @@ -737,9 +762,12 @@ MixerStrip::set_width_enum (Width w, void* owner) panners.astate_string(_route->panner()->automation_state())); } - - Gtkmm2ext::set_size_request_to_display_given_text_width (name_button, longest_label.c_str(), 2, _button_vpad); - set_size_request (-1, -1); + { + // panners expect an even number of horiz. pixels + int width = rintf (max (110.f * scale, gpm.get_gm_width() + 10.f * scale)) + 1; + width &= ~1; + set_size_request (width, -1); + } break; case Narrow: @@ -761,8 +789,12 @@ MixerStrip::set_width_enum (Width w, void* owner) panners.short_astate_string(_route->panner()->automation_state())); } - Gtkmm2ext::set_size_request_to_display_given_text_width (name_button, "long", 2, _button_vpad); - set_size_request (max (50, gpm.get_gm_width()), -1); + { + // panners expect an even number of horiz. pixels + int width = rintf (max (60.f * scale, gpm.get_gm_width() + 10.f * scale)) + 1; + width &= ~1; + set_size_request (width, -1); + } break; } @@ -795,6 +827,18 @@ struct RouteCompareByName { } }; +gint +MixerStrip::output_release (GdkEventButton *ev) +{ + switch (ev->button) { + case 3: + edit_output_configuration (); + break; + } + + return false; +} + gint MixerStrip::output_press (GdkEventButton *ev) { @@ -808,11 +852,10 @@ MixerStrip::output_press (GdkEventButton *ev) MenuList& citems = output_menu.items(); switch (ev->button) { - case 1: - edit_output_configuration (); - break; - case 3: + return false; //wait for the mouse-up to pop the dialog + + case 1: { output_menu.set_name ("ArdourContextMenu"); citems.clear (); @@ -820,15 +863,6 @@ MixerStrip::output_press (GdkEventButton *ev) citems.push_back (MenuElem (_("Disconnect"), sigc::mem_fun (*(static_cast(this)), &RouteUI::disconnect_output))); - for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { - citems.push_back ( - MenuElem ( - string_compose ("Add %1 port", (*i).to_i18n_string()), - sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_output_port), *i) - ) - ); - } - citems.push_back (SeparatorElem()); uint32_t const n_with_separator = citems.size (); @@ -862,6 +896,22 @@ MixerStrip::output_press (GdkEventButton *ev) citems.pop_back (); } + if (!ARDOUR::Profile->get_mixbus()) { + citems.push_back (SeparatorElem()); + + for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { + citems.push_back ( + MenuElem ( + string_compose (_("Add %1 port"), (*i).to_i18n_string()), + sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_output_port), *i) + ) + ); + } + } + + citems.push_back (SeparatorElem()); + citems.push_back (MenuElem (_("Routing Grid"), sigc::mem_fun (*(static_cast(this)), &RouteUI::edit_output_configuration))); + output_menu.popup (1, ev->time); break; } @@ -872,51 +922,22 @@ MixerStrip::output_press (GdkEventButton *ev) return TRUE; } -void -MixerStrip::edit_output_configuration () +gint +MixerStrip::input_release (GdkEventButton *ev) { - if (output_selector == 0) { - - boost::shared_ptr send; - boost::shared_ptr output; - - if ((send = boost::dynamic_pointer_cast(_current_delivery)) != 0) { - if (!boost::dynamic_pointer_cast(send)) { - output = send->output(); - } else { - output = _route->output (); - } - } else { - output = _route->output (); - } + switch (ev->button) { - output_selector = new IOSelectorWindow (_session, output); - } + case 3: + edit_input_configuration (); + break; + default: + break; - if (output_selector->is_visible()) { - output_selector->get_toplevel()->get_window()->raise(); - } else { - output_selector->present (); } - output_selector->set_keep_above (true); + return false; } -void -MixerStrip::edit_input_configuration () -{ - if (input_selector == 0) { - input_selector = new IOSelectorWindow (_session, _route->input()); - } - - if (input_selector->is_visible()) { - input_selector->get_toplevel()->get_window()->raise(); - } else { - input_selector->present (); - } - - input_selector->set_keep_above (true); -} gint MixerStrip::input_press (GdkEventButton *ev) @@ -938,26 +959,16 @@ MixerStrip::input_press (GdkEventButton *ev) switch (ev->button) { - case 1: - edit_input_configuration (); - break; - case 3: + return false; //don't handle the mouse-down here. wait for mouse-up to pop the menu + + case 1: { citems.push_back (MenuElem (_("Disconnect"), sigc::mem_fun (*(static_cast(this)), &RouteUI::disconnect_input))); - for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { - citems.push_back ( - MenuElem ( - string_compose ("Add %1 port", (*i).to_i18n_string()), - sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_input_port), *i) - ) - ); - } - citems.push_back (SeparatorElem()); uint32_t const n_with_separator = citems.size (); - + input_menu_bundles.clear (); ARDOUR::BundleList current = _route->input()->bundles_connected (); @@ -990,7 +1001,21 @@ MixerStrip::input_press (GdkEventButton *ev) citems.pop_back (); } + citems.push_back (SeparatorElem()); + for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { + citems.push_back ( + MenuElem ( + string_compose (_("Add %1 port"), (*i).to_i18n_string()), + sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_input_port), *i) + ) + ); + } + + citems.push_back (SeparatorElem()); + citems.push_back (MenuElem (_("Routing Grid"), sigc::mem_fun (*(static_cast(this)), &RouteUI::edit_input_configuration))); + input_menu.popup (1, ev->time); + break; } default: @@ -1036,9 +1061,9 @@ MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr b, ARDOUR: { using namespace Menu_Helpers; - if (b->ports_are_outputs() == false || b->nchannels() != _route->n_inputs() || *b == *_route->output()->bundle()) { - return; - } + if (b->ports_are_outputs() == false || b->nchannels() != _route->n_inputs() || *b == *_route->output()->bundle()) { + return; + } list >::iterator i = input_menu_bundles.begin (); while (i != input_menu_bundles.end() && b->has_same_ports (*i) == false) { @@ -1064,9 +1089,9 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr b, ARDOUR { using namespace Menu_Helpers; - if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs() || *b == *_route->input()->bundle()) { - return; - } + if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs() || *b == *_route->input()->bundle()) { + return; + } list >::iterator i = output_menu_bundles.begin (); while (i != output_menu_bundles.end() && b->has_same_ports (*i) == false) { @@ -1194,9 +1219,9 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt uint32_t ardour_connection_count = 0; uint32_t system_connection_count = 0; uint32_t other_connection_count = 0; + uint32_t typed_connection_count = 0; ostringstream label; - string label_string; bool have_label = false; bool each_io_has_one_connection = true; @@ -1210,12 +1235,21 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt ostringstream tooltip; char * tooltip_cstr; + //to avoid confusion, the button caption should only show connections that match the datatype of the track + DataType dt = DataType::AUDIO; + if ( boost::dynamic_pointer_cast(route) != 0 ) { + dt = DataType::MIDI; + // avoid further confusion with Midi-tracks that have a synth. + // Audio-ports may be connected, but button says "Disconnected" + tooltip << _("MIDI "); + } + if (for_input) { io_count = route->n_inputs().n_total(); - tooltip << string_compose (_("INPUT to %1"), Glib::Markup::escape_text(route->name())); + tooltip << string_compose (_("INPUT to %1"), Gtkmm2ext::markup_escape_text (route->name())); } else { io_count = route->n_outputs().n_total(); - tooltip << string_compose (_("OUTPUT from %1"), Glib::Markup::escape_text(route->name())); + tooltip << string_compose (_("OUTPUT from %1"), Gtkmm2ext::markup_escape_text (route->name())); } @@ -1228,19 +1262,36 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt port_connections.clear (); port->get_connections(port_connections); + + //ignore any port connections that don't match our DataType + if (port->type() != dt) { + if (!port_connections.empty()) { + ++typed_connection_count; + } + continue; + } + io_connection_count = 0; if (!port_connections.empty()) { for (vector::iterator i = port_connections.begin(); i != port_connections.end(); ++i) { + string pn = ""; string& connection_name (*i); + if (connection_name.find("system:") == 0) { + pn = AudioEngine::instance()->get_pretty_name_by_name (connection_name); + } + if (io_connection_count == 0) { - tooltip << endl << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1)) << " -> " << Glib::Markup::escape_text(connection_name); + tooltip << endl << Gtkmm2ext::markup_escape_text (port->name().substr(port->name().find("/") + 1)) + << " -> " + << Gtkmm2ext::markup_escape_text ( pn.empty() ? connection_name : pn ); } else { - tooltip << ", " << Glib::Markup::escape_text(connection_name); + tooltip << ", " + << Gtkmm2ext::markup_escape_text ( pn.empty() ? connection_name : pn ); } - if (connection_name.find("ardour:") == 0) { + if (connection_name.find(RouteUI::program_port_prefix) == 0) { if (ardour_track_name.empty()) { // "ardour:Master/in 1" -> "ardour:Master/" string::size_type slash = connection_name.find("/"); @@ -1252,6 +1303,32 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt if (connection_name.find(ardour_track_name) == 0) { ++ardour_connection_count; } + } else if (!pn.empty()) { + if (system_ports.empty()) { + system_ports += pn; + } else { + system_ports += "/" + pn; + } + if (connection_name.find("system:") == 0) { + ++system_connection_count; + } + } else if (connection_name.find("system:midi_") == 0) { + if (for_input) { + // "system:midi_capture_123" -> "123" + system_port = "M " + connection_name.substr(20); + } else { + // "system:midi_playback_123" -> "123" + system_port = "M " + connection_name.substr(21); + } + + if (system_ports.empty()) { + system_ports += system_port; + } else { + system_ports += "/" + system_port; + } + + ++system_connection_count; + } else if (connection_name.find("system:") == 0) { if (for_input) { // "system:capture_123" -> "123" @@ -1297,18 +1374,21 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt strcpy(tooltip_cstr, tooltip.str().c_str()); if (for_input) { - ARDOUR_UI::instance()->set_tip (&input_button, tooltip_cstr, ""); - } else { - ARDOUR_UI::instance()->set_tip (&output_button, tooltip_cstr, ""); + set_tooltip (&input_button, tooltip_cstr); + } else { + set_tooltip (&output_button, tooltip_cstr); } + delete [] tooltip_cstr; + if (each_io_has_one_connection) { if (total_connection_count == ardour_connection_count) { // all connections are to the same track in ardour // "ardour:Master/" -> "Master" string::size_type slash = ardour_track_name.find("/"); if (slash != string::npos) { - label << ardour_track_name.substr(7, slash - 7); + const size_t ppps = RouteUI::program_port_prefix.size (); // "ardour:" + label << ardour_track_name.substr (ppps, slash - ppps); have_label = true; } } @@ -1333,21 +1413,15 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt // Odd configuration label << "*" << total_connection_count << "*"; } + if (typed_connection_count > 0) { + label << "\u2295"; // circled plus + } } - switch (width) { - case Wide: - label_string = label.str().substr(0, 7); - break; - case Narrow: - label_string = label.str().substr(0, 3); - break; - } - if (for_input) { - input_button.set_text (label_string); + input_button.set_text (label.str()); } else { - output_button.set_text (label_string); + output_button.set_text (label.str()); } } @@ -1355,7 +1429,7 @@ void MixerStrip::update_input_display () { update_io_button (_route, _width, true); - panners.setup_pan (); + panners.setup_pan (); if (has_audio_outputs ()) { panners.show_all (); @@ -1369,8 +1443,8 @@ void MixerStrip::update_output_display () { update_io_button (_route, _width, false); - gpm.setup_meters (); - panners.setup_pan (); + gpm.setup_meters (); + panners.setup_pan (); if (has_audio_outputs ()) { panners.show_all (); @@ -1440,12 +1514,10 @@ MixerStrip::setup_comment_button () break; } - ARDOUR_UI::instance()->set_tip ( - _comment_button, _route->comment().empty() ? _("Click to Add/Edit Comments") : _route->comment() + set_tooltip ( + _comment_button, _route->comment().empty() ? _("Click to add/edit comments") : _route->comment() ); - Gtkmm2ext::set_size_request_to_display_given_text_width ( - _comment_button, _comment_button.get_text().c_str(), 2, _button_vpad); } bool @@ -1522,6 +1594,13 @@ MixerStrip::build_route_ops_menu () items.push_back (MenuElem (_("Color..."), sigc::mem_fun (*this, &RouteUI::choose_color))); items.push_back (MenuElem (_("Comments..."), sigc::mem_fun (*this, &RouteUI::open_comment_editor))); + + items.push_back (MenuElem (_("Inputs..."), sigc::mem_fun (*this, &RouteUI::edit_input_configuration))); + + items.push_back (MenuElem (_("Outputs..."), sigc::mem_fun (*this, &RouteUI::edit_output_configuration))); + + items.push_back (SeparatorElem()); + if (!_route->is_master()) { items.push_back (MenuElem (_("Save As Template..."), sigc::mem_fun(*this, &RouteUI::save_as_template))); } @@ -1535,8 +1614,20 @@ MixerStrip::build_route_ops_menu () i->set_sensitive(! _session->transport_rolling()); i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::set_route_active), !_route->active(), false)); - items.push_back (SeparatorElem()); + if (!Profile->get_mixbus ()) { + items.push_back (SeparatorElem()); + items.push_back (CheckMenuElem (_("Strict I/O"))); + i = dynamic_cast (&items.back()); + i->set_active (_route->strict_io()); + i->signal_activate().connect (sigc::hide_return (sigc::bind (sigc::mem_fun (*_route, &Route::set_strict_io), !_route->strict_io()))); + } + if (1 /* TODO IFF >= 1 plugin-insert */) { + items.push_back (SeparatorElem()); + items.push_back (MenuElem (_("Pin Connections..."), sigc::mem_fun (*this, &RouteUI::manage_pins))); + } + + items.push_back (SeparatorElem()); items.push_back (MenuElem (_("Adjust Latency..."), sigc::mem_fun (*this, &RouteUI::adjust_latency))); items.push_back (SeparatorElem()); @@ -1544,23 +1635,53 @@ MixerStrip::build_route_ops_menu () denormal_menu_item = dynamic_cast (&items.back()); denormal_menu_item->set_active (_route->denormal_protection()); - if (!Profile->get_sae()) { - items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog))); - } - items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Remove"), sigc::bind (sigc::mem_fun(*this, &RouteUI::remove_this_route), false))); + items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog))); + + if (_route) { + /* note that this relies on selection being shared across editor and + mixer (or global to the backend, in the future), which is the only + sane thing for users anyway. + */ + + RouteTimeAxisView* rtav = PublicEditor::instance().get_route_view_by_route_id (_route->id()); + if (rtav) { + Selection& selection (PublicEditor::instance().get_selection()); + if (!selection.selected (rtav)) { + selection.set (rtav); + } + + if (!_route->is_master()) { + items.push_back (SeparatorElem()); + items.push_back (MenuElem (_("Duplicate..."), sigc::mem_fun (*this, &RouteUI::duplicate_selected_routes))); + } + + items.push_back (SeparatorElem()); + items.push_back (MenuElem (_("Remove"), sigc::mem_fun(PublicEditor::instance(), &PublicEditor::remove_tracks))); + } + } } gboolean MixerStrip::name_button_button_press (GdkEventButton* ev) { - /* show menu for either button 1 or 3, so as not to confuse people - and also not hide stuff from them. - */ + if (ev->button == 3) { + list_route_operations (); + + /* do not allow rename if the track is record-enabled */ + rename_menu_item->set_sensitive (!_route->record_enabled()); + route_ops_menu->popup (1, ev->time); + + return true; + } - if (ev->button == 3 || ev->button == 1) { + return false; +} + +gboolean +MixerStrip::name_button_button_release (GdkEventButton* ev) +{ + if (ev->button == 1) { list_route_operations (); /* do not allow rename if the track is record-enabled */ @@ -1580,6 +1701,8 @@ MixerStrip::number_button_button_press (GdkEventButton* ev) /* do not allow rename if the track is record-enabled */ rename_menu_item->set_sensitive (!_route->record_enabled()); route_ops_menu->popup (1, ev->time); + + return true; } return false; @@ -1604,7 +1727,7 @@ MixerStrip::set_selected (bool yn) global_frame.set_name ("MixerStripFrame"); } global_frame.queue_draw (); - + // if (!yn) // processor_box.deselect_all_processors(); } @@ -1623,39 +1746,44 @@ void MixerStrip::name_changed () { switch (_width) { - case Wide: - if (_session->config.get_track_name_number()) { - const int64_t track_number = _route->track_number (); - if (track_number == 0) { - number_label.set_text ("-"); - } else { - number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec)); - } - } else { - number_label.set_text (""); - } - name_button.set_text (_route->name()); - break; - case Narrow: - if (_session->config.get_track_name_number()) { - name_button.set_markup(track_number_to_string (_route->track_number (), " ", - PBD::short_version (_route->name (), 5))); - } else { + case Wide: + name_button.set_text (_route->name()); + break; + case Narrow: name_button.set_text (PBD::short_version (_route->name(), 5)); + break; + } + + set_tooltip (name_button, _route->name()); + + if (_session->config.get_track_name_number()) { + const int64_t track_number = _route->track_number (); + if (track_number == 0) { + number_label.set_text ("-"); + } else { + number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec)); } - break; + } else { + number_label.set_text (""); } +} - Gtkmm2ext::set_size_request_to_display_given_text_width ( - name_button, name_button.get_text().c_str(), 2, _button_vpad); +void +MixerStrip::input_button_resized (Gtk::Allocation& alloc) +{ + input_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE); +} - ARDOUR_UI::instance()->set_tip (name_button, _route->name()); +void +MixerStrip::output_button_resized (Gtk::Allocation& alloc) +{ + output_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE); } void MixerStrip::name_button_resized (Gtk::Allocation& alloc) { - name_button.layout()->set_width (alloc.get_width() * PANGO_SCALE); + name_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE); } bool @@ -1664,7 +1792,7 @@ MixerStrip::width_button_pressed (GdkEventButton* ev) if (ev->button != 1) { return false; } - + if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier)) && _mixer_owned) { switch (_width) { case Wide: @@ -1729,7 +1857,10 @@ MixerStrip::map_frozen () // XXX need some way, maybe, to retoggle redirect editors break; } + } else { + processor_box.set_sensitive (true); } + RouteUI::map_frozen (); } void @@ -1807,48 +1938,48 @@ MixerStrip::meter_point_string (MeterPoint mp) case Wide: switch (mp) { case MeterInput: - return _("in"); + return _("In"); break; - + case MeterPreFader: - return _("pre"); + return _("Pre"); break; - + case MeterPostFader: - return _("post"); + return _("Post"); break; - + case MeterOutput: - return _("out"); + return _("Out"); break; - + case MeterCustom: default: - return _("custom"); + return _("Custom"); break; } break; case Narrow: switch (mp) { case MeterInput: - return _("in"); + return S_("Meter|In"); break; - + case MeterPreFader: - return _("pr"); + return S_("Meter|Pr"); break; - + case MeterPostFader: - return _("po"); + return S_("Meter|Po"); break; - + case MeterOutput: - return _("o"); + return S_("Meter|O"); break; - + case MeterCustom: default: - return _("c"); + return S_("Meter|C"); break; } break; @@ -1857,6 +1988,18 @@ MixerStrip::meter_point_string (MeterPoint mp) return string(); } +/** Called when the monitor-section state */ +void +MixerStrip::monitor_changed () +{ + assert (monitor_section_button); + if (_session->monitor_active()) { + monitor_section_button->set_name ("master monitor section button active"); + } else { + monitor_section_button->set_name ("master monitor section button normal"); + } +} + /** Called when the metering point has changed */ void MixerStrip::meter_changed () @@ -1905,12 +2048,13 @@ MixerStrip::drop_send () meter_point_button.set_sensitive (true); mute_button->set_sensitive (true); solo_button->set_sensitive (true); - rec_enable_button->set_sensitive (true); solo_isolated_led->set_sensitive (true); solo_safe_led->set_sensitive (true); monitor_input_button->set_sensitive (true); monitor_disk_button->set_sensitive (true); _comment_button.set_sensitive (true); + RouteUI::check_rec_enable_sensitivity (); + set_button_names (); // update solo button visual state } void @@ -1933,7 +2077,7 @@ MixerStrip::show_send (boost::shared_ptr send) send->set_metering (true); _current_delivery->DropReferences.connect (send_gone_connection, invalidator (*this), boost::bind (&MixerStrip::revert_to_default_display, this), gui_context()); - gain_meter().set_controls (_route, send->meter(), send->amp()); + gain_meter().set_controls (_route, send->meter(), send->amp(), send->gain_control()); gain_meter().setup_meters (); uint32_t const in = _current_delivery->pans_required(); @@ -1972,7 +2116,7 @@ MixerStrip::revert_to_default_display () set_current_delivery (_route->main_outs ()); - gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->amp()); + gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->amp(), _route->gain_control()); gain_meter().setup_meters (); panner_ui().set_panner (_route->main_outs()->panner_shell(), _route->main_outs()->panner()); @@ -1994,10 +2138,12 @@ MixerStrip::set_button_names () { switch (_width) { case Wide: - rec_enable_button->set_text (_("Rec")); mute_button->set_text (_("Mute")); monitor_input_button->set_text (_("In")); monitor_disk_button->set_text (_("Disk")); + if (monitor_section_button) { + monitor_section_button->set_text (_("Mon")); + } if (_route && _route->solo_safe()) { solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive)); @@ -2016,15 +2162,17 @@ MixerStrip::set_button_names () break; } } - solo_isolated_led->set_text (_("iso")); - solo_safe_led->set_text (_("lock")); + solo_isolated_led->set_text (_("Iso")); + solo_safe_led->set_text (S_("SoloLock|Lock")); break; default: - rec_enable_button->set_text (_("R")); - mute_button->set_text (_("M")); - monitor_input_button->set_text (_("I")); - monitor_disk_button->set_text (_("D")); + mute_button->set_text (S_("Mute|M")); + monitor_input_button->set_text (S_("MonitorInput|I")); + monitor_disk_button->set_text (S_("MonitorDisk|D")); + if (monitor_section_button) { + monitor_section_button->set_text (S_("Mon|O")); + } if (_route && _route->solo_safe()) { solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive)); @@ -2032,20 +2180,20 @@ MixerStrip::set_button_names () solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive)); } if (!Config->get_solo_control_is_listen_control()) { - solo_button->set_text (_("S")); + solo_button->set_text (S_("Solo|S")); } else { switch (Config->get_listen_position()) { case AfterFaderListen: - solo_button->set_text (_("A")); + solo_button->set_text (S_("AfterFader|A")); break; case PreFaderListen: - solo_button->set_text (_("P")); + solo_button->set_text (S_("Prefader|P")); break; } } - solo_isolated_led->set_text (_("i")); - solo_safe_led->set_text (_("L")); + solo_isolated_led->set_text (S_("SoloIso|I")); + solo_safe_led->set_text (S_("SoloLock|L")); break; } @@ -2054,18 +2202,6 @@ MixerStrip::set_button_names () } else { meter_point_button.set_text (""); } - - // Update size request of changed buttons - Gtkmm2ext::set_size_request_to_display_given_text_width ( - *rec_enable_button, rec_enable_button->get_text().c_str(), 2, _button_vpad); - Gtkmm2ext::set_size_request_to_display_given_text_width ( - *mute_button, mute_button->get_text().c_str(), 2, _button_vpad); - Gtkmm2ext::set_size_request_to_display_given_text_width ( - *monitor_input_button, monitor_input_button->get_text().c_str(), 2, _button_vpad); - Gtkmm2ext::set_size_request_to_display_given_text_width ( - *monitor_disk_button, monitor_disk_button->get_text().c_str(), 2, _button_vpad); - Gtkmm2ext::set_size_request_to_display_given_text_width ( - *solo_button, solo_button->get_text().c_str(), 2, _button_vpad); } PluginSelector* @@ -2129,11 +2265,30 @@ MixerStrip::parameter_changed (string p) /* The user has made changes to the mixer strip visibility, so get our VisibilityGroup to reflect these changes in our widgets. */ - _visibility.set_state (Config->get_mixer_strip_visibility ()); + _visibility.set_state (UIConfiguration::instance().get_mixer_strip_visibility ()); } else if (p == "track-name-number") { name_changed (); } + else if (p == "use-monitor-bus") { + if (monitor_section_button) { + if (mute_button->get_parent()) { + mute_button->get_parent()->remove(*mute_button); + } + if (monitor_section_button->get_parent()) { + monitor_section_button->get_parent()->remove(*monitor_section_button); + } + if (Config->get_use_monitor_bus ()) { + mute_solo_table.attach (*mute_button, 0, 1, 0, 1); + mute_solo_table.attach (*monitor_section_button, 1, 2, 0, 1); + mute_button->show(); + monitor_section_button->show(); + } else { + mute_solo_table.attach (*mute_button, 0, 2, 0, 1); + mute_button->show(); + } + } + } } /** Called to decide whether the solo isolate / solo lock button visibility should @@ -2147,7 +2302,7 @@ MixerStrip::override_solo_visibility () const if (_route && _route->is_master ()) { return boost::optional (false); } - + return boost::optional (); } @@ -2248,10 +2403,17 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev) add_level_meter_item_point (items, group, _("Output"), MeterOutput); add_level_meter_item_point (items, group, _("Custom"), MeterCustom); + if (gpm.meter_channels().n_audio() == 0) { + m->popup (ev->button, ev->time); + _suspend_menu_callbacks = false; + return; + } + RadioMenuItem::Group tgroup; items.push_back (SeparatorElem()); add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterPeak), MeterPeak); + add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterPeak0dB), MeterPeak0dB); add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterKrms), MeterKrms); add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC1DIN), MeterIEC1DIN); add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC1NOR), MeterIEC1NOR); @@ -2298,7 +2460,7 @@ MixerStrip::add_level_meter_item_point (Menu_Helpers::MenuList& items, RadioMenuItem::Group& group, string const & name, MeterPoint point) { using namespace Menu_Helpers; - + items.push_back (RadioMenuElem (group, name, sigc::bind (sigc::mem_fun (*this, &MixerStrip::set_meter_point), point))); RadioMenuItem* i = dynamic_cast (&items.back ()); i->set_active (_route->meter_point() == point); @@ -2316,7 +2478,7 @@ MixerStrip::add_level_meter_item_type (Menu_Helpers::MenuList& items, RadioMenuItem::Group& group, string const & name, MeterType type) { using namespace Menu_Helpers; - + items.push_back (RadioMenuElem (group, name, sigc::bind (sigc::mem_fun (*this, &MixerStrip::set_meter_type), type))); RadioMenuItem* i = dynamic_cast (&items.back ()); i->set_active (_route->meter_type() == type); @@ -2328,3 +2490,48 @@ MixerStrip::set_meter_type (MeterType t) if (_suspend_menu_callbacks) return; gpm.set_type (t); } + +void +MixerStrip::vca_menu_toggle (uint32_t n) +{ + if (!_route) { + return; + } + + boost::shared_ptr vca = _session->vca_manager().vca_by_number (n); + + if (!vca) { + return; + } + + vca->add (_route); +} + +bool +MixerStrip::vca_button_release (GdkEventButton* ev, uint32_t which) +{ + using namespace Gtk::Menu_Helpers; + + if (!_session || !Keyboard::is_context_menu_event (ev)) { + return false; + } + + VCAManager::VCAS vcas (_session->vca_manager().vcas()); + + if (vcas.empty()) { + /* XXX should probably show a message saying "No VCA masters" */ + return true; + } + + Menu* menu = new Menu; + MenuList& items = menu->items(); + RadioMenuItem::Group group; + + for (VCAManager::VCAS::iterator v = vcas.begin(); v != vcas.end(); ++v) { + items.push_back (RadioMenuElem (group, (*v)->name(), sigc::bind (sigc::mem_fun (*this, &MixerStrip::vca_menu_toggle), (*v)->number()))); + } + + menu->popup (1, ev->time); + + return true; +}