Considerable rework of decoder timing; tests pass, at least.

1 files changed, 1 insertions, 11 deletions

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index a73ad4d7c..7ff8529c6 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -42,15 +42,5 @@ AudioDecoder::AudioDecoder (shared_ptr<const Film> film, shared_ptr<const AudioC
 void
 AudioDecoder::audio (shared_ptr<const AudioBuffers> data, ContentTime time)
 {
-	Audio (data, time);
-}
-
-/** This is a bit odd, but necessary when we have (e.g.) FFmpegDecoders with no audio.
- *  The player needs to know that there is no audio otherwise it will keep trying to
- *  pass() the decoder to get it to emit audio.
- */
-bool
-AudioDecoder::has_audio () const
-{
-	return _audio_content->audio_channels () > 0;
+	_pending.push_back (shared_ptr<DecodedAudio> (new DecodedAudio (data, time)));
 }