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.

1 files changed, 2 insertions, 13 deletions

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index ef565c02b..db1ef7ffa 100644
--- 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