From 30b087ab3d28f1585987fa3f6ae006562ae192e3 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 18 Sep 2017 12:39:17 -0400 Subject: globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible --- gtk2_ardour/editor_canvas_events.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gtk2_ardour/editor_canvas_events.cc') diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 2848649a5e..fbdb730b4a 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -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 ?? */ @@ -1264,7 +1264,7 @@ Editor::drop_regions (const Glib::RefPtr& /*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 = _regions->get_dragged_region (); if (!region) { return; } -- cgit v1.2.3