From 88913c0139ac6d1dfb356d3048702b7bc8ef4079 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 20 Jun 2011 00:59:48 +0200 Subject: ALL: Remove trailing whitespaces This tries to make our code a bit more compliant with our code formatting conventions. For future use, this is the command I used: git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//' --- audio/decoders/aac.cpp | 2 +- audio/decoders/adpcm.cpp | 4 ++-- audio/decoders/quicktime.cpp | 4 ++-- audio/decoders/quicktime.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'audio/decoders') diff --git a/audio/decoders/aac.cpp b/audio/decoders/aac.cpp index 7949b5b561..874062a702 100644 --- a/audio/decoders/aac.cpp +++ b/audio/decoders/aac.cpp @@ -127,7 +127,7 @@ int AACStream::readBuffer(int16 *buffer, const int numSamples) { // Dip into our remaining samples pool if it's available if (_remainingSamples) { samples = MIN(numSamples, _remainingSamplesSize - _remainingSamplesPos); - + memcpy(buffer, _remainingSamples + _remainingSamplesPos, samples * 2); _remainingSamplesPos += samples; diff --git a/audio/decoders/adpcm.cpp b/audio/decoders/adpcm.cpp index d28ed222a5..f75196c882 100644 --- a/audio/decoders/adpcm.cpp +++ b/audio/decoders/adpcm.cpp @@ -342,14 +342,14 @@ do { \ _topNibble = true; \ } \ } while (0) - + int DK3_ADPCMStream::readBuffer(int16 *buffer, const int numSamples) { int samples = 0; assert((numSamples % 4) == 0); - while (samples < numSamples && !_stream->eos() && _stream->pos() < _endpos) { + while (samples < numSamples && !_stream->eos() && _stream->pos() < _endpos) { if ((_stream->pos() % _blockAlign) == 0) { _stream->readUint16LE(); // Unknown uint16 rate = _stream->readUint16LE(); // Copy of rate diff --git a/audio/decoders/quicktime.cpp b/audio/decoders/quicktime.cpp index 0f2e76658b..0ad2821cd5 100644 --- a/audio/decoders/quicktime.cpp +++ b/audio/decoders/quicktime.cpp @@ -220,7 +220,7 @@ void QuickTimeAudioDecoder::setAudioStreamPos(const Timestamp &where) { // First, we need to track down what audio sample we need Audio::Timestamp curAudioTime = where.convertToFramerate(_tracks[_audioTrackIndex]->timeScale); uint32 sample = curAudioTime.totalNumberOfFrames(); - uint32 seekSample = sample; + uint32 seekSample = sample; if (!isOldDemuxing()) { // We shouldn't have audio samples that are a different duration @@ -246,7 +246,7 @@ void QuickTimeAudioDecoder::setAudioStreamPos(const Timestamp &where) { totalSamples += chunkSampleCount; } - + // Reposition the audio stream queueNextAudioChunk(); if (sample != totalSamples) { diff --git a/audio/decoders/quicktime.h b/audio/decoders/quicktime.h index 413f527221..9f6c6c20e0 100644 --- a/audio/decoders/quicktime.h +++ b/audio/decoders/quicktime.h @@ -45,7 +45,7 @@ namespace Common { namespace Audio { class SeekableAudioStream; - + /** * Try to load a QuickTime sound file from the given file name and create a SeekableAudioStream * from that data. -- cgit v1.2.3