X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.h;h=ca1e26a6009dc1cc98750396cb2ac7ea2de89299;hb=216566521353a144d859e1d93d326934996d85a0;hp=6bebb5dc936c32f6338d18b595b130dc5adc43b2;hpb=ff2510f5098b545a03965c6b95296eec6885a4fb;p=rocksndiamonds.git

diff --git a/src/libgame/sound.h b/src/libgame/sound.h
index 6bebb5dc..ca1e26a6 100644
--- a/src/libgame/sound.h
+++ b/src/libgame/sound.h
@@ -57,7 +57,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,6 +102,10 @@
 						      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
@@ -116,9 +120,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,17 +139,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);
 
 int getSoundListSize();
+int getMusicListSize();
 struct FileInfo *getSoundListEntry(int);
+struct FileInfo *getMusicListEntry(int);
 int getSoundListPropertyMappingSize();
+int getMusicListPropertyMappingSize();
 struct PropertyMapping *getSoundListPropertyMapping();
-void InitSoundList(struct ConfigInfo *, int, struct ConfigInfo *,
-		   char **, char **, char **, char **);
+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);