X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fedit_note_dialog.cc;h=e334ffa06cc61bdbf4c87067f2deed3e32c6ea65;hb=e549e8f82c151db4ba6cd95ed5045c530453900f;hp=c4cfe11218703670a8570a9aca502576eaa86f65;hpb=060048685729cce62085c057ad97da3bdf351517;p=ardour.git

diff --git a/gtk2_ardour/edit_note_dialog.cc b/gtk2_ardour/edit_note_dialog.cc
index c4cfe11218..e334ffa06c 100644
--- a/gtk2_ardour/edit_note_dialog.cc
+++ b/gtk2_ardour/edit_note_dialog.cc
@@ -20,9 +20,11 @@
 #include <gtkmm/stock.h>
 #include <gtkmm/table.h>
 #include "ardour/midi_model.h"
+#include "ardour/midi_region.h"
 #include "edit_note_dialog.h"
 #include "canvas-note-event.h"
 #include "midi_region_view.h"
+#include "i18n.h"
 
 using namespace Gtk;
 
@@ -82,7 +84,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);
@@ -92,7 +94,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);
 
@@ -119,7 +121,7 @@ EditNoteDialog::run ()
 	_velocity.update ();
 
 	_region_view->start_note_diff_command (_("edit note"));
-	
+
 	bool had_change = false;
 
 	if (_channel.get_value_as_int() - 1 != _event->note()->channel()) {
@@ -137,14 +139,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);
@@ -157,7 +159,7 @@ EditNoteDialog::run ()
 
 	_region_view->apply_diff ();
 
-	_event->set_selected (_event->selected()); // change color 
-	
+	_event->set_selected (_event->selected()); // change color
+
 	return r;
 }