From 1f4a21c0da3a917a5ff7743a577cc0f210fa86d8 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 7 May 2013 21:02:13 +0100
Subject: Stop SndfileDecoder with no audio emitting lots of silence.

---
 src/lib/sndfile_decoder.cc | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/lib')

diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index fdaf2eeaa..d70478a1b 100644
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -102,14 +102,20 @@ SndfileDecoder::pass ()
 	sf_count_t const block = _audio_stream->sample_rate() / 2;
 	shared_ptr<AudioBuffers> audio (new AudioBuffers (_audio_stream->channels(), block));
 	sf_count_t const this_time = min (block, _frames - _done);
+	bool have_sound = false;
 	for (size_t i = 0; i < _sndfiles.size(); ++i) {
 		if (!_sndfiles[i]) {
 			audio->make_silent (i);
 		} else {
 			sf_read_float (_sndfiles[i], audio->data(i), this_time);
+			have_sound = true;
 		}
 	}
 
+	if (!have_sound) {
+		return true;
+	}
+
 	audio->set_frames (this_time);
 	Audio (audio, double(_done) / _audio_stream->sample_rate());
 	_done += this_time;
-- 
cgit v1.2.3