X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=48f44cadf4ba4acb9a3184cac7f27c2b8fc97282;hb=c546ad359a1edb9cc2c2383cac00d49648b97268;hp=1ec93aa9b6a01405f5a40f0a8cafdd35522dc99d;hpb=dbb0b9ca4f82ea8e3829cfeb009b9746c3d6f0dc;p=ardour.git diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 1ec93aa9b6..48f44cadf4 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -37,22 +36,24 @@ #include "ardour/amp.h" #include "ardour/session.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/audio_diskstream.h" #include "ardour/panner.h" #include "ardour/send.h" #include "ardour/processor.h" #include "ardour/profile.h" #include "ardour/ladspa_plugin.h" #include "ardour/user_bundle.h" +#include "ardour/port.h" #include "ardour_ui.h" #include "ardour_dialog.h" #include "mixer_strip.h" #include "mixer_ui.h" #include "keyboard.h" +#include "led.h" #include "public_editor.h" #include "send_ui.h" #include "io_selector.h" @@ -62,7 +63,6 @@ #include "i18n.h" -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -72,17 +72,19 @@ using namespace std; sigc::signal > MixerStrip::SwitchIO; int MixerStrip::scrollbar_height = 0; +PBD::Signal1 MixerStrip::CatchDeletion; -MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, bool in_mixer) +MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer) : AxisView(sess) , RouteUI (sess) - ,_mixer(mx) + , _mixer(mx) , _mixer_owned (in_mixer) - , processor_box (sess, sigc::mem_fun(*this, &MixerStrip::plugin_selector), mx.selection(), this, in_mixer) - , gpm (sess) + , processor_box (sess, boost::bind (&MixerStrip::plugin_selector, this), mx.selection(), this, in_mixer) + , gpm (sess, 250) , panners (sess) , _mono_button (_("Mono")) - , button_table (3, 2) + , button_table (4, 2) + , solo_led_table (2, 2) , middle_button_table (1, 2) , bottom_button_table (1, 2) , meter_point_label (_("pre")) @@ -99,13 +101,13 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, bool in_mixer) } } -MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr rt, bool in_mixer) +MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr rt, bool in_mixer) : AxisView(sess) , RouteUI (sess) - ,_mixer(mx) + , _mixer(mx) , _mixer_owned (in_mixer) , processor_box (sess, sigc::mem_fun(*this, &MixerStrip::plugin_selector), mx.selection(), this, in_mixer) - , gpm (sess) + , gpm (sess, 250) , panners (sess) , button_table (3, 2) , middle_button_table (1, 2) @@ -114,7 +116,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr rt , comment_button (_("Comments")) { init (); - set_button_names (); set_route (rt); } @@ -133,6 +134,9 @@ MixerStrip::init () _width_owner = 0; spacer = 0; + /* the length of this string determines the width of the mixer strip when it is set to `wide' */ + longest_label = "longest label"; + Gtk::Image* img; img = manage (new Gtk::Image (::get_icon("strip_width"))); @@ -150,14 +154,15 @@ MixerStrip::init () input_button.add (input_label); input_button.set_name ("MixerIOButton"); input_label.set_name ("MixerIOButtonLabel"); - Gtkmm2ext::set_size_request_to_display_given_text (input_button, "longest label", 4, 4); + + Gtkmm2ext::set_size_request_to_display_given_text (input_button, longest_label.c_str(), 4, 4); 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"); - Gtkmm2ext::set_size_request_to_display_given_text (output_button, "longest label", 4, 4); + 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); @@ -171,24 +176,64 @@ MixerStrip::init () bottom_button_table.attach (meter_point_button, 1, 2, 0, 1); - meter_point_button.signal_button_press_event().connect (mem_fun (gpm, &GainMeter::meter_press), false); - meter_point_button.signal_button_release_event().connect (mem_fun (gpm, &GainMeter::meter_release), false); + meter_point_button.signal_button_press_event().connect (sigc::mem_fun (gpm, &GainMeter::meter_press), false); + meter_point_button.signal_button_release_event().connect (sigc::mem_fun (gpm, &GainMeter::meter_release), false); hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); mute_button->set_name ("MixerMuteButton"); solo_button->set_name ("MixerSoloButton"); + invert_button->set_name ("MixerInvertButton"); + + solo_isolated_led = manage (new LED); + solo_isolated_led->show (); + solo_isolated_led->set_diameter (6); + solo_isolated_led->set_no_show_all (true); + solo_isolated_led->set_name (X_("SoloIsolatedLED")); + solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); + solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release)); + UI::instance()->set_tip (solo_isolated_led, _("Isolate Solo"), ""); + + solo_safe_led = manage (new LED); + solo_safe_led->show (); + solo_safe_led->set_diameter (6); + solo_safe_led->set_no_show_all (true); + solo_safe_led->set_name (X_("SoloSafeLED")); + solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); + solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release)); + UI::instance()->set_tip (solo_safe_led, _("Lock Solo Status"), ""); + + Label* iso_label = manage (new Label (_("iso"))); + Label* safe_label = manage (new Label (_("lock"))); + + iso_label->set_name (X_("SoloLEDLabel")); + safe_label->set_name (X_("SoloLEDLabel")); + + iso_label->show (); + safe_label->show (); + + solo_led_table.set_spacings (0); + solo_led_table.set_border_width (1); + solo_led_table.attach (*iso_label, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL); + solo_led_table.attach (*solo_isolated_led, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL); + solo_led_table.attach (*safe_label, 0, 1, 1, 2, Gtk::FILL, Gtk::FILL); + solo_led_table.attach (*solo_safe_led, 1, 2, 1, 2, Gtk::FILL, Gtk::FILL); + + solo_led_table.show (); + solo_led_box.pack_end (solo_led_table, false, false); + solo_led_box.show (); button_table.set_homogeneous (true); button_table.set_spacings (0); button_table.attach (name_button, 0, 2, 0, 1); button_table.attach (input_button, 0, 2, 1, 2); + button_table.attach (*invert_button, 0, 2, 3, 4); 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.attach (*solo_button, 1, 2, 0, 1); bottom_button_table.set_col_spacings (0); bottom_button_table.set_homogeneous (true); @@ -196,17 +241,18 @@ MixerStrip::init () name_button.add (name_label); name_button.set_name ("MixerNameButton"); - Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2); + Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2); name_label.set_name ("MixerNameButtonLabel"); ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), ""); group_button.add (group_label); group_button.set_name ("MixerGroupButton"); + Gtkmm2ext::set_size_request_to_display_given_text (group_button, "Group", 2, 2); group_label.set_name ("MixerGroupButtonLabel"); comment_button.set_name ("MixerCommentButton"); - comment_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::comment_button_clicked)); + comment_button.signal_clicked().connect (sigc::mem_fun(*this, &MixerStrip::comment_button_clicked)); global_vpacker.set_border_width (0); global_vpacker.set_spacing (0); @@ -215,8 +261,8 @@ MixerStrip::init () hide_button.set_name ("MixerHideButton"); top_event_box.set_name ("MixerTopEventBox"); - width_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::width_clicked)); - hide_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::hide_clicked)); + 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_hide_box.pack_start (width_button, false, true); width_hide_box.pack_start (top_event_box, true, true); @@ -229,6 +275,7 @@ MixerStrip::init () 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 (solo_led_box,Gtk::PACK_SHRINK); global_vpacker.pack_start (middle_button_table,Gtk::PACK_SHRINK); global_vpacker.pack_start (gain_meter_alignment,Gtk::PACK_SHRINK); global_vpacker.pack_start (bottom_button_table,Gtk::PACK_SHRINK); @@ -253,32 +300,22 @@ MixerStrip::init () _packed = false; _embedded = false; - _session.engine().Stopped.connect (mem_fun(*this, &MixerStrip::engine_stopped)); - _session.engine().Running.connect (mem_fun(*this, &MixerStrip::engine_running)); - - input_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::input_press), false); - output_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::output_press), false); + _session->engine().Stopped.connect (*this, invalidator (*this), boost::bind (&MixerStrip::engine_stopped, this), gui_context()); + _session->engine().Running.connect (*this, invalidator (*this), boost::bind (&MixerStrip::engine_running, this), gui_context()); - solo_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::solo_press), false); - solo_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::solo_release), false); - mute_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::mute_press), false); - mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release), false); + input_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::input_press), false); + output_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::output_press), false); /* we don't need this if its not an audio track, but we don't know that yet and it doesn't hurt (much). */ rec_enable_button->set_name ("MixerRecordEnableButton"); - rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press), false); - rec_enable_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::rec_enable_release)); /* ditto for this button and busses */ - show_sends_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::show_sends_press), false); - show_sends_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::show_sends_release)); - - name_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::name_button_button_press), false); - group_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::select_route_group), false); + name_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_press), false); + group_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::select_route_group), false); _width = (Width) -1; @@ -303,12 +340,12 @@ MixerStrip::init () set_flags (get_flags() | Gtk::CAN_FOCUS); - SwitchIO.connect (mem_fun (*this, &MixerStrip::switch_io)); + SwitchIO.connect (sigc::mem_fun (*this, &MixerStrip::switch_io)); } MixerStrip::~MixerStrip () { - GoingAway(); /* EMIT_SIGNAL */ + CatchDeletion (this); delete input_selector; delete output_selector; @@ -328,29 +365,34 @@ MixerStrip::set_route (boost::shared_ptr rt) RouteUI::set_route (rt); + /* map the current state */ + + mute_changed (0); + update_solo_display (); + delete input_selector; input_selector = 0; delete output_selector; output_selector = 0; - boost::shared_ptr send; + revert_to_default_display (); - if (_current_delivery && (send = boost::dynamic_pointer_cast(_current_delivery))) { - send->set_metering (false); - } - - _current_delivery = _route->main_outs (); - - panners.set_panner (rt->main_outs()->panner()); - gpm.set_controls (rt, rt->shared_peak_meter(), rt->amp()); processor_box.set_route (rt); if (set_color_from_route()) { set_color (unique_random_color()); } - if (_mixer_owned && (route()->is_master() || route()->is_control())) { + if (route()->is_master()) { + solo_button->hide (); + solo_led_box.hide (); + } else { + solo_button->show (); + solo_led_box.show (); + } + + if (_mixer_owned && (route()->is_master() || route()->is_monitor())) { if (scrollbar_height == 0) { HScrollbar scrollbar; @@ -364,16 +406,18 @@ MixerStrip::set_route (boost::shared_ptr rt) } if (is_audio_track()) { - boost::shared_ptr at = audio_track(); + at->FreezeChange.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::map_frozen, this), gui_context()); + } - connections.push_back (at->FreezeChange.connect (mem_fun(*this, &MixerStrip::map_frozen))); - + if (is_track ()) { + button_table.attach (*rec_enable_button, 0, 2, 2, 3); - rec_enable_button->set_sensitive (_session.writable()); + rec_enable_button->set_sensitive (_session->writable()); rec_enable_button->show(); - } else if (!is_track()) { + } else { + /* non-master bus */ if (!_route->is_master()) { @@ -382,14 +426,10 @@ MixerStrip::set_route (boost::shared_ptr rt) } } - if (_route->phase_invert()) { - name_label.set_text (X_("Ø ") + name_label.get_text()); - } else { - name_label.set_text (_route->name()); - } + invert_button->set_active (_route->phase_invert ()); _mono_button.set_name ("MixerMonoButton"); - _mono_button.signal_clicked().connect (mem_fun (*this, &MixerStrip::mono_button_clicked)); + _mono_button.signal_clicked().connect (sigc::mem_fun (*this, &MixerStrip::mono_button_clicked)); switch (_route->meter_point()) { case MeterInput: @@ -403,51 +443,44 @@ MixerStrip::set_route (boost::shared_ptr rt) case MeterPostFader: meter_point_label.set_text (_("post")); break; + + case MeterCustom: + meter_point_label.set_text (_("custom")); + break; } delete route_ops_menu; route_ops_menu = 0; - ARDOUR_UI::instance()->tooltips().set_tip (comment_button, _route->comment().empty() ? + ARDOUR_UI::instance()->set_tip (comment_button, _route->comment().empty() ? _("Click to Add/Edit Comments"): _route->comment()); - connections.push_back (_route->meter_change.connect ( - mem_fun(*this, &MixerStrip::meter_changed))); - connections.push_back (_route->input()->changed.connect ( - mem_fun(*this, &MixerStrip::input_changed))); - connections.push_back (_route->output()->changed.connect ( - mem_fun(*this, &MixerStrip::output_changed))); - connections.push_back (_route->route_group_changed.connect ( - mem_fun(*this, &MixerStrip::route_group_changed))); + _route->meter_change.connect (route_connections, invalidator (*this), bind (&MixerStrip::meter_changed, this), gui_context()); + _route->input()->changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::input_changed, this, _1, _2), gui_context()); + _route->output()->changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::output_changed, this, _1, _2), gui_context()); + _route->route_group_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::route_group_changed, this), gui_context()); if (_route->panner()) { - connections.push_back (_route->panner()->Changed.connect ( - mem_fun(*this, &MixerStrip::connect_to_pan))); + _route->panner()->Changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::connect_to_pan, this), gui_context()); } if (is_audio_track()) { - connections.push_back (audio_track()->DiskstreamChanged.connect ( - mem_fun(*this, &MixerStrip::diskstream_changed))); + audio_track()->DiskstreamChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::diskstream_changed, this), gui_context()); } - connections.push_back (_route->NameChanged.connect ( - mem_fun(*this, &RouteUI::name_changed))); - connections.push_back (_route->comment_changed.connect ( - mem_fun(*this, &MixerStrip::comment_changed))); - connections.push_back (_route->gui_changed.connect ( - mem_fun(*this, &MixerStrip::route_gui_changed))); + _route->comment_changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::comment_changed, this, _1), gui_context()); + _route->gui_changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::route_gui_changed, this, _1, _2), gui_context()); set_stuff_from_route (); /* now force an update of all the various elements */ - processor_box.update(); mute_changed (0); - solo_changed (0); + update_solo_display (); name_changed (); comment_changed (0); - route_group_changed (0); + route_group_changed (); connect_to_pan (); @@ -461,7 +494,7 @@ MixerStrip::set_route (boost::shared_ptr rt) processor_box.show(); - if (!route()->is_master() && !route()->is_control()) { + if (!route()->is_master() && !route()->is_monitor()) { /* we don't allow master or control routes to be hidden */ hide_button.show(); } @@ -529,7 +562,6 @@ MixerStrip::set_width_enum (Width w, void* owner) gpm.set_width (w); panners.set_width (w); - processor_box.set_width (w); boost::shared_ptr gain_automation = _route->gain_control()->alist(); @@ -600,13 +632,16 @@ MixerStrip::set_width_enum (Width w, void* owner) panners.short_astate_string(_route->panner()->automation_state())); } - Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2); + Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2); set_size_request (max (50, gpm.get_gm_width()), -1); break; } + + processor_box.set_width (w); + update_input_display (); update_output_display (); - route_group_changed (0); + route_group_changed (); name_changed (); WidthChanged (); } @@ -630,7 +665,7 @@ gint MixerStrip::output_press (GdkEventButton *ev) { using namespace Menu_Helpers; - if (!_session.engine().connected()) { + if (!_session->engine().connected()) { MessageDialog msg (_("Not connected to JACK - no I/O changes are possible")); msg.run (); return true; @@ -649,12 +684,12 @@ MixerStrip::output_press (GdkEventButton *ev) citems.clear (); output_menu_bundles.clear (); - citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast(this)), &RouteUI::disconnect_output))); + citems.push_back (MenuElem (_("Disconnect"), sigc::mem_fun (*(static_cast(this)), &RouteUI::disconnect_output))); citems.push_back (SeparatorElem()); ARDOUR::BundleList current = _route->output()->bundles_connected (); - boost::shared_ptr b = _session.bundles (); + boost::shared_ptr b = _session->bundles (); /* give user bundles first chance at being in the menu */ @@ -670,7 +705,7 @@ MixerStrip::output_press (GdkEventButton *ev) } } - boost::shared_ptr routes = _session.get_routes (); + boost::shared_ptr routes = _session->get_routes (); for (ARDOUR::RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) { maybe_add_bundle_to_output_menu ((*i)->input()->bundle(), current); } @@ -694,7 +729,21 @@ void MixerStrip::edit_output_configuration () { if (output_selector == 0) { - output_selector = new IOSelectorWindow (_session, _route->output()); + + boost::shared_ptr send; + boost::shared_ptr output; + + if ((send = boost::dynamic_pointer_cast(_current_delivery)) != 0) { + if (!boost::dynamic_pointer_cast(send)) { + output = send->output(); + } else { + output = _route->output (); + } + } else { + output = _route->output (); + } + + output_selector = new IOSelectorWindow (_session, output); } if (output_selector->is_visible()) { @@ -727,7 +776,7 @@ MixerStrip::input_press (GdkEventButton *ev) input_menu.set_name ("ArdourContextMenu"); citems.clear(); - if (!_session.engine().connected()) { + if (!_session->engine().connected()) { MessageDialog msg (_("Not connected to JACK - no I/O changes are possible")); msg.run (); return true; @@ -741,13 +790,13 @@ MixerStrip::input_press (GdkEventButton *ev) case 3: { - citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast(this)), &RouteUI::disconnect_input))); + citems.push_back (MenuElem (_("Disconnect"), sigc::mem_fun (*(static_cast(this)), &RouteUI::disconnect_input))); citems.push_back (SeparatorElem()); input_menu_bundles.clear (); ARDOUR::BundleList current = _route->input()->bundles_connected (); - boost::shared_ptr b = _session.bundles (); + boost::shared_ptr b = _session->bundles (); /* give user bundles first chance at being in the menu */ @@ -763,7 +812,7 @@ MixerStrip::input_press (GdkEventButton *ev) } } - boost::shared_ptr routes = _session.get_routes (); + boost::shared_ptr routes = _session->get_routes (); for (ARDOUR::RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) { maybe_add_bundle_to_input_menu ((*i)->output()->bundle(), current); } @@ -819,10 +868,7 @@ MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr b, ARDOUR: { using namespace Menu_Helpers; - if (b->ports_are_outputs() == false || - route()->input()->default_type() != b->type() || - b->nchannels() != _route->n_inputs().get (b->type ())) { - + if (b->ports_are_outputs() == false || b->nchannels() != _route->n_inputs()) { return; } @@ -842,7 +888,7 @@ 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, bind (mem_fun(*this, &MixerStrip::bundle_input_toggled), b))); + 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; @@ -856,10 +902,7 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr b, ARDOUR { using namespace Menu_Helpers; - if (b->ports_are_inputs() == false || - route()->output()->default_type() != b->type() || - b->nchannels() != _route->n_outputs().get (b->type ())) { - + if (b->ports_are_inputs() == false || b->nchannels() != _route->n_outputs()) { return; } @@ -879,7 +922,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, bind (mem_fun(*this, &MixerStrip::bundle_output_toggled), b))); + 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; @@ -908,7 +951,7 @@ MixerStrip::update_diskstream_display () void MixerStrip::connect_to_pan () { - ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::connect_to_pan)); + ENSURE_GUI_THREAD (*this, &MixerStrip::connect_to_pan) panstate_connection.disconnect (); panstyle_connection.disconnect (); @@ -919,11 +962,11 @@ MixerStrip::connect_to_pan () boost::shared_ptr pan_control = boost::dynamic_pointer_cast( - _route->panner()->data().control(Evoral::Parameter(PanAutomation))); + _route->panner()->control(Evoral::Parameter(PanAutomation))); if (pan_control) { - panstate_connection = pan_control->alist()->automation_state_changed.connect (mem_fun(panners, &PannerUI::pan_automation_state_changed)); - panstyle_connection = pan_control->alist()->automation_style_changed.connect (mem_fun(panners, &PannerUI::pan_automation_style_changed)); + pan_control->alist()->automation_state_changed.connect (panstate_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_state_changed, &panners), gui_context()); + pan_control->alist()->automation_style_changed.connect (panstyle_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_style_changed, &panners), gui_context()); } panners.pan_changed (this); @@ -975,7 +1018,7 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt uint32_t io_count; uint32_t io_index; Port *port; - vector connections; + vector port_connections; uint32_t total_connection_count = 0; uint32_t io_connection_count = 0; @@ -1013,13 +1056,13 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt } else { port = route->output()->nth (io_index); } - - connections.clear (); - port->get_connections(connections); + + port_connections.clear (); + port->get_connections(port_connections); io_connection_count = 0; - if (!connections.empty()) { - for (vector::iterator i = connections.begin(); i != connections.end(); ++i) { + if (!port_connections.empty()) { + for (vector::iterator i = port_connections.begin(); i != port_connections.end(); ++i) { string& connection_name (*i); if (io_connection_count == 0) { @@ -1166,20 +1209,20 @@ MixerStrip::fast_update () void MixerStrip::diskstream_changed () { - Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_diskstream_display)); + Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&MixerStrip::update_diskstream_display, this)); } void MixerStrip::input_changed (IOChange /*change*/, void */*src*/) { - Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_input_display)); + Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&MixerStrip::update_input_display, this)); set_width_enum (_width, this); } void MixerStrip::output_changed (IOChange /*change*/, void */*src*/) { - Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_output_display)); + Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&MixerStrip::update_output_display, this)); set_width_enum (_width, this); } @@ -1214,7 +1257,7 @@ MixerStrip::comment_editor_done_editing() break; } - ARDOUR_UI::instance()->tooltips().set_tip (comment_button, + ARDOUR_UI::instance()->set_tip (comment_button, str.empty() ? _("Click to Add/Edit Comments") : str); } @@ -1256,7 +1299,7 @@ MixerStrip::setup_comment_editor () comment_window = new ArdourDialog (title, false); comment_window->set_position (Gtk::WIN_POS_MOUSE); comment_window->set_skip_taskbar_hint (true); - comment_window->signal_hide().connect (mem_fun(*this, &MixerStrip::comment_editor_done_editing)); + comment_window->signal_hide().connect (sigc::mem_fun(*this, &MixerStrip::comment_editor_done_editing)); comment_area = manage (new TextView()); comment_area->set_name ("MixerTrackCommentArea"); @@ -1273,7 +1316,7 @@ MixerStrip::setup_comment_editor () void MixerStrip::comment_changed (void *src) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::comment_changed), src)); + ENSURE_GUI_THREAD (*this, &MixerStrip::comment_changed, src) if (src != this) { ignore_comment_edit = true; @@ -1287,7 +1330,7 @@ MixerStrip::comment_changed (void *src) void MixerStrip::set_route_group (RouteGroup *rg) { - _route->set_route_group (rg, this); + rg->add (_route); } bool @@ -1299,12 +1342,14 @@ MixerStrip::select_route_group (GdkEventButton *ev) if (group_menu == 0) { - group_menu = new RouteGroupMenu ( - _session, - (RouteGroup::Property) (RouteGroup::Gain | RouteGroup::Mute | RouteGroup::Solo) - ); + PropertyList* plist = new PropertyList(); + + plist->add (Properties::gain, true); + plist->add (Properties::mute, true); + plist->add (Properties::solo, true); - group_menu->GroupSelected.connect (mem_fun (*this, &MixerStrip::set_route_group)); + group_menu = new RouteGroupMenu (_session, plist); + group_menu->GroupSelected.connect (sigc::mem_fun (*this, &MixerStrip::set_route_group)); } group_menu->popup (1, ev->time); @@ -1314,19 +1359,14 @@ MixerStrip::select_route_group (GdkEventButton *ev) } void -MixerStrip::route_group_changed (void *ignored) +MixerStrip::route_group_changed () { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::route_group_changed), ignored)); + ENSURE_GUI_THREAD (*this, &MixerStrip::route_group_changed) RouteGroup *rg = _route->route_group(); if (rg) { - /* XXX: this needs a better algorithm */ - string truncated = rg->name (); - if (truncated.length () > 5) { - truncated = truncated.substr (0, 5); - } - group_label.set_text (truncated); + group_label.set_text (PBD::short_version (rg->name(), 5)); } else { switch (_width) { case Wide: @@ -1343,7 +1383,7 @@ MixerStrip::route_group_changed (void *ignored) void MixerStrip::route_gui_changed (string what_changed, void* ignored) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::route_gui_changed), what_changed, ignored)); + ENSURE_GUI_THREAD (*this, &MixerStrip::route_gui_changed, what_changed, ignored) if (what_changed == "color") { if (set_color_from_route () == 0) { @@ -1375,46 +1415,47 @@ MixerStrip::build_route_ops_menu () MenuList& items = route_ops_menu->items(); - items.push_back (MenuElem (_("Save As Template"), mem_fun(*this, &RouteUI::save_as_template))); - items.push_back (MenuElem (_("Rename"), mem_fun(*this, &RouteUI::route_rename))); + 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"), mem_fun (*this, &RouteUI::toggle_route_active))); + items.push_back (CheckMenuElem (_("Active"), sigc::mem_fun (*this, &RouteUI::toggle_route_active))); route_active_menu_item = dynamic_cast (&items.back()); route_active_menu_item->set_active (_route->active()); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Adjust latency"), mem_fun (*this, &RouteUI::adjust_latency))); + items.push_back (MenuElem (_("Adjust Latency..."), sigc::mem_fun (*this, &RouteUI::adjust_latency))); items.push_back (SeparatorElem()); - items.push_back (CheckMenuElem (_("Invert Polarity"), mem_fun (*this, &RouteUI::toggle_polarity))); - polarity_menu_item = dynamic_cast (&items.back()); - polarity_menu_item->set_active (_route->phase_invert()); - items.push_back (CheckMenuElem (_("Protect against denormals"), mem_fun (*this, &RouteUI::toggle_denormal_protection))); + items.push_back (CheckMenuElem (_("Protect Against Denormals"), sigc::mem_fun (*this, &RouteUI::toggle_denormal_protection))); 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..."), mem_fun (*this, &RouteUI::open_remote_control_id_dialog))); + items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog))); } items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Remove"), mem_fun(*this, &RouteUI::remove_this_route))); + items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &RouteUI::remove_this_route))); } -gint +gboolean MixerStrip::name_button_button_press (GdkEventButton* ev) { - if (ev->button == 1 || ev->button == 3) { + if (ev->button == 3) { 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); - } - return FALSE; + + } else if (ev->button == 1) { + revert_to_default_display (); + } + + return false; } void @@ -1444,15 +1485,12 @@ MixerStrip::name_changed () { switch (_width) { case Wide: - RouteUI::name_changed (); + RouteUI::property_changed (PropertyChange (ARDOUR::Properties::name)); break; case Narrow: name_label.set_text (PBD::short_version (_route->name(), 5)); break; } - if (_route->phase_invert()) { - name_label.set_text (X_("Ø ") + name_label.get_text()); - } } void @@ -1493,7 +1531,7 @@ MixerStrip::set_embedded (bool yn) void MixerStrip::map_frozen () { - ENSURE_GUI_THREAD (mem_fun(*this, &MixerStrip::map_frozen)); + ENSURE_GUI_THREAD (*this, &MixerStrip::map_frozen) boost::shared_ptr at = audio_track(); @@ -1515,7 +1553,7 @@ MixerStrip::map_frozen () void MixerStrip::hide_redirect_editors () { - _route->foreach_processor (mem_fun (*this, &MixerStrip::hide_processor_editor)); + _route->foreach_processor (sigc::mem_fun (*this, &MixerStrip::hide_processor_editor)); } void @@ -1537,36 +1575,48 @@ void MixerStrip::route_active_changed () { RouteUI::route_active_changed (); + reset_strip_style (); +} + +void +MixerStrip::reset_strip_style () +{ + if (_current_delivery && boost::dynamic_pointer_cast(_current_delivery)) { + + gpm.set_fader_name ("SendStripBase"); - if (is_midi_track()) { - if (_route->active()) { - set_name ("MidiTrackStripBase"); - gpm.set_meter_strip_name ("MidiTrackStripBase"); - } else { - set_name ("MidiTrackStripBaseInactive"); - gpm.set_meter_strip_name ("MidiTrackStripBaseInactive"); - } - gpm.set_fader_name ("MidiTrackFader"); - } else if (is_audio_track()) { - if (_route->active()) { - set_name ("AudioTrackStripBase"); - gpm.set_meter_strip_name ("AudioTrackMetrics"); - } else { - set_name ("AudioTrackStripBaseInactive"); - gpm.set_meter_strip_name ("AudioTrackMetricsInactive"); - } - gpm.set_fader_name ("AudioTrackFader"); } else { - if (_route->active()) { - set_name ("AudioBusStripBase"); - gpm.set_meter_strip_name ("AudioBusMetrics"); + + if (is_midi_track()) { + if (_route->active()) { + set_name ("MidiTrackStripBase"); + gpm.set_meter_strip_name ("MidiTrackStripBase"); + } else { + set_name ("MidiTrackStripBaseInactive"); + gpm.set_meter_strip_name ("MidiTrackStripBaseInactive"); + } + gpm.set_fader_name ("MidiTrackFader"); + } else if (is_audio_track()) { + if (_route->active()) { + set_name ("AudioTrackStripBase"); + gpm.set_meter_strip_name ("AudioTrackMetrics"); + } else { + set_name ("AudioTrackStripBaseInactive"); + gpm.set_meter_strip_name ("AudioTrackMetricsInactive"); + } + gpm.set_fader_name ("AudioTrackFader"); } else { - set_name ("AudioBusStripBaseInactive"); - gpm.set_meter_strip_name ("AudioBusMetricsInactive"); + if (_route->active()) { + set_name ("AudioBusStripBase"); + gpm.set_meter_strip_name ("AudioBusMetrics"); + } else { + set_name ("AudioBusStripBaseInactive"); + gpm.set_meter_strip_name ("AudioBusMetricsInactive"); + } + gpm.set_fader_name ("AudioBusFader"); + + /* (no MIDI busses yet) */ } - gpm.set_fader_name ("AudioBusFader"); - - /* (no MIDI busses yet) */ } } @@ -1586,10 +1636,11 @@ MixerStrip::engine_running () { } +/** Called when the metering point has changed */ void -MixerStrip::meter_changed (void *src) +MixerStrip::meter_changed () { - ENSURE_GUI_THREAD (bind (mem_fun(*this, &MixerStrip::meter_changed), src)); + ENSURE_GUI_THREAD (*this, &MixerStrip::meter_changed) switch (_route->meter_point()) { case MeterInput: @@ -1603,17 +1654,26 @@ MixerStrip::meter_changed (void *src) case MeterPostFader: meter_point_label.set_text (_("post")); break; + + case MeterCustom: + meter_point_label.set_text (_("custom")); + break; } gpm.setup_meters (); // reset peak when meter point changes gpm.reset_peak_display(); - set_width_enum (_width, this); } void MixerStrip::switch_io (boost::shared_ptr target) { + /* don't respond to switch IO signal outside of the mixer window */ + + if (!_mixer_owned) { + return; + } + if (_route == target || _route->is_master()) { /* don't change the display for the target or the master bus */ return; @@ -1632,90 +1692,121 @@ MixerStrip::switch_io (boost::shared_ptr target) return; } - boost::shared_ptr send; + boost::shared_ptr send = _route->internal_send_for (target); - if (_current_delivery && (send = boost::dynamic_pointer_cast(_current_delivery))) { - send->set_metering (false); + if (send) { + show_send (send); + } else { + revert_to_default_display (); } +} - _current_delivery = _route->internal_send_for (target); +void +MixerStrip::drop_send () +{ + boost::shared_ptr current_send; - cerr << "internal send from " << _route->name() << " to " << target->name() << " = " - << _current_delivery << endl; + if (_current_delivery && (current_send = boost::dynamic_pointer_cast(_current_delivery))) { + current_send->set_metering (false); + } - if (_current_delivery) { - send = boost::dynamic_pointer_cast(_current_delivery); - send->set_metering (true); - _current_delivery->GoingAway.connect (mem_fun (*this, &MixerStrip::revert_to_default_display)); - gain_meter().set_controls (_route, send->meter(), send->amp()); - panner_ui().set_panner (_current_delivery->panner()); + send_gone_connection.disconnect (); + input_button.set_sensitive (true); + output_button.set_sensitive (true); +} - } else { - _current_delivery = _route->main_outs (); - gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->amp()); - panner_ui().set_panner (_route->main_outs()->panner()); - } +void +MixerStrip::show_send (boost::shared_ptr send) +{ + assert (send != 0); + + drop_send (); + _current_delivery = 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().setup_meters (); + + panner_ui().set_panner (_current_delivery->panner()); panner_ui().setup_pan (); -} + input_button.set_sensitive (false); + + if (boost::dynamic_pointer_cast(send)) { + output_button.set_sensitive (false); + } + + reset_strip_style (); +} void MixerStrip::revert_to_default_display () { - show_sends_button->set_active (false); - - boost::shared_ptr send; - - if (_current_delivery && (send = boost::dynamic_pointer_cast(_current_delivery))) { - send->set_metering (false); + if (show_sends_button) { + show_sends_button->set_active (false); } + drop_send (); + _current_delivery = _route->main_outs(); gain_meter().set_controls (_route, _route->shared_peak_meter(), _route->amp()); gain_meter().setup_meters (); + panner_ui().set_panner (_route->main_outs()->panner()); panner_ui().setup_pan (); + + reset_strip_style (); } void MixerStrip::set_button_names () { - switch (_width) { + invert_button_label.set_text (X_("Ø")); + + switch (_width) { case Wide: rec_enable_button_label.set_text (_("Rec")); mute_button_label.set_text (_("Mute")); - if (!Config->get_solo_control_is_listen_control()) { - solo_button_label.set_text (_("Solo")); - } else { - switch (Config->get_listen_position()) { - case AfterFaderListen: - solo_button_label.set_text (_("AFL")); - break; - case PreFaderListen: - solo_button_label.set_text (_("PFL")); - break; - } - } + if (_route && _route->solo_safe()) { + solo_button_label.set_text (X_("!")); + } else { + if (!Config->get_solo_control_is_listen_control()) { + solo_button_label.set_text (_("Solo")); + } else { + switch (Config->get_listen_position()) { + case AfterFaderListen: + solo_button_label.set_text (_("AFL")); + break; + case PreFaderListen: + solo_button_label.set_text (_("PFL")); + break; + } + } + } break; default: rec_enable_button_label.set_text (_("R")); mute_button_label.set_text (_("M")); - if (!Config->get_solo_control_is_listen_control()) { - solo_button_label.set_text (_("S")); - } else { - switch (Config->get_listen_position()) { - case AfterFaderListen: - solo_button_label.set_text (_("A")); - break; - case PreFaderListen: - solo_button_label.set_text (_("P")); - break; - } - } + if (_route && _route->solo_safe()) { + solo_button_label.set_text (X_("!")); + if (!Config->get_solo_control_is_listen_control()) { + solo_button_label.set_text (_("S")); + } else { + switch (Config->get_listen_position()) { + case AfterFaderListen: + solo_button_label.set_text (_("A")); + break; + case PreFaderListen: + solo_button_label.set_text (_("P")); + break; + } + } + } break; } @@ -1741,6 +1832,7 @@ MixerStrip::on_key_press_event (GdkEventKey* ev) break; case GDK_r: + cerr << "Stole that r\n"; rec_enable_press (&fake); return true; break; @@ -1793,6 +1885,7 @@ MixerStrip::on_key_release_event (GdkEventKey* ev) break; case GDK_r: + cerr << "Stole that r\n"; rec_enable_release (&fake); return true; break;