more OSystem docs & cleanup

svn-id: r8118

14 files changed, 14 insertions, 15 deletions

diff --git a/backends/PalmOS/Src/palm.cpp b/backends/PalmOS/Src/palm.cpp
index 6d46ce31de..5ee9a9628a 100644
--- a/backends/PalmOS/Src/palm.cpp
+++ b/backends/PalmOS/Src/palm.cpp
@@ -1112,7 +1112,7 @@ void OSystem_PALMOS::move_screen(int dx, int dy, int height) {
 	SysTaskDelay(1); // prevent crash on Clie device using successive [HR]WinScrollRectangle !
 }
 
-bool OSystem_PALMOS::set_sound_proc(void *param, SoundProc *proc, byte format) {
+bool OSystem_PALMOS::set_sound_proc(SoundProc *proc, void *param, SoundFormat format) {
 
 	_sound.active = true;
 	_sound.proc = proc;
diff --git a/backends/PalmOS/Src/palm.h b/backends/PalmOS/Src/palm.h
index fcfb2014a7..d561080564 100644
--- a/backends/PalmOS/Src/palm.h
+++ b/backends/PalmOS/Src/palm.h
@@ -86,7 +86,7 @@ public:
 	void SimulateArrowKeys(Event *event, Int8 iHoriz, Int8 iVert, Boolean repeat);
 
 	// Set function that generates samples 
-	bool set_sound_proc(void *param, SoundProc *proc, byte sound);
+	bool set_sound_proc(SoundProc *proc, void *param, SoundFormat format);
 
 	// Poll cdrom status
 	// Returns true if cd audio is playing
diff --git a/backends/dc/audio.cpp b/backends/dc/audio.cpp
index 0b0cb8c639..526d8cbbef 100644
--- a/backends/dc/audio.cpp
+++ b/backends/dc/audio.cpp
@@ -34,8 +34,7 @@ void initSound()
   do_sound_command(CMD_SET_BUFFER(3));
 }
 
-bool OSystem_Dreamcast::set_sound_proc(void *param, SoundProc *proc,
-				       byte format)
+bool OSystem_Dreamcast::set_sound_proc(SoundProc *proc, void *param, SoundFormat format)
 {
 #if SAMPLE_MODE == 0
   assert(format == SOUND_16BIT);
diff --git a/backends/dc/dc.h b/backends/dc/dc.h
index 5dff783657..56cdb8dd00 100644
--- a/backends/dc/dc.h
+++ b/backends/dc/dc.h
@@ -48,7 +48,7 @@ class OSystem_Dreamcast : public OSystem {
   bool poll_event(Event *event);
   
   // Set function that generates samples 
-  bool set_sound_proc(void *param, SoundProc *proc, byte sound);
+  bool set_sound_proc(SoundProc *proc, void *param, SoundFormat format);
 		
   // Poll cdrom status
   // Returns true if cd audio is playing
diff --git a/backends/gp32/gp32.cpp b/backends/gp32/gp32.cpp
index 62b10b9a95..cb62c227ba 100644
--- a/backends/gp32/gp32.cpp
+++ b/backends/gp32/gp32.cpp
@@ -980,7 +980,7 @@ bool OSystem_GP32::poll_event(Event *event) { 	// fixme: make more user-friendly
 // Set the function to be invoked whenever samples need to be generated
 // Format is the sample type format.
 // Only 16-bit signed mode is needed for simon & scumm
-bool OSystem_GP32::set_sound_proc(void *param, SoundProc *proc, byte format) { 
+bool OSystem_GP32::set_sound_proc(SoundProc *proc, void *param, SoundFormat format) { 
 	return false; 
 }
 
diff --git a/backends/gp32/gp32.h b/backends/gp32/gp32.h
index 686ece4f27..825eeccb51 100644
--- a/backends/gp32/gp32.h
+++ b/backends/gp32/gp32.h
@@ -80,7 +80,7 @@ public:
 	// Set the function to be invoked whenever samples need to be generated
 	// Format is the sample type format.
 	// Only 16-bit signed mode is needed for simon & scumm
-	bool set_sound_proc(void *param, SoundProc *proc, byte format);
+	bool set_sound_proc(SoundProc *proc, void *param, SoundFormat format);
 	
 	// Get or set a property
 	uint32 property(int param, Property *value);
diff --git a/backends/morphos/morphos.cpp b/backends/morphos/morphos.cpp
index 34dde38f3f..2c9674101d 100644
--- a/backends/morphos/morphos.cpp
+++ b/backends/morphos/morphos.cpp
@@ -1404,7 +1404,7 @@ void OSystem_MorphOS::set_mouse_cursor(const byte *buf, uint w, uint h, int hots
 	UndrawMouse();
 }
 
-bool OSystem_MorphOS::set_sound_proc(void *param, OSystem::SoundProc *proc, byte format)
+bool OSystem_MorphOS::set_sound_proc(OSystem::SoundProc *proc, void *param, OSystem::SoundFormat format)
 {
 	SoundProc = proc;
 	SoundParam = param;
diff --git a/backends/morphos/morphos.h b/backends/morphos/morphos.h
index 6327edd647..2fed3dae28 100644
--- a/backends/morphos/morphos.h
+++ b/backends/morphos/morphos.h
@@ -99,7 +99,7 @@ class OSystem_MorphOS : public OSystem
 		virtual void warp_mouse(int x, int y);
 
 		// Set the function to be invoked whenever samples need to be generated
-		virtual bool set_sound_proc(void *param, SoundProc *proc, byte format);
+		virtual bool set_sound_proc(SoundProc *proc, void *param, SoundFormat format);
 				  void fill_sound    (byte * stream, int len);
 
 		virtual uint32 property(int param, Property *value);
diff --git a/backends/null/null.cpp b/backends/null/null.cpp
index 4878ebeffa..8098445a89 100644
--- a/backends/null/null.cpp
+++ b/backends/null/null.cpp
@@ -42,7 +42,7 @@ public:
 	void delay_msecs(uint msecs);
 	void create_thread(ThreadProc *proc, void *param) { }
 	bool poll_event(Event *event) { return false; }
-	bool set_sound_proc(void *param, SoundProc *proc, byte sound) {}
+	bool set_sound_proc(SoundProc *proc, void *param, SoundFormat format) {}
 	void quit() { exit(1); }
 	uint32 property(int param, Property *value) { return 0; }
 	static OSystem *create(int gfx_mode, bool full_screen);
diff --git a/backends/sdl/sdl-common.cpp b/backends/sdl/sdl-common.cpp
index f9096c098c..9970d20b13 100644
--- a/backends/sdl/sdl-common.cpp
+++ b/backends/sdl/sdl-common.cpp
@@ -827,7 +827,7 @@ bool OSystem_SDL_Common::poll_event(Event *event) {
 	return false;
 }
 
-bool OSystem_SDL_Common::set_sound_proc(void *param, SoundProc *proc, byte /* format */) {
+bool OSystem_SDL_Common::set_sound_proc(SoundProc *proc, void *param, SoundFormat format) {
 	SDL_AudioSpec desired;
 
 	memset(&desired, 0, sizeof(desired));
diff --git a/backends/sdl/sdl-common.h b/backends/sdl/sdl-common.h
index 71a44d46f6..89d28a8087 100644
--- a/backends/sdl/sdl-common.h
+++ b/backends/sdl/sdl-common.h
@@ -78,7 +78,7 @@ public:
 	bool poll_event(Event *event);
 
 	// Set function that generates samples 
-	bool set_sound_proc(void *param, SoundProc *proc, byte sound);
+	bool set_sound_proc(SoundProc *proc, void *param, SoundFormat format);
 
 	// Poll CD status
 	// Returns true if cd audio is playing
diff --git a/backends/wince/wince.cpp b/backends/wince/wince.cpp
index 6db546172e..967b6d9070 100644
--- a/backends/wince/wince.cpp
+++ b/backends/wince/wince.cpp
@@ -1673,7 +1673,7 @@ void own_soundProc(void *buffer, byte *samples, int len) {
 		memset(samples, 0, len);
 }
 
-bool OSystem_WINCE3::set_sound_proc(void *param, SoundProc *proc, byte format) {
+bool OSystem_WINCE3::set_sound_proc(SoundProc *proc, void *param, SoundFormat format) {
 	SDL_AudioSpec desired;
 
 	/* only one format supported at the moment */
diff --git a/backends/wince/wince.h b/backends/wince/wince.h
index 9af0e4e81b..1b369caeed 100644
--- a/backends/wince/wince.h
+++ b/backends/wince/wince.h
@@ -116,7 +116,7 @@ public:
 	bool poll_event(Event *event);
 	
 	// Set function that generates samples 
-	bool set_sound_proc(void *param, SoundProc *proc, byte sound);
+	bool set_sound_proc(SoundProc *proc, void *param, SoundFormat format);
 		
 	// Poll cdrom status
 	// Returns true if cd audio is playing
diff --git a/backends/x11/x11.cpp b/backends/x11/x11.cpp
index 106b0e7138..1f467a550c 100644
--- a/backends/x11/x11.cpp
+++ b/backends/x11/x11.cpp
@@ -96,7 +96,7 @@ public:
 	bool poll_event(Event *event);
 
 	// Set function that generates samples 
-	bool set_sound_proc(void *param, SoundProc *proc, byte sound);
+	bool set_sound_proc(SoundProc *proc, void *param, SoundFormat format);
 
 	// Poll cdrom status
 	// Returns true if cd audio is playing