X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_canvas_events.cc;h=fbdb730b4a9d82416f746e29156f90c0ea6bd35d;hb=e5a181c323243a03338f5a9934a5df254986370d;hp=ad1cb8def85cc9fb41a3848ce01c778f4ae01ac1;hpb=dc0139d4af4d246f6dcafb04425e3f1198c347c3;p=ardour.git

diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index ad1cb8def8..fbdb730b4a 100644
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -171,7 +171,7 @@ Editor::track_canvas_button_press_event (GdkEventButton *event)
 		begin_reversible_selection_op (X_("Clear Selection Click (track canvas)"));
 		selection->clear ();
 		commit_reversible_selection_op();
-        }
+	}
 	return false;
 }
 
@@ -179,10 +179,10 @@ bool
 Editor::track_canvas_button_release_event (GdkEventButton *event)
 {
 	if (!Keyboard::is_context_menu_event (event)) {
-                if (_drags->active ()) {
-                        _drags->end_grab ((GdkEvent*) event);
-                }
-        }
+		if (_drags->active ()) {
+			_drags->end_grab ((GdkEvent*) event);
+		}
+	}
 	return false;
 }
 
@@ -641,9 +641,9 @@ Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item,
 }
 
 struct DescendingRegionLayerSorter {
-    bool operator()(boost::shared_ptr<Region> a, boost::shared_ptr<Region> b) {
-	    return a->layer() > b->layer();
-    }
+	bool operator()(boost::shared_ptr<Region> a, boost::shared_ptr<Region> b) {
+		return a->layer() > b->layer();
+	}
 };
 
 bool
@@ -797,11 +797,11 @@ Editor::canvas_selection_end_trim_event (GdkEvent *event, ArdourCanvas::Item* it
 }
 
 bool
-Editor::canvas_frame_handle_event (GdkEvent* event, ArdourCanvas::Item* item, RegionView* rv)
+Editor::canvas_sample_handle_event (GdkEvent* event, ArdourCanvas::Item* item, RegionView* rv)
 {
 	bool ret = false;
 
-	/* frame handles are not active when in internal edit mode, because actual notes
+	/* sample handles are not active when in internal edit mode, because actual notes
 	   might be in the area occupied by the handle - we want them to be editable as normal.
 	*/
 
@@ -809,7 +809,7 @@ Editor::canvas_frame_handle_event (GdkEvent* event, ArdourCanvas::Item* item, Re
 		return false;
 	}
 
-	/* NOTE: frame handles pretend to be the colored trim bar from an event handling
+	/* NOTE: sample handles pretend to be the colored trim bar from an event handling
 	   perspective. XXX change this ??
 	*/
 
@@ -1080,18 +1080,6 @@ Editor::canvas_ruler_event (GdkEvent *event, ArdourCanvas::Item* item, ItemType
 		return handled;
 	}
 
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		if (UIConfiguration::instance ().get_use_time_rulers_to_zoom_with_vertical_drag () &&
-		    Keyboard::no_modifier_keys_pressed (&event->button) && event->button.button == 1) {
-			_drags->set(new RulerZoomDrag(this, item), event);
-			return true;
-		}
-		break;
-	default:
-		break;
-	}
-
 	return typed_event (item, event, type);
 }
 
@@ -1214,8 +1202,8 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const& context,
 
 			if (tv.first == 0
 			    && (
-			        boost::dynamic_pointer_cast<AudioRegion> (region) != 0 ||
-			        boost::dynamic_pointer_cast<MidiRegion> (region) != 0
+				boost::dynamic_pointer_cast<AudioRegion> (region) != 0 ||
+				boost::dynamic_pointer_cast<MidiRegion> (region) != 0
 			       )
 			   )
 			{
@@ -1263,9 +1251,9 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const& context,
 
 void
 Editor::drop_regions (const Glib::RefPtr<Gdk::DragContext>& /*context*/,
-		      int x, int y,
-		      const SelectionData& /*data*/,
-		      guint /*info*/, guint /*time*/)
+                      int x, int y,
+                      const SelectionData& /*data*/,
+                      guint /*info*/, guint /*time*/)
 {
 	GdkEvent event;
 	double px;
@@ -1276,7 +1264,7 @@ Editor::drop_regions (const Glib::RefPtr<Gdk::DragContext>& /*context*/,
 	event.button.y = y;
 	/* assume we're dragging with button 1 */
 	event.motion.state = Gdk::BUTTON1_MASK;
-	framepos_t const pos = window_event_sample (&event, &px, &py);
+	samplepos_t const pos = window_event_sample (&event, &px, &py);
 
 	boost::shared_ptr<Region> region = _regions->get_dragged_region ();
 	if (!region) { return; }