diff options
| author | Johannes Schickel | 2009-05-24 15:17:42 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-05-24 15:17:42 +0000 |
| commit | b3c6751b9b7fc1401fd5e87a034cdaec92b67b20 (patch) | |
| tree | aa00dba58fb88ea2e095b886963370c7290c692b /sound/adpcm.cpp | |
| parent | 7c1eb057146af11793c627327f3fefe309d27fbb (diff) | |
| download | scummvm-rg350-b3c6751b9b7fc1401fd5e87a034cdaec92b67b20.tar.gz scummvm-rg350-b3c6751b9b7fc1401fd5e87a034cdaec92b67b20.tar.bz2 scummvm-rg350-b3c6751b9b7fc1401fd5e87a034cdaec92b67b20.zip | |
Strip trailing whitespaces in the whole code base.
svn-id: r40867
Diffstat (limited to 'sound/adpcm.cpp')
| -rw-r--r-- | sound/adpcm.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/adpcm.cpp b/sound/adpcm.cpp index a5f2f7c4eb..37b14140b7 100644 --- a/sound/adpcm.cpp +++ b/sound/adpcm.cpp @@ -112,12 +112,12 @@ public: ADPCMInputStream::ADPCMInputStream(Common::SeekableReadStream *stream, bool disposeAfterUse, uint32 size, typesADPCM type, int rate, int channels, uint32 blockAlign, uint numLoops) : _stream(stream), _disposeAfterUse(disposeAfterUse), _channels(channels), _type(type), _blockAlign(blockAlign), _rate(rate), _numLoops(numLoops) { - + if (type == kADPCMMSIma && blockAlign == 0) error("ADPCMInputStream(): blockAlign isn't specified for MS IMA ADPCM"); if (type == kADPCMMS && blockAlign == 0) error("ADPCMInputStream(): blockAlign isn't specified for MS ADPCM"); - + if (type == kADPCMTinsel4 && blockAlign == 0) error("ADPCMInputStream(): blockAlign isn't specified for Tinsel 4-bit ADPCM"); if (type == kADPCMTinsel6 && blockAlign == 0) @@ -131,7 +131,7 @@ ADPCMInputStream::ADPCMInputStream(Common::SeekableReadStream *stream, bool disp error("ADPCMInputStream(): Tinsel 6-bit ADPCM only supports mono"); if (type == kADPCMTinsel8 && channels != 1) error("ADPCMInputStream(): Tinsel 8-bit ADPCM only supports mono"); - + _startpos = stream->pos(); _endpos = _startpos + size; _curLoop = 0; @@ -182,7 +182,7 @@ int ADPCMInputStream::readBuffer(int16 *buffer, const int numSamples) { error("Unsupported ADPCM encoding"); break; } - + // Loop if necessary if (samplesDecoded < numSamples || _stream->pos() == _endpos) { _curLoop++; @@ -192,7 +192,7 @@ int ADPCMInputStream::readBuffer(int16 *buffer, const int numSamples) { return samplesDecoded + readBuffer(buffer + samplesDecoded, numSamples - samplesDecoded); } } - + return samplesDecoded; } |