rnd-20020430-3-src

[rocksndiamonds.git] / src / libgame / sound.h

diff --git a/src/libgame/sound.h b/src/libgame/sound.h
index ebca45f5eb6be619b2ed1a69998ca7d654ea8dea..8481f3684e8ab26dae7fd9adbc6193ecca11b3cd 100644 (file)
--- a/src/libgame/sound.h
+++ b/src/libgame/sound.h
@@ -55,6 +55,11 @@
 #define AUDIO_MONO_CHANNEL                     1
 #define AUDIO_STEREO_CHANNELS                  2
 
+#define AUDIO_FORMAT_U8                                (1 << 0)
+#define AUDIO_FORMAT_S16                       (1 << 1)
+#define AUDIO_FORMAT_LE                                (1 << 2)
+#define AUDIO_FORMAT_BE                                (1 << 3)
+
 #if defined(TARGET_SDL)
 /* one second fading interval == 1000 ticks (milliseconds) */
 #define SOUND_FADING_INTERVAL                  1000
@@ -92,7 +97,7 @@
 #if !defined(PLATFORM_MSDOS)
 
 #define PSND_SILENCE           0
-#define PSND_MAX_VOLUME_BITS   7
+#define PSND_MAX_VOLUME_BITS   15
 #define PSND_MIN_VOLUME                0
 #define PSND_MAX_VOLUME                (1 << PSND_MAX_VOLUME_BITS)
 #define PSND_MIDDLE            0
@@ -179,14 +184,30 @@ struct SoundHeader_8SVX
 };
 #endif
 
+struct AudioFormatInfo
+{
+  boolean stereo;              /* availability of stereo sound */
+  int format;                  /* size and endianess of sample data */
+  int sample_rate;             /* sample frequency */
+  int fragment_size;           /* audio device fragment size in bytes */
+};
+
+struct SoundEffectInfo
+{
+  char *text;
+  char *default_filename;
+  char *filename;
+};
+
 struct SampleInfo
 { 
-  char *source_filename;
-
   int type;
+  char *source_filename;
+  int num_references;
 
-  void *data_ptr;
   long data_len;
+  void *data_ptr;
+  int format;
 };
 
 typedef struct SampleInfo      SoundInfo;
@@ -210,8 +231,9 @@ struct SoundControl
   int playingtime;
   long playingpos;
 
-  unsigned long data_len;
-  byte *data_ptr;
+  long data_len;
+  void *data_ptr;
+  int format;
 
 #if defined(PLATFORM_MSDOS)
   int voice;
@@ -228,12 +250,6 @@ void StartSoundserver(void);
 void SoundServer(void);
 
 /* sound client functions */
-void ReloadSounds(char *);
-void ReloadMusic(char *);
-SoundInfo *LoadCustomSound(char *);
-void InitSoundList(int);
-void LoadSoundToList(char *, int);
-void LoadCustomMusic(void);
 void PlayMusic(int);
 void PlaySound(int);
 void PlaySoundStereo(int, int);
@@ -247,10 +263,9 @@ void StopMusic(void);
 void StopSound(int);
 void StopSounds(void);
 void StopSoundExt(int, int);
+void InitSoundList(struct SoundEffectInfo *, int);
 void InitReloadSounds(char *);
 void InitReloadMusic(char *);
-void FreeSound(SoundInfo *);
-void FreeMusic(MusicInfo *);
 void FreeAllSounds(void);
 void FreeAllMusic(void);