1 files changed, 24 insertions, 10 deletions
diff --git a/src/i_sound.h b/src/i_sound.h
index e0162a77..53d3ef66 100644
--- a/src/i_sound.h
+++ b/src/i_sound.h
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: i_sound.h 73 2005-09-05 20:32:18Z fraggle $
+// $Id: i_sound.h 75 2005-09-05 22:50:56Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -91,27 +91,37 @@ I_UpdateSoundParams
 //
 //  MUSIC I/O
 //
+
 void I_InitMusic(void);
 void I_ShutdownMusic(void);
+
 // Volume.
+
 void I_SetMusicVolume(int volume);
+
 // PAUSE game handling.
-void I_PauseSong(int handle);
-void I_ResumeSong(int handle);
+
+void I_PauseSong(void *handle);
+void I_ResumeSong(void *handle);
+
 // Registers a song handle to song data.
-int I_RegisterSong(void *data);
+
+void *I_RegisterSong(void *data, int length);
+
 // Called by anything that wishes to start music.
 //  plays a song, and when the song is done,
 //  starts playing it again in an endless loop.
 // Horrible thing to do, considering.
-void
-I_PlaySong
-( int		handle,
-  int		looping );
+
+void I_PlaySong(void *handle, int looping);
+
 // Stops a song over 3 seconds.
-void I_StopSong(int handle);
+
+void I_StopSong(void *handle);
+
 // See above (register), then think backwards
-void I_UnRegisterSong(int handle);
+
+void I_UnRegisterSong(void *handle);
 
 
 
@@ -119,6 +129,10 @@ void I_UnRegisterSong(int handle);
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.5  2005/09/05 22:50:56  fraggle
+// Add mmus2mid code from prboom.  Use 'void *' for music handles.  Pass
+// length of data when registering music.
+//
 // Revision 1.4  2005/09/05 20:32:18  fraggle
 // Use the system-nonspecific sound code to assign the channel number used
 // by SDL.  Remove handle tagging stuff.