aboutsummaryrefslogtreecommitdiff
path: root/sound/audiostream.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2010-02-09 22:03:59 +0000
committerJohannes Schickel2010-02-09 22:03:59 +0000
commit52af1b38845a0e185a7243fab5eb18f497d08ebd (patch)
tree03fa209847f5d7919c2df1037245c35ff9c18ea4 /sound/audiostream.cpp
parente7d6d44e86168f9479b358019a849074e45e3b73 (diff)
downloadscummvm-rg350-52af1b38845a0e185a7243fab5eb18f497d08ebd.tar.gz
scummvm-rg350-52af1b38845a0e185a7243fab5eb18f497d08ebd.tar.bz2
scummvm-rg350-52af1b38845a0e185a7243fab5eb18f497d08ebd.zip
Formatting.
svn-id: r48023
Diffstat (limited to 'sound/audiostream.cpp')
-rw-r--r--sound/audiostream.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp
index 7501f4f671..8a86365b7b 100644
--- a/sound/audiostream.cpp
+++ b/sound/audiostream.cpp
@@ -83,9 +83,8 @@ SeekableAudioStream *SeekableAudioStream::openStreamFile(const Common::String &b
delete fileHandle;
- if (stream == NULL) {
+ if (stream == NULL)
debug(1, "SeekableAudioStream::openStreamFile: Could not open compressed AudioFile %s", basename.c_str());
- }
return stream;
}
@@ -161,10 +160,10 @@ AudioStream *makeLoopingAudioStream(SeekableAudioStream *stream, Timestamp start
#pragma mark -
SubLoopingAudioStream::SubLoopingAudioStream(SeekableAudioStream *stream,
- uint loops,
- const Timestamp loopStart,
- const Timestamp loopEnd,
- DisposeAfterUse::Flag disposeAfterUse)
+ uint loops,
+ const Timestamp loopStart,
+ const Timestamp loopEnd,
+ DisposeAfterUse::Flag disposeAfterUse)
: _parent(stream), _disposeAfterUse(disposeAfterUse), _loops(loops),
_pos(0, getRate() * (isStereo() ? 2 : 1)),
_loopStart(convertTimeToStreamPos(loopStart, getRate(), isStereo())),
@@ -358,7 +357,7 @@ int QueuingAudioStreamImpl::readBuffer(int16 *buffer, const int numSamples) {
AudioStream *stream = _queue.front()._stream;
samplesDecoded += stream->readBuffer(buffer + samplesDecoded, numSamples - samplesDecoded);
- if (stream->endOfData() ) {
+ if (stream->endOfData()) {
StreamHolder tmp = _queue.pop();
if (tmp._disposeAfterUse == DisposeAfterUse::YES)
delete stream;