Remove some unused code.

diff --git a/src/lib/audio_ring_buffers.cc b/src/lib/audio_ring_buffers.cc
index 4471f6cda1897eba6f0a74f3f69ad793e6453678..59f06a7c06ab378aabc75415faa55d66404c4a56 100644 (file)
--- a/src/lib/audio_ring_buffers.cc
+++ b/src/lib/audio_ring_buffers.cc
@@ -34,7 +34,7 @@ AudioRingBuffers::AudioRingBuffers ()
 }
 
 void
-AudioRingBuffers::put (shared_ptr<const AudioBuffers> data, DCPTime time)
+AudioRingBuffers::put (shared_ptr<const AudioBuffers> data)
 {
        boost::mutex::scoped_lock lm (_mutex);
 
@@ -43,7 +43,6 @@ AudioRingBuffers::put (shared_ptr<const AudioBuffers> data, DCPTime time)
        }
 
        _buffers.push_back (data);
-       _latest = time;
 }
 
 void
@@ -91,7 +90,6 @@ AudioRingBuffers::clear ()
        boost::mutex::scoped_lock lm (_mutex);
        _buffers.clear ();
        _used_in_head = 0;
-       _latest = DCPTime ();
 }
 
 Frame

diff --git a/src/lib/audio_ring_buffers.h b/src/lib/audio_ring_buffers.h
index 906160aa72f7fb7e1d5553293c72c52a72e00f3b..8f180042eef35d6018415d7ea1acff3178048068 100644 (file)
--- a/src/lib/audio_ring_buffers.h
+++ b/src/lib/audio_ring_buffers.h
@@ -33,21 +33,15 @@ class AudioRingBuffers : public boost::noncopyable
 public:
        AudioRingBuffers ();
 
-       void put (boost::shared_ptr<const AudioBuffers> data, DCPTime time);
+       void put (boost::shared_ptr<const AudioBuffers> data);
        void get (float* out, int channels, int frames);
 
        void clear ();
        Frame size () const;
 
-       DCPTime latest () const {
-               boost::mutex::scoped_lock lm (_mutex);
-               return _latest;
-       }
-
 private:
        mutable boost::mutex _mutex;
        std::list<boost::shared_ptr<const AudioBuffers> > _buffers;
-       DCPTime _latest;
        int _used_in_head;
 };
 

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index f7e7222725455c71cb8c78590c8c4fb428dcba72..bf9fedceba75cf66820c39cbb3aca2a2ebf71005 100644 (file)
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -48,7 +48,7 @@ Butler::Butler (weak_ptr<const Film> film, shared_ptr<Player> player, AudioMappi
        , _disable_audio (false)
 {
        _player_video_connection = _player->Video.connect (bind (&Butler::video, this, _1, _2));
-       _player_audio_connection = _player->Audio.connect (bind (&Butler::audio, 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));
 }
@@ -173,7 +173,7 @@ Butler::video (shared_ptr<PlayerVideo> video, DCPTime time)
 }
 
 void
-Butler::audio (shared_ptr<AudioBuffers> audio, DCPTime time)
+Butler::audio (shared_ptr<AudioBuffers> audio)
 {
        {
                boost::mutex::scoped_lock lm (_mutex);
@@ -183,7 +183,7 @@ Butler::audio (shared_ptr<AudioBuffers> audio, DCPTime time)
                }
        }
 
-       _audio.put (audio, time);
+       _audio.put (audio);
 }
 
 void

diff --git a/src/lib/butler.h b/src/lib/butler.h
index c2c5d8ca5e990a75c8516992b0bf0fc6f6371505..f68504f0e5cdb2e19384a5b34c3ea83e7b092789 100644 (file)
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -47,7 +47,7 @@ public:
 private:
        void thread ();
        void video (boost::shared_ptr<PlayerVideo> video, DCPTime time);
-       void audio (boost::shared_ptr<AudioBuffers> audio, DCPTime time);
+       void audio (boost::shared_ptr<AudioBuffers> audio);
        void player_changed ();
        bool should_run () const;