allow ardour button to handle focused keyboard events

[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 d1b646ce61b544f22beb1463650a4d7dfdb929cc..0f4dd52ff4594198e7b2fc5e371a10c7e5c05733 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"
 
@@ -70,15 +70,15 @@ public:
        MidiRegionView (ArdourCanvas::Group *,
                        RouteTimeAxisView&,
                        boost::shared_ptr<ARDOUR::MidiRegion>,
-                       double initial_frames_per_pixel,
-                       Gdk::Color const & basic_color);
+                       double initial_samples_per_pixel,
+                       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;
 
@@ -253,7 +253,7 @@ public:
         * @param x a pixel coordinate relative to region start
         * @return the snapped framepos_t coordinate relative to region start
         */
-       framepos_t snap_pixel_to_frame(double x);
+       framepos_t snap_pixel_to_sample(double x);
 
        /** Convert a timestamp in beats into frames (both relative to region position) */
        framepos_t region_beats_to_region_frames(double beats) const;
@@ -312,8 +312,8 @@ protected:
        MidiRegionView (ArdourCanvas::Group *,
                        RouteTimeAxisView&,
                        boost::shared_ptr<ARDOUR::MidiRegion>,
-                       double frames_per_pixel,
-                       Gdk::Color& basic_color,
+                       double samples_per_pixel,
+                       uint32_t basic_color,
                        TimeAxisViewItem::Visibility);
 
        void region_resized (const PBD::PropertyChange&);
@@ -349,7 +349,7 @@ private:
 
        void clear_events (bool with_selection_signal = true);
 
-       bool canvas_event(GdkEvent* ev);
+       bool canvas_group_event(GdkEvent* ev);
        bool note_canvas_event(GdkEvent* ev);
 
        void midi_channel_mode_changed ();
@@ -431,7 +431,7 @@ private:
        Events::iterator _optimization_iterator;
 
        void update_note (Note *, bool update_ghost_regions = true);
-       double update_hit (Hit *);
+        void update_hit (Hit *);
        void create_ghost_note (double, double);
        void update_ghost_note (double, double);