X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgain_meter.cc;h=4196409692aa3c78cfd9b58601f22711cb72c7ac;hb=refs%2Fheads%2Fcarl-master;hp=0eea976b97b02fa73f601a162f7cd6d62d2b8f96;hpb=51c833dff5db4dc5a33d2e3ee8e4ea21a9720acd;p=ardour.git diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 0eea976b97..4196409692 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -1,48 +1,60 @@ /* - Copyright (C) 2002 Paul Davis + * Copyright (C) 2005-2006 Nick Mainsbridge + * Copyright (C) 2005-2017 Paul Davis + * Copyright (C) 2005 Taybin Rutkin + * Copyright (C) 2006-2007 Doug McLain + * Copyright (C) 2006-2014 David Robillard + * Copyright (C) 2007-2016 Tim Mayberry + * Copyright (C) 2009-2012 Carl Hetherington + * Copyright (C) 2013-2019 Robin Gareus + * Copyright (C) 2014-2015 Ben Loftis + * Copyright (C) 2016 Julien "_FrnchFrgg_" RIVAUD + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * 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., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ - 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - 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. +#include -*/ +#include -#include +#include +#include +#include #include "ardour/amp.h" +#include "ardour/logmeter.h" #include "ardour/route_group.h" #include "ardour/session_route.h" #include "ardour/dB.h" #include "ardour/utils.h" -#include -#include -#include -#include -#include -#include +#include "gtkmm2ext/utils.h" +#include "gtkmm2ext/gtk_ui.h" + +#include "widgets/tooltips.h" + #include "pbd/fastlog.h" #include "pbd/stacktrace.h" #include "gain_meter.h" -#include "logmeter.h" #include "gui_thread.h" #include "keyboard.h" #include "public_editor.h" #include "utils.h" #include "meter_patterns.h" #include "timers.h" -#include "tooltips.h" #include "ui_config.h" #include "ardour/session.h" @@ -52,10 +64,10 @@ #include "ardour/midi_track.h" #include "ardour/dB.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; -using namespace ARDOUR_UI_UTILS; +using namespace ArdourWidgets; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; @@ -82,14 +94,17 @@ reset_cursor_to_default_state (Gtk::StateType, Gtk::Entry* widget) reset_cursor_to_default (widget); } +sigc::signal GainMeterBase::ChangeGainAutomationState; + GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int fader_girth) : gain_adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), // value 0.0, // lower 1.0, // upper dB_coeff_step(Config->get_max_gain()) / 10.0, // step increment dB_coeff_step(Config->get_max_gain())) // page increment - , gain_automation_style_button ("") , gain_automation_state_button ("") + , meter_point_button (_("pre")) + , gain_astate_propagate (false) , _data_type (DataType::AUDIO) { using namespace Menu_Helpers; @@ -106,8 +121,10 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int if (horizontal) { gain_slider = manage (new HSliderController (&gain_adjustment, boost::shared_ptr(), fader_length, fader_girth)); + gain_slider->set_tweaks (ArdourFader::Tweaks(ArdourFader::NoButtonForward | ArdourFader::NoVerticalScroll)); } else { gain_slider = manage (new VSliderController (&gain_adjustment, boost::shared_ptr(), fader_length, fader_girth)); + gain_slider->set_tweaks (ArdourFader::NoButtonForward); } level_meter = new LevelMeterHBox(_session); @@ -116,7 +133,6 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int meter_metric_area.signal_button_press_event().connect (sigc::mem_fun (*this, &GainMeterBase::level_meter_button_press)); meter_metric_area.add_events (Gdk::BUTTON_PRESS_MASK); - gain_slider->set_tweaks (PixFader::Tweaks(PixFader::NoButtonForward | PixFader::NoVerticalScroll)); gain_slider->StartGesture.connect (sigc::mem_fun (*this, &GainMeter::amp_start_touch)); gain_slider->StopGesture.connect (sigc::mem_fun (*this, &GainMeter::amp_stop_touch)); gain_slider->set_name ("GainFader"); @@ -126,13 +142,13 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int gain_display.signal_activate().connect (sigc::mem_fun (*this, &GainMeter::gain_activated)); gain_display.signal_focus_in_event().connect (sigc::mem_fun (*this, &GainMeter::gain_focused), false); gain_display.signal_focus_out_event().connect (sigc::mem_fun (*this, &GainMeter::gain_focused), false); - gain_display.set_alignment(0.5); + gain_display.set_alignment (0.5); peak_display.set_name ("MixerStripPeakDisplay"); set_size_request_to_display_given_text (peak_display, "-80.g", 2, 6); /* note the descender */ max_peak = minus_infinity(); peak_display.set_text (_("-inf")); - peak_display.set_alignment(0.5); + peak_display.set_alignment (0.5); /* stuff related to the fact that the peak display is not, in fact, supposed to be a text entry. @@ -143,25 +159,50 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int peak_display.unset_flags (Gtk::CAN_FOCUS); peak_display.set_editable (false); - gain_automation_style_button.set_name ("mixer strip button"); gain_automation_state_button.set_name ("mixer strip button"); set_tooltip (gain_automation_state_button, _("Fader automation mode")); - set_tooltip (gain_automation_style_button, _("Fader automation type")); + set_tooltip (peak_display, _("dBFS - Digital Peak Hold. Click to reset.")); - gain_automation_style_button.unset_flags (Gtk::CAN_FOCUS); gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS); gain_automation_state_button.set_size_request(15, 15); - gain_automation_style_button.set_size_request(15, 15); - - gain_astyle_menu.items().push_back (MenuElem (_("Trim"))); - gain_astyle_menu.items().push_back (MenuElem (_("Abs"))); gain_astate_menu.set_name ("ArdourContextMenu"); - gain_astyle_menu.set_name ("ArdourContextMenu"); + gain_astate_menu.set_reserve_toggle_size(false); + + meter_point_button.set_name ("mixer strip button"); + + set_tooltip (&meter_point_button, _("Metering point")); + + meter_point_button.unset_flags (Gtk::CAN_FOCUS); + + meter_point_button.set_size_request(15, 15); + + meter_point_menu.set_name ("ArdourContextMenu"); + meter_point_menu.set_reserve_toggle_size(false); + + meter_point_menu.items().clear (); + meter_point_menu.items().push_back (MenuElem(meterpt_string(MeterInput), + sigc::bind (sigc::mem_fun (*this, + &GainMeterBase::meter_point_clicked), (MeterPoint) MeterInput))); + meter_point_menu.items().push_back (MenuElem(meterpt_string(MeterPreFader), + sigc::bind (sigc::mem_fun (*this, + &GainMeterBase::meter_point_clicked), (MeterPoint) MeterPreFader))); + meter_point_menu.items().push_back (MenuElem(meterpt_string (MeterPostFader), + sigc::bind (sigc::mem_fun (*this, + &GainMeterBase::meter_point_clicked), (MeterPoint) MeterPostFader))); + meter_point_menu.items().push_back (MenuElem(meterpt_string (MeterOutput), + sigc::bind (sigc::mem_fun (*this, + &GainMeterBase::meter_point_clicked), (MeterPoint) MeterOutput))); + meter_point_menu.items().push_back (MenuElem(meterpt_string (MeterCustom), + sigc::bind (sigc::mem_fun (*this, + &GainMeterBase::meter_point_clicked), (MeterPoint) MeterCustom))); - gain_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &GainMeterBase::gain_adjusted)); + meter_point_button.signal_button_press_event().connect (sigc::mem_fun (*this, &GainMeter::meter_press), false); + + gain_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &GainMeterBase::fader_moved)); + peak_display.signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::peak_button_press), false); peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeterBase::peak_button_release), false); gain_display.signal_key_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_key_press), false); @@ -224,24 +265,21 @@ GainMeterBase::set_controls (boost::shared_ptr r, gain_astate_menu.items().clear (); - gain_astate_menu.items().push_back (MenuElem (S_("Automation|Manual"), - sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), - Evoral::Parameter(GainAutomation), (AutoState) ARDOUR::Off))); - gain_astate_menu.items().push_back (MenuElem (_("Play"), - sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), - Evoral::Parameter(GainAutomation), (AutoState) Play))); - gain_astate_menu.items().push_back (MenuElem (_("Write"), - sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), - Evoral::Parameter(GainAutomation), (AutoState) Write))); - gain_astate_menu.items().push_back (MenuElem (_("Touch"), - sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), - Evoral::Parameter(GainAutomation), (AutoState) Touch))); - - connections.push_back (gain_automation_style_button.signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_automation_style_button_event), false)); + gain_astate_menu.items().push_back (MenuElem (astate_string (ARDOUR::Off), + sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Off))); + gain_astate_menu.items().push_back (MenuElem (astate_string (ARDOUR::Play), + sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Play))); + gain_astate_menu.items().push_back (MenuElem (astate_string (ARDOUR::Write), + sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Write))); + gain_astate_menu.items().push_back (MenuElem (astate_string (ARDOUR::Touch), + sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Touch))); + gain_astate_menu.items().push_back (MenuElem (astate_string (ARDOUR::Latch), + sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Latch))); + connections.push_back (gain_automation_state_button.signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_automation_state_button_event), false)); + connections.push_back (ChangeGainAutomationState.connect (sigc::mem_fun(*this, &GainMeterBase::set_gain_astate))); _control->alist()->automation_state_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_state_changed, this), gui_context()); - _control->alist()->automation_style_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_style_changed, this), gui_context()); gain_automation_state_changed (); } @@ -251,6 +289,28 @@ GainMeterBase::set_controls (boost::shared_ptr r, gain_changed (); show_gain (); update_gain_sensitive (); + + if (!_meter) { + peak_display.hide (); + } else { + peak_display.show (); + } +} + +void +GainMeterBase::set_gain_astate (AutoState as) +{ + if (gain_astate_propagate) { + gain_astate_propagate = false; + ChangeGainAutomationState (as); + return; + } + if (_amp) { + _amp->set_parameter_automation_state (Evoral::Parameter (GainAutomation), as); + } else if (_control) { + _control->set_automation_state (as); + _session->set_dirty (); + } } void @@ -272,7 +332,7 @@ GainMeterBase::setup_gain_adjustment () gain_adjustment.set_upper (GAIN_COEFF_UNITY); gain_adjustment.set_step_increment (dB_coeff_step(Config->get_max_gain()) / 10.0); gain_adjustment.set_page_increment (dB_coeff_step(Config->get_max_gain())); - gain_slider->set_default_value (gain_to_slider_position (GAIN_COEFF_UNITY)); + gain_slider->set_default_value (gain_to_slider_position_with_max (GAIN_COEFF_UNITY, Config->get_max_gain())); } else { _data_type = DataType::MIDI; gain_adjustment.set_lower (0.0); @@ -333,12 +393,6 @@ GainMeterBase::setup_meters (int len) level_meter->setup_meters(len, meter_width); } -void -GainMeterBase::set_type (MeterType t) -{ - level_meter->set_type(t); -} - void GainMeter::setup_meters (int len) { @@ -361,16 +415,10 @@ GainMeter::setup_meters (int len) GainMeterBase::setup_meters (len); } -void -GainMeter::set_type (MeterType t) -{ - GainMeterBase::set_type (t); -} - bool GainMeterBase::gain_key_press (GdkEventKey* ev) { - if (key_is_legal_for_numeric_entry (ev->keyval)) { + if (ARDOUR_UI_UTILS::key_is_legal_for_numeric_entry (ev->keyval)) { /* drop through to normal handling */ return false; } @@ -378,6 +426,12 @@ GainMeterBase::gain_key_press (GdkEventKey* ev) return true; } +bool +GainMeterBase::peak_button_press (GdkEventButton* ev) +{ + return true; +} + bool GainMeterBase::peak_button_release (GdkEventButton* ev) { @@ -399,9 +453,13 @@ GainMeterBase::peak_button_release (GdkEventButton* ev) void GainMeterBase::reset_peak_display () { + if (!_route) { + // catch "reset all" for VCAs + return; + } _meter->reset_max(); level_meter->clear_meters(); - max_peak = -INFINITY; + max_peak = minus_infinity (); peak_display.set_text (_("-inf")); peak_display.set_name ("MixerStripPeakDisplay"); } @@ -459,24 +517,18 @@ GainMeterBase::gain_activated () { float f; - { - // Switch to user's preferred locale so that - // if they use different LC_NUMERIC conventions, - // we will honor them. - - PBD::LocaleGuard lg; - if (sscanf (gain_display.get_text().c_str(), "%f", &f) != 1) { - return; - } + // Use the user's preferred locale/LC_NUMERIC setting + if (sscanf (gain_display.get_text().c_str(), "%f", &f) != 1) { + return; } /* clamp to displayable values */ if (_data_type == DataType::AUDIO) { f = min (f, 6.0f); - _control->set_value (dB_to_coefficient(f), Controllable::NoGroup); + _control->set_value (dB_to_coefficient(f), Controllable::UseGroup); } else { f = min (fabs (f), 2.0f); - _control->set_value (f, Controllable::NoGroup); + _control->set_value (f, Controllable::UseGroup); } if (gain_display.has_focus()) { @@ -521,23 +573,27 @@ GainMeterBase::show_gain () } void -GainMeterBase::gain_adjusted () +GainMeterBase::fader_moved () { - gain_t value; + if (!ignore_toggle) { - /* convert from adjustment range (0..1) to gain coefficient */ + gain_t value; - if (_data_type == DataType::AUDIO) { - value = slider_position_to_gain_with_max (gain_adjustment.get_value(), Config->get_max_gain()); - } else { - value = gain_adjustment.get_value(); - } + /* convert from adjustment range (0..1) to gain coefficient */ - if (!ignore_toggle) { - if (_route && _route->amp() == _amp) { - _route->set_gain (value, Controllable::UseGroup); + if (_data_type == DataType::AUDIO) { + value = slider_position_to_gain_with_max (gain_adjustment.get_value(), Config->get_max_gain()); + } else { + value = gain_adjustment.get_value(); + } + + // XXX hack allow to override group + // (this breaks group'ed shift+click reset) + if (Keyboard::the_keyboard().key_is_down (GDK_Shift_R) + || Keyboard::the_keyboard().key_is_down (GDK_Shift_L)) { + _control->set_value (value, Controllable::InverseGroup); } else { - _control->set_value (value, Controllable::NoGroup); + _control->set_value (value, Controllable::UseGroup); } } @@ -547,20 +603,23 @@ GainMeterBase::gain_adjusted () void GainMeterBase::effective_gain_display () { - float value = GAIN_COEFF_ZERO; + gain_t fader_position = 0; switch (_data_type) { case DataType::AUDIO: - value = gain_to_slider_position_with_max (_control->get_value(), Config->get_max_gain()); + /* the position of the fader should reflect any master gain, + * not just the control's own inherent value + */ + fader_position = gain_to_slider_position_with_max (_control->get_value(), Config->get_max_gain()); break; case DataType::MIDI: - value = _control->get_value (); + fader_position = _control->get_value (); break; } - if (gain_adjustment.get_value() != value) { + if (gain_adjustment.get_value() != fader_position) { ignore_toggle = true; - gain_adjustment.set_value (value); + gain_adjustment.set_value (fader_position); ignore_toggle = false; } } @@ -568,7 +627,8 @@ GainMeterBase::effective_gain_display () void GainMeterBase::gain_changed () { - Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&GainMeterBase::effective_gain_display, this)); + ENSURE_GUI_THREAD (*this, &GainMeterBase::gain_automation_state_changed); + effective_gain_display (); } void @@ -592,114 +652,45 @@ void GainMeterBase::update_gain_sensitive () { bool x = !(_control->alist()->automation_state() & Play); - static_cast(gain_slider)->set_sensitive (x); -} - -static MeterPoint -next_meter_point (MeterPoint mp) -{ - switch (mp) { - case MeterInput: - return MeterPreFader; - break; - - case MeterPreFader: - return MeterPostFader; - break; - - case MeterPostFader: - return MeterOutput; - break; - - case MeterOutput: - return MeterCustom; - break; - - case MeterCustom: - return MeterInput; - break; - } - - abort(); /*NOTREACHED*/ - return MeterInput; + static_cast(gain_slider)->set_sensitive (x); } gint GainMeterBase::meter_press(GdkEventButton* ev) { - wait_for_release = false; - if (!_route) { - return FALSE; + return false; } - if (!ignore_toggle) { - - if (Keyboard::is_context_menu_event (ev)) { - - // no menu at this time. - - } else { - - if (Keyboard::is_button2_event(ev)) { - - // Primary-button2 click is the midi binding click - // button2-click is "momentary" - - if (!Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier))) { - wait_for_release = true; - old_meter_point = _route->meter_point (); - } - } - - if (_route && (ev->button == 1 || Keyboard::is_button2_event (ev))) { - + switch (ev->button) { + case 1: if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) { /* Primary+Tertiary-click applies change to all routes */ - _session->foreach_route (this, &GainMeterBase::set_meter_point, next_meter_point (_route->meter_point())); - + meter_point_change_target = MeterPointChangeAll; } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - /* Primary-click: solo mix group. - NOTE: Primary-button2 is MIDI learn. - */ + /* Primary-click: apply change to all routes in group */ - if (ev->button == 1) { - set_route_group_meter_point (*_route, next_meter_point (_route->meter_point())); - } + meter_point_change_target = MeterPointChangeGroup; } else { /* click: change just this route */ - // XXX no undo yet - - _route->set_meter_point (next_meter_point (_route->meter_point())); + meter_point_change_target = MeterPointChangeSingle; } - } - } - } - - return true; - -} - -gint -GainMeterBase::meter_release(GdkEventButton*) -{ - if (!ignore_toggle) { - if (wait_for_release) { - wait_for_release = false; - - if (_route) { - set_meter_point (*_route, old_meter_point); - } + Gtkmm2ext::anchored_menu_popup(&meter_point_menu, + &meter_point_button, + meterpt_string (_route->meter_point()), + 1, ev->time); + break; + default: + break; } } - return true; } @@ -722,23 +713,34 @@ GainMeterBase::set_route_group_meter_point (Route& route, MeterPoint mp) } void -GainMeterBase::meter_point_clicked () +GainMeterBase::meter_point_clicked (MeterPoint mp) { if (_route) { - /* WHAT? */ + switch (meter_point_change_target) { + case MeterPointChangeAll: + _session->foreach_route (this, &GainMeterBase::set_meter_point, mp); + break; + case MeterPointChangeGroup: + set_route_group_meter_point (*_route, mp); + break; + case MeterPointChangeSingle: + _route->set_meter_point (mp); + break; + } } } void GainMeterBase::amp_start_touch () { - _control->start_touch (_control->session().transport_frame()); + _control->start_touch (_control->session().transport_sample()); } void GainMeterBase::amp_stop_touch () { - _control->stop_touch (false, _control->session().transport_frame()); + _control->stop_touch (_control->session().transport_sample()); + effective_gain_display (); } gint @@ -750,7 +752,11 @@ GainMeterBase::gain_automation_state_button_event (GdkEventButton *ev) switch (ev->button) { case 1: - gain_astate_menu.popup (1, ev->time); + gain_astate_propagate = Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier)); + Gtkmm2ext::anchored_menu_popup(&gain_astate_menu, + &gain_automation_state_button, + astate_string(_control->alist()->automation_state()), + 1, ev->time); break; default: break; @@ -759,22 +765,6 @@ GainMeterBase::gain_automation_state_button_event (GdkEventButton *ev) return TRUE; } -gint -GainMeterBase::gain_automation_style_button_event (GdkEventButton *ev) -{ - if (ev->type == GDK_BUTTON_RELEASE) { - return TRUE; - } - - switch (ev->button) { - case 1: - gain_astyle_menu.popup (1, ev->time); - break; - default: - break; - } - return TRUE; -} string GainMeterBase::astate_string (AutoState state) @@ -791,76 +781,46 @@ GainMeterBase::short_astate_string (AutoState state) string GainMeterBase::_astate_string (AutoState state, bool shrt) { - string sstr; - switch (state) { - case ARDOUR::Off: - sstr = (shrt ? "M" : _("M")); - break; - case Play: - sstr = (shrt ? "P" : _("P")); - break; - case Touch: - sstr = (shrt ? "T" : _("T")); - break; - case Write: - sstr = (shrt ? "W" : _("W")); - break; + case ARDOUR::Off: + return shrt ? S_("Manual|M") : S_("Automation|Manual"); + case Play: + return shrt ? S_("Play|P") : _("Play"); + case Touch: + return shrt ? S_("Touch|T") : _("Touch"); + case Latch: + return shrt ? S_("Latch|L") : _("Latch"); + case Write: + return shrt ? S_("Write|W"): _("Write"); } - - return sstr; -} - -string -GainMeterBase::astyle_string (AutoStyle style) -{ - return _astyle_string (style, false); -} - -string -GainMeterBase::short_astyle_string (AutoStyle style) -{ - return _astyle_string (style, true); + assert (0); + return "???"; } string -GainMeterBase::_astyle_string (AutoStyle style, bool shrt) +GainMeterBase::meterpt_string (MeterPoint mp) { - if (style & Trim) { - return _("Trim"); - } else { - /* XXX it might different in different languages */ - - return (shrt ? _("Abs") : _("Abs")); - } -} - -void -GainMeterBase::gain_automation_style_changed () -{ - switch (_width) { - case Wide: - gain_automation_style_button.set_text (astyle_string(_control->alist()->automation_style())); - break; - case Narrow: - gain_automation_style_button.set_text (short_astyle_string(_control->alist()->automation_style())); - break; + switch (mp) { + case MeterInput: + return _("Input"); + case MeterPreFader: + return _("Pre Fader"); + case MeterPostFader: + return _("Post Fader"); + case MeterOutput: + return _("Output"); + case MeterCustom: + return _("Custom"); } + assert (0); + return "???"; // make gcc and _FrnchFrgg_ happy } void GainMeterBase::gain_automation_state_changed () { ENSURE_GUI_THREAD (*this, &GainMeterBase::gain_automation_state_changed); - - switch (_width) { - case Wide: - gain_automation_state_button.set_text (astate_string(_control->alist()->automation_state())); - break; - case Narrow: - gain_automation_state_button.set_text (short_astate_string(_control->alist()->automation_state())); - break; - } + gain_automation_state_button.set_text (short_astate_string(_control->alist()->automation_state())); const bool automation_watch_required = (_control->alist()->automation_state() != ARDOUR::Off); @@ -873,14 +833,6 @@ GainMeterBase::gain_automation_state_changed () update_gain_sensitive (); gain_watching.disconnect(); - - if (automation_watch_required) { - /* start watching automation so that things move */ - gain_watching = Timers::rapid_connect (sigc::mem_fun (*this, &GainMeterBase::effective_gain_display)); - } else { - /* update once to get the correct value shown as we re-enter off/manual mode */ - effective_gain_display(); - } } const ChanCount @@ -959,24 +911,19 @@ GainMeter::GainMeter (Session* s, int fader_length) meter_metric_area.set_name ("AudioTrackMetrics"); meter_metric_area.set_size_request(PX_SCALE(24, 24), -1); - gain_automation_style_button.set_name ("mixer strip button"); gain_automation_state_button.set_name ("mixer strip button"); set_tooltip (gain_automation_state_button, _("Fader automation mode")); - set_tooltip (gain_automation_style_button, _("Fader automation type")); - gain_automation_style_button.unset_flags (Gtk::CAN_FOCUS); gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS); gain_automation_state_button.set_size_request (PX_SCALE(12, 15), PX_SCALE(12, 15)); - gain_automation_style_button.set_size_request (PX_SCALE(12, 15), PX_SCALE(12, 15)); - fader_vbox = manage (new Gtk::VBox()); - fader_vbox->set_spacing (0); - fader_vbox->pack_start (*gain_slider, true, true); + fader_vbox.set_spacing (0); + fader_vbox.pack_start (*gain_slider, true, true); fader_alignment.set (0.5, 0.5, 0.0, 1.0); - fader_alignment.add (*fader_vbox); + fader_alignment.add (fader_vbox); hbox.pack_start (fader_alignment, true, true); @@ -1003,6 +950,8 @@ GainMeter::GainMeter (Session* s, int fader_length) meter_hbox.pack_start (meter_alignment, false, false); meter_hbox.pack_start (meter_ticks2_area, false, false); meter_hbox.pack_start (meter_metric_area, false, false); + + meter_metric_area.set_no_show_all (); } #undef PX_SCALE @@ -1028,8 +977,8 @@ GainMeter::set_controls (boost::shared_ptr r, _meter->ConfigurationChanged.connect ( model_connections, invalidator (*this), boost::bind (&GainMeter::meter_configuration_changed, this, _1), gui_context() ); - _meter->TypeChanged.connect ( - model_connections, invalidator (*this), boost::bind (&GainMeter::meter_type_changed, this, _1), gui_context() + _meter->MeterTypeChanged.connect ( + model_connections, invalidator (*this), boost::bind (&GainMeter::redraw_metrics, this), gui_context() ); meter_configuration_changed (_meter->input_streams ()); @@ -1038,20 +987,20 @@ GainMeter::set_controls (boost::shared_ptr r, if (_route) { _route->active_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::route_active_changed, this), gui_context ()); + hbox.pack_start (meter_hbox, true, true); + meter_hbox.show (); } - /* - if we have a non-hidden route (ie. we're not the click or the auditioner), - pack some route-dependent stuff. - */ - - hbox.pack_start (meter_hbox, true, true); - // if (r && !r->is_auditioner()) { // fader_vbox->pack_start (gain_automation_state_button, false, false, 0); // } - hbox.show_all (); + gain_display_box.show (); + gain_display.show (); + gain_slider->show (); + fader_vbox.show (); + fader_alignment.show (); + hbox.show (); setup_meters (); } @@ -1188,8 +1137,7 @@ GainMeter::route_active_changed () } void -GainMeter::meter_type_changed (MeterType t) +GainMeter::redraw_metrics () { - _route->set_meter_type(t); - RedrawMetrics(); + GainMeterBase::redraw_metrics (); }