Merge branch 'master' into saveas

[ardour.git] / gtk2_ardour / note.h

diff --git a/gtk2_ardour/note.h b/gtk2_ardour/note.h
index c6bcd957e3a9e6a2717d8dcd520811f0b95eb921..e763ea95f86bef6981ce340b70fe8d4d5e3403e8 100644 (file)
--- a/gtk2_ardour/note.h
+++ b/gtk2_ardour/note.h
@@ -26,16 +26,16 @@
 #include "midi_util.h"
 
 namespace ArdourCanvas {
-       class Group;
+       class Container;
 }
 
 class Note : public NoteBase
 {
 public:
-       typedef Evoral::Note<Evoral::MusicalTime> NoteType;
+       typedef Evoral::Note<Evoral::Beats> NoteType;
 
        Note (MidiRegionView&                   region,
-             ArdourCanvas::Group*              group,
+             ArdourCanvas::Item*               parent,
              const boost::shared_ptr<NoteType> note = boost::shared_ptr<NoteType>(),
              bool with_events = true);