initial commit of hand merging, plus getting "ancient" waf script to work correctly

1 files changed, 3 insertions, 8 deletions

diff --git a/gtk2_ardour/edit_note_dialog.h b/gtk2_ardour/edit_note_dialog.h
index cc92f290c3..11fd70a91c 100644
--- a/gtk2_ardour/edit_note_dialog.h
+++ b/gtk2_ardour/edit_note_dialog.h
@@ -23,23 +23,18 @@
 #include "audio_clock.h"
 
 class MidiRegionView;
-
-namespace Gnome {
-	namespace Canvas {
-		class CanvasNoteEvent;
-	}
-}
+class NoteBase;
 
 class EditNoteDialog : public ArdourDialog
 {
 public:
-	EditNoteDialog (MidiRegionView *, std::set<Gnome::Canvas::CanvasNoteEvent*>);
+	EditNoteDialog (MidiRegionView *, std::set<NoteBase*>);
 
 	int run ();
 
 private:
 	MidiRegionView* _region_view;
-	std::set<Gnome::Canvas::CanvasNoteEvent*> _events;
+	std::set<NoteBase*> _events;
 	Gtk::SpinButton _channel;
 	Gtk::CheckButton _channel_all;
 	Gtk::SpinButton _pitch;