/*
- 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
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 <cmath>
+#include <algorithm>
#include <sigc++/bind.h>
#include <pbd/convert.h>
+#include <pbd/enumwriter.h>
+#include <pbd/replace_all.h>
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/utils.h>
#include <ardour/session.h>
#include <ardour/audioengine.h>
#include <ardour/route.h>
+#include <ardour/route_group.h>
#include <ardour/audio_track.h>
#include <ardour/audio_diskstream.h>
#include <ardour/panner.h>
#include <ardour/send.h>
-#include <ardour/insert.h>
+#include <ardour/processor.h>
+#include <ardour/profile.h>
#include <ardour/ladspa_plugin.h>
-#include <ardour/connection.h>
-#include <ardour/session_connection.h>
+#include <ardour/user_bundle.h>
#include "ardour_ui.h"
#include "ardour_dialog.h"
using namespace PBD;
using namespace Gtk;
using namespace Gtkmm2ext;
+using namespace std;
+
+int MixerStrip::scrollbar_height = 0;
#ifdef VARISPEED_IN_MIXER_STRIP
static void
}
#endif
-MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt, bool in_mixer)
- : AxisView(sess),
- 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 (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)
+MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, bool in_mixer)
+ : AxisView(sess)
+ , RouteUI (sess, _("Mute"), _("Solo"), _("Record"))
+ ,_mixer(mx)
+ , _mixer_owned (in_mixer)
+ , pre_processor_box (PreFader, sess, mx.plugin_selector(), mx.selection(), in_mixer)
+ , post_processor_box (PostFader, sess, mx.plugin_selector(), mx.selection(), in_mixer)
+ , gpm (sess)
+ , panners (sess)
+ , 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)
+
+{
+ init ();
+}
+MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt, bool in_mixer)
+ : AxisView(sess)
+ , RouteUI (sess, _("Mute"), _("Solo"), _("Record"))
+ ,_mixer(mx)
+ , _mixer_owned (in_mixer)
+ , pre_processor_box (PreFader, sess, mx.plugin_selector(), mx.selection(), in_mixer)
+ , post_processor_box (PostFader, sess, mx.plugin_selector(), mx.selection(), in_mixer)
+ , gpm (sess)
+ , panners (sess)
+ , 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)
+
{
- if (set_color_from_route()) {
- set_color (unique_random_color());
- }
+ init ();
+ set_route (rt);
+}
+void
+MixerStrip::init ()
+{
input_selector = 0;
output_selector = 0;
group_menu = 0;
ignore_speed_adjustment = false;
comment_window = 0;
comment_area = 0;
+ _width_owner = 0;
+ spacer = 0;
+
+ Gtk::Image* img;
+
+ img = manage (new Gtk::Image (::get_icon("strip_width")));
+ img->show ();
+
+ width_button.add (*img);
- width_button.add (*(manage (new Gtk::Image (get_xpm("lr.xpm")))));
- hide_button.add (*(manage (new Gtk::Image (get_xpm("small_x.xpm")))));
+ img = manage (new Gtk::Image (::get_icon("hide")));
+ img->show ();
+
+ hide_button.add (*img);
input_label.set_text (_("Input"));
+ ARDOUR_UI::instance()->set_tip (&input_button, _("Button 1 to choose inputs from a port matrix, button 3 to select inputs from a menu"), "");
input_button.add (input_label);
input_button.set_name ("MixerIOButton");
input_label.set_name ("MixerIOButtonLabel");
+ Gtkmm2ext::set_size_request_to_display_given_text (input_button, "longest label", 4, 4);
output_label.set_text (_("Output"));
+ ARDOUR_UI::instance()->set_tip (&output_button, _("Button 1 to choose outputs from a port matrix, button 3 to select inputs from a menu"), "");
output_button.add (output_label);
output_button.set_name ("MixerIOButton");
output_label.set_name ("MixerIOButtonLabel");
+ Gtkmm2ext::set_size_request_to_display_given_text (output_button, "longest label", 4, 4);
- _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, its "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);
-
-
+ ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Select metering point"), "");
+ meter_point_button.add (meter_point_label);
+ meter_point_button.set_name ("MixerStripMeterPreButton");
+ meter_point_label.set_name ("MixerStripMeterPreButton");
+
+ /* 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);
- solo_button->set_name ("MixerSoloButton");
- mute_button->set_name ("MixerMuteButton");
-
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);
+ mute_button->set_name ("MixerMuteButton");
+ solo_button->set_name ("MixerSoloButton");
button_table.set_homogeneous (true);
button_table.set_spacings (0);
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()) {
-
- rec_enable_button->set_name ("MixerRecordEnableButton");
- rec_enable_button->unset_flags (Gtk::CAN_FOCUS);
- rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press));
-
- 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");
- speed_frame.set_shadow_type (Gtk::SHADOW_IN);
- speed_frame.add (speed_spinner);
-
- speed_spinner.set_print_func (speed_printer, 0);
-
- 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 (*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");
- if (_route->phase_invert()) {
- name_label.set_text (X_("Ø ") + name_label.get_text());
- } else {
- name_label.set_text (_route->name());
- }
-
+ ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), "");
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());
-
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);
-
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);
+ gain_meter_alignment.set_padding(0, 4, 0, 0);
+ gain_meter_alignment.add(gpm);
- whvbox->pack_start (width_hide_box, true, true);
+ whvbox.pack_start (width_hide_box, true, true);
- global_vpacker.pack_start (*whvbox, Gtk::PACK_SHRINK);
+ 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 (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 (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, 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);
_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()->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_press_event().connect (mem_fun(*this, &MixerStrip::input_press), false);
output_button.signal_button_press_event().connect (mem_fun(*this, &MixerStrip::output_press), 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);
+ /* we don't need this if its not an audio track, but we don't know that yet and it doesn't
+ hurt (much).
+ */
+
+ rec_enable_button->set_name ("MixerRecordEnableButton");
+ 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));
+
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 ();
/* start off as a passthru strip. we'll correct this, if necessary,
in update_diskstream_display().
*/
- set_name ("AudioTrackStripBase");
+ /* start off as a passthru strip. we'll correct this, if necessary,
+ in update_diskstream_display().
+ */
+
+ if (is_midi_track())
+ set_name ("MidiTrackStripBase");
+ else
+ set_name ("AudioTrackStripBase");
+
+ add_events (Gdk::BUTTON_RELEASE_MASK);
+}
+
+MixerStrip::~MixerStrip ()
+{
+ GoingAway(); /* EMIT_SIGNAL */
+
+ delete input_selector;
+ delete output_selector;
+}
+
+void
+MixerStrip::set_route (boost::shared_ptr<Route> rt)
+{
+ if (rec_enable_button->get_parent()) {
+ button_table.remove (*rec_enable_button);
+ }
+
+#ifdef VARISPEED_IN_MIXER_STRIP
+ if (speed_frame->get_parent()) {
+ button_table.remove (*speed_frame);
+ }
+#endif
+
+ RouteUI::set_route (rt);
+
+ delete input_selector;
+ input_selector = 0;
+
+ delete output_selector;
+ output_selector = 0;
+
+ panners.set_io (rt);
+ gpm.set_io (rt);
+ pre_processor_box.set_route (rt);
+ post_processor_box.set_route (rt);
+
+ if (set_color_from_route()) {
+ set_color (unique_random_color());
+ }
+
+ if (_mixer_owned && (route()->is_master() || route()->is_control())) {
+
+ if (scrollbar_height == 0) {
+ HScrollbar scrollbar;
+ Gtk::Requisition requisition(scrollbar.size_request ());
+ scrollbar_height = requisition.height;
+ }
+
+ spacer = manage (new EventBox);
+ spacer->set_size_request (-1, scrollbar_height);
+ global_vpacker.pack_start (*spacer, false, false);
+ }
+
+ if (is_audio_track()) {
+
+ boost::shared_ptr<AudioTrack> at = audio_track();
+
+ connections.push_back (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");
+ speed_frame.set_shadow_type (Gtk::SHADOW_IN);
+ speed_frame.add (speed_spinner);
+
+ speed_spinner.set_print_func (speed_printer, 0);
+
+ 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 (*rec_enable_button, 0, 2, 2, 3);
+ rec_enable_button->show();
+ }
+
+ if (_route->phase_invert()) {
+ name_label.set_text (X_("Ø ") + name_label.get_text());
+ } else {
+ name_label.set_text (_route->name());
+ }
+
+ 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;
+ }
+
+ delete route_ops_menu;
+ route_ops_menu = 0;
+
+ ARDOUR_UI::instance()->tooltips().set_tip (comment_button, _route->comment().empty() ?
+ _("Click to Add/Edit Comments"):
+ _route->comment());
+
+ connections.push_back (_route->meter_change.connect (mem_fun(*this, &MixerStrip::meter_changed)));
+ connections.push_back (_route->input_changed.connect (mem_fun(*this, &MixerStrip::input_changed)));
+ connections.push_back (_route->output_changed.connect (mem_fun(*this, &MixerStrip::output_changed)));
+ connections.push_back (_route->mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed)));
+ connections.push_back (_route->solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed)));
+ connections.push_back (_route->solo_safe_changed.connect (mem_fun(*this, &RouteUI::solo_changed)));
+ connections.push_back (_route->mix_group_changed.connect (mem_fun(*this, &MixerStrip::mix_group_changed)));
+ connections.push_back (_route->panner().Changed.connect (mem_fun(*this, &MixerStrip::connect_to_pan)));
+
+ if (is_audio_track()) {
+ connections.push_back (audio_track()->DiskstreamChanged.connect (mem_fun(*this, &MixerStrip::diskstream_changed)));
+ connections.push_back (get_diskstream()->SpeedChanged.connect (mem_fun(*this, &MixerStrip::speed_changed)));
+ }
+
+ connections.push_back (_route->NameChanged.connect (mem_fun(*this, &RouteUI::name_changed)));
+ connections.push_back (_route->comment_changed.connect (mem_fun(*this, &MixerStrip::comment_changed)));
+ connections.push_back (_route->gui_changed.connect (mem_fun(*this, &MixerStrip::route_gui_changed)));
+
+ set_stuff_from_route ();
/* 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);
update_output_display ();
add_events (Gdk::BUTTON_RELEASE_MASK);
-}
-MixerStrip::~MixerStrip ()
-{
- GoingAway(); /* EMIT_SIGNAL */
+ pre_processor_box.show();
- if (input_selector) {
- delete input_selector;
+ if (!route()->is_master() && !route()->is_control()) {
+ /* we don't allow master or control routes to be hidden */
+ hide_button.show();
}
- if (output_selector) {
- delete output_selector;
- }
+ width_button.show();
+ width_hide_box.show();
+ whvbox.show ();
+ global_frame.show();
+ global_vpacker.show();
+ button_table.show();
+ middle_button_table.show();
+ bottom_button_table.show();
+ pre_processor_box.show_all ();
+ gpm.show_all ();
+ panners.show_all ();
+ gain_meter_alignment.show ();
+ post_processor_box.show_all ();
+ gain_unit_button.show();
+ gain_unit_label.show();
+ meter_point_button.show();
+ meter_point_label.show();
+ diskstream_button.show();
+ diskstream_label.show();
+ input_button.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 ();
}
void
MixerStrip::set_stuff_from_route ()
{
XMLProperty *prop;
-
+
ensure_xml_node ();
- 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);
+ /* if width is not set, it will be set by the MixerUI or editor */
+
+ if ((prop = xml_node->property ("strip-width")) != 0) {
+ set_width (Width (string_2_enum (prop->value(), _width)), this);
}
- if ((prop = xml_node->property ("shown_mixer")) != 0) {
+ if ((prop = xml_node->property ("shown-mixer")) != 0) {
if (prop->value() == "no") {
_marked_for_display = false;
} 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);
-
- if (_width == w) {
- return;
- }
+ pre_processor_box.set_width (w);
+ post_processor_box.set_width (w);
+
+ boost::shared_ptr<AutomationList> gain_automation = _route->gain_control()->alist();
+
+ _width_owner = owner;
ensure_xml_node ();
_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");
- if (rec_enable_button) {
- rec_enable_button->set_label (_("record"));
+ if (rec_enable_button) {
+ ((Gtk::Label*)rec_enable_button->get_child())->set_text (_("Record"));
}
- mute_button->set_label (_("mute"));
- solo_button->set_label (_("solo"));
+ ((Gtk::Label*)mute_button->get_child())->set_text (_("Mute"));
+ ((Gtk::Label*)solo_button->get_child())->set_text (_("Solo"));
if (_route->comment() == "") {
- comment_button.set_label (_("comments"));
+ comment_button.unset_bg (STATE_NORMAL);
+ ((Gtk::Label*)comment_button.get_child())->set_text (_("Comments"));
} else {
- comment_button.set_label (_("*comments*"));
+ comment_button.modify_bg (STATE_NORMAL, color());
+ ((Gtk::Label*)comment_button.get_child())->set_text (_("*Comments*"));
}
- gpm.gain_automation_style_button.set_label (gpm.astyle_string(_route->gain_automation_curve().automation_style()));
- gpm.gain_automation_state_button.set_label (gpm.astate_string(_route->gain_automation_curve().automation_state()));
- panners.pan_automation_style_button.set_label (panners.astyle_string(_route->panner().automation_style()));
- panners.pan_automation_state_button.set_label (panners.astate_string(_route->panner().automation_state()));
+ ((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);
+ set_size_request (-1, -1);
break;
case Narrow:
- set_size_request (50, -1);
- xml_node->add_property ("strip_width", "narrow");
-
if (rec_enable_button) {
- rec_enable_button->set_label (_("Rec"));
+ ((Gtk::Label*)rec_enable_button->get_child())->set_text (_("Rec"));
}
- mute_button->set_label (_("M"));
- solo_button->set_label (_("S"));
+ ((Gtk::Label*)mute_button->get_child())->set_text (_("M"));
+ ((Gtk::Label*)solo_button->get_child())->set_text (_("S"));
if (_route->comment() == "") {
- comment_button.set_label (_("Cmt"));
+ comment_button.unset_bg (STATE_NORMAL);
+ ((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt"));
} else {
- comment_button.set_label (_("*Cmt*"));
+ comment_button.modify_bg (STATE_NORMAL, color());
+ ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
}
- gpm.gain_automation_style_button.set_label (gpm.short_astyle_string(_route->gain_automation_curve().automation_style()));
- gpm.gain_automation_state_button.set_label (gpm.short_astate_string(_route->gain_automation_curve().automation_state()));
- panners.pan_automation_style_button.set_label (panners.short_astyle_string(_route->panner().automation_style()));
- panners.pan_automation_state_button.set_label (panners.short_astate_string(_route->panner().automation_state()));
+ ((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 ();
+#ifdef GTKOSX
+ WidthChanged();
+#endif
}
void
ensure_xml_node ();
if (_packed) {
- xml_node->add_property ("shown_mixer", "yes");
+ xml_node->add_property ("shown-mixer", "yes");
} else {
- xml_node->add_property ("shown_mixer", "no");
+ xml_node->add_property ("shown-mixer", "no");
}
}
switch (ev->button) {
case 1:
+ edit_output_configuration ();
+ break;
+
+ case 3:
+ {
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<RouteUI*>(this)), &RouteUI::disconnect_output)));
citems.push_back (SeparatorElem());
-
- _session.foreach_connection (this, &MixerStrip::add_connection_to_output_menu);
-
+
+ ARDOUR::BundleList current = _route->bundles_connected_to_outputs ();
+
+ boost::shared_ptr<ARDOUR::BundleList> b = _session.bundles ();
+ for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
+ maybe_add_bundle_to_output_menu (*i, current);
+ }
+
+ boost::shared_ptr<ARDOUR::RouteList> routes = _session.get_routes ();
+ for (ARDOUR::RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) {
+ maybe_add_bundle_to_output_menu ((*i)->bundle_for_inputs(), current);
+ }
+
+ if (citems.size() == 2) {
+ /* no routes added; remove the separator */
+ citems.pop_back ();
+ }
+
output_menu.popup (1, ev->time);
break;
-
+ }
+
default:
break;
}
if (output_selector->is_visible()) {
output_selector->get_toplevel()->get_window()->raise();
} else {
- output_selector->show_all ();
+ output_selector->present ();
}
}
if (input_selector->is_visible()) {
input_selector->get_toplevel()->get_window()->raise();
} else {
- input_selector->show_all ();
+ input_selector->present ();
}
}
msg.run ();
return true;
}
-
+
switch (ev->button) {
case 1:
+ edit_input_configuration ();
+ break;
- citems.push_back (MenuElem (_("Edit"), mem_fun(*this, &MixerStrip::edit_input_configuration)));
- citems.push_back (SeparatorElem());
+ case 3:
+ {
citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_input)));
citems.push_back (SeparatorElem());
-
- _session.foreach_connection (this, &MixerStrip::add_connection_to_input_menu);
+
+ ARDOUR::BundleList current = _route->bundles_connected_to_inputs ();
+
+ boost::shared_ptr<ARDOUR::BundleList> b = _session.bundles ();
+ for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
+ maybe_add_bundle_to_input_menu (*i, current);
+ }
+
+ boost::shared_ptr<ARDOUR::RouteList> routes = _session.get_routes ();
+ for (ARDOUR::RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) {
+ maybe_add_bundle_to_input_menu ((*i)->bundle_for_outputs(), current);
+ }
+
+ if (citems.size() == 2) {
+ /* no routes added; remove the separator */
+ citems.pop_back ();
+ }
+
input_menu.popup (1, ev->time);
break;
-
+ }
default:
break;
}
}
void
-MixerStrip::connection_input_chosen (ARDOUR::Connection *c)
+MixerStrip::bundle_input_toggled (boost::shared_ptr<ARDOUR::Bundle> c)
{
- if (!ignore_toggle) {
+ if (ignore_toggle) {
+ return;
+ }
- try {
- _route->use_input_connection (*c, this);
- }
+ ARDOUR::BundleList current = _route->bundles_connected_to_inputs ();
- catch (AudioEngine::PortRegistrationFailure& err) {
- error << _("could not register new ports required for that connection")
- << endmsg;
- }
+ if (std::find (current.begin(), current.end(), c) == current.end()) {
+ _route->connect_input_ports_to_bundle (c, this);
+ } else {
+ _route->disconnect_input_ports_from_bundle (c, this);
}
}
void
-MixerStrip::connection_output_chosen (ARDOUR::Connection *c)
+MixerStrip::bundle_output_toggled (boost::shared_ptr<ARDOUR::Bundle> c)
{
- if (!ignore_toggle) {
+ if (ignore_toggle) {
+ return;
+ }
- try {
- _route->use_output_connection (*c, this);
- }
+ ARDOUR::BundleList current = _route->bundles_connected_to_outputs ();
- catch (AudioEngine::PortRegistrationFailure& err) {
- error << _("could not register new ports required for that connection")
- << endmsg;
- }
+ if (std::find (current.begin(), current.end(), c) == current.end()) {
+ _route->connect_output_ports_to_bundle (c, this);
+ } else {
+ _route->disconnect_output_ports_from_bundle (c, this);
}
}
void
-MixerStrip::add_connection_to_input_menu (ARDOUR::Connection* c)
+MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleList const & current)
{
using namespace Menu_Helpers;
- if (dynamic_cast<InputConnection *> (c) == 0) {
- return;
- }
+ if (b->ports_are_outputs() == false ||
+ route()->default_type() != b->type() ||
+ b->nchannels() != _route->n_inputs().get (b->type ())) {
+
+ return;
+ }
MenuList& citems = input_menu.items();
- 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();
-
- if (current == c) {
- ignore_toggle = true;
- dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
- ignore_toggle = false;
- }
+ std::string n = b->name ();
+ replace_all (n, "_", " ");
+
+ citems.push_back (CheckMenuElem (n, bind (mem_fun(*this, &MixerStrip::bundle_input_toggled), b)));
+
+ if (std::find (current.begin(), current.end(), b) != current.end()) {
+ ignore_toggle = true;
+ dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
+ ignore_toggle = false;
}
}
void
-MixerStrip::add_connection_to_output_menu (ARDOUR::Connection* c)
+MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleList const & current)
{
using namespace Menu_Helpers;
- if (dynamic_cast<OutputConnection *> (c) == 0) {
- return;
- }
-
- 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)));
+ if (b->ports_are_inputs() == false ||
+ route()->default_type() != b->type() ||
+ b->nchannels() != _route->n_outputs().get (b->type ())) {
- ARDOUR::Connection *current = _route->output_connection();
-
- if (current == c) {
- ignore_toggle = true;
- dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
- ignore_toggle = false;
- }
+ return;
+ }
+
+ MenuList& citems = output_menu.items();
+
+ std::string n = b->name ();
+ replace_all (n, "_", " ");
+
+ citems.push_back (CheckMenuElem (n, bind (mem_fun(*this, &MixerStrip::bundle_output_toggled), b)));
+
+ if (std::find (current.begin(), current.end(), b) != current.end()) {
+ ignore_toggle = true;
+ dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
+ ignore_toggle = false;
}
}
void
MixerStrip::update_diskstream_display ()
{
- if (is_audio_track()) {
-
- map_frozen ();
-
- update_input_display ();
+ if (is_track()) {
if (input_selector) {
input_selector->hide_all ();
} else {
- map_frozen ();
-
- update_input_display ();
show_passthru_color ();
}
}
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();
+ boost::shared_ptr<ARDOUR::AutomationControl> pan_control
+ = boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(
+ _route->panner().data().control(Evoral::Parameter( PanAutomation ) ));
- 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));
+ if (pan_control) {
+ panstate_connection = pan_control->alist()->automation_state_changed.connect (mem_fun(panners, &PannerUI::pan_automation_state_changed));
+ panstyle_connection = pan_control->alist()->automation_style_changed.connect (mem_fun(panners, &PannerUI::pan_automation_style_changed));
}
panners.pan_changed (this);
void
MixerStrip::update_input_display ()
{
- ARDOUR::Connection *c;
+ ARDOUR::BundleList const c = _route->bundles_connected_to_inputs ();
- if ((c = _route->input_connection()) != 0) {
- input_label.set_text (c->name());
+ if (c.size() > 1) {
+ input_label.set_text (_("Inputs"));
+ } else if (c.size() == 1) {
+ input_label.set_text (c[0]->name ());
} else {
switch (_width) {
case Wide:
void
MixerStrip::update_output_display ()
{
- ARDOUR::Connection *c;
+ ARDOUR::BundleList const c = _route->bundles_connected_to_outputs ();
- if ((c = _route->output_connection()) != 0) {
- output_label.set_text (c->name());
+ /* XXX: how do we represent >1 connected bundle? */
+ if (c.size() > 1) {
+ output_label.set_text (_("Outputs"));
+ } else if (c.size() == 1) {
+ output_label.set_text (c[0]->name());
} else {
switch (_width) {
case Wide:
break;
}
}
+
gpm.setup_meters ();
panners.setup_pan ();
}
MixerStrip::input_changed (IOChange change, void *src)
{
Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_input_display));
+ set_width(_width, this);
}
void
MixerStrip::output_changed (IOChange change, void *src)
{
Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_output_display));
+ set_width(_width, this);
+}
+
+
+void
+MixerStrip::comment_editor_done_editing()
+{
+ string str = comment_area->get_buffer()->get_text();
+ if (_route->comment() != str) {
+ _route->set_comment (str, this);
+
+ switch (_width) {
+
+ case Wide:
+ if (! str.empty()) {
+ comment_button.modify_bg (STATE_NORMAL, color());
+ ((Gtk::Label*)comment_button.get_child())->set_text (_("*Comments*"));
+ } else {
+ comment_button.unset_bg (STATE_NORMAL);
+ ((Gtk::Label*)comment_button.get_child())->set_text (_("Comments"));
+ }
+ break;
+
+ case Narrow:
+ if (! str.empty()) {
+ comment_button.modify_bg (STATE_NORMAL, color());
+ ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
+ } else {
+ comment_button.unset_bg (STATE_NORMAL);
+ ((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt"));
+ }
+ break;
+ }
+
+ ARDOUR_UI::instance()->tooltips().set_tip (comment_button,
+ str.empty() ? _("Click to Add/Edit Comments") : str);
+ }
+
}
void
setup_comment_editor ();
}
- int x, y, cw_width, cw_height;
+ int x, y, cw_width, cw_height;
if (comment_window->is_visible()) {
- string str = comment_area->get_buffer()->get_text();
- if (_route->comment() != str) {
- _route->set_comment (str, this);
+ comment_window->hide ();
+ return;
+ }
- switch (_width) {
-
- case Wide:
- if (! str.empty()) {
- comment_button.set_label (_("*Comments*"));
- } else {
- comment_button.set_label (_("Comments"));
- }
- break;
-
- case Narrow:
- if (! str.empty()) {
- comment_button.set_label (_("*Cmt*"));
- } else {
- comment_button.set_label (_("Cmt"));
- }
- break;
- }
-
- ARDOUR_UI::instance()->tooltips().set_tip (comment_button,
- str.empty() ? _("Click to Add/Edit Comments") : str);
- }
- comment_window->hide ();
- return;
- }
comment_window->get_size (cw_width, cw_height);
comment_window->get_position(x, y);
comment_window->move(x, y - (cw_height / 2) - 45);
comment_window->show();
comment_window->present();
-
}
void
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");
MixerStrip::show_route_color ()
{
name_button.modify_bg (STATE_NORMAL, color());
+ top_event_box.modify_bg (STATE_NORMAL, color());
route_active_changed ();
}
MixerStrip::build_route_ops_menu ()
{
using namespace Menu_Helpers;
-
- route_ops_menu = manage (new Menu);
+ route_ops_menu = 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)));
route_active_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
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<CheckMenuItem *> (&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<CheckMenuItem *> (&items.back());
+ denormal_menu_item->set_active (_route->denormal_protection());
- build_remote_control_menu ();
-
- items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu));
+ if (!Profile->get_sae()) {
+ 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_press (GdkEventButton* ev)
{
- if (ev->button == 1) {
+ if (ev->button == 1 || ev->button == 3) {
list_route_operations ();
+
+ Menu_Helpers::MenuList& items = route_ops_menu->items();
+ /* do not allow rename if the track is record-enabled */
+ static_cast<MenuItem*> (&items.front())->set_sensitive (!_route->record_enabled());
+
route_ops_menu->popup (1, ev->time);
}
return FALSE;
}
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 (PBD::short_version (_route->name(), 5));
{
switch (_width) {
case Wide:
- set_width (Narrow);
+ set_width (Narrow, this);
break;
case Narrow:
- set_width (Wide);
+ set_width (Wide, this);
break;
}
}
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
{
ENSURE_GUI_THREAD (mem_fun(*this, &MixerStrip::map_frozen));
- AudioTrack* at = audio_track();
+ boost::shared_ptr<AudioTrack> 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);
+ // XXX need some way, maybe, to retoggle redirect editors
break;
}
}
- _route->foreach_redirect (this, &MixerStrip::hide_redirect_editor);
+
+ hide_redirect_editors ();
}
void
-MixerStrip::hide_redirect_editor (boost::shared_ptr<Redirect> redirect)
+MixerStrip::hide_redirect_editors ()
{
- void* gui = redirect->get_gui ();
+ _route->foreach_processor (mem_fun (*this, &MixerStrip::hide_processor_editor));
+}
+
+void
+MixerStrip::hide_processor_editor (boost::weak_ptr<Processor> p)
+{
+ boost::shared_ptr<Processor> processor (p.lock ());
+ if (!processor) {
+ return;
+ }
+
+ void* gui = processor->get_gui ();
if (gui) {
static_cast<Gtk::Widget*>(gui)->hide ();
{
RouteUI::route_active_changed ();
- if (is_audio_track()) {
+ 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 { // FIXME: assumed audio bus
+ } else {
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) */
}
}
void
MixerStrip::engine_stopped ()
{
- input_button.set_sensitive (false);
- if (rec_enable_button) {
- rec_enable_button->set_sensitive (false);
- }
- output_button.set_sensitive (false);
}
void
MixerStrip::engine_running ()
{
- input_button.set_sensitive (true);
- if (rec_enable_button) {
- rec_enable_button->set_sensitive (true);
- }
- output_button.set_sensitive (true);
}
void
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;
- }
+ switch (_route->meter_point()) {
+ case MeterInput:
+ meter_point_label.set_text (_("input"));
+ break;
- gpm.setup_meters ();
+ case MeterPreFader:
+ meter_point_label.set_text (_("pre"));
+ break;
+
+ case MeterPostFader:
+ meter_point_label.set_text (_("post"));
+ break;
+ }
+
+ gpm.setup_meters ();
+ // reset peak when meter point changes
+ gpm.reset_peak_display();
+ set_width(_width, this);
}