ardour/livetrax
13
0
Fork 0
Code

Fix various issues wrt BBTRulerDrag

Browse Source 
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.
This commit is contained in:
nick_m 2017-06-17 04:59:06 +10:00
parent b0a306f9d0
commit d94c630134
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gtk2_ardour/editor_drag.cc
View File

@ -3548,6 +3548,7 @@ BBTRulerDrag::BBTRulerDrag (Editor* e, ArdourCanvas::Item* i)
, _grab_qn (0.0) , _grab_qn (0.0)
, _tempo (0) , _tempo (0)
, _before_state (0) , _before_state (0)
, _drag_valid (true)
{ {
DEBUG_TRACE (DEBUG::Drags, "New BBTRulerDrag\n"); DEBUG_TRACE (DEBUG::Drags, "New BBTRulerDrag\n");
@ -3559,6 +3560,12 @@ BBTRulerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
Drag::start_grab (event, cursor); Drag::start_grab (event, cursor);
TempoMap& map (_editor->session()->tempo_map()); TempoMap& map (_editor->session()->tempo_map());
_tempo = const_cast<TempoSection*> (&map.tempo_section_at_frame (raw_grab_frame())); _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); _editor->tempo_curve_selected (_tempo, true);
ostringstream sstr; ostringstream sstr;
@ -3604,12 +3611,15 @@ BBTRulerDrag::setup_pointer_frame_offset ()
void void
BBTRulerDrag::motion (GdkEvent* event, bool first_move) BBTRulerDrag::motion (GdkEvent* event, bool first_move)
{ {
TempoMap& map (_editor->session()->tempo_map()); if (!_drag_valid) {
return;
}
if (first_move) { if (first_move) {
_editor->begin_reversible_command (_("stretch tempo")); _editor->begin_reversible_command (_("stretch tempo"));
} }
TempoMap& map (_editor->session()->tempo_map());
framepos_t pf; framepos_t pf;
if (_editor->snap_musical()) { if (_editor->snap_musical()) {
@ -3644,17 +3654,22 @@ BBTRulerDrag::finished (GdkEvent* event, bool movement_occurred)
TempoMap& map (_editor->session()->tempo_map()); 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); _editor->tempo_curve_selected (_tempo, false);
if (_tempo->clamped()) { if (_tempo->clamped()) {
TempoSection* prev_tempo = map.previous_tempo_section (_tempo); TempoSection* prev_tempo = map.previous_tempo_section (_tempo);
if (prev_tempo) { if (prev_tempo) {
_editor->tempo_curve_selected (prev_tempo, false); _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 void

1
gtk2_ardour/editor_drag.h
View File

@ -822,6 +822,7 @@ private:
double _grab_qn; double _grab_qn;
ARDOUR::TempoSection* _tempo; ARDOUR::TempoSection* _tempo;
XMLNode* _before_state; XMLNode* _before_state;
bool _drag_valid;
}; };
/** tempo curve twist drag */ /** tempo curve twist drag */