diff options
| author | nick_m <mainsbridge@gmail.com> | 2017-02-26 05:39:20 +1100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-02-27 20:16:10 +0100 |
| commit | 636583e6ef93a64151ca0ceddb352318d0fe36d0 (patch) | |
| tree | fac6f83c21a2469e21c69f661cc82b763a77df31 /gtk2_ardour/editor_drag.cc | |
| parent | 211226983df8e46e8849dd0aeca422b89d3d4d79 (diff) | |
restore pinch tempo. it now operates via shift + alt drag on the curve.
Diffstat (limited to 'gtk2_ardour/editor_drag.cc')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 3787db10a8..edc1ce77cc 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -3639,8 +3639,8 @@ TempoTwistDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) _grab_tempo = Tempo (_tempo->note_types_per_minute(), _tempo->note_type()); ostringstream sstr; - sstr << "<" << fixed << setprecision(3) << _tempo->note_types_per_minute() << "\n"; - sstr << ">" << fixed << setprecision(3) << _tempo->end_note_types_per_minute(); + sstr << "start: " << fixed << setprecision(3) << _tempo->note_types_per_minute() << "\n"; + sstr << "end: " << fixed << setprecision(3) << _tempo->end_note_types_per_minute(); show_verbose_cursor_text (sstr.str()); } @@ -3687,15 +3687,13 @@ TempoTwistDrag::motion (GdkEvent* event, bool first_move) pf = adjusted_current_frame (event); } - if (ArdourKeyboard::indicates_copy (event->button.state)) { - /* adjust this and the next tempi to match pointer frame */ - double new_bpm = max (1.5, _grab_tempo.note_types_per_minute() + ((grab_y() - min (-1.0, current_pointer_y())) / 5.0)); + /* adjust this and the next tempi to match pointer frame */ + double new_bpm = max (1.5, _grab_tempo.note_types_per_minute() + ((grab_y() - min (-1.0, current_pointer_y())) / 5.0)); + _editor->session()->tempo_map().gui_twist_tempi (_tempo, new_bpm, map.frame_at_quarter_note (_grab_qn), pf); - _editor->session()->tempo_map().gui_twist_tempi (_tempo, new_bpm, map.frame_at_quarter_note (_grab_qn), pf); - } ostringstream sstr; - sstr << "<" << fixed << setprecision(3) << _tempo->note_types_per_minute() << "\n"; - sstr << ">" << fixed << setprecision(3) << _tempo->end_note_types_per_minute(); + sstr << "start: " << fixed << setprecision(3) << _tempo->note_types_per_minute() << "\n"; + sstr << "end: " << fixed << setprecision(3) << _tempo->end_note_types_per_minute(); show_verbose_cursor_text (sstr.str()); } |