X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=77b203e7fb12014f67afbadb42b3659a00237e9e;hb=44a3f042a7a878af45ae893e0361d6a8be315da4;hp=1874aa91e850dcbd24b22c6c3cea300a0cd825df;hpb=65287a6f09cc4c76c047e58bcd5d69e622f048b1;p=ardour.git diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 1874aa91e8..77b203e7fb 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,13 +81,10 @@ using namespace std; using namespace ArdourMeter; MixerStrip* MixerStrip::_entered_mixer_strip; - PBD::Signal1 MixerStrip::CatchDeletion; -static const int _button_vpad = 4; - MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer) - : AxisView(sess) + : SessionHandlePtr (sess) , RouteUI (sess) , _mixer(mx) , _mixer_owned (in_mixer) @@ -96,9 +97,13 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer) , mute_solo_table (1, 2) , bottom_button_table (1, 3) , meter_point_button (_("pre")) + , monitor_section_button (0) , midi_input_enable_button (0) + , _plugin_insert_cnt (0) , _comment_button (_("Comments")) + , trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero)) , _visibility (X_("mixer-element-visibility")) + , control_slave_ui (sess) { init (); @@ -112,7 +117,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer) } MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr rt, bool in_mixer) - : AxisView(sess) + : SessionHandlePtr (sess) , RouteUI (sess) , _mixer(mx) , _mixer_owned (in_mixer) @@ -125,9 +130,12 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr rt , mute_solo_table (1, 2) , bottom_button_table (1, 3) , 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")) + , control_slave_ui (sess) { init (); set_route (rt); @@ -136,8 +144,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr rt void MixerStrip::init () { - int button_table_row = 0; - _entered_mixer_strip= 0; group_menu = 0; route_ops_menu = 0; @@ -154,15 +160,17 @@ 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); + hide_button.set_tweaks (ArdourButton::Square); + set_tooltip (width_button, t); + + hide_button.set_icon (ArdourIcon::CloseCross); + hide_button.set_tweaks (ArdourButton::Square); + 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_box.pack_start (input_button, true, true); @@ -170,38 +178,33 @@ MixerStrip::init () output_button.set_text (_("Output")); output_button.set_name ("mixer strip button"); - 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"); 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), false); + 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), false); + 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_safe_led->set_text (S_("SoloLock|Lock")); solo_isolated_led->set_text (_("Iso")); solo_iso_table.set_homogeneous (true); @@ -243,7 +246,7 @@ MixerStrip::init () button_size_group->add_widget (*monitor_input_button); } } - + mute_solo_table.set_homogeneous (true); mute_solo_table.set_spacings (2); @@ -253,16 +256,25 @@ 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)); - ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), ""); + set_tooltip (&group_button, _("Mix group")); group_button.set_name ("mixer strip button"); _comment_button.set_name (X_("mixer strip button")); + _comment_button.set_text_ellipsize (Pango::ELLIPSIZE_END); _comment_button.signal_clicked.connect (sigc::mem_fun (*this, &RouteUI::toggle_comment_editor)); + _comment_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::comment_button_resized)); + + // 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); @@ -273,7 +285,6 @@ 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 (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); @@ -286,6 +297,7 @@ MixerStrip::init () number_label.set_fixed_colors (0x80808080, 0x80808080); number_label.set_alignment (.5, .5); number_label.set_fallthrough_to_parent (true); + number_label.set_tweaks (ArdourButton::OccasionalText); global_vpacker.set_spacing (2); if (!ARDOUR::Profile->get_trx()) { @@ -300,6 +312,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 (control_slave_ui, 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); @@ -327,9 +340,14 @@ MixerStrip::init () input_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::input_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)); + + 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); @@ -376,9 +394,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 (&control_slave_ui, 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()); @@ -398,10 +417,10 @@ MixerStrip::~MixerStrip () } 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 deselect_all_processors(); @@ -424,10 +443,19 @@ MixerStrip::mixer_strip_leave_event (GdkEventCrossing *ev) //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; } +string +MixerStrip::name() const +{ + if (_route) { + return _route->name(); + } + return string(); +} + void MixerStrip::set_route (boost::shared_ptr rt) { @@ -449,25 +477,22 @@ MixerStrip::set_route (boost::shared_ptr rt) if (group_button.get_parent()) { bottom_button_table.remove (group_button); } - + RouteUI::set_route (rt); + control_slave_ui.set_stripable (boost::dynamic_pointer_cast (rt)); + /* ProcessorBox needs access to _route so that it can read GUI object state. */ processor_box.set_route (rt); - /* map the current state */ - - mute_changed (0); - update_solo_display (); - 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); } @@ -476,9 +501,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); @@ -489,10 +514,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); @@ -522,14 +562,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); } @@ -554,7 +604,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()) { @@ -583,7 +632,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()); @@ -599,17 +648,17 @@ MixerStrip::set_route (boost::shared_ptr rt) } _route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::setup_comment_button, this), gui_context()); - _route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::property_changed, this, _1), gui_context()); set_stuff_from_route (); /* 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 (); + update_track_number_visibility (); connect_to_pan (); panners.setup_pan (); @@ -654,6 +703,7 @@ MixerStrip::set_route (boost::shared_ptr rt) gpm.gain_automation_state_button.show(); parameter_changed ("mixer-element-visibility"); + map_frozen(); show (); } @@ -689,12 +739,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 ( @@ -709,8 +760,12 @@ MixerStrip::set_width_enum (Width w, void* owner) panners.astate_string(_route->panner()->automation_state())); } - - set_size_request (max (110, gpm.get_gm_width()+5), -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: @@ -732,7 +787,12 @@ MixerStrip::set_width_enum (Width w, void* owner) panners.short_astate_string(_route->panner()->automation_state())); } - set_size_request (max (60, gpm.get_gm_width() + 10), -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; } @@ -769,11 +829,11 @@ gint MixerStrip::output_release (GdkEventButton *ev) { switch (ev->button) { - case 1: + case 3: edit_output_configuration (); break; } - + return false; } @@ -790,10 +850,10 @@ MixerStrip::output_press (GdkEventButton *ev) MenuList& citems = output_menu.items(); switch (ev->button) { - case 1: + case 3: return false; //wait for the mouse-up to pop the dialog - case 3: + case 1: { output_menu.set_name ("ArdourContextMenu"); citems.clear (); @@ -801,15 +861,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 (); @@ -843,6 +894,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; } @@ -858,7 +925,7 @@ MixerStrip::input_release (GdkEventButton *ev) { switch (ev->button) { - case 1: + case 3: edit_input_configuration (); break; default: @@ -885,30 +952,21 @@ MixerStrip::input_press (GdkEventButton *ev) return true; } - if (_session->actively_recording() && _route->record_enabled()) + if (_session->actively_recording() && is_track() && track()->rec_enable_control()->get_value()) return true; switch (ev->button) { - case 1: + case 3: return false; //don't handle the mouse-down here. wait for mouse-up to pop the menu - case 3: + 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 (); @@ -941,7 +999,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: @@ -987,9 +1059,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) { @@ -1015,9 +1087,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) { @@ -1145,9 +1217,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; @@ -1161,12 +1233,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())); } @@ -1179,19 +1260,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("/"); @@ -1203,6 +1301,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" @@ -1248,18 +1372,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; } } @@ -1284,21 +1411,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()); } } @@ -1306,7 +1427,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 (); @@ -1320,8 +1441,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 (); @@ -1368,33 +1489,27 @@ MixerStrip::port_connected_or_disconnected (boost::weak_ptr wa, boost::wea void MixerStrip::setup_comment_button () { - switch (_width) { + std::string comment = _route->comment(); - case Wide: - if (_route->comment().empty ()) { - _comment_button.unset_bg (STATE_NORMAL); - _comment_button.set_text (_("Comments")); - } else { - _comment_button.modify_bg (STATE_NORMAL, color ()); - _comment_button.set_text (_("*Comments*")); - } - break; + set_tooltip (_comment_button, comment.empty() ? _("Click to add/edit comments") : _route->comment()); - case Narrow: - if (_route->comment().empty ()) { - _comment_button.unset_bg (STATE_NORMAL); - _comment_button.set_text (_("Cmt")); - } else { - _comment_button.modify_bg (STATE_NORMAL, color ()); - _comment_button.set_text (_("*Cmt*")); - } - break; + if (comment.empty ()) { + _comment_button.set_name ("generic button"); + _comment_button.set_text (_width == Wide ? _("Comments") : _("Cmt")); + return; } - ARDOUR_UI::instance()->set_tip ( - _comment_button, _route->comment().empty() ? _("Click to Add/Edit Comments") : _route->comment() - ); + _comment_button.set_name ("comment button"); + string::size_type pos = comment.find_first_of (" \t\n"); + if (pos != string::npos) { + comment = comment.substr (0, pos); + } + if (comment.empty()) { + _comment_button.set_text (_width == Wide ? _("Comments") : _("Cmt")); + } else { + _comment_button.set_text (comment); + } } bool @@ -1408,9 +1523,9 @@ MixerStrip::select_route_group (GdkEventButton *ev) PropertyList* plist = new PropertyList(); - plist->add (Properties::gain, true); - plist->add (Properties::mute, true); - plist->add (Properties::solo, true); + plist->add (Properties::group_gain, true); + plist->add (Properties::group_mute, true); + plist->add (Properties::group_solo, true); group_menu = new RouteGroupMenu (_session, plist); } @@ -1459,6 +1574,18 @@ MixerStrip::show_passthru_color () reset_strip_style (); } + +void +MixerStrip::help_count_plugins (boost::weak_ptr p) +{ + boost::shared_ptr processor (p.lock ()); + if (!processor || !processor->display_to_user()) { + return; + } + if (boost::dynamic_pointer_cast (processor)) { + ++_plugin_insert_cnt; + } +} void MixerStrip::build_route_ops_menu () { @@ -1491,8 +1618,22 @@ 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()))); + } + _plugin_insert_cnt = 0; + _route->foreach_processor (sigc::mem_fun (*this, &MixerStrip::help_count_plugins)); + if (_plugin_insert_cnt > 0) { + 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()); @@ -1500,13 +1641,28 @@ 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))); - } + 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. + */ - items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Remove"), sigc::bind (sigc::mem_fun(*this, &RouteUI::remove_this_route), false))); + 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 @@ -1516,7 +1672,7 @@ MixerStrip::name_button_button_press (GdkEventButton* ev) list_route_operations (); /* do not allow rename if the track is record-enabled */ - rename_menu_item->set_sensitive (!_route->record_enabled()); + rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value()); route_ops_menu->popup (1, ev->time); return true; @@ -1532,7 +1688,7 @@ MixerStrip::name_button_button_release (GdkEventButton* ev) list_route_operations (); /* do not allow rename if the track is record-enabled */ - rename_menu_item->set_sensitive (!_route->record_enabled()); + rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value()); route_ops_menu->popup (1, ev->time); } @@ -1546,9 +1702,9 @@ MixerStrip::number_button_button_press (GdkEventButton* ev) list_route_operations (); /* do not allow rename if the track is record-enabled */ - rename_menu_item->set_sensitive (!_route->record_enabled()); + rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value()); route_ops_menu->popup (1, ev->time); - + return true; } @@ -1566,24 +1722,24 @@ void MixerStrip::set_selected (bool yn) { AxisView::set_selected (yn); - if (_selected) { + + if (selected()) { global_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT); global_frame.set_name ("MixerStripSelectedFrame"); } else { global_frame.set_shadow_type (Gtk::SHADOW_IN); global_frame.set_name ("MixerStripFrame"); } + global_frame.queue_draw (); - + // if (!yn) // processor_box.deselect_all_processors(); } void -MixerStrip::property_changed (const PropertyChange& what_changed) +MixerStrip::route_property_changed (const PropertyChange& what_changed) { - RouteUI::property_changed (what_changed); - if (what_changed.contains (ARDOUR::Properties::name)) { name_changed (); } @@ -1593,36 +1749,50 @@ 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 (""); } +} - ARDOUR_UI::instance()->set_tip (name_button, _route->name()); +void +MixerStrip::input_button_resized (Gtk::Allocation& alloc) +{ + input_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE); +} + +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); +} + +void +MixerStrip::comment_button_resized (Gtk::Allocation& alloc) +{ + _comment_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE); } bool @@ -1631,7 +1801,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: @@ -1696,7 +1866,10 @@ MixerStrip::map_frozen () // XXX need some way, maybe, to retoggle redirect editors break; } + } else { + processor_box.set_sensitive (true); } + RouteUI::map_frozen (); } void @@ -1776,19 +1949,19 @@ MixerStrip::meter_point_string (MeterPoint mp) case MeterInput: return _("In"); break; - + case MeterPreFader: return _("Pre"); break; - + case MeterPostFader: return _("Post"); break; - + case MeterOutput: return _("Out"); break; - + case MeterCustom: default: return _("Custom"); @@ -1798,24 +1971,24 @@ MixerStrip::meter_point_string (MeterPoint mp) 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; @@ -1824,6 +1997,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 () @@ -1872,12 +2057,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 @@ -1900,7 +2086,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(); @@ -1939,7 +2125,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()); @@ -1961,12 +2147,14 @@ 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()) { + if (_route && _route->solo_safe_control()->solo_safe()) { solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive)); } else { solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive)); @@ -1984,35 +2172,37 @@ MixerStrip::set_button_names () } } solo_isolated_led->set_text (_("Iso")); - solo_safe_led->set_text (_("Lock")); + 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()) { + if (_route && _route->solo_safe_control()->solo_safe()) { solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive)); } else { 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; } @@ -2084,10 +2274,29 @@ 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 ()); - } - else if (p == "track-name-number") { + _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(); + } + } + } else if (p == "track-name-number") { + update_track_number_visibility(); } } @@ -2102,7 +2311,7 @@ MixerStrip::override_solo_visibility () const if (_route && _route->is_master ()) { return boost::optional (false); } - + return boost::optional (); } @@ -2203,10 +2412,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); @@ -2253,7 +2469,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); @@ -2271,7 +2487,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); @@ -2283,3 +2499,45 @@ MixerStrip::set_meter_type (MeterType t) if (_suspend_menu_callbacks) return; gpm.set_type (t); } + +void +MixerStrip::update_track_number_visibility () +{ + DisplaySuspender ds; + bool show_label = _session->config.get_track_name_number(); + + if (_route && _route->is_master()) { + show_label = false; + } + + if (show_label) { + number_label.show (); + // see ArdourButton::on_size_request(), we should probably use a global size-group here instead. + // except the width of the number label is subtracted from the name-hbox, so we + // need to explictly calculate it anyway until the name-label & entry become ArdourWidgets. + int tnw = (2 + std::max(2u, _session->track_number_decimals())) * number_label.char_pixel_width(); + if (tnw & 1) --tnw; + number_label.set_size_request(tnw, -1); + number_label.show (); + } else { + number_label.hide (); + } +} + +Gdk::Color +MixerStrip::color () const +{ + return route_color (); +} + +bool +MixerStrip::marked_for_display () const +{ + return !_route->presentation_info().hidden(); +} + +bool +MixerStrip::set_marked_for_display (bool yn) +{ + return RouteUI::mark_hidden (!yn); +}