Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.

git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 13 insertions, 2 deletions

diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index 6085501470..d6f63c2f9d 100644
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -151,8 +151,19 @@ Auditioner::audition_region (boost::shared_ptr<Region> region)
 	reset_panner();
 
 	length = the_region->length();
-	_diskstream->seek (0);
-	current_frame = 0;
+
+	int dir;
+	nframes_t offset = the_region->sync_offset (dir);
+
+	/* can't audition from a negative sync point */
+
+	if (dir < 0) {
+		offset = 0;
+	}
+
+	_diskstream->seek (offset);
+	current_frame = offset;
+
 	g_atomic_int_set (&_active, 1);
 }