[Scummvm-cvs-logs] SF.net SVN: scummvm:[48023] scummvm/trunk/sound/audiostream.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Tue Feb 9 23:04:00 CET 2010
Revision: 48023
http://scummvm.svn.sourceforge.net/scummvm/?rev=48023&view=rev
Author: lordhoto
Date: 2010-02-09 22:03:59 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
Formatting.
Modified Paths:
--------------
scummvm/trunk/sound/audiostream.cpp
Modified: scummvm/trunk/sound/audiostream.cpp
===================================================================
--- scummvm/trunk/sound/audiostream.cpp 2010-02-09 22:03:02 UTC (rev 48022)
+++ scummvm/trunk/sound/audiostream.cpp 2010-02-09 22:03:59 UTC (rev 48023)
@@ -83,9 +83,8 @@
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 @@
#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 @@
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;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list