Snap-back fader on release (follow-up to e8cebac6a36a)

[ardour.git] / gtk2_ardour / gain_meter.cc

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 0a66784a938247df63b67ca29210ae60ddf0b14d..5e2cd62c624f3b2b31440f1ef47f6178b9b94520 100644 (file)
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -581,7 +581,14 @@ GainMeterBase::fader_moved ()
                        value = gain_adjustment.get_value();
                }
 
-               _control->set_value (value, Controllable::UseGroup);
+               // 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::NoGroup);
+               } else {
+                       _control->set_value (value, Controllable::UseGroup);
+               }
        }
 
        show_gain ();
@@ -725,6 +732,7 @@ void
 GainMeterBase::amp_stop_touch ()
 {
        _control->stop_touch (false, _control->session().transport_frame());
+       effective_gain_display ();
 }
 
 gint