diff options
| author | Robin Gareus <robin@gareus.org> | 2014-09-05 02:38:24 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-09-05 02:38:24 +0200 |
| commit | 70be12afaa6c5d870a7d5373eeb7f4430a1be806 (patch) | |
| tree | 6c2d53d1deab00af70af37a78feaa8b6bfb4fb06 /gtk2_ardour/gain_meter.cc | |
| parent | 48a851011b6134794ce0f64a4866c2e9fc97b058 (diff) | |
gain-meter: use new PixFader API
Diffstat (limited to 'gtk2_ardour/gain_meter.cc')
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 3a9f6692e1..8098131fe6 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -89,8 +89,9 @@ 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->signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_press), false); - gain_slider->signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_release), false); + 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"); gain_display.set_name ("MixerStripGainDisplay"); @@ -690,25 +691,16 @@ GainMeterBase::meter_point_clicked () } } -bool -GainMeterBase::gain_slider_button_press (GdkEventButton* ev) +void +GainMeterBase::amp_start_touch () { - switch (ev->type) { - case GDK_BUTTON_PRESS: - _amp->gain_control()->start_touch (_amp->session().transport_frame()); - break; - default: - return false; - } - - return false; + _amp->gain_control()->start_touch (_amp->session().transport_frame()); } -bool -GainMeterBase::gain_slider_button_release (GdkEventButton*) +void +GainMeterBase::amp_stop_touch () { _amp->gain_control()->stop_touch (false, _amp->session().transport_frame()); - return false; } gint |