diff options
| author | nick_m <mainsbridge@gmail.com> | 2017-02-26 07:03:02 +1100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-02-27 20:16:10 +0100 |
| commit | 8e944953c6c0ef210c36fd9a2e9d60f3e5a6766a (patch) | |
| tree | 0030e622115ce77cfcd7a000b9ae4366590eca9f /gtk2_ardour/editor_drag.cc | |
| parent | f4d51ee0d0976fb6310f3399249e7ea1b9c47210 (diff) | |
highlight the tempo curve that is to be altered, modify text to suit.
Diffstat (limited to 'gtk2_ardour/editor_drag.cc')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 1ea89a00fe..815acd3e94 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -3537,8 +3537,9 @@ BBTRulerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) Drag::start_grab (event, cursor); TempoMap& map (_editor->session()->tempo_map()); _tempo = const_cast<TempoSection*> (&map.tempo_section_at_frame (raw_grab_frame())); - ostringstream sstr; + _editor->tempo_curve_selected (_tempo, true); + ostringstream sstr; sstr << "start: " << fixed << setprecision(3) << _tempo->note_types_per_minute() << "\n"; sstr << "mouse: " << fixed << setprecision(3) << map.tempo_at_frame (adjusted_current_frame (event)).note_types_per_minute(); show_verbose_cursor_text (sstr.str()); @@ -3609,6 +3610,7 @@ BBTRulerDrag::finished (GdkEvent* event, bool movement_occurred) 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); } void @@ -3692,7 +3694,7 @@ TempoTwistDrag::motion (GdkEvent* event, bool first_move) _editor->session()->tempo_map().gui_twist_tempi (_tempo, new_bpm, map.frame_at_quarter_note (_grab_qn), pf); ostringstream sstr; - sstr << "start: " << fixed << setprecision(3) << _tempo->note_types_per_minute() << "\n"; + sstr << "start: " << fixed << setprecision(3) << _tempo->note_types_per_minute(); sstr << "end: " << fixed << setprecision(3) << _tempo->end_note_types_per_minute(); show_verbose_cursor_text (sstr.str()); } @@ -3735,10 +3737,10 @@ TempoEndDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) Drag::start_grab (event, cursor); TempoMap& map (_editor->session()->tempo_map()); _tempo = const_cast<TempoSection*> (&map.tempo_section_at_frame (raw_grab_frame())); + _editor->tempo_curve_selected (&map.tempo_section_at_frame (_tempo->frame() - 1), true); ostringstream sstr; sstr << "end: " << fixed << setprecision(3) << map.tempo_section_at_frame (_tempo->frame() - 1).end_note_types_per_minute() << "\n"; - sstr << "start: " << fixed << setprecision(3) << map.tempo_section_at_frame (_tempo->frame() - 1).end_note_types_per_minute(); show_verbose_cursor_text (sstr.str()); } @@ -3783,8 +3785,7 @@ TempoEndDrag::motion (GdkEvent* event, bool first_move) map.gui_stretch_tempo_end (&map.tempo_section_at_frame (_tempo->frame() - 1), map.frame_at_quarter_note (_grab_qn), pf); ostringstream sstr; - sstr << "end: " << fixed << setprecision(3) << map.tempo_section_at_frame (_tempo->frame() - 1).end_note_types_per_minute() << "\n"; - sstr << "start: " << fixed << setprecision(3) << map.tempo_section_at_frame (_tempo->frame() - 1).note_types_per_minute(); + sstr << "end: " << fixed << setprecision(3) << map.tempo_section_at_frame (_tempo->frame() - 1).end_note_types_per_minute(); show_verbose_cursor_text (sstr.str()); } @@ -3800,6 +3801,7 @@ TempoEndDrag::finished (GdkEvent* event, bool movement_occurred) XMLNode &after = map.get_state(); _editor->session()->add_command(new MementoCommand<TempoMap>(map, before_state, &after)); _editor->commit_reversible_command (); + _editor->tempo_curve_selected (&map.tempo_section_at_frame (_tempo->frame() - 1), false); } void |