Remove bad attempt at flushing resamplers.

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 6db7ff693e1adaf76c87cdbb8de7e09338eccd8c..7ab72d9a15379b7c71fade6ba432cdb686b77546 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -264,9 +264,6 @@ Player::process_audio (weak_ptr<Piece> weak_piece, shared_ptr<const AudioBuffers
        if (content->content_audio_frame_rate() != content->output_audio_frame_rate()) {
                shared_ptr<Resampler> r = resampler (content);
                audio = r->run (audio);
-               _last_resampler = r;
-       } else {
-               _last_resampler.reset ();
        }
 
        /* Remap channels */
@@ -343,12 +340,6 @@ Player::flush ()
                _audio_buffers.set_frames (0);
        }
 
-       if (_last_resampler) {
-//             shared_ptr<const AudioBuffers> resamp = _last_resampler->flush ();
-//             Audio (resamp, _audio_position);
-//             _audio_position += _film->audio_frames_to_time (resamp->frames ());
-       }
-       
        while (_video_position < _audio_position) {
                emit_black ();
        }

diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc
index cc50724420922440c7e7ba0cb90a6d1d04086524..565fb69c29b127240b956b64e75f744bce5df8e9 100644 (file)
--- a/src/lib/resampler.cc
+++ b/src/lib/resampler.cc
@@ -80,6 +80,7 @@ Resampler::run (shared_ptr<const AudioBuffers> in)
        return resampled;
 }      
 
+/* XXX: no-one calls this */
 shared_ptr<const AudioBuffers>
 Resampler::flush ()
 {