projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020508-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
sound.h
diff --git
a/src/libgame/sound.h
b/src/libgame/sound.h
index 896bef06971a5f2ee3f4fb9886ea688e4a577983..310308a88e6747c18c024c50a2c46f5e45dc0d00 100644
(file)
--- a/
src/libgame/sound.h
+++ b/
src/libgame/sound.h
@@
-52,8
+52,13
@@
#define AUDIO_FRAGMENT_SIZE_2048 2048
#define AUDIO_FRAGMENT_SIZE_4096 4096
#define AUDIO_FRAGMENT_SIZE_2048 2048
#define AUDIO_FRAGMENT_SIZE_4096 4096
-#define AUDIO_MONO_CHANNEL 1
-#define AUDIO_STEREO_CHANNELS 2
+#define AUDIO_NUM_CHANNELS_MONO 1
+#define AUDIO_NUM_CHANNELS_STEREO 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) */
#if defined(TARGET_SDL)
/* one second fading interval == 1000 ticks (milliseconds) */
@@
-76,10
+81,10
@@
#define DEFAULT_AUDIO_FRAGMENT_SIZE DEFAULT_AUDIO_FRAGMENT_SIZE_WIN32
#endif
#define DEFAULT_AUDIO_FRAGMENT_SIZE DEFAULT_AUDIO_FRAGMENT_SIZE_WIN32
#endif
-#if
!defined(PLATFORM_MSDOS
)
-#define
MAX_SOUNDS_PLAYING 16
+#if
defined(TARGET_SDL
)
+#define
NUM_MIXER_CHANNELS MIX_CHANNELS
#else
#else
-#define
MAX_SOUNDS_PLAYING
8
+#define
NUM_MIXER_CHANNELS
8
#endif
#if !defined(PLATFORM_HPUX)
#endif
#if !defined(PLATFORM_HPUX)
@@
-92,7
+97,7
@@
#if !defined(PLATFORM_MSDOS)
#define PSND_SILENCE 0
#if !defined(PLATFORM_MSDOS)
#define PSND_SILENCE 0
-#define PSND_MAX_VOLUME_BITS
7
+#define PSND_MAX_VOLUME_BITS
15
#define PSND_MIN_VOLUME 0
#define PSND_MAX_VOLUME (1 << PSND_MAX_VOLUME_BITS)
#define PSND_MIDDLE 0
#define PSND_MIN_VOLUME 0
#define PSND_MAX_VOLUME (1 << PSND_MAX_VOLUME_BITS)
#define PSND_MIDDLE 0
@@
-133,6
+138,9
@@
#define SSND_MUSIC (SSND_FADE_MUSIC | SSND_STOP_MUSIC)
#define SSND_ALL (SSND_FADE_ALL | SSND_STOP_ALL)
#define SSND_MUSIC (SSND_FADE_MUSIC | SSND_STOP_MUSIC)
#define SSND_ALL (SSND_FADE_ALL | SSND_STOP_ALL)
+#define SND_RELOAD_SOUNDS 1
+#define SND_RELOAD_MUSIC 2
+
#define SND_TYPE_NONE 0
#define SND_TYPE_WAV 1
#define SND_TYPE_NONE 0
#define SND_TYPE_WAV 1
@@
-157,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
{
@@
-176,14
+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
{
struct SampleInfo
{
- char *source_filename;
-
int type;
int type;
+ char *source_filename;
+ int num_references;
- void *data_ptr;
long data_len;
long data_len;
+ void *data_ptr;
+ int format;
};
typedef struct SampleInfo SoundInfo;
};
typedef struct SampleInfo SoundInfo;
@@
-208,7
+236,8
@@
struct SoundControl
long playingpos;
long data_len;
long playingpos;
long data_len;
- byte *data_ptr;
+ void *data_ptr;
+ int format;
#if defined(PLATFORM_MSDOS)
int voice;
#if defined(PLATFORM_MSDOS)
int voice;
@@
-225,12
+254,6
@@
void StartSoundserver(void);
void SoundServer(void);
/* sound client functions */
void SoundServer(void);
/* sound client functions */
-void ReloadSounds(void);
-void ReloadMusic(void);
-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);
@@
-244,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);