diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-07-08 02:45:07 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-07-10 02:18:38 +1000 |
| commit | a44c8b96aec782f192c3c2c83190d8301d4d37f4 (patch) | |
| tree | 0fa0b746aa2cef61658448cacd4a79130f579ad0 /gtk2_ardour/edit_note_dialog.cc | |
| parent | 703150d365a98e5e4dadcbf2d2fa585f3bae8cd8 (diff) | |
Edit note dialog fixes.
- position display is session-relative
- Add missing undo to note edit.
Diffstat (limited to 'gtk2_ardour/edit_note_dialog.cc')
| -rw-r--r-- | gtk2_ardour/edit_note_dialog.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk2_ardour/edit_note_dialog.cc b/gtk2_ardour/edit_note_dialog.cc index ae154807a2..08cfbadec2 100644 --- a/gtk2_ardour/edit_note_dialog.cc +++ b/gtk2_ardour/edit_note_dialog.cc @@ -93,7 +93,8 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, set<NoteBase*> n) _time_clock.set_session (_region_view->get_time_axis_view().session ()); _time_clock.set_mode (AudioClock::BBT); - _time_clock.set (_region_view->source_relative_time_converter().to ((*_events.begin())->note()->time ()), true); + _time_clock.set (_region_view->source_relative_time_converter().to + ((*_events.begin())->note()->time()) + (_region_view->region()->position() - _region_view->region()->start()), true); l = manage (left_aligned_label (_("Length"))); table->attach (*l, 0, 1, r, r + 1); @@ -193,7 +194,8 @@ EditNoteDialog::done (int r) } } - Evoral::Beats const t = _region_view->source_relative_time_converter().from (_time_clock.current_time ()); + Evoral::Beats const t = _region_view->source_relative_time_converter().from + (_time_clock.current_time() - (_region_view->region()->position() - _region_view->region()->start())); if (!_time_all.get_sensitive() || _time_all.get_active ()) { for (set<NoteBase*>::iterator i = _events.begin(); i != _events.end(); ++i) { |