X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.h;h=45905aab9ac0a265c0fe4d804b2e8ec8f7c2e501;hb=ee0895b12e544444db37febb1242bcc8a72d6ad8;hp=ec5a2a8b8c2a0a13d7382cb4a7e5a6dd73dfe72f;hpb=c9433eab5c4317ed4f89164b386a7d33562e29be;p=rocksndiamonds.git

diff --git a/src/libgame/sound.h b/src/libgame/sound.h
index ec5a2a8b..45905aab 100644
--- a/src/libgame/sound.h
+++ b/src/libgame/sound.h
@@ -14,7 +14,7 @@
 #ifndef SOUND_H
 #define SOUND_H
 
-#include "platform.h"
+#include "system.h"
 
 
 #if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
@@ -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
@@ -114,16 +117,7 @@
 #define SOUND_MIDDLE			(SOUND_MAX_LEFT2RIGHT / 2)
 
 /* value for undefined sound effect filename */
-#define SND_FILE_UNDEFINED		"NONE"
-
-
-struct SoundEffectInfo
-{
-  char *text;
-  char *default_filename;
-
-  char *filename;
-};
+#define SND_FILE_UNDEFINED		UNDEFINED_FILENAME
 
 
 /* general sound functions */
@@ -148,9 +142,10 @@ void StopMusic(void);
 void StopSound(int);
 void StopSounds(void);
 void StopSoundExt(int, int);
-void InitSoundList(struct SoundEffectInfo *, int);
-void InitReloadSounds(char *);
-void InitReloadMusic(char *);
+struct FileInfo *getCurrentSoundList();
+void InitSoundList(struct ConfigInfo *, struct ConfigInfo *, int);
+void InitReloadCustomSounds(char *);
+void InitReloadCustomMusic(char *);
 void FreeAllSounds(void);
 void FreeAllMusic(void);