X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_region_view.h;h=49759da531a0cd4f9a9b9010d69a7c9b430a4a99;hb=feebabb330d9d61105b71bbac4d43b0f14454621;hp=d1b646ce61b544f22beb1463650a4d7dfdb929cc;hpb=bcd65def7da197a6f88eb1c4adb375f2b639f783;p=ardour.git

diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index d1b646ce61..49759da531 100644
--- 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 ();
@@ -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);