[Scummvm-cvs-logs] SF.net SVN: scummvm:[47540] scummvm/trunk/sound/audiostream.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Mon Jan 25 02:27:14 CET 2010


Revision: 47540
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47540&view=rev
Author:   lordhoto
Date:     2010-01-25 01:27:14 +0000 (Mon, 25 Jan 2010)

Log Message:
-----------
Formatting.

Modified Paths:
--------------
    scummvm/trunk/sound/audiostream.cpp

Modified: scummvm/trunk/sound/audiostream.cpp
===================================================================
--- scummvm/trunk/sound/audiostream.cpp	2010-01-25 01:08:18 UTC (rev 47539)
+++ scummvm/trunk/sound/audiostream.cpp	2010-01-25 01:27:14 UTC (rev 47540)
@@ -41,8 +41,8 @@
 
 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 @@
 };
 
 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 @@
 		AudioStream *_stream;
 		DisposeAfterUse::Flag _disposeAfterUse;
 		StreamHolder(AudioStream *stream, DisposeAfterUse::Flag disposeAfterUse)
-			: _stream(stream),
-			  _disposeAfterUse(disposeAfterUse) {}
+		    : _stream(stream),
+		      _disposeAfterUse(disposeAfterUse) {}
 	};
 
 	/**
@@ -303,7 +303,7 @@
 
 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 @@
 	return samplesDecoded;
 }
 
-
-
 QueuingAudioStream *makeQueuingAudioStream(int rate, bool stereo) {
 	return new QueuingAudioStreamImpl(rate, stereo);
 }
 
-
-
 } // End of namespace Audio


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