X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.h;h=e6a8a20a352b3ca7f8480f4370451b2e17f011c4;hb=2e99b0c26d334eb287486b8933b52b5048c6cc0c;hp=89e5405934f90f4a0f438600379696a8686bf914;hpb=ba0568bc8d5b8b3d081691b8e987f2b66a4c13e6;p=rocksndiamonds.git

diff --git a/src/libgame/sound.h b/src/libgame/sound.h
index 89e54059..e6a8a20a 100644
--- a/src/libgame/sound.h
+++ b/src/libgame/sound.h
@@ -1,7 +1,7 @@
 /***********************************************************
 * Artsoft Retro-Game Library                               *
 *----------------------------------------------------------*
-* (c) 1994-2002 Artsoft Entertainment                      *
+* (c) 1994-2006 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -17,10 +17,6 @@
 #include "system.h"
 
 
-#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
-#define AUDIO_UNIX_NATIVE
-#endif
-
 #if defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) || defined(VOXWARE)
 #define AUDIO_LINUX_IOCTL
 #endif
@@ -57,7 +53,7 @@
 #if defined(PLATFORM_HPUX)
 #define DEFAULT_AUDIO_FRAGMENT_SIZE	AUDIO_FRAGMENT_SIZE_32768
 #elif defined(PLATFORM_WIN32)
-#define DEFAULT_AUDIO_FRAGMENT_SIZE	AUDIO_FRAGMENT_SIZE_2048
+#define DEFAULT_AUDIO_FRAGMENT_SIZE	AUDIO_FRAGMENT_SIZE_1024
 #else
 #define DEFAULT_AUDIO_FRAGMENT_SIZE	AUDIO_FRAGMENT_SIZE_512
 #endif
@@ -102,11 +98,13 @@
 						      SND_CTRL_RELOAD_MUSIC))
 #define ALL_SOUNDS(x)			((x).state & SND_CTRL_ALL_SOUNDS)
 
+#define MAP_NOCONF_MUSIC(x)		(-((x) + 1))
+#define UNMAP_NOCONF_MUSIC(x)		MAP_NOCONF_MUSIC(x)
+
+
 #define SOUND_MIN_VOLUME		0
 #if defined(TARGET_SDL)
 #define SOUND_MAX_VOLUME		SDL_MIX_MAXVOLUME
-#elif defined(TARGET_ALLEGRO)
-#define SOUND_MAX_VOLUME		255
 #else
 #define SOUND_MAX_VOLUME		128
 #endif
@@ -116,9 +114,6 @@
 #define SOUND_MAX_LEFT2RIGHT		255
 #define SOUND_MIDDLE			(SOUND_MAX_LEFT2RIGHT / 2)
 
-/* value for undefined sound effect filename */
-#define SND_FILE_UNDEFINED		UNDEFINED_FILENAME
-
 
 /* general sound functions */
 void UnixOpenAudio(void);
@@ -138,13 +133,24 @@ void PlaySoundExt(int, int, int, int);
 void FadeMusic(void);
 void FadeSound(int);
 void FadeSounds(void);
+void FadeSoundsAndMusic(void);
 void StopMusic(void);
 void StopSound(int);
 void StopSounds(void);
 void StopSoundExt(int, int);
-struct FileInfo *getCurrentSoundList();
-void InitSoundList(struct ConfigInfo *, int, struct ConfigInfo *,
-		   char **, char **, char **);
+
+int getSoundListSize();
+int getMusicListSize();
+struct FileInfo *getSoundListEntry(int);
+struct FileInfo *getMusicListEntry(int);
+int getSoundListPropertyMappingSize();
+int getMusicListPropertyMappingSize();
+struct PropertyMapping *getSoundListPropertyMapping();
+struct PropertyMapping *getMusicListPropertyMapping();
+void InitSoundList(struct ConfigInfo *, int, struct ConfigTypeInfo *,
+		   char **, char **, char **, char **, char **);
+void InitMusicList(struct ConfigInfo *, int, struct ConfigTypeInfo *,
+		   char **, char **, char **, char **, char **);
 void InitReloadCustomSounds(char *);
 void InitReloadCustomMusic(char *);
 void FreeAllSounds(void);