From 9de96c328babc3944f5a9b4d12da9471e3a33ef7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 4 Aug 2017 01:28:57 +0100 Subject: [PATCH] Remove believed-unnecessary player-changed handler in butler. --- src/lib/butler.cc | 9 --------- src/lib/butler.h | 2 -- 2 files changed, 11 deletions(-) diff --git a/src/lib/butler.cc b/src/lib/butler.cc index 2b6010aaa..ea0950afb 100644 --- a/src/lib/butler.cc +++ b/src/lib/butler.cc @@ -59,7 +59,6 @@ Butler::Butler (shared_ptr player, shared_ptr 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 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 e416ba818..8fad3614e 100644 --- a/src/lib/butler.h +++ b/src/lib/butler.h @@ -49,7 +49,6 @@ private: void thread (); void video (boost::shared_ptr video, DCPTime time); void audio (boost::shared_ptr audio); - void player_changed (); bool should_run () const; void prepare (boost::weak_ptr 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; }; -- 2.30.2