rnd-20020508-1-src

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

diff --git a/src/libgame/sound.h b/src/libgame/sound.h
index 8481f3684e8ab26dae7fd9adbc6193ecca11b3cd..310308a88e6747c18c024c50a2c46f5e45dc0d00 100644 (file)
--- a/src/libgame/sound.h
+++ b/src/libgame/sound.h
@@ -52,8 +52,8 @@
 #define AUDIO_FRAGMENT_SIZE_2048               2048
 #define AUDIO_FRAGMENT_SIZE_4096               4096
 
-#define AUDIO_MONO_CHANNEL                     1
-#define AUDIO_STEREO_CHANNELS                  2
+#define AUDIO_NUM_CHANNELS_MONO                        1
+#define AUDIO_NUM_CHANNELS_STEREO              2
 
 #define AUDIO_FORMAT_U8                                (1 << 0)
 #define AUDIO_FORMAT_S16                       (1 << 1)
@@ -81,10 +81,10 @@
 #define DEFAULT_AUDIO_FRAGMENT_SIZE    DEFAULT_AUDIO_FRAGMENT_SIZE_WIN32
 #endif
 
-#if !defined(PLATFORM_MSDOS)
-#define MAX_SOUNDS_PLAYING                     16
+#if defined(TARGET_SDL)
+#define NUM_MIXER_CHANNELS                     MIX_CHANNELS
 #else
-#define MAX_SOUNDS_PLAYING                     8
+#define NUM_MIXER_CHANNELS                     8
 #endif
 
 #if !defined(PLATFORM_HPUX)
@@ -165,6 +165,10 @@
 #endif
 #endif
 
+/* value for undefined sound effect filename */
+#define SND_FILE_UNDEFINED     "NONE"
+
+
 #if 0
 struct SoundHeader_SUN
 {