X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=39e23a99a4d708235bc4689edc819a0afaf9bb60;hb=64e69c36da8226a89902c4660c80f9470e7b55db;hp=1a357dc0024d20073d48b0dc70d33506ebced82e;hpb=3be16e8afbd891c0bfe7227158384ed0d127597f;p=ardour.git diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 1a357dc002..39e23a99a4 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -23,6 +23,7 @@ #include #include +#include #include #include @@ -36,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -43,7 +45,6 @@ #include #include #include -#include #include #include "ardour_ui.h" @@ -139,21 +140,33 @@ MixerStrip::init () comment_window = 0; comment_area = 0; _width_owner = 0; + spacer = 0; - width_button.add (*(manage (new Gtk::Image (::get_icon("strip_width"))))); - hide_button.add (*(manage (new Gtk::Image (::get_icon("hide"))))); + 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 (); + + hide_button.add (*img); input_label.set_text (_("Input")); - ARDOUR_UI::instance()->set_tip (&input_button, _("Click to choose inputs"), ""); + 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"); + Gtkmm2ext::set_size_request_to_display_given_text (input_button, "longest label", 4, 4); output_label.set_text (_("Output")); - ARDOUR_UI::instance()->set_tip (&output_button, _("Click to choose outputs"), ""); + 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); ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Select metering point"), ""); meter_point_button.add (meter_point_label); @@ -208,8 +221,6 @@ MixerStrip::init () global_vpacker.set_border_width (0); global_vpacker.set_spacing (0); - VBox *whvbox = manage (new VBox); - width_button.set_name ("MixerWidthButton"); hide_button.set_name ("MixerHideButton"); top_event_box.set_name ("MixerTopEventBox"); @@ -220,17 +231,16 @@ MixerStrip::init () width_hide_box.pack_start (width_button, false, true); width_hide_box.pack_start (top_event_box, true, true); width_hide_box.pack_end (hide_button, false, true); - Gtk::Alignment *gain_meter_alignment = Gtk::manage(new Gtk::Alignment()); - gain_meter_alignment->set_padding(0, 4, 0, 0); - gain_meter_alignment->add(gpm); + gain_meter_alignment.set_padding(0, 4, 0, 0); + gain_meter_alignment.add(gpm); - whvbox->pack_start (width_hide_box, true, true); + whvbox.pack_start (width_hide_box, true, true); - global_vpacker.pack_start (*whvbox, Gtk::PACK_SHRINK); + global_vpacker.pack_start (whvbox, Gtk::PACK_SHRINK); global_vpacker.pack_start (button_table,Gtk::PACK_SHRINK); 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 (gain_meter_alignment,Gtk::PACK_SHRINK); global_vpacker.pack_start (bottom_button_table,Gtk::PACK_SHRINK); global_vpacker.pack_start (post_processor_box, true, true); if (!is_midi_track()) { @@ -297,13 +307,8 @@ MixerStrip::~MixerStrip () { GoingAway(); /* EMIT_SIGNAL */ - if (input_selector) { - delete input_selector; - } - - if (output_selector) { - delete output_selector; - } + delete input_selector; + delete output_selector; } void @@ -321,6 +326,12 @@ MixerStrip::set_route (boost::shared_ptr rt) RouteUI::set_route (rt); + delete input_selector; + input_selector = 0; + + delete output_selector; + output_selector = 0; + panners.set_io (rt); gpm.set_io (rt); pre_processor_box.set_route (rt); @@ -338,7 +349,7 @@ MixerStrip::set_route (boost::shared_ptr rt) scrollbar_height = requisition.height; } - EventBox* spacer = manage (new EventBox); + spacer = manage (new EventBox); spacer->set_size_request (-1, scrollbar_height); global_vpacker.pack_start (*spacer, false, false); } @@ -364,6 +375,7 @@ MixerStrip::set_route (boost::shared_ptr rt) #endif /* VARISPEED_IN_MIXER_STRIP */ button_table.attach (*rec_enable_button, 0, 2, 2, 3); + rec_enable_button->show(); } if (_route->phase_invert()) { @@ -385,6 +397,9 @@ MixerStrip::set_route (boost::shared_ptr rt) meter_point_label.set_text (_("post")); break; } + + delete route_ops_menu; + route_ops_menu = 0; ARDOUR_UI::instance()->tooltips().set_tip (comment_button, _route->comment().empty() ? _("Click to Add/Edit Comments"): @@ -440,13 +455,20 @@ MixerStrip::set_route (boost::shared_ptr rt) /* we don't allow master or control routes to be hidden */ hide_button.show(); } + width_button.show(); width_hide_box.show(); + whvbox.show (); global_frame.show(); global_vpacker.show(); button_table.show(); middle_button_table.show(); bottom_button_table.show(); + pre_processor_box.show_all (); + gpm.show_all (); + panners.show_all (); + gain_meter_alignment.show (); + post_processor_box.show_all (); gain_unit_button.show(); gain_unit_label.show(); meter_point_button.show(); @@ -466,7 +488,7 @@ MixerStrip::set_route (boost::shared_ptr rt) speed_label.show(); speed_frame.show(); - show(); + show (); } void @@ -518,20 +540,19 @@ MixerStrip::set_width (Width w, void* owner) switch (w) { case Wide: - set_size_request (-1, -1); - + if (rec_enable_button) { - ((Gtk::Label*)rec_enable_button->get_child())->set_text (_("record")); + ((Gtk::Label*)rec_enable_button->get_child())->set_text (_("Record")); } ((Gtk::Label*)mute_button->get_child())->set_text (_("Mute")); ((Gtk::Label*)solo_button->get_child())->set_text (_("Solo")); if (_route->comment() == "") { comment_button.unset_bg (STATE_NORMAL); - ((Gtk::Label*)comment_button.get_child())->set_text (_("comments")); + ((Gtk::Label*)comment_button.get_child())->set_text (_("Comments")); } else { comment_button.modify_bg (STATE_NORMAL, color()); - ((Gtk::Label*)comment_button.get_child())->set_text (_("*comments*")); + ((Gtk::Label*)comment_button.get_child())->set_text (_("*Comments*")); } ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.astyle_string(gain_automation->automation_style())); @@ -539,6 +560,7 @@ MixerStrip::set_width (Width w, void* owner) ((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); + set_size_request (-1, -1); break; case Narrow: @@ -564,12 +586,13 @@ MixerStrip::set_width (Width w, void* owner) set_size_request (max (50, gpm.get_gm_width()), -1); break; } - update_input_display (); update_output_display (); mix_group_changed (0); name_changed (); - +#ifdef GTKOSX + WidthChanged(); +#endif } void @@ -601,25 +624,38 @@ MixerStrip::output_press (GdkEventButton *ev) switch (ev->button) { case 1: + edit_output_configuration (); + break; + + case 3: { output_menu.set_name ("ArdourContextMenu"); citems.clear(); - citems.push_back (MenuElem (_("Edit"), mem_fun(*this, &MixerStrip::edit_output_configuration))); - citems.push_back (SeparatorElem()); citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast(this)), &RouteUI::disconnect_output))); citems.push_back (SeparatorElem()); - std::vector > current = _route->bundles_connected_to_outputs (); + ARDOUR::BundleList current = _route->bundles_connected_to_outputs (); - _session.foreach_bundle ( - bind (mem_fun (*this, &MixerStrip::add_bundle_to_output_menu), current) - ); + boost::shared_ptr b = _session.bundles (); + for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) { + maybe_add_bundle_to_output_menu (*i, current); + } + + 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)->bundle_for_inputs(), current); + } + + if (citems.size() == 2) { + /* no routes added; remove the separator */ + citems.pop_back (); + } output_menu.popup (1, ev->time); break; } - + default: break; } @@ -672,17 +708,30 @@ MixerStrip::input_press (GdkEventButton *ev) switch (ev->button) { case 1: + edit_input_configuration (); + break; + + case 3: { - citems.push_back (MenuElem (_("Edit"), mem_fun(*this, &MixerStrip::edit_input_configuration))); - citems.push_back (SeparatorElem()); citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast(this)), &RouteUI::disconnect_input))); citems.push_back (SeparatorElem()); - std::vector > current = _route->bundles_connected_to_inputs (); + ARDOUR::BundleList current = _route->bundles_connected_to_inputs (); - _session.foreach_bundle ( - bind (mem_fun (*this, &MixerStrip::add_bundle_to_input_menu), current) - ); + boost::shared_ptr b = _session.bundles (); + for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) { + maybe_add_bundle_to_input_menu (*i, current); + } + + 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)->bundle_for_outputs(), current); + } + + if (citems.size() == 2) { + /* no routes added; remove the separator */ + citems.pop_back (); + } input_menu.popup (1, ev->time); break; @@ -694,83 +743,86 @@ MixerStrip::input_press (GdkEventButton *ev) } void -MixerStrip::bundle_input_chosen (boost::shared_ptr c) +MixerStrip::bundle_input_toggled (boost::shared_ptr c) { - if (!ignore_toggle) { + if (ignore_toggle) { + return; + } - try { - _route->connect_input_ports_to_bundle (c, this); - } + ARDOUR::BundleList current = _route->bundles_connected_to_inputs (); - catch (AudioEngine::PortRegistrationFailure& err) { - error << _("could not register new ports required for that bundle") - << endmsg; - } + if (std::find (current.begin(), current.end(), c) == current.end()) { + _route->connect_input_ports_to_bundle (c, this); + } else { + _route->disconnect_input_ports_from_bundle (c, this); } } void -MixerStrip::bundle_output_chosen (boost::shared_ptr c) +MixerStrip::bundle_output_toggled (boost::shared_ptr c) { - if (!ignore_toggle) { + if (ignore_toggle) { + return; + } - try { - _route->connect_output_ports_to_bundle (c, this); - } + ARDOUR::BundleList current = _route->bundles_connected_to_outputs (); - catch (AudioEngine::PortRegistrationFailure& err) { - error << _("could not register new ports required for that bundle") - << endmsg; - } + if (std::find (current.begin(), current.end(), c) == current.end()) { + _route->connect_output_ports_to_bundle (c, this); + } else { + _route->disconnect_output_ports_from_bundle (c, this); } } void -MixerStrip::add_bundle_to_input_menu (boost::shared_ptr b, std::vector > const & current) +MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr b, ARDOUR::BundleList const & current) { using namespace Menu_Helpers; - /* the input menu needs to contain only output bundles (that we - can connect inputs to */ - if (b->ports_are_outputs() == false) { + if (b->ports_are_outputs() == false || + route()->default_type() != b->type() || + b->nchannels() != _route->n_inputs().get (b->type ())) { + return; } MenuList& citems = input_menu.items(); - if (b->nchannels() == _route->n_inputs()) { - - citems.push_back (CheckMenuElem (b->name(), bind (mem_fun(*this, &MixerStrip::bundle_input_chosen), b))); - - if (std::find (current.begin(), current.end(), b) != current.end()) { - ignore_toggle = true; - dynamic_cast (&citems.back())->set_active (true); - ignore_toggle = false; - } + std::string n = b->name (); + replace_all (n, "_", " "); + + citems.push_back (CheckMenuElem (n, bind (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; } } void -MixerStrip::add_bundle_to_output_menu (boost::shared_ptr b, std::vector > const & current) +MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr b, ARDOUR::BundleList const & current) { using namespace Menu_Helpers; - /* the output menu needs to contain only input bundles (that we - can connect outputs to */ - if (b->ports_are_inputs() == false) { + if (b->ports_are_inputs() == false || + route()->default_type() != b->type() || + b->nchannels() != _route->n_outputs().get (b->type ())) { + return; } - if (b->nchannels() == _route->n_outputs()) { - - MenuList& citems = output_menu.items(); - citems.push_back (CheckMenuElem (b->name(), bind (mem_fun(*this, &MixerStrip::bundle_output_chosen), b))); - - if (std::find (current.begin(), current.end(), b) != current.end()) { - ignore_toggle = true; - dynamic_cast (&citems.back())->set_active (true); - ignore_toggle = false; - } + MenuList& citems = output_menu.items(); + + std::string n = b->name (); + replace_all (n, "_", " "); + + citems.push_back (CheckMenuElem (n, bind (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; } } @@ -814,11 +866,12 @@ MixerStrip::connect_to_pan () void MixerStrip::update_input_display () { - std::vector > c = _route->bundles_connected_to_inputs (); + ARDOUR::BundleList const c = _route->bundles_connected_to_inputs (); - /* XXX: how do we represent >1 connected bundle? */ - if (c.empty() == false) { - input_label.set_text (c[0]->name()); + if (c.size() > 1) { + input_label.set_text (_("Inputs")); + } else if (c.size() == 1) { + input_label.set_text (c[0]->name ()); } else { switch (_width) { case Wide: @@ -835,10 +888,12 @@ MixerStrip::update_input_display () void MixerStrip::update_output_display () { - std::vector > c = _route->bundles_connected_to_outputs (); + ARDOUR::BundleList const c = _route->bundles_connected_to_outputs (); /* XXX: how do we represent >1 connected bundle? */ - if (c.empty() == false) { + if (c.size() > 1) { + output_label.set_text (_("Outputs")); + } else if (c.size() == 1) { output_label.set_text (c[0]->name()); } else { switch (_width) { @@ -1084,7 +1139,7 @@ void MixerStrip::build_route_ops_menu () { using namespace Menu_Helpers; - route_ops_menu = manage (new Menu); + route_ops_menu = new Menu; route_ops_menu->set_name ("ArdourContextMenu"); MenuList& items = route_ops_menu->items(); @@ -1107,11 +1162,10 @@ MixerStrip::build_route_ops_menu () denormal_menu_item = dynamic_cast (&items.back()); denormal_menu_item->set_active (_route->denormal_protection()); - build_remote_control_menu (); - - items.push_back (SeparatorElem()); if (!Profile->get_sae()) { - items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu)); + build_remote_control_menu (); + items.push_back (SeparatorElem()); + items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu)); } items.push_back (SeparatorElem()); @@ -1121,7 +1175,7 @@ MixerStrip::build_route_ops_menu () gint MixerStrip::name_button_button_press (GdkEventButton* ev) { - if (ev->button == 1) { + if (ev->button == 1 || ev->button == 3) { list_route_operations (); Menu_Helpers::MenuList& items = route_ops_menu->items(); @@ -1274,12 +1328,17 @@ MixerStrip::map_frozen () void MixerStrip::hide_redirect_editors () { - _route->foreach_processor (this, &MixerStrip::hide_processor_editor); + _route->foreach_processor (mem_fun (*this, &MixerStrip::hide_processor_editor)); } void -MixerStrip::hide_processor_editor (boost::shared_ptr processor) +MixerStrip::hide_processor_editor (boost::weak_ptr p) { + boost::shared_ptr processor (p.lock ()); + if (!processor) { + return; + } + void* gui = processor->get_gui (); if (gui) {