projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20031129-3-src
[rocksndiamonds.git]
/
src
/
libgame
/
sound.h
diff --git
a/src/libgame/sound.h
b/src/libgame/sound.h
index feb41d4739eaf020a73c7ea3ea3b165797874791..b4bcafcf81921f0c354cb0424c1e972affccf956 100644
(file)
--- a/
src/libgame/sound.h
+++ b/
src/libgame/sound.h
@@
-57,7
+57,7
@@
#if defined(PLATFORM_HPUX)
#define DEFAULT_AUDIO_FRAGMENT_SIZE AUDIO_FRAGMENT_SIZE_32768
#elif 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
+#define DEFAULT_AUDIO_FRAGMENT_SIZE AUDIO_FRAGMENT_SIZE_
1024
#else
#define DEFAULT_AUDIO_FRAGMENT_SIZE AUDIO_FRAGMENT_SIZE_512
#endif
#else
#define DEFAULT_AUDIO_FRAGMENT_SIZE AUDIO_FRAGMENT_SIZE_512
#endif
@@
-135,17
+135,24
@@
void PlaySoundExt(int, int, int, int);
void FadeMusic(void);
void FadeSound(int);
void FadeSounds(void);
void FadeMusic(void);
void FadeSound(int);
void FadeSounds(void);
+void FadeSoundsAndMusic(void);
void StopMusic(void);
void StopSound(int);
void StopSounds(void);
void StopSoundExt(int, int);
int getSoundListSize();
void StopMusic(void);
void StopSound(int);
void StopSounds(void);
void StopSoundExt(int, int);
int getSoundListSize();
+int getMusicListSize();
struct FileInfo *getSoundListEntry(int);
struct FileInfo *getSoundListEntry(int);
+struct FileInfo *getMusicListEntry(int);
int getSoundListPropertyMappingSize();
int getSoundListPropertyMappingSize();
+int getMusicListPropertyMappingSize();
struct PropertyMapping *getSoundListPropertyMapping();
struct PropertyMapping *getSoundListPropertyMapping();
+struct PropertyMapping *getMusicListPropertyMapping();
void InitSoundList(struct ConfigInfo *, int, struct ConfigInfo *,
char **, char **, char **, char **, char **);
void InitSoundList(struct ConfigInfo *, int, struct ConfigInfo *,
char **, char **, char **, char **, char **);
+void InitMusicList(struct ConfigInfo *, int, struct ConfigInfo *,
+ char **, char **, char **, char **, char **);
void InitReloadCustomSounds(char *);
void InitReloadCustomMusic(char *);
void FreeAllSounds(void);
void InitReloadCustomSounds(char *);
void InitReloadCustomMusic(char *);
void FreeAllSounds(void);