X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.h;h=f1cd4aeb80eafa004851d66aa875f0bfb739d1f2;hb=6d37ddaaf9915af0f483f4fc04d07b98e99e091e;hp=896bef06971a5f2ee3f4fb9886ea688e4a577983;hpb=1101077a226b09854650662759bf12caf7c84f8d;p=rocksndiamonds.git diff --git a/src/libgame/sound.h b/src/libgame/sound.h index 896bef06..f1cd4aeb 100644 --- a/src/libgame/sound.h +++ b/src/libgame/sound.h @@ -36,6 +36,10 @@ #include "system.h" +#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL) +#define AUDIO_UNIX_NATIVE +#endif + #if defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) || defined(VOXWARE) #define AUDIO_LINUX_IOCTL #endif @@ -52,8 +56,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) */ @@ -66,7 +76,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 @@ -76,23 +91,26 @@ #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_MIDDLE 0 @@ -114,6 +132,7 @@ #endif +#if 0 #define PSND_NO_LOOP 0 #define PSND_LOOP 1 #define PSND_MUSIC 2 @@ -133,6 +152,10 @@ #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 @@ -157,6 +180,10 @@ #endif #endif +/* value for undefined sound effect filename */ +#define SND_FILE_UNDEFINED "NONE" + + #if 0 struct SoundHeader_SUN { @@ -176,67 +203,104 @@ struct SoundHeader_8SVX }; #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 *source_filename; - int type; + char *source_filename; + int num_references; - void *data_ptr; 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 IS_MUSIC_MODULE(x) ((x).format == AUDIO_FORMAT_UNKNOWN) +#define ALL_SOUNDS(x) ((x).state & SND_CTRL_ALL_SOUNDS) + struct SoundControl { + boolean active; + int nr; int volume; int stereo; - boolean active; - boolean loop; - boolean music; - boolean fade_sound; - boolean stop_sound; - boolean stop_all_sounds; - boolean reload_sounds; - boolean reload_music; + int state; int playingtime; long playingpos; long data_len; - byte *data_ptr; + void *data_ptr; + int format; #if defined(PLATFORM_MSDOS) int voice; #endif }; +typedef struct SoundControl SoundControl; + /* general sound functions */ void UnixOpenAudio(void); void UnixCloseAudio(void); -/* sound server functions */ -void InitPlaylist(void); -void StartSoundserver(void); -void SoundServer(void); +/* mixer functions */ +void Mixer_InitChannels(void); +void StartMixer(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 PlaySoundLoop(int); void PlaySoundMusic(int); -void PlaySoundExt(int, int, int, boolean); +void PlaySoundExt(int, int, int, int); void FadeMusic(void); void FadeSound(int); void FadeSounds(void); @@ -244,10 +308,9 @@ void StopMusic(void); void StopSound(int); void StopSounds(void); void StopSoundExt(int, int); +void InitSoundList(struct SoundEffectInfo *, int); void InitReloadSounds(char *); void InitReloadMusic(char *); -void FreeSound(SoundInfo *); -void FreeMusic(MusicInfo *); void FreeAllSounds(void); void FreeAllMusic(void);