X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.h;h=8305588db9344fc41865752903707b904c16d625;hb=5bb4dba95d27f31aaa4a060c0efef70c671ebd7e;hp=a2a6599936b86e56b0ebfeb734a5d5802d5beb63;hpb=b641818c787e48bbf03ce2a0cd5b542c4c21e523;p=rocksndiamonds.git diff --git a/src/libgame/sound.h b/src/libgame/sound.h index a2a65999..8305588d 100644 --- a/src/libgame/sound.h +++ b/src/libgame/sound.h @@ -35,7 +35,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 +101,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 +124,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 +138,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);