From 66a3513dbd979e2cd6ec4713c3a526a6f5488fb7 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 10 May 2022 09:33:49 -0600 Subject: [PATCH] remove copy option for TempoMarkerDrag This just seems like a dumb UI to implement. Drag-copying tempo markers is not a thing --- gtk2_ardour/editor_drag.cc | 3 +-- gtk2_ardour/editor_drag.h | 3 +-- gtk2_ardour/editor_mouse.cc | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 6c21281f67..a76bab4a04 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -3527,9 +3527,8 @@ MeterMarkerDrag::aborted (bool moved) } -TempoMarkerDrag::TempoMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c) +TempoMarkerDrag::TempoMarkerDrag (Editor* e, ArdourCanvas::Item* i) : Drag (e, i, Temporal::BeatTime) - , _copy (c) , _grab_bpm (120.0, 4.0) , _before_state (0) { diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index 9c0c2c94ad..0a1c1bca25 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -864,7 +864,7 @@ private: class TempoMarkerDrag : public Drag { public: - TempoMarkerDrag (Editor *, ArdourCanvas::Item *, bool); + TempoMarkerDrag (Editor *, ArdourCanvas::Item *); void start_grab (GdkEvent *, Gdk::Cursor* c = 0); void motion (GdkEvent *, bool); @@ -886,7 +886,6 @@ private: Temporal::TempoPoint const * _real_section; Temporal::TempoMap::WritableSharedPtr map; - bool _copy; bool _movable; Temporal::Tempo _grab_bpm; Temporal::Beats _grab_qn; diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index d39aef441f..c566877868 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -792,7 +792,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT if (ArdourKeyboard::indicates_constraint (event->button.state)) { _drags->set (new TempoEndDrag (this, item), event); } else { - _drags->set (new TempoMarkerDrag (this, item, ArdourKeyboard::indicates_copy (event->button.state)), event); + _drags->set (new TempoMarkerDrag (this, item), event); } return true;