Merge branch 'master' into cairocanvas

1 files changed, 8 insertions, 0 deletions

diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc
index 1fe1524618..c9eb55a472 100644
--- a/libs/ardour/butler.cc
+++ b/libs/ardour/butler.cc
@@ -257,6 +257,14 @@ restart:
 			_session.butler_transport_work ();
 		}
 
+		frameoffset_t audition_seek;
+		if (should_run && _session.is_auditioning()
+				&& (audition_seek = _session.the_auditioner()->seek_frame()) >= 0) {
+			boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (_session.the_auditioner());
+			tr->seek(audition_seek);
+			_session.the_auditioner()->seek_response(audition_seek);
+		}
+
 		boost::shared_ptr<RouteList> rl = _session.get_routes();
 
 		RouteList rl_with_auditioner = *rl;