diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-08-16 14:24:41 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-08-16 14:24:41 +0000 |
| commit | f6951c92f04ed17ec98a2d1cd9bcf535ce6f037c (patch) | |
| tree | 135769f8d8d18e6004fffd37671cc678f7ab3e2e /gtk2_ardour/edit_note_dialog.cc | |
| parent | 6a3ce666c6716ceb9378e508d6116f83c32957c7 (diff) | |
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
Diffstat (limited to 'gtk2_ardour/edit_note_dialog.cc')
| -rw-r--r-- | gtk2_ardour/edit_note_dialog.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/edit_note_dialog.cc b/gtk2_ardour/edit_note_dialog.cc index 2894f95271..8dbddefbf1 100644 --- a/gtk2_ardour/edit_note_dialog.cc +++ b/gtk2_ardour/edit_note_dialog.cc @@ -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); |