projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030110-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
sound.h
diff --git
a/src/libgame/sound.h
b/src/libgame/sound.h
index a018ec91d23e0798a3b032ade7b1395e6ad8b5b2..dcc41eac55e93113fc7bb76a70b07ccd23ae9c8c 100644
(file)
--- a/
src/libgame/sound.h
+++ b/
src/libgame/sound.h
@@
-14,7
+14,7
@@
#ifndef SOUND_H
#define SOUND_H
#ifndef SOUND_H
#define SOUND_H
-#include "
platfor
m.h"
+#include "
syste
m.h"
#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
#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_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
#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
#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
#define DEFAULT_AUDIO_FRAGMENT_SIZE AUDIO_FRAGMENT_SIZE_2048
#else
#define DEFAULT_AUDIO_FRAGMENT_SIZE AUDIO_FRAGMENT_SIZE_512
@@
-139,7
+142,8
@@
void StopMusic(void);
void StopSound(int);
void StopSounds(void);
void StopSoundExt(int, int);
void StopSound(int);
void StopSounds(void);
void StopSoundExt(int, int);
-void InitSoundList(struct ArtworkConfigInfo *, int);
+struct FileInfo *getCurrentSoundList();
+void InitSoundList(struct ConfigInfo *, struct ConfigInfo *, int);
void InitReloadSounds(char *);
void InitReloadMusic(char *);
void FreeAllSounds(void);
void InitReloadSounds(char *);
void InitReloadMusic(char *);
void FreeAllSounds(void);