attempt to fix deep confusion in GUI code about converting between musical and audio time (should have beneficial effects on #4257); change ghost note drawing when in MIDI note draw/add mode so that its start is aligned with the mouse cursor

git-svn-id: svn://localhost/ardour2/branches/3.0@9998 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-08-16 14:24:41 +00:00
parent 6a3ce666c6
commit f6951c92f0
8 changed files with 138 additions and 98 deletions

View file

@ -83,7 +83,7 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, Gnome::Canvas::CanvasNoteEve
_time_clock.set_session (_region_view->get_time_axis_view().session ());
_time_clock.set_mode (AudioClock::BBT);
_time_clock.set (_region_view->time_converter().to (ev->note()->time ()), true);
_time_clock.set (_region_view->source_relative_time_converter().to (ev->note()->time ()), true);
l = manage (new Label (_("Length")));
l->set_alignment (0, 0.5);
@ -93,7 +93,7 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, Gnome::Canvas::CanvasNoteEve
_length_clock.set_session (_region_view->get_time_axis_view().session ());
_length_clock.set_mode (AudioClock::BBT);
_length_clock.set (_region_view->time_converter().to (ev->note()->length ()), true);
_length_clock.set (_region_view->region_relative_time_converter().to (ev->note()->length ()), true);
get_vbox()->pack_start (*table);
@ -138,14 +138,14 @@ EditNoteDialog::run ()
had_change = true;
}
double const t = _region_view->time_converter().from (_time_clock.current_time ());
double const t = _region_view->source_relative_time_converter().from (_time_clock.current_time ());
if (t != _event->note()->time()) {
_region_view->change_note_time (_event, t);
had_change = true;
}
double const d = _region_view->time_converter().from (_length_clock.current_duration ());
double const d = _region_view->region_relative_time_converter().from (_length_clock.current_duration ());
if (d != _event->note()->length()) {
_region_view->change_note_length (_event, d);