X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=48f44cadf4ba4acb9a3184cac7f27c2b8fc97282;hb=c546ad359a1edb9cc2c2383cac00d49648b97268;hp=6b92873569c8b2e7414c7d80d1904924cc152124;hpb=d1630219500305397e1608e09508872f0ab2f836;p=ardour.git diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 6b92873569..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 @@ -41,19 +40,20 @@ #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" @@ -77,13 +77,14 @@ PBD::Signal1 MixerStrip::CatchDeletion; 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, 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")) @@ -103,7 +104,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) , 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, 250) @@ -115,7 +116,6 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr rt , comment_button (_("Comments")) { init (); - set_button_names (); set_route (rt); } @@ -183,12 +183,52 @@ MixerStrip::init () 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); @@ -235,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); @@ -259,8 +300,8 @@ MixerStrip::init () _packed = false; _embedded = false; - _session->engine().Stopped.connect (*this, boost::bind (&MixerStrip::engine_stopped, this), gui_context()); - _session->engine().Running.connect (*this, boost::bind (&MixerStrip::engine_running, this), gui_context()); + _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()); 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); @@ -324,6 +365,11 @@ 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; @@ -340,11 +386,13 @@ MixerStrip::set_route (boost::shared_ptr rt) 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_control())) { + if (_mixer_owned && (route()->is_master() || route()->is_monitor())) { if (scrollbar_height == 0) { HScrollbar scrollbar; @@ -358,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()); + } - at->FreezeChange.connect (route_connections, boost::bind (&MixerStrip::map_frozen, this), gui_context()); - + if (is_track ()) { + button_table.attach (*rec_enable_button, 0, 2, 2, 3); rec_enable_button->set_sensitive (_session->writable()); rec_enable_button->show(); - } else if (!is_track()) { + } else { + /* non-master bus */ if (!_route->is_master()) { @@ -376,11 +426,7 @@ 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 (sigc::mem_fun (*this, &MixerStrip::mono_button_clicked)); @@ -410,28 +456,28 @@ MixerStrip::set_route (boost::shared_ptr rt) _("Click to Add/Edit Comments"): _route->comment()); - _route->meter_change.connect (route_connections, ui_bind (&MixerStrip::meter_changed, this, _1), gui_context()); - _route->input()->changed.connect (route_connections, ui_bind (&MixerStrip::input_changed, this, _1, _2), gui_context()); - _route->output()->changed.connect (route_connections, ui_bind (&MixerStrip::output_changed, this, _1, _2), gui_context()); - _route->route_group_changed.connect (route_connections, boost::bind (&MixerStrip::route_group_changed, this), gui_context()); + _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()) { - _route->panner()->Changed.connect (route_connections, boost::bind (&MixerStrip::connect_to_pan, this), gui_context()); + _route->panner()->Changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::connect_to_pan, this), gui_context()); } if (is_audio_track()) { - audio_track()->DiskstreamChanged.connect (route_connections, boost::bind (&MixerStrip::diskstream_changed, this), gui_context()); + audio_track()->DiskstreamChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::diskstream_changed, this), gui_context()); } - _route->comment_changed.connect (route_connections, ui_bind (&MixerStrip::comment_changed, this, _1), gui_context()); - _route->gui_changed.connect (route_connections, ui_bind (&MixerStrip::route_gui_changed, this, _1, _2), gui_context()); + _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 */ mute_changed (0); - solo_changed (0); + update_solo_display (); name_changed (); comment_changed (0); route_group_changed (); @@ -448,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(); } @@ -822,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; } @@ -859,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; } @@ -925,8 +965,8 @@ MixerStrip::connect_to_pan () _route->panner()->control(Evoral::Parameter(PanAutomation))); if (pan_control) { - pan_control->alist()->automation_state_changed.connect (panstate_connection, boost::bind (&PannerUI::pan_automation_state_changed, &panners), gui_context()); - pan_control->alist()->automation_style_changed.connect (panstyle_connection, boost::bind (&PannerUI::pan_automation_style_changed, &panners), gui_context()); + 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); @@ -1169,20 +1209,20 @@ MixerStrip::fast_update () void MixerStrip::diskstream_changed () { - Gtkmm2ext::UI::instance()->call_slot (boost::bind (&MixerStrip::update_diskstream_display, this)); + 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 (boost::bind (&MixerStrip::update_input_display, this)); + 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 (boost::bind (&MixerStrip::update_output_display, this)); + Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&MixerStrip::update_output_display, this)); set_width_enum (_width, this); } @@ -1375,8 +1415,8 @@ MixerStrip::build_route_ops_menu () MenuList& items = route_ops_menu->items(); - 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))); + 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"), sigc::mem_fun (*this, &RouteUI::toggle_route_active))); @@ -1385,13 +1425,10 @@ MixerStrip::build_route_ops_menu () items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Adjust latency"), sigc::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"), sigc::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"), sigc::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()); @@ -1404,17 +1441,21 @@ MixerStrip::build_route_ops_menu () 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 @@ -1450,9 +1491,6 @@ MixerStrip::name_changed () 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 @@ -1600,9 +1638,9 @@ MixerStrip::engine_running () /** Called when the metering point has changed */ void -MixerStrip::meter_changed (void *src) +MixerStrip::meter_changed () { - ENSURE_GUI_THREAD (*this, &MixerStrip::meter_changed, src) + ENSURE_GUI_THREAD (*this, &MixerStrip::meter_changed) switch (_route->meter_point()) { case MeterInput: @@ -1687,7 +1725,7 @@ MixerStrip::show_send (boost::shared_ptr send) _current_delivery = send; send->set_metering (true); - _current_delivery->DropReferences.connect (send_gone_connection, boost::bind (&MixerStrip::revert_to_default_display, this), gui_context()); + _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 (); @@ -1727,39 +1765,48 @@ MixerStrip::revert_to_default_display () 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; } @@ -1785,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; @@ -1837,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;