comments, cleanup

stepmania/src/RageFile.h

@@ -1,6 +1,4 @@
-/*
+/* RageFile - High-level file access. */
- * RageFile: high-level file abstraction
- */
 
 #ifndef RAGE_FILE_H
 #define RAGE_FILE_H

stepmania/src/RageFileDriver.h

@@ -1,4 +1,4 @@
-/* RageFileDriver, RageFileObj: Low-level file access driver classes. */
+/* RageFileDriver - File driver base classes. */
 
 #ifndef RAGE_FILE_DRIVER_H
 #define RAGE_FILE_DRIVER_H

stepmania/src/RageFileDriverTimeout.h

@@ -1,4 +1,4 @@
-/* RageFileDriverTimeOut - manipulate files with a forced timeout */
+/* RageFileDriverTimeOut - manipulate files with a forced timeout. */
 
 #ifndef RAGE_FILE_DRIVER_TIMEOUT_H
 #define RAGE_FILE_DRIVER_TIMEOUT_H

stepmania/src/RageFileDriverZip.h

@@ -1,3 +1,5 @@
+/* RageFileDriverZip - A read-only file driver for ZIPs. */
+
 #ifndef RAGE_FILE_DRIVER_ZIP_H
 #define RAGE_FILE_DRIVER_ZIP_H
 
@@ -16,7 +18,7 @@ public:
 
 private:
 	RageFile zip;
-    vector<FileInfo *> Files;
+	vector<FileInfo *> Files;
 
 	void ParseZipfile();
 	static void ReadEndCentralRecord( RageFile &zip, end_central_dir_record &ec );

stepmania/src/RageFileManager.h

@@ -1,6 +1,4 @@
-/*
+/* RageFileManager - File utilities and high-level manager for RageFile objects. */
- * RageFileManager: File utilities and high-level manager for RageFile objects.
- */
 
 #ifndef RAGE_FILE_MANAGER_H
 #define RAGE_FILE_MANAGER_H

stepmania/src/RageInput.h

@@ -1,4 +1,4 @@
-/* RageInput: Starts up InputHandlers, which generate InputEvents. */
+/* RageInput - Starts up InputHandlers, which generate InputEvents. */
 
 #ifndef RAGEINPUT_H
 #define RAGEINPUT_H
@@ -8,8 +8,6 @@
 class InputHandler;
 class RageInput
 {
-	vector<InputHandler *> Devices;
-
 public:
 	RageInput( CString drivers );
 	~RageInput();
@@ -17,6 +15,9 @@ public:
 	void Update( float fDeltaTime );
 	void GetDevicesAndDescriptions(vector<InputDevice>& vDevicesOut, vector<CString>& vDescriptionsOut);
 	void WindowReset();
+
+private:
+	vector<InputHandler *> Devices;
 };
 
 extern RageInput*			INPUTMAN;	// global and accessable from anywhere in our program

stepmania/src/RageInputDevice.h

@@ -1,5 +1,6 @@
-#ifndef RAGEINPUTDEVICE_H
+/* RageInputDevice - User input types. */
-#define RAGEINPUTDEVICE_H 1
+#ifndef RAGE_INPUT_DEVICE_H
+#define RAGE_INPUT_DEVICE_H
 
 #include "RageTimer.h"
 

stepmania/src/RageLog.h

@@ -1,6 +1,4 @@
-/*
+/* RageLog - Manages logging. */
- * RageLog - Manages logging.
- */
 
 #ifndef RAGELOG_H
 #define RAGELOG_H

stepmania/src/RageModelGeometry.h

@@ -1,6 +1,4 @@
-/*
+/* RageModelGeometry - Stores mesh data. */
- * RageModelGeometry - stores model geometry 
- */
 
 #ifndef RAGE_MODEL_GEOMETRY_H
 #define RAGE_MODEL_GEOMETRY_H
@@ -24,7 +22,7 @@ public:
 	int m_iRefCount;
 
 	vector<msMesh> m_Meshes;
-    RageCompiledGeometry* m_pCompiledGeometry;	// video memory copy of geometry shared by all meshes
+	RageCompiledGeometry* m_pCompiledGeometry;	// video memory copy of geometry shared by all meshes
 
 	RageVector3 m_vMins, m_vMaxs;
 };

stepmania/src/RageSoundManager.h

@@ -1,3 +1,5 @@
+/* RageSoundManager - A global singleton to interface RageSound and RageSoundDriver. */
+
 #ifndef RAGE_SOUND_MANAGER_H
 #define RAGE_SOUND_MANAGER_H
 
@@ -12,25 +14,6 @@ struct RageSoundParams;
 
 class RageSoundManager
 {
-	/* Set of sounds that we've taken over (and are responsible for deleting
-	 * when they're finished playing): */
-	set<RageSound *> owned_sounds;
-
-	/* A list of all sounds that currently exist, by ID. */
-	map<int,RageSound *> all_sounds;
-	
-	RageSoundDriver *driver;
-
-	/* Prefs: */
-	float MixVolume;
-	struct queued_pos_map_t
-	{
-		int ID, pos, got_frames;
-		int64_t frameno;
-	};
-
-	CircBuf<queued_pos_map_t> pos_map_queue;
-
 public:
 	RageSoundManager();
 	~RageSoundManager();
@@ -70,7 +53,26 @@ public:
 	static void AttenuateBuf( int16_t *buf, int samples, float vol );
 
 private:
+	/* Set of sounds that we've taken over (and are responsible for deleting
+	 * when they're finished playing): */
+	set<RageSound *> owned_sounds;
+
+	/* A list of all sounds that currently exist, by ID. */
+	map<int,RageSound *> all_sounds;
+	
+	RageSoundDriver *driver;
+
+	/* Prefs: */
+	float MixVolume;
+	struct queued_pos_map_t
+	{
+		int ID, pos, got_frames;
+		int64_t frameno;
+	};
+
+	CircBuf<queued_pos_map_t> pos_map_queue;
 	void FlushPosMapQueue();
+
 	RageSound *GetSoundByID( int ID );
 };