minor safety fix for the Pane

[ardour.git] / gtk2_ardour / gain_meter.cc

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index b38e653bac3edd7c0b4364092bbd1e5586782a70..4b72a25de834c9f778385c9126e8efeb47dcbef6 100644 (file)
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -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<void, ARDOUR::AutoState> 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.
@@ -225,20 +228,17 @@ GainMeterBase::set_controls (boost::shared_ptr<Route> 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 +259,17 @@ GainMeterBase::set_controls (boost::shared_ptr<Route> 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 +418,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");
 }
@@ -479,10 +490,10 @@ GainMeterBase::gain_activated ()
        /* 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()) {
@@ -541,11 +552,7 @@ GainMeterBase::fader_moved ()
                        value = gain_adjustment.get_value();
                }
 
-               if (_route && _control == _route->gain_control()) {
-                       _route->set_gain (value, Controllable::UseGroup);
-               } else {
-                       _control->set_value (value, Controllable::NoGroup);
-               }
+               _control->set_value (value, Controllable::UseGroup);
        }
 
        show_gain ();
@@ -760,6 +767,7 @@ GainMeterBase::gain_automation_state_button_event (GdkEventButton *ev)
 
        switch (ev->button) {
                case 1:
+                       gain_astate_propagate = Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier));
                        gain_astate_menu.popup (1, ev->time);
                        break;
                default: