X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.h;h=feb41d4739eaf020a73c7ea3ea3b165797874791;hb=07bd1f7e496e8914d56ec4422b33492b8f66b1d0;hp=310d7b851307e7cb14711736ca18ba00a232b5db;hpb=68a47a5b92e7c62a8c8a06391e4f9b8d53eeb82f;p=rocksndiamonds.git diff --git a/src/libgame/sound.h b/src/libgame/sound.h index 310d7b85..feb41d47 100644 --- a/src/libgame/sound.h +++ b/src/libgame/sound.h @@ -37,6 +37,7 @@ #define AUDIO_FRAGMENT_SIZE_1024 1024 #define AUDIO_FRAGMENT_SIZE_2048 2048 #define AUDIO_FRAGMENT_SIZE_4096 4096 +#define AUDIO_FRAGMENT_SIZE_32768 32768 #define AUDIO_NUM_CHANNELS_MONO 1 #define AUDIO_NUM_CHANNELS_STEREO 2 @@ -53,7 +54,9 @@ #define DEFAULT_AUDIO_SAMPLE_RATE AUDIO_SAMPLE_RATE_22050 #endif -#if defined(PLATFORM_WIN32) +#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 #else #define DEFAULT_AUDIO_FRAGMENT_SIZE AUDIO_FRAGMENT_SIZE_512 @@ -113,9 +116,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); @@ -139,10 +139,15 @@ void StopMusic(void); void StopSound(int); void StopSounds(void); void StopSoundExt(int, int); -struct FileInfo *getCurrentSoundList(); -void InitSoundList(struct ConfigInfo *, struct ConfigInfo *, int); -void InitReloadSounds(char *); -void InitReloadMusic(char *); + +int getSoundListSize(); +struct FileInfo *getSoundListEntry(int); +int getSoundListPropertyMappingSize(); +struct PropertyMapping *getSoundListPropertyMapping(); +void InitSoundList(struct ConfigInfo *, int, struct ConfigInfo *, + char **, char **, char **, char **, char **); +void InitReloadCustomSounds(char *); +void InitReloadCustomMusic(char *); void FreeAllSounds(void); void FreeAllMusic(void);