X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=157a034ea51a4f9edf801ee5b6a4937c823f8b22;hb=b713af2083c9da1ab6f82b47abae1da94bc96654;hp=9eb0a4c2bd0eda175a0b9fe386a3eacf31102046;hpb=30968b854257cb5f9159ca59589f783c85615601;p=ardour.git

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 9eb0a4c2bd..157a034ea5 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1146,7 +1146,7 @@ void
 Editor::scroll_playhead (bool forward)
 {
 	framepos_t pos = playhead_cursor->current_frame ();
-	framecnt_t delta = (framecnt_t) floor (current_page_frames() / 0.8);
+	framecnt_t delta = (framecnt_t) floor (current_page_samples() / 0.8);
 
 	if (forward) {
 		if (pos == max_framepos) {
@@ -1211,7 +1211,7 @@ Editor::cursor_align (bool playhead_to_edit)
 void
 Editor::scroll_backward (float pages)
 {
-	framepos_t const one_page = (framepos_t) rint (_visible_canvas_width * frames_per_pixel);
+	framepos_t const one_page = (framepos_t) rint (_visible_canvas_width * samples_per_pixel);
 	framepos_t const cnt = (framepos_t) floor (pages * one_page);
 
 	framepos_t frame;
@@ -1227,7 +1227,7 @@ Editor::scroll_backward (float pages)
 void
 Editor::scroll_forward (float pages)
 {
-	framepos_t const one_page = (framepos_t) rint (_visible_canvas_width * frames_per_pixel);
+	framepos_t const one_page = (framepos_t) rint (_visible_canvas_width * samples_per_pixel);
 	framepos_t const cnt = (framepos_t) floor (pages * one_page);
 
 	framepos_t frame;
@@ -1331,7 +1331,7 @@ Editor::tav_zoom_smooth (bool coarser, bool force_all)
 }
 
 bool
-Editor::clamp_frames_per_pixel (double& fpp) const
+Editor::clamp_samples_per_pixel (double& fpp) const
 {
 	bool clamped = false;
 	
@@ -1353,7 +1353,7 @@ Editor::temporal_zoom_step (bool coarser)
 {
 	ENSURE_GUI_THREAD (*this, &Editor::temporal_zoom_step, coarser)
 
-	double nfpp = frames_per_pixel;
+	double nfpp = samples_per_pixel;
 
 	if (coarser) {
 		nfpp = min (9e6, nfpp * 1.61803399);
@@ -1371,7 +1371,7 @@ Editor::temporal_zoom (double fpp)
 		return;
 	}
 
-	framepos_t current_page = current_page_frames();
+	framepos_t current_page = current_page_samples();
 	framepos_t current_leftmost = leftmost_frame;
 	framepos_t current_rightmost;
 	framepos_t current_center;
@@ -1383,8 +1383,8 @@ Editor::temporal_zoom (double fpp)
 	double nfpp;
 	double l;
 
-	clamp_frames_per_pixel (fpp);
-	if (fpp == frames_per_pixel) {
+	clamp_samples_per_pixel (fpp);
+	if (fpp == samples_per_pixel) {
 		return;
 	}
 
@@ -1660,7 +1660,7 @@ Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame)
 	double range_before = frame - leftmost_frame;
 	double new_fpp;
 
-	new_fpp = frames_per_pixel;
+	new_fpp = samples_per_pixel;
 
 	if (coarser) {
 		new_fpp *= 1.61803399;
@@ -1670,7 +1670,7 @@ Editor::temporal_zoom_to_frame (bool coarser, framepos_t frame)
 		range_before /= 1.61803399;
 	}
 
-	if (new_fpp == frames_per_pixel)  {
+	if (new_fpp == samples_per_pixel)  {
 		return;
 	}
 
@@ -1964,22 +1964,19 @@ Editor::unhide_ranges ()
 void
 Editor::insert_region_list_drag (boost::shared_ptr<Region> region, int x, int y)
 {
-	double wx, wy;
 	double cx, cy;
 	framepos_t where;
 	RouteTimeAxisView *rtv = 0;
 	boost::shared_ptr<Playlist> playlist;
 
-	_track_canvas_viewport->window_to_canvas (x, y, wx, wy);
-
 	GdkEvent event;
 	event.type = GDK_BUTTON_RELEASE;
-	event.button.x = wx;
-	event.button.y = wy;
+	event.button.x = x;
+	event.button.y = y;
 
-	where = event_frame (&event, &cx, &cy);
+	where = window_event_frame (&event, &cx, &cy);
 
-	if (where < leftmost_frame || where > leftmost_frame + current_page_frames()) {
+	if (where < leftmost_frame || where > leftmost_frame + current_page_samples()) {
 		/* clearly outside canvas area */
 		return;
 	}
@@ -2009,19 +2006,16 @@ Editor::insert_region_list_drag (boost::shared_ptr<Region> region, int x, int y)
 void
 Editor::insert_route_list_drag (boost::shared_ptr<Route> route, int x, int y)
 {
-	double wx, wy;
 	double cx, cy;
 	RouteTimeAxisView *dest_rtv = 0;
 	RouteTimeAxisView *source_rtv = 0;
 
-	_track_canvas_viewport->window_to_canvas (x, y, wx, wy);
-
 	GdkEvent event;
 	event.type = GDK_BUTTON_RELEASE;
-	event.button.x = wx;
-	event.button.y = wy;
+	event.button.x = x;
+	event.button.y = y;
 
-	event_frame (&event, &cx, &cy);
+	window_event_frame (&event, &cx, &cy);
 
 	std::pair<TimeAxisView*, int> const tv = trackview_by_y_position (cy);
 	if (tv.first == 0) {
@@ -4425,14 +4419,14 @@ Editor::reset_point_selection ()
 void
 Editor::center_playhead ()
 {
-	float const page = _visible_canvas_width * frames_per_pixel;
+	float const page = _visible_canvas_width * samples_per_pixel;
 	center_screen_internal (playhead_cursor->current_frame (), page);
 }
 
 void
 Editor::center_edit_point ()
 {
-	float const page = _visible_canvas_width * frames_per_pixel;
+	float const page = _visible_canvas_width * samples_per_pixel;
 	center_screen_internal (get_preferred_edit_position(), page);
 }
 
@@ -5052,7 +5046,6 @@ Editor::toggle_region_lock ()
 	_session->commit_reversible_command ();
 }
 
-#ifdef WITH_VIDEOTIMELINE
 void
 Editor::toggle_region_video_lock ()
 {
@@ -5076,8 +5069,6 @@ Editor::toggle_region_video_lock ()
 
 	_session->commit_reversible_command ();
 }
-#endif
-
 
 void
 Editor::toggle_region_lock_style ()