diff options
| author | nick_m <mainsbridge@gmail.com> | 2017-06-17 04:59:06 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2017-07-22 02:15:20 +1000 |
| commit | d94c630134da6a728b6a53b57ab6f151c4e0206c (patch) | |
| tree | f5b6831d0097ba5bcbb076933e7d43ac8c872031 /gtk2_ardour | |
| parent | b0a306f9d0ba5d47dadba1130d68d25bc078c52e (diff) | |
Fix various issues wrt BBTRulerDrag
If we've clicked on a tempo bar before the initial tempo,
don't allow anything to happen.
If it was just a click, ensure the tempo curve colour is restored.
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 25 | ||||
| -rw-r--r-- | gtk2_ardour/editor_drag.h | 1 |
2 files changed, 21 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 3b0a0a41cc..0eda339772 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -3548,6 +3548,7 @@ BBTRulerDrag::BBTRulerDrag (Editor* e, ArdourCanvas::Item* i) , _grab_qn (0.0) , _tempo (0) , _before_state (0) + , _drag_valid (true) { DEBUG_TRACE (DEBUG::Drags, "New BBTRulerDrag\n"); @@ -3559,6 +3560,12 @@ BBTRulerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) Drag::start_grab (event, cursor); TempoMap& map (_editor->session()->tempo_map()); _tempo = const_cast<TempoSection*> (&map.tempo_section_at_frame (raw_grab_frame())); + + if (adjusted_current_frame (event, false) <= _tempo->frame()) { + _drag_valid = false; + return; + } + _editor->tempo_curve_selected (_tempo, true); ostringstream sstr; @@ -3604,12 +3611,15 @@ BBTRulerDrag::setup_pointer_frame_offset () void BBTRulerDrag::motion (GdkEvent* event, bool first_move) { - TempoMap& map (_editor->session()->tempo_map()); + if (!_drag_valid) { + return; + } if (first_move) { _editor->begin_reversible_command (_("stretch tempo")); } + TempoMap& map (_editor->session()->tempo_map()); framepos_t pf; if (_editor->snap_musical()) { @@ -3644,17 +3654,22 @@ BBTRulerDrag::finished (GdkEvent* event, bool movement_occurred) TempoMap& map (_editor->session()->tempo_map()); - XMLNode &after = map.get_state(); - _editor->session()->add_command(new MementoCommand<TempoMap>(map, _before_state, &after)); - _editor->commit_reversible_command (); _editor->tempo_curve_selected (_tempo, false); - if (_tempo->clamped()) { TempoSection* prev_tempo = map.previous_tempo_section (_tempo); if (prev_tempo) { _editor->tempo_curve_selected (prev_tempo, false); } } + + if (!movement_occurred || !_drag_valid) { + return; + } + + XMLNode &after = map.get_state(); + _editor->session()->add_command(new MementoCommand<TempoMap>(map, _before_state, &after)); + _editor->commit_reversible_command (); + } void diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index f2b08d4cfe..e5a349fbb2 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -822,6 +822,7 @@ private: double _grab_qn; ARDOUR::TempoSection* _tempo; XMLNode* _before_state; + bool _drag_valid; }; /** tempo curve twist drag */ |