X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=90d2a2912af334746fe771cf31e0df33b3204b4e;hb=25eb9f406960aa8e36ccd90e2cd4397f372bd0fa;hp=7021e06b4e72843df91aa17908f3aab3e223b46e;hpb=bcac4f1c96c6c5d67a145c38d2cb56429f0040da;p=ardour.git diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 7021e06b4e..90d2a2912a 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -17,6 +17,7 @@ */ #include +#include #include #include @@ -33,27 +34,24 @@ #include #include -#include "ardour/ardour.h" -#include "ardour/amp.h" -#include "ardour/session.h" +#include "ardour/audio_track.h" #include "ardour/audioengine.h" #include "ardour/internal_send.h" -#include "ardour/route.h" -#include "ardour/route_group.h" -#include "ardour/audio_track.h" #include "ardour/midi_track.h" #include "ardour/pannable.h" #include "ardour/panner.h" #include "ardour/panner_shell.h" -#include "ardour/send.h" -#include "ardour/processor.h" +#include "ardour/port.h" #include "ardour/profile.h" -#include "ardour/ladspa_plugin.h" +#include "ardour/route.h" +#include "ardour/route_group.h" +#include "ardour/send.h" +#include "ardour/session.h" +#include "ardour/types.h" #include "ardour/user_bundle.h" -#include "ardour/port.h" #include "ardour_ui.h" -#include "ardour_dialog.h" +#include "ardour_window.h" #include "mixer_strip.h" #include "mixer_ui.h" #include "keyboard.h" @@ -73,8 +71,6 @@ using namespace Gtk; using namespace Gtkmm2ext; using namespace std; -sigc::signal > MixerStrip::SwitchIO; - int MixerStrip::scrollbar_height = 0; PBD::Signal1 MixerStrip::CatchDeletion; @@ -86,12 +82,13 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer) , processor_box (sess, boost::bind (&MixerStrip::plugin_selector, this), mx.selection(), this, in_mixer) , gpm (sess, 250) , panners (sess) + , button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL)) , button_table (3, 1) , rec_solo_table (2, 2) , top_button_table (1, 2) , middle_button_table (1, 2) , bottom_button_table (1, 2) - , meter_point_label (_("pre")) + , meter_point_button (_("pre")) , midi_input_enable_button (0) , _comment_button (_("Comments")) , _visibility (X_("mixer-strip-visibility")) @@ -112,13 +109,14 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr rt , RouteUI (sess) , _mixer(mx) , _mixer_owned (in_mixer) - , processor_box (sess, sigc::mem_fun(*this, &MixerStrip::plugin_selector), mx.selection(), this, in_mixer) + , processor_box (sess, boost::bind (&MixerStrip::plugin_selector, this), mx.selection(), this, in_mixer) , gpm (sess, 250) , panners (sess) + , button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL)) , button_table (3, 1) , middle_button_table (1, 2) , bottom_button_table (1, 2) - , meter_point_label (_("pre")) + , meter_point_button (_("pre")) , midi_input_enable_button (0) , _comment_button (_("Comments")) , _visibility (X_("mixer-strip-visibility")) @@ -144,36 +142,28 @@ MixerStrip::init () /* the length of this string determines the width of the mixer strip when it is set to `wide' */ longest_label = "longest label"; - Gtk::Image* img; - - img = manage (new Gtk::Image (::get_icon("strip_width"))); - img->show (); - - width_button.add (*img); - - img = manage (new Gtk::Image (::get_icon("hide"))); - img->show (); + string t = _("Click to toggle the width of this mixer strip."); + if (_mixer_owned) { + t += string_compose (_("\n%1-%2-click to toggle the width of all strips."), Keyboard::primary_modifier_name(), Keyboard::tertiary_modifier_name ()); + } + + width_button.set_image (::get_icon("strip_width")); + ARDOUR_UI::instance()->set_tip (width_button, t); - hide_button.add (*img); + hide_button.set_image(::get_icon("hide")); + ARDOUR_UI::instance()->set_tip (&hide_button, _("Hide this mixer strip")); - input_label.set_text (_("Input")); - ARDOUR_UI::instance()->set_tip (&input_button, _("Button 1 to choose inputs from a port matrix, button 3 to select inputs from a menu"), ""); - input_button.add (input_label); - input_button.set_name ("MixerIOButton"); - input_label.set_name ("MixerIOButtonLabel"); + input_button.set_text (_("Input")); + input_button.set_name ("mixer strip button"); + input_button.set_size_request (-1, 20); input_button_box.pack_start (input_button, true, true); - output_label.set_text (_("Output")); - ARDOUR_UI::instance()->set_tip (&output_button, _("Button 1 to choose outputs from a port matrix, button 3 to select inputs from a menu"), ""); - output_button.add (output_label); - output_button.set_name ("MixerIOButton"); - output_label.set_name ("MixerIOButtonLabel"); + output_button.set_text (_("Output")); + output_button.set_name ("mixer strip button"); Gtkmm2ext::set_size_request_to_display_given_text (output_button, longest_label.c_str(), 4, 4); - ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Select metering point"), ""); - meter_point_button.add (meter_point_label); - meter_point_button.set_name ("MixerStripMeterPreButton"); - meter_point_label.set_name ("MixerStripMeterPreButton"); + ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Click to select metering point"), ""); + meter_point_button.set_name ("mixer strip button"); /* TRANSLATORS: this string should be longest of the strings used to describe meter points. In english, it's "input". @@ -217,7 +207,7 @@ MixerStrip::init () top_button_table.attach (*monitor_disk_button, 1, 2, 0, 1); top_button_table.show (); - rec_solo_table.set_homogeneous (false); + rec_solo_table.set_homogeneous (true); rec_solo_table.set_row_spacings (2); rec_solo_table.set_col_spacings (2); rec_solo_table.attach (*solo_isolated_led, 1, 2, 0, 1); @@ -225,44 +215,60 @@ MixerStrip::init () rec_solo_table.show (); button_table.set_homogeneous (false); - button_table.set_spacings (0); + button_table.set_spacings (2); + + if (solo_isolated_led) { + button_size_group->add_widget (*solo_isolated_led); + } + if (solo_safe_led) { + button_size_group->add_widget (*solo_safe_led); + } + if (rec_enable_button) { + button_size_group->add_widget (*rec_enable_button); + } + if (monitor_disk_button) { + button_size_group->add_widget (*monitor_disk_button); + } + if (monitor_input_button) { + button_size_group->add_widget (*monitor_input_button); + } button_table.attach (name_button, 0, 1, 0, 1); button_table.attach (input_button_box, 0, 1, 1, 2); button_table.attach (_invert_button_box, 0, 1, 2, 3); middle_button_table.set_homogeneous (true); - middle_button_table.set_spacings (0); - middle_button_table.attach (*mute_button, 0, 1, 0, 1); - middle_button_table.attach (*solo_button, 1, 2, 0, 1); + middle_button_table.set_spacings (2); - bottom_button_table.set_col_spacings (0); + bottom_button_table.set_spacings (2); bottom_button_table.set_homogeneous (true); - bottom_button_table.attach (group_button, 0, 1, 0, 1); - - name_button.add (name_label); - name_button.set_name ("MixerNameButton"); +// bottom_button_table.attach (group_button, 0, 1, 0, 1); + bottom_button_table.attach (gpm.gain_automation_state_button, 0, 1, 0, 1); + + name_button.set_name ("mixer strip button"); + name_button.set_text (" "); /* non empty text, forces creation of the layout */ + name_button.set_text (""); /* back to empty */ + name_button.layout()->set_ellipsize (Pango::ELLIPSIZE_END); + name_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::name_button_resized)); Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2); + name_button.set_size_request (-1, 20); - name_label.set_name ("MixerNameButtonLabel"); ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), ""); - group_button.add (group_label); - group_button.set_name ("MixerGroupButton"); + group_button.set_name ("mixer strip button"); Gtkmm2ext::set_size_request_to_display_given_text (group_button, "Group", 2, 2); - group_label.set_name ("MixerGroupButtonLabel"); - _comment_button.set_name (X_("MixerCommentButton")); - _comment_button.signal_clicked().connect (sigc::mem_fun (*this, &MixerStrip::toggle_comment)); + _comment_button.set_name (X_("mixer strip button")); + _comment_button.signal_clicked.connect (sigc::mem_fun (*this, &MixerStrip::toggle_comment_editor)); global_vpacker.set_border_width (0); global_vpacker.set_spacing (0); - width_button.set_name ("MixerWidthButton"); - hide_button.set_name ("MixerHideButton"); - top_event_box.set_name ("MixerTopEventBox"); + width_button.set_name ("mixer strip button"); + hide_button.set_name ("mixer strip button"); + top_event_box.set_name ("mixer strip button"); - width_button.signal_clicked().connect (sigc::mem_fun(*this, &MixerStrip::width_clicked)); - hide_button.signal_clicked().connect (sigc::mem_fun(*this, &MixerStrip::hide_clicked)); + 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.pack_start (width_button, false, true); width_hide_box.pack_start (top_event_box, true, true); @@ -270,13 +276,14 @@ MixerStrip::init () whvbox.pack_start (width_hide_box, true, true); + global_vpacker.set_spacing (2); global_vpacker.pack_start (whvbox, Gtk::PACK_SHRINK); global_vpacker.pack_start (button_table, Gtk::PACK_SHRINK); global_vpacker.pack_start (processor_box, true, true); global_vpacker.pack_start (panners, Gtk::PACK_SHRINK); - global_vpacker.pack_start (top_button_table, Gtk::PACK_SHRINK, 2); - global_vpacker.pack_start (rec_solo_table, Gtk::PACK_SHRINK, 2); - global_vpacker.pack_start (middle_button_table, Gtk::PACK_SHRINK, 2); + global_vpacker.pack_start (top_button_table, Gtk::PACK_SHRINK); + global_vpacker.pack_start (rec_solo_table, Gtk::PACK_SHRINK); + global_vpacker.pack_start (middle_button_table, Gtk::PACK_SHRINK); global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK); global_vpacker.pack_start (bottom_button_table, Gtk::PACK_SHRINK); global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK); @@ -331,8 +338,6 @@ MixerStrip::init () set_flags (get_flags() | Gtk::CAN_FOCUS); - SwitchIO.connect (sigc::mem_fun (*this, &MixerStrip::switch_io)); - AudioEngine::instance()->PortConnectedOrDisconnected.connect ( *this, invalidator (*this), boost::bind (&MixerStrip::port_connected_or_disconnected, this, _1, _3), gui_context () ); @@ -342,15 +347,17 @@ MixerStrip::init () are recognised when they occur. */ _visibility.add (&_invert_button_box, X_("PhaseInvert"), _("Phase Invert")); - _visibility.add (solo_safe_led, X_("SoloSafe"), _("Solo Safe")); - _visibility.add (solo_isolated_led, X_("SoloIsolated"), _("Solo Isolated")); + _visibility.add (solo_safe_led, X_("SoloSafe"), _("Solo Safe"), true, boost::bind (&MixerStrip::override_solo_visibility, this)); + _visibility.add (solo_isolated_led, X_("SoloIsolated"), _("Solo Isolated"), true, boost::bind (&MixerStrip::override_solo_visibility, this)); _visibility.add (&_comment_button, X_("Comments"), _("Comments")); _visibility.add (&group_button, X_("Group"), _("Group")); _visibility.add (&meter_point_button, X_("MeterPoint"), _("Meter Point")); parameter_changed (X_("mixer-strip-visibility")); - Config->ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, ui_bind (&MixerStrip::parameter_changed, this, _1), gui_context()); + Config->ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, boost::bind (&MixerStrip::parameter_changed, this, _1), gui_context()); + + gpm.LevelMeterButtonPress.connect_same_thread (_level_meter_connection, boost::bind (&MixerStrip::level_meter_button_press, this, _1)); } MixerStrip::~MixerStrip () @@ -373,10 +380,13 @@ MixerStrip::set_route (boost::shared_ptr rt) rec_solo_table.remove (*show_sends_button); } - processor_box.set_route (rt); - RouteUI::set_route (rt); + /* ProcessorBox needs access to _route so that it can read + GUI object state. + */ + processor_box.set_route (rt); + /* map the current state */ mute_changed (0); @@ -390,10 +400,37 @@ MixerStrip::set_route (boost::shared_ptr rt) revert_to_default_display (); + /* unpack these from the parent and stuff them into our own + table + */ + + if (gpm.peak_display.get_parent()) { + gpm.peak_display.get_parent()->remove (gpm.peak_display); + } + if (gpm.gain_display.get_parent()) { + gpm.gain_display.get_parent()->remove (gpm.gain_display); + } + + middle_button_table.attach (gpm.gain_display,0,1,1,2); + middle_button_table.attach (gpm.peak_display,1,2,1,2); + + if (solo_button->get_parent()) { + middle_button_table.remove (*solo_button); + } + + if (mute_button->get_parent()) { + middle_button_table.remove (*mute_button); + } + if (route()->is_master()) { + middle_button_table.attach (*mute_button, 0, 2, 0, 1); solo_button->hide (); + mute_button->show (); rec_solo_table.hide (); } else { + middle_button_table.attach (*mute_button, 0, 1, 0, 1); + middle_button_table.attach (*solo_button, 1, 2, 0, 1); + mute_button->show (); solo_button->show (); rec_solo_table.show (); } @@ -421,10 +458,9 @@ MixerStrip::set_route (boost::shared_ptr rt) if (is_midi_track()) { if (midi_input_enable_button == 0) { - Image* img = manage (new Image (get_icon (X_("midi_socket_small")))); - midi_input_enable_button = manage (new StatefulToggleButton); - midi_input_enable_button->set_name ("MixerMidiInputEnableButton"); - midi_input_enable_button->set_image (*img); + midi_input_enable_button = manage (new ArdourButton); + midi_input_enable_button->set_name ("midi input button"); + midi_input_enable_button->set_image (::get_icon (X_("midi_socket_small"))); midi_input_enable_button->signal_button_press_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_press), false); midi_input_enable_button->signal_button_release_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_release), false); ARDOUR_UI::instance()->set_tip (midi_input_enable_button, _("Enable/Disable MIDI input")); @@ -449,12 +485,6 @@ MixerStrip::set_route (boost::shared_ptr rt) at->FreezeChange.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::map_frozen, this), gui_context()); } - if (has_audio_outputs ()) { - panners.show_all (); - } else { - panners.hide_all (); - } - if (is_track ()) { rec_solo_table.attach (*rec_enable_button, 0, 1, 0, 2); @@ -471,7 +501,7 @@ MixerStrip::set_route (boost::shared_ptr rt) } } - meter_point_label.set_text (meter_point_string (_route->meter_point())); + meter_point_button.set_text (meter_point_string (_route->meter_point())); delete route_ops_menu; route_ops_menu = 0; @@ -487,7 +517,8 @@ MixerStrip::set_route (boost::shared_ptr rt) audio_track()->DiskstreamChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::diskstream_changed, this), gui_context()); } - _route->comment_changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::comment_changed, this, _1), gui_context()); + _route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::comment_changed, this, _1), gui_context()); + _route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::property_changed, this, _1), gui_context()); set_stuff_from_route (); @@ -502,6 +533,12 @@ MixerStrip::set_route (boost::shared_ptr rt) connect_to_pan (); panners.setup_pan (); + if (has_audio_outputs ()) { + panners.show_all (); + } else { + panners.hide_all (); + } + update_diskstream_display (); update_input_display (); update_output_display (); @@ -515,6 +552,10 @@ MixerStrip::set_route (boost::shared_ptr rt) hide_button.show(); } + gpm.reset_peak_display (); + gpm.gain_display.show (); + gpm.peak_display.show (); + width_button.show(); width_hide_box.show(); whvbox.show (); @@ -524,20 +565,13 @@ MixerStrip::set_route (boost::shared_ptr rt) middle_button_table.show(); bottom_button_table.show(); gpm.show_all (); - gain_unit_button.show(); - gain_unit_label.show(); meter_point_button.show(); - meter_point_label.show(); - diskstream_button.show(); - diskstream_label.show(); input_button_box.show_all(); output_button.show(); - output_label.show(); - name_label.show(); name_button.show(); _comment_button.show(); group_button.show(); - group_label.show(); + gpm.gain_automation_state_button.show(); parameter_changed ("mixer-strip-visibility"); @@ -577,13 +611,15 @@ MixerStrip::set_width_enum (Width w, void* owner) switch (w) { case Wide: + if (show_sends_button) { - show_sends_button->set_text (_("Sends")); + show_sends_button->set_text (_("Aux\nSends")); + show_sends_button->layout()->set_alignment (Pango::ALIGN_CENTER); } - ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text ( + gpm.gain_automation_style_button.set_text ( gpm.astyle_string(gain_automation->automation_style())); - ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text ( + gpm.gain_automation_state_button.set_text ( gpm.astate_string(gain_automation->automation_state())); if (_route->panner()) { @@ -593,21 +629,20 @@ MixerStrip::set_width_enum (Width w, void* owner) panners.astate_string(_route->panner()->automation_state())); } - solo_isolated_led->set_text (_("iso")); - solo_safe_led->set_text (_("lock")); - Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2); + Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2); set_size_request (-1, -1); break; case Narrow: + if (show_sends_button) { show_sends_button->set_text (_("Snd")); } - ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text ( + gpm.gain_automation_style_button.set_text ( gpm.short_astyle_string(gain_automation->automation_style())); - ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text ( + gpm.gain_automation_state_button.set_text ( gpm.short_astate_string(gain_automation->automation_state())); if (_route->panner()) { @@ -616,11 +651,8 @@ MixerStrip::set_width_enum (Width w, void* owner) ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text ( panners.short_astate_string(_route->panner()->automation_state())); } - - solo_isolated_led->set_text (""); - solo_safe_led->set_text (""); - Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2); + Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2); set_size_request (max (50, gpm.get_gm_width()), -1); break; } @@ -678,7 +710,18 @@ MixerStrip::output_press (GdkEventButton *ev) output_menu_bundles.clear (); citems.push_back (MenuElem (_("Disconnect"), sigc::mem_fun (*(static_cast(this)), &RouteUI::disconnect_output))); + + for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { + citems.push_back ( + MenuElem ( + string_compose ("Add %1 port", (*i).to_i18n_string()), + sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_output_port), *i) + ) + ); + } + citems.push_back (SeparatorElem()); + uint32_t const n_with_separator = citems.size (); ARDOUR::BundleList current = _route->output()->bundles_connected (); @@ -705,7 +748,7 @@ MixerStrip::output_press (GdkEventButton *ev) maybe_add_bundle_to_output_menu ((*i)->input()->bundle(), current); } - if (citems.size() == 2) { + if (citems.size() == n_with_separator) { /* no routes added; remove the separator */ citems.pop_back (); } @@ -746,6 +789,8 @@ MixerStrip::edit_output_configuration () } else { output_selector->present (); } + + output_selector->set_keep_above (true); } void @@ -760,6 +805,8 @@ MixerStrip::edit_input_configuration () } else { input_selector->present (); } + + input_selector->set_keep_above (true); } gint @@ -789,7 +836,19 @@ MixerStrip::input_press (GdkEventButton *ev) case 3: { citems.push_back (MenuElem (_("Disconnect"), sigc::mem_fun (*(static_cast(this)), &RouteUI::disconnect_input))); + + for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { + citems.push_back ( + MenuElem ( + string_compose ("Add %1 port", (*i).to_i18n_string()), + sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_input_port), *i) + ) + ); + } + citems.push_back (SeparatorElem()); + uint32_t const n_with_separator = citems.size (); + input_menu_bundles.clear (); ARDOUR::BundleList current = _route->input()->bundles_connected (); @@ -817,7 +876,7 @@ MixerStrip::input_press (GdkEventButton *ev) maybe_add_bundle_to_input_menu ((*i)->output()->bundle(), current); } - if (citems.size() == 2) { + if (citems.size() == n_with_separator) { /* no routes added; remove the separator */ citems.pop_back (); } @@ -832,7 +891,7 @@ MixerStrip::input_press (GdkEventButton *ev) } void -MixerStrip::bundle_input_toggled (boost::shared_ptr c) +MixerStrip::bundle_input_chosen (boost::shared_ptr c) { if (ignore_toggle) { return; @@ -841,14 +900,14 @@ MixerStrip::bundle_input_toggled (boost::shared_ptr c) ARDOUR::BundleList current = _route->input()->bundles_connected (); if (std::find (current.begin(), current.end(), c) == current.end()) { - _route->input()->connect_ports_to_bundle (c, this); + _route->input()->connect_ports_to_bundle (c, true, this); } else { _route->input()->disconnect_ports_from_bundle (c, this); } } void -MixerStrip::bundle_output_toggled (boost::shared_ptr c) +MixerStrip::bundle_output_chosen (boost::shared_ptr c) { if (ignore_toggle) { return; @@ -857,18 +916,18 @@ MixerStrip::bundle_output_toggled (boost::shared_ptr c) ARDOUR::BundleList current = _route->output()->bundles_connected (); if (std::find (current.begin(), current.end(), c) == current.end()) { - _route->output()->connect_ports_to_bundle (c, this); + _route->output()->connect_ports_to_bundle (c, true, this); } else { _route->output()->disconnect_ports_from_bundle (c, this); } } void -MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr b, ARDOUR::BundleList const & current) +MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr b, ARDOUR::BundleList const& /*current*/) { using namespace Menu_Helpers; - if (b->ports_are_outputs() == false || b->nchannels() != _route->n_inputs()) { + if (b->ports_are_outputs() == false || b->nchannels() != _route->n_inputs() || *b == *_route->output()->bundle()) { return; } @@ -888,21 +947,15 @@ MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr b, ARDOUR: std::string n = b->name (); replace_all (n, "_", " "); - citems.push_back (CheckMenuElem (n, sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_input_toggled), b))); - - if (std::find (current.begin(), current.end(), b) != current.end()) { - ignore_toggle = true; - dynamic_cast (&citems.back())->set_active (true); - ignore_toggle = false; - } + citems.push_back (MenuElem (n, 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*/) { using namespace Menu_Helpers; - if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs()) { + if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs() || *b == *_route->input()->bundle()) { return; } @@ -922,13 +975,7 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr b, ARDOUR std::string n = b->name (); replace_all (n, "_", " "); - citems.push_back (CheckMenuElem (n, sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_output_toggled), b))); - - if (std::find (current.begin(), current.end(), b) != current.end()) { - ignore_toggle = true; - dynamic_cast (&citems.back())->set_active (true); - ignore_toggle = false; - } + citems.push_back (MenuElem (n, sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_output_chosen), b))); } void @@ -1037,14 +1084,15 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt ostringstream tooltip; char * tooltip_cstr; - tooltip << route->name(); - if (for_input) { io_count = route->n_inputs().n_total(); + tooltip << string_compose (_("INPUT to %1"), Glib::Markup::escape_text(route->name())); } else { io_count = route->n_outputs().n_total(); + tooltip << string_compose (_("OUTPUT from %1"), Glib::Markup::escape_text(route->name())); } + for (io_index = 0; io_index < io_count; ++io_index) { if (for_input) { port = route->input()->nth (io_index); @@ -1061,9 +1109,9 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt string& connection_name (*i); if (io_connection_count == 0) { - tooltip << endl << port->name().substr(port->name().find("/") + 1) << " -> " << connection_name; + tooltip << endl << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1)) << " -> " << Glib::Markup::escape_text(connection_name); } else { - tooltip << ", " << connection_name; + tooltip << ", " << Glib::Markup::escape_text(connection_name); } if (connection_name.find("ardour:") == 0) { @@ -1129,7 +1177,7 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt } if (each_io_has_one_connection) { - if ((total_connection_count == ardour_connection_count)) { + 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("/"); @@ -1163,7 +1211,7 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt switch (width) { case Wide: - label_string = label.str().substr(0, 6); + label_string = label.str().substr(0, 7); break; case Narrow: label_string = label.str().substr(0, 3); @@ -1171,9 +1219,9 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt } if (for_input) { - input_label.set_text (label_string); + input_button.set_text (label_string); } else { - output_label.set_text (label_string); + output_button.set_text (label_string); } } @@ -1182,6 +1230,13 @@ MixerStrip::update_input_display () { update_io_button (_route, _width, true); panners.setup_pan (); + + if (has_audio_outputs ()) { + panners.show_all (); + } else { + panners.hide_all (); + } + } void @@ -1190,6 +1245,12 @@ MixerStrip::update_output_display () update_io_button (_route, _width, false); gpm.setup_meters (); panners.setup_pan (); + + if (has_audio_outputs ()) { + panners.show_all (); + } else { + panners.hide_all (); + } } void @@ -1229,20 +1290,20 @@ MixerStrip::setup_comment_button () case Wide: if (_route->comment().empty ()) { _comment_button.unset_bg (STATE_NORMAL); - ((Gtk::Label *) _comment_button.get_child ())->set_text (_("Comments")); + _comment_button.set_text (_("Comments")); } else { _comment_button.modify_bg (STATE_NORMAL, color ()); - ((Gtk::Label *) _comment_button.get_child ())->set_text (_("*Comments*")); + _comment_button.set_text (_("*Comments*")); } break; case Narrow: if (_route->comment().empty ()) { _comment_button.unset_bg (STATE_NORMAL); - ((Gtk::Label *) _comment_button.get_child ())->set_text (_("Cmt")); + _comment_button.set_text (_("Cmt")); } else { _comment_button.modify_bg (STATE_NORMAL, color ()); - ((Gtk::Label *) _comment_button.get_child ())->set_text (_("*Cmt*")); + _comment_button.set_text (_("*Cmt*")); } break; } @@ -1265,19 +1326,24 @@ MixerStrip::comment_editor_done_editing () } void -MixerStrip::toggle_comment () +MixerStrip::toggle_comment_editor () { if (ignore_toggle) { return; } - if (comment_window == 0) { - setup_comment_editor (); + if (comment_window && comment_window->is_visible ()) { + comment_window->hide (); + } else { + open_comment_editor (); } +} - if (comment_window->is_visible ()) { - comment_window->hide (); - return; +void +MixerStrip::open_comment_editor () +{ + if (comment_window == 0) { + setup_comment_editor (); } string title; @@ -1291,7 +1357,7 @@ MixerStrip::toggle_comment () void MixerStrip::setup_comment_editor () { - comment_window = new ArdourDialog ("", false); // title will be reset to show route + comment_window = new ArdourWindow (""); // title will be reset to show route comment_window->set_position (Gtk::WIN_POS_MOUSE); comment_window->set_skip_taskbar_hint (true); comment_window->signal_hide().connect (sigc::mem_fun(*this, &MixerStrip::comment_editor_done_editing)); @@ -1304,8 +1370,7 @@ MixerStrip::setup_comment_editor () comment_area->get_buffer()->set_text (_route->comment()); comment_area->show (); - comment_window->get_vbox()->pack_start (*comment_area); - comment_window->get_action_area()->hide(); + comment_window->add (*comment_area); } void @@ -1357,14 +1422,14 @@ MixerStrip::route_group_changed () RouteGroup *rg = _route->route_group(); if (rg) { - group_label.set_text (PBD::short_version (rg->name(), 5)); + group_button.set_text (PBD::short_version (rg->name(), 5)); } else { switch (_width) { case Wide: - group_label.set_text (_("Grp")); + group_button.set_text (_("Grp")); break; case Narrow: - group_label.set_text (_("~G")); + group_button.set_text (_("~G")); break; } } @@ -1393,16 +1458,16 @@ MixerStrip::build_route_ops_menu () MenuList& items = route_ops_menu->items(); - items.push_back (CheckMenuElem (_("Comments..."), sigc::mem_fun (*this, &MixerStrip::toggle_comment))); - CheckMenuItem* i = dynamic_cast (&items.back ()); - i->set_active (comment_window && comment_window->is_visible ()); - items.push_back (MenuElem (_("Save As Template..."), sigc::mem_fun(*this, &RouteUI::save_as_template))); + items.push_back (MenuElem (_("Comments..."), sigc::mem_fun (*this, &MixerStrip::open_comment_editor))); + if (!_route->is_master()) { + 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(); items.push_back (SeparatorElem()); items.push_back (CheckMenuElem (_("Active"))); - i = dynamic_cast (&items.back()); + CheckMenuItem* i = dynamic_cast (&items.back()); i->set_active (_route->active()); i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::set_route_active), !_route->active(), false)); @@ -1427,15 +1492,16 @@ MixerStrip::build_route_ops_menu () gboolean MixerStrip::name_button_button_press (GdkEventButton* ev) { - if (ev->button == 3) { + /* show menu for either button 1 or 3, so as not to confuse people + and also not hide stuff from them. + */ + + if (ev->button == 3 || ev->button == 1) { list_route_operations (); /* do not allow rename if the track is record-enabled */ rename_menu_item->set_sensitive (!_route->record_enabled()); route_ops_menu->popup (1, ev->time); - - } else if (ev->button == 1) { - revert_to_default_display (); } return false; @@ -1462,30 +1528,66 @@ MixerStrip::set_selected (bool yn) global_frame.queue_draw (); } +void +MixerStrip::property_changed (const PropertyChange& what_changed) +{ + RouteUI::property_changed (what_changed); + + if (what_changed.contains (ARDOUR::Properties::name)) { + name_changed (); + } +} + void MixerStrip::name_changed () { switch (_width) { case Wide: - RouteUI::property_changed (PropertyChange (ARDOUR::Properties::name)); + name_button.set_text (_route->name()); break; case Narrow: - name_label.set_text (PBD::short_version (_route->name(), 5)); + name_button.set_text (PBD::short_version (_route->name(), 5)); break; } + + ARDOUR_UI::instance()->set_tip (name_button, _route->name()); } void -MixerStrip::width_clicked () +MixerStrip::name_button_resized (Gtk::Allocation& alloc) { - switch (_width) { - case Wide: - set_width_enum (Narrow, this); - break; - case Narrow: - set_width_enum (Wide, this); - break; + name_button.layout()->set_width (alloc.get_width() * PANGO_SCALE); +} + +bool +MixerStrip::width_button_pressed (GdkEventButton* ev) +{ + if (ev->button != 1) { + return false; } + + if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier)) && _mixer_owned) { + switch (_width) { + case Wide: + _mixer.set_strip_width (Narrow); + break; + + case Narrow: + _mixer.set_strip_width (Wide); + break; + } + } else { + switch (_width) { + case Wide: + set_width_enum (Narrow, this); + break; + case Narrow: + set_width_enum (Wide, this); + break; + } + } + + return true; } void @@ -1594,11 +1696,6 @@ MixerStrip::reset_strip_style () } } -RouteGroup* -MixerStrip::route_group() const -{ - return _route->route_group(); -} void MixerStrip::engine_stopped () @@ -1613,70 +1710,86 @@ MixerStrip::engine_running () string MixerStrip::meter_point_string (MeterPoint mp) { - switch (mp) { - case MeterInput: - return _("in"); - break; - - case MeterPreFader: - return _("pre"); - break; - - case MeterPostFader: - return _("post"); - break; - - case MeterOutput: - return _("out"); + switch (_width) { + case Wide: + switch (mp) { + case MeterInput: + return _("in"); + break; + + case MeterPreFader: + return _("pre"); + break; + + case MeterPostFader: + return _("post"); + break; + + case MeterOutput: + return _("out"); + break; + + case MeterCustom: + default: + return _("custom"); + break; + } break; - - case MeterCustom: - default: - return _("custom"); + case Narrow: + switch (mp) { + case MeterInput: + return _("in"); + break; + + case MeterPreFader: + return _("pr"); + break; + + case MeterPostFader: + return _("po"); + break; + + case MeterOutput: + return _("o"); + break; + + case MeterCustom: + default: + return _("c"); + break; + } break; } + + return string(); } /** Called when the metering point has changed */ void MixerStrip::meter_changed () { - meter_point_label.set_text (meter_point_string (_route->meter_point())); + meter_point_button.set_text (meter_point_string (_route->meter_point())); gpm.setup_meters (); // reset peak when meter point changes gpm.reset_peak_display(); } +/** The bus that we are displaying sends to has changed, or been turned off. + * @param send_to New bus that we are displaying sends to, or 0. + */ void -MixerStrip::switch_io (boost::shared_ptr target) +MixerStrip::bus_send_display_changed (boost::shared_ptr send_to) { - /* don't respond to switch IO signal outside of the mixer window */ + RouteUI::bus_send_display_changed (send_to); - if (!_mixer_owned) { - return; - } + if (send_to) { + boost::shared_ptr send = _route->internal_send_for (send_to); - if (_route == target || _route->is_master()) { - /* don't change the display for the target or the master bus */ - return; - } else if (!is_track() && show_sends_button) { - /* make sure our show sends button is inactive, and we no longer blink, - since we're not the target. - */ - send_blink_connection.disconnect (); - show_sends_button->unset_active_state (); - } - - if (!target) { - /* switch back to default */ - revert_to_default_display (); - return; - } - - boost::shared_ptr send = _route->internal_send_for (target); - - if (send) { - show_send (send); + if (send) { + show_send (send); + } else { + revert_to_default_display (); + } } else { revert_to_default_display (); } @@ -1687,7 +1800,7 @@ MixerStrip::drop_send () { boost::shared_ptr current_send; - if (_current_delivery && (current_send = boost::dynamic_pointer_cast(_current_delivery))) { + if (_current_delivery && ((current_send = boost::dynamic_pointer_cast(_current_delivery)) != 0)) { current_send->set_metering (false); } @@ -1732,6 +1845,14 @@ MixerStrip::show_send (boost::shared_ptr send) panner_ui().set_panner (_current_delivery->panner_shell(), _current_delivery->panner()); panner_ui().setup_pan (); + /* make sure the send has audio output */ + + if (_current_delivery->output() && _current_delivery->output()->n_ports().n_audio() > 0) { + panners.show_all (); + } else { + panners.hide_all (); + } + input_button.set_sensitive (false); group_button.set_sensitive (false); set_invert_sensitive (false); @@ -1755,10 +1876,6 @@ MixerStrip::show_send (boost::shared_ptr send) void MixerStrip::revert_to_default_display () { - if (show_sends_button) { - show_sends_button->unset_active_state (); - } - drop_send (); set_current_delivery (_route->main_outs ()); @@ -1769,6 +1886,12 @@ MixerStrip::revert_to_default_display () panner_ui().set_panner (_route->main_outs()->panner_shell(), _route->main_outs()->panner()); panner_ui().setup_pan (); + if (has_audio_outputs ()) { + panners.show_all (); + } else { + panners.hide_all (); + } + reset_strip_style (); } @@ -1803,6 +1926,8 @@ MixerStrip::set_button_names () } } } + solo_isolated_led->set_text (_("iso")); + solo_safe_led->set_text (_("lock")); break; default: @@ -1832,121 +1957,16 @@ MixerStrip::set_button_names () } } } + solo_isolated_led->set_text (_("i")); + solo_safe_led->set_text (_("L")); break; - } -} - -bool -MixerStrip::on_key_press_event (GdkEventKey* ev) -{ - GdkEventButton fake; - fake.type = GDK_BUTTON_PRESS; - fake.button = 1; - fake.state = ev->state; - - switch (ev->keyval) { - case GDK_m: - mute_press (&fake); - return true; - break; - - case GDK_s: - solo_press (&fake); - return true; - break; - - case GDK_r: - rec_enable_press (&fake); - return true; - break; - - case GDK_e: - show_sends_press (&fake); - return true; - break; - - case GDK_g: - if (ev->state & Keyboard::PrimaryModifier) { - step_gain_down (); - } else { - step_gain_up (); - } - return true; - break; - - case GDK_0: - if (_route) { - _route->set_gain (1.0, this); - } - return true; - - default: - break; - } - - return false; -} - - -bool -MixerStrip::on_key_release_event (GdkEventKey* ev) -{ - GdkEventButton fake; - fake.type = GDK_BUTTON_RELEASE; - fake.button = 1; - fake.state = ev->state; - - switch (ev->keyval) { - case GDK_m: - mute_release (&fake); - return true; - break; - - case GDK_s: - solo_release (&fake); - return true; - break; - - case GDK_r: - rec_enable_release (&fake); - return true; - break; - - case GDK_e: - show_sends_release (&fake); - return true; - break; - - case GDK_g: - return true; - break; - - default: - break; - } - - return false; -} - -bool -MixerStrip::on_enter_notify_event (GdkEventCrossing*) -{ - Keyboard::magic_widget_grab_focus (); - return false; -} -bool -MixerStrip::on_leave_notify_event (GdkEventCrossing* ev) -{ - switch (ev->detail) { - case GDK_NOTIFY_INFERIOR: - break; - default: - Keyboard::magic_widget_drop_focus (); + if (_route) { + meter_point_button.set_text (meter_point_string (_route->meter_point())); + } else { + meter_point_button.set_text (""); } - - return false; } PluginSelector* @@ -1977,22 +1997,12 @@ MixerStrip::input_active_button_release (GdkEventButton* ev) return true; } - if (mt->input_active()) { - if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) { - /* turn all other tracks using this input off */ - _session->set_exclusive_input_active (mt, false); - } else { - mt->set_input_active (false); - } + boost::shared_ptr rl (new RouteList); - } else { - if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) { - /* turn all other tracks using this input on */ - _session->set_exclusive_input_active (mt, true); - } else { - mt->set_input_active (true); - } - } + rl->push_back (route()); + + _session->set_exclusive_input_active (rl, !mt->input_active(), + Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))); return true; } @@ -2023,3 +2033,124 @@ MixerStrip::parameter_changed (string p) _visibility.set_state (Config->get_mixer_strip_visibility ()); } } + +/** Called to decide whether the solo isolate / solo lock button visibility should + * be overridden from that configured by the user. We do this for the master bus. + * + * @return optional value that is present if visibility state should be overridden. + */ +boost::optional +MixerStrip::override_solo_visibility () const +{ + if (_route && _route->is_master ()) { + return boost::optional (false); + } + + return boost::optional (); +} + +void +MixerStrip::add_input_port (DataType t) +{ + _route->input()->add_port ("", this, t); +} + +void +MixerStrip::add_output_port (DataType t) +{ + _route->output()->add_port ("", this, t); +} + +void +MixerStrip::route_active_changed () +{ + reset_strip_style (); +} + +void +MixerStrip::copy_processors () +{ + processor_box.processor_operation (ProcessorBox::ProcessorsCopy); +} + +void +MixerStrip::cut_processors () +{ + processor_box.processor_operation (ProcessorBox::ProcessorsCut); +} + +void +MixerStrip::paste_processors () +{ + processor_box.processor_operation (ProcessorBox::ProcessorsPaste); +} + +void +MixerStrip::select_all_processors () +{ + processor_box.processor_operation (ProcessorBox::ProcessorsSelectAll); +} + +void +MixerStrip::delete_processors () +{ + processor_box.processor_operation (ProcessorBox::ProcessorsDelete); +} + +void +MixerStrip::toggle_processors () +{ + processor_box.processor_operation (ProcessorBox::ProcessorsToggleActive); +} + +void +MixerStrip::ab_plugins () +{ + processor_box.processor_operation (ProcessorBox::ProcessorsAB); +} + +bool +MixerStrip::level_meter_button_press (GdkEventButton* ev) +{ + if (ev->button == 3) { + popup_level_meter_menu (ev); + return true; + } + + return false; +} + +void +MixerStrip::popup_level_meter_menu (GdkEventButton* ev) +{ + using namespace Gtk::Menu_Helpers; + + Gtk::Menu* m = manage (new Menu); + MenuList& items = m->items (); + + RadioMenuItem::Group group; + + add_level_meter_item (items, group, _("Input"), MeterInput); + add_level_meter_item (items, group, _("Pre-fader"), MeterPreFader); + add_level_meter_item (items, group, _("Post-fader"), MeterPostFader); + add_level_meter_item (items, group, _("Output"), MeterOutput); + add_level_meter_item (items, group, _("Custom"), MeterCustom); + + m->popup (ev->button, ev->time); +} + +void +MixerStrip::add_level_meter_item (Menu_Helpers::MenuList& items, RadioMenuItem::Group& group, string const & name, MeterPoint point) +{ + using namespace Menu_Helpers; + + items.push_back (RadioMenuElem (group, name, sigc::bind (sigc::mem_fun (*this, &MixerStrip::set_meter_point), point))); + RadioMenuItem* i = dynamic_cast (&items.back ()); + i->set_active (_route->meter_point() == point); +} + +void +MixerStrip::set_meter_point (MeterPoint p) +{ + _route->set_meter_point (p); +}