X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fedit_note_dialog.cc;h=0c7d2a6113a4950d31aecc94e57829193db70d92;hb=6b1b72a247bf04c81292fc41af4f69c9b7f90379;hp=997713ae2d24401b525e9c3bdb341bbd14d3e98e;hpb=964100e9114e154be4ad818fa919e4684acd7ca8;p=ardour.git

diff --git a/gtk2_ardour/edit_note_dialog.cc b/gtk2_ardour/edit_note_dialog.cc
index 997713ae2d..0c7d2a6113 100644
--- a/gtk2_ardour/edit_note_dialog.cc
+++ b/gtk2_ardour/edit_note_dialog.cc
@@ -120,8 +120,8 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, set<NoteBase*> n)
 	int test_channel = (*_events.begin())->note()->channel ();
 	int test_pitch = (*_events.begin())->note()->note ();
 	int test_velocity = (*_events.begin())->note()->velocity ();
-	Evoral::Beats test_time = (*_events.begin())->note()->time ();
-	Evoral::Beats test_length = (*_events.begin())->note()->length ();
+	Temporal::Beats test_time = (*_events.begin())->note()->time ();
+	Temporal::Beats test_length = (*_events.begin())->note()->length ();
 
 	for (set<NoteBase*>::iterator i = _events.begin(); i != _events.end(); ++i) {
 		if ((*i)->note()->channel() != test_channel) {
@@ -197,8 +197,8 @@ EditNoteDialog::done (int r)
 		}
 	}
 
-	framecnt_t const region_samples = _time_clock.current_time() - (_region_view->region()->position() - _region_view->region()->start());
-	Evoral::Beats const t = _region_view->source_relative_time_converter().from (region_samples);
+	samplecnt_t const region_samples = _time_clock.current_time() - (_region_view->region()->position() - _region_view->region()->start());
+	Temporal::Beats const t = _region_view->source_relative_time_converter().from (region_samples);
 
 	if (!_time_all.get_sensitive() || _time_all.get_active ()) {
 		for (set<NoteBase*>::iterator i = _events.begin(); i != _events.end(); ++i) {
@@ -211,8 +211,8 @@ EditNoteDialog::done (int r)
 
 	if (!_length_all.get_sensitive() || _length_all.get_active ()) {
 		for (set<NoteBase*>::iterator i = _events.begin(); i != _events.end(); ++i) {
-			framepos_t const note_end_sample = region_samples + _length_clock.current_duration (_time_clock.current_time());
-			Evoral::Beats const d = _region_view->source_relative_time_converter().from (note_end_sample) - (*i)->note()->time();
+			samplepos_t const note_end_sample = region_samples + _length_clock.current_duration (_time_clock.current_time());
+			Temporal::Beats const d = _region_view->source_relative_time_converter().from (note_end_sample) - (*i)->note()->time();
 			if (d != (*i)->note()->length()) {
 				_region_view->change_note_length (*i, d);
 				had_change = true;