diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-05-03 22:15:10 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:16 +1000 |
| commit | 8b4f5dcd5f6a570ef920fe77c4dba5242726db5f (patch) | |
| tree | cdadb3cc9cd5161c071a1b472bd32ea2161697ec /gtk2_ardour | |
| parent | 992fc6b5102df03edeb3d33a3c2557b49532c0ae (diff) | |
Tempo ramps - reinstate cross-dragging of music-locked meters, various bug fixes.
- revert failed frameoffset_t experiment
- caclulate meters using bbt
- fix tempo dilation when first tempo is ramped.
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 080e82d984..a686789253 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -3204,7 +3204,7 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move) if (Keyboard::modifier_state_contains (event->button.state, ArdourKeyboard::constraint_modifier ())) { /* adjust previous tempo to match meter frame */ _editor->session()->tempo_map().gui_dilate_tempo (_real_section, pf); - } else if ((bbt.bars > _real_section->bbt().bars && pf > last_pointer_frame()) + } else if ((bbt.bars != _real_section->bbt().bars && pf > last_pointer_frame()) || (bbt.bars < _real_section->bbt().bars && pf < last_pointer_frame())) { /* move meter beat-based */ _editor->session()->tempo_map().gui_move_meter (_real_section, bbt); |