-1,0,0, FALSE,FALSE,FALSE,FALSE,FALSE, 0,0L,0L,NULL
};
-#ifndef MSDOS
+#if defined(PLATFORM_UNIX)
static int stereo_volume[PSND_MAX_LEFT2RIGHT+1];
static char premix_first_buffer[SND_BLOCKSIZE];
-#ifdef VOXWARE
+#if defined(AUDIO_STREAMING_DSP)
static char premix_left_buffer[SND_BLOCKSIZE];
static char premix_right_buffer[SND_BLOCKSIZE];
static int premix_last_buffer[SND_BLOCKSIZE];
-#endif /* VOXWARE */
+#endif
static unsigned char playing_buffer[SND_BLOCKSIZE];
-#endif /* MSDOS */
+#endif
/* forward declaration of internal functions */
-#ifdef VOXWARE
+#if defined(AUDIO_STREAMING_DSP)
static void SoundServer_InsertNewSound(struct SoundControl);
-#endif
-#ifndef VOXWARE
+#elif defined(PLATFORM_UNIX)
static unsigned char linear_to_ulaw(int);
static int ulaw_to_linear(unsigned char);
#endif
-#ifdef HPUX_AUDIO
+
+#if defined(PLATFORM_HPUX)
static void HPUX_Audio_Control();
#endif
-#ifdef MSDOS
+
+#if defined(PLATFORM_MSDOS)
static void SoundServer_InsertNewSound(struct SoundControl);
static void SoundServer_StopSound(int);
static void SoundServer_StopAllSounds();
#endif
+#if defined(PLATFORM_UNIX)
+int OpenAudioDevice(char *audio_device_name)
+{
+ int audio_fd;
+
+ /* check if desired audio device is accessible */
+ if (access(sound_device_name, W_OK) != 0)
+ return -1;
+
+ /* try to open audio device in non-blocking mode */
+ if ((audio_fd = open(audio_device_name, O_WRONLY | O_NONBLOCK)) < 0)
+ return audio_fd;
+
+ /* re-open audio device in blocking mode */
+ close(audio_fd);
+ audio_fd = open(audio_device_name, O_WRONLY);
+
+ return audio_fd;
+}
+
+void UnixOpenAudio(struct AudioSystemInfo *audio)
+{
+ static char *audio_device_name[] =
+ {
+ DEVICENAME_DSP,
+ DEVICENAME_AUDIO
+ };
+ int audio_fd;
+ int i;
+
+ /* look for available audio devices, starting with preferred ones */
+ for (i=0; i<sizeof(audio_device_name)/sizeof(char *); i++)
+ if ((audio_fd = OpenAudioDevice(sound_device_name)) >= 0)
+ break;
+
+ if (audio_fd < 0)
+ {
+ Error(ERR_WARN, "cannot open audio device - no sound");
+ return;
+ }
+
+ close(audio_fd);
+
+ audio->sound_available = TRUE;
+
+#if defined(AUDIO_STREAMING_DSP)
+ audio->loops_available = TRUE;
+#endif
+}
+
+void UnixCloseAudio(struct AudioSystemInfo *audio)
+{
+ if (audio->device_fd)
+ close(audio->device_fd);
+}
+
+#endif /* PLATFORM_UNIX */
+
void SoundServer()
{
int i;
-#ifndef MSDOS
+#if defined(PLATFORM_UNIX)
struct SoundControl snd_ctrl;
fd_set sound_fdset;
- close(sound_pipe[1]); /* no writing into pipe needed */
+ close(audio.soundserver_pipe[1]); /* no writing into pipe needed */
#endif
for(i=0;i<MAX_SOUNDS_PLAYING;i++)
playlist[i] = emptySoundControl;
playing_sounds = 0;
-#ifndef MSDOS
+#if defined(PLATFORM_UNIX)
stereo_volume[PSND_MAX_LEFT2RIGHT] = 0;
for(i=0;i<PSND_MAX_LEFT2RIGHT;i++)
stereo_volume[i] =
(int)sqrt((float)(PSND_MAX_LEFT2RIGHT*PSND_MAX_LEFT2RIGHT-i*i));
-#ifdef HPUX_AUDIO
+#if defined(PLATFORM_HPUX)
HPUX_Audio_Control();
#endif
FD_ZERO(&sound_fdset);
- FD_SET(sound_pipe[0], &sound_fdset);
+ FD_SET(audio.soundserver_pipe[0], &sound_fdset);
while(1) /* wait for sound playing commands from client */
{
- FD_SET(sound_pipe[0], &sound_fdset);
- select(sound_pipe[0]+1, &sound_fdset, NULL, NULL, NULL);
- if (!FD_ISSET(sound_pipe[0], &sound_fdset))
+ FD_SET(audio.soundserver_pipe[0], &sound_fdset);
+ select(audio.soundserver_pipe[0] + 1, &sound_fdset, NULL, NULL, NULL);
+ if (!FD_ISSET(audio.soundserver_pipe[0], &sound_fdset))
continue;
- if (read(sound_pipe[0], &snd_ctrl, sizeof(snd_ctrl)) != sizeof(snd_ctrl))
+ if (read(audio.soundserver_pipe[0], &snd_ctrl, sizeof(snd_ctrl))
+ != sizeof(snd_ctrl))
Error(ERR_EXIT_SOUND_SERVER, "broken pipe - no sounds");
-#ifdef VOXWARE
+#if defined(AUDIO_STREAMING_DSP)
if (snd_ctrl.fade_sound)
{
playlist[i]=emptySoundControl;
playing_sounds=0;
- close(sound_device);
+ close(audio.device_fd);
}
else if (snd_ctrl.stop_sound)
{
}
if (!playing_sounds)
- close(sound_device);
+ close(audio.device_fd);
}
if (playing_sounds || snd_ctrl.active)
long sample_size;
static long max_sample_size = 0;
static long fragment_size = 0;
- boolean stereo;
+ /* Even if the stereo flag is used as being boolean, it must be
+ defined as an integer, else 'ioctl()' will fail! */
+ int stereo = TRUE;
+#if 0
+ int sample_rate = 8000;
+#else
+ int sample_rate = 22050;
+#endif
- if (playing_sounds || (sound_device=open(sound_device_name,O_WRONLY))>=0)
+ if (playing_sounds ||
+ (audio.device_fd = OpenAudioDevice(sound_device_name)) >= 0)
{
if (!playing_sounds) /* we just opened the audio device */
{
/* 2 buffers / 512 bytes, giving 1/16 second resolution */
/* (with stereo the effective buffer size will shrink to 256) */
fragment_size = 0x00020009;
- ioctl(sound_device, SNDCTL_DSP_SETFRAGMENT, &fragment_size);
+
+ if (ioctl(audio.device_fd,SNDCTL_DSP_SETFRAGMENT,&fragment_size) < 0)
+ Error(ERR_EXIT_SOUND_SERVER,
+ "cannot set fragment size of /dev/dsp - no sounds");
+
/* try if we can use stereo sound */
- stereo = TRUE;
- ioctl(sound_device, SNDCTL_DSP_STEREO, &stereo);
+ if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0)
+ {
+#ifdef DEBUG
+ static boolean reported = FALSE;
+
+ if (!reported)
+ {
+ Error(ERR_RETURN, "cannot get stereo sound on /dev/dsp");
+ reported = TRUE;
+ }
+#endif
+ stereo = FALSE;
+ }
+
+ if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &sample_rate) < 0)
+ Error(ERR_EXIT_SOUND_SERVER,
+ "cannot set sample rate of /dev/dsp - no sounds");
+
/* get the real fragmentation size; this should return 512 */
- ioctl(sound_device, SNDCTL_DSP_GETBLKSIZE, &fragment_size);
+ if (ioctl(audio.device_fd, SNDCTL_DSP_GETBLKSIZE,&fragment_size) < 0)
+ Error(ERR_EXIT_SOUND_SERVER,
+ "cannot get fragment size of /dev/dsp - no sounds");
+
max_sample_size = fragment_size / (stereo ? 2 : 1);
}
SoundServer_InsertNewSound(snd_ctrl);
while(playing_sounds &&
- select(sound_pipe[0]+1,&sound_fdset,NULL,NULL,&delay)<1)
+ select(audio.soundserver_pipe[0] + 1,
+ &sound_fdset, NULL, NULL, &delay) < 1)
{
- FD_SET(sound_pipe[0], &sound_fdset);
+ FD_SET(audio.soundserver_pipe[0], &sound_fdset);
/* first clear the last premixing buffer */
memset(premix_last_buffer,0,fragment_size*sizeof(int));
}
/* finally play the sound fragment */
- write(sound_device,playing_buffer,fragment_size);
+ write(audio.device_fd, playing_buffer,fragment_size);
}
/* if no sounds playing, free device for other sound programs */
if (!playing_sounds)
- close(sound_device);
+ close(audio.device_fd);
}
}
-#else /* !VOXWARE */
+#else /* !AUDIO_STREAMING_DSP */
if (snd_ctrl.active && !snd_ctrl.loop)
{
int wait_percent = 90; /* wait 90% of the real playing time */
int i;
- if ((sound_device=open(sound_device_name,O_WRONLY))>=0)
+ if ((audio.device_fd = OpenAudioDevice(sound_device_name)) >= 0)
{
playing_sounds = 1;
while(playing_sounds &&
- select(sound_pipe[0]+1,&sound_fdset,NULL,NULL,&delay)<1)
+ select(audio.soundserver_pipe[0] + 1,
+ &sound_fdset, NULL, NULL, &delay) < 1)
{
- FD_SET(sound_pipe[0], &sound_fdset);
+ FD_SET(audio.soundserver_pipe[0], &sound_fdset);
/* get pointer and size of the actual sound sample */
sample_ptr = snd_ctrl.data_ptr + snd_ctrl.playingpos;
playing_sounds = 0;
/* finally play the sound fragment */
- write(sound_device,playing_buffer,sample_size);
+ write(audio.device_fd,playing_buffer,sample_size);
delay.tv_sec = 0;
delay.tv_usec = ((sample_size*10*wait_percent)/(sample_rate))*1000;
}
- close(sound_device);
+ close(audio.device_fd);
}
}
-#endif /* !VOXWARE */
+#endif /* !AUDIO_STREAMING_DSP */
}
-#endif /* !MSDOS */
+
+#endif /* PLATFORM_UNIX */
+
}
-#ifdef MSDOS
+#if defined(PLATFORM_MSDOS)
static void sound_handler(struct SoundControl snd_ctrl)
{
int i;
if (snd_ctrl.active)
SoundServer_InsertNewSound(snd_ctrl);
}
-#endif /* MSDOS */
+#endif /* PLATFORM_MSDOS */
+#if !defined(PLATFORM_WIN32)
static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
{
int i, k;
for(i=0;i<MAX_SOUNDS_PLAYING;i++)
{
-#ifndef MSDOS
+#if !defined(PLATFORM_MSDOS)
int actual = 100 * playlist[i].playingpos / playlist[i].data_len;
#else
int actual = playlist[i].playingpos;
longest_nr=i;
}
}
-#ifdef MSDOS
+#if defined(PLATFORM_MSDOS)
voice_set_volume(playlist[longest_nr].voice, 0);
deallocate_voice(playlist[longest_nr].voice);
#endif
{
playlist[i].fade_sound = FALSE;
playlist[i].volume = PSND_MAX_VOLUME;
-#ifdef MSDOS
+#if defined(PLATFORM_MSDOS)
playlist[i].loop = PSND_LOOP;
voice_stop_volumeramp(playlist[i].voice);
voice_ramp_volume(playlist[i].voice, playlist[i].volume, 1000);
if (!playlist[i].active || playlist[i].nr != snd_ctrl.nr)
continue;
-#ifndef MSDOS
+#if !defined(PLATFORM_MSDOS)
actual = 100 * playlist[i].playingpos / playlist[i].data_len;
#else
actual = playlist[i].playingpos;
longest_nr=i;
}
}
-#ifdef MSDOS
+
+#if defined(PLATFORM_MSDOS)
voice_set_volume(playlist[longest_nr].voice, 0);
deallocate_voice(playlist[longest_nr].voice);
#endif
{
playlist[i] = snd_ctrl;
playing_sounds++;
-#ifdef MSDOS
+
+#if defined(PLATFORM_MSDOS)
playlist[i].voice = allocate_voice(Sound[snd_ctrl.nr].sample_ptr);
if(snd_ctrl.loop)
voice_set_playmode(playlist[i].voice, PLAYMODE_LOOP);
}
}
}
+#endif /* !PLATFORM_WIN32 */
/*
void SoundServer_FadeSound(int nr)
}
*/
+#if !defined(PLATFORM_WIN32)
+#if defined(PLATFORM_MSDOS)
static void SoundServer_StopSound(int nr)
{
int i;
for(i=0;i<MAX_SOUNDS_PLAYING;i++)
if (playlist[i].nr == nr)
{
-#ifdef MSDOS
+#if defined(PLATFORM_MSDOS)
voice_set_volume(playlist[i].voice, 0);
deallocate_voice(playlist[i].voice);
#endif
playing_sounds--;
}
-#ifndef MSDOS
+#if !defined(PLATFORM_MSDOS)
if (!playing_sounds)
- close(sound_device);
+ close(audio.device_fd);
#endif
}
for(i=0;i<MAX_SOUNDS_PLAYING;i++)
{
-#ifdef MSDOS
+#if defined(PLATFORM_MSDOS)
voice_set_volume(playlist[i].voice, 0);
deallocate_voice(playlist[i].voice);
#endif
}
playing_sounds = 0;
-#ifndef MSDOS
- close(sound_device);
+#if !defined(PLATFORM_MSDOS)
+ close(audio.device_fd);
#endif
}
+#endif /* PLATFORM_MSDOS */
+#endif /* !PLATFORM_WIN32 */
-#ifdef HPUX_AUDIO
+#if defined(PLATFORM_HPUX)
static void HPUX_Audio_Control()
{
struct audio_describe ainfo;
close(audio_ctl);
}
-#endif /* HPUX_AUDIO */
+#endif /* PLATFORM_HPUX */
+
+#if defined(PLATFORM_UNIX) && !defined(AUDIO_STREAMING_DSP)
/* these two are stolen from "sox"... :) */
return(sample);
}
+#endif /* PLATFORM_UNIX && !AUDIO_STREAMING_DSP */
/*** THE STUFF ABOVE IS ONLY USED BY THE SOUND SERVER CHILD PROCESS ***/
/*** THE STUFF BELOW IS ONLY USED BY THE MAIN PROCESS ***/
-#ifndef MSDOS
-static unsigned long be2long(unsigned long *be) /* big-endian -> longword */
-{
- unsigned char *ptr = (unsigned char *)be;
-
- return(ptr[0]<<24 | ptr[1]<<16 | ptr[2]<<8 | ptr[3]);
-}
+#define CHUNK_ID_LEN 4 /* IFF style chunk id length */
+#define WAV_HEADER_SIZE 20 /* size of WAV file header */
-static unsigned long le2long(unsigned long *be) /* little-endian -> longword */
-{
- unsigned char *ptr = (unsigned char *)be;
-
- return(ptr[3]<<24 | ptr[2]<<16 | ptr[1]<<8 | ptr[0]);
-}
-#endif /* !MSDOS */
-
-boolean LoadSound(struct SoundInfo *snd_info)
+boolean LoadSound(struct SampleInfo *snd_info)
{
char filename[256];
char *sound_ext = "wav";
-#ifndef MSDOS
- struct SoundHeader_WAV *sound_header;
+#if !defined(TARGET_SDL)
+#if !defined(PLATFORM_MSDOS)
+ byte sound_header_buffer[WAV_HEADER_SIZE];
+ char chunk[CHUNK_ID_LEN + 1];
+ int chunk_length, dummy;
FILE *file;
int i;
+#endif
#endif
sprintf(filename, "%s/%s/%s.%s",
- options.base_directory, SOUNDS_DIRECTORY, snd_info->name, sound_ext);
+ options.ro_base_directory, SOUNDS_DIRECTORY,
+ snd_info->name, sound_ext);
-#ifndef MSDOS
+#if defined(TARGET_SDL)
- if ((file = fopen(filename, "r")) == NULL)
- {
- Error(ERR_WARN, "cannot open sound file '%s' - no sounds", filename);
- return(FALSE);
- }
-
- if (fseek(file, 0, SEEK_END) < 0)
+ snd_info->mix_chunk = Mix_LoadWAV(filename);
+ if (snd_info->mix_chunk == NULL)
{
Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
- fclose(file);
- return(FALSE);
+ return FALSE;
}
- snd_info->file_len = ftell(file);
- rewind(file);
+#else /* !TARGET_SDL */
- snd_info->file_ptr = checked_malloc(snd_info->file_len);
-
- if (fread(snd_info->file_ptr, 1, snd_info->file_len, file) !=
- snd_info->file_len)
- {
- Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
- fclose(file);
- return(FALSE);
- }
+#if !defined(PLATFORM_MSDOS)
- fclose(file);
-
- sound_header = (struct SoundHeader_WAV *)snd_info->file_ptr;
-
- if (strncmp(sound_header->magic_RIFF, "RIFF", 4) ||
- snd_info->file_len != le2long(&sound_header->header_size) + 8 ||
- strncmp(sound_header->magic_WAVE, "WAVE", 4) ||
- strncmp(sound_header->magic_DATA, "data", 4) ||
- snd_info->file_len != le2long(&sound_header->data_size) + 44)
+ if ((file = fopen(filename, "r")) == NULL)
{
- Error(ERR_WARN, "'%s' is not a RIFF/WAVE file or broken - no sounds",
- filename);
- return(FALSE);
+ Error(ERR_WARN, "cannot open sound file '%s' - no sounds", filename);
+ return FALSE;
}
- snd_info->data_ptr = snd_info->file_ptr + 44;
- snd_info->data_len = le2long(&sound_header->data_size);
-
- for (i=0; i<snd_info->data_len; i++)
- snd_info->data_ptr[i] = snd_info->data_ptr[i]^0x80;
-
-#else /* MSDOS */
-
- snd_info->sample_ptr = load_sample(filename);
- if (!snd_info->sample_ptr)
+ /* read chunk "RIFF" */
+ getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_LITTLE_ENDIAN);
+ if (strcmp(chunk, "RIFF") != 0)
{
- Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
- return(FALSE);
- }
-
-#endif /* MSDOS */
-
- return(TRUE);
-}
-
-boolean LoadSound_8SVX(struct SoundInfo *snd_info)
-{
- char filename[256];
-#ifndef MSDOS
- struct SoundHeader_8SVX *sound_header;
- FILE *file;
- char *ptr;
- char *sound_ext = "8svx";
-#else
- char *sound_ext = "wav";
-#endif
-
- sprintf(filename, "%s/%s/%s.%s",
- options.base_directory, SOUNDS_DIRECTORY, snd_info->name, sound_ext);
-
-#ifndef MSDOS
- if (!(file=fopen(filename,"r")))
- {
- Error(ERR_WARN, "cannot open sound file '%s' - no sounds", filename);
- return(FALSE);
+ Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename);
+ fclose(file);
+ return FALSE;
}
- if (fseek(file,0,SEEK_END)<0)
+ /* read chunk "WAVE" */
+ getFileChunk(file, chunk, &dummy, BYTE_ORDER_LITTLE_ENDIAN);
+ if (strcmp(chunk, "WAVE") != 0)
{
- Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
+ Error(ERR_WARN, "missing 'WAVE' chunk of sound file '%s'", filename);
fclose(file);
- return(FALSE);
+ return FALSE;
}
- snd_info->file_len = ftell(file);
- rewind(file);
+ /* read header information */
+ for (i=0; i<WAV_HEADER_SIZE; i++)
+ sound_header_buffer[i] = fgetc(file);
- if (!(snd_info->file_ptr=malloc(snd_info->file_len)))
+ /* read chunk "data" */
+ getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_LITTLE_ENDIAN);
+ if (strcmp(chunk, "data") != 0)
{
- Error(ERR_WARN, "out of memory (this shouldn't happen :) - no sounds");
+ Error(ERR_WARN, "missing 'data' chunk of sound file '%s'", filename);
fclose(file);
- return(FALSE);
+ return FALSE;
}
- if (fread(snd_info->file_ptr,1,snd_info->file_len,file)!=snd_info->file_len)
+ snd_info->data_len = chunk_length;
+ snd_info->data_ptr = checked_malloc(snd_info->data_len);
+
+ /* read sound data */
+ if (fread(snd_info->data_ptr, 1, snd_info->data_len, file) !=
+ snd_info->data_len)
{
Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
fclose(file);
- return(FALSE);
+ return FALSE;
}
fclose(file);
- sound_header = (struct SoundHeader_8SVX *)snd_info->file_ptr;
-
- if (strncmp(sound_header->magic_FORM,"FORM",4) ||
- snd_info->file_len != be2long(&sound_header->chunk_size)+8 ||
- strncmp(sound_header->magic_8SVX,"8SVX",4))
- {
- Error(ERR_WARN, "'%s' is not an IFF/8SVX file or broken - no sounds",
- filename);
- return(FALSE);
- }
+ for (i=0; i<snd_info->data_len; i++)
+ snd_info->data_ptr[i] = snd_info->data_ptr[i] ^ 0x80;
- ptr = (char *)snd_info->file_ptr + 12;
+#else /* PLATFORM_MSDOS */
- while(ptr < (char *)(snd_info->file_ptr + snd_info->file_len))
- {
- if (!strncmp(ptr,"VHDR",4))
- {
- ptr += be2long((unsigned long *)(ptr + 4)) + 8;
- continue;
- }
- else if (!strncmp(ptr,"ANNO",4))
- {
- ptr += be2long((unsigned long *)(ptr + 4)) + 8;
- continue;
- }
- else if (!strncmp(ptr,"CHAN",4))
- {
- ptr += be2long((unsigned long *)(ptr + 4)) + 8;
- continue;
- }
- else if (!strncmp(ptr,"BODY",4))
- {
- snd_info->data_ptr = (byte *)ptr + 8;
- snd_info->data_len = be2long((unsigned long *)(ptr + 4));
- return(TRUE);
- }
- else
- {
- /* other chunk not recognized here */
- ptr += be2long((unsigned long *)(ptr + 4)) + 8;
- continue;
- }
- }
-
- return(FALSE);
-#else /* MSDOS */
snd_info->sample_ptr = load_sample(filename);
- if(!snd_info->sample_ptr)
+ if (!snd_info->sample_ptr)
{
Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
- return(FALSE);
+ return FALSE;
}
- return(TRUE);
-#endif /* MSDOS */
+
+#endif /* PLATFORM_MSDOS */
+#endif /* !TARGET_SDL */
+
+ return TRUE;
}
void PlaySound(int nr)
{
struct SoundControl snd_ctrl = emptySoundControl;
- if (sound_status==SOUND_OFF || !setup.sound)
+ if (!audio.sound_available || !setup.sound)
return;
if (volume<PSND_MIN_VOLUME)
snd_ctrl.data_ptr = Sound[nr].data_ptr;
snd_ctrl.data_len = Sound[nr].data_len;
-#ifndef MSDOS
- if (write(sound_pipe[1], &snd_ctrl, sizeof(snd_ctrl))<0)
+#if defined(TARGET_SDL)
+
+ Mix_Volume(-1, SDL_MIX_MAXVOLUME / 4);
+ Mix_VolumeMusic(SDL_MIX_MAXVOLUME / 4);
+
+ Mix_PlayChannel(-1, Sound[nr].mix_chunk, (loop ? -1 : 0));
+
+#else
+#if !defined(PLATFORM_MSDOS)
+ if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0)
{
Error(ERR_WARN, "cannot pipe to child process - no sounds");
- sound_status = SOUND_OFF;
+ audio.sound_available = FALSE;
return;
}
#else
sound_handler(snd_ctrl);
#endif
+#endif
}
void FadeSound(int nr)
{
struct SoundControl snd_ctrl = emptySoundControl;
- if (sound_status==SOUND_OFF)
+ if (!audio.sound_available)
return;
if (SSND_FADING(method))
snd_ctrl.stop_sound = TRUE;
}
-#ifndef MSDOS
- if (write(sound_pipe[1], &snd_ctrl, sizeof(snd_ctrl))<0)
+#if defined(TARGET_SDL)
+
+ if (SSND_FADING(method))
+ {
+ Mix_FadeOutChannel(-1, 1000);
+ Mix_FadeOutMusic(1000);
+ }
+ else
+ {
+ Mix_HaltChannel(-1);
+ Mix_HaltMusic();
+ }
+
+#else
+#if !defined(PLATFORM_MSDOS)
+ if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0)
{
Error(ERR_WARN, "cannot pipe to child process - no sounds");
- sound_status = SOUND_OFF;
+ audio.sound_available = FALSE;
return;
}
#else
sound_handler(snd_ctrl);
#endif
+#endif
}
-void FreeSounds(int max)
+void FreeSounds(int num_sounds)
{
int i;
- if (sound_status==SOUND_OFF)
+ if (!audio.sound_available)
return;
- for(i=0;i<max;i++)
-#ifndef MSDOS
- free(Sound[i].file_ptr);
+ for(i=0; i<num_sounds; i++)
+#if !defined(PLATFORM_MSDOS)
+ free(Sound[i].data_ptr);
#else
destroy_sample(Sound[i].sample_ptr);
#endif