Remove believed-unnecessary player-changed handler in butler.

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index 2b6010aaa6df777498f90a7c969e667670eea623..ea0950afbcccd916ce8e2b79ff9a6797a54502d1 100644 (file)
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -59,7 +59,6 @@ Butler::Butler (shared_ptr<Player> player, shared_ptr<Log> log, AudioMapping aud
 {
        _player_video_connection = _player->Video.connect (bind (&Butler::video, this, _1, _2));
        _player_audio_connection = _player->Audio.connect (bind (&Butler::audio, this, _1));
-       _player_changed_connection = _player->Changed.connect (bind (&Butler::player_changed, this));
        _thread = new boost::thread (bind (&Butler::thread, this));
 
        /* Create some threads to do work on the PlayerVideos we are creating; at present this is used to
@@ -231,14 +230,6 @@ Butler::audio (shared_ptr<AudioBuffers> audio)
        _audio.put (remap (audio, _audio_channels, _audio_mapping));
 }
 
-void
-Butler::player_changed ()
-{
-       _video.clear ();
-       _audio.clear ();
-       _summon.notify_all ();
-}
-
 /** Try to get `frames' frames of audio and copy it into `out'.  Silence
  *  will be filled if no audio is available.
  *  @return true if there was a buffer underrun, otherwise false.

diff --git a/src/lib/butler.h b/src/lib/butler.h
index e416ba8183736ad4aff376d1f52610881e18c808..8fad3614e5aa75c4144d3400be3e8efd7a1f855e 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -49,7 +49,6 @@ private:
        void thread ();
        void video (boost::shared_ptr<PlayerVideo> video, DCPTime time);
        void audio (boost::shared_ptr<AudioBuffers> audio);
-       void player_changed ();
        bool should_run () const;
        void prepare (boost::weak_ptr<PlayerVideo> video) const;
 
@@ -81,5 +80,4 @@ private:
 
        boost::signals2::scoped_connection _player_video_connection;
        boost::signals2::scoped_connection _player_audio_connection;
-       boost::signals2::scoped_connection _player_changed_connection;
 };