ardour/livetrax
13
0
Fork 0
Code

Tempo ramps - a saner way to snap music-locked tempos.

Browse Source
This commit is contained in:
nick_m 2016-03-29 07:19:11 +11:00
parent 29700068d7
commit b39db7ebeb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/editor_drag.cc
View File

@ -3317,7 +3317,6 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
} }
framepos_t pf; framepos_t pf;
double beat = 0.0;
Tempo const tp = _marker->tempo(); Tempo const tp = _marker->tempo();
if (Keyboard::modifier_state_equals (event->button.state, ArdourKeyboard::constraint_modifier ())) { if (Keyboard::modifier_state_equals (event->button.state, ArdourKeyboard::constraint_modifier ())) {
@ -3351,12 +3350,15 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
_editor->session()->tempo_map().bbt_time (pf, when); _editor->session()->tempo_map().bbt_time (pf, when);
if (_real_section->position_lock_style() == MusicTime) { if (_real_section->position_lock_style() == MusicTime) {
const double pulse = _editor->session()->tempo_map().predict_tempo_pulse (_real_section, Tempo (_real_section->beats_per_minute(), _real_section->note_type()), pf);
when = _editor->session()->tempo_map().pulse_to_bbt (pulse);
if (use_snap && _editor->snap_type() == SnapToBar) { if (use_snap && _editor->snap_type() == SnapToBar) {
_editor->session()->tempo_map().round_bbt (when, -1); _editor->session()->tempo_map().round_bbt (when, -1);
} else if (use_snap) { } else if (use_snap) {
_editor->session()->tempo_map().round_bbt (when, _editor->get_grid_beat_divisions (0)); _editor->session()->tempo_map().round_bbt (when, _editor->get_grid_beat_divisions (0));
} }
beat = _editor->session()->tempo_map().bbt_to_beats (when); const double beat = _editor->session()->tempo_map().bbt_to_beats (when);
_editor->session()->tempo_map().gui_move_tempo_beat (_real_section, tp, beat); _editor->session()->tempo_map().gui_move_tempo_beat (_real_section, tp, beat);
} else { } else {
if (use_snap && _editor->snap_type() == SnapToBar) { if (use_snap && _editor->snap_type() == SnapToBar) {