diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-11 15:53:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-11 15:53:52 +0100 |
| commit | 8bdc282a88cbd0446b06866b9436c43200886314 (patch) | |
| tree | 252114666813778c1dcf9c88c88788c1456d2b16 /src | |
| parent | 4122f932b1dc25f7a4592f49f2c9ab19d63b3a4e (diff) | |
Remove bad attempt at flushing resamplers.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/player.cc | 9 | ||||
| -rw-r--r-- | src/lib/resampler.cc | 1 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 6db7ff693..7ab72d9a1 100644 --- 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 cc5072442..565fb69c2 100644 --- 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 () { |