From 83742c7e6edcf958e0820abc77c029f4ada4880f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 8 May 2013 16:58:19 +0100
Subject: Better fix for still (no sound) DCP crash.

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

(limited to 'src/lib/sndfile_decoder.cc')

diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index d70478a1b..fdaf2eeaa 100644
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -102,20 +102,14 @@ 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