diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-01-10 23:33:26 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-01-10 23:33:26 +0000 |
| commit | c482638aa6e0dbc0d4acdc93fe9712e1802fde32 (patch) | |
| tree | cb28da2b8d23d2607e3fb14711f6e3f89d1f46b2 /gtk2_ardour/gain_meter.cc | |
| parent | ed72df29b79f9e2dc7482f07c39010b4523c4a8e (diff) | |
Revert to fader-is-for-route on double-clicking a mixer strip's fader. Fixes #3685.
git-svn-id: svn://localhost/ardour2/branches/3.0@8496 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/gain_meter.cc')
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 7dd7f88d7c..64fde6f6bf 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -110,8 +110,8 @@ GainMeterBase::GainMeterBase (Session* s, level_meter = new LevelMeter(_session); - gain_slider->signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeter::start_gain_touch)); - gain_slider->signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeter::end_gain_touch)); + gain_slider->signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_press)); + gain_slider->signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_release)); gain_slider->set_name ("GainFader"); gain_display.set_name ("MixerStripGainDisplay"); @@ -591,18 +591,28 @@ GainMeterBase::meter_point_clicked () } } -gint -GainMeterBase::start_gain_touch (GdkEventButton*) +bool +GainMeterBase::gain_slider_button_press (GdkEventButton* ev) { - _amp->gain_control()->start_touch (_amp->session().transport_frame()); - return FALSE; + switch (ev->type) { + case GDK_BUTTON_PRESS: + _amp->gain_control()->start_touch (_amp->session().transport_frame()); + break; + case GDK_2BUTTON_PRESS: + SliderDoubleClicked (); /* EMIT SIGNAL */ + break; + default: + return false; + } + + return true; } -gint -GainMeterBase::end_gain_touch (GdkEventButton*) +bool +GainMeterBase::gain_slider_button_release (GdkEventButton* ev) { _amp->gain_control()->stop_touch (false, _amp->session().transport_frame()); - return FALSE; + return true; } gint |