I think Butler should just clear itself out when the player changes.

Other layers will seek as appropriate, we shouldn't fight them I don't think.

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index ef565c02b0607849689ffb8d1fd22da4f373062f..db1ef7ffa8dbde00ebb057f0591e832a99aeddea 100644 (file)
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -234,19 +234,8 @@ Butler::audio (shared_ptr<AudioBuffers> audio)
 void
 Butler::player_changed ()
 {
-       optional<DCPTime> t;
-
-       {
-               boost::mutex::scoped_lock lm (_mutex);
-               t = _video.earliest ();
-       }
-
-       if (t) {
-               seek (*t, true);
-       } else {
-               _video.clear ();
-               _audio.clear ();
-       }
+       _video.clear ();
+       _audio.clear ();
 }
 
 /** Try to get `frames' frames of audio and copy it into `out'.  Silence