X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=f791314d7519fa0b94288948a39d84e98681479e;hb=29f0d9732eb68fcaa22219cedddddd47bcaa8c17;hp=2ca903ea734151347a819fa8149790f4efcd8792;hpb=670641c3df89af73de36efa5b0a184c2430275b0;p=ardour.git diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 2ca903ea73..f791314d75 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2002 Paul Davis + Copyright (C) 2000-2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -14,45 +14,42 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id$ */ #include -#include +#include #include +#include +#include + #include #include #include -#include #include -#include #include +#include +#include #include #include #include #include #include -#include +#include #include #include -#include +#include #include -#include -#include +#include #include "ardour_ui.h" #include "ardour_dialog.h" #include "mixer_strip.h" #include "mixer_ui.h" #include "keyboard.h" -#include "plugin_selector.h" #include "public_editor.h" - -#include "plugin_ui.h" #include "send_ui.h" #include "io_selector.h" #include "utils.h" @@ -62,9 +59,14 @@ using namespace sigc; using namespace ARDOUR; +using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; +using namespace std; + +int MixerStrip::scrollbar_height = 0; +#ifdef VARISPEED_IN_MIXER_STRIP static void speed_printer (char buf[32], Gtk::Adjustment& adj, void* arg) { @@ -76,22 +78,21 @@ speed_printer (char buf[32], Gtk::Adjustment& adj, void* arg) snprintf (buf, 32, "%.3f", val); } } +#endif -MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer) +MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr rt, bool in_mixer) : AxisView(sess), - RouteUI (rt, sess, _("mute"), _("solo"), _("RECORD")), + 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 (8, 2), - gain_automation_style_button (""), - gain_automation_state_button (""), - pan_automation_style_button (""), - pan_automation_state_button (""), - polarity_button (_("polarity")), - comment_button (_("comments")), + button_table (3, 2), + middle_button_table (1, 2), + bottom_button_table (1, 2), + meter_point_label (_("pre")), + comment_button (_("Comments")), speed_adjustment (1.0, 0.001, 4.0, 0.001, 0.1), speed_spinner (&speed_adjustment, "MixerStripSpeedBase", true) @@ -110,110 +111,85 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer) ignore_speed_adjustment = false; comment_window = 0; comment_area = 0; + _width_owner = 0; - width_button.add (*(manage (new Gtk::Image (get_xpm("lr.xpm"))))); - hide_button.add (*(manage (new Gtk::Image (get_xpm("small_x.xpm"))))); - + 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_label.set_text (_("Input")); input_button.add (input_label); input_button.set_name ("MixerIOButton"); input_label.set_name ("MixerIOButtonLabel"); - output_label.set_text (_("OUTPUT")); + output_label.set_text (_("Output")); output_button.add (output_label); output_button.set_name ("MixerIOButton"); output_label.set_name ("MixerIOButtonLabel"); - rec_enable_button->set_name ("MixerRecordEnableButton"); - rec_enable_button->unset_flags (Gtk::CAN_FOCUS); - - solo_button->set_name ("MixerSoloButton"); - mute_button->set_name ("MixerMuteButton"); - gain_automation_style_button.set_name ("MixerAutomationModeButton"); - gain_automation_state_button.set_name ("MixerAutomationPlaybackButton"); - pan_automation_style_button.set_name ("MixerAutomationModeButton"); - pan_automation_state_button.set_name ("MixerAutomationPlaybackButton"); - polarity_button.set_name ("MixerPhaseInvertButton"); - - ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_state_button, _("Pan automation mode")); - ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_state_button, _("Gain automation mode")); - - ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_style_button, _("Pan automation type")); - ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_style_button, _("Gain automation type")); + _route->meter_change.connect (mem_fun(*this, &MixerStrip::meter_changed)); + meter_point_button.add (meter_point_label); + meter_point_button.set_name ("MixerStripMeterPreButton"); + meter_point_label.set_name ("MixerStripMeterPreButton"); + + 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; + } + + /* TRANSLATORS: this string should be longest of the strings + used to describe meter points. In english, it's "input". + */ + set_size_request_to_display_given_text (meter_point_button, _("tupni"), 5, 5); + + bottom_button_table.attach (meter_point_button, 1, 2, 0, 1); + + meter_point_button.signal_button_press_event().connect (mem_fun (gpm, &GainMeter::meter_press), false); + /* XXX what is this meant to do? */ + //meter_point_button.signal_button_release_event().connect (mem_fun (gpm, &GainMeter::meter_release), false); hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK)); - width_button.unset_flags (Gtk::CAN_FOCUS); - hide_button.unset_flags (Gtk::CAN_FOCUS); - input_button.unset_flags (Gtk::CAN_FOCUS); - output_button.unset_flags (Gtk::CAN_FOCUS); - solo_button->unset_flags (Gtk::CAN_FOCUS); - mute_button->unset_flags (Gtk::CAN_FOCUS); - gain_automation_style_button.unset_flags (Gtk::CAN_FOCUS); - gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS); - pan_automation_style_button.unset_flags (Gtk::CAN_FOCUS); - pan_automation_state_button.unset_flags (Gtk::CAN_FOCUS); - polarity_button.unset_flags (Gtk::CAN_FOCUS); + mute_button->set_name ("MixerMuteButton"); + solo_button->set_name ("MixerSoloButton"); button_table.set_homogeneous (true); + button_table.set_spacings (0); button_table.attach (name_button, 0, 2, 0, 1); - button_table.attach (group_button, 0, 2, 1, 2); - button_table.attach (input_button, 0, 2, 2, 3); - - button_table.attach (polarity_button, 0, 2, 3, 4); - - button_table.attach (*solo_button, 0, 1, 4, 5); - button_table.attach (*mute_button, 1, 2, 4, 5); + button_table.attach (input_button, 0, 2, 1, 2); - // button_table.attach (gain_automation_style_button, 0, 1, 5, 6); - button_table.attach (gain_automation_state_button, 0, 1, 5, 6); - // button_table.attach (pan_automation_style_button, 0, 1, 6, 7); - button_table.attach (pan_automation_state_button, 1, 2, 5, 6); + middle_button_table.set_homogeneous (true); + middle_button_table.set_spacings (0); + middle_button_table.attach (*mute_button, 0, 1, 0, 1); + middle_button_table.attach (*solo_button, 1, 2, 0, 1); - using namespace Menu_Helpers; - - gain_astate_menu.items().push_back (MenuElem (_("off"), - bind (mem_fun (_route, &IO::set_gain_automation_state), (AutoState) Off))); - gain_astate_menu.items().push_back (MenuElem (_("play"), - bind (mem_fun (_route, &IO::set_gain_automation_state), (AutoState) Play))); - gain_astate_menu.items().push_back (MenuElem (_("write"), - bind (mem_fun (_route, &IO::set_gain_automation_state), (AutoState) Write))); - gain_astate_menu.items().push_back (MenuElem (_("touch"), - bind (mem_fun (_route, &IO::set_gain_automation_state), (AutoState) Touch))); - - gain_astyle_menu.items().push_back (MenuElem (_("trim"))); - gain_astyle_menu.items().push_back (MenuElem (_("abs"))); - - pan_astate_menu.items().push_back (MenuElem (_("off"), - bind (mem_fun (_route.panner(), &Panner::set_automation_state), (AutoState) Off))); - pan_astate_menu.items().push_back (MenuElem (_("play"), - bind (mem_fun (_route.panner(), &Panner::set_automation_state), (AutoState) Play))); - pan_astate_menu.items().push_back (MenuElem (_("write"), - bind (mem_fun (_route.panner(), &Panner::set_automation_state), (AutoState) Write))); - pan_astate_menu.items().push_back (MenuElem (_("touch"), - bind (mem_fun (_route.panner(), &Panner::set_automation_state), (AutoState) Touch))); - - pan_astyle_menu.items().push_back (MenuElem (_("trim"))); - pan_astyle_menu.items().push_back (MenuElem (_("abs"))); + bottom_button_table.set_col_spacings (0); + bottom_button_table.set_homogeneous (true); + bottom_button_table.attach (group_button, 0, 1, 0, 1); - gain_astate_menu.set_name ("ArdourContextMenu"); - gain_astyle_menu.set_name ("ArdourContextMenu"); - pan_astate_menu.set_name ("ArdourContextMenu"); - pan_astyle_menu.set_name ("ArdourContextMenu"); - - ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_style_button, _("gain automation mode")); - ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_style_button, _("pan automation mode")); - ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_state_button, _("gain automation state")); - ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_state_button, _("pan automation state")); - if (is_audio_track()) { - AudioTrack* at = dynamic_cast(&_route); + rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press), false); + rec_enable_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::rec_enable_release)); + + rec_enable_button->set_name ("MixerRecordEnableButton"); + + boost::shared_ptr at = audio_track(); at->FreezeChange.connect (mem_fun(*this, &MixerStrip::map_frozen)); +#ifdef VARISPEED_IN_MIXER_STRIP speed_adjustment.signal_value_changed().connect (mem_fun(*this, &MixerStrip::speed_adjustment_changed)); speed_frame.set_name ("BaseFrame"); @@ -222,10 +198,12 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer) speed_spinner.set_print_func (speed_printer, 0); - ARDOUR_UI::instance()->tooltips().set_tip (speed_spinner, _("varispeed")); + ARDOUR_UI::instance()->tooltips().set_tip (speed_spinner, _("Varispeed")); + + button_table.attach (speed_frame, 0, 2, 5, 6); +#endif /* VARISPEED_IN_MIXER_STRIP */ - button_table.attach (speed_frame, 0, 2, 6, 7); - button_table.attach (*rec_enable_button, 0, 2, 7, 8); + button_table.attach (*rec_enable_button, 0, 2, 2, 3); } name_button.add (name_label); @@ -233,43 +211,70 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer) Gtkmm2ext::set_size_request_to_display_given_text (name_button, "longest label", 2, 2); name_label.set_name ("MixerNameButtonLabel"); - name_label.set_text (_route.name()); + if (_route->phase_invert()) { + name_label.set_text (X_("Ø ") + name_label.get_text()); + } else { + name_label.set_text (_route->name()); + } group_button.add (group_label); group_button.set_name ("MixerGroupButton"); group_label.set_name ("MixerGroupButtonLabel"); comment_button.set_name ("MixerCommentButton"); - ARDOUR_UI::instance()->tooltips().set_tip (comment_button, _route.comment()=="" ? - _("click to add/edit comments"): - _route.comment()); + + ARDOUR_UI::instance()->tooltips().set_tip (comment_button, _route->comment()=="" ? + _("Click to Add/Edit Comments"): + _route->comment()); + comment_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::comment_button_clicked)); global_vpacker.set_border_width (0); global_vpacker.set_spacing (0); - Gtk::VBox *whvbox = manage (new Gtk::VBox); + VBox *whvbox = manage (new VBox); width_button.set_name ("MixerWidthButton"); hide_button.set_name ("MixerHideButton"); + top_event_box.set_name ("MixerTopEventBox"); width_button.signal_clicked().connect (mem_fun(*this, &MixerStrip::width_clicked)); hide_button.signal_clicked().connect (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); 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); 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 (pre_redirect_box, true, true); - global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK); - global_vpacker.pack_start (post_redirect_box, true, true); - global_vpacker.pack_start (panners, 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 (bottom_button_table,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()->is_master() || route()->is_control()) { + + if (scrollbar_height == 0) { + HScrollbar scrollbar; + Gtk::Requisition requisition(scrollbar.size_request ()); + scrollbar_height = requisition.height; + } + + EventBox* spacer = manage (new EventBox); + spacer->set_size_request (-1, scrollbar_height); + global_vpacker.pack_start (*spacer, false, false); + } + global_frame.add (global_vpacker); global_frame.set_shadow_type (Gtk::SHADOW_IN); global_frame.set_name ("BaseFrame"); @@ -284,49 +289,35 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer) _packed = false; _embedded = false; - _route.input_changed.connect (mem_fun(*this, &MixerStrip::input_changed)); - _route.output_changed.connect (mem_fun(*this, &MixerStrip::output_changed)); - _route.mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed)); - _route.solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed)); - _route.solo_safe_changed.connect (mem_fun(*this, &RouteUI::solo_changed)); - _route.mix_group_changed.connect (mem_fun(*this, &MixerStrip::mix_group_changed)); - _route.gain_automation_curve().automation_state_changed.connect (mem_fun(*this, &MixerStrip::gain_automation_state_changed)); - _route.gain_automation_curve().automation_style_changed.connect (mem_fun(*this, &MixerStrip::gain_automation_style_changed)); - _route.panner().Changed.connect (mem_fun(*this, &MixerStrip::connect_to_pan)); + _session.engine().Stopped.connect (mem_fun(*this, &MixerStrip::engine_stopped)); + _session.engine().Running.connect (mem_fun(*this, &MixerStrip::engine_running)); + _route->input_changed.connect (mem_fun(*this, &MixerStrip::input_changed)); + _route->output_changed.connect (mem_fun(*this, &MixerStrip::output_changed)); + _route->mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed)); + _route->solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed)); + _route->solo_safe_changed.connect (mem_fun(*this, &RouteUI::solo_changed)); + _route->mix_group_changed.connect (mem_fun(*this, &MixerStrip::mix_group_changed)); + _route->panner().Changed.connect (mem_fun(*this, &MixerStrip::connect_to_pan)); if (is_audio_track()) { - audio_track()->diskstream_changed.connect (mem_fun(*this, &MixerStrip::diskstream_changed)); - get_diskstream()->speed_changed.connect (mem_fun(*this, &MixerStrip::speed_changed)); + audio_track()->DiskstreamChanged.connect (mem_fun(*this, &MixerStrip::diskstream_changed)); + get_diskstream()->SpeedChanged.connect (mem_fun(*this, &MixerStrip::speed_changed)); } - _route.name_changed.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)); - - input_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::input_press), false); - output_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::output_press), false); - - rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press)); - solo_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::solo_press)); - solo_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::solo_release)); - mute_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::mute_press)); - mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release)); - - gain_automation_style_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::gain_automation_style_button_event), false); - gain_automation_style_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::gain_automation_style_button_event), false); - pan_automation_style_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::pan_automation_style_button_event), false); - pan_automation_style_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::pan_automation_style_button_event), false); + _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)); - gain_automation_state_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::gain_automation_state_button_event), false); - gain_automation_state_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::gain_automation_state_button_event), false); - pan_automation_state_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::pan_automation_state_button_event), false); - pan_automation_state_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::pan_automation_state_button_event), false); + input_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::input_press), false); + output_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::output_press), false); - polarity_button.signal_toggled().connect (mem_fun(*this, &MixerStrip::polarity_toggled)); + solo_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::solo_press), false); + solo_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::solo_release), false); + mute_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::mute_press), false); + mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release), false); - name_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::name_button_button_release), false); - - group_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::select_mix_group), false); + name_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::name_button_button_press), false); + group_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::select_mix_group), false); _width = (Width) -1; set_stuff_from_route (); @@ -335,19 +326,21 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer) 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); - gain_automation_state_changed (); - pan_automation_state_changed (); + connect_to_pan (); panners.setup_pan (); @@ -356,15 +349,46 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer) speed_changed (); } - /* XXX hack: no phase invert changed signal */ - - polarity_button.set_active (_route.phase_invert()); - update_diskstream_display (); update_input_display (); 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 () @@ -384,22 +408,13 @@ 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) { - if (prop->value() == "wide") { - set_width (Wide); - } else if (prop->value() == "narrow") { - set_width (Narrow); - } - else { - error << string_compose(_("unknown strip width \"%1\" in XML GUI information"), prop->value()) << endmsg; - set_width (Wide); - } - } - else { - set_width (Wide); + set_width (Width (string_2_enum (prop->value(), _width)), this); } if ((prop = xml_node->property ("shown_mixer")) != 0) { @@ -408,22 +423,26 @@ MixerStrip::set_stuff_from_route () } else { _marked_for_display = true; } - } - else { + } else { /* backwards compatibility */ _marked_for_display = true; } } void -MixerStrip::set_width (Width w) +MixerStrip::set_width (Width w, void* owner) { /* always set the gpm width again, things may be hidden */ + 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; + if (_width == w) { return; } @@ -432,44 +451,64 @@ MixerStrip::set_width (Width w) _width = w; + if (_width_owner == this) { + xml_node->add_property ("strip_width", enum_2_string (_width)); + } + switch (w) { case Wide: set_size_request (-1, -1); - xml_node->add_property ("strip_width", "wide"); - - static_cast (rec_enable_button->get_child())->set_text (_("RECORD")); - static_cast (mute_button->get_child())->set_text (_("mute")); - static_cast (solo_button->get_child())->set_text (_("solo")); - static_cast (comment_button.get_child())->set_text (_("comments")); - static_cast (gain_automation_style_button.get_child())->set_text (astyle_string(_route.gain_automation_curve().automation_style())); - static_cast (gain_automation_state_button.get_child())->set_text (astate_string(_route.gain_automation_curve().automation_state())); - static_cast (pan_automation_style_button.get_child())->set_text (astyle_string(_route.panner().automation_style())); - static_cast (pan_automation_state_button.get_child())->set_text (astate_string(_route.panner().automation_state())); - static_cast (polarity_button.get_child())->set_text (_("polarity")); + + if (rec_enable_button) { + ((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")); + } 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 (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); break; case Narrow: - set_size_request (50, -1); - xml_node->add_property ("strip_width", "narrow"); - - static_cast (rec_enable_button->get_child())->set_text (_("REC")); - static_cast (mute_button->get_child())->set_text (_("m")); - static_cast (solo_button->get_child())->set_text (_("s")); - static_cast (comment_button.get_child())->set_text (_("cmt")); - static_cast (gain_automation_style_button.get_child())->set_text (short_astyle_string(_route.gain_automation_curve().automation_style())); - static_cast (gain_automation_state_button.get_child())->set_text (short_astate_string(_route.gain_automation_curve().automation_state())); - static_cast (pan_automation_style_button.get_child())->set_text (short_astyle_string(_route.panner().automation_style())); - static_cast (pan_automation_state_button.get_child())->set_text (short_astate_string(_route.panner().automation_state())); - static_cast (polarity_button.get_child())->set_text (_("pol")); + if (rec_enable_button) { + ((Gtk::Label*)rec_enable_button->get_child())->set_text (_("Rec")); + } + ((Gtk::Label*)mute_button->get_child())->set_text (_("M")); + ((Gtk::Label*)solo_button->get_child())->set_text (_("S")); + + 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 (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); + set_size_request (max (50, gpm.get_gm_width()), -1); break; } update_input_display (); update_output_display (); mix_group_changed (0); - name_changed (0); + name_changed (); + } void @@ -490,27 +529,35 @@ MixerStrip::set_packed (bool yn) 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; } MenuList& citems = output_menu.items(); - 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()); - - _session.foreach_connection (this, &MixerStrip::add_connection_to_output_menu); + switch (ev->button) { - output_menu.popup (1, ev->time); + case 1: + 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()); + + _session.foreach_bundle ( + bind (mem_fun (*this, &MixerStrip::add_bundle_to_output_menu), _route->output_bundle ()) + ); + output_menu.popup (1, ev->time); + break; + + default: + break; + } return TRUE; } @@ -524,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 (); } } @@ -538,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 (); } } @@ -550,79 +597,84 @@ MixerStrip::input_press (GdkEventButton *ev) MenuList& citems = input_menu.items(); input_menu.set_name ("ArdourContextMenu"); 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 ADVANCED_ROUTE_DISKSTREAM_CONNECTIVITY - if (is_audio_track()) { - citems.push_back (MenuElem (_("Track"), mem_fun(*this, &MixerStrip::select_stream_input))); - } -#endif - 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()); + switch (ev->button) { - _session.foreach_connection (this, &MixerStrip::add_connection_to_input_menu); - input_menu.popup (1, ev->time); + case 1: + 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()); + + _session.foreach_bundle ( + bind (mem_fun (*this, &MixerStrip::add_bundle_to_input_menu), _route->input_bundle ()) + ); + input_menu.popup (1, ev->time); + break; + + default: + break; + } return TRUE; } 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()) { + 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; @@ -631,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()) { + + 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))); + citems.push_back (CheckMenuElem (b->name(), bind (mem_fun(*this, &MixerStrip::bundle_output_chosen), b))); - ARDOUR::Connection *current = _route.output_connection(); - - if (current == c) { + if (current == b) { ignore_toggle = true; dynamic_cast (&citems.back())->set_active (true); ignore_toggle = false; @@ -654,46 +707,10 @@ MixerStrip::add_connection_to_output_menu (ARDOUR::Connection* c) } } -void -MixerStrip::select_stream_input () -{ - using namespace Menu_Helpers; - - Menu *stream_menu = manage (new Menu); - MenuList& items = stream_menu->items(); - stream_menu->set_name ("ArdourContextMenu"); - - Session::DiskStreamList streams = _session.disk_streams(); - - for (Session::DiskStreamList::iterator i = streams.begin(); i != streams.end(); ++i) { - - if (!(*i)->hidden()) { - - items.push_back (CheckMenuElem ((*i)->name(), bind (mem_fun(*this, &MixerStrip::stream_input_chosen), *i))); - - if (get_diskstream() == *i) { - ignore_toggle = true; - static_cast (&items.back())->set_active (true); - ignore_toggle = false; - } - } - } - - stream_menu->popup (1, 0); -} - -void -MixerStrip::stream_input_chosen (DiskStream *stream) -{ - if (is_audio_track()) { - audio_track()->set_diskstream (*stream, this); - } -} - void MixerStrip::update_diskstream_display () { - if (is_audio_track()) { + if (is_track()) { map_frozen (); @@ -718,15 +735,15 @@ void MixerStrip::connect_to_pan () { ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::connect_to_pan)); - + panstate_connection.disconnect (); panstyle_connection.disconnect (); - if (!_route.panner().empty()) { - StreamPanner* sp = _route.panner().front(); + if (!_route->panner().empty()) { + StreamPanner* sp = _route->panner().front(); - panstate_connection = sp->automation().automation_state_changed.connect (mem_fun(*this, &MixerStrip::pan_automation_state_changed)); - panstyle_connection = sp->automation().automation_style_changed.connect (mem_fun(*this, &MixerStrip::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); @@ -735,313 +752,103 @@ 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) { case Wide: - input_label.set_text (_("INPUT")); + input_label.set_text (_(" Input")); break; case Narrow: - input_label.set_text (_("IN")); + input_label.set_text (_("I")); break; } } - panners.setup_pan (); } 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) { case Wide: - output_label.set_text (_("OUTPUT")); + output_label.set_text (_("Output")); break; case Narrow: - output_label.set_text (_("OUT")); + output_label.set_text (_("O")); break; } } - gpm.setup_meters (); panners.setup_pan (); } -void -MixerStrip::update () -{ - gpm.update_meters (); -} - void MixerStrip::fast_update () { - if (_session.meter_falloff() > 0.0f) { - gpm.update_meters_falloff (); - } -} - -gint -MixerStrip::gain_automation_state_button_event (GdkEventButton *ev) -{ - if (ev->type == GDK_BUTTON_PRESS || ev->type == GDK_2BUTTON_PRESS) { - return TRUE; - } - - switch (ev->button) { - case 1: - switch (ev->button) { - case 1: - gain_astate_menu.popup (1, ev->time); - break; - default: - break; - } - } - - return TRUE; -} - -gint -MixerStrip::gain_automation_style_button_event (GdkEventButton *ev) -{ - if (ev->type == GDK_BUTTON_PRESS || ev->type == GDK_2BUTTON_PRESS) { - return TRUE; - } - - switch (ev->button) { - case 1: - gain_astyle_menu.popup (1, ev->time); - break; - default: - break; - } - return TRUE; -} - -gint -MixerStrip::pan_automation_state_button_event (GdkEventButton *ev) -{ - using namespace Menu_Helpers; - - if (ev->type == GDK_BUTTON_PRESS || ev->type == GDK_2BUTTON_PRESS) { - return TRUE; - } - - switch (ev->button) { - case 1: - pan_astate_menu.popup (1, ev->time); - break; - default: - break; - } - - return TRUE; -} - -gint -MixerStrip::pan_automation_style_button_event (GdkEventButton *ev) -{ - switch (ev->button) { - case 1: - pan_astyle_menu.popup (1, ev->time); - break; - default: - break; - } - return TRUE; -} - -string -MixerStrip::astate_string (AutoState state) -{ - return _astate_string (state, false); -} - -string -MixerStrip::short_astate_string (AutoState state) -{ - return _astate_string (state, true); -} - -string -MixerStrip::_astate_string (AutoState state, bool shrt) -{ - string sstr; - - switch (state) { - case Off: - sstr = (shrt ? "--" : _("off")); - break; - case Play: - sstr = (shrt ? "P" : _("aplay")); - break; - case Touch: - sstr = (shrt ? "T" : _("touch")); - break; - case Write: - sstr = (shrt ? "W" : _("awrite")); - break; - } - - return sstr; -} - -string -MixerStrip::astyle_string (AutoStyle style) -{ - return _astyle_string (style, false); -} - -string -MixerStrip::short_astyle_string (AutoStyle style) -{ - return _astyle_string (style, true); -} - -string -MixerStrip::_astyle_string (AutoStyle style, bool shrt) -{ - if (style & Trim) { - return _("trim"); - } else { - /* XXX it might different in different languages */ - - return (shrt ? _("abs") : _("abs")); - } + gpm.update_meters (); } void -MixerStrip::diskstream_changed (void *src) +MixerStrip::diskstream_changed () { Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_diskstream_display)); } void -MixerStrip::gain_automation_style_changed () +MixerStrip::input_changed (IOChange change, void *src) { - switch (_width) { - case Wide: - static_cast (gain_automation_style_button.get_child())->set_text (astyle_string(_route.gain_automation_curve().automation_style())); - break; - case Narrow: - static_cast (gain_automation_style_button.get_child())->set_text (short_astyle_string(_route.gain_automation_curve().automation_style())); - break; - } + Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_input_display)); } void -MixerStrip::gain_automation_state_changed () +MixerStrip::output_changed (IOChange change, void *src) { - ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::gain_automation_state_changed)); - - bool x; - - switch (_width) { - case Wide: - static_cast (gain_automation_state_button.get_child())->set_text (astate_string(_route.gain_automation_curve().automation_state())); - break; - case Narrow: - static_cast (gain_automation_state_button.get_child())->set_text (short_astate_string(_route.gain_automation_curve().automation_state())); - break; - } - - x = (_route.gain_automation_state() != Off); - - if (gain_automation_state_button.get_active() != x) { - ignore_toggle = true; - gain_automation_state_button.set_active (x); - ignore_toggle = false; - } - - gpm.update_gain_sensitive (); - - /* start watching automation so that things move */ - - gain_watching.disconnect(); - - if (x) { - gain_watching = ARDOUR_UI::RapidScreenUpdate.connect (mem_fun (gpm, &GainMeter::effective_gain_display)); - } + Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_output_display)); } -void -MixerStrip::pan_automation_style_changed () -{ - ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::pan_automation_style_changed)); - - switch (_width) { - case Wide: - static_cast (pan_automation_style_button.get_child())->set_text (astyle_string(_route.panner().automation_style())); - break; - case Narrow: - static_cast (pan_automation_style_button.get_child())->set_text (short_astyle_string(_route.panner().automation_style())); - break; - } -} -void -MixerStrip::pan_automation_state_changed () +void +MixerStrip::comment_editor_done_editing() { - ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::pan_automation_state_changed)); - - bool x; - - switch (_width) { - case Wide: - static_cast (pan_automation_state_button.get_child())->set_text (astate_string(_route.panner().automation_state())); - break; - case Narrow: - static_cast (pan_automation_state_button.get_child())->set_text (short_astate_string(_route.panner().automation_state())); - break; - } - - /* when creating a new session, we get to create busses (and - sometimes tracks) with no outputs by the time they get - here. - */ - - if (_route.panner().empty()) { - return; - } - - x = (_route.panner().front()->automation().automation_state() != Off); - - if (pan_automation_state_button.get_active() != x) { - ignore_toggle = true; - pan_automation_state_button.set_active (x); - ignore_toggle = false; - } - - panners.update_pan_sensitive (); - - /* start watching automation so that things move */ - - pan_watching.disconnect(); + string str = comment_area->get_buffer()->get_text(); + if (_route->comment() != str) { + _route->set_comment (str, this); - if (x) { - pan_watching = ARDOUR_UI::RapidScreenUpdate.connect (mem_fun (panners, &PannerUI::effective_pan_display)); + 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; + } + + ARDOUR_UI::instance()->tooltips().set_tip (comment_button, + str.empty() ? _("Click to Add/Edit Comments") : str); } -} -void -MixerStrip::input_changed (IOChange change, void *src) -{ - Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_input_display)); -} - -void -MixerStrip::output_changed (IOChange change, void *src) -{ - Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_output_display)); } void @@ -1051,50 +858,47 @@ MixerStrip::comment_button_clicked () setup_comment_editor (); } + int x, y, cw_width, cw_height; + if (comment_window->is_visible()) { comment_window->hide (); return; - } - - comment_window->set_position (Gtk::WIN_POS_MOUSE); - comment_window->show_all (); - comment_window->present(); - - ResponseType response = (ResponseType) comment_window->run(); - comment_window->hide (); - - switch (response) { - case RESPONSE_ACCEPT: - break; - default: - return; } - string str = comment_area->get_buffer()->get_text(); - _route.set_comment (str, this); - ARDOUR_UI::instance()->tooltips().set_tip (comment_button, - str.empty() ? _("click to add/edit comments") : str); + 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. + */ + + comment_window->show(); + comment_window->present(); } void MixerStrip::setup_comment_editor () { string title; - title = _route.name(); + title = _route->name(); title += _(": comment editor"); comment_window = new ArdourDialog (title, false); - comment_area = manage (new TextView()); + comment_window->set_position (Gtk::WIN_POS_MOUSE); + comment_window->set_skip_taskbar_hint (true); + comment_window->signal_hide().connect (mem_fun(*this, &MixerStrip::comment_editor_done_editing)); + 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()); - comment_area->set_size_request (200,100); + comment_area->get_buffer()->set_text (_route->comment()); comment_area->show (); comment_window->get_vbox()->pack_start (*comment_area); - comment_window->add_button (Stock::CANCEL, RESPONSE_CANCEL); - comment_window->add_button (Stock::OK, RESPONSE_ACCEPT); + comment_window->get_action_area()->hide(); } void @@ -1105,7 +909,7 @@ MixerStrip::comment_changed (void *src) if (src != this) { ignore_comment_edit = true; if (comment_area) { - comment_area->get_buffer()->set_text (_route.comment()); + comment_area->get_buffer()->set_text (_route->comment()); } ignore_comment_edit = false; } @@ -1114,7 +918,7 @@ MixerStrip::comment_changed (void *src) void MixerStrip::set_mix_group (RouteGroup *rg) { - _route.set_mix_group (rg, this); + _route->set_mix_group (rg, this); } void @@ -1126,7 +930,7 @@ MixerStrip::add_mix_group_to_menu (RouteGroup *rg, RadioMenuItem::Group* group) items.push_back (RadioMenuElem (*group, rg->name(), bind (mem_fun(*this, &MixerStrip::set_mix_group), rg))); - if (_route.mix_group() == rg) { + if (_route->mix_group() == rg) { static_cast(&items.back())->set_active (); } } @@ -1137,19 +941,27 @@ MixerStrip::select_mix_group (GdkEventButton *ev) using namespace Menu_Helpers; if (group_menu == 0) { - group_menu = new Menu; + group_menu = new Menu; } group_menu->set_name ("ArdourContextMenu"); MenuList& items = group_menu->items(); RadioMenuItem::Group group; - items.clear (); - items.push_back (RadioMenuElem (group, _("no group"), bind (mem_fun(*this, &MixerStrip::set_mix_group), (RouteGroup *) 0))); + switch (ev->button) { + case 1: - _session.foreach_mix_group (bind (mem_fun (*this, &MixerStrip::add_mix_group_to_menu), &group)); - - group_menu->popup (1, 0); + items.clear (); + items.push_back (RadioMenuElem (group, _("No group"), bind (mem_fun(*this, &MixerStrip::set_mix_group), (RouteGroup *) 0))); + + _session.foreach_mix_group (bind (mem_fun (*this, &MixerStrip::add_mix_group_to_menu), &group)); + + group_menu->popup (1, ev->time); + break; + default: + break; + } + return true; } @@ -1158,14 +970,14 @@ MixerStrip::mix_group_changed (void *ignored) { ENSURE_GUI_THREAD(bind (mem_fun(*this, &MixerStrip::mix_group_changed), ignored)); - RouteGroup *rg = _route.mix_group(); + RouteGroup *rg = _route->mix_group(); if (rg) { group_label.set_text (rg->name()); } else { switch (_width) { case Wide: - group_label.set_text (_("no group")); + group_label.set_text (_("Grp")); break; case Narrow: group_label.set_text (_("~G")); @@ -1174,16 +986,6 @@ MixerStrip::mix_group_changed (void *ignored) } } -void -MixerStrip::polarity_toggled () -{ - bool x; - - if ((x = polarity_button.get_active()) != _route.phase_invert()) { - _route.set_phase_invert (x, this); - } -} - void MixerStrip::route_gui_changed (string what_changed, void* ignored) @@ -1200,11 +1002,8 @@ MixerStrip::route_gui_changed (string what_changed, void* ignored) void MixerStrip::show_route_color () { - name_button.ensure_style (); - Glib::RefPtr style = name_button.get_style()->copy(); - style->set_bg (Gtk::STATE_NORMAL, color()); - name_button.set_style (style); - + name_button.modify_bg (STATE_NORMAL, color()); + top_event_box.modify_bg (STATE_NORMAL, color()); route_active_changed (); } @@ -1218,17 +1017,28 @@ void MixerStrip::build_route_ops_menu () { using namespace Menu_Helpers; - route_ops_menu = manage (new Menu); route_ops_menu->set_name ("ArdourContextMenu"); MenuList& items = route_ops_menu->items(); - + items.push_back (MenuElem (_("Rename"), mem_fun(*this, &RouteUI::route_rename))); items.push_back (SeparatorElem()); - items.push_back (CheckMenuElem (_("Active"), mem_fun(*this, &RouteUI::toggle_route_active))); + 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()); + 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 (); @@ -1240,10 +1050,16 @@ MixerStrip::build_route_ops_menu () } gint -MixerStrip::name_button_button_release (GdkEventButton* ev) +MixerStrip::name_button_button_press (GdkEventButton* ev) { - if (ev->button == 3) { + if (ev->button == 1) { list_route_operations (); + + Menu_Helpers::MenuList& items = route_ops_menu->items(); + /* do not allow rename if the track is record-enabled */ + static_cast (&items.front())->set_sensitive (!_route->record_enabled()); + + route_ops_menu->popup (1, ev->time); } return FALSE; } @@ -1256,8 +1072,6 @@ MixerStrip::list_route_operations () } refresh_remote_control_menu(); - - route_ops_menu->popup (1, 0); } @@ -1312,16 +1126,19 @@ 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 (short_version (_route.name(), 5)); + name_label.set_text (PBD::short_version (_route->name(), 5)); break; } + if (_route->phase_invert()) { + name_label.set_text (X_("Ø ") + name_label.get_text()); + } } void @@ -1329,10 +1146,10 @@ MixerStrip::width_clicked () { switch (_width) { case Wide: - set_width (Narrow); + set_width (Narrow, this); break; case Narrow: - set_width (Wide); + set_width (Wide, this); break; } } @@ -1340,11 +1157,17 @@ MixerStrip::width_clicked () void MixerStrip::hide_clicked () { + // LAME fix to reset the button status for when it is redisplayed (part 1) + hide_button.set_sensitive(false); + if (_embedded) { Hiding(); /* EMIT_SIGNAL */ } else { _mixer.hide_strip (this); } + + // (part 2) + hide_button.set_sensitive(true); } void @@ -1358,29 +1181,29 @@ MixerStrip::map_frozen () { ENSURE_GUI_THREAD (mem_fun(*this, &MixerStrip::map_frozen)); - AudioTrack* at = dynamic_cast(&_route); + 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 (Redirect* 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 (); @@ -1392,29 +1215,74 @@ MixerStrip::route_active_changed () { RouteUI::route_active_changed (); - if (is_audio_track()) { - if (_route.active()) { + if (is_midi_track()) { + if (_route->active()) { + set_name ("MidiTrackStripBase"); + gpm.set_meter_strip_name ("MidiTrackStripBase"); + } else { + 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()) { + 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) */ } } RouteGroup* MixerStrip::mix_group() const { - return _route.mix_group(); + return _route->mix_group(); } + +void +MixerStrip::engine_stopped () +{ +} + +void +MixerStrip::engine_running () +{ +} + +void +MixerStrip::meter_changed (void *src) +{ + + ENSURE_GUI_THREAD (bind (mem_fun(*this, &MixerStrip::meter_changed), src)); + + 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 (); +} +