X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=90d2a2912af334746fe771cf31e0df33b3204b4e;hb=25eb9f406960aa8e36ccd90e2cd4397f372bd0fa;hp=adce954a91afdb8e56790435c55fe0e830fe3cdb;hpb=d57be75d1a7f6060d4fa7a9d836c0c191e6d5240;p=ardour.git diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index adce954a91..90d2a2912a 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -155,13 +155,14 @@ MixerStrip::init () input_button.set_text (_("Input")); input_button.set_name ("mixer strip button"); + input_button.set_size_request (-1, 20); input_button_box.pack_start (input_button, true, true); 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"), ""); + ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Click to select metering point"), ""); meter_point_button.set_name ("mixer strip button"); /* TRANSLATORS: this string should be longest of the strings @@ -206,7 +207,7 @@ MixerStrip::init () top_button_table.attach (*monitor_disk_button, 1, 2, 0, 1); top_button_table.show (); - rec_solo_table.set_homogeneous (false); + rec_solo_table.set_homogeneous (true); rec_solo_table.set_row_spacings (2); rec_solo_table.set_col_spacings (2); rec_solo_table.attach (*solo_isolated_led, 1, 2, 0, 1); @@ -241,14 +242,16 @@ MixerStrip::init () bottom_button_table.set_spacings (2); bottom_button_table.set_homogeneous (true); - bottom_button_table.attach (group_button, 0, 1, 0, 1); +// bottom_button_table.attach (group_button, 0, 1, 0, 1); + bottom_button_table.attach (gpm.gain_automation_state_button, 0, 1, 0, 1); - name_button.set_name ("mixer strip name button"); + name_button.set_name ("mixer strip 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_button.set_size_request (-1, 20); ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), ""); group_button.set_name ("mixer strip button"); @@ -397,6 +400,20 @@ MixerStrip::set_route (boost::shared_ptr rt) revert_to_default_display (); + /* unpack these from the parent and stuff them into our own + table + */ + + if (gpm.peak_display.get_parent()) { + gpm.peak_display.get_parent()->remove (gpm.peak_display); + } + if (gpm.gain_display.get_parent()) { + gpm.gain_display.get_parent()->remove (gpm.gain_display); + } + + middle_button_table.attach (gpm.gain_display,0,1,1,2); + middle_button_table.attach (gpm.peak_display,1,2,1,2); + if (solo_button->get_parent()) { middle_button_table.remove (*solo_button); } @@ -468,12 +485,6 @@ MixerStrip::set_route (boost::shared_ptr rt) at->FreezeChange.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::map_frozen, this), gui_context()); } - if (has_audio_outputs ()) { - panners.show_all (); - } else { - panners.hide_all (); - } - if (is_track ()) { rec_solo_table.attach (*rec_enable_button, 0, 1, 0, 2); @@ -522,6 +533,12 @@ MixerStrip::set_route (boost::shared_ptr rt) connect_to_pan (); panners.setup_pan (); + if (has_audio_outputs ()) { + panners.show_all (); + } else { + panners.hide_all (); + } + update_diskstream_display (); update_input_display (); update_output_display (); @@ -536,6 +553,8 @@ MixerStrip::set_route (boost::shared_ptr rt) } gpm.reset_peak_display (); + gpm.gain_display.show (); + gpm.peak_display.show (); width_button.show(); width_hide_box.show(); @@ -552,6 +571,7 @@ MixerStrip::set_route (boost::shared_ptr rt) name_button.show(); _comment_button.show(); group_button.show(); + gpm.gain_automation_state_button.show(); parameter_changed ("mixer-strip-visibility"); @@ -591,14 +611,15 @@ MixerStrip::set_width_enum (Width w, void* owner) switch (w) { case Wide: + if (show_sends_button) { 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 ( + gpm.gain_automation_style_button.set_text ( gpm.astyle_string(gain_automation->automation_style())); - ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text ( + gpm.gain_automation_state_button.set_text ( gpm.astate_string(gain_automation->automation_state())); if (_route->panner()) { @@ -608,21 +629,20 @@ MixerStrip::set_width_enum (Width w, void* owner) panners.astate_string(_route->panner()->automation_state())); } - solo_isolated_led->set_text (_("iso")); - solo_safe_led->set_text (_("lock")); Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2); set_size_request (-1, -1); break; case Narrow: + if (show_sends_button) { show_sends_button->set_text (_("Snd")); } - ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text ( + gpm.gain_automation_style_button.set_text ( gpm.short_astyle_string(gain_automation->automation_style())); - ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text ( + gpm.gain_automation_state_button.set_text ( gpm.short_astate_string(gain_automation->automation_state())); if (_route->panner()) { @@ -631,9 +651,6 @@ MixerStrip::set_width_enum (Width w, void* owner) ((Gtk::Label*)panners.pan_automation_state_button.get_child())->set_text ( panners.short_astate_string(_route->panner()->automation_state())); } - - solo_isolated_led->set_text (_("i")); - solo_safe_led->set_text (_("L")); Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2); set_size_request (max (50, gpm.get_gm_width()), -1); @@ -772,6 +789,8 @@ MixerStrip::edit_output_configuration () } else { output_selector->present (); } + + output_selector->set_keep_above (true); } void @@ -786,6 +805,8 @@ MixerStrip::edit_input_configuration () } else { input_selector->present (); } + + input_selector->set_keep_above (true); } gint @@ -870,7 +891,7 @@ MixerStrip::input_press (GdkEventButton *ev) } void -MixerStrip::bundle_input_toggled (boost::shared_ptr c) +MixerStrip::bundle_input_chosen (boost::shared_ptr c) { if (ignore_toggle) { return; @@ -879,14 +900,14 @@ MixerStrip::bundle_input_toggled (boost::shared_ptr c) ARDOUR::BundleList current = _route->input()->bundles_connected (); if (std::find (current.begin(), current.end(), c) == current.end()) { - _route->input()->connect_ports_to_bundle (c, this); + _route->input()->connect_ports_to_bundle (c, true, this); } else { _route->input()->disconnect_ports_from_bundle (c, this); } } void -MixerStrip::bundle_output_toggled (boost::shared_ptr c) +MixerStrip::bundle_output_chosen (boost::shared_ptr c) { if (ignore_toggle) { return; @@ -895,14 +916,14 @@ MixerStrip::bundle_output_toggled (boost::shared_ptr c) ARDOUR::BundleList current = _route->output()->bundles_connected (); if (std::find (current.begin(), current.end(), c) == current.end()) { - _route->output()->connect_ports_to_bundle (c, this); + _route->output()->connect_ports_to_bundle (c, true, this); } else { _route->output()->disconnect_ports_from_bundle (c, this); } } void -MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr b, ARDOUR::BundleList const & current) +MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr b, ARDOUR::BundleList const& /*current*/) { using namespace Menu_Helpers; @@ -926,17 +947,11 @@ MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr b, ARDOUR: std::string n = b->name (); replace_all (n, "_", " "); - citems.push_back (CheckMenuElem (n, sigc::bind (sigc::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; - } + citems.push_back (MenuElem (n, sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_input_chosen), b))); } void -MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr b, ARDOUR::BundleList const & current) +MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr b, ARDOUR::BundleList const& /*current*/) { using namespace Menu_Helpers; @@ -960,13 +975,7 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr b, ARDOUR std::string n = b->name (); replace_all (n, "_", " "); - citems.push_back (CheckMenuElem (n, sigc::bind (sigc::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; - } + citems.push_back (MenuElem (n, sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_output_chosen), b))); } void @@ -1077,10 +1086,10 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt if (for_input) { io_count = route->n_inputs().n_total(); - tooltip << string_compose (_("INPUT to %1"), route->name()); + tooltip << string_compose (_("INPUT to %1"), Glib::Markup::escape_text(route->name())); } else { io_count = route->n_outputs().n_total(); - tooltip << string_compose (_("OUTPUT from %1"), route->name()); + tooltip << string_compose (_("OUTPUT from %1"), Glib::Markup::escape_text(route->name())); } @@ -1100,9 +1109,9 @@ MixerStrip::update_io_button (boost::shared_ptr route, Width widt string& connection_name (*i); if (io_connection_count == 0) { - tooltip << endl << port->name().substr(port->name().find("/") + 1) << " -> " << connection_name; + tooltip << endl << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1)) << " -> " << Glib::Markup::escape_text(connection_name); } else { - tooltip << ", " << connection_name; + tooltip << ", " << Glib::Markup::escape_text(connection_name); } if (connection_name.find("ardour:") == 0) { @@ -1221,6 +1230,13 @@ MixerStrip::update_input_display () { update_io_button (_route, _width, true); panners.setup_pan (); + + if (has_audio_outputs ()) { + panners.show_all (); + } else { + panners.hide_all (); + } + } void @@ -1229,6 +1245,12 @@ MixerStrip::update_output_display () update_io_button (_route, _width, false); gpm.setup_meters (); panners.setup_pan (); + + if (has_audio_outputs ()) { + panners.show_all (); + } else { + panners.hide_all (); + } } void @@ -1688,28 +1710,58 @@ MixerStrip::engine_running () string MixerStrip::meter_point_string (MeterPoint mp) { - switch (mp) { - case MeterInput: - return _("in"); - break; - - case MeterPreFader: - return _("pre"); - break; - - case MeterPostFader: - return _("post"); - break; - - case MeterOutput: - return _("out"); + switch (_width) { + case Wide: + switch (mp) { + case MeterInput: + return _("in"); + break; + + case MeterPreFader: + return _("pre"); + break; + + case MeterPostFader: + return _("post"); + break; + + case MeterOutput: + return _("out"); + break; + + case MeterCustom: + default: + return _("custom"); + break; + } break; - - case MeterCustom: - default: - return _("custom"); + case Narrow: + switch (mp) { + case MeterInput: + return _("in"); + break; + + case MeterPreFader: + return _("pr"); + break; + + case MeterPostFader: + return _("po"); + break; + + case MeterOutput: + return _("o"); + break; + + case MeterCustom: + default: + return _("c"); + break; + } break; } + + return string(); } /** Called when the metering point has changed */ @@ -1793,6 +1845,14 @@ MixerStrip::show_send (boost::shared_ptr send) panner_ui().set_panner (_current_delivery->panner_shell(), _current_delivery->panner()); panner_ui().setup_pan (); + /* make sure the send has audio output */ + + if (_current_delivery->output() && _current_delivery->output()->n_ports().n_audio() > 0) { + panners.show_all (); + } else { + panners.hide_all (); + } + input_button.set_sensitive (false); group_button.set_sensitive (false); set_invert_sensitive (false); @@ -1826,6 +1886,12 @@ MixerStrip::revert_to_default_display () panner_ui().set_panner (_route->main_outs()->panner_shell(), _route->main_outs()->panner()); panner_ui().setup_pan (); + if (has_audio_outputs ()) { + panners.show_all (); + } else { + panners.hide_all (); + } + reset_strip_style (); } @@ -1860,6 +1926,8 @@ MixerStrip::set_button_names () } } } + solo_isolated_led->set_text (_("iso")); + solo_safe_led->set_text (_("lock")); break; default: @@ -1889,12 +1957,18 @@ MixerStrip::set_button_names () } } } + solo_isolated_led->set_text (_("i")); + solo_safe_led->set_text (_("L")); break; + } + if (_route) { + meter_point_button.set_text (meter_point_string (_route->meter_point())); + } else { + meter_point_button.set_text (""); } } - PluginSelector* MixerStrip::plugin_selector() { @@ -1923,22 +1997,12 @@ MixerStrip::input_active_button_release (GdkEventButton* ev) 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); - } + boost::shared_ptr rl (new RouteList); - } 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); - } - } + rl->push_back (route()); + + _session->set_exclusive_input_active (rl, !mt->input_active(), + Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))); return true; }