X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.h;h=8481f3684e8ab26dae7fd9adbc6193ecca11b3cd;hb=20414a1c99e248151e43daf6ef5433e943afddd6;hp=63cab3365dd65ca1eaa5337f028f867036dc1416;hpb=8c373c85183bd059717b0a53ffb97dd472bd6741;p=rocksndiamonds.git

diff --git a/src/libgame/sound.h b/src/libgame/sound.h
index 63cab336..8481f368 100644
--- 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
@@ -179,13 +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
 { 
   int type;
   char *source_filename;
+  int num_references;
 
   long data_len;
   void *data_ptr;
+  int format;
 };
 
 typedef struct SampleInfo	SoundInfo;
@@ -211,6 +233,7 @@ struct SoundControl
 
   long data_len;
   void *data_ptr;
+  int format;
 
 #if defined(PLATFORM_MSDOS)
   int voice;
@@ -227,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);
@@ -246,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);