X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.h;h=3e392a599d02fe1e949d866839f195b8d97bdd00;hb=edaa850fd2d2cae7ec31961fae3d56487e710c71;hp=a2a6599936b86e56b0ebfeb734a5d5802d5beb63;hpb=b641818c787e48bbf03ce2a0cd5b542c4c21e523;p=rocksndiamonds.git

diff --git a/src/libgame/sound.h b/src/libgame/sound.h
index a2a65999..3e392a59 100644
--- a/src/libgame/sound.h
+++ b/src/libgame/sound.h
@@ -17,6 +17,7 @@
 
 // values for platform specific sound initialization
 #define AUDIO_SAMPLE_RATE_22050		22050
+#define AUDIO_SAMPLE_RATE_44100		44100
 
 #define AUDIO_FRAGMENT_SIZE_512		512
 #define AUDIO_FRAGMENT_SIZE_1024	1024
@@ -35,7 +36,7 @@
 
 #define DEFAULT_AUDIO_SAMPLE_RATE	AUDIO_SAMPLE_RATE_22050
 
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
 #define DEFAULT_AUDIO_FRAGMENT_SIZE	AUDIO_FRAGMENT_SIZE_1024
 #else
 #define DEFAULT_AUDIO_FRAGMENT_SIZE	AUDIO_FRAGMENT_SIZE_512
@@ -101,6 +102,8 @@ void UnixCloseAudio(void);
 void Mixer_InitChannels(void);
 void StartMixer(void);
 
+boolean isSoundPlaying(int);
+
 // sound client functions
 void PlayMusic(int);
 void PlayMusicLoop(int);
@@ -122,8 +125,10 @@ void ExpireSoundLoops(boolean);
 
 int getSoundListSize(void);
 int getMusicListSize(void);
+int getMusicListSize_NoConf(void);
 struct FileInfo *getSoundListEntry(int);
 struct FileInfo *getMusicListEntry(int);
+char *getSoundInfoEntryFilename(int);
 char *getMusicInfoEntryFilename(int);
 char *getCurrentlyPlayingMusicFilename(void);
 int getSoundListPropertyMappingSize(void);
@@ -134,8 +139,8 @@ 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 InitReloadCustomSounds(void);
+void InitReloadCustomMusic(void);
 void FreeAllSounds(void);
 void FreeAllMusic(void);