ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Edit note dialog fixes. 

- position display is session-relative

	- Add missing undo to note edit.
This commit is contained in:
nick_m 2016-07-08 02:45:07 +10:00
parent 703150d365
commit a44c8b96ae
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/edit_note_dialog.cc
View File

@ -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) {

4
gtk2_ardour/editor_mouse.cc
View File

@ -2082,8 +2082,12 @@ Editor::edit_notes (MidiRegionView* mrv)
void
Editor::note_edit_done (int r, EditNoteDialog* d)
{
begin_reversible_command (_("edit note(s)"));
d->done (r);
delete d;
commit_reversible_command();
}
void