Fix finding session templates

[ardour.git] / gtk2_ardour / midi_region_view.h

diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index 49759da531a0cd4f9a9b9010d69a7c9b430a4a99..3fd6625ce90c18c4103788ac5b7fb2e946657324 100644 (file)
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -21,7 +21,7 @@
 
 #include <string>
 #include <vector>
-
+#include <stdint.h>
 
 #include "pbd/signals.h"
 
@@ -67,18 +67,18 @@ public:
        typedef Evoral::Note<Evoral::MusicalTime> NoteType;
        typedef Evoral::Sequence<Evoral::MusicalTime>::Notes Notes;
 
-       MidiRegionView (ArdourCanvas::Group *,
+       MidiRegionView (ArdourCanvas::Container *,
                        RouteTimeAxisView&,
                        boost::shared_ptr<ARDOUR::MidiRegion>,
                        double initial_samples_per_pixel,
-                       Gdk::Color const & basic_color);
+                       uint32_t base_color);
 
        MidiRegionView (const MidiRegionView& other);
        MidiRegionView (const MidiRegionView& other, boost::shared_ptr<ARDOUR::MidiRegion>);
 
        ~MidiRegionView ();
 
-       virtual void init (Gdk::Color const & basic_color, bool wfd);
+       void init (bool wfd);
 
        const boost::shared_ptr<ARDOUR::MidiRegion> midi_region() const;
 
@@ -309,11 +309,11 @@ protected:
        /** Allows derived types to specify their visibility requirements
         * to the TimeAxisViewItem parent class.
         */
-       MidiRegionView (ArdourCanvas::Group *,
+       MidiRegionView (ArdourCanvas::Container *,
                        RouteTimeAxisView&,
                        boost::shared_ptr<ARDOUR::MidiRegion>,
                        double samples_per_pixel,
-                       Gdk::Color& basic_color,
+                       uint32_t basic_color,
                        TimeAxisViewItem::Visibility);
 
        void region_resized (const PBD::PropertyChange&);
@@ -387,7 +387,7 @@ private:
        PatchChanges                         _patch_changes;
        SysExes                              _sys_exes;
        Note**                               _active_notes;
-       ArdourCanvas::Group*                 _note_group;
+       ArdourCanvas::Container*                 _note_group;
        ARDOUR::MidiModel::NoteDiffCommand*  _note_diff_command;
        Note*                                _ghost_note;
        double                               _last_ghost_x;
@@ -401,7 +401,7 @@ private:
        /** A group used to temporarily reparent _note_group to during start trims, so
         *  that the notes don't move with the parent region view.
         */
-       ArdourCanvas::Group*                 _temporary_note_group;
+       ArdourCanvas::Container*                 _temporary_note_group;
 
        MouseState _mouse_state;
        int _pressed_button;