X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=5ce4caa3af1b74866a95e2073aa5fab38ccc17e8;hb=e549e8f82c151db4ba6cd95ed5045c530453900f;hp=80fd6f5c38e2f5510871a28e5d7cff9e97f7a476;hpb=4233a54ac3bdd8475125b99a97c669f1d37d8dd6;p=ardour.git diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 80fd6f5c38..5ce4caa3af 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -40,8 +40,10 @@ #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/profile.h" @@ -83,13 +85,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) - , _mono_button (_("Mono")) - , button_table (4, 2) + , button_table (3, 1) , solo_led_table (2, 2) + , top_button_table (1, 2) , middle_button_table (1, 2) , bottom_button_table (1, 2) , meter_point_label (_("pre")) - , comment_button (_("Comments")) + , midi_input_enable_button (0) { init (); @@ -110,12 +112,11 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr rt , processor_box (sess, sigc::mem_fun(*this, &MixerStrip::plugin_selector), mx.selection(), this, in_mixer) , gpm (sess, 250) , panners (sess) - , _mono_button (_("Mono")) - , button_table (3, 2) + , button_table (3, 1) , middle_button_table (1, 2) , bottom_button_table (1, 2) , meter_point_label (_("pre")) - , comment_button (_("Comments")) + , midi_input_enable_button (0) { init (); set_route (rt); @@ -127,7 +128,6 @@ MixerStrip::init () input_selector = 0; output_selector = 0; group_menu = 0; - _marked_for_display = false; route_ops_menu = 0; ignore_comment_edit = false; ignore_toggle = false; @@ -156,8 +156,7 @@ 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.c_str(), 4, 4); + 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"), ""); @@ -186,6 +185,9 @@ MixerStrip::init () mute_button->set_name ("MixerMuteButton"); solo_button->set_name ("MixerSoloButton"); + monitor_input_button->set_name ("MixerMonitorInputButton"); + monitor_disk_button->set_name ("MixerMonitorInputButton"); + solo_isolated_led = manage (new LED); solo_isolated_led->show (); solo_isolated_led->set_diameter (6); @@ -204,32 +206,40 @@ MixerStrip::init () 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 = manage (new Label (_("iso"))); + _safe_label = manage (new Label (_("lock"))); + + _iso_label->set_name (X_("SoloLEDLabel")); + _safe_label->set_name (X_("SoloLEDLabel")); - iso_label->show (); - safe_label->show (); + _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 (*_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 (*_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 (); + + top_button_table.set_homogeneous (true); + top_button_table.set_spacings (0); + top_button_table.attach (*monitor_input_button, 0, 1, 0, 1); + top_button_table.attach (*monitor_disk_button, 1, 2, 0, 1); + top_button_table.show (); + + below_panner_box.set_border_width (2); + below_panner_box.set_spacing (2); + below_panner_box.pack_end (solo_led_table, false, false); + below_panner_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_box, 0, 2, 3, 4); + 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); @@ -248,15 +258,9 @@ MixerStrip::init () 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); + 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 (sigc::mem_fun(*this, &MixerStrip::comment_button_clicked)); - - _mono_button.set_name ("MixerMonoButton"); - _mono_button.signal_clicked().connect (sigc::mem_fun (*this, &MixerStrip::mono_button_clicked)); - global_vpacker.set_border_width (0); global_vpacker.set_spacing (0); @@ -270,22 +274,19 @@ 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); - gain_meter_alignment.set_padding(0, 4, 0, 0); - gain_meter_alignment.add(gpm); whvbox.pack_start (width_hide_box, true, true); global_vpacker.pack_start (whvbox, Gtk::PACK_SHRINK); - global_vpacker.pack_start (button_table,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 (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); - global_vpacker.pack_start (_mono_button, Gtk::PACK_SHRINK); + global_vpacker.pack_start (top_button_table, Gtk::PACK_SHRINK); + global_vpacker.pack_start (below_panner_box, 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); - global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK); global_frame.add (global_vpacker); global_frame.set_shadow_type (Gtk::SHADOW_IN); @@ -344,7 +345,7 @@ MixerStrip::init () 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, _2), gui_context () + *this, invalidator (*this), boost::bind (&MixerStrip::port_connected_or_disconnected, this, _1, _3), gui_context () ); } @@ -361,11 +362,11 @@ void MixerStrip::set_route (boost::shared_ptr rt) { if (rec_enable_button->get_parent()) { - button_table.remove (*rec_enable_button); + below_panner_box.remove (*rec_enable_button); } if (show_sends_button->get_parent()) { - button_table.remove (*show_sends_button); + below_panner_box.remove (*show_sends_button); } processor_box.set_route (rt); @@ -385,18 +386,14 @@ MixerStrip::set_route (boost::shared_ptr rt) revert_to_default_display (); - if (set_color_from_route()) { - set_color (unique_random_color()); + if (route()->is_master()) { + solo_button->hide (); + below_panner_box.hide (); + } else { + solo_button->show (); + below_panner_box.show (); } - 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) { @@ -410,65 +407,76 @@ MixerStrip::set_route (boost::shared_ptr rt) global_vpacker.pack_start (*spacer, false, false); } + if (is_track()) { + monitor_input_button->show (); + monitor_disk_button->show (); + } else { + monitor_input_button->hide(); + monitor_disk_button->hide (); + } + + 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->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")); + } else { + input_button_box.remove (*midi_input_enable_button); + } + /* get current state */ + midi_input_status_changed (); + input_button_box.pack_start (*midi_input_enable_button, false, false); + /* follow changes */ + midi_track()->InputActiveChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::midi_input_status_changed, this), gui_context()); + } else { + if (midi_input_enable_button) { + /* removal from the container will delete it */ + input_button_box.remove (*midi_input_enable_button); + midi_input_enable_button = 0; + } + } + 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()); } if (has_audio_outputs ()) { - _mono_button.show (); panners.show_all (); } else { - _mono_button.hide (); panners.hide_all (); } if (is_track ()) { - - button_table.attach (*rec_enable_button, 0, 2, 2, 3); + + below_panner_box.pack_start (*rec_enable_button); rec_enable_button->set_sensitive (_session->writable()); rec_enable_button->show(); } else { - + /* non-master bus */ if (!_route->is_master()) { - button_table.attach (*show_sends_button, 0, 2, 2, 3); + below_panner_box.pack_start (*show_sends_button); show_sends_button->show(); } } - 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; - - case MeterCustom: - meter_point_label.set_text (_("custom")); - break; - } + meter_point_label.set_text (meter_point_string (_route->meter_point())); delete route_ops_menu; route_ops_menu = 0; - ARDOUR_UI::instance()->set_tip (comment_button, _route->comment().empty() ? - _("Click to Add/Edit Comments"): - _route->comment()); - _route->meter_change.connect (route_connections, invalidator (*this), bind (&MixerStrip::meter_changed, this), 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, invalidator (*this), boost::bind (&MixerStrip::connect_to_pan, this), gui_context()); + if (_route->panner_shell()) { + _route->panner_shell()->Changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::connect_to_pan, this), gui_context()); } if (is_audio_track()) { @@ -476,20 +484,18 @@ MixerStrip::set_route (boost::shared_ptr rt) } _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); - update_solo_display (); + update_solo_display (); name_changed (); comment_changed (0); route_group_changed (); connect_to_pan (); - panners.setup_pan (); update_diskstream_display (); @@ -514,20 +520,17 @@ MixerStrip::set_route (boost::shared_ptr rt) middle_button_table.show(); bottom_button_table.show(); gpm.show_all (); - gain_meter_alignment.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(); + 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(); @@ -537,25 +540,11 @@ MixerStrip::set_route (boost::shared_ptr rt) void MixerStrip::set_stuff_from_route () { - XMLProperty *prop; - - ensure_xml_node (); - /* if width is not set, it will be set by the MixerUI or editor */ - if ((prop = xml_node->property ("strip-width")) != 0) { - set_width_enum (Width (string_2_enum (prop->value(), _width)), this); - } - - if ((prop = xml_node->property ("shown-mixer")) != 0) { - if (prop->value() == "no") { - _marked_for_display = false; - } else { - _marked_for_display = true; - } - } else { - /* backwards compatibility */ - _marked_for_display = true; + string str = gui_property ("strip-width"); + if (!str.empty()) { + set_width_enum (Width (string_2_enum (str, _width)), this); } } @@ -571,12 +560,10 @@ MixerStrip::set_width_enum (Width w, void* owner) _width_owner = owner; - ensure_xml_node (); - _width = w; if (_width_owner == this) { - xml_node->add_property ("strip-width", enum_2_string (_width)); + set_gui_property ("strip-width", enum_2_string (_width)); } set_button_names (); @@ -587,14 +574,6 @@ MixerStrip::set_width_enum (Width w, void* owner) ((Gtk::Label*)show_sends_button->get_child())->set_text (_("Sends")); } - if (_route->comment() == "") { - comment_button.unset_bg (STATE_NORMAL); - ((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*)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 ( @@ -607,6 +586,9 @@ MixerStrip::set_width_enum (Width w, void* owner) panners.astate_string(_route->panner()->automation_state())); } + _iso_label->show (); + _safe_label->show (); + Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2); set_size_request (-1, -1); break; @@ -616,14 +598,6 @@ MixerStrip::set_width_enum (Width w, void* owner) ((Gtk::Label*)show_sends_button->get_child())->set_text (_("Snd")); } - if (_route->comment() == "") { - comment_button.unset_bg (STATE_NORMAL); - ((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt")); - } else { - comment_button.modify_bg (STATE_NORMAL, color()); - ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*")); - } - ((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 ( @@ -636,13 +610,16 @@ MixerStrip::set_width_enum (Width w, void* owner) panners.short_astate_string(_route->panner()->automation_state())); } + _iso_label->hide (); + _safe_label->hide (); + 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 (); @@ -655,22 +632,26 @@ MixerStrip::set_packed (bool yn) { _packed = yn; - ensure_xml_node (); - if (_packed) { - xml_node->add_property ("shown-mixer", "yes"); + set_gui_property ("visible", true); } else { - xml_node->add_property ("shown-mixer", "no"); + set_gui_property ("visible", false); } } +struct RouteCompareByName { + bool operator() (boost::shared_ptr a, boost::shared_ptr b) { + return a->name().compare (b->name()) < 0; + } +}; + gint MixerStrip::output_press (GdkEventButton *ev) { - using namespace Menu_Helpers; + using namespace Menu_Helpers; if (!_session->engine().connected()) { - MessageDialog msg (_("Not connected to JACK - no I/O changes are possible")); + MessageDialog msg (_("Not connected to JACK - no I/O changes are possible")); msg.run (); return true; } @@ -696,7 +677,7 @@ MixerStrip::output_press (GdkEventButton *ev) boost::shared_ptr b = _session->bundles (); /* give user bundles first chance at being in the menu */ - + for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) { if (boost::dynamic_pointer_cast (*i)) { maybe_add_bundle_to_output_menu (*i, current); @@ -708,9 +689,11 @@ MixerStrip::output_press (GdkEventButton *ev) 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) { + RouteList copy = *routes; + copy.sort (RouteCompareByName ()); + for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) { maybe_add_bundle_to_output_menu ((*i)->input()->bundle(), current); } @@ -724,7 +707,7 @@ MixerStrip::output_press (GdkEventButton *ev) } default: - break; + break; } return TRUE; } @@ -733,7 +716,7 @@ void MixerStrip::edit_output_configuration () { if (output_selector == 0) { - + boost::shared_ptr send; boost::shared_ptr output; @@ -742,11 +725,11 @@ MixerStrip::edit_output_configuration () output = send->output(); } else { output = _route->output (); - } + } } else { output = _route->output (); } - + output_selector = new IOSelectorWindow (_session, output); } @@ -781,12 +764,12 @@ MixerStrip::input_press (GdkEventButton *ev) citems.clear(); if (!_session->engine().connected()) { - MessageDialog msg (_("Not connected to JACK - no I/O changes are possible")); + MessageDialog msg (_("Not connected to JACK - no I/O changes are possible")); msg.run (); return true; } - if (_session->actively_recording() && _route->record_enabled()) + if (_session->actively_recording() && _route->record_enabled()) return true; switch (ev->button) { @@ -806,7 +789,7 @@ MixerStrip::input_press (GdkEventButton *ev) boost::shared_ptr b = _session->bundles (); /* give user bundles first chance at being in the menu */ - + for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) { if (boost::dynamic_pointer_cast (*i)) { maybe_add_bundle_to_input_menu (*i, current); @@ -818,9 +801,11 @@ MixerStrip::input_press (GdkEventButton *ev) 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) { + RouteList copy = *routes; + copy.sort (RouteCompareByName ()); + for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) { maybe_add_bundle_to_input_menu ((*i)->output()->bundle(), current); } @@ -833,7 +818,7 @@ MixerStrip::input_press (GdkEventButton *ev) break; } default: - break; + break; } return TRUE; } @@ -923,7 +908,7 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr b, ARDOUR } output_menu_bundles.push_back (b); - + MenuList& citems = output_menu.items(); std::string n = b->name (); @@ -947,7 +932,7 @@ MixerStrip::update_diskstream_display () input_selector->hide_all (); } - show_route_color (); + route_color_changed (); } else { @@ -967,12 +952,12 @@ MixerStrip::connect_to_pan () return; } - boost::shared_ptr p = _route->pannable (); + boost::shared_ptr p = _route->pannable (); - p->automation_state_changed.connect (panstate_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_state_changed, &panners), gui_context()); - p->automation_style_changed.connect (panstyle_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_style_changed, &panners), gui_context()); + p->automation_state_changed.connect (panstate_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_state_changed, &panners), gui_context()); + p->automation_style_changed.connect (panstyle_connection, invalidator (*this), boost::bind (&PannerUI::pan_automation_style_changed, &panners), gui_context()); - panners.panner_changed (this); + panners.panshell_changed (); } @@ -1058,7 +1043,7 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt } else { port = route->output()->nth (io_index); } - + port_connections.clear (); port->get_connections(port_connections); io_connection_count = 0; @@ -1226,82 +1211,55 @@ MixerStrip::port_connected_or_disconnected (Port* a, Port* b) } void -MixerStrip::comment_editor_done_editing() +MixerStrip::comment_editor_done_editing () { - string str = comment_area->get_buffer()->get_text(); - if (_route->comment() != str) { - _route->set_comment (str, this); - - switch (_width) { - - case Wide: - if (! str.empty()) { - comment_button.modify_bg (STATE_NORMAL, color()); - ((Gtk::Label*)comment_button.get_child())->set_text (_("*Comments*")); - } else { - comment_button.unset_bg (STATE_NORMAL); - ((Gtk::Label*)comment_button.get_child())->set_text (_("Comments")); - } - break; - - case Narrow: - if (! str.empty()) { - comment_button.modify_bg (STATE_NORMAL, color()); - ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*")); - } else { - comment_button.unset_bg (STATE_NORMAL); - ((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt")); - } - break; - } + ignore_toggle = true; + _comment_menu_item->set_active (false); + ignore_toggle = false; - ARDOUR_UI::instance()->set_tip (comment_button, - str.empty() ? _("Click to Add/Edit Comments") : str); + string const str = comment_area->get_buffer()->get_text(); + if (str == _route->comment ()) { + return; } + _route->set_comment (str, this); } void -MixerStrip::comment_button_clicked () +MixerStrip::toggle_comment () { + if (ignore_toggle) { + return; + } + if (comment_window == 0) { setup_comment_editor (); } - int x, y, cw_width, cw_height; - - if (comment_window->is_visible()) { + if (comment_window->is_visible ()) { comment_window->hide (); return; } - comment_window->get_size (cw_width, cw_height); - comment_window->get_position(x, y); - comment_window->move(x, y - (cw_height / 2) - 45); - /* - half the dialog height minus the comments button height - with some window decoration fudge thrown in. - */ + string title; + title = _route->name(); + title += _(": comment editor"); - comment_window->show(); + comment_window->set_title (title); comment_window->present(); } void MixerStrip::setup_comment_editor () { - string title; - title = _route->name(); - title += _(": comment editor"); - - comment_window = new ArdourDialog (title, false); + comment_window = new ArdourDialog ("", false); // 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)); + comment_window->set_default_size (400, 200); comment_area = manage (new TextView()); comment_area->set_name ("MixerTrackCommentArea"); - comment_area->set_size_request (110, 178); comment_area->set_wrap_mode (WRAP_WORD); comment_area->set_editable (true); comment_area->get_buffer()->set_text (_route->comment()); @@ -1325,19 +1283,6 @@ MixerStrip::comment_changed (void *src) } } -/** Set the route group for this strip's route, or remove it from its current group. - * @param rg New RouteGroup, or 0. - */ -void -MixerStrip::set_route_group (RouteGroup *rg) -{ - if (rg) { - rg->add (_route); - } else if (_route->route_group ()) { - _route->route_group()->remove (_route); - } -} - bool MixerStrip::select_route_group (GdkEventButton *ev) { @@ -1354,10 +1299,12 @@ MixerStrip::select_route_group (GdkEventButton *ev) plist->add (Properties::solo, true); group_menu = new RouteGroupMenu (_session, plist); - group_menu->GroupSelected.connect (sigc::mem_fun (*this, &MixerStrip::set_route_group)); } - group_menu->popup (1, ev->time); + WeakRouteList r; + r.push_back (route ()); + group_menu->build (r); + group_menu->menu()->popup (1, ev->time); } return true; @@ -1371,7 +1318,7 @@ MixerStrip::route_group_changed () RouteGroup *rg = _route->route_group(); if (rg) { - group_label.set_text (PBD::short_version (rg->name(), 5)); + group_label.set_text (PBD::short_version (rg->name(), 5)); } else { switch (_width) { case Wide: @@ -1384,31 +1331,18 @@ MixerStrip::route_group_changed () } } - void -MixerStrip::route_gui_changed (string what_changed, void*) -{ - ENSURE_GUI_THREAD (*this, &MixerStrip::route_gui_changed, what_changed, ignored) - - if (what_changed == "color") { - if (set_color_from_route () == 0) { - show_route_color (); - } - } -} - -void -MixerStrip::show_route_color () +MixerStrip::route_color_changed () { name_button.modify_bg (STATE_NORMAL, color()); top_event_box.modify_bg (STATE_NORMAL, color()); - route_active_changed (); + reset_strip_style (); } void MixerStrip::show_passthru_color () { - route_active_changed (); + reset_strip_style (); } void @@ -1420,13 +1354,16 @@ MixerStrip::build_route_ops_menu () MenuList& items = route_ops_menu->items(); + items.push_back (CheckMenuElem (_("Comments..."), sigc::mem_fun (*this, &MixerStrip::toggle_comment))); + _comment_menu_item = dynamic_cast (&items.back ()); 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))); - route_active_menu_item = dynamic_cast (&items.back()); - route_active_menu_item->set_active (_route->active()); + items.push_back (CheckMenuElem (_("Active"))); + 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)); items.push_back (SeparatorElem()); @@ -1440,10 +1377,10 @@ MixerStrip::build_route_ops_menu () if (!Profile->get_sae()) { items.push_back (SeparatorElem()); 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"), sigc::mem_fun(*this, &RouteUI::remove_this_route))); + items.push_back (MenuElem (_("Remove"), sigc::bind (sigc::mem_fun(*this, &RouteUI::remove_this_route), false))); } gboolean @@ -1457,8 +1394,8 @@ MixerStrip::name_button_button_press (GdkEventButton* ev) route_ops_menu->popup (1, ev->time); } else if (ev->button == 1) { - revert_to_default_display (); - } + revert_to_default_display (); + } return false; } @@ -1466,9 +1403,8 @@ MixerStrip::name_button_button_press (GdkEventButton* ev) void MixerStrip::list_route_operations () { - if (route_ops_menu == 0) { - build_route_ops_menu (); - } + delete route_ops_menu; + build_route_ops_menu (); } void @@ -1493,7 +1429,7 @@ MixerStrip::name_changed () RouteUI::property_changed (PropertyChange (ARDOUR::Properties::name)); break; case Narrow: - name_label.set_text (PBD::short_version (_route->name(), 5)); + name_label.set_text (PBD::short_version (_route->name(), 5)); break; } } @@ -1575,13 +1511,6 @@ MixerStrip::hide_processor_editor (boost::weak_ptr p) } } -void -MixerStrip::route_active_changed () -{ - RouteUI::route_active_changed (); - reset_strip_style (); -} - void MixerStrip::reset_strip_style () { @@ -1590,7 +1519,7 @@ MixerStrip::reset_strip_style () gpm.set_fader_name ("SendStripBase"); } else { - + if (is_midi_track()) { if (_route->active()) { set_name ("MidiTrackStripBase"); @@ -1618,7 +1547,7 @@ MixerStrip::reset_strip_style () gpm.set_meter_strip_name ("AudioBusMetricsInactive"); } gpm.set_fader_name ("AudioBusFader"); - + /* (no MIDI busses yet) */ } } @@ -1640,30 +1569,38 @@ MixerStrip::engine_running () { } -/** Called when the metering point has changed */ -void -MixerStrip::meter_changed () +string +MixerStrip::meter_point_string (MeterPoint mp) { - ENSURE_GUI_THREAD (*this, &MixerStrip::meter_changed) - - switch (_route->meter_point()) { + switch (mp) { case MeterInput: - meter_point_label.set_text (_("input")); + return _("in"); break; case MeterPreFader: - meter_point_label.set_text (_("pre")); + return _("pre"); break; case MeterPostFader: - meter_point_label.set_text (_("post")); + return _("post"); + break; + + case MeterOutput: + return _("out"); break; case MeterCustom: - meter_point_label.set_text (_("custom")); + default: + return _("custom"); break; } +} +/** Called when the metering point has changed */ +void +MixerStrip::meter_changed () +{ + meter_point_label.set_text (meter_point_string (_route->meter_point())); gpm.setup_meters (); // reset peak when meter point changes gpm.reset_peak_display(); @@ -1717,16 +1654,16 @@ MixerStrip::drop_send () send_gone_connection.disconnect (); input_button.set_sensitive (true); output_button.set_sensitive (true); - group_button.set_sensitive (true); - set_invert_sensitive (true); - meter_point_button.set_sensitive (true); - mute_button->set_sensitive (true); - solo_button->set_sensitive (true); - rec_enable_button->set_sensitive (true); - _mono_button.set_sensitive (true); - comment_button.set_sensitive (true); - solo_isolated_led->set_sensitive (true); - solo_safe_led->set_sensitive (true); + group_button.set_sensitive (true); + set_invert_sensitive (true); + meter_point_button.set_sensitive (true); + mute_button->set_sensitive (true); + solo_button->set_sensitive (true); + rec_enable_button->set_sensitive (true); + solo_isolated_led->set_sensitive (true); + solo_safe_led->set_sensitive (true); + monitor_input_button->set_sensitive (true); + monitor_disk_button->set_sensitive (true); } void @@ -1751,20 +1688,20 @@ MixerStrip::show_send (boost::shared_ptr send) gain_meter().set_controls (_route, send->meter(), send->amp()); gain_meter().setup_meters (); - panner_ui().set_panner (_current_delivery->panner()); + panner_ui().set_panner (_current_delivery->panner_shell(), _current_delivery->panner()); panner_ui().setup_pan (); input_button.set_sensitive (false); - group_button.set_sensitive (false); - set_invert_sensitive (false); - meter_point_button.set_sensitive (false); - mute_button->set_sensitive (false); - solo_button->set_sensitive (false); - rec_enable_button->set_sensitive (false); - _mono_button.set_sensitive (false); - comment_button.set_sensitive (false); - solo_isolated_led->set_sensitive (false); - solo_safe_led->set_sensitive (false); + group_button.set_sensitive (false); + set_invert_sensitive (false); + meter_point_button.set_sensitive (false); + mute_button->set_sensitive (false); + solo_button->set_sensitive (false); + rec_enable_button->set_sensitive (false); + solo_isolated_led->set_sensitive (false); + solo_safe_led->set_sensitive (false); + monitor_input_button->set_sensitive (false); + monitor_disk_button->set_sensitive (false); if (boost::dynamic_pointer_cast(send)) { output_button.set_sensitive (false); @@ -1787,7 +1724,7 @@ MixerStrip::revert_to_default_display () 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().set_panner (_route->main_outs()->panner_shell(), _route->main_outs()->panner()); panner_ui().setup_pan (); reset_strip_style (); @@ -1796,46 +1733,50 @@ MixerStrip::revert_to_default_display () void MixerStrip::set_button_names () { - switch (_width) { + switch (_width) { case Wide: rec_enable_button_label.set_text (_("Rec")); mute_button_label.set_text (_("Mute")); - 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; - } - } - } + monitor_input_button_label.set_text (_("In")); + monitor_disk_button_label.set_text (_("Disk")); + 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 (_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; - } - } - } + monitor_input_button_label.set_text (_("I")); + monitor_disk_button_label.set_text (_("D")); + 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; } @@ -1861,7 +1802,6 @@ MixerStrip::on_key_press_event (GdkEventKey* ev) break; case GDK_r: - cerr << "Stole that r\n"; rec_enable_press (&fake); return true; break; @@ -1914,7 +1854,6 @@ MixerStrip::on_key_release_event (GdkEventKey* ev) break; case GDK_r: - cerr << "Stole that r\n"; rec_enable_release (&fake); return true; break; @@ -1938,7 +1877,7 @@ MixerStrip::on_key_release_event (GdkEventKey* ev) bool MixerStrip::on_enter_notify_event (GdkEventCrossing*) { - Keyboard::magic_widget_grab_focus (); + Keyboard::magic_widget_grab_focus (); return false; } @@ -1955,14 +1894,66 @@ MixerStrip::on_leave_notify_event (GdkEventCrossing* ev) return false; } +PluginSelector* +MixerStrip::plugin_selector() +{ + return _mixer.plugin_selector(); +} + void -MixerStrip::mono_button_clicked () +MixerStrip::hide_things () { - panners.set_mono (_mono_button.get_active ()); + processor_box.hide_things (); } -PluginSelector* -MixerStrip::plugin_selector() +bool +MixerStrip::input_active_button_press (GdkEventButton*) { - return _mixer.plugin_selector(); + /* nothing happens on press */ + return true; +} + +bool +MixerStrip::input_active_button_release (GdkEventButton* ev) +{ + boost::shared_ptr mt = midi_track (); + + if (!mt) { + 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); + } + + } 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); + } + } + + return true; +} + +void +MixerStrip::midi_input_status_changed () +{ + if (midi_input_enable_button) { + boost::shared_ptr mt = midi_track (); + assert (mt); + midi_input_enable_button->set_active (mt->input_active ()); + } +} + +string +MixerStrip::state_id () const +{ + return string_compose ("strip %1", _route->id().to_s()); }