X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=b5ae269c7fb65864bd16f60df36bd108496bf0ab;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=ebbf078b3cf96bb2e8dc8926cd92c033e51c532a;hpb=384d05dd35191077f3c2e6a5b6547f627aa0b68f;p=ardour.git diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index ebbf078b3c..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" @@ -70,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; @@ -84,7 +85,7 @@ 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) @@ -103,6 +104,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer) , _comment_button (_("Comments")) , trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero)) , _visibility (X_("mixer-element-visibility")) + , control_slave_ui (sess) { init (); @@ -116,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) @@ -134,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); @@ -160,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); @@ -211,15 +216,6 @@ MixerStrip::init () } solo_iso_table.show (); - vca_button = manage (new ArdourButton (ArdourButton::default_elements)); - vca_button->set_no_show_all (true); - vca_button->set_name (X_("vca assign")); - vca_button->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - vca_button->signal_button_release_event().connect (sigc::mem_fun (*this, &MixerStrip::vca_button_release), false); - UI::instance()->set_tip (*vca_button, _("VCA assignments")); - vca_button->set_text (_("-vca-")); - vca_button->show (); - rec_mon_table.set_homogeneous (true); rec_mon_table.set_row_spacings (2); rec_mon_table.set_col_spacings (2); @@ -268,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())) @@ -288,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); @@ -301,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()) { @@ -315,7 +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 (*vca_button, 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); @@ -397,7 +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 (vca_button, X_("VCA"), _("VCA Assigns"), 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)); @@ -483,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. */ @@ -649,12 +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()); - - _route->gain_control()->MasterStatusChange.connect (route_connections, - invalidator (*this), - boost::bind (&MixerStrip::update_vca_display, this), - gui_context()); set_stuff_from_route (); @@ -662,7 +656,6 @@ MixerStrip::set_route (boost::shared_ptr rt) update_mute_display (); update_solo_display (); - update_vca_display (); name_changed (); comment_changed (); route_group_changed (); @@ -1217,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; @@ -1241,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); @@ -1497,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 @@ -1537,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); } @@ -1736,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) @@ -1750,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 (); } @@ -1803,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) { @@ -2508,100 +2542,6 @@ MixerStrip::set_meter_type (MeterType t) gpm.set_type (t); } -void -MixerStrip::vca_menu_toggle (Gtk::CheckMenuItem* menuitem, uint32_t n) -{ - if (!_route) { - return; - } - - boost::shared_ptr vca = _session->vca_manager().vca_by_number (n); - - if (!vca) { - return; - } - - if (!_selected) { - /* if this strip is not selected, add it before carrying out - changes to assignment. the user probably didn't notice - that they were clicking on an unselected track. - */ - _mixer.select_strip (*this); - } - - if (!menuitem->get_active()) { - _mixer.do_vca_unassign (vca); - } else { - _mixer.do_vca_assign (vca); - } -} - -void -MixerStrip::vca_assign (boost::shared_ptr vca) -{ - if (!vca || !_route) { - return; - } - - _route->assign (vca); -} - -void -MixerStrip::vca_unassign (boost::shared_ptr vca) -{ - if (!_route) { - return; - } - - _route->unassign (vca); -} - -bool -MixerStrip::vca_button_release (GdkEventButton* ev) -{ - using namespace Gtk::Menu_Helpers; - - if (!_session) { - return false; - } - - /* primary click only */ - - if (ev->button != 1) { - return false; - } - - if (!_route) { - /* no route - nothing to do */ - return false; - } - - VCAList vcas (_session->vca_manager().vcas()); - - if (vcas.empty()) { - /* the button should not have been visible under these conditions */ - return true; - } - - Menu* menu = new Menu; - MenuList& items = menu->items(); - - items.push_back (MenuElem (_("Unassign"), sigc::bind (sigc::mem_fun (_mixer, &Mixer_UI::do_vca_unassign), boost::shared_ptr()))); - - for (VCAList::iterator v = vcas.begin(); v != vcas.end(); ++v) { - items.push_back (CheckMenuElem ((*v)->name())); - Gtk::CheckMenuItem* item = dynamic_cast (&items.back()); - if (_route->slaved_to (*v)) { - item->set_active (true); - } - item->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &MixerStrip::vca_menu_toggle), item, (*v)->number())); - } - - menu->popup (1, ev->time); - - return true; -} - void MixerStrip::update_track_number_visibility () { @@ -2643,4 +2583,3 @@ MixerStrip::set_marked_for_display (bool yn) { return RouteUI::mark_hidden (!yn); } -