diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index 9fb3b1da37..a62fee2672 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/gtk2_ardour/automation_controller.cc @@ -212,14 +212,14 @@ AutomationController::value_adjusted () } void -AutomationController::start_touch() +AutomationController::start_touch (int state) { _grabbed = true; _controllable->start_touch (timepos_t (_controllable->session().transport_sample())); } void -AutomationController::end_touch () +AutomationController::end_touch (int state) { _controllable->stop_touch (timepos_t (_controllable->session().transport_sample())); if (_grabbed) { @@ -229,20 +229,20 @@ AutomationController::end_touch () } bool -AutomationController::button_press (GdkEventButton*) +AutomationController::button_press (GdkEventButton* ev) { ArdourButton* but = dynamic_cast(_widget); if (but) { - start_touch (); + start_touch (ev->state); _controllable->set_value (but->get_active () ? 0.0 : 1.0, Controllable::UseGroup); } return false; } bool -AutomationController::button_release (GdkEventButton*) +AutomationController::button_release (GdkEventButton* ev) { - end_touch (); + end_touch (ev->state); return true; } diff --git a/gtk2_ardour/automation_controller.h b/gtk2_ardour/automation_controller.h index 07b698b4d8..90b1c73be6 100644 --- a/gtk2_ardour/automation_controller.h +++ b/gtk2_ardour/automation_controller.h @@ -88,8 +88,8 @@ private: Gtk::Adjustment* adj, bool use_knob); - void start_touch(); - void end_touch(); + void start_touch(int); + void end_touch(int); bool button_press(GdkEventButton*); bool button_release(GdkEventButton*); diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 74aa5a4187..135309d712 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -752,13 +752,13 @@ GainMeterBase::meter_point_clicked (MeterPoint mp) } void -GainMeterBase::amp_start_touch () +GainMeterBase::amp_start_touch (int state) { _control->start_touch (timepos_t (_control->session().transport_sample())); } void -GainMeterBase::amp_stop_touch () +GainMeterBase::amp_stop_touch (int state) { _control->stop_touch (timepos_t (_control->session().transport_sample())); effective_gain_display (); diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h index 2e1aa87997..bc7789ffc0 100644 --- a/gtk2_ardour/gain_meter.h +++ b/gtk2_ardour/gain_meter.h @@ -186,8 +186,8 @@ protected: Gtk::Menu* meter_menu; void popup_meter_menu (GdkEventButton*); - void amp_stop_touch (); - void amp_start_touch (); + void amp_stop_touch (int); + void amp_start_touch (int); void set_route_group_meter_point (ARDOUR::Route&, ARDOUR::MeterPoint); void set_meter_point (ARDOUR::Route&, ARDOUR::MeterPoint); diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index da4647a36d..362b1ce9d8 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -1010,13 +1010,13 @@ MeterStrip::color () const } void -MeterStrip::gain_start_touch () +MeterStrip::gain_start_touch (int) { _route->gain_control ()->start_touch (timepos_t (_session->transport_sample ())); } void -MeterStrip::gain_end_touch () +MeterStrip::gain_end_touch (int) { _route->gain_control ()->stop_touch (timepos_t (_session->transport_sample ())); } diff --git a/gtk2_ardour/meter_strip.h b/gtk2_ardour/meter_strip.h index ea1b690748..ca1e43f3d8 100644 --- a/gtk2_ardour/meter_strip.h +++ b/gtk2_ardour/meter_strip.h @@ -151,8 +151,8 @@ private: bool peak_button_release (GdkEventButton*); - void gain_start_touch (); - void gain_end_touch (); + void gain_start_touch (int); + void gain_end_touch (int); void parameter_changed (std::string const & p); void redraw_metrics (); diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 093793a439..254d3dd963 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -500,7 +500,7 @@ MixerStrip::update_trim_control () } void -MixerStrip::trim_start_touch () +MixerStrip::trim_start_touch (int) { assert (_route && _session); if (route()->trim() && route()->trim()->active() && route()->n_inputs().n_audio() > 0) { @@ -509,7 +509,7 @@ MixerStrip::trim_start_touch () } void -MixerStrip::trim_end_touch () +MixerStrip::trim_end_touch (int) { assert (_route && _session); if (route()->trim() && route()->trim()->active() && route()->n_inputs().n_audio() > 0) { diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h index 8198980cf8..946deeb6cc 100644 --- a/gtk2_ardour/mixer_strip.h +++ b/gtk2_ardour/mixer_strip.h @@ -240,8 +240,8 @@ private: ArdourWidgets::ArdourButton* _loudess_analysis_button; std::shared_ptr _volume_controller; - void trim_start_touch (); - void trim_end_touch (); + void trim_start_touch (int); + void trim_end_touch (int); void setup_comment_button (); diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index a23e22a48d..3d2decae0f 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -1103,7 +1103,7 @@ ProcessorEntry::Control::slider_adjusted () } void -ProcessorEntry::Control::start_touch () +ProcessorEntry::Control::start_touch (int) { std::shared_ptr c = _control.lock (); if (!c) { @@ -1113,7 +1113,7 @@ ProcessorEntry::Control::start_touch () } void -ProcessorEntry::Control::end_touch () +ProcessorEntry::Control::end_touch (int) { std::shared_ptr c = _control.lock (); if (!c) { diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h index 9d05c3d0d0..5c238f3feb 100644 --- a/gtk2_ardour/processor_box.h +++ b/gtk2_ardour/processor_box.h @@ -234,8 +234,8 @@ private: std::string state_id () const; void set_tooltip (); - void start_touch (); - void end_touch (); + void start_touch (int); + void end_touch (int); bool button_released (GdkEventButton*); diff --git a/gtk2_ardour/virtual_keyboard_window.cc b/gtk2_ardour/virtual_keyboard_window.cc index 555c3bb2d6..083521e194 100644 --- a/gtk2_ardour/virtual_keyboard_window.cc +++ b/gtk2_ardour/virtual_keyboard_window.cc @@ -614,7 +614,7 @@ VirtualKeyboardWindow::pitch_bend_event_handler (int val) } void -VirtualKeyboardWindow::pitch_bend_release () +VirtualKeyboardWindow::pitch_bend_release (int) { _pitch_adjustment.set_value (8192); } diff --git a/gtk2_ardour/virtual_keyboard_window.h b/gtk2_ardour/virtual_keyboard_window.h index 9eae27fb6a..a39f8948ea 100644 --- a/gtk2_ardour/virtual_keyboard_window.h +++ b/gtk2_ardour/virtual_keyboard_window.h @@ -116,7 +116,7 @@ private: bool pitch_bend_timeout (); void pitch_bend_event_handler (int); - void pitch_bend_release (); + void pitch_bend_release (int); void pitch_bend_update_tooltip (int); void pitch_slider_adjusted (); diff --git a/libs/widgets/ardour_ctrl_base.cc b/libs/widgets/ardour_ctrl_base.cc index 94ab6e4650..581df36c48 100644 --- a/libs/widgets/ardour_ctrl_base.cc +++ b/libs/widgets/ardour_ctrl_base.cc @@ -211,7 +211,7 @@ ArdourCtrlBase::on_button_press_event (GdkEventButton *ev) if (_grabbed) { remove_modal_grab(); _grabbed = false; - StopGesture (); + StopGesture (ev->state); gdk_pointer_ungrab (GDK_CURRENT_TIME); } return true; @@ -229,7 +229,7 @@ ArdourCtrlBase::on_button_press_event (GdkEventButton *ev) _tooltip.start_drag(); add_modal_grab(); _grabbed = true; - StartGesture (); + StartGesture (ev->state); gdk_pointer_grab(ev->window,false, GdkEventMask( Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK |Gdk::BUTTON_RELEASE_MASK), NULL,NULL,ev->time); @@ -241,7 +241,7 @@ ArdourCtrlBase::on_button_release_event (GdkEventButton *ev) { _tooltip.stop_drag(); _grabbed = false; - StopGesture (); + StopGesture (ev->state); remove_modal_grab(); gdk_pointer_ungrab (GDK_CURRENT_TIME); diff --git a/libs/widgets/ardour_fader.cc b/libs/widgets/ardour_fader.cc index 8ae3487870..bf6478b9b9 100644 --- a/libs/widgets/ardour_fader.cc +++ b/libs/widgets/ardour_fader.cc @@ -441,7 +441,7 @@ ArdourFader::on_grab_broken_event (GdkEventGrabBroken* ev) remove_modal_grab(); _dragging = false; gdk_pointer_ungrab (GDK_CURRENT_TIME); - StopGesture (); + StopGesture (0); } return (_tweaks & NoButtonForward) ? true : false; } @@ -454,7 +454,7 @@ ArdourFader::on_button_press_event (GdkEventButton* ev) remove_modal_grab(); _dragging = false; gdk_pointer_ungrab (GDK_CURRENT_TIME); - StopGesture (); + StopGesture (ev->state); } return (_tweaks & NoButtonForward) ? true : false; } @@ -464,7 +464,7 @@ ArdourFader::on_button_press_event (GdkEventButton* ev) } add_modal_grab (); - StartGesture (); + StartGesture (ev->state); _grab_loc = (_orien == VERT) ? ev->y : ev->x; _grab_start = (_orien == VERT) ? ev->y : ev->x; _grab_window = ev->window; @@ -491,7 +491,7 @@ ArdourFader::on_button_release_event (GdkEventButton* ev) remove_modal_grab(); _dragging = false; gdk_pointer_ungrab (GDK_CURRENT_TIME); - StopGesture (); + StopGesture (ev->state); if (!_hovering) { if (!(_tweaks & NoVerticalScroll)) { @@ -527,7 +527,7 @@ ArdourFader::on_button_release_event (GdkEventButton* ev) if (_dragging) { remove_modal_grab(); _dragging = false; - StopGesture (); + StopGesture (ev->state); set_adjustment_from_event (ev); gdk_pointer_ungrab (GDK_CURRENT_TIME); return true; diff --git a/libs/widgets/widgets/ardour_ctrl_base.h b/libs/widgets/widgets/ardour_ctrl_base.h index c9a576ec37..d5e6b96ac4 100644 --- a/libs/widgets/widgets/ardour_ctrl_base.h +++ b/libs/widgets/widgets/ardour_ctrl_base.h @@ -80,8 +80,8 @@ public: void color_handler (); - sigc::signal StartGesture; - sigc::signal StopGesture; + sigc::signal StartGesture; + sigc::signal StopGesture; void set_size_request (int, int); diff --git a/libs/widgets/widgets/ardour_fader.h b/libs/widgets/widgets/ardour_fader.h index 5355b4e3c5..5da24394fb 100644 --- a/libs/widgets/widgets/ardour_fader.h +++ b/libs/widgets/widgets/ardour_fader.h @@ -39,8 +39,8 @@ public: virtual ~ArdourFader (); static void flush_pattern_cache(); - sigc::signal StartGesture; - sigc::signal StopGesture; + sigc::signal StartGesture; + sigc::signal StopGesture; sigc::signal OnExpose; void set_default_value (float); diff --git a/libs/widgets/widgets/barcontroller.h b/libs/widgets/widgets/barcontroller.h index 70595eb4ed..150219e2e4 100644 --- a/libs/widgets/widgets/barcontroller.h +++ b/libs/widgets/widgets/barcontroller.h @@ -42,8 +42,8 @@ public: ArdourFader::Tweaks tweaks() const { return _slider.tweaks (); } void set_tweaks (ArdourFader::Tweaks t) { _slider.set_tweaks (t);} - sigc::signal StartGesture; - sigc::signal StopGesture; + sigc::signal StartGesture; + sigc::signal StopGesture; /* export this to allow direct connection to button events */ Gtk::Widget& event_widget() { return _slider; } @@ -74,9 +74,8 @@ private: bool _switching; bool _switch_on_release; - - void passtrhu_gesture_start() { StartGesture (); } - void passtrhu_gesture_stop() { StopGesture (); } + void passtrhu_gesture_start (int state) { StartGesture (state); } + void passtrhu_gesture_stop (int state) { StopGesture (state); } };