X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=f791314d7519fa0b94288948a39d84e98681479e;hb=29f0d9732eb68fcaa22219cedddddd47bcaa8c17;hp=1a21464bf53e49baf046141777a91df78566eb95;hpb=2a52135c663e9a60b5f0cc9cc6673799c3ea5549;p=ardour.git diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 1a21464bf5..f791314d75 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -40,10 +40,9 @@ #include #include #include -#include +#include #include -#include -#include +#include #include "ardour_ui.h" #include "ardour_dialog.h" @@ -85,8 +84,8 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr rt : AxisView(sess), RouteUI (rt, sess, _("Mute"), _("Solo"), _("Record")), _mixer(mx), - pre_redirect_box (PreFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer), - post_redirect_box (PostFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer), + pre_processor_box (PreFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer), + post_processor_box (PostFader, sess, rt, mx.plugin_selector(), mx.selection(), in_mixer), gpm (_route, sess), panners (_route, sess), button_table (3, 2), @@ -114,8 +113,10 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr rt comment_area = 0; _width_owner = 0; - width_button.add (*(manage (new Gtk::Image (::get_icon("strip_width"))))); - hide_button.add (*(manage (new Gtk::Image (::get_icon("hide"))))); + Gtk::Image *width_icon = manage (new Gtk::Image (::get_icon("strip_width"))); + Gtk::Image *hide_icon = manage (new Gtk::Image (::get_icon("hide"))); + width_button.add (*width_icon); + hide_button.add (*hide_icon); input_label.set_text (_("Input")); input_button.add (input_label); @@ -184,7 +185,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr rt rec_enable_button->set_name ("MixerRecordEnableButton"); - AudioTrack* at = audio_track(); + boost::shared_ptr at = audio_track(); at->FreezeChange.connect (mem_fun(*this, &MixerStrip::map_frozen)); @@ -251,16 +252,17 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr rt global_vpacker.pack_start (*whvbox, Gtk::PACK_SHRINK); global_vpacker.pack_start (button_table,Gtk::PACK_SHRINK); - global_vpacker.pack_start (pre_redirect_box, true, true); + global_vpacker.pack_start (pre_processor_box, true, true); 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); - global_vpacker.pack_start (post_redirect_box, true, true); - global_vpacker.pack_start (panners, Gtk::PACK_SHRINK); + global_vpacker.pack_start (post_processor_box, true, true); + if (!is_midi_track()) + global_vpacker.pack_start (panners, Gtk::PACK_SHRINK); global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK); global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK); - if (route()->master() || route()->control()) { + if (route()->is_master() || route()->is_control()) { if (scrollbar_height == 0) { HScrollbar scrollbar; @@ -302,7 +304,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr rt get_diskstream()->SpeedChanged.connect (mem_fun(*this, &MixerStrip::speed_changed)); } - _route->name_changed.connect (mem_fun(*this, &RouteUI::name_changed)); + _route->NameChanged.connect (mem_fun(*this, &RouteUI::name_changed)); _route->comment_changed.connect (mem_fun(*this, &MixerStrip::comment_changed)); _route->gui_changed.connect (mem_fun(*this, &MixerStrip::route_gui_changed)); @@ -324,15 +326,18 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr rt in update_diskstream_display(). */ - set_name ("AudioTrackStripBase"); + if (is_midi_track()) + set_name ("MidiTrackStripBase"); + else + set_name ("AudioTrackStripBase"); /* now force an update of all the various elements */ - pre_redirect_box.update(); - post_redirect_box.update(); + pre_processor_box.update(); + post_processor_box.update(); mute_changed (0); solo_changed (0); - name_changed (0); + name_changed (); comment_changed (0); mix_group_changed (0); @@ -349,6 +354,41 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr rt update_output_display (); add_events (Gdk::BUTTON_RELEASE_MASK); + + whvbox->show(); + hide_icon->show(); + width_icon->show(); + gain_meter_alignment->show(); + + pre_processor_box.show(); + hide_button.show(); + width_button.show(); + width_hide_box.show(); + global_frame.show(); + global_vpacker.show(); + button_table.show(); + middle_button_table.show(); + bottom_button_table.show(); + gain_unit_button.show(); + gain_unit_label.show(); + meter_point_button.show(); + meter_point_label.show(); + diskstream_button.show(); + diskstream_label.show(); + input_button.show(); + input_label.show(); + output_button.show(); + output_label.show(); + name_label.show(); + name_button.show(); + comment_button.show(); + group_button.show(); + group_label.show(); + speed_spinner.show(); + speed_label.show(); + speed_frame.show(); + + show(); } MixerStrip::~MixerStrip () @@ -396,8 +436,10 @@ MixerStrip::set_width (Width w, void* owner) gpm.set_width (w); panners.set_width (w); - pre_redirect_box.set_width (w); - post_redirect_box.set_width (w); + pre_processor_box.set_width (w); + post_processor_box.set_width (w); + + boost::shared_ptr gain_automation = _route->gain_control()->list(); _width_owner = owner; @@ -431,8 +473,8 @@ MixerStrip::set_width (Width w, void* owner) ((Gtk::Label*)comment_button.get_child())->set_text (_("*comments*")); } - ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.astyle_string(_route->gain_automation_curve().automation_style())); - ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.astate_string(_route->gain_automation_curve().automation_state())); + ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.astyle_string(gain_automation->automation_style())); + ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.astate_string(gain_automation->automation_state())); ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.astyle_string(_route->panner().automation_style())); ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.astate_string(_route->panner().automation_state())); Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2); @@ -453,8 +495,8 @@ MixerStrip::set_width (Width w, void* owner) ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*")); } - ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.short_astyle_string(_route->gain_automation_curve().automation_style())); - ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.short_astate_string(_route->gain_automation_curve().automation_state())); + ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.short_astyle_string(gain_automation->automation_style())); + ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.short_astate_string(gain_automation->automation_state())); ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text (panners.short_astyle_string(_route->panner().automation_style())); ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text (panners.short_astate_string(_route->panner().automation_state())); Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2); @@ -465,7 +507,7 @@ MixerStrip::set_width (Width w, void* owner) update_input_display (); update_output_display (); mix_group_changed (0); - name_changed (0); + name_changed (); } @@ -506,7 +548,9 @@ MixerStrip::output_press (GdkEventButton *ev) citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast(this)), &RouteUI::disconnect_output))); citems.push_back (SeparatorElem()); - _session.foreach_connection (this, &MixerStrip::add_connection_to_output_menu); + _session.foreach_bundle ( + bind (mem_fun (*this, &MixerStrip::add_bundle_to_output_menu), _route->output_bundle ()) + ); output_menu.popup (1, ev->time); break; @@ -527,7 +571,7 @@ MixerStrip::edit_output_configuration () if (output_selector->is_visible()) { output_selector->get_toplevel()->get_window()->raise(); } else { - output_selector->show_all (); + output_selector->present (); } } @@ -541,7 +585,7 @@ MixerStrip::edit_input_configuration () if (input_selector->is_visible()) { input_selector->get_toplevel()->get_window()->raise(); } else { - input_selector->show_all (); + input_selector->present (); } } @@ -568,7 +612,9 @@ MixerStrip::input_press (GdkEventButton *ev) citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast(this)), &RouteUI::disconnect_input))); citems.push_back (SeparatorElem()); - _session.foreach_connection (this, &MixerStrip::add_connection_to_input_menu); + _session.foreach_bundle ( + bind (mem_fun (*this, &MixerStrip::add_bundle_to_input_menu), _route->input_bundle ()) + ); input_menu.popup (1, ev->time); break; @@ -580,55 +626,55 @@ MixerStrip::input_press (GdkEventButton *ev) } void -MixerStrip::connection_input_chosen (ARDOUR::Connection *c) +MixerStrip::bundle_input_chosen (boost::shared_ptr c) { if (!ignore_toggle) { try { - _route->use_input_connection (*c, this); + _route->connect_input_ports_to_bundle (c, this); } catch (AudioEngine::PortRegistrationFailure& err) { - error << _("could not register new ports required for that connection") + error << _("could not register new ports required for that bundle") << endmsg; } } } void -MixerStrip::connection_output_chosen (ARDOUR::Connection *c) +MixerStrip::bundle_output_chosen (boost::shared_ptr c) { if (!ignore_toggle) { try { - _route->use_output_connection (*c, this); + _route->connect_output_ports_to_bundle (c, this); } catch (AudioEngine::PortRegistrationFailure& err) { - error << _("could not register new ports required for that connection") + error << _("could not register new ports required for that bundle") << endmsg; } } } void -MixerStrip::add_connection_to_input_menu (ARDOUR::Connection* c) +MixerStrip::add_bundle_to_input_menu (boost::shared_ptr b, boost::shared_ptr current) { using namespace Menu_Helpers; - if (dynamic_cast (c) == 0) { + /* the input menu needs to contain only output bundles (that we + can connect inputs to */ + if (boost::dynamic_pointer_cast (b) == 0) { return; } MenuList& citems = input_menu.items(); - if (c->nports() == _route->n_inputs().get_total()) { + if (b->nchannels() == _route->n_inputs().n_total()) { - citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_input_chosen), c))); - - ARDOUR::Connection *current = _route->input_connection(); + citems.push_back (CheckMenuElem (b->name(), bind (mem_fun(*this, &MixerStrip::bundle_input_chosen), b))); - if (current == c) { + if (current == b) { ignore_toggle = true; dynamic_cast (&citems.back())->set_active (true); ignore_toggle = false; @@ -637,22 +683,23 @@ MixerStrip::add_connection_to_input_menu (ARDOUR::Connection* c) } void -MixerStrip::add_connection_to_output_menu (ARDOUR::Connection* c) +MixerStrip::add_bundle_to_output_menu (boost::shared_ptr b, boost::shared_ptr current) { using namespace Menu_Helpers; - if (dynamic_cast (c) == 0) { + /* the output menu needs to contain only input bundles (that we + can connect outputs to */ + if (boost::dynamic_pointer_cast (b) == 0) { return; } - if (c->nports() == _route->n_outputs().get_total()) { + + if (b->nchannels() == _route->n_outputs().n_total()) { MenuList& citems = output_menu.items(); - citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_output_chosen), c))); - - ARDOUR::Connection *current = _route->output_connection(); + citems.push_back (CheckMenuElem (b->name(), bind (mem_fun(*this, &MixerStrip::bundle_output_chosen), b))); - if (current == c) { + if (current == b) { ignore_toggle = true; dynamic_cast (&citems.back())->set_active (true); ignore_toggle = false; @@ -663,7 +710,7 @@ MixerStrip::add_connection_to_output_menu (ARDOUR::Connection* c) void MixerStrip::update_diskstream_display () { - if (is_audio_track()) { + if (is_track()) { map_frozen (); @@ -695,8 +742,8 @@ MixerStrip::connect_to_pan () if (!_route->panner().empty()) { StreamPanner* sp = _route->panner().front(); - panstate_connection = sp->automation().automation_state_changed.connect (mem_fun(panners, &PannerUI::pan_automation_state_changed)); - panstyle_connection = sp->automation().automation_style_changed.connect (mem_fun(panners, &PannerUI::pan_automation_style_changed)); + panstate_connection = sp->pan_control()->list()->automation_state_changed.connect (mem_fun(panners, &PannerUI::pan_automation_state_changed)); + panstyle_connection = sp->pan_control()->list()->automation_style_changed.connect (mem_fun(panners, &PannerUI::pan_automation_style_changed)); } panners.pan_changed (this); @@ -705,9 +752,9 @@ MixerStrip::connect_to_pan () void MixerStrip::update_input_display () { - ARDOUR::Connection *c; + boost::shared_ptr c; - if ((c = _route->input_connection()) != 0) { + if ((c = _route->input_bundle()) != 0) { input_label.set_text (c->name()); } else { switch (_width) { @@ -725,9 +772,9 @@ MixerStrip::update_input_display () void MixerStrip::update_output_display () { - ARDOUR::Connection *c; + boost::shared_ptr c; - if ((c = _route->output_connection()) != 0) { + if ((c = _route->output_bundle()) != 0) { output_label.set_text (c->name()); } else { switch (_width) { @@ -980,10 +1027,18 @@ MixerStrip::build_route_ops_menu () items.push_back (CheckMenuElem (_("Active"), 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 (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))); + denormal_menu_item = dynamic_cast (&items.back()); + denormal_menu_item->set_active (_route->denormal_protection()); build_remote_control_menu (); @@ -1071,11 +1126,11 @@ MixerStrip::set_selected (bool yn) } void -MixerStrip::name_changed (void *src) +MixerStrip::name_changed () { switch (_width) { case Wide: - RouteUI::name_changed (src); + RouteUI::name_changed (); break; case Narrow: name_label.set_text (PBD::short_version (_route->name(), 5)); @@ -1126,29 +1181,29 @@ MixerStrip::map_frozen () { ENSURE_GUI_THREAD (mem_fun(*this, &MixerStrip::map_frozen)); - AudioTrack* at = audio_track(); + boost::shared_ptr at = audio_track(); if (at) { switch (at->freeze_state()) { case AudioTrack::Frozen: - pre_redirect_box.set_sensitive (false); - post_redirect_box.set_sensitive (false); + pre_processor_box.set_sensitive (false); + post_processor_box.set_sensitive (false); speed_spinner.set_sensitive (false); break; default: - pre_redirect_box.set_sensitive (true); - post_redirect_box.set_sensitive (true); + pre_processor_box.set_sensitive (true); + post_processor_box.set_sensitive (true); speed_spinner.set_sensitive (true); break; } } - _route->foreach_redirect (this, &MixerStrip::hide_redirect_editor); + _route->foreach_processor (this, &MixerStrip::hide_processor_editor); } void -MixerStrip::hide_redirect_editor (boost::shared_ptr redirect) +MixerStrip::hide_processor_editor (boost::shared_ptr processor) { - void* gui = redirect->get_gui (); + void* gui = processor->get_gui (); if (gui) { static_cast(gui)->hide (); @@ -1168,24 +1223,27 @@ MixerStrip::route_active_changed () 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 ("AudioTrackStripBase"); + gpm.set_meter_strip_name ("AudioTrackMetrics"); } else { set_name ("AudioTrackStripBaseInactive"); - gpm.set_meter_strip_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 ("AudioBusStripBase"); + gpm.set_meter_strip_name ("AudioBusMetrics"); } else { set_name ("AudioBusStripBaseInactive"); - gpm.set_meter_strip_name ("AudioBusStripBaseInactive"); + gpm.set_meter_strip_name ("AudioBusMetricsInactive"); } gpm.set_fader_name ("AudioBusFader"); + + /* (no MIDI busses yet) */ } } @@ -1211,20 +1269,20 @@ MixerStrip::meter_changed (void *src) ENSURE_GUI_THREAD (bind (mem_fun(*this, &MixerStrip::meter_changed), src)); - switch (_route->meter_point()) { + switch (_route->meter_point()) { case MeterInput: meter_point_label.set_text (_("input")); break; - + case MeterPreFader: meter_point_label.set_text (_("pre")); break; - + case MeterPostFader: meter_point_label.set_text (_("post")); break; - } + } - gpm.setup_meters (); + gpm.setup_meters (); }