X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.h;h=3ca946fb1257bdf45f12e035c6cd8da8938d2a66;hb=fd72fbf3b83fc7215347e131aa6fc3c87ad7b4d5;hp=190c441e735e24fc002b2e957d79d239c7a31ee9;hpb=c8689f0335cd584d24570046c6eb5a3b75701305;p=rocksndiamonds.git diff --git a/src/libgame/sound.h b/src/libgame/sound.h index 190c441e..3ca946fb 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 @@ -33,7 +34,7 @@ #define AUDIO_FORMAT_LE (1 << 2) #define AUDIO_FORMAT_BE (1 << 3) -#define DEFAULT_AUDIO_SAMPLE_RATE AUDIO_SAMPLE_RATE_22050 +#define DEFAULT_AUDIO_SAMPLE_RATE AUDIO_SAMPLE_RATE_44100 #if defined(PLATFORM_WINDOWS) #define DEFAULT_AUDIO_FRAGMENT_SIZE AUDIO_FRAGMENT_SIZE_1024 @@ -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);