diff options
| author | Jordi Vilalta Prat | 2008-12-22 11:22:15 +0000 |
|---|---|---|
| committer | Jordi Vilalta Prat | 2008-12-22 11:22:15 +0000 |
| commit | b1999a2a16b83aa031df2ce1cb266b7fea8847da (patch) | |
| tree | a042bbc975ead7e8b38243d0d25822d70e72fe69 /sound | |
| parent | 2ec51ef3585d9450ddf21cff9212c0bc7f0b6a3f (diff) | |
| download | scummvm-rg350-b1999a2a16b83aa031df2ce1cb266b7fea8847da.tar.gz scummvm-rg350-b1999a2a16b83aa031df2ce1cb266b7fea8847da.tar.bz2 scummvm-rg350-b1999a2a16b83aa031df2ce1cb266b7fea8847da.zip | |
Fixed indentation and removed whitespaces at the end of line
svn-id: r35481
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/adpcm.cpp | 2 | ||||
| -rw-r--r-- | sound/mididrv.cpp | 4 | ||||
| -rw-r--r-- | sound/mixer.cpp | 2 | ||||
| -rw-r--r-- | sound/mixer_intern.h | 2 | ||||
| -rw-r--r-- | sound/mp3.cpp | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sound/adpcm.cpp b/sound/adpcm.cpp index d3ec7df9a0..1140089910 100644 --- a/sound/adpcm.cpp +++ b/sound/adpcm.cpp @@ -370,7 +370,7 @@ int ADPCMInputStream::readBufferTinsel6(int channels, int16 *buffer, const int n _blockPos++; break; } - + } } diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp index 473612f6bc..8e85b5a5f8 100644 --- a/sound/mididrv.cpp +++ b/sound/mididrv.cpp @@ -47,7 +47,7 @@ static const MidiDriverDescription s_musicDrivers[] = { #endif #if defined(__MINT__) - {"stmidi", "Atari ST MIDI", MD_STMIDI, MDT_MIDI}, + {"stmidi", "Atari ST MIDI", MD_STMIDI, MDT_MIDI}, #endif #if defined(UNIX) && !defined(__BEOS__) && !defined(MACOSX) && !defined(__MAEMO__) && !defined(__MINT__) @@ -252,7 +252,7 @@ MidiDriver *MidiDriver::createMidi(int midiDriver) { case MD_WINDOWS: return MidiDriver_WIN_create(g_system->getMixer()); #endif #if defined(__MINT__) - case MD_STMIDI: return MidiDriver_STMIDI_create(g_system->getMixer()); + case MD_STMIDI: return MidiDriver_STMIDI_create(g_system->getMixer()); #endif #if defined(UNIX) && !defined(__BEOS__) && !defined(MACOSX) && !defined(__MAEMO__) && !defined(__MINT__) case MD_SEQ: return MidiDriver_SEQ_create(g_system->getMixer()); diff --git a/sound/mixer.cpp b/sound/mixer.cpp index 4826d2b044..5cf6e6d512 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -214,7 +214,7 @@ void MixerImpl::mixCallback(byte *samples, uint len) { assert(samples); Common::StackLock lock(_mutex); - + int16 *buf = (int16 *)samples; len >>= 2; diff --git a/sound/mixer_intern.h b/sound/mixer_intern.h index 46ba97e66c..d74fc70a1c 100644 --- a/sound/mixer_intern.h +++ b/sound/mixer_intern.h @@ -135,7 +135,7 @@ public: * setOutputRate() has been called). */ void setReady(bool ready); - + /** * Set the output sample rate. * diff --git a/sound/mp3.cpp b/sound/mp3.cpp index 0249032e2f..ba21436de4 100644 --- a/sound/mp3.cpp +++ b/sound/mp3.cpp @@ -117,7 +117,7 @@ MP3InputStream::MP3InputStream(Common::SeekableReadStream *inStream, bool dispos // Calculate play time mad_timer_t length; - mad_timer_set(&length, 0, 0, 1000); + mad_timer_set(&length, 0, 0, 1000); mad_timer_add(&length, start); mad_timer_negate(&length); @@ -175,7 +175,7 @@ MP3InputStream::MP3InputStream(Common::SeekableReadStream *inStream, bool dispos } _totalPlayTime = mad_timer_count(length, MAD_UNITS_MILLISECONDS); - + if (numLoops && mad_timer_sign(length) >= 0) _totalPlayTime *= numLoops; else |