no more per-track varispeed

1 files changed, 8 insertions, 67 deletions

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 41fe50d6ef..f7bd882260 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -799,17 +799,6 @@ Editor::build_region_boundary_cache ()
 				break;
 			}
 
-			float speed = 1.0f;
-			RouteTimeAxisView *rtav;
-
-			if (ontrack != 0 && (rtav = dynamic_cast<RouteTimeAxisView*>(ontrack)) != 0 ) {
-				if (rtav->track() != 0) {
-					speed = rtav->track()->speed();
-				}
-			}
-
-			rpos = track_frame_to_session_frame (rpos, speed);
-
 			if (rpos < lpos) {
 				lpos = rpos;
 			}
@@ -847,7 +836,6 @@ Editor::find_next_region (framepos_t frame, RegionPoint point, int32_t dir, Trac
 	boost::shared_ptr<Region> ret;
 	framepos_t rpos = 0;
 
-	float track_speed;
 	framepos_t track_frame;
 	RouteTimeAxisView *rtav;
 
@@ -856,13 +844,7 @@ Editor::find_next_region (framepos_t frame, RegionPoint point, int32_t dir, Trac
 		framecnt_t distance;
 		boost::shared_ptr<Region> r;
 
-		track_speed = 1.0f;
-		if ( (rtav = dynamic_cast<RouteTimeAxisView*>(*i)) != 0 ) {
-			if (rtav->track()!=0)
-				track_speed = rtav->track()->speed();
-		}
-
-		track_frame = session_frame_to_track_frame(frame, track_speed);
+		track_frame = frame;
 
 		if ((r = (*i)->find_next_region (track_frame, point, dir)) == 0) {
 			continue;
@@ -882,9 +864,6 @@ Editor::find_next_region (framepos_t frame, RegionPoint point, int32_t dir, Trac
 			break;
 		}
 
-		// rpos is a "track frame", converting it to "_session frame"
-		rpos = track_frame_to_session_frame(rpos, track_speed);
-
 		if (rpos > frame) {
 			distance = rpos - frame;
 		} else {
@@ -1052,17 +1031,6 @@ Editor::cursor_to_region_point (EditorCursor* cursor, RegionPoint point, int32_t
 		break;
 	}
 
-	float speed = 1.0f;
-	RouteTimeAxisView *rtav;
-
-	if ( ontrack != 0 && (rtav = dynamic_cast<RouteTimeAxisView*>(ontrack)) != 0 ) {
-		if (rtav->track() != 0) {
-			speed = rtav->track()->speed();
-		}
-	}
-
-	pos = track_frame_to_session_frame(pos, speed);
-
 	if (cursor == playhead_cursor) {
 		_session->request_locate (pos);
 	} else {
@@ -1243,17 +1211,6 @@ Editor::selected_marker_to_region_point (RegionPoint point, int32_t dir)
 		break;
 	}
 
-	float speed = 1.0f;
-	RouteTimeAxisView *rtav;
-
-	if (ontrack != 0 && (rtav = dynamic_cast<RouteTimeAxisView*>(ontrack)) != 0) {
-		if (rtav->track() != 0) {
-			speed = rtav->track()->speed();
-		}
-	}
-
-	pos = track_frame_to_session_frame(pos, speed);
-
 	loc->move_to (pos, 0);
 }
 
@@ -3184,8 +3141,6 @@ Editor::separate_regions_between (const TimeSelection& ts)
 
 			/* XXX need to consider musical time selections here at some point */
 
-			double speed = rtv->track()->speed();
-
 			for (list<AudioRange>::const_iterator t = ts.begin(); t != ts.end(); ++t) {
 
 				sigc::connection c = rtv->view()->RegionViewAdded.connect (
@@ -3193,8 +3148,7 @@ Editor::separate_regions_between (const TimeSelection& ts)
 
 				latest_regionviews.clear ();
 
-				playlist->partition ((framepos_t)((*t).start * speed),
-				                     (framepos_t)((*t).end * speed), false);
+				playlist->partition ((*t).start, (*t).end, false);
 
 				c.disconnect ();
 
@@ -3839,16 +3793,11 @@ Editor::trim_region_to_location (const Location& loc, const char* str)
 			return;
 		}
 
-		float speed = 1.0;
 		framepos_t start;
 		framepos_t end;
 
-		if (tav->track() != 0) {
-			speed = tav->track()->speed();
-		}
-
-		start = session_frame_to_track_frame (loc.start(), speed);
-		end = session_frame_to_track_frame (loc.end(), speed);
+		start = loc.start();
+		end = loc.end();
 
 		rv->region()->clear_changes ();
 		rv->region()->trim_to (start, (end - start));
@@ -3899,13 +3848,6 @@ Editor::trim_to_region(bool forward)
 			continue;
 		}
 
-		float speed = 1.0;
-
-		if (atav->track() != 0) {
-			speed = atav->track()->speed();
-		}
-
-
 		boost::shared_ptr<Region> region = arv->region();
 		boost::shared_ptr<Playlist> playlist (region->playlist());
 
@@ -3919,19 +3861,18 @@ Editor::trim_to_region(bool forward)
 				continue;
 			}
 
-			region->trim_end((framepos_t) ( (next_region->first_frame() - 1) * speed));
-			arv->region_changed (PropertyChange (ARDOUR::Properties::length));
+		    region->trim_end (next_region->first_frame() - 1);
+		    arv->region_changed (PropertyChange (ARDOUR::Properties::length));
 		}
 		else {
 
 			next_region = playlist->find_next_region (region->first_frame(), Start, 0);
 
-			if(!next_region){
+			if (!next_region) {
 				continue;
 			}
 
-			region->trim_front((framepos_t) ((next_region->last_frame() + 1) * speed));
-
+			region->trim_front (next_region->last_frame() + 1);
 			arv->region_changed (ARDOUR::bounds_change);
 		}