ardour/livetrax
13
0
Fork 0
Code

More tempo marker cross-dragging fixes.

Browse Source
This commit is contained in:
nick_m 2016-06-08 13:48:22 +10:00
parent d18bbc646a
commit 6c986231d3
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk2_ardour/editor_drag.cc
View File

@ -3340,8 +3340,11 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
const framepos_t pf = adjusted_current_frame (event); const framepos_t pf = adjusted_current_frame (event);
if (!_editor->snap_musical()) { /* cop-out : we really should set the musical position of music-locked tempo sections here, which generally works well.
The problem is that when the mouse pointer's motion causes the location of the beat to change in a more-or-less
chaotic way when cross-dragging tempo sections (the beat the pointer is now above could have changed without any pointer motion).
Until there is a way to deal with this, just pretend the tempo section is audio-locked.
*/
if (was_music) { if (was_music) {
_real_section->set_position_lock_style (AudioTime); _real_section->set_position_lock_style (AudioTime);
} }
@ -3352,19 +3355,6 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
_real_section->set_position_lock_style (MusicTime); _real_section->set_position_lock_style (MusicTime);
} }
} else {
if (!was_music) {
_real_section->set_position_lock_style (MusicTime);
}
map.gui_move_tempo (_real_section, pf);
if (!was_music) {
_real_section->set_position_lock_style (AudioTime);
}
}
show_verbose_cursor_time (_real_section->frame()); show_verbose_cursor_time (_real_section->frame());
} }