diff options
| author | Johannes Schickel | 2010-01-25 01:27:14 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-01-25 01:27:14 +0000 |
| commit | ec14cd6e6add76ce4f719edd7ce508d67ebd9f14 (patch) | |
| tree | 8022d331ea7c2c8468bbef841d5d840ddc1f4c65 /sound | |
| parent | 8c28155848042bfdece32c02a91bc545c08f1da2 (diff) | |
| download | scummvm-rg350-ec14cd6e6add76ce4f719edd7ce508d67ebd9f14.tar.gz scummvm-rg350-ec14cd6e6add76ce4f719edd7ce508d67ebd9f14.tar.bz2 scummvm-rg350-ec14cd6e6add76ce4f719edd7ce508d67ebd9f14.zip | |
Formatting.
svn-id: r47540
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/audiostream.cpp | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp index 01c4aefec0..20f4d4d14e 100644 --- a/sound/audiostream.cpp +++ b/sound/audiostream.cpp @@ -41,8 +41,8 @@ namespace Audio { struct StreamFileFormat { /** Decodername */ - const char* decoderName; - const char* fileExtension; + const char *decoderName; + const char *fileExtension; /** * Pointer to a function which tries to open a file of type StreamFormat. * Return NULL in case of an error (invalid/nonexisting file). @@ -51,16 +51,16 @@ struct StreamFileFormat { }; static const StreamFileFormat STREAM_FILEFORMATS[] = { - /* decoderName, fileExt, openStreamFuntion */ + /* decoderName, fileExt, openStreamFuntion */ #ifdef USE_FLAC - { "Flac", ".flac", makeFlacStream }, - { "Flac", ".fla", makeFlacStream }, + { "Flac", ".flac", makeFlacStream }, + { "Flac", ".fla", makeFlacStream }, #endif #ifdef USE_VORBIS - { "Ogg Vorbis", ".ogg", makeVorbisStream }, + { "Ogg Vorbis", ".ogg", makeVorbisStream }, #endif #ifdef USE_MAD - { "MPEG Layer 3", ".mp3", makeMP3Stream }, + { "MPEG Layer 3", ".mp3", makeMP3Stream }, #endif { NULL, NULL, NULL } // Terminator @@ -271,8 +271,8 @@ private: AudioStream *_stream; DisposeAfterUse::Flag _disposeAfterUse; StreamHolder(AudioStream *stream, DisposeAfterUse::Flag disposeAfterUse) - : _stream(stream), - _disposeAfterUse(disposeAfterUse) {} + : _stream(stream), + _disposeAfterUse(disposeAfterUse) {} }; /** @@ -303,7 +303,7 @@ private: public: QueuingAudioStreamImpl(int rate, bool stereo) - : _rate(rate), _stereo(stereo), _finished(false) {} + : _rate(rate), _stereo(stereo), _finished(false) {} ~QueuingAudioStreamImpl(); // Implement the AudioStream API @@ -360,12 +360,8 @@ int QueuingAudioStreamImpl::readBuffer(int16 *buffer, const int numSamples) { return samplesDecoded; } - - QueuingAudioStream *makeQueuingAudioStream(int rate, bool stereo) { return new QueuingAudioStreamImpl(rate, stereo); } - - } // End of namespace Audio |