X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fedit_note_dialog.cc;h=5f8add9ffd9bd3adcdcceb649fa6a514dfb94b64;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=2782122dbf0693f89c36ed296586280b1ffb05fb;hpb=bcd65def7da197a6f88eb1c4adb375f2b639f783;p=ardour.git

diff --git a/gtk2_ardour/edit_note_dialog.cc b/gtk2_ardour/edit_note_dialog.cc
index 2782122dbf..5f8add9ffd 100644
--- a/gtk2_ardour/edit_note_dialog.cc
+++ b/gtk2_ardour/edit_note_dialog.cc
@@ -116,8 +116,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 ();
-	double test_time = (*_events.begin())->note()->time ();
-	double test_length = (*_events.begin())->note()->length ();
+	Evoral::MusicalTime test_time = (*_events.begin())->note()->time ();
+	Evoral::MusicalTime test_length = (*_events.begin())->note()->length ();
 	
 	for (set<NoteBase*>::iterator i = _events.begin(); i != _events.end(); ++i) {
 		if ((*i)->note()->channel() != test_channel) {
@@ -146,16 +146,13 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, set<NoteBase*> n)
 	add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
 	add_button (Gtk::Stock::APPLY, Gtk::RESPONSE_ACCEPT);
 	set_default_response (Gtk::RESPONSE_ACCEPT);
-
-	show_all ();
 }
 
-int
-EditNoteDialog::run ()
+void
+EditNoteDialog::done (int r)
 {
-	int const r = Dialog::run ();
 	if (r != RESPONSE_ACCEPT) {
-		return r;
+                return;
 	}
 
 	/* These calls mean that if a value is entered using the keyboard
@@ -196,7 +193,7 @@ EditNoteDialog::run ()
 		}
 	}
 
-	double const t = _region_view->source_relative_time_converter().from (_time_clock.current_time ());
+	Evoral::MusicalTime const t = _region_view->source_relative_time_converter().from (_time_clock.current_time ());
 
 	if (!_time_all.get_sensitive() || _time_all.get_active ()) {
 		for (set<NoteBase*>::iterator i = _events.begin(); i != _events.end(); ++i) {
@@ -207,7 +204,7 @@ EditNoteDialog::run ()
 		}
 	}
 
-	double const d = _region_view->region_relative_time_converter().from (_length_clock.current_duration ());
+	Evoral::MusicalTime const d = _region_view->region_relative_time_converter().from (_length_clock.current_duration ());
 
 	if (!_length_all.get_sensitive() || _length_all.get_active ()) {
 		for (set<NoteBase*>::iterator i = _events.begin(); i != _events.end(); ++i) {
@@ -227,6 +224,4 @@ EditNoteDialog::run ()
 	for (set<NoteBase*>::iterator i = _events.begin(); i != _events.end(); ++i) {
 		(*i)->set_selected ((*i)->selected()); // change color
 	}
-
-	return r;
 }