X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=adce954a91afdb8e56790435c55fe0e830fe3cdb;hb=e58e614f2046bf6275a99c24c74a5795b6680a1f;hp=bf82130b95e441585109e6f8150da37036231513;hpb=ef4ac379a330a6a26e4b2da575a2c0010bc41783;p=ardour.git diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index bf82130b95..adce954a91 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -34,27 +34,24 @@ #include #include -#include "ardour/ardour.h" -#include "ardour/amp.h" -#include "ardour/session.h" +#include "ardour/audio_track.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/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/port.h" #include "ardour/profile.h" -#include "ardour/ladspa_plugin.h" +#include "ardour/route.h" +#include "ardour/route_group.h" +#include "ardour/send.h" +#include "ardour/session.h" +#include "ardour/types.h" #include "ardour/user_bundle.h" -#include "ardour/port.h" #include "ardour_ui.h" -#include "ardour_dialog.h" +#include "ardour_window.h" #include "mixer_strip.h" #include "mixer_ui.h" #include "keyboard.h" @@ -91,7 +88,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer) , top_button_table (1, 2) , middle_button_table (1, 2) , bottom_button_table (1, 2) - , meter_point_label (_("pre")) + , meter_point_button (_("pre")) , midi_input_enable_button (0) , _comment_button (_("Comments")) , _visibility (X_("mixer-strip-visibility")) @@ -112,14 +109,14 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr rt , RouteUI (sess) , _mixer(mx) , _mixer_owned (in_mixer) - , processor_box (sess, sigc::mem_fun(*this, &MixerStrip::plugin_selector), mx.selection(), this, in_mixer) + , processor_box (sess, boost::bind (&MixerStrip::plugin_selector, this), mx.selection(), this, in_mixer) , gpm (sess, 250) , panners (sess) , button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL)) , button_table (3, 1) , middle_button_table (1, 2) , bottom_button_table (1, 2) - , meter_point_label (_("pre")) + , meter_point_button (_("pre")) , midi_input_enable_button (0) , _comment_button (_("Comments")) , _visibility (X_("mixer-strip-visibility")) @@ -145,36 +142,27 @@ MixerStrip::init () /* 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"))); - img->show (); - - width_button.add (*img); - - img = manage (new Gtk::Image (::get_icon("hide"))); - img->show (); + string t = _("Click to toggle the width of this mixer strip."); + if (_mixer_owned) { + t += string_compose (_("\n%1-%2-click to toggle the width of all strips."), Keyboard::primary_modifier_name(), Keyboard::tertiary_modifier_name ()); + } + + width_button.set_image (::get_icon("strip_width")); + ARDOUR_UI::instance()->set_tip (width_button, t); - hide_button.add (*img); + hide_button.set_image(::get_icon("hide")); + ARDOUR_UI::instance()->set_tip (&hide_button, _("Hide this mixer strip")); - input_label.set_text (_("Input")); - 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"); + input_button.set_text (_("Input")); + input_button.set_name ("mixer strip button"); 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"), ""); - output_button.add (output_label); - output_button.set_name ("MixerIOButton"); - output_label.set_name ("MixerIOButtonLabel"); + output_button.set_text (_("Output")); + output_button.set_name ("mixer strip button"); 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); - meter_point_button.set_name ("MixerStripMeterPreButton"); - meter_point_label.set_name ("MixerStripMeterPreButton"); + meter_point_button.set_name ("mixer strip button"); /* TRANSLATORS: this string should be longest of the strings used to describe meter points. In english, it's "input". @@ -226,7 +214,7 @@ MixerStrip::init () rec_solo_table.show (); button_table.set_homogeneous (false); - button_table.set_spacings (0); + button_table.set_spacings (2); if (solo_isolated_led) { button_size_group->add_widget (*solo_isolated_led); @@ -251,33 +239,33 @@ MixerStrip::init () middle_button_table.set_homogeneous (true); middle_button_table.set_spacings (2); - bottom_button_table.set_col_spacings (0); + bottom_button_table.set_spacings (2); bottom_button_table.set_homogeneous (true); bottom_button_table.attach (group_button, 0, 1, 0, 1); - name_button.add (name_label); - name_button.set_name ("MixerNameButton"); + name_button.set_name ("mixer strip name button"); + name_button.set_text (" "); /* non empty text, forces creation of the layout */ + name_button.set_text (""); /* back to empty */ + name_button.layout()->set_ellipsize (Pango::ELLIPSIZE_END); + name_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::name_button_resized)); 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"); + group_button.set_name ("mixer strip button"); Gtkmm2ext::set_size_request_to_display_given_text (group_button, "Group", 2, 2); - group_label.set_name ("MixerGroupButtonLabel"); - _comment_button.set_name (X_("MixerCommentButton")); - _comment_button.signal_clicked().connect (sigc::mem_fun (*this, &MixerStrip::toggle_comment)); + _comment_button.set_name (X_("mixer strip button")); + _comment_button.signal_clicked.connect (sigc::mem_fun (*this, &MixerStrip::toggle_comment_editor)); global_vpacker.set_border_width (0); global_vpacker.set_spacing (0); - width_button.set_name ("MixerWidthButton"); - hide_button.set_name ("MixerHideButton"); - top_event_box.set_name ("MixerTopEventBox"); + width_button.set_name ("mixer strip button"); + hide_button.set_name ("mixer strip button"); + top_event_box.set_name ("mixer strip button"); - 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_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::width_button_pressed), false); + 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); @@ -285,13 +273,14 @@ MixerStrip::init () whvbox.pack_start (width_hide_box, true, true); + global_vpacker.set_spacing (2); 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 (panners, Gtk::PACK_SHRINK); - global_vpacker.pack_start (top_button_table, Gtk::PACK_SHRINK, 2); - global_vpacker.pack_start (rec_solo_table, Gtk::PACK_SHRINK, 2); - global_vpacker.pack_start (middle_button_table, Gtk::PACK_SHRINK, 2); + global_vpacker.pack_start (top_button_table, Gtk::PACK_SHRINK); + global_vpacker.pack_start (rec_solo_table, 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); @@ -363,7 +352,7 @@ MixerStrip::init () parameter_changed (X_("mixer-strip-visibility")); - Config->ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, ui_bind (&MixerStrip::parameter_changed, this, _1), gui_context()); + Config->ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, boost::bind (&MixerStrip::parameter_changed, this, _1), gui_context()); gpm.LevelMeterButtonPress.connect_same_thread (_level_meter_connection, boost::bind (&MixerStrip::level_meter_button_press, this, _1)); } @@ -388,10 +377,13 @@ MixerStrip::set_route (boost::shared_ptr rt) rec_solo_table.remove (*show_sends_button); } - processor_box.set_route (rt); - RouteUI::set_route (rt); + /* ProcessorBox needs access to _route so that it can read + GUI object state. + */ + processor_box.set_route (rt); + /* map the current state */ mute_changed (0); @@ -449,10 +441,9 @@ MixerStrip::set_route (boost::shared_ptr rt) 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 = manage (new ArdourButton); + midi_input_enable_button->set_name ("midi input button"); + midi_input_enable_button->set_image (::get_icon (X_("midi_socket_small"))); 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")); @@ -499,7 +490,7 @@ MixerStrip::set_route (boost::shared_ptr rt) } } - meter_point_label.set_text (meter_point_string (_route->meter_point())); + meter_point_button.set_text (meter_point_string (_route->meter_point())); delete route_ops_menu; route_ops_menu = 0; @@ -515,7 +506,8 @@ MixerStrip::set_route (boost::shared_ptr rt) audio_track()->DiskstreamChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::diskstream_changed, this), gui_context()); } - _route->comment_changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::comment_changed, this, _1), gui_context()); + _route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::comment_changed, this, _1), gui_context()); + _route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::property_changed, this, _1), gui_context()); set_stuff_from_route (); @@ -543,6 +535,8 @@ MixerStrip::set_route (boost::shared_ptr rt) hide_button.show(); } + gpm.reset_peak_display (); + width_button.show(); width_hide_box.show(); whvbox.show (); @@ -552,20 +546,12 @@ MixerStrip::set_route (boost::shared_ptr rt) middle_button_table.show(); bottom_button_table.show(); gpm.show_all (); - gain_unit_button.show(); - gain_unit_label.show(); meter_point_button.show(); - meter_point_label.show(); - diskstream_button.show(); - diskstream_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(); parameter_changed ("mixer-strip-visibility"); @@ -606,7 +592,8 @@ MixerStrip::set_width_enum (Width w, void* owner) switch (w) { case Wide: if (show_sends_button) { - show_sends_button->set_text (_("Sends")); + show_sends_button->set_text (_("Aux\nSends")); + show_sends_button->layout()->set_alignment (Pango::ALIGN_CENTER); } ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text ( @@ -624,7 +611,7 @@ MixerStrip::set_width_enum (Width w, void* owner) solo_isolated_led->set_text (_("iso")); solo_safe_led->set_text (_("lock")); - Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2); + Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2); set_size_request (-1, -1); break; @@ -645,10 +632,10 @@ MixerStrip::set_width_enum (Width w, void* owner) panners.short_astate_string(_route->panner()->automation_state())); } - solo_isolated_led->set_text (""); - solo_safe_led->set_text (""); + solo_isolated_led->set_text (_("i")); + solo_safe_led->set_text (_("L")); - Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2); + Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2); set_size_request (max (50, gpm.get_gm_width()), -1); break; } @@ -717,6 +704,7 @@ MixerStrip::output_press (GdkEventButton *ev) } citems.push_back (SeparatorElem()); + uint32_t const n_with_separator = citems.size (); ARDOUR::BundleList current = _route->output()->bundles_connected (); @@ -743,7 +731,7 @@ MixerStrip::output_press (GdkEventButton *ev) maybe_add_bundle_to_output_menu ((*i)->input()->bundle(), current); } - if (citems.size() == 2) { + if (citems.size() == n_with_separator) { /* no routes added; remove the separator */ citems.pop_back (); } @@ -838,6 +826,8 @@ MixerStrip::input_press (GdkEventButton *ev) } citems.push_back (SeparatorElem()); + uint32_t const n_with_separator = citems.size (); + input_menu_bundles.clear (); ARDOUR::BundleList current = _route->input()->bundles_connected (); @@ -865,7 +855,7 @@ MixerStrip::input_press (GdkEventButton *ev) maybe_add_bundle_to_input_menu ((*i)->output()->bundle(), current); } - if (citems.size() == 2) { + if (citems.size() == n_with_separator) { /* no routes added; remove the separator */ citems.pop_back (); } @@ -1085,14 +1075,15 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt ostringstream tooltip; char * tooltip_cstr; - tooltip << route->name(); - if (for_input) { io_count = route->n_inputs().n_total(); + tooltip << string_compose (_("INPUT to %1"), route->name()); } else { io_count = route->n_outputs().n_total(); + tooltip << string_compose (_("OUTPUT from %1"), route->name()); } + for (io_index = 0; io_index < io_count; ++io_index) { if (for_input) { port = route->input()->nth (io_index); @@ -1177,7 +1168,7 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt } if (each_io_has_one_connection) { - if ((total_connection_count == ardour_connection_count)) { + if (total_connection_count == ardour_connection_count) { // all connections are to the same track in ardour // "ardour:Master/" -> "Master" string::size_type slash = ardour_track_name.find("/"); @@ -1211,7 +1202,7 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt switch (width) { case Wide: - label_string = label.str().substr(0, 6); + label_string = label.str().substr(0, 7); break; case Narrow: label_string = label.str().substr(0, 3); @@ -1219,9 +1210,9 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt } if (for_input) { - input_label.set_text (label_string); + input_button.set_text (label_string); } else { - output_label.set_text (label_string); + output_button.set_text (label_string); } } @@ -1277,20 +1268,20 @@ MixerStrip::setup_comment_button () case Wide: if (_route->comment().empty ()) { _comment_button.unset_bg (STATE_NORMAL); - ((Gtk::Label *) _comment_button.get_child ())->set_text (_("Comments")); + _comment_button.set_text (_("Comments")); } else { _comment_button.modify_bg (STATE_NORMAL, color ()); - ((Gtk::Label *) _comment_button.get_child ())->set_text (_("*Comments*")); + _comment_button.set_text (_("*Comments*")); } break; case Narrow: if (_route->comment().empty ()) { _comment_button.unset_bg (STATE_NORMAL); - ((Gtk::Label *) _comment_button.get_child ())->set_text (_("Cmt")); + _comment_button.set_text (_("Cmt")); } else { _comment_button.modify_bg (STATE_NORMAL, color ()); - ((Gtk::Label *) _comment_button.get_child ())->set_text (_("*Cmt*")); + _comment_button.set_text (_("*Cmt*")); } break; } @@ -1313,19 +1304,24 @@ MixerStrip::comment_editor_done_editing () } void -MixerStrip::toggle_comment () +MixerStrip::toggle_comment_editor () { if (ignore_toggle) { return; } - if (comment_window == 0) { - setup_comment_editor (); + if (comment_window && comment_window->is_visible ()) { + comment_window->hide (); + } else { + open_comment_editor (); } +} - if (comment_window->is_visible ()) { - comment_window->hide (); - return; +void +MixerStrip::open_comment_editor () +{ + if (comment_window == 0) { + setup_comment_editor (); } string title; @@ -1339,7 +1335,7 @@ MixerStrip::toggle_comment () void MixerStrip::setup_comment_editor () { - comment_window = new ArdourDialog ("", false); // title will be reset to show route + comment_window = new ArdourWindow (""); // 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)); @@ -1352,8 +1348,7 @@ MixerStrip::setup_comment_editor () comment_area->get_buffer()->set_text (_route->comment()); comment_area->show (); - comment_window->get_vbox()->pack_start (*comment_area); - comment_window->get_action_area()->hide(); + comment_window->add (*comment_area); } void @@ -1405,14 +1400,14 @@ MixerStrip::route_group_changed () RouteGroup *rg = _route->route_group(); if (rg) { - group_label.set_text (PBD::short_version (rg->name(), 5)); + group_button.set_text (PBD::short_version (rg->name(), 5)); } else { switch (_width) { case Wide: - group_label.set_text (_("Grp")); + group_button.set_text (_("Grp")); break; case Narrow: - group_label.set_text (_("~G")); + group_button.set_text (_("~G")); break; } } @@ -1441,16 +1436,16 @@ MixerStrip::build_route_ops_menu () MenuList& items = route_ops_menu->items(); - items.push_back (CheckMenuElem (_("Comments..."), sigc::mem_fun (*this, &MixerStrip::toggle_comment))); - CheckMenuItem* i = dynamic_cast (&items.back ()); - i->set_active (comment_window && comment_window->is_visible ()); - items.push_back (MenuElem (_("Save As Template..."), sigc::mem_fun(*this, &RouteUI::save_as_template))); + items.push_back (MenuElem (_("Comments..."), sigc::mem_fun (*this, &MixerStrip::open_comment_editor))); + if (!_route->is_master()) { + 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"))); - i = dynamic_cast (&items.back()); + 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)); @@ -1475,15 +1470,16 @@ MixerStrip::build_route_ops_menu () gboolean MixerStrip::name_button_button_press (GdkEventButton* ev) { - if (ev->button == 3) { + /* show menu for either button 1 or 3, so as not to confuse people + and also not hide stuff from them. + */ + + if (ev->button == 3 || ev->button == 1) { 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); - - } else if (ev->button == 1) { - revert_to_default_display (); } return false; @@ -1510,30 +1506,66 @@ MixerStrip::set_selected (bool yn) global_frame.queue_draw (); } +void +MixerStrip::property_changed (const PropertyChange& what_changed) +{ + RouteUI::property_changed (what_changed); + + if (what_changed.contains (ARDOUR::Properties::name)) { + name_changed (); + } +} + void MixerStrip::name_changed () { switch (_width) { case Wide: - RouteUI::property_changed (PropertyChange (ARDOUR::Properties::name)); + name_button.set_text (_route->name()); break; case Narrow: - name_label.set_text (PBD::short_version (_route->name(), 5)); + name_button.set_text (PBD::short_version (_route->name(), 5)); break; } + + ARDOUR_UI::instance()->set_tip (name_button, _route->name()); } void -MixerStrip::width_clicked () +MixerStrip::name_button_resized (Gtk::Allocation& alloc) { - switch (_width) { - case Wide: - set_width_enum (Narrow, this); - break; - case Narrow: - set_width_enum (Wide, this); - break; + name_button.layout()->set_width (alloc.get_width() * PANGO_SCALE); +} + +bool +MixerStrip::width_button_pressed (GdkEventButton* ev) +{ + if (ev->button != 1) { + return false; + } + + if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier)) && _mixer_owned) { + switch (_width) { + case Wide: + _mixer.set_strip_width (Narrow); + break; + + case Narrow: + _mixer.set_strip_width (Wide); + break; + } + } else { + switch (_width) { + case Wide: + set_width_enum (Narrow, this); + break; + case Narrow: + set_width_enum (Wide, this); + break; + } } + + return true; } void @@ -1684,7 +1716,7 @@ MixerStrip::meter_point_string (MeterPoint mp) void MixerStrip::meter_changed () { - meter_point_label.set_text (meter_point_string (_route->meter_point())); + meter_point_button.set_text (meter_point_string (_route->meter_point())); gpm.setup_meters (); // reset peak when meter point changes gpm.reset_peak_display(); @@ -1700,6 +1732,7 @@ MixerStrip::bus_send_display_changed (boost::shared_ptr send_to) if (send_to) { boost::shared_ptr send = _route->internal_send_for (send_to); + if (send) { show_send (send); } else { @@ -1715,7 +1748,7 @@ MixerStrip::drop_send () { boost::shared_ptr current_send; - if (_current_delivery && (current_send = boost::dynamic_pointer_cast(_current_delivery))) { + if (_current_delivery && ((current_send = boost::dynamic_pointer_cast(_current_delivery)) != 0)) { current_send->set_metering (false); }