Yet another code cleanup

source/shared_lib/include/sound/openal/sound_factory_openal.h

@@ -24,17 +24,20 @@
 #include "sound_player_openal.h"
 #include "leak_dumper.h"
 
-namespace Shared{ namespace Sound{ namespace OpenAL{
-
-// ===============================
-//	class SoundFactoryOpenAL
-// ===============================
-
-class SoundFactoryOpenAL : public SoundFactory{
-public:
-	virtual SoundPlayer* newSoundPlayer()	{return new SoundPlayerOpenAL();}	
-};
-
-}}}//end namespace
+namespace Shared {
+	namespace Sound {
+		namespace OpenAL {
+			// ===============================
+			//	class SoundFactoryOpenAL
+			// ===============================
+			class SoundFactoryOpenAL : public SoundFactory {
+			public:
+				virtual SoundPlayer* newSoundPlayer() {
+					return new SoundPlayerOpenAL();
+				}	
+			};
+		}
+	}
+} //end namespace
 
 #endif

source/shared_lib/include/sound/openal/sound_player_openal.h

@@ -37,108 +37,109 @@
 using std::vector;
 using namespace Shared::PlatformCommon;
 
-namespace Shared{ namespace Sound{ namespace OpenAL{
+namespace Shared {
+	namespace Sound {
+		namespace OpenAL{
+			class SoundSource {
+			public:
+				SoundSource();
+				virtual ~SoundSource();
 
-class SoundSource {
-public:
-	SoundSource();
-	virtual ~SoundSource();
+				bool playing();
+				void stop();
+				void unQueueBuffers();
 
-	bool playing();
-	void stop();
-	void unQueueBuffers();
+			protected:
+				friend class SoundPlayerOpenAL;
+				ALenum getFormat(Sound* sound);
 
-protected:
-	friend class SoundPlayerOpenAL;
-	ALenum getFormat(Sound* sound);
+				ALuint source;
+			};
 
-	ALuint source;
-};
+			class StaticSoundSource : public SoundSource {
+			public:
+				StaticSoundSource();
+				virtual ~StaticSoundSource();
 
-class StaticSoundSource : public SoundSource {
-public:
-	StaticSoundSource();
-	virtual ~StaticSoundSource();
+				void play(StaticSound* sound);
 
-	void play(StaticSound* sound);
+			protected:
+				friend class SoundPlayerOpenAL;
+				bool bufferAllocated;
+				ALuint buffer;
+			};
 
-protected:
-	friend class SoundPlayerOpenAL;
-	bool bufferAllocated;
-	ALuint buffer;
-};
+			class StreamSoundSource : public SoundSource {
+			public:
+				StreamSoundSource();
+				virtual ~StreamSoundSource();
 
-class StreamSoundSource : public SoundSource {
-public:
-	StreamSoundSource();
-	virtual ~StreamSoundSource();
+				void play(StrSound* sound, int64 fade);
+				void update();
+				void stop();
+				void stop(int64 fade);
 
-	void play(StrSound* sound, int64 fade);
-	void update();
-	void stop();
-	void stop(int64 fade);
+			protected:
+				friend class SoundPlayerOpenAL;
+				static const size_t STREAMBUFFERSIZE = 4096 * 500;
+				static const size_t STREAMFRAGMENTS = 10;
+				static const size_t STREAMFRAGMENTSIZE
+					= STREAMBUFFERSIZE / STREAMFRAGMENTS;
 
-protected:
-	friend class SoundPlayerOpenAL;
-	static const size_t STREAMBUFFERSIZE = 4096 * 500;
-	static const size_t STREAMFRAGMENTS = 10;
-	static const size_t STREAMFRAGMENTSIZE
-		= STREAMBUFFERSIZE / STREAMFRAGMENTS;
+				bool fillBufferAndQueue(ALuint buffer);
 
-	bool fillBufferAndQueue(ALuint buffer);
+				StrSound* sound;
+				ALuint buffers[STREAMFRAGMENTS];
+				ALenum format;
 
-	StrSound* sound;
-	ALuint buffers[STREAMFRAGMENTS];
-	ALenum format;
+				enum FadeState { NoFading, FadingOn, FadingOff };
+				FadeState fadeState;
+				Chrono chrono; // delay-fade chrono
+				int64 fade;
+			};
 
-	enum FadeState { NoFading, FadingOn, FadingOff };
-	FadeState fadeState;
-	Chrono chrono; // delay-fade chrono
-	int64 fade;
-};
+			// ==============================================================
+			//	class SoundPlayerSDL
+			//
+			///	SoundPlayer implementation using SDL_mixer
+			// ==============================================================
 
-// ==============================================================
-//	class SoundPlayerSDL
-//
-///	SoundPlayer implementation using SDL_mixer
-// ==============================================================
+			class SoundPlayerOpenAL : public SoundPlayer {
+			public:
+				SoundPlayerOpenAL();
+				virtual ~SoundPlayerOpenAL();
+				virtual bool init(const SoundPlayerParams *params);
+				virtual void end();
+				virtual void play(StaticSound *staticSound, bool force=false);
+				virtual void play(StrSound *strSound, int64 fadeOn=0);
+				virtual void stop(StrSound *strSound, int64 fadeOff=0);
+				virtual void stopAllSounds(int64 fadeOff=0);
+				virtual void updateStreams();	//updates str buffers if needed
 
-class SoundPlayerOpenAL : public SoundPlayer {
-public:
-	SoundPlayerOpenAL();
-	virtual ~SoundPlayerOpenAL();
-	virtual bool init(const SoundPlayerParams *params);
-	virtual void end();
-	virtual void play(StaticSound *staticSound, bool force=false);
-	virtual void play(StrSound *strSound, int64 fadeOn=0);
-	virtual void stop(StrSound *strSound, int64 fadeOff=0);
-	virtual void stopAllSounds(int64 fadeOff=0);
-	virtual void updateStreams();	//updates str buffers if needed
+			private:
+				friend class SoundSource;
+				friend class StaticSoundSource;
+				friend class StreamSoundSource;
 
-private:
-	friend class SoundSource;
-	friend class StaticSoundSource;
-	friend class StreamSoundSource;
+				void printOpenALInfo();
 
-	void printOpenALInfo();
+				StaticSoundSource* findStaticSoundSource();
+				StreamSoundSource* findStreamSoundSource();
+				void checkAlcError(string message);
+				static void checkAlError(string message);
 
-	StaticSoundSource* findStaticSoundSource();
-	StreamSoundSource* findStreamSoundSource();
-	void checkAlcError(string message);
-	static void checkAlError(string message);
+				ALCdevice* device;
+				ALCcontext* context;
 
-	ALCdevice* device;
-	ALCcontext* context;
+				typedef std::vector<StaticSoundSource*> StaticSoundSources;
+				StaticSoundSources staticSources;
+				typedef std::vector<StreamSoundSource*> StreamSoundSources;
+				StreamSoundSources streamSources;
 
-	typedef std::vector<StaticSoundSource*> StaticSoundSources;
-	StaticSoundSources staticSources;
-	typedef std::vector<StreamSoundSource*> StreamSoundSources;
-	StreamSoundSources streamSources;
-
-	SoundPlayerParams params;
-};
-
-}}}//end namespace
+				SoundPlayerParams params;
+			};
+		}
+	}
+} //end namespace
 
 #endif
-

source/shared_lib/include/sound/sound.h

@@ -161,6 +161,6 @@ namespace Shared {
 		};
 
 	}
-}//end namespace
+} //end namespace
 
 #endif

source/shared_lib/include/sound/sound_factory.h

@@ -40,6 +40,6 @@ namespace Shared {
 		};
 
 	}
-}//end namespace
+} //end namespace
 
 #endif

source/shared_lib/include/sound/sound_factory_none.h

@@ -38,6 +38,6 @@ namespace Shared {
 		};
 
 	}
-}//end namespace
+} //end namespace
 
 #endif

source/shared_lib/include/sound/sound_file_loader.h

@@ -119,6 +119,6 @@ namespace Shared {
 		};
 
 	}
-}//end namespace
+} //end namespace
 
 #endif

source/shared_lib/include/sound/sound_interface.h

@@ -50,6 +50,6 @@ namespace Shared {
 		};
 
 	}
-}//end namespace
+} //end namespace
 
 #endif

source/shared_lib/include/sound/sound_player.h

@@ -70,6 +70,6 @@ namespace Shared {
 		};
 
 	}
-}//end namespace
+} //end namespace
 
 #endif