X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=f17468ea65f36742eb0eea0d1e05b04de80ad687;hb=d7cd457bdf5116a2ba4e211320065b0e3ad5afb4;hp=0153ac5f1f1dbe1260926c06a1273797b81a876e;hpb=3888b244a6ac0eef3988b5ffe14524e202873926;p=ardour.git diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 0153ac5f1f..f17468ea65 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -22,22 +22,18 @@ #include +#include + #include "pbd/convert.h" #include "pbd/enumwriter.h" #include "pbd/replace_all.h" #include "pbd/stacktrace.h" -#include -#include -#include -#include -#include -#include - #include "ardour/amp.h" #include "ardour/audio_track.h" #include "ardour/audioengine.h" #include "ardour/internal_send.h" +#include "ardour/io.h" #include "ardour/meter.h" #include "ardour/midi_track.h" #include "ardour/pannable.h" @@ -55,11 +51,18 @@ #include "ardour/vca.h" #include "ardour/vca_manager.h" +#include "gtkmm2ext/gtk_ui.h" +#include "gtkmm2ext/menu_elems.h" +#include "gtkmm2ext/utils.h" +#include "gtkmm2ext/doi.h" + +#include "widgets/tooltips.h" + #include "ardour_window.h" +#include "enums_convert.h" #include "mixer_strip.h" #include "mixer_ui.h" #include "keyboard.h" -#include "ardour_button.h" #include "public_editor.h" #include "send_ui.h" #include "io_selector.h" @@ -67,13 +70,12 @@ #include "gui_thread.h" #include "route_group_menu.h" #include "meter_patterns.h" -#include "tooltips.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; -using namespace ARDOUR_UI_UTILS; +using namespace ArdourWidgets; using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; @@ -96,7 +98,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer) , solo_iso_table (1, 2) , 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) @@ -129,9 +130,9 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr rt , solo_iso_table (1, 2) , 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")) @@ -151,7 +152,6 @@ MixerStrip::init () ignore_toggle = false; comment_area = 0; _width_owner = 0; - spacer = 0; /* the length of this string determines the width of the mixer strip when it is set to `wide' */ longest_label = "longest label"; @@ -178,13 +178,7 @@ MixerStrip::init () output_button.set_text (_("Output")); output_button.set_name ("mixer strip button"); - 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); + bottom_button_table.attach (gpm.meter_point_button, 2, 3, 0, 1); hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); @@ -263,7 +257,9 @@ MixerStrip::init () 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())) @@ -272,6 +268,8 @@ MixerStrip::init () trim_control.set_tooltip_prefix (_("Trim: ")); trim_control.set_name ("trim knob"); trim_control.set_no_show_all (true); + trim_control.StartGesture.connect(sigc::mem_fun(*this, &MixerStrip::trim_start_touch)); + trim_control.StopGesture.connect(sigc::mem_fun(*this, &MixerStrip::trim_end_touch)); input_button_box.pack_start (trim_control, false, false); global_vpacker.set_border_width (1); @@ -283,7 +281,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); @@ -296,6 +293,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()) { @@ -319,6 +317,24 @@ MixerStrip::init () global_vpacker.pack_start (name_button, Gtk::PACK_SHRINK); } +#ifndef MIXBUS + //add a spacer underneath the master bus; + //this fills the area that is taken up by the scrollbar on the tracks; + //and therefore keeps the faders "even" across the bottom + int scrollbar_height = 0; + { + Gtk::Window window (WINDOW_TOPLEVEL); + HScrollbar scrollbar; + window.add (scrollbar); + scrollbar.set_name ("MixerWindow"); + scrollbar.ensure_style(); + Gtk::Requisition requisition(scrollbar.size_request ()); + scrollbar_height = requisition.height; + } + spacer.set_size_request (-1, scrollbar_height); + global_vpacker.pack_end (spacer, false, false); +#endif + global_frame.add (global_vpacker); global_frame.set_shadow_type (Gtk::SHADOW_IN); global_frame.set_name ("BaseFrame"); @@ -350,7 +366,6 @@ MixerStrip::init () 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); @@ -414,6 +429,22 @@ MixerStrip::~MixerStrip () _entered_mixer_strip = NULL; } +void +MixerStrip::vca_assign (boost::shared_ptr vca) +{ + boost::shared_ptr sl = boost::dynamic_pointer_cast ( route() ); + if (sl) + sl->assign(vca); +} + +void +MixerStrip::vca_unassign (boost::shared_ptr vca) +{ + boost::shared_ptr sl = boost::dynamic_pointer_cast ( route() ); + if (sl) + sl->unassign(vca); +} + bool MixerStrip::mixer_strip_enter_event (GdkEventCrossing* /*ev*/) { @@ -454,6 +485,38 @@ MixerStrip::name() const return string(); } +void +MixerStrip::update_trim_control () +{ + if (route()->trim() && route()->trim()->active() && + route()->n_inputs().n_audio() > 0) { + trim_control.show (); + trim_control.set_controllable (route()->trim()->gain_control()); + } else { + trim_control.hide (); + boost::shared_ptr none; + trim_control.set_controllable (none); + } +} + +void +MixerStrip::trim_start_touch () +{ + assert (_route && _session); + if (route()->trim() && route()->trim()->active() && route()->n_inputs().n_audio() > 0) { + route()->trim()->gain_control ()->start_touch (_session->transport_frame()); + } +} + +void +MixerStrip::trim_end_touch () +{ + assert (_route && _session); + if (route()->trim() && route()->trim()->active() && route()->n_inputs().n_audio() > 0) { + route()->trim()->gain_control ()->stop_touch (_session->transport_frame()); + } +} + void MixerStrip::set_route (boost::shared_ptr rt) { @@ -515,9 +578,8 @@ MixerStrip::set_route (boost::shared_ptr rt) 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); - } + solo_iso_table.set_sensitive(false); + control_slave_ui.set_sensitive(false); 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()); @@ -538,18 +600,14 @@ MixerStrip::set_route (boost::shared_ptr rt) mute_button->show (); solo_button->show (); rec_mon_table.show (); + solo_iso_table.set_sensitive(true); + control_slave_ui.set_sensitive(true); } if (_mixer_owned && route()->is_master() ) { - - HScrollbar scrollbar; - Gtk::Requisition requisition(scrollbar.size_request ()); - int scrollbar_height = requisition.height; - - spacer = manage (new EventBox); - spacer->set_size_request (-1, scrollbar_height+2); - global_vpacker.pack_start (*spacer, false, false); - spacer->show(); + spacer.show(); + } else { + spacer.hide(); } if (is_track()) { @@ -560,14 +618,7 @@ 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); - } + update_trim_control(); if (is_midi_track()) { if (midi_input_enable_button == 0) { @@ -624,7 +675,7 @@ MixerStrip::set_route (boost::shared_ptr rt) } } - meter_point_button.set_text (meter_point_string (_route->meter_point())); + gpm.meter_point_button.set_text (meter_point_string (_route->meter_point())); delete route_ops_menu; route_ops_menu = 0; @@ -692,7 +743,7 @@ MixerStrip::set_route (boost::shared_ptr rt) mute_solo_table.show(); bottom_button_table.show(); gpm.show_all (); - meter_point_button.show(); + gpm.meter_point_button.show(); input_button_box.show_all(); output_button.show(); name_button.show(); @@ -711,9 +762,9 @@ MixerStrip::set_stuff_from_route () { /* if width is not set, it will be set by the MixerUI or editor */ - string str = gui_property ("strip-width"); - if (!str.empty()) { - set_width_enum (Width (string_2_enum (str, _width)), this); + Width width; + if (get_gui_property ("strip-width", width)) { + set_width_enum (width, this); } } @@ -732,7 +783,7 @@ MixerStrip::set_width_enum (Width w, void* owner) _width = w; if (_width_owner == this) { - set_gui_property ("strip-width", enum_2_string (_width)); + set_gui_property ("strip-width", _width); } set_button_names (); @@ -746,14 +797,10 @@ MixerStrip::set_width_enum (Width w, void* owner) show_sends_button->set_text (_("Aux")); } - gpm.gain_automation_style_button.set_text ( - gpm.astyle_string(gain_automation->automation_style())); gpm.gain_automation_state_button.set_text ( gpm.astate_string(gain_automation->automation_state())); if (_route->panner()) { - ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text ( - panners.astyle_string(_route->panner()->automation_style())); ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text ( panners.astate_string(_route->panner()->automation_state())); } @@ -772,15 +819,11 @@ MixerStrip::set_width_enum (Width w, void* owner) show_sends_button->set_text (_("Snd")); } - gpm.gain_automation_style_button.set_text ( - gpm.short_astyle_string(gain_automation->automation_style())); gpm.gain_automation_state_button.set_text ( gpm.short_astate_string(gain_automation->automation_state())); gain_meter().setup_meters (); // recalc meter width if (_route->panner()) { - ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text ( - panners.short_astyle_string(_route->panner()->automation_style())); ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text ( panners.short_astate_string(_route->panner()->automation_state())); } @@ -808,12 +851,7 @@ void MixerStrip::set_packed (bool yn) { _packed = yn; - - if (_packed) { - set_gui_property ("visible", true); - } else { - set_gui_property ("visible", false); - } + set_gui_property ("visible", _packed); } @@ -908,7 +946,9 @@ MixerStrip::output_press (GdkEventButton *ev) 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); + Gtkmm2ext::anchored_menu_popup(&output_menu, &output_button, "", + 1, ev->time); + break; } @@ -1010,7 +1050,8 @@ MixerStrip::input_press (GdkEventButton *ev) 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); + Gtkmm2ext::anchored_menu_popup(&input_menu, &input_button, "", + 1, ev->time); break; } @@ -1073,11 +1114,7 @@ MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr b, ARDOUR: input_menu_bundles.push_back (b); MenuList& citems = input_menu.items(); - - std::string n = b->name (); - replace_all (n, "_", " "); - - citems.push_back (MenuElem (n, sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_input_chosen), b))); + citems.push_back (MenuElemNoMnemonic (b->name (), sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_input_chosen), b))); } void @@ -1101,21 +1138,17 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr b, ARDOUR output_menu_bundles.push_back (b); MenuList& citems = output_menu.items(); - - std::string n = b->name (); - replace_all (n, "_", " "); - - citems.push_back (MenuElem (n, sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_output_chosen), b))); + citems.push_back (MenuElemNoMnemonic (b->name (), sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_output_chosen), b))); } void MixerStrip::update_diskstream_display () { - if (is_track() && input_selector) { - input_selector->hide_all (); - } + if (is_track() && input_selector) { + input_selector->hide_all (); + } - route_color_changed (); + route_color_changed (); } void @@ -1133,7 +1166,6 @@ MixerStrip::connect_to_pan () boost::shared_ptr p = _route->pannable (); p->automation_state_changed.connect (panstate_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_state_changed, &panners), gui_context()); - p->automation_style_changed.connect (panstyle_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_style_changed, &panners), gui_context()); /* This call reduncant, PannerUI::set_panner() connects to _panshell->Changed itself * However, that only works a panner was previously set. @@ -1207,6 +1239,7 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt { uint32_t io_count; uint32_t io_index; + boost::shared_ptr io; boost::shared_ptr port; vector port_connections; @@ -1231,30 +1264,70 @@ 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 + /* To avoid confusion, the button caption only shows connections that match the expected datatype + * + * First of all, if the user made only connections to a given type, we should use that one since + * it is very probably what the user expects. If there are several connections types, then show + * audio ones as primary, which matches expectations for both audio tracks with midi control and + * synthesisers. This first heuristic can be expressed with these two rules: + * A) If there are connected audio ports, consider audio as primary type. + * B) Else, if there are connected midi ports, consider midi as primary type. + * + * If there are no connected ports, then we choose the primary type based on the type of existing + * but unconnected ports. Again: + * C) If there are audio ports, consider audio as primary type. + * D) Else, if there are midi ports, consider midi as primary type. */ + 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" + bool match = false; + + if (for_input) { + io = route->input(); + } else { + io = route->output(); + } + + io_count = io->n_ports().n_total(); + for (io_index = 0; io_index < io_count; ++io_index) { + port = io->nth (io_index); + if (port->connected()) { + match = true; + if (port->type() == DataType::AUDIO) { + /* Rule A) applies no matter the remaining ports */ + dt = DataType::AUDIO; + break; + } + if (port->type() == DataType::MIDI) { + /* Rule B) is a good candidate... */ + dt = DataType::MIDI; + /* ...but continue the loop to check remaining ports for rule A) */ + } + } + } + + if (!match) { + /* Neither rule A) nor rule B) matched */ + if ( io->n_ports().n_audio() > 0 ) { + /* Rule C */ + dt = DataType::AUDIO; + } else if ( io->n_ports().n_midi() > 0 ) { + /* Rule D */ + dt = DataType::MIDI; + } + } + + if ( dt == DataType::MIDI ) { tooltip << _("MIDI "); } if (for_input) { - io_count = route->n_inputs().n_total(); 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"), Gtkmm2ext::markup_escape_text (route->name())); } - for (io_index = 0; io_index < io_count; ++io_index) { - if (for_input) { - port = route->input()->nth (io_index); - } else { - port = route->output()->nth (io_index); - } + port = io->nth (io_index); port_connections.clear (); port->get_connections(port_connections); @@ -1465,6 +1538,7 @@ void MixerStrip::io_changed_proxy () { Glib::signal_idle().connect_once (sigc::mem_fun (*this, &MixerStrip::update_panner_choices)); + Glib::signal_idle().connect_once (sigc::mem_fun (*this, &MixerStrip::update_trim_control)); } void @@ -1487,33 +1561,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; } - set_tooltip ( - _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 @@ -1537,7 +1605,12 @@ MixerStrip::select_route_group (GdkEventButton *ev) WeakRouteList r; r.push_back (route ()); group_menu->build (r); - group_menu->menu()->popup (1, ev->time); + + RouteGroup *rg = _route->route_group(); + + Gtkmm2ext::anchored_menu_popup(group_menu->menu(), &group_button, + rg ? rg->name() : _("No Group"), + 1, ev->time); } return true; @@ -1567,6 +1640,7 @@ MixerStrip::route_group_changed () void MixerStrip::route_color_changed () { + using namespace ARDOUR_UI_UTILS; name_button.modify_bg (STATE_NORMAL, color()); number_label.set_fixed_colors (gdk_color_to_rgba (color()), gdk_color_to_rgba (color())); reset_strip_style (); @@ -1586,7 +1660,13 @@ MixerStrip::help_count_plugins (boost::weak_ptr p) if (!processor || !processor->display_to_user()) { return; } - if (boost::dynamic_pointer_cast (processor)) { + boost::shared_ptr pi = boost::dynamic_pointer_cast (processor); +#ifdef MIXBUS + if (pi && pi->is_channelstrip ()) { + return; + } +#endif + if (pi) { ++_plugin_insert_cnt; } } @@ -1607,13 +1687,26 @@ MixerStrip::build_route_ops_menu () items.push_back (MenuElem (_("Outputs..."), sigc::mem_fun (*this, &RouteUI::edit_output_configuration))); - items.push_back (SeparatorElem()); + if (!Profile->get_mixbus()) { + items.push_back (SeparatorElem()); + } - if (!_route->is_master()) { + if (!_route->is_master() +#ifdef MIXBUS + && !_route->mixbus() +#endif + ) { + if (Profile->get_mixbus()) { + items.push_back (SeparatorElem()); + } items.push_back (MenuElem (_("Save As Template..."), sigc::mem_fun(*this, &RouteUI::save_as_template))); } - items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteUI::route_rename))); - rename_menu_item = &items.back(); + + if (!Profile->get_mixbus()) { + items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteUI::route_rename))); + /* do not allow rename if the track is record-enabled */ + items.back().set_sensitive (!is_track() || !track()->rec_enable_control()->get_value()); + } items.push_back (SeparatorElem()); items.push_back (CheckMenuElem (_("Active"))); @@ -1637,6 +1730,12 @@ MixerStrip::build_route_ops_menu () items.push_back (MenuElem (_("Pin Connections..."), sigc::mem_fun (*this, &RouteUI::manage_pins))); } + if (_route->the_instrument () && _route->the_instrument ()->output_streams().n_audio() > 2) { + // TODO ..->n_audio() > 1 && separate_output_groups) hard to check here every time. + items.push_back (MenuElem (_("Fan out to Busses"), sigc::bind (sigc::mem_fun (*this, &RouteUI::fan_out), true, true))); + items.push_back (MenuElem (_("Fan out to Tracks"), sigc::bind (sigc::mem_fun (*this, &RouteUI::fan_out), false, true))); + } + items.push_back (SeparatorElem()); items.push_back (MenuElem (_("Adjust Latency..."), sigc::mem_fun (*this, &RouteUI::adjust_latency))); @@ -1651,11 +1750,11 @@ MixerStrip::build_route_ops_menu () sane thing for users anyway. */ - RouteTimeAxisView* rtav = PublicEditor::instance().get_route_view_by_route_id (_route->id()); - if (rtav) { + StripableTimeAxisView* stav = PublicEditor::instance().get_stripable_time_axis_by_id (_route->id()); + if (stav) { Selection& selection (PublicEditor::instance().get_selection()); - if (!selection.selected (rtav)) { - selection.set (rtav); + if (!selection.selected (stav)) { + selection.set (stav); } if (!_route->is_master()) { @@ -1672,12 +1771,15 @@ MixerStrip::build_route_ops_menu () gboolean MixerStrip::name_button_button_press (GdkEventButton* ev) { - if (ev->button == 3) { + if (ev->button == 1 || ev->button == 3) { list_route_operations (); - /* do not allow rename if the track is record-enabled */ - rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value()); - route_ops_menu->popup (1, ev->time); + if (ev->button == 1) { + Gtkmm2ext::anchored_menu_popup(route_ops_menu, &name_button, "", + 1, ev->time); + } else { + route_ops_menu->popup (3, ev->time); + } return true; } @@ -1685,28 +1787,12 @@ MixerStrip::name_button_button_press (GdkEventButton* ev) 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 */ - rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value()); - route_ops_menu->popup (1, ev->time); - } - - return false; -} - gboolean MixerStrip::number_button_button_press (GdkEventButton* ev) { if ( ev->button == 3 ) { list_route_operations (); - /* do not allow rename if the track is record-enabled */ - rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value()); route_ops_menu->popup (1, ev->time); return true; @@ -1723,8 +1809,10 @@ MixerStrip::list_route_operations () } void -MixerStrip::show_selected () +MixerStrip::set_selected (bool yn) { + AxisView::set_selected (yn); + if (selected()) { global_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT); global_frame.set_name ("MixerStripSelectedFrame"); @@ -1766,7 +1854,7 @@ MixerStrip::name_changed () if (track_number == 0) { number_label.set_text ("-"); } else { - number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec)); + number_label.set_text (PBD::to_string (abs(_route->track_number ()))); } } else { number_label.set_text (""); @@ -1791,6 +1879,12 @@ MixerStrip::name_button_resized (Gtk::Allocation& alloc) 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 MixerStrip::width_button_pressed (GdkEventButton* ev) { @@ -2009,7 +2103,7 @@ MixerStrip::monitor_changed () void MixerStrip::meter_changed () { - meter_point_button.set_text (meter_point_string (_route->meter_point())); + gpm.meter_point_button.set_text (meter_point_string (_route->meter_point())); gpm.setup_meters (); // reset peak when meter point changes gpm.reset_peak_display(); @@ -2050,7 +2144,7 @@ MixerStrip::drop_send () output_button.set_sensitive (true); group_button.set_sensitive (true); set_invert_sensitive (true); - meter_point_button.set_sensitive (true); + gpm.meter_point_button.set_sensitive (true); mute_button->set_sensitive (true); solo_button->set_sensitive (true); solo_isolated_led->set_sensitive (true); @@ -2097,7 +2191,7 @@ MixerStrip::show_send (boost::shared_ptr send) input_button.set_sensitive (false); group_button.set_sensitive (false); set_invert_sensitive (false); - meter_point_button.set_sensitive (false); + gpm.meter_point_button.set_sensitive (false); mute_button->set_sensitive (false); solo_button->set_sensitive (false); rec_enable_button->set_sensitive (false); @@ -2203,9 +2297,9 @@ MixerStrip::set_button_names () } if (_route) { - meter_point_button.set_text (meter_point_string (_route->meter_point())); + gpm.meter_point_button.set_text (meter_point_string (_route->meter_point())); } else { - meter_point_button.set_text (""); + gpm.meter_point_button.set_text (""); } }