From 6d5273e5146acb569dd3827e211d5b3493324606 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 11 Mar 2023 20:41:22 -0700 Subject: [PATCH] tempo marker drag: change type of stored bpm --- gtk2_ardour/editor_drag.cc | 5 ++--- gtk2_ardour/editor_drag.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index a8a7dc0074..10c9ee0a40 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -3259,7 +3259,6 @@ TempoCurveDrag::aborted (bool moved) TempoMarkerDrag::TempoMarkerDrag (Editor* e, ArdourCanvas::Item* i) : Drag (e, i, Temporal::BeatTime) - , _grab_bpm (120.0, 4.0) , _before_state (0) { DEBUG_TRACE (DEBUG::Drags, "New TempoMarkerDrag\n"); @@ -3267,7 +3266,7 @@ TempoMarkerDrag::TempoMarkerDrag (Editor* e, ArdourCanvas::Item* i) _marker = reinterpret_cast (_item->get_data ("marker")); _real_section = &_marker->tempo(); _movable = !TempoMap::use()->is_initial (_marker->tempo()); - _grab_bpm = Tempo (_real_section->note_types_per_minute(), _real_section->note_type(), _real_section->end_note_types_per_minute()); + _grab_bpm = _real_section->note_types_per_minute(); _grab_qn = _real_section->beats(); assert (_marker); } @@ -3308,7 +3307,7 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move) if (ArdourKeyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { - double new_bpm = std::max (1.5, _grab_bpm.note_types_per_minute() - ((current_pointer_x() - grab_x()) / 5.0)); + double new_bpm = std::max (1.5, _grab_bpm - ((current_pointer_x() - grab_x()) / 5.0)); stringstream strs; Temporal::Tempo new_tempo (new_bpm, _marker->tempo().note_type()); map->change_tempo (const_cast(_marker->tempo()), new_tempo); diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index 482ad364c6..f483c9f00f 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -879,7 +879,7 @@ private: Temporal::TempoMap::WritableSharedPtr map; bool _movable; - Temporal::Tempo _grab_bpm; + double _grab_bpm; Temporal::Beats _grab_qn; XMLNode* _before_state; };