Split off some of the s_sound.c code into i_sound.c and reimplement the

old low-level sound API as a thin wrapper around the module system.
Decouple the low-level code from the high-level code.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1212

1 files changed, 1 insertions, 62 deletions

diff --git a/src/doom/sounds.h b/src/doom/sounds.h
index 325d1d63..3d190910 100644
--- a/src/doom/sounds.h
+++ b/src/doom/sounds.h
@@ -28,68 +28,7 @@
 #ifndef __SOUNDS__
 #define __SOUNDS__
 
-
-//
-// SoundFX struct.
-//
-typedef struct sfxinfo_struct	sfxinfo_t;
-
-struct sfxinfo_struct
-{
-    // up to 6-character name
-    char*	name;
-
-    // Sfx singularity (only one at a time)
-    int		singularity;
-
-    // Sfx priority
-    int		priority;
-
-    // referenced sound if a link
-    sfxinfo_t*	link;
-
-    // pitch if a link
-    int		pitch;
-
-    // volume if a link
-    int		volume;
-
-    // sound data
-    void*	data;
-
-    // this is checked every second to see if sound
-    // can be thrown out (if 0, then decrement, if -1,
-    // then throw out, if > 0, then it is in use)
-    int		usefulness;
-
-    // lump number of sfx
-    int		lumpnum;		
-};
-
-
-
-
-//
-// MusicInfo struct.
-//
-typedef struct
-{
-    // up to 6-character name
-    char*	name;
-
-    // lump number of music
-    int		lumpnum;
-    
-    // music data
-    void*	data;
-
-    // music handle once registered
-    void *handle;
-    
-} musicinfo_t;
-
-
-
+#include "i_sound.h"
 
 // the complete set of sound effects
 extern sfxinfo_t	S_sfx[];