X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgain_meter.cc;h=5f0a854e69b1c09599f8dfc57bdfa560973e88e5;hb=5b80a6ba0447406f5ddf61a1ec5ed0f002ee0a05;hp=baf4193d27fa0466b7bc345e9619f6e036388f3c;hpb=653ae4acd639fef149314fe6f8c7a0d862afae40;p=ardour.git diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index baf4193d27..5f0a854e69 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -20,6 +20,7 @@ #include #include "ardour/amp.h" +#include "ardour/logmeter.h" #include "ardour/route_group.h" #include "ardour/session_route.h" #include "ardour/dB.h" @@ -35,7 +36,6 @@ #include "pbd/stacktrace.h" #include "gain_meter.h" -#include "logmeter.h" #include "gui_thread.h" #include "keyboard.h" #include "public_editor.h" @@ -52,7 +52,7 @@ #include "ardour/midi_track.h" #include "ardour/dB.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; @@ -82,6 +82,8 @@ 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 @@ -90,6 +92,7 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int dB_coeff_step(Config->get_max_gain())) // page increment , gain_automation_style_button ("") , gain_automation_state_button ("") + , gain_astate_propagate (false) , _data_type (DataType::AUDIO) { using namespace Menu_Helpers; @@ -126,13 +129,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. @@ -159,6 +162,7 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int gain_astyle_menu.items().push_back (MenuElem (_("Abs"))); gain_astate_menu.set_name ("ArdourContextMenu"); + gain_astate_menu.set_reserve_toggle_size(false); gain_astyle_menu.set_name ("ArdourContextMenu"); gain_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &GainMeterBase::fader_moved)); @@ -225,20 +229,17 @@ 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))); + sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (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))); + sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::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))); + sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::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))); + sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Touch))); connections.push_back (gain_automation_style_button.signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_automation_style_button_event), false)); 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()); @@ -259,6 +260,17 @@ GainMeterBase::set_controls (boost::shared_ptr r, } } +void +GainMeterBase::set_gain_astate (AutoState as) +{ + if (gain_astate_propagate) { + gain_astate_propagate = false; + ChangeGainAutomationState (as); + return; + } + _amp->set_parameter_automation_state (Evoral::Parameter (GainAutomation), as); +} + void GainMeterBase::setup_gain_adjustment () { @@ -407,7 +419,7 @@ GainMeterBase::reset_peak_display () { _meter->reset_max(); level_meter->clear_meters(); - max_peak = -INFINITY; + max_peak = minus_infinity (); peak_display.set_text (_("-inf")); peak_display.set_name ("MixerStripPeakDisplay"); } @@ -465,15 +477,9 @@ 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 */ @@ -756,7 +762,10 @@ 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, + "", 1, ev->time); break; default: break;