-/***********************************************************
-* Artsoft Retro-Game Library *
-*----------------------------------------------------------*
-* (c) 1994-2001 Artsoft Entertainment *
-* Holger Schemel *
-* Detmolder Strasse 189 *
-* 33604 Bielefeld *
-* Germany *
-* e-mail: info@artsoft.org *
-*----------------------------------------------------------*
-* sound.c *
-***********************************************************/
-
-#include <string.h>
+// ============================================================================
+// Artsoft Retro-Game Library
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+// Holger Schemel
+// info@artsoft.org
+// http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// sound.c
+// ============================================================================
+
+#include <sys/types.h>
#include <sys/time.h>
+#include <string.h>
#include <unistd.h>
#include <fcntl.h>
#include <dirent.h>
#include <signal.h>
+#include <math.h>
+#include <errno.h>
+#include "platform.h"
#include "system.h"
#include "sound.h"
#include "misc.h"
#include "setup.h"
+#include "text.h"
-static int num_sounds = 0, num_music = 0;
-static struct SampleInfo *Sound = NULL;
-#if defined(TARGET_SDL)
-static int num_mods = 0;
-static struct SampleInfo *Mod = NULL;
-#endif
+/* expiration time (in milliseconds) for sound loops */
+#define SOUND_LOOP_EXPIRATION_TIME 200
+/* one second fading interval == 1000 ticks (milliseconds) */
+#define SOUND_FADING_INTERVAL 1000
-/* ========================================================================= */
-/* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */
+#define SND_TYPE_NONE 0
+#define SND_TYPE_WAV 1
-static int playing_sounds = 0;
-static struct SoundControl playlist[MAX_SOUNDS_PLAYING];
-static struct SoundControl emptySoundControl =
-{
- -1,0,0, FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE, 0,0L,0L,NULL
-};
+#define MUS_TYPE_NONE 0
+#define MUS_TYPE_WAV 1
+#define MUS_TYPE_MOD 2
-#if defined(PLATFORM_UNIX)
-static int stereo_volume[PSND_MAX_LEFT2RIGHT+1];
-static char premix_first_buffer[SND_BLOCKSIZE];
-#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
-static unsigned char playing_buffer[SND_BLOCKSIZE];
-#endif
+#define DEVICENAME_DSP "/dev/dsp"
+#define DEVICENAME_SOUND_DSP "/dev/sound/dsp"
+#define DEVICENAME_AUDIO "/dev/audio"
+#define DEVICENAME_AUDIOCTL "/dev/audioCtl"
-/* forward declaration of internal functions */
-#if defined(AUDIO_STREAMING_DSP)
-static void SoundServer_InsertNewSound(struct SoundControl);
-#elif defined(PLATFORM_UNIX)
-static unsigned char linear_to_ulaw(int);
-static int ulaw_to_linear(unsigned char);
-#endif
+#define SOUND_VOLUME_LEFT(x) (stereo_volume[x])
+#define SOUND_VOLUME_RIGHT(x) (stereo_volume[SOUND_MAX_LEFT2RIGHT-x])
-#if defined(AUDIO_LINUX_IOCTL)
-static boolean InitAudioDevice_Linux();
-#elif defined(PLATFORM_NETBSD)
-static boolean InitAudioDevice_NetBSD();
-#elif defined(PLATFORM_HPUX)
-static boolean InitAudioDevice_HPUX();
-#elif defined(PLATFORM_MSDOS)
-static void SoundServer_InsertNewSound(struct SoundControl);
-static void SoundServer_StopSound(int);
-static void SoundServer_StopAllSounds();
-#endif
+#define SAME_SOUND_NR(x,y) ((x).nr == (y).nr)
+#define SAME_SOUND_DATA(x,y) ((x).data_ptr == (y).data_ptr)
-#if defined(PLATFORM_UNIX)
-static int OpenAudioDevice(char *audio_device_name)
-{
- int audio_fd;
+#define SOUND_VOLUME_FROM_PERCENT(v,p) ((p) < 0 ? SOUND_MIN_VOLUME : \
+ (p) > 100 ? (v) : \
+ (p) * (v) / 100)
- /* check if desired audio device is accessible */
- if (access(audio_device_name, W_OK) != 0)
- return -1;
+#define SOUND_VOLUME_SIMPLE(v) SOUND_VOLUME_FROM_PERCENT(v, setup.volume_simple)
+#define SOUND_VOLUME_LOOPS(v) SOUND_VOLUME_FROM_PERCENT(v, setup.volume_loops)
+#define SOUND_VOLUME_MUSIC(v) SOUND_VOLUME_FROM_PERCENT(v, setup.volume_music)
- /* try to open audio device in non-blocking mode */
- if ((audio_fd = open(audio_device_name, O_WRONLY | O_NONBLOCK)) < 0)
- return audio_fd;
+#define SETUP_SOUND_VOLUME(v,s) ((s) == SND_CTRL_PLAY_MUSIC ? \
+ SOUND_VOLUME_MUSIC(v) : \
+ (s) == SND_CTRL_PLAY_LOOP ? \
+ SOUND_VOLUME_LOOPS(v) : \
+ SOUND_VOLUME_SIMPLE(v))
- /* re-open audio device in blocking mode */
- close(audio_fd);
- audio_fd = open(audio_device_name, O_WRONLY);
+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 */
+};
- return audio_fd;
-}
+struct SampleInfo
+{
+ char *source_filename;
+ int num_references;
+
+ int type;
+ int format;
+ void *data_ptr; /* pointer to first sample (8 or 16 bit) */
+ int data_len; /* number of samples, NOT number of bytes */
+ int num_channels; /* mono: 1 channel, stereo: 2 channels */
+};
+typedef struct SampleInfo SoundInfo;
+typedef struct SampleInfo MusicInfo;
-static boolean TestAudioDevices(void)
+struct SoundControl
{
- static char *audio_device_name[] =
- {
- DEVICENAME_DSP,
- DEVICENAME_AUDIO
- };
- int audio_fd = -1;
- int i;
+ boolean active;
- /* look for available audio devices, starting with preferred ones */
- for (i=0; i<sizeof(audio_device_name)/sizeof(char *); i++)
- if ((audio_fd = OpenAudioDevice(audio_device_name[i])) >= 0)
- break;
+ int nr;
+ int volume;
+ int stereo_position;
- if (audio_fd < 0)
- {
- Error(ERR_WARN, "cannot open audio device -- no sound");
- return FALSE;
- }
+ int state;
- close(audio_fd);
+ unsigned int playing_starttime;
+ unsigned int playing_pos;
- audio.device_name = audio_device_name[i];
+ int type;
+ int format;
+ void *data_ptr; /* pointer to first sample (8 or 16 bit) */
+ int data_len; /* number of samples, NOT number of bytes */
+ int num_channels; /* mono: 1 channel, stereo: 2 channels */
+};
+typedef struct SoundControl SoundControl;
- return TRUE;
-}
+static struct ArtworkListInfo *sound_info = NULL;
+static struct ArtworkListInfo *music_info = NULL;
-#if !defined(TARGET_SDL)
-static boolean ForkAudioProcess(void)
-{
- if (pipe(audio.soundserver_pipe) < 0)
- {
- Error(ERR_WARN, "cannot create pipe -- no sounds");
- return FALSE;
- }
+static MusicInfo **Music_NoConf = NULL;
- if ((audio.soundserver_pid = fork()) < 0)
- {
- Error(ERR_WARN, "cannot create sound server process -- no sounds");
- return FALSE;
- }
+static int num_music_noconf = 0;
+static int stereo_volume[SOUND_MAX_LEFT2RIGHT + 1];
- if (audio.soundserver_pid == 0) /* we are child process */
- {
- SoundServer();
- /* never reached */
- exit(0);
- }
- else /* we are parent */
- close(audio.soundserver_pipe[0]); /* no reading from pipe needed */
+/* ========================================================================= */
+/* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */
- return TRUE;
-}
-#endif
+static struct SoundControl mixer[NUM_MIXER_CHANNELS];
+static int mixer_active_channels = 0;
+static boolean expire_loop_sounds = FALSE;
-void UnixOpenAudio(void)
-{
- if (!TestAudioDevices())
- return;
+static void ReloadCustomSounds();
+static void ReloadCustomMusic();
+static void FreeSound(void *);
+static void FreeMusic(void *);
+static void FreeAllMusic_NoConf();
- audio.sound_available = TRUE;
- audio.sound_enabled = TRUE;
+static SoundInfo *getSoundInfoEntryFromSoundID(int);
+static MusicInfo *getMusicInfoEntryFromMusicID(int);
-#if defined(AUDIO_STREAMING_DSP)
- audio.music_available = TRUE;
- audio.loops_available = TRUE;
-#endif
+
+/* ------------------------------------------------------------------------- */
+/* mixer functions */
+/* ------------------------------------------------------------------------- */
+
+void Mixer_InitChannels()
+{
+ int i;
+
+ for (i = 0; i < audio.num_channels; i++)
+ mixer[i].active = FALSE;
+ mixer_active_channels = 0;
}
-void UnixCloseAudio(void)
+static void Mixer_ResetChannelExpiration(int channel)
{
- if (audio.device_fd)
- close(audio.device_fd);
+ mixer[channel].playing_starttime = Counter();
- if (audio.soundserver_pid > 0) /* we are parent process */
- kill(audio.soundserver_pid, SIGTERM);
+ if (expire_loop_sounds &&
+ IS_LOOP(mixer[channel]) && !IS_MUSIC(mixer[channel]))
+ Mix_ExpireChannel(channel, SOUND_LOOP_EXPIRATION_TIME);
}
-#endif /* PLATFORM_UNIX */
-void InitPlaylist(void)
+static boolean Mixer_ChannelExpired(int channel)
{
- int i;
+ if (!mixer[channel].active)
+ return TRUE;
- for(i=0;i<MAX_SOUNDS_PLAYING;i++)
- playlist[i] = emptySoundControl;
- playing_sounds = 0;
+ if (expire_loop_sounds &&
+ IS_LOOP(mixer[channel]) && !IS_MUSIC(mixer[channel]) &&
+ DelayReached(&mixer[channel].playing_starttime,
+ SOUND_LOOP_EXPIRATION_TIME))
+ return TRUE;
+
+ if (!Mix_Playing(channel))
+ return TRUE;
+
+ return FALSE;
}
-void StartSoundserver(void)
+static boolean Mixer_AllocateChannel(int channel)
{
- if (!audio.sound_available)
- return;
+ return TRUE;
+}
-#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
- if (!ForkAudioProcess())
- audio.sound_available = FALSE;
-#endif
+static void Mixer_SetChannelProperties(int channel)
+{
+ Mix_Volume(channel, mixer[channel].volume);
+ Mix_SetPanning(channel,
+ SOUND_VOLUME_LEFT(mixer[channel].stereo_position),
+ SOUND_VOLUME_RIGHT(mixer[channel].stereo_position));
}
-#if defined(PLATFORM_UNIX)
-void SoundServer(void)
+static void Mixer_StartChannel(int channel)
{
- int i;
+ Mix_PlayChannel(channel, mixer[channel].data_ptr,
+ IS_LOOP(mixer[channel]) ? -1 : 0);
+}
- struct SoundControl snd_ctrl;
- fd_set sound_fdset;
+static void Mixer_PlayChannel(int channel)
+{
+ /* start with inactive channel in case something goes wrong */
+ mixer[channel].active = FALSE;
- close(audio.soundserver_pipe[1]); /* no writing into pipe needed */
+ if (mixer[channel].type != MUS_TYPE_WAV)
+ return;
- InitPlaylist();
+ if (!Mixer_AllocateChannel(channel))
+ return;
- 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));
+ Mixer_SetChannelProperties(channel);
+ Mixer_StartChannel(channel);
-#if defined(PLATFORM_HPUX)
- InitAudioDevice_HPUX();
-#endif
+ Mixer_ResetChannelExpiration(channel);
- FD_ZERO(&sound_fdset);
- FD_SET(audio.soundserver_pipe[0], &sound_fdset);
+ mixer[channel].playing_pos = 0;
+ mixer[channel].active = TRUE;
+ mixer_active_channels++;
+}
- while(1) /* wait for sound playing commands from client */
- {
- 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(audio.soundserver_pipe[0], &snd_ctrl, sizeof(snd_ctrl))
- != sizeof(snd_ctrl))
- Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
+static void Mixer_PlayMusicChannel()
+{
+ Mixer_PlayChannel(audio.music_channel);
- if (snd_ctrl.reload_sounds || snd_ctrl.reload_music)
- {
- for(i=0;i<MAX_SOUNDS_PLAYING;i++)
- playlist[i] = emptySoundControl;
- playing_sounds = 0;
+ if (mixer[audio.music_channel].type != MUS_TYPE_WAV)
+ {
+ /* Mix_VolumeMusic() must be called _after_ Mix_PlayMusic() --
+ this looks like a bug in the SDL_mixer library */
+ Mix_PlayMusic(mixer[audio.music_channel].data_ptr, -1);
+ Mix_VolumeMusic(mixer[audio.music_channel].volume);
+ }
+}
- close(audio.device_fd);
+static void Mixer_StopChannel(int channel)
+{
+ if (!mixer[channel].active)
+ return;
- if (snd_ctrl.reload_sounds)
- ReloadSounds();
- else
- ReloadMusic();
+ Mix_HaltChannel(channel);
- continue;
- }
+ mixer[channel].active = FALSE;
+ mixer_active_channels--;
+}
-#if defined(AUDIO_STREAMING_DSP)
+static void Mixer_StopMusicChannel()
+{
+ Mixer_StopChannel(audio.music_channel);
- if (snd_ctrl.fade_sound)
- {
- if (!playing_sounds)
- continue;
+ Mix_HaltMusic();
+}
- for(i=0;i<MAX_SOUNDS_PLAYING;i++)
- if (snd_ctrl.stop_all_sounds || playlist[i].nr == snd_ctrl.nr)
- playlist[i].fade_sound = TRUE;
- }
- else if (snd_ctrl.stop_all_sounds)
- {
- if (!playing_sounds)
- continue;
+static void Mixer_FadeChannel(int channel)
+{
+ if (!mixer[channel].active)
+ return;
- for(i=0;i<MAX_SOUNDS_PLAYING;i++)
- playlist[i] = emptySoundControl;
- playing_sounds = 0;
+ mixer[channel].state |= SND_CTRL_FADE;
- close(audio.device_fd);
- }
- else if (snd_ctrl.stop_sound)
- {
- if (!playing_sounds)
- continue;
+ Mix_FadeOutChannel(channel, SOUND_FADING_INTERVAL);
+}
- for(i=0;i<MAX_SOUNDS_PLAYING;i++)
- if (playlist[i].nr == snd_ctrl.nr)
- {
- playlist[i] = emptySoundControl;
- playing_sounds--;
- }
+static void Mixer_FadeMusicChannel()
+{
+ Mixer_FadeChannel(audio.music_channel);
- if (!playing_sounds)
- close(audio.device_fd);
- }
+ Mix_FadeOutMusic(SOUND_FADING_INTERVAL);
+}
- if (playing_sounds || snd_ctrl.active)
- {
- struct timeval delay = { 0, 0 };
- byte *sample_ptr;
- long sample_size;
- static long max_sample_size = 0;
- static long fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE;
- int sample_rate = DEFAULT_AUDIO_SAMPLE_RATE;
- static boolean stereo = TRUE;
-
- if (playing_sounds ||
- (audio.device_fd = OpenAudioDevice(audio.device_name)) >= 0)
- {
- if (!playing_sounds) /* we just opened the audio device */
- {
-#if defined(AUDIO_LINUX_IOCTL)
- stereo = InitAudioDevice_Linux(fragment_size, sample_rate);
-#elif defined(PLATFORM_NETBSD)
- stereo = InitAudioDevice_NetBSD(fragment_size, sample_rate);
-#endif
- max_sample_size = fragment_size / (stereo ? 2 : 1);
- }
-
- if (snd_ctrl.active) /* new sound has arrived */
- SoundServer_InsertNewSound(snd_ctrl);
-
- while(playing_sounds &&
- select(audio.soundserver_pipe[0] + 1,
- &sound_fdset, NULL, NULL, &delay) < 1)
- {
- FD_SET(audio.soundserver_pipe[0], &sound_fdset);
-
- /* first clear the last premixing buffer */
- memset(premix_last_buffer, 0, fragment_size * sizeof(int));
-
- for(i=0;i<MAX_SOUNDS_PLAYING;i++)
- {
- int j;
-
- if (!playlist[i].active)
- continue;
-
- /* get pointer and size of the actual sound sample */
- sample_ptr = playlist[i].data_ptr+playlist[i].playingpos;
- sample_size =
- MIN(max_sample_size,playlist[i].data_len-playlist[i].playingpos);
- playlist[i].playingpos += sample_size;
-
- /* fill the first mixing buffer with original sample */
- memcpy(premix_first_buffer,sample_ptr,sample_size);
-
- /* are we about to restart a looping sound? */
- if (playlist[i].loop && sample_size<max_sample_size)
- {
- playlist[i].playingpos = max_sample_size-sample_size;
- memcpy(premix_first_buffer+sample_size,
- playlist[i].data_ptr,max_sample_size-sample_size);
- sample_size = max_sample_size;
- }
-
- /* decrease volume if sound is fading out */
- if (playlist[i].fade_sound &&
- playlist[i].volume >= SOUND_FADING_VOLUME_THRESHOLD)
- playlist[i].volume -= SOUND_FADING_VOLUME_STEP;
-
- /* adjust volume of actual sound sample */
- if (playlist[i].volume != PSND_MAX_VOLUME)
- for(j=0;j<sample_size;j++)
- premix_first_buffer[j] =
- (playlist[i].volume * (int)premix_first_buffer[j])
- >> PSND_MAX_VOLUME_BITS;
-
- /* fill the last mixing buffer with stereo or mono sound */
- if (stereo)
- {
- int middle_pos = PSND_MAX_LEFT2RIGHT/2;
- int left_volume = stereo_volume[middle_pos+playlist[i].stereo];
- int right_volume = stereo_volume[middle_pos-playlist[i].stereo];
-
- for(j=0;j<sample_size;j++)
- {
- premix_left_buffer[j] =
- (left_volume * (int)premix_first_buffer[j])
- >> PSND_MAX_LEFT2RIGHT_BITS;
- premix_right_buffer[j] =
- (right_volume * (int)premix_first_buffer[j])
- >> PSND_MAX_LEFT2RIGHT_BITS;
- premix_last_buffer[2*j+0] += premix_left_buffer[j];
- premix_last_buffer[2*j+1] += premix_right_buffer[j];
- }
- }
- else
- {
- for(j=0;j<sample_size;j++)
- premix_last_buffer[j] += (int)premix_first_buffer[j];
- }
-
- /* delete completed sound entries from the playlist */
- if (playlist[i].playingpos >= playlist[i].data_len)
- {
- if (playlist[i].loop)
- playlist[i].playingpos = 0;
- else
- {
- playlist[i] = emptySoundControl;
- playing_sounds--;
- }
- }
- else if (playlist[i].volume <= SOUND_FADING_VOLUME_THRESHOLD)
- {
- playlist[i] = emptySoundControl;
- playing_sounds--;
- }
- }
-
- /* put last mixing buffer to final playing buffer */
- for(i=0; i<fragment_size; i++)
- {
- if (premix_last_buffer[i]<-255)
- playing_buffer[i] = 0;
- else if (premix_last_buffer[i]>255)
- playing_buffer[i] = 255;
- else
- playing_buffer[i] = (premix_last_buffer[i]>>1)^0x80;
- }
-
- /* finally play the sound fragment */
- write(audio.device_fd, playing_buffer, fragment_size);
- }
-
- /* if no sounds playing, free device for other sound programs */
- if (!playing_sounds)
- close(audio.device_fd);
- }
- }
+static void Mixer_UnFadeChannel(int channel)
+{
+ if (!mixer[channel].active || !IS_FADING(mixer[channel]))
+ return;
-#else /* !AUDIO_STREAMING_DSP */
+ mixer[channel].state &= ~SND_CTRL_FADE;
+ mixer[channel].volume = SOUND_MAX_VOLUME;
- if (snd_ctrl.active && !snd_ctrl.loop)
- {
- struct timeval delay = { 0, 0 };
- byte *sample_ptr;
- long sample_size, max_sample_size = SND_BLOCKSIZE;
- long sample_rate = 8000; /* standard "/dev/audio" sampling rate */
- int wait_percent = 90; /* wait 90% of the real playing time */
- int i;
-
- if ((audio.device_fd = OpenAudioDevice(audio.device_name)) >= 0)
- {
- playing_sounds = 1;
-
- while(playing_sounds &&
- select(audio.soundserver_pipe[0] + 1,
- &sound_fdset, NULL, NULL, &delay) < 1)
- {
- 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;
- sample_size =
- MIN(max_sample_size, snd_ctrl.data_len - snd_ctrl.playingpos);
- snd_ctrl.playingpos += sample_size;
-
- /* fill the first mixing buffer with original sample */
- memcpy(premix_first_buffer,sample_ptr,sample_size);
-
- /* adjust volume of actual sound sample */
- if (snd_ctrl.volume != PSND_MAX_VOLUME)
- for(i=0;i<sample_size;i++)
- premix_first_buffer[i] =
- (snd_ctrl.volume * (int)premix_first_buffer[i])
- >> PSND_MAX_VOLUME_BITS;
-
- for(i=0;i<sample_size;i++)
- playing_buffer[i] =
- linear_to_ulaw(((int)premix_first_buffer[i]) << 8);
-
- if (snd_ctrl.playingpos >= snd_ctrl.data_len)
- playing_sounds = 0;
-
- /* finally play the sound fragment */
- write(audio.device_fd,playing_buffer,sample_size);
-
- delay.tv_sec = 0;
- delay.tv_usec = ((sample_size*10*wait_percent)/(sample_rate))*1000;
- }
- close(audio.device_fd);
- }
- }
-#endif /* !AUDIO_STREAMING_DSP */
- }
+ Mix_ExpireChannel(channel, -1);
+ Mix_Volume(channel, mixer[channel].volume);
}
-#endif /* PLATFORM_UNIX */
-#if defined(PLATFORM_MSDOS)
-static void sound_handler(struct SoundControl snd_ctrl)
+static void Mixer_InsertSound(SoundControl snd_ctrl)
{
- int i;
+ SoundInfo *snd_info;
+ int i, k;
+ int num_sounds = getSoundListSize();
+ int num_music = getMusicListSize();
- if (snd_ctrl.fade_sound)
+ if (IS_MUSIC(snd_ctrl))
{
- if (!playing_sounds)
+ if (snd_ctrl.nr >= num_music) /* invalid music */
return;
- for (i=0; i<MAX_SOUNDS_PLAYING; i++)
- if ((snd_ctrl.stop_all_sounds || playlist[i].nr == snd_ctrl.nr) &&
- !playlist[i].fade_sound)
- {
- playlist[i].fade_sound = TRUE;
- if (voice_check(playlist[i].voice))
- voice_ramp_volume(playlist[i].voice, 1000, 0);
- playlist[i].loop = PSND_NO_LOOP;
- }
- }
- else if (snd_ctrl.stop_all_sounds)
- {
- if (!playing_sounds)
- return;
- SoundServer_StopAllSounds();
+ if (snd_ctrl.nr < 0) /* undefined music */
+ {
+ if (num_music_noconf == 0) /* no fallback music available */
+ return;
+
+ snd_ctrl.nr = UNMAP_NOCONF_MUSIC(snd_ctrl.nr) % num_music_noconf;
+ snd_info = Music_NoConf[snd_ctrl.nr];
+ }
+ else
+ snd_info = getMusicInfoEntryFromMusicID(snd_ctrl.nr);
}
- else if (snd_ctrl.stop_sound)
+ else
{
- if (!playing_sounds)
+ if (snd_ctrl.nr < 0 || snd_ctrl.nr >= num_sounds)
return;
- SoundServer_StopSound(snd_ctrl.nr);
- }
- for (i=0; i<MAX_SOUNDS_PLAYING; i++)
- {
- if (!playlist[i].active || playlist[i].loop)
- continue;
-
- playlist[i].playingpos = voice_get_position(playlist[i].voice);
- playlist[i].volume = voice_get_volume(playlist[i].voice);
- if (playlist[i].playingpos == -1 || !playlist[i].volume)
- {
- deallocate_voice(playlist[i].voice);
- playlist[i] = emptySoundControl;
- playing_sounds--;
- }
+ snd_info = getSoundInfoEntryFromSoundID(snd_ctrl.nr);
}
- if (snd_ctrl.active)
- SoundServer_InsertNewSound(snd_ctrl);
-}
-#endif /* PLATFORM_MSDOS */
+ if (snd_info == NULL)
+ return;
-#if !defined(PLATFORM_WIN32)
-static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
-{
- int i, k;
+ /* copy sound sample and format information */
+ snd_ctrl.type = snd_info->type;
+ snd_ctrl.format = snd_info->format;
+ snd_ctrl.data_ptr = snd_info->data_ptr;
+ snd_ctrl.data_len = snd_info->data_len;
+ snd_ctrl.num_channels = snd_info->num_channels;
- /* if playlist is full, remove oldest sound */
- if (playing_sounds==MAX_SOUNDS_PLAYING)
+ /* play music samples on a dedicated music channel */
+ if (IS_MUSIC(snd_ctrl))
{
- int longest=0, longest_nr=0;
+ Mixer_StopMusicChannel();
- for(i=0;i<MAX_SOUNDS_PLAYING;i++)
- {
-#if !defined(PLATFORM_MSDOS)
- int actual = 100 * playlist[i].playingpos / playlist[i].data_len;
-#else
- int actual = playlist[i].playingpos;
-#endif
+ mixer[audio.music_channel] = snd_ctrl;
+ Mixer_PlayMusicChannel();
- if (!playlist[i].loop && actual>longest)
- {
- longest=actual;
- longest_nr=i;
- }
- }
-#if defined(PLATFORM_MSDOS)
- voice_set_volume(playlist[longest_nr].voice, 0);
- deallocate_voice(playlist[longest_nr].voice);
-#endif
- playlist[longest_nr] = emptySoundControl;
- playing_sounds--;
+ return;
}
- /* check if sound is already being played (and how often) */
- for(k=0,i=0;i<MAX_SOUNDS_PLAYING;i++)
- {
- if (playlist[i].nr == snd_ctrl.nr)
+ /* check if (and how often) this sound sample is already playing */
+ for (k = 0, i = audio.first_sound_channel; i < audio.num_channels; i++)
+ if (mixer[i].active && SAME_SOUND_DATA(mixer[i], snd_ctrl))
k++;
- }
- /* restart loop sounds only if they are just fading out */
- if (k>=1 && snd_ctrl.loop)
+ /* reset expiration delay for already playing loop sounds */
+ if (k > 0 && IS_LOOP(snd_ctrl))
{
- for(i=0;i<MAX_SOUNDS_PLAYING;i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
- if (playlist[i].nr == snd_ctrl.nr && playlist[i].fade_sound)
+ if (mixer[i].active && SAME_SOUND_DATA(mixer[i], snd_ctrl))
{
- playlist[i].fade_sound = FALSE;
- playlist[i].volume = PSND_MAX_VOLUME;
-#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);
-#endif
+ if (IS_FADING(mixer[i]))
+ Mixer_UnFadeChannel(i);
+
+ /* restore settings like volume and stereo position */
+ mixer[i].volume = snd_ctrl.volume;
+ mixer[i].stereo_position = snd_ctrl.stereo_position;
+
+ Mixer_SetChannelProperties(i);
+ Mixer_ResetChannelExpiration(i);
}
}
+
return;
}
/* don't play sound more than n times simultaneously (with n == 2 for now) */
- if (k>=2)
+ if (k >= 2)
{
- int longest=0, longest_nr=0;
+ unsigned int playing_current = Counter();
+ int longest = 0, longest_nr = audio.first_sound_channel;
/* look for oldest equal sound */
- for(i=0;i<MAX_SOUNDS_PLAYING;i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
+ int playing_time = playing_current - mixer[i].playing_starttime;
int actual;
- if (!playlist[i].active || playlist[i].nr != snd_ctrl.nr)
+ if (!mixer[i].active || !SAME_SOUND_NR(mixer[i], snd_ctrl))
continue;
-#if !defined(PLATFORM_MSDOS)
- actual = 100 * playlist[i].playingpos / playlist[i].data_len;
-#else
- actual = playlist[i].playingpos;
-#endif
- if (actual>=longest)
+ actual = 1000 * playing_time / mixer[i].data_len;
+
+ if (actual >= longest)
{
- longest=actual;
- longest_nr=i;
+ longest = actual;
+ longest_nr = i;
}
}
-#if defined(PLATFORM_MSDOS)
- voice_set_volume(playlist[longest_nr].voice, 0);
- deallocate_voice(playlist[longest_nr].voice);
-#endif
- playlist[longest_nr] = emptySoundControl;
- playing_sounds--;
+ Mixer_StopChannel(longest_nr);
}
- /* neuen Sound in Liste packen */
- for(i=0;i<MAX_SOUNDS_PLAYING;i++)
+ /* If all (non-music) channels are active, stop the channel that has
+ played its sound sample most completely (in percent of the sample
+ length). As we cannot currently get the actual playing position
+ of the channel's sound sample when compiling with the SDL mixer
+ library, we use the current playing time (in milliseconds) instead. */
+
+#if DEBUG
+ /* channel allocation sanity check -- should not be needed */
+ if (mixer_active_channels ==
+ audio.num_channels - (mixer[audio.music_channel].active ? 0 : 1))
{
- if (!playlist[i].active)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
- playlist[i] = snd_ctrl;
- playing_sounds++;
-
-#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);
- voice_set_volume(playlist[i].voice, snd_ctrl.volume);
- voice_set_pan(playlist[i].voice, snd_ctrl.stereo);
- voice_start(playlist[i].voice);
+ if (!mixer[i].active)
+ {
+ Error(ERR_INFO, "Mixer_InsertSound: Channel %d inactive", i);
+ Error(ERR_INFO, "Mixer_InsertSound: This should never happen!");
+
+ mixer_active_channels--;
+ }
+ }
+ }
#endif
+
+ if (mixer_active_channels ==
+ audio.num_channels - (mixer[audio.music_channel].active ? 0 : 1))
+ {
+ unsigned int playing_current = Counter();
+ int longest = 0, longest_nr = audio.first_sound_channel;
+
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
+ {
+ int playing_time = playing_current - mixer[i].playing_starttime;
+ int actual = 1000 * playing_time / mixer[i].data_len;
+
+ if (!IS_LOOP(mixer[i]) && actual > longest)
+ {
+ longest = actual;
+ longest_nr = i;
+ }
+ }
+
+ Mixer_StopChannel(longest_nr);
+ }
+
+ /* add the new sound to the mixer */
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
+ {
+ if (!mixer[i].active)
+ {
+ mixer[i] = snd_ctrl;
+ Mixer_PlayChannel(i);
+
break;
}
}
}
-#endif /* !PLATFORM_WIN32 */
-/*
-void SoundServer_FadeSound(int nr)
+static void HandleSoundRequest(SoundControl snd_ctrl)
{
int i;
- if (!playing_sounds)
- return;
+ /* deactivate channels that have expired since the last request */
+ for (i = 0; i < audio.num_channels; i++)
+ if (mixer[i].active && Mixer_ChannelExpired(i))
+ Mixer_StopChannel(i);
- for(i=0;i<MAX_SOUNDS_PLAYING;i++)
- if (snd_ctrl.stop_all_sounds || playlist[i].nr == snd_ctrl.nr)
- playlist[i].fade_sound = TRUE;
+ if (IS_RELOADING(snd_ctrl)) /* load new sound or music files */
+ {
+ Mixer_StopMusicChannel();
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
+ Mixer_StopChannel(i);
+
+ if (snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS)
+ ReloadCustomSounds();
+ else
+ ReloadCustomMusic();
+ }
+ else if (IS_FADING(snd_ctrl)) /* fade out existing sound or music */
+ {
+ if (IS_MUSIC(snd_ctrl))
+ {
+ Mixer_FadeMusicChannel();
+ return;
+ }
+
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
+ if (SAME_SOUND_NR(mixer[i], snd_ctrl) || ALL_SOUNDS(snd_ctrl))
+ Mixer_FadeChannel(i);
+ }
+ else if (IS_STOPPING(snd_ctrl)) /* stop existing sound or music */
+ {
+ if (IS_MUSIC(snd_ctrl))
+ {
+ Mixer_StopMusicChannel();
+ return;
+ }
+
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
+ if (SAME_SOUND_NR(mixer[i], snd_ctrl) || ALL_SOUNDS(snd_ctrl))
+ Mixer_StopChannel(i);
+ }
+ else if (SET_EXPIRE_LOOPS(snd_ctrl)) /* set loop expiration on or off */
+ {
+ expire_loop_sounds = snd_ctrl.active;
+ }
+ else if (snd_ctrl.active) /* add new sound to mixer */
+ {
+ Mixer_InsertSound(snd_ctrl);
+ }
}
-*/
-#if !defined(PLATFORM_WIN32)
-#if defined(PLATFORM_MSDOS)
-static void SoundServer_StopSound(int nr)
+void StartMixer(void)
{
int i;
- if (!playing_sounds)
+ if (!audio.sound_available)
return;
- for(i=0;i<MAX_SOUNDS_PLAYING;i++)
- if (playlist[i].nr == nr)
- {
-#if defined(PLATFORM_MSDOS)
- voice_set_volume(playlist[i].voice, 0);
- deallocate_voice(playlist[i].voice);
-#endif
- playlist[i] = emptySoundControl;
- playing_sounds--;
- }
-
-#if !defined(PLATFORM_MSDOS)
- if (!playing_sounds)
- close(audio.device_fd);
-#endif
+ /* initialize stereo position conversion information */
+ for (i = 0; i <= SOUND_MAX_LEFT2RIGHT; i++)
+ stereo_volume[i] =
+ (int)sqrt((float)(SOUND_MAX_LEFT2RIGHT * SOUND_MAX_LEFT2RIGHT - i * i));
}
-static void SoundServer_StopAllSounds()
+
+/* THE STUFF ABOVE IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */
+/* ========================================================================= */
+/* THE STUFF BELOW IS ONLY USED BY THE MAIN PROCESS */
+
+#define CHUNK_ID_LEN 4 /* IFF style chunk id length */
+#define WAV_HEADER_SIZE 16 /* size of WAV file header */
+
+static void *Load_WAV(char *filename)
{
- int i;
+ SoundInfo *snd_info;
+
+ if (!audio.sound_available)
+ return NULL;
- for(i=0;i<MAX_SOUNDS_PLAYING;i++)
+ snd_info = checked_calloc(sizeof(SoundInfo));
+
+ if ((snd_info->data_ptr = Mix_LoadWAV(filename)) == NULL)
{
-#if defined(PLATFORM_MSDOS)
- voice_set_volume(playlist[i].voice, 0);
- deallocate_voice(playlist[i].voice);
-#endif
- playlist[i]=emptySoundControl;
+ Error(ERR_WARN, "cannot read sound file '%s': %s", filename, Mix_GetError());
+ free(snd_info);
+ return NULL;
}
- playing_sounds = 0;
-#if !defined(PLATFORM_MSDOS)
- close(audio.device_fd);
-#endif
-}
-#endif /* PLATFORM_MSDOS */
-#endif /* !PLATFORM_WIN32 */
+ snd_info->data_len = ((Mix_Chunk *)snd_info->data_ptr)->alen;
+ snd_info->type = SND_TYPE_WAV;
+ snd_info->source_filename = getStringCopy(filename);
-/* ------------------------------------------------------------------------- */
-/* platform dependant audio initialization code */
-/* ------------------------------------------------------------------------- */
+ return snd_info;
+}
-#if defined(AUDIO_LINUX_IOCTL)
-static boolean InitAudioDevice_Linux(long fragment_size, int sample_rate)
+static void *Load_MOD(char *filename)
{
- /* "ioctl()" expects pointer to 'int' value for stereo flag
- (boolean is defined as 'char', which will not work here) */
- int stereo = TRUE;
- unsigned long fragment_spec = 0;
-
- /* determine logarithm (log2) of the fragment size */
- for (fragment_spec=0; (1 << fragment_spec) < fragment_size;
- fragment_spec++);
-
- /* use two fragments (play one fragment, prepare the other);
- one fragment would result in interrupted audio output, more
- than two fragments would raise audio output latency to much */
- fragment_spec |= 0x00020000;
-
- /* Example for fragment specification:
- - 2 buffers / 512 bytes (giving 1/16 second resolution for 8 kHz)
- - (with stereo the effective buffer size will shrink to 256)
- => fragment_size = 0x00020009 */
-
- if (ioctl(audio.device_fd, SNDCTL_DSP_SETFRAGMENT, &fragment_spec) < 0)
- Error(ERR_EXIT_SOUND_SERVER,
- "cannot set fragment size of /dev/dsp -- no sounds");
-
- /* try if we can use stereo sound */
- if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0)
- {
-#ifdef DEBUG
- static boolean reported = FALSE;
+ MusicInfo *mod_info;
- if (!reported)
- {
- Error(ERR_RETURN, "cannot get stereo sound on /dev/dsp");
- reported = TRUE;
- }
-#endif
- stereo = FALSE;
+ if (!audio.sound_available)
+ return NULL;
+
+ mod_info = checked_calloc(sizeof(MusicInfo));
+
+ if ((mod_info->data_ptr = Mix_LoadMUS(filename)) == NULL)
+ {
+ Error(ERR_WARN, "cannot read music file '%s': %s", filename, Mix_GetError());
+ free(mod_info);
+ return NULL;
}
- 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");
+ mod_info->type = MUS_TYPE_MOD;
+ mod_info->source_filename = getStringCopy(filename);
- /* get the real fragmentation size; this should return 512 */
- 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");
+ return mod_info;
+}
- return (boolean)stereo;
+static void *Load_WAV_or_MOD(char *filename)
+{
+ if (FileIsMusic(filename))
+ return Load_MOD(filename);
+ else if (FileIsSound(filename))
+ return Load_WAV(filename);
+ else
+ return NULL;
}
-#endif /* AUDIO_LINUX_IOCTL */
-#if defined(PLATFORM_NETBSD)
-static boolean InitAudioDevice_NetBSD(long fragment_size, int sample_rate)
+void LoadCustomMusic_NoConf(void)
{
- audio_info_t a_info;
- boolean stereo = TRUE;
+ static boolean draw_init_text = TRUE; /* only draw at startup */
+ static char *last_music_directory = NULL;
+ char *music_directory = getCustomMusicDirectory();
+ Directory *dir;
+ DirectoryEntry *dir_entry;
+ int num_music = getMusicListSize();
+
+ if (!audio.sound_available)
+ return;
+
+ if (last_music_directory != NULL &&
+ strEqual(last_music_directory, music_directory))
+ return; /* old and new music directory are the same */
+
+ if (last_music_directory != NULL)
+ free(last_music_directory);
+ last_music_directory = getStringCopy(music_directory);
- AUDIO_INITINFO(&a_info);
- a_info.play.encoding = AUDIO_ENCODING_LINEAR8;
- a_info.play.precision = 8;
- a_info.play.channels = 2;
- a_info.play.sample_rate = sample_rate;
- a_info.blocksize = fragment_size;
+ FreeAllMusic_NoConf();
- if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0)
+ if ((dir = openDirectory(music_directory)) == NULL)
{
- /* try to disable stereo */
- a_info.play.channels = 1;
- stereo = FALSE;
+ Error(ERR_WARN, "cannot read music directory '%s'", music_directory);
- if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0)
- Error(ERR_EXIT_SOUND_SERVER,
- "cannot set sample rate of /dev/audio -- no sounds");
+ audio.music_available = FALSE;
+
+ return;
}
- return stereo;
-}
-#endif /* PLATFORM_NETBSD */
+ if (draw_init_text)
+ DrawInitText("Loading music", 120, FC_GREEN);
-#if defined(PLATFORM_HPUX)
-static boolean InitAudioDevice_HPUX()
-{
- struct audio_describe ainfo;
- int audio_ctl;
+ while ((dir_entry = readDirectory(dir)) != NULL) /* loop all entries */
+ {
+ char *basename = dir_entry->basename;
+ MusicInfo *mus_info = NULL;
+ boolean music_already_used = FALSE;
+ int i;
- audio_ctl = open("/dev/audioCtl", O_WRONLY | O_NDELAY);
- if (audio_ctl == -1)
- Error(ERR_EXIT_SOUND_SERVER, "cannot open /dev/audioCtl -- no sounds");
+ /* skip all music files that are configured in music config file */
+ for (i = 0; i < num_music; i++)
+ {
+ struct FileInfo *music = getMusicListEntry(i);
- if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1)
- Error(ERR_EXIT_SOUND_SERVER, "no audio info -- no sounds");
+ if (strEqual(basename, music->filename))
+ {
+ music_already_used = TRUE;
+ break;
+ }
+ }
- if (ioctl(audio_ctl, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) == -1)
- Error(ERR_EXIT_SOUND_SERVER, "ulaw audio not available -- no sounds");
+ if (music_already_used)
+ continue;
- ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1);
- ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000);
+ if (draw_init_text)
+ DrawInitText(basename, 150, FC_YELLOW);
- close(audio_ctl);
+ if (FileIsMusic(dir_entry->filename))
+ mus_info = Load_WAV_or_MOD(dir_entry->filename);
- return TRUE; /* to provide common interface for InitAudioDevice_...() */
+ if (mus_info)
+ {
+ num_music_noconf++;
+ Music_NoConf = checked_realloc(Music_NoConf,
+ num_music_noconf * sizeof(MusicInfo *));
+ Music_NoConf[num_music_noconf - 1] = mus_info;
+ }
+ }
+
+ closeDirectory(dir);
+
+ draw_init_text = FALSE;
}
-#endif /* PLATFORM_HPUX */
-
-#if defined(PLATFORM_UNIX) && !defined(AUDIO_STREAMING_DSP)
-
-/* these two are stolen from "sox"... :) */
-
-/*
-** This routine converts from linear to ulaw.
-**
-** Craig Reese: IDA/Supercomputing Research Center
-** Joe Campbell: Department of Defense
-** 29 September 1989
-**
-** References:
-** 1) CCITT Recommendation G.711 (very difficult to follow)
-** 2) "A New Digital Technique for Implementation of Any
-** Continuous PCM Companding Law," Villeret, Michel,
-** et al. 1973 IEEE Int. Conf. on Communications, Vol 1,
-** 1973, pg. 11.12-11.17
-** 3) MIL-STD-188-113,"Interoperability and Performance Standards
-** for Analog-to_Digital Conversion Techniques,"
-** 17 February 1987
-**
-** Input: Signed 16 bit linear sample
-** Output: 8 bit ulaw sample
-*/
-
-#define ZEROTRAP /* turn on the trap as per the MIL-STD */
-#define BIAS 0x84 /* define the add-in bias for 16 bit samples */
-#define CLIP 32635
-
-static unsigned char linear_to_ulaw(int sample)
+
+int getSoundListSize()
{
- static int exp_lut[256] =
- {
- 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,
- 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
- 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
- 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
- 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
- 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
- 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
- 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
- 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
- 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
- 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
- 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
- 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
- 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
- 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
- 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
- };
-
- int sign, exponent, mantissa;
- unsigned char ulawbyte;
-
- /* Get the sample into sign-magnitude. */
- sign = (sample >> 8) & 0x80; /* set aside the sign */
- if (sign != 0)
- sample = -sample; /* get magnitude */
- if (sample > CLIP)
- sample = CLIP; /* clip the magnitude */
-
- /* Convert from 16 bit linear to ulaw. */
- sample = sample + BIAS;
- exponent = exp_lut[( sample >> 7 ) & 0xFF];
- mantissa = ( sample >> ( exponent + 3 ) ) & 0x0F;
- ulawbyte = ~ ( sign | ( exponent << 4 ) | mantissa );
-#ifdef ZEROTRAP
- if (ulawbyte == 0)
- ulawbyte = 0x02; /* optional CCITT trap */
-#endif
+ return (sound_info->num_file_list_entries +
+ sound_info->num_dynamic_file_list_entries);
+}
- return(ulawbyte);
+int getMusicListSize()
+{
+ return (music_info->num_file_list_entries +
+ music_info->num_dynamic_file_list_entries);
}
-/*
-** This routine converts from ulaw to 16 bit linear.
-**
-** Craig Reese: IDA/Supercomputing Research Center
-** 29 September 1989
-**
-** References:
-** 1) CCITT Recommendation G.711 (very difficult to follow)
-** 2) MIL-STD-188-113,"Interoperability and Performance Standards
-** for Analog-to_Digital Conversion Techniques,"
-** 17 February 1987
-**
-** Input: 8 bit ulaw sample
-** Output: signed 16 bit linear sample
-*/
-
-static int ulaw_to_linear(unsigned char ulawbyte)
+struct FileInfo *getSoundListEntry(int pos)
{
- static int exp_lut[8] = { 0, 132, 396, 924, 1980, 4092, 8316, 16764 };
- int sign, exponent, mantissa, sample;
-
- ulawbyte = ~ ulawbyte;
- sign = ( ulawbyte & 0x80 );
- exponent = ( ulawbyte >> 4 ) & 0x07;
- mantissa = ulawbyte & 0x0F;
- sample = exp_lut[exponent] + ( mantissa << ( exponent + 3 ) );
- if (sign != 0)
- sample = -sample;
-
- return(sample);
+ int num_list_entries = sound_info->num_file_list_entries;
+ int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries);
+
+ return (pos < num_list_entries ? &sound_info->file_list[list_pos] :
+ &sound_info->dynamic_file_list[list_pos]);
}
-#endif /* PLATFORM_UNIX && !AUDIO_STREAMING_DSP */
+struct FileInfo *getMusicListEntry(int pos)
+{
+ int num_list_entries = music_info->num_file_list_entries;
+ int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries);
-/* THE STUFF ABOVE IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */
-/* ========================================================================= */
-/* THE STUFF BELOW IS ONLY USED BY THE MAIN PROCESS */
+ return (pos < num_list_entries ? &music_info->file_list[list_pos] :
+ &music_info->dynamic_file_list[list_pos]);
+}
-void ReloadSounds()
+static SoundInfo *getSoundInfoEntryFromSoundID(int pos)
{
- printf("reloading sounds ...\n");
+ int num_list_entries = sound_info->num_file_list_entries;
+ int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries);
+ SoundInfo **snd_info =
+ (SoundInfo **)(pos < num_list_entries ? sound_info->artwork_list :
+ sound_info->dynamic_artwork_list);
+
+ return snd_info[list_pos];
}
-void ReloadMusic()
+static MusicInfo *getMusicInfoEntryFromMusicID(int pos)
{
- printf("reloading music ...\n");
+ int num_list_entries = music_info->num_file_list_entries;
+ int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries);
+ MusicInfo **mus_info =
+ (MusicInfo **)(pos < num_list_entries ? music_info->artwork_list :
+ music_info->dynamic_artwork_list);
+
+ return mus_info[list_pos];
}
-#define CHUNK_ID_LEN 4 /* IFF style chunk id length */
-#define WAV_HEADER_SIZE 16 /* size of WAV file header */
+int getSoundListPropertyMappingSize()
+{
+ return sound_info->num_property_mapping_entries;
+}
-static boolean LoadSoundExt(char *sound_name, boolean is_music)
+int getMusicListPropertyMappingSize()
{
- struct SampleInfo *snd_info;
- char *filename;
-#if !defined(TARGET_SDL) && !defined(PLATFORM_MSDOS)
- byte sound_header_buffer[WAV_HEADER_SIZE];
- char chunk_name[CHUNK_ID_LEN + 1];
- int chunk_size;
- FILE *file;
- int i;
-#endif
+ return music_info->num_property_mapping_entries;
+}
- if (!audio.sound_available)
- return FALSE;
+struct PropertyMapping *getSoundListPropertyMapping()
+{
+ return sound_info->property_mapping;
+}
- num_sounds++;
- Sound = checked_realloc(Sound, num_sounds * sizeof(struct SampleInfo));
+struct PropertyMapping *getMusicListPropertyMapping()
+{
+ return music_info->property_mapping;
+}
- snd_info = &Sound[num_sounds - 1];
- snd_info->data_len = 0;
- snd_info->data_ptr = NULL;
-#if 0
- snd_info->name = sound_name;
-#endif
+void InitSoundList(struct ConfigInfo *config_list, int num_file_list_entries,
+ struct ConfigTypeInfo *config_suffix_list,
+ char **base_prefixes, char **ext1_suffixes,
+ char **ext2_suffixes, char **ext3_suffixes,
+ char **ignore_tokens)
+{
+ int i;
- if (is_music)
- filename = getPath2(options.music_directory, sound_name);
- else
- filename = getStringCopy(sound_name);
+ sound_info = checked_calloc(sizeof(struct ArtworkListInfo));
+ sound_info->type = ARTWORK_TYPE_SOUNDS;
-#if defined(TARGET_SDL)
+ /* ---------- initialize file list and suffix lists ---------- */
- if ((snd_info->mix_chunk = Mix_LoadWAV(filename)) == NULL)
- {
- Error(ERR_WARN, "cannot read sound file '%s'", filename);
- free(filename);
- return FALSE;
- }
+ sound_info->num_file_list_entries = num_file_list_entries;
+ sound_info->num_dynamic_file_list_entries = 0;
-#elif defined(PLATFORM_UNIX)
+ sound_info->file_list =
+ getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens,
+ num_file_list_entries);
+ sound_info->dynamic_file_list = NULL;
- if ((file = fopen(filename, MODE_READ)) == NULL)
- {
- Error(ERR_WARN, "cannot open sound file '%s'", filename);
- free(filename);
- return FALSE;
- }
+ sound_info->num_suffix_list_entries = 0;
+ for (i = 0; config_suffix_list[i].token != NULL; i++)
+ sound_info->num_suffix_list_entries++;
- /* read chunk id "RIFF" */
- getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN);
- if (strcmp(chunk_name, "RIFF") != 0)
- {
- Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename);
- fclose(file);
- free(filename);
- return FALSE;
- }
+ sound_info->suffix_list = config_suffix_list;
- /* read "RIFF" type id "WAVE" */
- getFileChunk(file, chunk_name, NULL, BYTE_ORDER_LITTLE_ENDIAN);
- if (strcmp(chunk_name, "WAVE") != 0)
- {
- Error(ERR_WARN, "missing 'WAVE' type ID of sound file '%s'", filename);
- fclose(file);
- free(filename);
- return FALSE;
- }
+ /* ---------- initialize base prefix and suffixes lists ---------- */
- while (getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN))
- {
-#if 0
- printf("DEBUG: file '%s', chunk id '%s', chunk size '%d' [%d]\n",
- filename, chunk_name, chunk_size, feof(file));
-#endif
+ sound_info->num_base_prefixes = 0;
+ for (i = 0; base_prefixes[i] != NULL; i++)
+ sound_info->num_base_prefixes++;
- if (strcmp(chunk_name, "fmt ") == 0)
- {
- /* read header information */
- for (i=0; i < MIN(chunk_size, WAV_HEADER_SIZE); i++)
- sound_header_buffer[i] = fgetc(file);
+ sound_info->num_ext1_suffixes = 0;
+ for (i = 0; ext1_suffixes[i] != NULL; i++)
+ sound_info->num_ext1_suffixes++;
- if (chunk_size > WAV_HEADER_SIZE)
- ReadUnusedBytesFromFile(file, chunk_size - WAV_HEADER_SIZE);
- }
- else if (strcmp(chunk_name, "data") == 0)
- {
- snd_info->data_len = chunk_size;
- snd_info->data_ptr = checked_malloc(snd_info->data_len);
+ sound_info->num_ext2_suffixes = 0;
+ for (i = 0; ext2_suffixes[i] != NULL; i++)
+ sound_info->num_ext2_suffixes++;
- /* read sound data */
- if (fread(snd_info->data_ptr, 1, snd_info->data_len, file) !=
- snd_info->data_len)
- {
- Error(ERR_WARN,"cannot read 'data' chunk of sound file '%s'",filename);
- fclose(file);
- free(filename);
- return FALSE;
- }
+ sound_info->num_ext3_suffixes = 0;
+ for (i = 0; ext3_suffixes[i] != NULL; i++)
+ sound_info->num_ext3_suffixes++;
- /* check for odd number of sample bytes (data chunk is word aligned) */
- if ((chunk_size % 2) == 1)
- ReadUnusedBytesFromFile(file, 1);
- }
- else /* unknown chunk -- ignore */
- ReadUnusedBytesFromFile(file, chunk_size);
- }
+ sound_info->num_ignore_tokens = 0;
+ for (i = 0; ignore_tokens[i] != NULL; i++)
+ sound_info->num_ignore_tokens++;
- fclose(file);
+ sound_info->base_prefixes = base_prefixes;
+ sound_info->ext1_suffixes = ext1_suffixes;
+ sound_info->ext2_suffixes = ext2_suffixes;
+ sound_info->ext3_suffixes = ext3_suffixes;
+ sound_info->ignore_tokens = ignore_tokens;
- if (snd_info->data_ptr == NULL)
- {
- Error(ERR_WARN, "missing 'data' chunk of sound file '%s'", filename);
- free(filename);
- return FALSE;
- }
+ sound_info->num_property_mapping_entries = 0;
- for (i=0; i<snd_info->data_len; i++)
- snd_info->data_ptr[i] = snd_info->data_ptr[i] ^ 0x80;
+ sound_info->property_mapping = NULL;
-#else /* PLATFORM_MSDOS */
+ /* ---------- initialize artwork reference and content lists ---------- */
- snd_info->sample_ptr = load_sample(filename);
- if (!snd_info->sample_ptr)
- {
- Error(ERR_WARN, "cannot read sound file '%s'", filename);
- return FALSE;
- }
+ sound_info->sizeof_artwork_list_entry = sizeof(SoundInfo *);
-#endif
+ sound_info->artwork_list =
+ checked_calloc(num_file_list_entries * sizeof(SoundInfo *));
+ sound_info->dynamic_artwork_list = NULL;
- free(filename);
+ sound_info->content_list = NULL;
- return TRUE;
-}
+ /* ---------- initialize artwork loading/freeing functions ---------- */
-boolean LoadSound(char *sound_name)
-{
- return LoadSoundExt(sound_name, FALSE);
+ sound_info->load_artwork = Load_WAV;
+ sound_info->free_artwork = FreeSound;
}
-boolean LoadCustomSound(char *basename)
+void InitMusicList(struct ConfigInfo *config_list, int num_file_list_entries,
+ struct ConfigTypeInfo *config_suffix_list,
+ char **base_prefixes, char **ext1_suffixes,
+ char **ext2_suffixes, char **ext3_suffixes,
+ char **ignore_tokens)
{
- char *filename = getCustomSoundFilename(basename);
+ int i;
- if (filename == NULL)
- {
- Error(ERR_WARN, "cannot find sound file '%s' -- no sounds", filename);
- return FALSE;
- }
+ music_info = checked_calloc(sizeof(struct ArtworkListInfo));
+ music_info->type = ARTWORK_TYPE_MUSIC;
- return LoadSound(filename);
-}
+ /* ---------- initialize file list and suffix lists ---------- */
-boolean LoadMod(char *mod_name)
-{
-#if defined(TARGET_SDL)
- struct SampleInfo *mod_info;
- char *filename;
+ music_info->num_file_list_entries = num_file_list_entries;
+ music_info->num_dynamic_file_list_entries = 0;
- num_mods++;
- Mod = checked_realloc(Mod, num_mods * sizeof(struct SampleInfo));
+ music_info->file_list =
+ getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens,
+ num_file_list_entries);
+ music_info->dynamic_file_list = NULL;
- mod_info = &Mod[num_mods - 1];
- mod_info->name = mod_name;
+ music_info->num_suffix_list_entries = 0;
+ for (i = 0; config_suffix_list[i].token != NULL; i++)
+ music_info->num_suffix_list_entries++;
- filename = getPath2(options.music_directory, mod_info->name);
+ music_info->suffix_list = config_suffix_list;
- if ((mod_info->mix_music = Mix_LoadMUS(filename)) == NULL)
- {
- Error(ERR_WARN, "cannot read music file '%s' -- no music", filename);
- free(filename);
- return FALSE;
- }
+ /* ---------- initialize base prefix and suffixes lists ---------- */
- free(filename);
+ music_info->num_base_prefixes = 0;
+ for (i = 0; base_prefixes[i] != NULL; i++)
+ music_info->num_base_prefixes++;
- return TRUE;
-#else
- return FALSE;
-#endif
-}
+ music_info->num_ext1_suffixes = 0;
+ for (i = 0; ext1_suffixes[i] != NULL; i++)
+ music_info->num_ext1_suffixes++;
-int LoadMusic(void)
-{
- DIR *dir;
- struct dirent *dir_entry;
- int num_wav_music = 0;
- int num_mod_music = 0;
+ music_info->num_ext2_suffixes = 0;
+ for (i = 0; ext2_suffixes[i] != NULL; i++)
+ music_info->num_ext2_suffixes++;
- if (!audio.sound_available)
- return 0;
+ music_info->num_ext3_suffixes = 0;
+ for (i = 0; ext3_suffixes[i] != NULL; i++)
+ music_info->num_ext3_suffixes++;
- if ((dir = opendir(options.music_directory)) == NULL)
- {
- Error(ERR_WARN, "cannot read music directory '%s'",
- options.music_directory);
- audio.music_available = FALSE;
- return 0;
- }
+ music_info->num_ignore_tokens = 0;
+ for (i = 0; ignore_tokens[i] != NULL; i++)
+ music_info->num_ignore_tokens++;
- while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */
- {
- char *filename = dir_entry->d_name;
+ music_info->base_prefixes = base_prefixes;
+ music_info->ext1_suffixes = ext1_suffixes;
+ music_info->ext2_suffixes = ext2_suffixes;
+ music_info->ext3_suffixes = ext3_suffixes;
+ music_info->ignore_tokens = ignore_tokens;
- if (FileIsSound(filename) && LoadSoundExt(filename, TRUE))
- num_wav_music++;
- else if (FileIsMusic(filename) && LoadMod(filename))
- num_mod_music++;
- }
+ music_info->num_property_mapping_entries = 0;
+
+ music_info->property_mapping = NULL;
+
+ /* ---------- initialize artwork reference and content lists ---------- */
- closedir(dir);
+ music_info->sizeof_artwork_list_entry = sizeof(MusicInfo *);
- if (num_wav_music == 0 && num_mod_music == 0)
- Error(ERR_WARN, "cannot find any valid music files in directory '%s'",
- options.music_directory);
+ music_info->artwork_list =
+ checked_calloc(num_file_list_entries * sizeof(MusicInfo *));
+ music_info->dynamic_artwork_list = NULL;
- num_music = (num_mod_music > 0 ? num_mod_music : num_wav_music);
+ music_info->content_list = NULL;
- audio.mods_available = (num_mod_music > 0);
- audio.music_available = (num_music > 0);
+ /* ---------- initialize artwork loading/freeing functions ---------- */
- return num_music;
+ music_info->load_artwork = Load_WAV_or_MOD;
+ music_info->free_artwork = FreeMusic;
}
void PlayMusic(int nr)
if (!audio.music_available)
return;
- if (!audio.mods_available)
- nr = num_sounds - num_music + nr;
-
-#if defined(TARGET_SDL)
- if (audio.mods_available) /* play MOD music */
- {
- Mix_PlayMusic(Mod[nr].mix_music, -1);
- Mix_VolumeMusic(SOUND_MAX_VOLUME); /* must be _after_ Mix_PlayMusic()! */
- }
- else /* play WAV music loop */
- {
- Mix_Volume(audio.music_channel, SOUND_MAX_VOLUME);
- Mix_PlayChannel(audio.music_channel, Sound[nr].mix_chunk, -1);
- }
-#else
- audio.music_nr = nr;
- PlaySoundLoop(nr);
-#endif
+ PlaySoundMusic(nr);
}
void PlaySound(int nr)
{
- PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_NO_LOOP);
+ if (!setup.sound_simple)
+ return;
+
+ PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_SOUND);
}
-void PlaySoundStereo(int nr, int stereo)
+void PlaySoundStereo(int nr, int stereo_position)
{
- PlaySoundExt(nr, PSND_MAX_VOLUME, stereo, PSND_NO_LOOP);
+ if (!setup.sound_simple)
+ return;
+
+ PlaySoundExt(nr, SOUND_MAX_VOLUME, stereo_position, SND_CTRL_PLAY_SOUND);
}
void PlaySoundLoop(int nr)
{
- PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_LOOP);
+ if (!setup.sound_loops)
+ return;
+
+ PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_LOOP);
}
-void PlaySoundExt(int nr, int volume, int stereo, boolean loop)
+void PlaySoundMusic(int nr)
{
- struct SoundControl snd_ctrl = emptySoundControl;
+ if (!setup.sound_music)
+ return;
+
+ PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_MUSIC);
+}
+
+void PlaySoundExt(int nr, int volume, int stereo_position, int state)
+{
+ SoundControl snd_ctrl;
if (!audio.sound_available ||
!audio.sound_enabled ||
audio.sound_deactivated)
return;
- if (volume<PSND_MIN_VOLUME)
- volume = PSND_MIN_VOLUME;
- else if (volume>PSND_MAX_VOLUME)
- volume = PSND_MAX_VOLUME;
-
- if (stereo<PSND_MAX_LEFT)
- stereo = PSND_MAX_LEFT;
- else if (stereo>PSND_MAX_RIGHT)
- stereo = PSND_MAX_RIGHT;
-
- snd_ctrl.nr = nr;
- snd_ctrl.volume = volume;
- snd_ctrl.stereo = stereo;
- snd_ctrl.loop = loop;
- snd_ctrl.active = TRUE;
- snd_ctrl.data_ptr = Sound[nr].data_ptr;
- snd_ctrl.data_len = Sound[nr].data_len;
-
-#if defined(TARGET_SDL)
- Mix_Volume(-1, SOUND_MAX_VOLUME);
- Mix_PlayChannel(-1, Sound[nr].mix_chunk, (loop ? -1 : 0));
-#elif defined(PLATFORM_UNIX)
- if (audio.soundserver_pid == 0) /* we are child process */
- return;
+ volume = SETUP_SOUND_VOLUME(volume, state);
- if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0)
- {
- Error(ERR_WARN, "cannot pipe to child process -- no sounds");
- audio.sound_available = audio.sound_enabled = FALSE;
- return;
- }
-#elif defined(PLATFORM_MSDOS)
- sound_handler(snd_ctrl);
-#endif
+ if (volume < SOUND_MIN_VOLUME)
+ volume = SOUND_MIN_VOLUME;
+ else if (volume > SOUND_MAX_VOLUME)
+ volume = SOUND_MAX_VOLUME;
+
+ if (stereo_position < SOUND_MAX_LEFT)
+ stereo_position = SOUND_MAX_LEFT;
+ else if (stereo_position > SOUND_MAX_RIGHT)
+ stereo_position = SOUND_MAX_RIGHT;
+
+ clear_mem(&snd_ctrl, sizeof(SoundControl)); /* to make valgrind happy */
+
+ snd_ctrl.active = TRUE;
+ snd_ctrl.nr = nr;
+ snd_ctrl.volume = volume;
+ snd_ctrl.stereo_position = stereo_position;
+ snd_ctrl.state = state;
+
+ HandleSoundRequest(snd_ctrl);
}
void FadeMusic(void)
{
-#if defined(TARGET_SDL)
- if (!audio.sound_available)
+ if (!audio.music_available)
return;
- if (audio.mods_available)
- Mix_FadeOutMusic(SOUND_FADING_INTERVAL);
- else
- Mix_FadeOutChannel(audio.music_channel, SOUND_FADING_INTERVAL);
-#else
- FadeSound(audio.music_nr);
-#endif
+ StopSoundExt(-1, SND_CTRL_FADE_MUSIC);
}
void FadeSound(int nr)
{
- StopSoundExt(nr, SSND_FADE_SOUND);
+ StopSoundExt(nr, SND_CTRL_FADE_SOUND);
}
void FadeSounds()
{
+ StopSoundExt(-1, SND_CTRL_FADE_ALL);
+}
+
+void FadeSoundsAndMusic()
+{
+ FadeSounds();
FadeMusic();
- StopSoundExt(-1, SSND_FADE_ALL_SOUNDS);
}
void StopMusic(void)
{
-#if defined(TARGET_SDL)
- if (!audio.sound_available)
+ if (!audio.music_available)
return;
- if (audio.mods_available)
- Mix_HaltMusic();
- else
- Mix_HaltChannel(audio.music_channel);
-#else
- StopSound(audio.music_nr);
-#endif
+ StopSoundExt(-1, SND_CTRL_STOP_MUSIC);
}
void StopSound(int nr)
{
- StopSoundExt(nr, SSND_STOP_SOUND);
+ StopSoundExt(nr, SND_CTRL_STOP_SOUND);
}
void StopSounds()
{
- StopSoundExt(-1, SSND_STOP_ALL_SOUNDS);
+ StopMusic();
+ StopSoundExt(-1, SND_CTRL_STOP_ALL);
}
-void StopSoundExt(int nr, int method)
+void StopSoundExt(int nr, int state)
{
- struct SoundControl snd_ctrl = emptySoundControl;
+ SoundControl snd_ctrl;
if (!audio.sound_available)
return;
- if (SSND_FADING(method))
- snd_ctrl.fade_sound = TRUE;
+ clear_mem(&snd_ctrl, sizeof(SoundControl)); /* to make valgrind happy */
- if (SSND_ALL(method))
- snd_ctrl.stop_all_sounds = TRUE;
- else
- {
- snd_ctrl.nr = nr;
- snd_ctrl.stop_sound = TRUE;
- }
+ snd_ctrl.active = FALSE;
+ snd_ctrl.nr = nr;
+ snd_ctrl.state = state;
-#if defined(TARGET_SDL)
+ HandleSoundRequest(snd_ctrl);
+}
- if (SSND_FADING(method))
- {
- int i;
+void ExpireSoundLoops(boolean active)
+{
+ SoundControl snd_ctrl;
- for (i=0; i<audio.channels; i++)
- if (i != audio.music_channel || snd_ctrl.stop_all_sounds)
- Mix_FadeOutChannel(i, SOUND_FADING_INTERVAL);
- if (snd_ctrl.stop_all_sounds)
- Mix_FadeOutMusic(SOUND_FADING_INTERVAL);
- }
- else
- {
- int i;
+ if (!audio.sound_available)
+ return;
- for (i=0; i<audio.channels; i++)
- if (i != audio.music_channel || snd_ctrl.stop_all_sounds)
- Mix_HaltChannel(i);
- if (snd_ctrl.stop_all_sounds)
- Mix_HaltMusic();
- }
+ clear_mem(&snd_ctrl, sizeof(SoundControl)); /* to make valgrind happy */
-#else
-#if !defined(PLATFORM_MSDOS)
- if (audio.soundserver_pid == 0) /* we are child process */
- return;
+ snd_ctrl.active = active;
+ snd_ctrl.state = SND_CTRL_EXPIRE_LOOPS;
- if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0)
- {
- Error(ERR_WARN, "cannot pipe to child process -- no sounds");
- audio.sound_available = audio.sound_enabled = FALSE;
- return;
- }
-#else
- sound_handler(snd_ctrl);
-#endif
-#endif
+ HandleSoundRequest(snd_ctrl);
+}
+
+static void ReloadCustomSounds()
+{
+ LoadArtworkConfig(sound_info);
+ ReloadCustomArtworkList(sound_info);
}
-void InitReloadSounds(char *set_name)
+static void ReloadCustomMusic()
{
- struct SoundControl snd_ctrl = emptySoundControl;
+ LoadArtworkConfig(music_info);
+ ReloadCustomArtworkList(music_info);
+ /* load all music files from directory not defined in "musicinfo.conf" */
+ LoadCustomMusic_NoConf();
+}
+
+void InitReloadCustomSounds(char *set_identifier)
+{
if (!audio.sound_available)
return;
- snd_ctrl.reload_sounds = TRUE;
+ ReloadCustomSounds();
+}
-#if defined(TARGET_SDL)
- ReloadSounds();
-#elif defined(PLATFORM_UNIX)
- if (audio.soundserver_pid == 0) /* we are child process */
+void InitReloadCustomMusic(char *set_identifier)
+{
+ if (!audio.music_available)
return;
- if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0)
- {
- Error(ERR_WARN, "cannot pipe to child process -- no sounds");
- audio.sound_available = audio.sound_enabled = FALSE;
- return;
- }
-#elif defined(PLATFORM_MSDOS)
- sound_handler(snd_ctrl);
-#endif
+ ReloadCustomMusic();
}
-void InitReloadMusic(char *set_name)
+void FreeSound(void *ptr)
{
- struct SoundControl snd_ctrl = emptySoundControl;
+ SoundInfo *sound = (SoundInfo *)ptr;
- if (!audio.sound_available)
+ if (sound == NULL)
return;
- snd_ctrl.reload_music = TRUE;
+ if (sound->data_ptr)
+ {
+ Mix_FreeChunk(sound->data_ptr);
+ }
-#if defined(TARGET_SDL)
- ReloadMusic();
-#elif defined(PLATFORM_UNIX)
- if (audio.soundserver_pid == 0) /* we are child process */
+ checked_free(sound->source_filename);
+
+ free(sound);
+}
+
+void FreeMusic(void *ptr)
+{
+ MusicInfo *music = (MusicInfo *)ptr;
+
+ if (music == NULL)
return;
- if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0)
+ if (music->data_ptr)
{
- Error(ERR_WARN, "cannot pipe to child process -- no sounds");
- audio.sound_available = audio.sound_enabled = FALSE;
- return;
+ if (music->type == MUS_TYPE_MOD)
+ Mix_FreeMusic(music->data_ptr);
+ else
+ Mix_FreeChunk(music->data_ptr);
}
-#elif defined(PLATFORM_MSDOS)
- sound_handler(snd_ctrl);
-#endif
+
+ free(music);
}
-void FreeSounds(int num_sounds)
+static void FreeAllMusic_NoConf()
{
int i;
- if (!audio.sound_available)
+ if (Music_NoConf == NULL)
return;
- for(i=0; i<num_sounds; i++)
-#if defined(TARGET_SDL)
- free(Sound[i].mix_chunk);
-#elif !defined(PLATFORM_MSDOS)
- free(Sound[i].data_ptr);
-#else
- destroy_sample(Sound[i].sample_ptr);
-#endif
+ for (i = 0; i < num_music_noconf; i++)
+ FreeMusic(Music_NoConf[i]);
+
+ free(Music_NoConf);
+
+ Music_NoConf = NULL;
+ num_music_noconf = 0;
+}
+
+void FreeAllSounds()
+{
+ FreeCustomArtworkLists(sound_info);
+}
+
+void FreeAllMusic()
+{
+ FreeCustomArtworkLists(music_info);
+ FreeAllMusic_NoConf();
}
/* THE STUFF ABOVE IS ONLY USED BY THE MAIN PROCESS */