X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=b5ae269c7fb65864bd16f60df36bd108496bf0ab;hb=46d2b03af0f2e4d9495b447724d0fa275ea774ff;hp=99bd730b9f00bbf23227141efa5f60455011dbd8;hpb=ffde3968ec3a597939aa5896f6917e5711bae739;p=ardour.git diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 99bd730b9f..b5ae269c7f 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -38,6 +38,7 @@ #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" @@ -52,6 +53,8 @@ #include "ardour/session.h" #include "ardour/types.h" #include "ardour/user_bundle.h" +#include "ardour/vca.h" +#include "ardour/vca_manager.h" #include "ardour_window.h" #include "mixer_strip.h" @@ -68,7 +71,7 @@ #include "tooltips.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; @@ -79,11 +82,10 @@ using namespace std; using namespace ArdourMeter; MixerStrip* MixerStrip::_entered_mixer_strip; - PBD::Signal1 MixerStrip::CatchDeletion; MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer) - : AxisView(sess) + : SessionHandlePtr (sess) , RouteUI (sess) , _mixer(mx) , _mixer_owned (in_mixer) @@ -98,9 +100,11 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer) , 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 (); @@ -114,7 +118,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) @@ -132,6 +136,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr rt , _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); @@ -158,9 +163,11 @@ MixerStrip::init () } 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); @@ -257,7 +264,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())) @@ -277,7 +286,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); @@ -290,6 +298,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()) { @@ -304,6 +313,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); @@ -385,6 +395,7 @@ 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)); @@ -437,6 +448,15 @@ MixerStrip::mixer_strip_leave_event (GdkEventCrossing *ev) return false; } +string +MixerStrip::name() const +{ + if (_route) { + return _route->name(); + } + return string(); +} + void MixerStrip::set_route (boost::shared_ptr rt) { @@ -461,6 +481,8 @@ MixerStrip::set_route (boost::shared_ptr rt) 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. */ @@ -501,8 +523,10 @@ MixerStrip::set_route (boost::shared_ptr rt) } 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_section_button->set_name ("monitor section button"); + 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); @@ -581,7 +605,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()) { @@ -626,7 +649,6 @@ 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 (); @@ -635,8 +657,9 @@ MixerStrip::set_route (boost::shared_ptr rt) 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 (); @@ -872,15 +895,17 @@ MixerStrip::output_press (GdkEventButton *ev) citems.pop_back (); } - citems.push_back (SeparatorElem()); + 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) - ) - ); + 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()); @@ -928,7 +953,7 @@ 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) { @@ -1035,9 +1060,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) { @@ -1063,9 +1088,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) { @@ -1185,6 +1210,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; @@ -1209,30 +1235,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); @@ -1265,7 +1331,7 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt << 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("/"); @@ -1349,17 +1415,20 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt if (for_input) { set_tooltip (&input_button, tooltip_cstr); - } else { + } 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; } } @@ -1400,7 +1469,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 (); @@ -1414,8 +1483,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 (); @@ -1462,33 +1531,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 @@ -1502,9 +1565,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); } @@ -1553,6 +1616,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 () { @@ -1585,8 +1660,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()); @@ -1594,11 +1683,6 @@ 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 @@ -1616,7 +1700,7 @@ MixerStrip::build_route_ops_menu () 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))); } @@ -1630,7 +1714,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; @@ -1646,7 +1730,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); } @@ -1660,7 +1744,7 @@ 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; @@ -1680,13 +1764,15 @@ 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) @@ -1694,10 +1780,8 @@ MixerStrip::set_selected (bool yn) } 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 (); } @@ -1747,6 +1831,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) { @@ -1821,6 +1911,7 @@ MixerStrip::map_frozen () } else { processor_box.set_sensitive (true); } + RouteUI::map_frozen (); } void @@ -1948,6 +2039,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 () @@ -1996,12 +2099,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 @@ -2024,7 +2128,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(); @@ -2063,7 +2167,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()); @@ -2092,7 +2196,7 @@ MixerStrip::set_button_names () 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)); @@ -2121,7 +2225,7 @@ MixerStrip::set_button_names () 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)); @@ -2213,11 +2317,9 @@ MixerStrip::parameter_changed (string p) our VisibilityGroup to reflect these changes in our widgets. */ _visibility.set_state (UIConfiguration::instance().get_mixer_strip_visibility ()); - } - else if (p == "track-name-number") { + } else if (p == "track-name-number") { name_changed (); - } - else if (p == "use-monitor-bus") { + } else if (p == "use-monitor-bus") { if (monitor_section_button) { if (mute_button->get_parent()) { mute_button->get_parent()->remove(*mute_button); @@ -2225,7 +2327,7 @@ MixerStrip::parameter_changed (string p) if (monitor_section_button->get_parent()) { monitor_section_button->get_parent()->remove(*monitor_section_button); } - if (_session->monitor_out()) { + 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(); @@ -2235,6 +2337,8 @@ MixerStrip::parameter_changed (string p) mute_button->show(); } } + } else if (p == "track-name-number") { + update_track_number_visibility(); } } @@ -2437,3 +2541,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); +}