X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsound.h;h=5ad49a929e247fad2ceced08ce79ba47a0f25c21;hp=939e5a0045bfc718bdeb2ff9b99f90bc350db22f;hb=40bb242e83c3e4df5da57a052d42e1d2c37bf69d;hpb=868a1c69992bb641676a9e6eee5e7308cd02ecde diff --git a/src/libgame/sound.h b/src/libgame/sound.h index 939e5a00..5ad49a92 100644 --- a/src/libgame/sound.h +++ b/src/libgame/sound.h @@ -26,6 +26,9 @@ #include #elif defined(PLATFORM_FREEBSD) #include +#elif defined(PLATFORM_NETBSD) +#include +#include #elif defined(PLATFORM_HPUX) #include #endif @@ -34,6 +37,10 @@ #if defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) || defined(VOXWARE) +#define AUDIO_LINUX_IOCTL +#endif + +#if defined(AUDIO_LINUX_IOCTL) || defined(PLATFORM_NETBSD) #define AUDIO_STREAMING_DSP #endif @@ -45,8 +52,14 @@ #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_UNKNOWN (0) +#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) */ @@ -59,7 +72,12 @@ #define SOUND_FADING_VOLUME_THRESHOLD (SOUND_FADING_VOLUME_STEP * 2) #endif +#if defined(AUDIO_STREAMING_DSP) #define DEFAULT_AUDIO_SAMPLE_RATE AUDIO_SAMPLE_RATE_22050 +#else +#define DEFAULT_AUDIO_SAMPLE_RATE AUDIO_SAMPLE_RATE_8000 +#endif + #define DEFAULT_AUDIO_FRAGMENT_SIZE_UNIX AUDIO_FRAGMENT_SIZE_512 #define DEFAULT_AUDIO_FRAGMENT_SIZE_WIN32 AUDIO_FRAGMENT_SIZE_2048 @@ -69,26 +87,28 @@ #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 -#define MAX_SOUNDS_PLAYING 8 +#define NUM_MIXER_CHANNELS 8 #endif +#define MUSIC_CHANNEL 0 +#define FIRST_SOUND_CHANNEL 1 + #if !defined(PLATFORM_HPUX) -#define SND_BLOCKSIZE 4096 +#define SND_BLOCKSIZE 4096 #else -#define SND_BLOCKSIZE 32768 +#define SND_BLOCKSIZE 32768 #endif /* some values for PlaySound(), StopSound() and friends */ #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_NO_LOOP 0 -#define PSND_LOOP 1 #define PSND_MIDDLE 0 #define PSND_MAX_STEREO_BITS 7 #define PSND_MAX_STEREO (1 << PSND_MAX_STEREO_BITS) @@ -96,24 +116,48 @@ #define PSND_MAX_RIGHT (+PSND_MAX_STEREO) #define PSND_MAX_LEFT2RIGHT_BITS (PSND_MAX_STEREO_BITS+1) #define PSND_MAX_LEFT2RIGHT (1 << PSND_MAX_LEFT2RIGHT_BITS) -#else + +#else /* PLATFORM_MSDOS */ + #define PSND_SILENCE 0 #define PSND_MIN_VOLUME 0 #define PSND_MAX_VOLUME 255 -#define PSND_NO_LOOP 0 -#define PSND_LOOP 1 #define PSND_MAX_LEFT 0 #define PSND_MAX_RIGHT 255 #define PSND_MIDDLE 128 + #endif -#define SSND_FADE_SOUND (1<<0) -#define SSND_FADE_ALL_SOUNDS (1<<1) -#define SSND_FADING(x) (x & (SSND_FADE_SOUND | SSND_FADE_ALL_SOUNDS)) -#define SSND_STOP_SOUND (1<<2) -#define SSND_STOP_ALL_SOUNDS (1<<3) -#define SSND_STOPPING(x) (x & (SSND_STOP_SOUND | SSND_STOP_ALL_SOUNDS)) -#define SSND_ALL(x) (x&(SSND_FADE_ALL_SOUNDS|SSND_STOP_ALL_SOUNDS)) +#if 0 +#define PSND_NO_LOOP 0 +#define PSND_LOOP 1 +#define PSND_MUSIC 2 + +#define SSND_FADE_SOUND (1 << 0) +#define SSND_FADE_MUSIC (1 << 1) +#define SSND_FADE_ALL (1 << 2) +#define SSND_FADING (SSND_FADE_SOUND | \ + SSND_FADE_MUSIC | \ + SSND_FADE_ALL) +#define SSND_STOP_SOUND (1 << 3) +#define SSND_STOP_MUSIC (1 << 4) +#define SSND_STOP_ALL (1 << 5) +#define SSND_STOPPING (SSND_STOP_SOUND | \ + SSND_STOP_MUSIC | \ + 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 +#endif + +#define SND_TYPE_NONE 0 +#define SND_TYPE_WAV 1 + +#define MUS_TYPE_NONE 0 +#define MUS_TYPE_WAV 1 +#define MUS_TYPE_MOD 2 /* settings for sound path, sound device, etc. */ #ifndef SND_PATH @@ -132,6 +176,11 @@ #endif #endif +/* value for undefined sound effect filename */ +#define SND_FILE_UNDEFINED "NONE" + + +#if 0 struct SoundHeader_SUN { unsigned long magic; @@ -148,37 +197,92 @@ struct SoundHeader_8SVX unsigned long chunk_size; char magic_8SVX[4]; }; +#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 { - char *name; - byte *data_ptr; - long data_len; - -#if defined(PLATFORM_MSDOS) - SAMPLE *sample_ptr; -#endif + int type; + char *source_filename; + int num_references; -#if defined(TARGET_SDL) - Mix_Chunk *mix_chunk; - Mix_Music *mix_music; -#endif + long data_len; + void *data_ptr; + int format; }; +typedef struct SampleInfo SoundInfo; +typedef struct SampleInfo MusicInfo; + +#define SND_CTRL_NONE (0) +#define SND_CTRL_MUSIC (1 << 0) +#define SND_CTRL_LOOP (1 << 1) +#define SND_CTRL_FADE (1 << 2) +#define SND_CTRL_STOP (1 << 3) +#define SND_CTRL_ALL_SOUNDS (1 << 4) +#define SND_CTRL_RELOAD_SOUNDS (1 << 5) +#define SND_CTRL_RELOAD_MUSIC (1 << 6) + +#define SND_CTRL_PLAY_SOUND (SND_CTRL_NONE) +#define SND_CTRL_PLAY_LOOP (SND_CTRL_LOOP) +#define SND_CTRL_PLAY_MUSIC (SND_CTRL_LOOP | SND_CTRL_MUSIC) + +#define SND_CTRL_FADE_SOUND (SND_CTRL_FADE) +#define SND_CTRL_FADE_MUSIC (SND_CTRL_FADE | SND_CTRL_MUSIC) +#define SND_CTRL_FADE_ALL (SND_CTRL_FADE | SND_CTRL_ALL_SOUNDS) + +#define SND_CTRL_STOP_SOUND (SND_CTRL_STOP) +#define SND_CTRL_STOP_MUSIC (SND_CTRL_STOP | SND_CTRL_MUSIC) +#define SND_CTRL_STOP_ALL (SND_CTRL_STOP | SND_CTRL_ALL_SOUNDS) + +#define IS_MUSIC(x) ((x).state & SND_CTRL_MUSIC) +#define IS_LOOP(x) ((x).state & SND_CTRL_LOOP) +#define IS_FADING(x) ((x).state & SND_CTRL_FADE) +#define IS_STOPPING(x) ((x).state & SND_CTRL_STOP) +#define IS_RELOADING(x) ((x).state & (SND_CTRL_RELOAD_SOUNDS | \ + SND_CTRL_RELOAD_MUSIC)) +#define ALL_SOUNDS(x) ((x).state & SND_CTRL_ALL_SOUNDS) + struct SoundControl { + boolean active; + int nr; int volume; int stereo; - boolean active; + +#if 1 + int state; +#else boolean loop; + boolean music; boolean fade_sound; boolean stop_sound; boolean stop_all_sounds; + boolean reload_sounds; + boolean reload_music; +#endif + int playingtime; long playingpos; + long data_len; - byte *data_ptr; + void *data_ptr; + int format; #if defined(PLATFORM_MSDOS) int voice; @@ -195,14 +299,12 @@ void StartSoundserver(void); void SoundServer(void); /* sound client functions */ -boolean LoadSound(char *); -boolean LoadMod(char *); -int LoadMusic(void); void PlayMusic(int); void PlaySound(int); void PlaySoundStereo(int, int); void PlaySoundLoop(int); -void PlaySoundExt(int, int, int, boolean); +void PlaySoundMusic(int); +void PlaySoundExt(int, int, int, int); void FadeMusic(void); void FadeSound(int); void FadeSounds(void); @@ -210,6 +312,10 @@ void StopMusic(void); void StopSound(int); void StopSounds(void); void StopSoundExt(int, int); -void FreeSounds(int); +void InitSoundList(struct SoundEffectInfo *, int); +void InitReloadSounds(char *); +void InitReloadMusic(char *); +void FreeAllSounds(void); +void FreeAllMusic(void); #endif