X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmixer_strip.cc;h=70e0a6aa1865f31e1e396a5f5cd42b0215a3e600;hb=8d1775b4582a4fe96b254dd3877377406ee51642;hp=24704a0f72de2b17e07475ed1d3d3cfdf044fa08;hpb=7b8d7f464f27bee198320dff7866716c064f6418;p=ardour.git diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 24704a0f72..70e0a6aa18 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -15,28 +15,29 @@ 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 @@ -46,14 +47,10 @@ #include "ardour_ui.h" #include "ardour_dialog.h" -#include "ardour_message.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" @@ -63,43 +60,14 @@ using namespace sigc; using namespace ARDOUR; +using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; +using namespace std; -/* XPM */ -static const gchar * small_x_xpm[] = { -"11 11 2 1", -" c None", -". c #cccc99", -" ", -" ", -" . . ", -" . . ", -" . . ", -" . ", -" . . ", -" . . ", -" . . ", -" ", -" "}; - -/* XPM */ -static const gchar * lr_xpm[] = { -"11 11 2 1", -" c None", -". c #cccc99", -" ", -" ", -" . . ", -" . . ", -" . . ", -"...........", -" . . ", -" . . ", -" . . ", -" ", -" "}; +int MixerStrip::scrollbar_height = 0; +#ifdef VARISPEED_IN_MIXER_STRIP static void speed_printer (char buf[32], Gtk::Adjustment& adj, void* arg) { @@ -111,22 +79,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), 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) @@ -144,110 +111,83 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer) ignore_toggle = false; ignore_speed_adjustment = false; comment_window = 0; + comment_area = 0; - width_button.add (*(manage (new Gtk::Image (Gdk::Pixbuf::create_from_xpm_data(lr_xpm))))); - hide_button.add (*(manage (new Gtk::Image (Gdk::Pixbuf::create_from_xpm_data(small_x_xpm))))); + width_button.add (*(manage (new Gtk::Image (::get_icon("strip_width"))))); + hide_button.add (*(manage (new Gtk::Image (::get_icon("hide"))))); - - 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 (input_button, 0, 2, 1, 2); - button_table.attach (polarity_button, 0, 2, 3, 4); + 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); - button_table.attach (*solo_button, 0, 1, 4, 5); - button_table.attach (*mute_button, 1, 2, 4, 5); - - // 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); - - 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"))); - - 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")); + bottom_button_table.set_col_spacings (0); + bottom_button_table.set_homogeneous (true); + bottom_button_table.attach (group_button, 0, 1, 0, 1); 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"); + + AudioTrack* 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"); @@ -256,56 +196,81 @@ 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")); - speed_spinner.show (); - speed_frame.show (); + 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); name_button.set_name ("MixerNameButton"); 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 (4); - global_vpacker.set_spacing (4); + 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, false, false); - global_vpacker.pack_start (button_table, false, false); + 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, false, false); + 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_redirect_box, true, true); - global_vpacker.pack_start (panners, false, false); - global_vpacker.pack_start (output_button, false, false); - global_vpacker.pack_start (comment_button, false, false); + 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()->master() || route()->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); @@ -318,81 +283,38 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer) _selected = true; set_selected (false); - whvbox->show_all (); - name_label.show (); - group_label.show(); - input_label.show (); - output_label.show (); - pre_redirect_box.show_all (); - post_redirect_box.show_all (); - button_table.show (); - comment_button.show (); - name_button.show (); - input_button.show (); - group_button.show (); - output_button.show (); - rec_enable_button->show (); - solo_button->show (); - mute_button->show (); - gain_automation_style_button.show (); - gain_automation_state_button.show (); - pan_automation_style_button.show (); - pan_automation_state_button.show (); - polarity_button.show (); - global_vpacker.show (); - global_frame.show (); - _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)); - output_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::output_press)); + _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)); - 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)); + 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); - gain_automation_style_button.signal_button_press_event().connect_after (ptr_fun (do_not_propagate)); - pan_automation_style_button.signal_button_press_event().connect_after (ptr_fun (do_not_propagate)); - gain_automation_state_button.signal_button_press_event().connect_after (ptr_fun (do_not_propagate)); - pan_automation_state_button.signal_button_press_event().connect_after (ptr_fun (do_not_propagate)); + 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); - gain_automation_style_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::gain_automation_style_button_event)); - gain_automation_style_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::gain_automation_style_button_event)); - pan_automation_style_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::pan_automation_style_button_event)); - pan_automation_style_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::pan_automation_style_button_event)); - - gain_automation_state_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::gain_automation_state_button_event)); - gain_automation_state_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::gain_automation_state_button_event)); - pan_automation_state_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::pan_automation_state_button_event)); - pan_automation_state_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::pan_automation_state_button_event)); - - polarity_button.signal_toggled().connect (mem_fun(*this, &MixerStrip::polarity_toggled)); - - name_button.signal_button_release_event().connect (mem_fun(*this, &MixerStrip::name_button_button_release)); - - group_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::select_mix_group)); + 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 (); @@ -412,8 +334,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, Route& rt, bool in_mixer) name_changed (0); comment_changed (0); mix_group_changed (0); - gain_automation_state_changed (); - pan_automation_state_changed (); + connect_to_pan (); panners.setup_pan (); @@ -422,10 +343,6 @@ 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 (); @@ -474,8 +391,7 @@ MixerStrip::set_stuff_from_route () } else { _marked_for_display = true; } - } - else { + } else { /* backwards compatibility */ _marked_for_display = true; } @@ -497,38 +413,56 @@ MixerStrip::set_width (Width w) ensure_xml_node (); _width = w; - + switch (w) { case Wide: set_size_request (-1, -1); xml_node->add_property ("strip_width", "wide"); + + 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*")); + } - 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")); + ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (gpm.astyle_string(_route->gain_automation_curve().automation_style())); + ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.astate_string(_route->gain_automation_curve().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(_route->gain_automation_curve().automation_style())); + ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (gpm.short_astate_string(_route->gain_automation_curve().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; } @@ -536,6 +470,7 @@ MixerStrip::set_width (Width w) update_output_display (); mix_group_changed (0); name_changed (0); + } void @@ -556,26 +491,33 @@ MixerStrip::set_packed (bool yn) gint MixerStrip::output_press (GdkEventButton *ev) { - using namespace Menu_Helpers; - + using namespace Menu_Helpers; if (!_session.engine().connected()) { - ArdourMessage msg (NULL, "nojackdialog", _("Not connected to JACK - no I/O changes are possible")); - return TRUE; + 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_connection (this, &MixerStrip::add_connection_to_output_menu); + output_menu.popup (1, ev->time); + break; + + default: + break; + } return TRUE; } @@ -615,26 +557,29 @@ MixerStrip::input_press (GdkEventButton *ev) MenuList& citems = input_menu.items(); input_menu.set_name ("ArdourContextMenu"); citems.clear(); - + if (!_session.engine().connected()) { - ArdourMessage msg (NULL, "nojackdialog", _("Not connected to JACK - no I/O changes are possible")); - return TRUE; + MessageDialog msg (_("Not connected to JACK - no I/O changes are possible")); + msg.run (); + return true; } + + switch (ev->button) { -#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()); - - _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_connection (this, &MixerStrip::add_connection_to_input_menu); + input_menu.popup (1, ev->time); + break; + + default: + break; + } return TRUE; } @@ -644,7 +589,7 @@ MixerStrip::connection_input_chosen (ARDOUR::Connection *c) if (!ignore_toggle) { try { - _route.use_input_connection (*c, this); + _route->use_input_connection (*c, this); } catch (AudioEngine::PortRegistrationFailure& err) { @@ -660,7 +605,7 @@ MixerStrip::connection_output_chosen (ARDOUR::Connection *c) if (!ignore_toggle) { try { - _route.use_output_connection (*c, this); + _route->use_output_connection (*c, this); } catch (AudioEngine::PortRegistrationFailure& err) { @@ -681,11 +626,11 @@ MixerStrip::add_connection_to_input_menu (ARDOUR::Connection* c) MenuList& citems = input_menu.items(); - if (c->nports() == _route.n_inputs()) { + if (c->nports() == _route->n_inputs()) { citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_input_chosen), c))); - ARDOUR::Connection *current = _route.input_connection(); + ARDOUR::Connection *current = _route->input_connection(); if (current == c) { ignore_toggle = true; @@ -704,12 +649,12 @@ MixerStrip::add_connection_to_output_menu (ARDOUR::Connection* c) return; } - if (c->nports() == _route.n_outputs()) { + if (c->nports() == _route->n_outputs()) { MenuList& citems = output_menu.items(); citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_output_chosen), c))); - ARDOUR::Connection *current = _route.output_connection(); + ARDOUR::Connection *current = _route->output_connection(); if (current == c) { ignore_toggle = true; @@ -719,42 +664,6 @@ 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 () { @@ -787,11 +696,11 @@ 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->automation().automation_state_changed.connect (mem_fun(panners, &PannerUI::pan_automation_state_changed)); + panstyle_connection = sp->automation().automation_style_changed.connect (mem_fun(panners, &PannerUI::pan_automation_style_changed)); } panners.pan_changed (this); @@ -802,19 +711,18 @@ MixerStrip::update_input_display () { ARDOUR::Connection *c; - if ((c = _route.input_connection()) != 0) { + if ((c = _route->input_connection()) != 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 (); } @@ -823,290 +731,80 @@ MixerStrip::update_output_display () { ARDOUR::Connection *c; - if ((c = _route.output_connection()) != 0) { + if ((c = _route->output_connection()) != 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 () -{ - 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; - } -} - -void -MixerStrip::gain_automation_state_changed () +MixerStrip::input_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_input_display)); } void -MixerStrip::pan_automation_style_changed () +MixerStrip::output_changed (IOChange change, void *src) { - 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; - } + Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_output_display)); } -void -MixerStrip::pan_automation_state_changed () -{ - 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(); +void +MixerStrip::comment_editor_done_editing() { + 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 @@ -1116,34 +814,47 @@ MixerStrip::comment_button_clicked () setup_comment_editor (); } + int x, y, cw_width, cw_height; + if (comment_window->is_visible()) { comment_window->hide (); - } else { - comment_window->set_position (Gtk::WIN_POS_MOUSE); - comment_window->show_all (); + 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. + */ + + comment_window->show(); + comment_window->present(); } void MixerStrip::setup_comment_editor () { - comment_window = new Window (WINDOW_TOPLEVEL); - - string str; - str = _route.name(); - str += _(": comment editor"); - comment_window->set_title (str); - - comment_area.set_name ("MixerTrackCommentArea"); - comment_area.set_editable (true); - comment_area.signal_focus_in_event().connect (ptr_fun (ARDOUR_UI::generic_focus_in_event)); - comment_area.signal_focus_out_event().connect (ptr_fun (ARDOUR_UI::generic_focus_out_event)); - comment_area.changed.connect (mem_fun(*this, &MixerStrip::comment_edited)); - comment_area.signal_button_release_event().connect_after (ptr_fun (do_not_propagate)); - comment_area.show (); - - comment_window->add (comment_area); - comment_window->signal_delete_event().connect (bind (ptr_fun (just_hide_it), comment_window)); + string title; + title = _route->name(); + title += _(": comment editor"); + + comment_window = new ArdourDialog (title, false); + 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->show (); + + comment_window->get_vbox()->pack_start (*comment_area); + comment_window->get_action_area()->hide(); } void @@ -1153,60 +864,61 @@ MixerStrip::comment_changed (void *src) if (src != this) { ignore_comment_edit = true; - comment_area.freeze (); - //comment_area.get_buffer()->delete_text (0, -1); - //comment_area.set_point (0); - comment_area.get_buffer()->set_text (_route.comment()); - comment_area.thaw (); + if (comment_area) { + comment_area->get_buffer()->set_text (_route->comment()); + } ignore_comment_edit = false; } } -void -MixerStrip::comment_edited () -{ - ENSURE_GUI_THREAD(mem_fun(*this, &MixerStrip::comment_edited)); - - if (!ignore_comment_edit) { - 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); - } -} - void MixerStrip::set_mix_group (RouteGroup *rg) - { - _route.set_mix_group (rg, this); - delete group_menu; - group_menu = 0; + _route->set_mix_group (rg, this); } void -MixerStrip::add_mix_group_to_menu (RouteGroup *rg) +MixerStrip::add_mix_group_to_menu (RouteGroup *rg, RadioMenuItem::Group* group) { using namespace Menu_Helpers; MenuList& items = group_menu->items(); - items.push_back (MenuElem (rg->name(), bind (mem_fun(*this, &MixerStrip::set_mix_group), rg))); + + items.push_back (RadioMenuElem (*group, rg->name(), bind (mem_fun(*this, &MixerStrip::set_mix_group), rg))); + + if (_route->mix_group() == rg) { + static_cast(&items.back())->set_active (); + } } -gint +bool MixerStrip::select_mix_group (GdkEventButton *ev) { using namespace Menu_Helpers; - group_menu = new Menu; + if (group_menu == 0) { + group_menu = new Menu; + } group_menu->set_name ("ArdourContextMenu"); MenuList& items = group_menu->items(); + RadioMenuItem::Group group; + + switch (ev->button) { + case 1: - items.push_back (MenuElem (_("no group"), bind (mem_fun(*this, &MixerStrip::set_mix_group), (RouteGroup *) 0))); - _session.foreach_mix_group (this, &MixerStrip::add_mix_group_to_menu); + items.clear (); + items.push_back (RadioMenuElem (group, _("No group"), bind (mem_fun(*this, &MixerStrip::set_mix_group), (RouteGroup *) 0))); - group_menu->popup (ev->button, 0); - return stop_signal (group_button, "button_press_event"); + _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; } void @@ -1214,14 +926,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")); @@ -1230,16 +942,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) @@ -1256,14 +958,8 @@ MixerStrip::route_gui_changed (string what_changed, void* ignored) void MixerStrip::show_route_color () { - Glib::RefPtr style; - - name_button.ensure_style (); - style = name_button.get_style()->copy(); - style->set_bg (Gtk::STATE_NORMAL, color()); - name_button.set_style (style); - style->unrefernce(); - + name_button.modify_bg (STATE_NORMAL, color()); + top_event_box.modify_bg (STATE_NORMAL, color()); route_active_changed (); } @@ -1278,26 +974,36 @@ MixerStrip::build_route_ops_menu () { using namespace Menu_Helpers; - route_ops_menu = new Menu; + 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 (CheckMenuElem (_("Invert Polarity"), mem_fun (*this, &RouteUI::toggle_polarity))); + polarity_menu_item = dynamic_cast (&items.back()); + polarity_menu_item->set_active (_route->phase_invert()); + + build_remote_control_menu (); + + items.push_back (SeparatorElem()); + items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu)); items.push_back (SeparatorElem()); items.push_back (MenuElem (_("Remove"), mem_fun(*this, &RouteUI::remove_this_route))); } 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 (); + route_ops_menu->popup (1, ev->time); } return FALSE; } @@ -1308,8 +1014,8 @@ MixerStrip::list_route_operations () if (route_ops_menu == 0) { build_route_ops_menu (); } - - route_ops_menu->popup (1, 0); + + refresh_remote_control_menu(); } @@ -1371,9 +1077,12 @@ MixerStrip::name_changed (void *src) RouteUI::name_changed (src); 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 @@ -1392,11 +1101,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.unselect_strip_in_display (this); + _mixer.hide_strip (this); } + + // (part 2) + hide_button.set_sensitive(true); } void @@ -1410,7 +1125,7 @@ MixerStrip::map_frozen () { ENSURE_GUI_THREAD (mem_fun(*this, &MixerStrip::map_frozen)); - AudioTrack* at = dynamic_cast(&_route); + AudioTrack* at = audio_track(); if (at) { switch (at->freeze_state()) { @@ -1426,11 +1141,11 @@ MixerStrip::map_frozen () break; } } - _route.foreach_redirect (this, &MixerStrip::hide_redirect_editor); + _route->foreach_redirect (this, &MixerStrip::hide_redirect_editor); } void -MixerStrip::hide_redirect_editor (Redirect* redirect) +MixerStrip::hide_redirect_editor (boost::shared_ptr redirect) { void* gui = redirect->get_gui (); @@ -1445,7 +1160,7 @@ MixerStrip::route_active_changed () RouteUI::route_active_changed (); if (is_audio_track()) { - if (_route.active()) { + if (_route->active()) { set_name ("AudioTrackStripBase"); gpm.set_meter_strip_name ("AudioTrackStripBase"); } else { @@ -1453,8 +1168,8 @@ MixerStrip::route_active_changed () gpm.set_meter_strip_name ("AudioTrackStripBaseInactive"); } gpm.set_fader_name ("AudioTrackFader"); - } else { - if (_route.active()) { + } else { // FIXME: assumed audio bus + if (_route->active()) { set_name ("AudioBusStripBase"); gpm.set_meter_strip_name ("AudioBusStripBase"); } else { @@ -1464,3 +1179,43 @@ MixerStrip::route_active_changed () gpm.set_fader_name ("AudioBusFader"); } } + +RouteGroup* +MixerStrip::mix_group() const +{ + 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 (); +} +