merge with master

[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..5a5c74cb2ca5c5ea9f067edae35f47ee8a73b38f 100644 (file)
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -70,7 +70,7 @@ public:
        MidiRegionView (ArdourCanvas::Group *,
                        RouteTimeAxisView&,
                        boost::shared_ptr<ARDOUR::MidiRegion>,
-                       double initial_frames_per_pixel,
+                       double initial_samples_per_pixel,
                        Gdk::Color const & basic_color);
 
        MidiRegionView (const MidiRegionView& other);
@@ -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,7 +312,7 @@ protected:
        MidiRegionView (ArdourCanvas::Group *,
                        RouteTimeAxisView&,
                        boost::shared_ptr<ARDOUR::MidiRegion>,
-                       double frames_per_pixel,
+                       double samples_per_pixel,
                        Gdk::Color& basic_color,
                        TimeAxisViewItem::Visibility);
 
@@ -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 ();