Split i_sound.c into i_sdlsound.c, i_sdlmusic.c, with generic "sound

driver" modules, one for PC speaker and one for digital output.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 913

1 files changed, 44 insertions, 0 deletions

diff --git a/src/s_sound.h b/src/s_sound.h
index c5460aed..8a5e2c6c 100644
--- a/src/s_sound.h
+++ b/src/s_sound.h
@@ -28,6 +28,8 @@
 #ifndef __S_SOUND__
 #define __S_SOUND__
 
+#include "p_mobj.h"
+#include "sounds.h"
 
 typedef enum 
 {
@@ -43,8 +45,50 @@ typedef enum
     SNDDEVICE_AWE32 = 9,
 } snddevice_t;
 
+typedef struct
+{
+    snddevice_t *sound_devices;
+    int num_sound_devices;
+
+    // Initialise sound module
+    // Returns true if successfully initialised
+
+    boolean (*Init)(void);
+
+    // Shutdown sound module
+
+    void (*Shutdown)(void);
+
+    // Returns the lump index of the given sound.
+
+    int (*GetSfxLumpNum)(sfxinfo_t *sfxinfo);
+
+    // Called periodically to update the subsystem.
+
+    void (*Update)(void);
+
+    // Update the sound settings on the given channel.
+
+    void (*UpdateSoundParams)(int channel, int vol, int sep);
+
+    // Start a sound on a given channel.  Returns the channel id
+    // or -1 on failure.
+
+    int (*StartSound)(int id, int channel, int vol, int sep);
+
+    // Stop the sound playing on the given channel.
+
+    void (*StopSound)(int channel);
+
+    // Query if a sound is playing on the given channel
+
+    boolean (*SoundIsPlaying)(int channel);
+
+} sound_module_t;
+
 extern int snd_sfxdevice;
 extern int snd_musicdevice;
+extern int snd_samplerate;
 
 //
 // Initializes sound stuff, including volume