projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020501-2-src
[rocksndiamonds.git]
/
src
/
libgame
/
sound.h
diff --git
a/src/libgame/sound.h
b/src/libgame/sound.h
index 63cab3365dd65ca1eaa5337f028f867036dc1416..b2461ef536c087824975a38435ce904e7c9028b0 100644
(file)
--- a/
src/libgame/sound.h
+++ b/
src/libgame/sound.h
@@
-55,6
+55,11
@@
#define AUDIO_MONO_CHANNEL 1
#define AUDIO_STEREO_CHANNELS 2
#define AUDIO_MONO_CHANNEL 1
#define AUDIO_STEREO_CHANNELS 2
+#define AUDIO_FORMAT_U8 (1 << 0)
+#define AUDIO_FORMAT_S16 (1 << 1)
+#define AUDIO_FORMAT_LE (1 << 2)
+#define AUDIO_FORMAT_BE (1 << 3)
+
#if defined(TARGET_SDL)
/* one second fading interval == 1000 ticks (milliseconds) */
#define SOUND_FADING_INTERVAL 1000
#if defined(TARGET_SDL)
/* one second fading interval == 1000 ticks (milliseconds) */
#define SOUND_FADING_INTERVAL 1000
@@
-160,6
+165,10
@@
#endif
#endif
#endif
#endif
+/* value for undefined sound effect filename */
+#define SND_FILE_UNDEFINED "NONE"
+
+
#if 0
struct SoundHeader_SUN
{
#if 0
struct SoundHeader_SUN
{
@@
-179,13
+188,30
@@
struct SoundHeader_8SVX
};
#endif
};
#endif
+struct AudioFormatInfo
+{
+ boolean stereo; /* availability of stereo sound */
+ int format; /* size and endianess of sample data */
+ int sample_rate; /* sample frequency */
+ int fragment_size; /* audio device fragment size in bytes */
+};
+
+struct SoundEffectInfo
+{
+ char *text;
+ char *default_filename;
+ char *filename;
+};
+
struct SampleInfo
{
int type;
char *source_filename;
struct SampleInfo
{
int type;
char *source_filename;
+ int num_references;
long data_len;
void *data_ptr;
long data_len;
void *data_ptr;
+ int format;
};
typedef struct SampleInfo SoundInfo;
};
typedef struct SampleInfo SoundInfo;
@@
-211,6
+237,7
@@
struct SoundControl
long data_len;
void *data_ptr;
long data_len;
void *data_ptr;
+ int format;
#if defined(PLATFORM_MSDOS)
int voice;
#if defined(PLATFORM_MSDOS)
int voice;
@@
-227,12
+254,6
@@
void StartSoundserver(void);
void SoundServer(void);
/* sound client functions */
void SoundServer(void);
/* sound client functions */
-void ReloadSounds(char *);
-void ReloadMusic(char *);
-SoundInfo *LoadCustomSound(char *);
-void InitSoundList(int);
-void LoadSoundToList(char *, int);
-void LoadCustomMusic(void);
void PlayMusic(int);
void PlaySound(int);
void PlaySoundStereo(int, int);
void PlayMusic(int);
void PlaySound(int);
void PlaySoundStereo(int, int);
@@
-246,10
+267,9
@@
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 SoundEffectInfo *, int);
void InitReloadSounds(char *);
void InitReloadMusic(char *);
void InitReloadSounds(char *);
void InitReloadMusic(char *);
-void FreeSound(SoundInfo *);
-void FreeMusic(MusicInfo *);
void FreeAllSounds(void);
void FreeAllMusic(void);
void FreeAllSounds(void);
void FreeAllMusic(void);