projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed indentation (no functional change) (more)
[rocksndiamonds.git]
/
src
/
libgame
/
sound.h
diff --git
a/src/libgame/sound.h
b/src/libgame/sound.h
index 9f6c754c0e37f2d04e5bd1a71d12c718fc558204..3ca946fb1257bdf45f12e035c6cd8da8938d2a66 100644
(file)
--- 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
// 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
#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 AUDIO_FORMAT_LE (1 << 2)
#define AUDIO_FORMAT_BE (1 << 3)
-#define DEFAULT_AUDIO_SAMPLE_RATE AUDIO_SAMPLE_RATE_
2205
0
+#define DEFAULT_AUDIO_SAMPLE_RATE AUDIO_SAMPLE_RATE_
4410
0
#if defined(PLATFORM_WINDOWS)
#define DEFAULT_AUDIO_FRAGMENT_SIZE AUDIO_FRAGMENT_SIZE_1024
#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);
void Mixer_InitChannels(void);
void StartMixer(void);
+boolean isSoundPlaying(int);
+
// sound client functions
void PlayMusic(int);
void PlayMusicLoop(int);
// sound client functions
void PlayMusic(int);
void PlayMusicLoop(int);
@@
-122,6
+125,7
@@
void ExpireSoundLoops(boolean);
int getSoundListSize(void);
int getMusicListSize(void);
int getSoundListSize(void);
int getMusicListSize(void);
+int getMusicListSize_NoConf(void);
struct FileInfo *getSoundListEntry(int);
struct FileInfo *getMusicListEntry(int);
char *getSoundInfoEntryFilename(int);
struct FileInfo *getSoundListEntry(int);
struct FileInfo *getMusicListEntry(int);
char *getSoundInfoEntryFilename(int);