ardour/livetrax
13
0
Fork 0
Code

gain-meter: use new PixFader API

Browse Source
This commit is contained in:
Robin Gareus 2014-09-05 02:38:24 +02:00
parent 48a851011b
commit 70be12afaa
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk2_ardour/gain_meter.cc
View File

@ -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

4
gtk2_ardour/gain_meter.h
View File

@ -168,8 +168,8 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr
Gtk::Menu* meter_menu;
void popup_meter_menu (GdkEventButton*);
bool gain_slider_button_press (GdkEventButton *);
bool gain_slider_button_release (GdkEventButton *);
void amp_stop_touch ();
void amp_start_touch ();
void set_route_group_meter_point (ARDOUR::Route&, ARDOUR::MeterPoint);
void set_meter_point (ARDOUR::Route&, ARDOUR::MeterPoint);