diff options
Diffstat (limited to 'sound/decoders')
| -rw-r--r-- | sound/decoders/flac.cpp | 4 | ||||
| -rw-r--r-- | sound/decoders/mac_snd.cpp | 2 | ||||
| -rw-r--r-- | sound/decoders/mp3.cpp | 2 | 
3 files changed, 5 insertions, 3 deletions
diff --git a/sound/decoders/flac.cpp b/sound/decoders/flac.cpp index 2a92735616..560b83e1ee 100644 --- a/sound/decoders/flac.cpp +++ b/sound/decoders/flac.cpp @@ -139,7 +139,7 @@ public:  	bool seek(const Timestamp &where);  	Timestamp getLength() const { return _length; } -	bool isStreamDecoderReady() const { return getStreamDecoderState() == FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC ; } +	bool isStreamDecoderReady() const { return getStreamDecoderState() == FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC; }  protected:  	uint getChannels() const { return MIN<uint>(_streaminfo.channels, MAX_OUTPUT_CHANNELS); } @@ -552,7 +552,7 @@ void FLACStream::convertBuffersGeneric(SampleType* bufDestination, const FLAC__i  		for (; numSamples > 0; numSamples -= numChannels) {  			for (uint i = 0; i < numChannels; ++i) -				*bufDestination++ = static_cast<SampleType>(*(inChannels[i]++) >> kPower) ; +				*bufDestination++ = static_cast<SampleType>(*(inChannels[i]++) >> kPower);  		}  	} else {  		for (; numSamples > 0; numSamples -= numChannels) { diff --git a/sound/decoders/mac_snd.cpp b/sound/decoders/mac_snd.cpp index d6894f1144..48f6886bf4 100644 --- a/sound/decoders/mac_snd.cpp +++ b/sound/decoders/mac_snd.cpp @@ -69,7 +69,7 @@ SeekableAudioStream *makeMacSndStream(Common::SeekableReadStream *stream,  	// We really should never get this as long as we have sampled data only  	if (stream->readUint16BE() != 1) {  		warning("makeMacSndStream(): Unsupported command count"); -		return 0;  +		return 0;  	}  	uint16 command = stream->readUint16BE(); diff --git a/sound/decoders/mp3.cpp b/sound/decoders/mp3.cpp index e54d646b0a..e06b82a9e2 100644 --- a/sound/decoders/mp3.cpp +++ b/sound/decoders/mp3.cpp @@ -232,6 +232,8 @@ bool MP3Stream::seek(const Timestamp &where) {  	while (mad_timer_compare(destination, _totalTime) > 0 && _state != MP3_STATE_EOS)  		readHeader(); +	decodeMP3Data(); +  	return (_state != MP3_STATE_EOS);  }  | 
