rnd-20020424-1-src

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

diff --git a/src/libgame/sound.h b/src/libgame/sound.h
index aef0aa2e0dd22d129f35bfbbaac40e24a0ceeb7f..896bef06971a5f2ee3f4fb9886ea688e4a577983 100644 (file)
--- a/src/libgame/sound.h
+++ b/src/libgame/sound.h
@@ -90,12 +90,11 @@
 
 /* some values for PlaySound(), StopSound() and friends */
 #if !defined(PLATFORM_MSDOS)
+
 #define PSND_SILENCE           0
 #define PSND_MAX_VOLUME_BITS   7
 #define PSND_MIN_VOLUME                0
 #define PSND_MAX_VOLUME                (1 << PSND_MAX_VOLUME_BITS)
-#define PSND_NO_LOOP           0
-#define PSND_LOOP              1
 #define PSND_MIDDLE            0
 #define PSND_MAX_STEREO_BITS   7
 #define PSND_MAX_STEREO                (1 << PSND_MAX_STEREO_BITS)
@@ -103,24 +102,43 @@
 #define PSND_MAX_RIGHT         (+PSND_MAX_STEREO)
 #define PSND_MAX_LEFT2RIGHT_BITS (PSND_MAX_STEREO_BITS+1)
 #define PSND_MAX_LEFT2RIGHT    (1 << PSND_MAX_LEFT2RIGHT_BITS)
-#else
+
+#else  /* PLATFORM_MSDOS */
+
 #define PSND_SILENCE           0
 #define PSND_MIN_VOLUME                0
 #define PSND_MAX_VOLUME                255
-#define PSND_NO_LOOP           0
-#define PSND_LOOP              1
 #define PSND_MAX_LEFT          0
 #define PSND_MAX_RIGHT         255
 #define PSND_MIDDLE            128
+
 #endif
 
-#define SSND_FADE_SOUND                (1<<0)
-#define SSND_FADE_ALL_SOUNDS   (1<<1)
-#define SSND_FADING(x)         (x & (SSND_FADE_SOUND | SSND_FADE_ALL_SOUNDS))
-#define SSND_STOP_SOUND                (1<<2)
-#define SSND_STOP_ALL_SOUNDS   (1<<3)
-#define SSND_STOPPING(x)       (x & (SSND_STOP_SOUND | SSND_STOP_ALL_SOUNDS))
-#define SSND_ALL(x)            (x&(SSND_FADE_ALL_SOUNDS|SSND_STOP_ALL_SOUNDS))
+#define PSND_NO_LOOP           0
+#define PSND_LOOP              1
+#define PSND_MUSIC             2
+
+#define SSND_FADE_SOUND                (1 << 0)
+#define SSND_FADE_MUSIC                (1 << 1)
+#define SSND_FADE_ALL          (1 << 2)
+#define SSND_FADING            (SSND_FADE_SOUND | \
+                                SSND_FADE_MUSIC | \
+                                SSND_FADE_ALL)
+#define SSND_STOP_SOUND                (1 << 3)
+#define SSND_STOP_MUSIC                (1 << 4)
+#define SSND_STOP_ALL          (1 << 5)
+#define SSND_STOPPING          (SSND_STOP_SOUND | \
+                                SSND_STOP_MUSIC | \
+                                SSND_STOP_ALL)
+#define SSND_MUSIC             (SSND_FADE_MUSIC | SSND_STOP_MUSIC)
+#define SSND_ALL               (SSND_FADE_ALL | SSND_STOP_ALL)
+
+#define SND_TYPE_NONE          0
+#define SND_TYPE_WAV           1
+
+#define MUS_TYPE_NONE          0
+#define MUS_TYPE_WAV           1
+#define MUS_TYPE_MOD           2
 
 /* settings for sound path, sound device, etc. */
 #ifndef SND_PATH
@@ -160,33 +178,35 @@ struct SoundHeader_8SVX
 
 struct SampleInfo
 { 
-  byte *data_ptr;
-  long data_len;
+  char *source_filename;
 
-#if defined(PLATFORM_MSDOS)
-  SAMPLE *sample_ptr;
-#endif
+  int type;
 
-#if defined(TARGET_SDL)
-  Mix_Chunk *mix_chunk;
-  Mix_Music *mix_music;
-#endif
+  void *data_ptr;
+  long data_len;
 };
 
+typedef struct SampleInfo      SoundInfo;
+typedef struct SampleInfo      MusicInfo;
+
 struct SoundControl
 {
   int nr;
   int volume;
   int stereo;
+
   boolean active;
   boolean loop;
+  boolean music;
   boolean fade_sound;
   boolean stop_sound;
   boolean stop_all_sounds;
   boolean reload_sounds;
   boolean reload_music;
+
   int playingtime;
   long playingpos;
+
   long data_len;
   byte *data_ptr;
 
@@ -207,12 +227,15 @@ void SoundServer(void);
 /* sound client functions */
 void ReloadSounds(void);
 void ReloadMusic(void);
-boolean LoadCustomSound(char *);
-int LoadCustomMusic(void);
+SoundInfo *LoadCustomSound(char *);
+void InitSoundList(int);
+void LoadSoundToList(char *, int);
+void LoadCustomMusic(void);
 void PlayMusic(int);
 void PlaySound(int);
 void PlaySoundStereo(int, int);
 void PlaySoundLoop(int);
+void PlaySoundMusic(int);
 void PlaySoundExt(int, int, int, boolean);
 void FadeMusic(void);
 void FadeSound(int);
@@ -223,6 +246,9 @@ void StopSounds(void);
 void StopSoundExt(int, int);
 void InitReloadSounds(char *);
 void InitReloadMusic(char *);
-void FreeSounds(int);
+void FreeSound(SoundInfo *);
+void FreeMusic(MusicInfo *);
+void FreeAllSounds(void);
+void FreeAllMusic(void);
 
 #endif