merge MixerActor API (back) into Mixer_UI; make solo/mute/recenable actions there...

[ardour.git] / gtk2_ardour / note.h

diff --git a/gtk2_ardour/note.h b/gtk2_ardour/note.h
index c6bcd957e3a9e6a2717d8dcd520811f0b95eb921..37d5573fa11326e3e4e40ed67648911df98c0f78 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);
 
@@ -51,8 +51,8 @@ public:
        void set_x1 (ArdourCanvas::Coord);
        void set_y1 (ArdourCanvas::Coord);
 
-        void set_outline_what (ArdourCanvas::Rectangle::What);
-        void set_outline_all ();
+       void set_outline_what (ArdourCanvas::Rectangle::What);
+       void set_outline_all ();
 
        void set_outline_color (uint32_t);
        void set_fill_color (uint32_t);