Merge branch 'master' into cairocanvas

[ardour.git] / libs / ardour / butler.cc

diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc
index 1fe15246183c89575782e5e4f505c562bcbf6bb7..c9eb55a472579b152f1bbb53fad5b3aae346991e 100644 (file)
--- 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;