X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsound.h;h=28d7ba21ef2d8c89099d165c9138e07655cf3fb4;hb=4bca9bc5f299a9b287134b06e41b147f506792b4;hp=6eb0dad26bf408e5371c6deded9c7d39c34ac260;hpb=2a66260e017880b41a1ffb93f7de12e4d4d83f0f;p=rocksndiamonds.git diff --git a/src/sound.h b/src/sound.h index 6eb0dad2..28d7ba21 100644 --- a/src/sound.h +++ b/src/sound.h @@ -45,14 +45,14 @@ extern void ioctl(long, long, void *); #define HPUX_AUDIO #endif /* _HPUX_SOURCE */ -#ifndef MSDOS +#if !defined(PLATFORM_MSDOS) #define MAX_SOUNDS_PLAYING 16 #else #define MAX_SOUNDS_PLAYING 8 #endif /* some values for PlaySound(), StopSound() and friends */ -#ifndef MSDOS +#if !defined(PLATFORM_MSDOS) #define PSND_SILENCE 0 #define PSND_MAX_VOLUME_BITS 7 #define PSND_MIN_VOLUME 0 @@ -131,11 +131,11 @@ struct SoundInfo byte *data_ptr; long data_len; -#ifdef MSDOS +#if defined(PLATFORM_MSDOS) SAMPLE *sample_ptr; #endif -#ifdef USE_SDL_LIBRARY +#if defined(TARGET_SDL) Mix_Chunk *mix_chunk; #endif }; @@ -154,16 +154,21 @@ struct SoundControl long playingpos; long data_len; byte *data_ptr; -#ifdef MSDOS + +#if defined(PLATFORM_MSDOS) int voice; #endif }; -/* start sound server */ +/* general sound functions */ int OpenAudio(char *); +int CheckAudio(char *); +boolean UnixInitAudio(void); + +/* sound server functions */ void SoundServer(void); -/* client functions */ +/* sound client functions */ boolean LoadSound(struct SoundInfo *); void PlaySound(int); void PlaySoundStereo(int, int);