X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=21d6a5007fdc0bcac2aafa356172db4d3371f15d;hb=6d0b0099956a97725cc207ed59c84e6fddc239f6;hp=c33a8853662bfa694e5d6cfacb53c4d405708d92;hpb=b3722f7063699fafd0421d504e05a7300c70e0ec;p=ardour.git diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index c33a885366..21d6a5007f 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -22,18 +22,13 @@ #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" @@ -56,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" @@ -68,13 +70,12 @@ #include "gui_thread.h" #include "route_group_menu.h" #include "meter_patterns.h" -#include "tooltips.h" #include "ui_config.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; @@ -267,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); @@ -431,7 +434,7 @@ MixerStrip::vca_assign (boost::shared_ptr vca) { boost::shared_ptr sl = boost::dynamic_pointer_cast ( route() ); if (sl) - sl->assign(vca, false); + sl->assign(vca); } void @@ -496,6 +499,24 @@ MixerStrip::update_trim_control () } } +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) { @@ -741,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); } } @@ -762,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 (); @@ -776,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())); } @@ -802,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())); } @@ -838,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); } @@ -896,27 +904,37 @@ MixerStrip::output_press (GdkEventButton *ev) boost::shared_ptr b = _session->bundles (); - /* give user bundles first chance at being in the menu */ + /* guess the user-intended main type of the route output */ + DataType intended_type = guess_main_type(false); + + /* try adding the master bus first */ + boost::shared_ptr master = _session->master_out(); + if (master) { + maybe_add_bundle_to_output_menu (master->input()->bundle(), current, intended_type); + } + + /* then other routes inputs */ + boost::shared_ptr routes = _session->get_routes (); + RouteList copy = *routes; + copy.sort (RouteCompareByName ()); + for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) { + maybe_add_bundle_to_output_menu ((*i)->input()->bundle(), current, intended_type); + } + /* then try adding user bundles, often labeled/grouped physical inputs */ for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) { if (boost::dynamic_pointer_cast (*i)) { - maybe_add_bundle_to_output_menu (*i, current); + maybe_add_bundle_to_output_menu (*i, current, intended_type); } } + /* then all other bundles, including physical outs or other sofware */ for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) { if (boost::dynamic_pointer_cast (*i) == 0) { - maybe_add_bundle_to_output_menu (*i, current); + maybe_add_bundle_to_output_menu (*i, current, intended_type); } } - boost::shared_ptr routes = _session->get_routes (); - RouteList copy = *routes; - copy.sort (RouteCompareByName ()); - for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) { - maybe_add_bundle_to_output_menu ((*i)->input()->bundle(), current); - } - if (citems.size() == n_with_separator) { /* no routes added; remove the separator */ citems.pop_back (); @@ -1060,13 +1078,7 @@ MixerStrip::bundle_input_chosen (boost::shared_ptr c) return; } - ARDOUR::BundleList current = _route->input()->bundles_connected (); - - if (std::find (current.begin(), current.end(), c) == current.end()) { - _route->input()->connect_ports_to_bundle (c, true, this); - } else { - _route->input()->disconnect_ports_from_bundle (c, this); - } + _route->input()->connect_ports_to_bundle (c, true, this); } void @@ -1076,13 +1088,7 @@ MixerStrip::bundle_output_chosen (boost::shared_ptr c) return; } - ARDOUR::BundleList current = _route->output()->bundles_connected (); - - if (std::find (current.begin(), current.end(), c) == current.end()) { - _route->output()->connect_ports_to_bundle (c, true, this); - } else { - _route->output()->disconnect_ports_from_bundle (c, this); - } + _route->output()->connect_ports_to_bundle (c, true, true, this); } void @@ -1106,49 +1112,59 @@ 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 -MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr b, ARDOUR::BundleList const& /*current*/) +MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr b, ARDOUR::BundleList const& /*current*/, + DataType type) { using namespace Menu_Helpers; - if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs() || *b == *_route->input()->bundle()) { + /* The bundle should be an input one, but not ours */ + if (b->ports_are_inputs() == false || *b == *_route->input()->bundle()) { + return; + } + + /* Don't add the monitor input unless we are Master */ + boost::shared_ptr monitor = _session->monitor_out(); + if ((!_route->is_master()) && monitor && b->has_same_ports (monitor->input()->bundle())) return; + + /* It should either match exactly our outputs (if |type| is DataType::NIL) + * or have the same number of |type| channels than our outputs. */ + if (type == DataType::NIL) { + if(b->nchannels() != _route->n_outputs()) + return; + } else { + if (b->nchannels().n(type) != _route->n_outputs().n(type)) + return; } + /* Avoid adding duplicates */ list >::iterator i = output_menu_bundles.begin (); while (i != output_menu_bundles.end() && b->has_same_ports (*i) == false) { ++i; } - if (i != output_menu_bundles.end()) { return; } + /* Now add the bundle to the menu */ 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 @@ -1166,7 +1182,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. @@ -1196,6 +1211,53 @@ MixerStrip::update_panner_choices () panners.set_available_panners(PannerManager::instance().PannerManager::get_available_panners(in, out)); } +DataType +MixerStrip::guess_main_type(bool for_input, bool favor_connected) const +{ + /* The heuristic follows these principles: + * A) If all ports that the user connected are of the same type, then he + * very probably intends to use the IO with that type. A common subcase + * is when the IO has only ports of the same type (connected or not). + * B) If several types of ports are connected, then we should guess based + * on the likeliness of the user wanting to use a given type. + * We assume that the DataTypes are ordered from the most likely to the + * least likely when iterating or comparing them with "<". + * C) If no port is connected, the same logic can be applied with all ports + * instead of connected ones. TODO: Try other ideas, for instance look at + * the last plugin output when |for_input| is false (note: when StrictIO + * the outs of the last plugin should be the same as the outs of the route + * modulo the panner which forwards non-audio anyway). + * All of these constraints are respected by the following algorithm that + * just returns the most likely datatype found in connected ports if any, or + * available ports if any (since if all ports are of the same type, the most + * likely found will be that one obviously). */ + + boost::shared_ptr io = for_input ? _route->input() : _route->output(); + + /* Find most likely type among connected ports */ + if (favor_connected) { + DataType type = DataType::NIL; /* NIL is always last so least likely */ + for (PortSet::iterator p = io->ports().begin(); p != io->ports().end(); ++p) { + if (p->connected() && p->type() < type) + type = p->type(); + } + if (type != DataType::NIL) { + /* There has been a connected port (necessarily non-NIL) */ + return type; + } + } + + /* Find most likely type among available ports. + * The iterator stops before NIL. */ + for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { + if (io->n_ports().n(*t) > 0) + return *t; + } + + /* No port at all, return the most likely datatype by default */ + return DataType::front(); +} + /* * Output port labelling * ===================== @@ -1236,269 +1298,214 @@ MixerStrip::update_panner_choices () */ void -MixerStrip::update_io_button (boost::shared_ptr route, Width width, bool for_input) +MixerStrip::update_io_button (bool for_input) { - uint32_t io_count; - uint32_t io_index; - boost::shared_ptr io; - boost::shared_ptr port; - vector port_connections; - - uint32_t total_connection_count = 0; - uint32_t io_connection_count = 0; - 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 tooltip; ostringstream label; - bool have_label = false; - bool each_io_has_one_connection = true; - - string connection_name; - string ardour_track_name; - string other_connection_type; - string system_ports; - string system_port; - - ostringstream tooltip; - char * tooltip_cstr; - /* 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. */ + uint32_t total_connection_count = 0; + uint32_t typed_connection_count = 0; + bool each_typed_port_has_one_connection = true; - DataType dt = DataType::AUDIO; - bool match = false; + DataType dt = guess_main_type(for_input); + boost::shared_ptr io = for_input ? _route->input() : _route->output(); + /* Fill in the tooltip. Also count: + * - The total number of connections. + * - The number of main-typed connections. + * - Whether each main-typed port has exactly one connection. */ if (for_input) { - io = route->input(); + tooltip << string_compose (_("INPUT to %1"), + Gtkmm2ext::markup_escape_text (_route->name())); } else { - io = route->output(); + tooltip << string_compose (_("OUTPUT from %1"), + Gtkmm2ext::markup_escape_text (_route->name())); } - 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) */ + string arrow = Gtkmm2ext::markup_escape_text(for_input ? " <- " : " -> "); + vector port_connections; + for (PortSet::iterator port = io->ports().begin(); + port != io->ports().end(); + ++port) { + port_connections.clear(); + port->get_connections(port_connections); + + uint32_t port_connection_count = 0; + + for (vector::iterator i = port_connections.begin(); + i != port_connections.end(); + ++i) { + ++port_connection_count; + + if (port_connection_count == 1) { + tooltip << endl << Gtkmm2ext::markup_escape_text ( + port->name().substr(port->name().find("/") + 1)); + tooltip << arrow; + } else { + tooltip << ", "; } + + tooltip << Gtkmm2ext::markup_escape_text(*i); } - } - 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; + total_connection_count += port_connection_count; + if (port->type() == dt) { + typed_connection_count += port_connection_count; + each_typed_port_has_one_connection &= (port_connection_count == 1); } - } - if ( dt == DataType::MIDI ) { - tooltip << _("MIDI "); } - if (for_input) { - tooltip << string_compose (_("INPUT to %1"), Gtkmm2ext::markup_escape_text (route->name())); - } else { - tooltip << string_compose (_("OUTPUT from %1"), Gtkmm2ext::markup_escape_text (route->name())); + if (total_connection_count == 0) { + tooltip << endl << _("Disconnected"); } - for (io_index = 0; io_index < io_count; ++io_index) { - port = io->nth (io_index); - - port_connections.clear (); - port->get_connections(port_connections); + if (typed_connection_count == 0) { + label << "-"; + have_label = true; + } - //ignore any port connections that don't match our DataType - if (port->type() != dt) { - if (!port_connections.empty()) { - ++typed_connection_count; + /* Are all main-typed channels connected to the same route ? */ + if (!have_label) { + boost::shared_ptr routes = _session->get_routes (); + for (ARDOUR::RouteList::const_iterator route = routes->begin(); + route != routes->end(); + ++route) { + boost::shared_ptr dest_io = + for_input ? (*route)->output() : (*route)->input(); + if (io->bundle()->connected_to(dest_io->bundle(), + _session->engine(), + dt, true)) { + label << Gtkmm2ext::markup_escape_text ((*route)->name()); + have_label = true; + break; } - 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 << Gtkmm2ext::markup_escape_text (port->name().substr(port->name().find("/") + 1)) - << " -> " - << Gtkmm2ext::markup_escape_text ( pn.empty() ? connection_name : pn ); - } else { - tooltip << ", " - << Gtkmm2ext::markup_escape_text ( pn.empty() ? connection_name : pn ); - } - - 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("/"); - if (slash != string::npos) { - ardour_track_name = connection_name.substr(0, slash + 1); - } - } - - 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" - system_port = connection_name.substr(15); - } else { - // "system:playback_123" -> "123" - system_port = connection_name.substr(16); - } - - if (system_ports.empty()) { - system_ports += system_port; - } else { - system_ports += "/" + system_port; - } - - ++system_connection_count; - } else { - if (other_connection_type.empty()) { - // "jamin:in 1" -> "jamin:" - other_connection_type = connection_name.substr(0, connection_name.find(":") + 1); - } + /* Are all main-typed channels connected to the same (user) bundle ? */ + if (!have_label) { + boost::shared_ptr bundles = _session->bundles (); + for (ARDOUR::BundleList::iterator bundle = bundles->begin(); + bundle != bundles->end(); + ++bundle) { + if (boost::dynamic_pointer_cast (*bundle) == 0) + continue; + if (io->bundle()->connected_to(*bundle, _session->engine(), + dt, true)) { + label << Gtkmm2ext::markup_escape_text ((*bundle)->name()); + have_label = true; + break; + } + } + } - if (connection_name.find(other_connection_type) == 0) { - ++other_connection_count; + /* Is each main-typed channel only connected to a physical output ? */ + if (!have_label && each_typed_port_has_one_connection) { + ostringstream temp_label; + vector phys; + string playorcapture; + if (for_input) { + _session->engine().get_physical_inputs(dt, phys); + playorcapture = "capture_"; + } else { + _session->engine().get_physical_outputs(dt, phys); + playorcapture = "playback_"; + } + for (PortSet::iterator port = io->ports().begin(dt); + port != io->ports().end(dt); + ++port) { + string pn = ""; + for (vector::iterator s = phys.begin(); + s != phys.end(); + ++s) { + if (!port->connected_to(*s)) + continue; + pn = AudioEngine::instance()->get_pretty_name_by_name(*s); + if (pn.empty()) { + string::size_type start = (*s).find(playorcapture); + if (start != string::npos) { + pn = (*s).substr(start + playorcapture.size()); } } - - ++total_connection_count; - ++io_connection_count; + break; } + if (pn.empty()) { + temp_label.str(""); /* erase the failed attempt */ + break; + } + if (port != io->ports().begin(dt)) + temp_label << "/"; + temp_label << pn; } - if (io_connection_count != 1) { - each_io_has_one_connection = false; + if (!temp_label.str().empty()) { + label << temp_label.str(); + have_label = true; } } - if (total_connection_count == 0) { - tooltip << endl << _("Disconnected"); - } - - tooltip_cstr = new char[tooltip.str().size() + 1]; - strcpy(tooltip_cstr, tooltip.str().c_str()); - - if (for_input) { - 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) { - const size_t ppps = RouteUI::program_port_prefix.size (); // "ardour:" - label << ardour_track_name.substr (ppps, slash - ppps); - have_label = true; + /* Is each main-typed channel connected to a single and different port with + * the same client name (e.g. another JACK client) ? */ + if (!have_label && each_typed_port_has_one_connection) { + string maybe_client = ""; + vector connections; + for (PortSet::iterator port = io->ports().begin(dt); + port != io->ports().end(dt); + ++port) { + port_connections.clear(); + port->get_connections(port_connections); + string connection = port_connections.front(); + + vector::iterator i = connections.begin(); + while (i != connections.end() && *i != connection) { + ++i; } + if (i != connections.end()) + break; /* duplicate connection */ + connections.push_back(connection); + + connection = connection.substr(0, connection.find(":")); + if (maybe_client.empty()) + maybe_client = connection; + if (maybe_client != connection) + break; } - else if (total_connection_count == system_connection_count) { - // all connections are to system ports - label << system_ports; - have_label = true; - } - else if (total_connection_count == other_connection_count) { - // all connections are to the same external program eg jamin - // "jamin:" -> "jamin" - label << other_connection_type.substr(0, other_connection_type.size() - 1); + if (connections.size() == io->n_ports().n(dt)) { + label << maybe_client; have_label = true; } } + /* Odd configuration */ if (!have_label) { - if (total_connection_count == 0) { - // Disconnected - label << "-"; - } else { - // Odd configuration - label << "*" << total_connection_count << "*"; - } - if (typed_connection_count > 0) { - label << "\u2295"; // circled plus - } + label << "*" << total_connection_count << "*"; } + if (total_connection_count > typed_connection_count) { + label << "\u2295"; /* circled plus */ + } + + /* Actually set the properties of the button */ + char * cstr = new char[tooltip.str().size() + 1]; + strcpy(cstr, tooltip.str().c_str()); + if (for_input) { input_button.set_text (label.str()); + set_tooltip (&input_button, cstr); } else { output_button.set_text (label.str()); + set_tooltip (&output_button, cstr); } + + delete [] cstr; } void MixerStrip::update_input_display () { - update_io_button (_route, _width, true); + update_io_button (true); panners.setup_pan (); if (has_audio_outputs ()) { @@ -1512,7 +1519,7 @@ MixerStrip::update_input_display () void MixerStrip::update_output_display () { - update_io_button (_route, _width, false); + update_io_button (false); gpm.setup_meters (); panners.setup_pan (); @@ -1641,6 +1648,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 (); @@ -1750,11 +1758,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()) { @@ -1778,7 +1786,7 @@ MixerStrip::name_button_button_press (GdkEventButton* ev) Gtkmm2ext::anchored_menu_popup(route_ops_menu, &name_button, "", 1, ev->time); } else { - route_ops_menu->popup (ev->button, ev->time); + route_ops_menu->popup (3, ev->time); } return true; @@ -1790,10 +1798,10 @@ MixerStrip::name_button_button_press (GdkEventButton* ev) gboolean MixerStrip::number_button_button_press (GdkEventButton* ev) { - if (ev->button == 3) { + if ( ev->button == 3 ) { list_route_operations (); - route_ops_menu->popup (ev->button, ev->time); + route_ops_menu->popup (1, ev->time); return true; } @@ -1854,7 +1862,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 ("");