/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2001 Artsoft Entertainment *
+* (c) 1994-2002 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
* sound.c *
***********************************************************/
-#include <string.h>
+#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 "platform.h"
+
+#if defined(PLATFORM_LINUX)
+#include <sys/ioctl.h>
+#include <linux/soundcard.h>
+#elif defined(PLATFORM_FREEBSD)
+#include <machine/soundcard.h>
+#elif defined(PLATFORM_NETBSD)
+#include <sys/ioctl.h>
+#include <sys/audioio.h>
+#elif defined(PLATFORM_HPUX)
+#include <sys/audio.h>
+#endif
#include "system.h"
#include "sound.h"
#include "misc.h"
#include "setup.h"
+#include "text.h"
+
+
+/* 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
+
+#if defined(AUDIO_STREAMING_DSP)
+#define SOUND_FADING_VOLUME_STEP (SOUND_MAX_VOLUME / 40)
+#define SOUND_FADING_VOLUME_THRESHOLD (SOUND_FADING_VOLUME_STEP * 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
+
+#define DEVICENAME_DSP "/dev/dsp"
+#define DEVICENAME_SOUND_DSP "/dev/sound/dsp"
+#define DEVICENAME_AUDIO "/dev/audio"
+#define DEVICENAME_AUDIOCTL "/dev/audioCtl"
+#define SOUND_VOLUME_LEFT(x) (stereo_volume[x])
+#define SOUND_VOLUME_RIGHT(x) (stereo_volume[SOUND_MAX_LEFT2RIGHT-x])
-struct ListNode
+#define SAME_SOUND_NR(x,y) ((x).nr == (y).nr)
+#define SAME_SOUND_DATA(x,y) ((x).data_ptr == (y).data_ptr)
+
+#if 0
+struct SoundHeader_SUN
+{
+ unsigned long magic;
+ unsigned long hdr_size;
+ unsigned long data_size;
+ unsigned long encoding;
+ unsigned long sample_rate;
+ unsigned long channels;
+};
+
+struct SoundHeader_8SVX
{
- char *key;
- void *content;
- struct ListNode *next;
+ char magic_FORM[4];
+ unsigned long chunk_size;
+ char magic_8SVX[4];
};
-typedef struct ListNode ListNode;
+#endif
-static ListNode *newListNode(void);
-static void addNodeToList(ListNode **, char *, void *);
-static void deleteNodeFromList(ListNode **, char *, void (*function)(void *));
-static ListNode *getNodeFromKey(ListNode *, char *);
-static int getNumNodes(ListNode *);
+#if defined(AUDIO_UNIX_NATIVE)
+struct SoundHeader_WAV
+{
+ unsigned short compression_code;
+ unsigned short num_channels;
+ unsigned long sample_rate;
+ unsigned long bytes_per_second;
+ unsigned short block_align;
+ unsigned short bits_per_sample;
+};
+#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 SampleInfo
+{
+ char *source_filename;
+ int num_references;
-static struct SoundEffectInfo *sound_effect;
-static ListNode *SoundFileList = NULL;
+ int type;
+ int format;
+ void *data_ptr; /* pointer to first sample (8 or 16 bit) */
+ long 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;
+
+struct SoundControl
+{
+ boolean active;
+
+ int nr;
+ int volume;
+ int stereo_position;
+
+ int state;
+
+ unsigned long playing_starttime;
+ unsigned long playing_pos;
+
+ int type;
+ int format;
+ void *data_ptr; /* pointer to first sample (8 or 16 bit) */
+ long data_len; /* number of samples, NOT number of bytes */
+ int num_channels; /* mono: 1 channel, stereo: 2 channels */
+
+#if defined(TARGET_ALLEGRO)
+ int voice;
+#endif
+};
+typedef struct SoundControl SoundControl;
+
+static struct ArtworkListInfo *sound_info = NULL;
+static struct ArtworkListInfo *music_info = NULL;
+
+#if 0
static SoundInfo **Sound = NULL;
-static MusicInfo **Music = NULL;
-static int num_sounds = 0, num_music = 0;
+#endif
+
+static MusicInfo **Music_NoConf = NULL;
+
+#if 0
+static int num_sounds = 0;
+#endif
+
+static int num_music_noconf = 0;
+static int stereo_volume[SOUND_MAX_LEFT2RIGHT + 1];
/* ========================================================================= */
/* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */
-static struct AudioFormatInfo afmt;
static struct SoundControl mixer[NUM_MIXER_CHANNELS];
static int mixer_active_channels = 0;
-/* forward declaration of internal functions */
-static void InitAudioDevice(struct AudioFormatInfo *);
-static void Mixer_Main(void);
+#if defined(AUDIO_UNIX_NATIVE)
+static struct AudioFormatInfo afmt;
-#if defined(PLATFORM_UNIX) && !defined(AUDIO_STREAMING_DSP)
+static void Mixer_Main(void);
+#if !defined(AUDIO_STREAMING_DSP)
static unsigned char linear_to_ulaw(int);
static int ulaw_to_linear(unsigned char);
#endif
+#endif
static void ReloadCustomSounds();
static void ReloadCustomMusic();
static void FreeSound(void *);
+static void FreeMusic(void *);
+static void FreeAllMusic_NoConf();
+
+static SoundInfo *getSoundInfoEntryFromSoundID(int);
+static MusicInfo *getMusicInfoEntryFromMusicID(int);
+
+
+/* ------------------------------------------------------------------------- */
+/* functions for native (non-SDL) Unix audio/mixer support */
+/* ------------------------------------------------------------------------- */
+
+#if defined(AUDIO_UNIX_NATIVE)
-#if defined(PLATFORM_UNIX)
static int OpenAudioDevice(char *audio_device_name)
{
int audio_device_fd;
static char *audio_device_name[] =
{
DEVICENAME_DSP,
+ DEVICENAME_SOUND_DSP,
DEVICENAME_AUDIO
};
int audio_device_fd = -1;
int i;
/* look for available audio devices, starting with preferred ones */
- for (i=0; i<sizeof(audio_device_name)/sizeof(char *); i++)
+ for (i = 0; i < sizeof(audio_device_name)/sizeof(char *); i++)
if ((audio_device_fd = OpenAudioDevice(audio_device_name[i])) >= 0)
break;
return TRUE;
}
-#if !defined(TARGET_SDL)
static boolean ForkAudioProcess(void)
{
if (pipe(audio.mixer_pipe) < 0)
return FALSE;
}
- if (audio.mixer_pid == 0) /* we are child process */
- {
- Mixer_Main();
+ if (audio.mixer_pid == 0) /* we are the child process */
+ audio.mixer_pid = getpid();
- /* never reached */
- exit(0);
- }
- else /* we are parent */
- close(audio.mixer_pipe[0]); /* no reading from pipe needed */
+#if 0
+ printf("PID: %d [%s]\n", getpid(),(IS_CHILD_PROCESS() ? "child" : "parent"));
+ Delay(10000 * 0);
+#endif
+
+ if (IS_CHILD_PROCESS())
+ Mixer_Main(); /* this function never returns */
+ else
+ close(audio.mixer_pipe[0]); /* no reading from pipe needed */
return TRUE;
}
-#endif
void UnixOpenAudio(void)
{
if (audio.device_fd)
close(audio.device_fd);
- if (audio.mixer_pid > 0) /* we are parent process */
+ if (IS_PARENT_PROCESS() && HAS_CHILD_PROCESS())
kill(audio.mixer_pid, SIGTERM);
}
-static void WriteReloadInfoToPipe(char *set_name, int type)
+
+/* ------------------------------------------------------------------------- */
+/* functions for platform specific audio device initialization */
+/* ------------------------------------------------------------------------- */
+
+#if defined(AUDIO_LINUX_IOCTL)
+static void InitAudioDevice_Linux(struct AudioFormatInfo *afmt)
+{
+ /* "ioctl()" expects pointer to 'int' value for stereo flag
+ (boolean is defined as 'char', which will not work here) */
+ unsigned int fragment_spec = 0;
+ int fragment_size_query = -1;
+ int stereo = TRUE;
+ struct
+ {
+ int format_ioctl;
+ int format_result;
+ }
+ formats[] =
+ {
+ /* supported audio format in preferred order */
+ { AFMT_S16_LE, AUDIO_FORMAT_S16 | AUDIO_FORMAT_LE },
+ { AFMT_S16_BE, AUDIO_FORMAT_S16 | AUDIO_FORMAT_BE },
+ { AFMT_U8, AUDIO_FORMAT_U8 },
+ { -1, -1 }
+ };
+ int i;
+
+ /* determine logarithm (log2) of the fragment size */
+ while ((1 << fragment_spec) < afmt->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 audio device -- no sounds");
+
+ i = 0;
+ afmt->format = 0;
+ while (formats[i].format_result != -1)
+ {
+ unsigned int audio_format = formats[i].format_ioctl;
+ if (ioctl(audio.device_fd, SNDCTL_DSP_SETFMT, &audio_format) == 0)
+ {
+ afmt->format = formats[i].format_result;
+ break;
+ }
+ }
+
+ if (afmt->format == 0) /* no supported audio format found */
+ Error(ERR_EXIT_SOUND_SERVER,
+ "cannot set audio format of audio device -- no sounds");
+
+ /* try if we can use stereo sound */
+ afmt->stereo = TRUE;
+ if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0)
+ afmt->stereo = FALSE;
+
+ if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &afmt->sample_rate) < 0)
+ Error(ERR_EXIT_SOUND_SERVER,
+ "cannot set sample rate of audio device -- no sounds");
+
+ /* get the real fragmentation size; this should return 512 */
+ if (ioctl(audio.device_fd, SNDCTL_DSP_GETBLKSIZE, &fragment_size_query) < 0)
+ Error(ERR_EXIT_SOUND_SERVER,
+ "cannot get fragment size of audio device -- no sounds");
+ if (fragment_size_query != afmt->fragment_size)
+ Error(ERR_EXIT_SOUND_SERVER,
+ "cannot set fragment size of audio device -- no sounds");
+}
+#endif /* AUDIO_LINUX_IOCTL */
+
+#if defined(PLATFORM_NETBSD)
+static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt)
{
- struct SoundControl snd_ctrl;
+ audio_info_t a_info;
+ boolean stereo = TRUE;
+
+ 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 = afmt->sample_rate;
+ a_info.blocksize = afmt->fragment_size;
+
+ afmt->format = AUDIO_FORMAT_U8;
+ afmt->stereo = TRUE;
+
+ if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0)
+ {
+ /* try to disable stereo */
+ a_info.play.channels = 1;
+
+ afmt->stereo = FALSE;
+
+ if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0)
+ Error(ERR_EXIT_SOUND_SERVER,
+ "cannot set sample rate of audio device -- no sounds");
+ }
+}
+#endif /* PLATFORM_NETBSD */
+
+#if defined(PLATFORM_HPUX)
+static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt)
+{
+ struct audio_describe ainfo;
+ int audio_ctl;
+
+ audio_ctl = open("/dev/audioCtl", O_WRONLY | O_NDELAY);
+ if (audio_ctl == -1)
+ Error(ERR_EXIT_SOUND_SERVER, "cannot open audio device -- no sounds");
+
+ if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1)
+ Error(ERR_EXIT_SOUND_SERVER, "no audio info -- no sounds");
+
+ if (ioctl(audio_ctl, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) == -1)
+ Error(ERR_EXIT_SOUND_SERVER, "ulaw audio not available -- no sounds");
+
+ ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1);
+ ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000);
+
+ afmt->format = AUDIO_FORMAT_U8;
+ afmt->stereo = FALSE;
+ afmt->sample_rate = 8000;
+
+ close(audio_ctl);
+}
+#endif /* PLATFORM_HPUX */
+
+static void InitAudioDevice(struct AudioFormatInfo *afmt)
+{
+ afmt->stereo = TRUE;
+ afmt->format = AUDIO_FORMAT_UNKNOWN;
+ afmt->sample_rate = DEFAULT_AUDIO_SAMPLE_RATE;
+ afmt->fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE;
+
+#if defined(AUDIO_LINUX_IOCTL)
+ InitAudioDevice_Linux(afmt);
+#elif defined(PLATFORM_NETBSD)
+ InitAudioDevice_NetBSD(afmt);
+#elif defined(PLATFORM_HPUX)
+ InitAudioDevice_HPUX(afmt);
+#else
+ /* generic /dev/audio stuff might be placed here */
+#endif
+}
+
+
+/* ------------------------------------------------------------------------- */
+/* functions for communication between main process and sound mixer process */
+/* ------------------------------------------------------------------------- */
+
+static void SendSoundControlToMixerProcess(SoundControl *snd_ctrl)
+{
+ if (IS_CHILD_PROCESS())
+ return;
+
+ if (write(audio.mixer_pipe[1], snd_ctrl, sizeof(SoundControl)) < 0)
+ {
+ Error(ERR_WARN, "cannot pipe to child process -- no sounds");
+ audio.sound_available = audio.sound_enabled = FALSE;
+ return;
+ }
+}
+
+static void ReadSoundControlFromMainProcess(SoundControl *snd_ctrl)
+{
+ if (IS_PARENT_PROCESS())
+ return;
+
+ if (read(audio.mixer_pipe[0], snd_ctrl, sizeof(SoundControl))
+ != sizeof(SoundControl))
+ Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
+}
+
+static void WriteReloadInfoToPipe(char *set_identifier, int type)
+{
+ SoundControl snd_ctrl;
TreeInfo *ti = (type == SND_CTRL_RELOAD_SOUNDS ? artwork.snd_current :
artwork.mus_current);
unsigned long str_size1 = strlen(leveldir_current->fullpath) + 1;
- unsigned long str_size2 = strlen(ti->basepath) + 1;
- unsigned long str_size3 = strlen(ti->fullpath) + 1;
-
- if (audio.mixer_pid == 0) /* we are child process */
+ unsigned long str_size2 = strlen(leveldir_current->sounds_path) + 1;
+ unsigned long str_size3 = strlen(leveldir_current->music_path) + 1;
+ unsigned long str_size4 = strlen(ti->basepath) + 1;
+ unsigned long str_size5 = strlen(ti->fullpath) + 1;
+ boolean override_level_artwork = (type == SND_CTRL_RELOAD_SOUNDS ?
+ setup.override_level_sounds :
+ setup.override_level_music);
+
+ if (IS_CHILD_PROCESS())
return;
if (leveldir_current == NULL) /* should never happen */
Error(ERR_EXIT, "leveldir_current == NULL");
+ memset(&snd_ctrl, 0, sizeof(SoundControl)); /* to make valgrind happy */
+
snd_ctrl.active = FALSE;
snd_ctrl.state = type;
- snd_ctrl.data_len = strlen(set_name) + 1;
+ snd_ctrl.data_len = strlen(set_identifier) + 1;
if (write(audio.mixer_pipe[1], &snd_ctrl,
sizeof(snd_ctrl)) < 0 ||
- write(audio.mixer_pipe[1], set_name,
+ write(audio.mixer_pipe[1], set_identifier,
snd_ctrl.data_len) < 0 ||
+ write(audio.mixer_pipe[1], &override_level_artwork,
+ sizeof(boolean)) < 0 ||
write(audio.mixer_pipe[1], leveldir_current,
sizeof(TreeInfo)) < 0 ||
write(audio.mixer_pipe[1], ti,
sizeof(unsigned long)) < 0 ||
write(audio.mixer_pipe[1], &str_size3,
sizeof(unsigned long)) < 0 ||
+ write(audio.mixer_pipe[1], &str_size4,
+ sizeof(unsigned long)) < 0 ||
+ write(audio.mixer_pipe[1], &str_size5,
+ sizeof(unsigned long)) < 0 ||
write(audio.mixer_pipe[1], leveldir_current->fullpath,
str_size1) < 0 ||
- write(audio.mixer_pipe[1], ti->basepath,
+ write(audio.mixer_pipe[1], leveldir_current->sounds_path,
str_size2) < 0 ||
+ write(audio.mixer_pipe[1], leveldir_current->music_path,
+ str_size3) < 0 ||
+ write(audio.mixer_pipe[1], ti->basepath,
+ str_size4) < 0 ||
write(audio.mixer_pipe[1], ti->fullpath,
- str_size3) < 0)
+ str_size5) < 0)
{
Error(ERR_WARN, "cannot pipe to child process -- no sounds");
audio.sound_available = audio.sound_enabled = FALSE;
}
}
-static void ReadReloadInfoFromPipe(struct SoundControl snd_ctrl)
+static void ReadReloadInfoFromPipe(SoundControl *snd_ctrl)
{
- TreeInfo **ti_ptr = ((snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS) ?
+ TreeInfo **ti_ptr = ((snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS) ?
&artwork.snd_current : &artwork.mus_current);
TreeInfo *ti = *ti_ptr;
- unsigned long str_size1, str_size2, str_size3;
- static char *set_name = NULL;
+ unsigned long str_size1, str_size2, str_size3, str_size4, str_size5;
+ static char *set_identifier = NULL;
+ boolean *override_level_artwork = (snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS ?
+ &setup.override_level_sounds :
+ &setup.override_level_music);
- if (set_name)
- free(set_name);
+ checked_free(set_identifier);
- set_name = checked_malloc(snd_ctrl.data_len);
+ set_identifier = checked_malloc(snd_ctrl->data_len);
if (leveldir_current == NULL)
leveldir_current = checked_calloc(sizeof(TreeInfo));
+
if (ti == NULL)
ti = *ti_ptr = checked_calloc(sizeof(TreeInfo));
- if (leveldir_current->fullpath != NULL)
- free(leveldir_current->fullpath);
- if (ti->basepath != NULL)
- free(ti->basepath);
- if (ti->fullpath != NULL)
- free(ti->fullpath);
-
- if (read(audio.mixer_pipe[0], set_name,
- snd_ctrl.data_len) != snd_ctrl.data_len ||
+
+ checked_free(leveldir_current->fullpath);
+ checked_free(leveldir_current->sounds_path);
+ checked_free(leveldir_current->music_path);
+ checked_free(ti->basepath);
+ checked_free(ti->fullpath);
+
+ if (read(audio.mixer_pipe[0], set_identifier,
+ snd_ctrl->data_len) != snd_ctrl->data_len ||
+ read(audio.mixer_pipe[0], override_level_artwork,
+ sizeof(boolean)) != sizeof(boolean) ||
read(audio.mixer_pipe[0], leveldir_current,
sizeof(TreeInfo)) != sizeof(TreeInfo) ||
read(audio.mixer_pipe[0], ti,
read(audio.mixer_pipe[0], &str_size2,
sizeof(unsigned long)) != sizeof(unsigned long) ||
read(audio.mixer_pipe[0], &str_size3,
+ sizeof(unsigned long)) != sizeof(unsigned long) ||
+ read(audio.mixer_pipe[0], &str_size4,
+ sizeof(unsigned long)) != sizeof(unsigned long) ||
+ read(audio.mixer_pipe[0], &str_size5,
sizeof(unsigned long)) != sizeof(unsigned long))
Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
leveldir_current->fullpath = checked_calloc(str_size1);
- ti->basepath = checked_calloc(str_size2);
- ti->fullpath = checked_calloc(str_size3);
+ leveldir_current->sounds_path = checked_calloc(str_size2);
+ leveldir_current->music_path = checked_calloc(str_size3);
+ ti->basepath = checked_calloc(str_size4);
+ ti->fullpath = checked_calloc(str_size5);
if (read(audio.mixer_pipe[0], leveldir_current->fullpath,
str_size1) != str_size1 ||
- read(audio.mixer_pipe[0], ti->basepath,
+ read(audio.mixer_pipe[0], leveldir_current->sounds_path,
str_size2) != str_size2 ||
+ read(audio.mixer_pipe[0], leveldir_current->music_path,
+ str_size3) != str_size3 ||
+ read(audio.mixer_pipe[0], ti->basepath,
+ str_size4) != str_size4 ||
read(audio.mixer_pipe[0], ti->fullpath,
- str_size3) != str_size3)
+ str_size5) != str_size5)
Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
- if (snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS)
- artwork.sounds_set_current = set_name;
+ if (snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS)
+ artwork.snd_current_identifier = set_identifier;
else
- artwork.music_set_current = set_name;
+ artwork.mus_current_identifier = set_identifier;
}
-#endif /* PLATFORM_UNIX */
+
+#endif /* AUDIO_UNIX_NATIVE */
+
+
+/* ------------------------------------------------------------------------- */
+/* mixer functions */
+/* ------------------------------------------------------------------------- */
void Mixer_InitChannels()
{
int i;
- for(i=0; i<audio.num_channels; i++)
+ for (i = 0; i < audio.num_channels; i++)
mixer[i].active = FALSE;
mixer_active_channels = 0;
}
-static void Mixer_PlayChannel(int channel)
+static void Mixer_ResetChannelExpiration(int channel)
{
-#if defined(PLATFORM_MSDOS)
- mixer[channel].voice = allocate_voice((SAMPLE *)mixer[channel].data_ptr);
+ mixer[channel].playing_starttime = Counter();
+#if defined(TARGET_SDL)
+ if (IS_LOOP(mixer[channel]) && !IS_MUSIC(mixer[channel]))
+ Mix_ExpireChannel(channel, SOUND_LOOP_EXPIRATION_TIME);
+#endif
+}
+
+static boolean Mixer_ChannelExpired(int channel)
+{
+ if (!mixer[channel].active)
+ return TRUE;
+
+ if (IS_LOOP(mixer[channel]) && !IS_MUSIC(mixer[channel]) &&
+ DelayReached(&mixer[channel].playing_starttime,
+ SOUND_LOOP_EXPIRATION_TIME))
+ return TRUE;
+
+#if defined(TARGET_SDL)
+
+ if (!Mix_Playing(channel))
+ return TRUE;
+
+#elif defined(TARGET_ALLEGRO)
+
+ mixer[channel].playing_pos = voice_get_position(mixer[channel].voice);
+ mixer[channel].volume = voice_get_volume(mixer[channel].voice);
+
+ /* sound sample has completed playing or was completely faded out */
+ if (mixer[channel].playing_pos == -1 || mixer[channel].volume == 0)
+ return TRUE;
+
+#endif /* TARGET_ALLEGRO */
+
+ return FALSE;
+}
+
+static boolean Mixer_AllocateChannel(int channel)
+{
+#if defined(TARGET_ALLEGRO)
+ mixer[channel].voice = allocate_voice((SAMPLE *)mixer[channel].data_ptr);
if (mixer[channel].voice < 0)
- return;
+ return FALSE;
+#endif
+ return TRUE;
+}
+
+static void Mixer_SetChannelProperties(int channel)
+{
+#if defined(TARGET_SDL)
+ Mix_Volume(channel, mixer[channel].volume);
+ Mix_SetPanning(channel,
+ SOUND_VOLUME_LEFT(mixer[channel].stereo_position),
+ SOUND_VOLUME_RIGHT(mixer[channel].stereo_position));
+#elif defined(TARGET_ALLEGRO)
+ voice_set_volume(mixer[channel].voice, mixer[channel].volume);
+ voice_set_pan(mixer[channel].voice, mixer[channel].stereo_position);
+#endif
+}
+
+static void Mixer_StartChannel(int channel)
+{
+#if defined(TARGET_SDL)
+ Mix_PlayChannel(channel, mixer[channel].data_ptr,
+ IS_LOOP(mixer[channel]) ? -1 : 0);
+#elif defined(TARGET_ALLEGRO)
if (IS_LOOP(mixer[channel]))
voice_set_playmode(mixer[channel].voice, PLAYMODE_LOOP);
- voice_set_volume(mixer[channel].voice, snd_ctrl.volume);
- voice_set_pan(mixer[channel].voice, snd_ctrl.stereo);
voice_start(mixer[channel].voice);
#endif
}
+static void Mixer_PlayChannel(int channel)
+{
+ /* start with inactive channel in case something goes wrong */
+ mixer[channel].active = FALSE;
+
+ if (mixer[channel].type != MUS_TYPE_WAV)
+ return;
+
+ if (!Mixer_AllocateChannel(channel))
+ return;
+
+ Mixer_SetChannelProperties(channel);
+ Mixer_StartChannel(channel);
+
+ Mixer_ResetChannelExpiration(channel);
+
+ mixer[channel].playing_pos = 0;
+ mixer[channel].active = TRUE;
+ mixer_active_channels++;
+}
+
+static void Mixer_PlayMusicChannel()
+{
+ Mixer_PlayChannel(audio.music_channel);
+
+#if defined(TARGET_SDL)
+ 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(SOUND_MAX_VOLUME);
+ }
+#endif
+}
+
static void Mixer_StopChannel(int channel)
{
-#if defined(PLATFORM_MSDOS)
+ if (!mixer[channel].active)
+ return;
+
+#if defined(TARGET_SDL)
+ Mix_HaltChannel(channel);
+#elif defined(TARGET_ALLEGRO)
voice_set_volume(mixer[channel].voice, 0);
deallocate_voice(mixer[channel].voice);
#endif
+
+ mixer[channel].active = FALSE;
+ mixer_active_channels--;
+}
+
+static void Mixer_StopMusicChannel()
+{
+ Mixer_StopChannel(audio.music_channel);
+
+#if defined(TARGET_SDL)
+ Mix_HaltMusic();
+#endif
}
static void Mixer_FadeChannel(int channel)
{
+ if (!mixer[channel].active)
+ return;
+
mixer[channel].state |= SND_CTRL_FADE;
-#if defined(PLATFORM_MSDOS)
+#if defined(TARGET_SDL)
+ Mix_FadeOutChannel(channel, SOUND_FADING_INTERVAL);
+#elif defined(TARGET_ALLEGRO)
if (voice_check(mixer[channel].voice))
- voice_ramp_volume(mixer[channel].voice, 1000, 0);
- mixer[channel].state &= ~SND_CTRL_IS_LOOP;
+ voice_ramp_volume(mixer[channel].voice, SOUND_FADING_INTERVAL, 0);
#endif
}
-static void Mixer_RemoveSound(int channel)
+static void Mixer_FadeMusicChannel()
{
- if (!mixer_active_channels || !mixer[channel].active)
- return;
+ Mixer_FadeChannel(audio.music_channel);
-#if 0
- printf("REMOVING MIXER SOUND %d\n", channel);
+#if defined(TARGET_SDL)
+ Mix_FadeOutMusic(SOUND_FADING_INTERVAL);
#endif
+}
- Mixer_StopChannel(channel);
+static void Mixer_UnFadeChannel(int channel)
+{
+ if (!mixer[channel].active || !IS_FADING(mixer[channel]))
+ return;
- mixer[channel].active = FALSE;
- mixer_active_channels--;
+ mixer[channel].state &= ~SND_CTRL_FADE;
+ mixer[channel].volume = SOUND_MAX_VOLUME;
+
+#if defined(TARGET_SDL)
+ Mix_ExpireChannel(channel, -1);
+ Mix_Volume(channel, mixer[channel].volume);
+#elif defined(TARGET_ALLEGRO)
+ voice_stop_volumeramp(mixer[channel].voice);
+ voice_ramp_volume(mixer[channel].voice, SOUND_FADING_INTERVAL,
+ mixer[channel].volume);
+#endif
}
-static void Mixer_InsertSound(struct SoundControl snd_ctrl)
+static void Mixer_InsertSound(SoundControl snd_ctrl)
{
SoundInfo *snd_info;
int i, k;
+ int num_sounds = getSoundListSize();
+ int num_music = getMusicListSize();
+
+#if 0
+ if (IS_MUSIC(snd_ctrl))
+ printf("NEW MUSIC %d ARRIVED [%d/%d] [%d ACTIVE CHANNELS]\n",
+ snd_ctrl.nr, num_music, num_music_noconf, mixer_active_channels);
+ else
+ printf("NEW SOUND %d ARRIVED [%d] [%d ACTIVE CHANNELS]\n",
+ snd_ctrl.nr, num_sounds, mixer_active_channels);
+#endif
#if 0
- printf("NEW SOUND %d HAS ARRIVED [%d]\n", snd_ctrl.nr, num_sounds);
+ /* !!! TEST ONLY !!! */
+ if (IS_MUSIC(snd_ctrl))
+ snd_ctrl.nr = 0;
#endif
+#if 1
+ if (IS_MUSIC(snd_ctrl))
+ {
+ if (snd_ctrl.nr >= num_music) /* invalid music */
+ return;
+
+ 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.nr < 0 || snd_ctrl.nr >= num_sounds)
+ return;
+
+ snd_info = getSoundInfoEntryFromSoundID(snd_ctrl.nr);
+ }
+
+ /*
+ if (snd_ctrl.nr >= (IS_MUSIC(snd_ctrl) ? num_music : num_sounds))
+ return;
+ */
+#else
if (IS_MUSIC(snd_ctrl))
- snd_ctrl.nr = snd_ctrl.nr % num_music;
+ {
+ if (num_music_noconf == 0)
+ return;
+
+ snd_ctrl.nr = snd_ctrl.nr % num_music_noconf;
+ }
else if (snd_ctrl.nr >= num_sounds)
return;
+#endif
+
+#if 0
+#if 1
+ snd_info = (IS_MUSIC(snd_ctrl) ? getMusicInfoEntryFromMusicID(snd_ctrl.nr) :
+ getSoundInfoEntryFromSoundID(snd_ctrl.nr));
+#else
+ snd_info = (IS_MUSIC(snd_ctrl) ? Music_NoConf[snd_ctrl.nr] :
+ getSoundInfoEntryFromSoundID(snd_ctrl.nr));
+#endif
+#endif
- snd_info = (IS_MUSIC(snd_ctrl) ? Music[snd_ctrl.nr] : Sound[snd_ctrl.nr]);
if (snd_info == NULL)
+ return;
+
+ /* 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;
+
+ /* play music samples on a dedicated music channel */
+ if (IS_MUSIC(snd_ctrl))
{
#if 0
- printf("sound/music %d undefined\n", snd_ctrl.nr);
+ printf("::: slot %d, ptr 0x%08x\n", snd_ctrl.nr, snd_ctrl.data_ptr);
#endif
+
+ Mixer_StopMusicChannel();
+
+ mixer[audio.music_channel] = snd_ctrl;
+ Mixer_PlayMusicChannel();
+
return;
}
+ /* 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++;
+
#if 0
- printf("-> %d\n", mixer_active_channels);
+ printf("SOUND %d [CURRENTLY PLAYING %d TIMES]\n", snd_ctrl.nr, k);
#endif
- if (mixer_active_channels == audio.num_channels)
+ /* reset expiration delay for already playing loop sounds */
+ if (k > 0 && IS_LOOP(snd_ctrl))
{
- for (i=0; i<audio.num_channels; i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
- if (mixer[i].data_ptr == NULL)
+ if (mixer[i].active && SAME_SOUND_DATA(mixer[i], snd_ctrl))
{
-#if 1
- printf("THIS SHOULD NEVER HAPPEN! [%d]\n", i);
+#if 0
+ printf("RESETTING EXPIRATION FOR SOUND %d\n", snd_ctrl.nr);
#endif
- Mixer_RemoveSound(i);
+ 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);
+
+#if 0
+ printf("RESETTING VOLUME/STEREO FOR SOUND %d TO %d/%d\n",
+ snd_ctrl.nr, snd_ctrl.volume, snd_ctrl.stereo_position);
+#endif
}
}
+
+ return;
}
- /* if mixer is full, remove oldest sound */
- if (mixer_active_channels == audio.num_channels)
+#if 0
+ printf("PLAYING NEW SOUND %d\n", snd_ctrl.nr);
+#endif
+
+ /* don't play sound more than n times simultaneously (with n == 2 for now) */
+ if (k >= 2)
{
+ unsigned long playing_current = Counter();
int longest = 0, longest_nr = audio.first_sound_channel;
- for (i=audio.first_sound_channel; i<audio.num_channels; i++)
+ /* look for oldest equal sound */
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
-#if !defined(PLATFORM_MSDOS)
- int actual = 100 * mixer[i].playingpos / mixer[i].data_len;
-#else
- int actual = mixer[i].playingpos;
-#endif
+ int playing_time = playing_current - mixer[i].playing_starttime;
+ int actual;
- if (!IS_LOOP(mixer[i]) && actual > longest)
+ if (!mixer[i].active || !SAME_SOUND_NR(mixer[i], snd_ctrl))
+ continue;
+
+ actual = 1000 * playing_time / mixer[i].data_len;
+
+ if (actual >= longest)
{
longest = actual;
longest_nr = i;
}
}
- Mixer_RemoveSound(longest_nr);
+ Mixer_StopChannel(longest_nr);
}
- /* check if sound is already being played (and how often) */
- for (k=0, i=audio.first_sound_channel; i<audio.num_channels; i++)
- if (mixer[i].nr == snd_ctrl.nr)
- k++;
+ /* 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. */
- /* restart loop sounds only if they are just fading out */
- if (k >= 1 && IS_LOOP(snd_ctrl))
+#if DEBUG
+ /* channel allocation sanity check -- should not be needed */
+ if (mixer_active_channels ==
+ audio.num_channels - (mixer[audio.music_channel].active ? 0 : 1))
{
- for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
- if (mixer[i].nr == snd_ctrl.nr && IS_FADING(mixer[i]))
+ if (!mixer[i].active)
{
- mixer[i].state &= ~SND_CTRL_FADE;
- mixer[i].volume = PSND_MAX_VOLUME;
-#if defined(PLATFORM_MSDOS)
- mixer[i].state |= SND_CTRL_LOOP;
- voice_stop_volumeramp(mixer[i].voice);
- voice_ramp_volume(mixer[i].voice, mixer[i].volume, 1000);
-#endif
+ Error(ERR_RETURN, "Mixer_InsertSound: Channel %d inactive", i);
+ Error(ERR_RETURN, "Mixer_InsertSound: This should never happen!");
+
+ mixer_active_channels--;
}
}
-
- return;
}
+#endif
- /* don't play sound more than n times simultaneously (with n == 2 for now) */
- if (k >= 2)
+ if (mixer_active_channels ==
+ audio.num_channels - (mixer[audio.music_channel].active ? 0 : 1))
{
+ unsigned long playing_current = Counter();
int longest = 0, longest_nr = audio.first_sound_channel;
- /* look for oldest equal sound */
- for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+#if 0
+#if DEBUG
+ /* print some debugging information about audio channel usage */
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
- int actual;
+ Error(ERR_RETURN, "Mixer_InsertSound: %d [%d]: %ld (%ld)",
+ i, mixer[i].active, mixer[i].data_len, (long)mixer[i].data_ptr);
+ }
+#endif
+#endif
- if (!mixer[i].active || mixer[i].nr != snd_ctrl.nr)
- continue;
+ 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 !defined(PLATFORM_MSDOS)
- actual = 100 * mixer[i].playingpos / mixer[i].data_len;
-#else
- actual = mixer[i].playingpos;
-#endif
- if (actual >= longest)
+ if (!IS_LOOP(mixer[i]) && actual > longest)
{
longest = actual;
longest_nr = i;
}
}
- Mixer_RemoveSound(longest_nr);
+ Mixer_StopChannel(longest_nr);
}
- /* add new sound to mixer */
- for(i=0; i<audio.num_channels; i++)
+ /* add the new sound to the mixer */
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
#if 0
printf("CHECKING CHANNEL %d FOR SOUND %d ...\n", i, snd_ctrl.nr);
#endif
- /*
- if (!mixer[i].active ||
- (IS_MUSIC(snd_ctrl) && i == audio.music_channel))
- */
- if ((i == audio.music_channel && IS_MUSIC(snd_ctrl)) ||
- (i != audio.music_channel && !mixer[i].active))
+ if (!mixer[i].active)
{
- snd_ctrl.data_ptr = snd_info->data_ptr;
- snd_ctrl.data_len = snd_info->data_len;
- snd_ctrl.format = snd_info->format;
-
- snd_ctrl.playingpos = 0;
- snd_ctrl.playingtime = 0;
+#if 0
+ printf("ADDING NEW SOUND %d TO MIXER\n", snd_ctrl.nr);
+#endif
-#if 1
+#if defined(AUDIO_UNIX_NATIVE)
if (snd_info->data_len == 0)
{
printf("THIS SHOULD NEVER HAPPEN! [snd_info->data_len == 0]\n");
}
#endif
-#if 1
- if (IS_MUSIC(snd_ctrl) && i == audio.music_channel && mixer[i].active)
- {
- printf("THIS SHOULD NEVER HAPPEN! [adding music twice]\n");
-
-#if 1
- Mixer_RemoveSound(i);
-#endif
- }
-#endif
-
mixer[i] = snd_ctrl;
- mixer_active_channels++;
-
-#if 0
- printf("NEW SOUND %d ADDED TO MIXER\n", snd_ctrl.nr);
-#endif
-
Mixer_PlayChannel(i);
break;
}
}
-static void HandleSoundRequest(struct SoundControl snd_ctrl)
+static void HandleSoundRequest(SoundControl snd_ctrl)
{
int i;
+#if defined(AUDIO_UNIX_NATIVE)
+ if (IS_PARENT_PROCESS())
+ {
+ SendSoundControlToMixerProcess(&snd_ctrl);
+ return;
+ }
+#endif
+
+ /* 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);
+
if (IS_RELOADING(snd_ctrl)) /* load new sound or music files */
{
- ReadReloadInfoFromPipe(snd_ctrl);
- Mixer_InitChannels();
+ Mixer_StopMusicChannel();
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
+ Mixer_StopChannel(i);
+
+#if defined(AUDIO_UNIX_NATIVE)
CloseAudioDevice(&audio.device_fd);
+ ReadReloadInfoFromPipe(&snd_ctrl);
+#endif
if (snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS)
ReloadCustomSounds();
}
else if (IS_FADING(snd_ctrl)) /* fade out existing sound or music */
{
- if (!mixer_active_channels)
- return;
-
if (IS_MUSIC(snd_ctrl))
{
- Mixer_FadeChannel(audio.music_channel);
+ Mixer_FadeMusicChannel();
return;
}
- for(i=audio.first_sound_channel; i<audio.num_channels; i++)
- if (mixer[i].nr == snd_ctrl.nr || ALL_SOUNDS(snd_ctrl))
+ 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 (!mixer_active_channels)
- return;
-
if (IS_MUSIC(snd_ctrl))
{
- Mixer_RemoveSound(audio.music_channel);
+ Mixer_StopMusicChannel();
return;
}
- for(i=audio.first_sound_channel; i<audio.num_channels; i++)
- if (mixer[i].nr == snd_ctrl.nr || ALL_SOUNDS(snd_ctrl))
- Mixer_RemoveSound(i);
+ 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);
+#if defined(AUDIO_UNIX_NATIVE)
if (!mixer_active_channels)
CloseAudioDevice(&audio.device_fd);
+#endif
}
else if (snd_ctrl.active) /* add new sound to mixer */
{
void StartMixer(void)
{
+ int i;
+
+#if 0
+ SDL_version compile_version;
+ const SDL_version *link_version;
+ MIX_VERSION(&compile_version);
+ printf("compiled with SDL_mixer version: %d.%d.%d\n",
+ compile_version.major,
+ compile_version.minor,
+ compile_version.patch);
+ link_version = Mix_Linked_Version();
+ printf("running with SDL_mixer version: %d.%d.%d\n",
+ link_version->major,
+ link_version->minor,
+ link_version->patch);
+#endif
+
if (!audio.sound_available)
return;
-#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
+ /* 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));
+
+#if defined(AUDIO_UNIX_NATIVE)
if (!ForkAudioProcess())
audio.sound_available = FALSE;
#endif
}
-#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
+#if defined(AUDIO_UNIX_NATIVE)
-static void CopySampleToMixingBuffer(struct SoundControl *snd_ctrl,
+static void CopySampleToMixingBuffer(SoundControl *snd_ctrl,
int sample_pos, int sample_size,
- short *buffer_ptr)
+ short *buffer_base_ptr, int buffer_pos,
+ int num_output_channels)
{
- void *sample_ptr = snd_ctrl->data_ptr;
- int i;
+ short *buffer_ptr = buffer_base_ptr + num_output_channels * buffer_pos;
+ int num_channels = snd_ctrl->num_channels;
+ int stepsize = num_channels;
+ int output_stepsize = num_output_channels;
+ int i, j;
if (snd_ctrl->format == AUDIO_FORMAT_U8)
- for (i=0; i<sample_size; i++)
- *buffer_ptr++ =
- ((short)(((byte *)sample_ptr)[sample_pos + i] ^ 0x80)) << 8;
+ {
+ byte *sample_ptr = (byte *)snd_ctrl->data_ptr + num_channels * sample_pos;
+
+ for (i = 0; i < num_output_channels; i++)
+ {
+ int offset = (snd_ctrl->num_channels == 1 ? 0 : i);
+
+ for (j = 0; j < sample_size; j++)
+ buffer_ptr[output_stepsize * j + i] =
+ ((short)(sample_ptr[stepsize * j + offset] ^ 0x80)) << 8;
+ }
+ }
else /* AUDIO_FORMAT_S16 */
- for (i=0; i<sample_size; i++)
- *buffer_ptr++ =
- ((short *)sample_ptr)[sample_pos + i];
+ {
+ short *sample_ptr= (short *)snd_ctrl->data_ptr + num_channels * sample_pos;
+
+ for (i = 0; i < num_output_channels; i++)
+ {
+ int offset = (snd_ctrl->num_channels == 1 ? 0 : i);
+
+ for (j = 0; j < sample_size; j++)
+ buffer_ptr[output_stepsize * j + i] =
+ sample_ptr[stepsize * j + offset];
+ }
+ }
}
#if defined(AUDIO_STREAMING_DSP)
static void Mixer_Main_DSP()
{
- static int stereo_volume[PSND_MAX_LEFT2RIGHT + 1];
- static boolean stereo_volume_calculated = FALSE;
- static short premix_first_buffer[SND_BLOCKSIZE];
- static short premix_left_buffer[SND_BLOCKSIZE];
- static short premix_right_buffer[SND_BLOCKSIZE];
- static long premix_last_buffer[SND_BLOCKSIZE];
- static byte playing_buffer[SND_BLOCKSIZE];
+ static short premix_first_buffer[DEFAULT_AUDIO_FRAGMENT_SIZE];
+ static long premix_last_buffer[DEFAULT_AUDIO_FRAGMENT_SIZE];
+ static byte playing_buffer[DEFAULT_AUDIO_FRAGMENT_SIZE];
boolean stereo;
int fragment_size;
int sample_bytes;
int max_sample_size;
+ int num_output_channels;
int i, j;
- if (!stereo_volume_calculated)
- {
- for(i=0; i<=PSND_MAX_LEFT2RIGHT; i++)
- stereo_volume[i] =
- (int)sqrt((float)(PSND_MAX_LEFT2RIGHT * PSND_MAX_LEFT2RIGHT - i * i));
-
- stereo_volume_calculated = TRUE;
- }
-
if (!mixer_active_channels)
return;
stereo = afmt.stereo;
fragment_size = afmt.fragment_size;
sample_bytes = (afmt.format & AUDIO_FORMAT_U8 ? 1 : 2);
- max_sample_size = fragment_size / ((stereo ? 2 : 1) * sample_bytes);
+ num_output_channels = (stereo ? 2 : 1);
+ max_sample_size = fragment_size / (num_output_channels * sample_bytes);
/* first clear the last premixing buffer */
memset(premix_last_buffer, 0,
- max_sample_size * (stereo ? 2 : 1) * sizeof(long));
+ max_sample_size * num_output_channels * sizeof(long));
- for(i=0; i<audio.num_channels; i++)
+ for (i = 0; i < audio.num_channels; i++)
{
void *sample_ptr;
int sample_len;
if (!mixer[i].active)
continue;
+ if (Mixer_ChannelExpired(i))
+ {
+ Mixer_StopChannel(i);
+ continue;
+ }
+
/* pointer, lenght and actual playing position of sound sample */
sample_ptr = mixer[i].data_ptr;
sample_len = mixer[i].data_len;
- sample_pos = mixer[i].playingpos;
+ sample_pos = mixer[i].playing_pos;
sample_size = MIN(max_sample_size, sample_len - sample_pos);
- mixer[i].playingpos += sample_size;
+ mixer[i].playing_pos += sample_size;
/* copy original sample to first mixing buffer */
CopySampleToMixingBuffer(&mixer[i], sample_pos, sample_size,
- premix_first_buffer);
+ premix_first_buffer, 0, num_output_channels);
/* are we about to restart a looping sound? */
if (IS_LOOP(mixer[i]) && sample_size < max_sample_size)
int restarted_sample_size =
MIN(max_sample_size - sample_size, sample_len);
- if (mixer[i].format == AUDIO_FORMAT_U8)
- for (j=0; j<restarted_sample_size; j++)
- premix_first_buffer[sample_size + j] =
- ((short)(((byte *)sample_ptr)[j] ^ 0x80)) << 8;
- else
- for (j=0; j<restarted_sample_size; j++)
- premix_first_buffer[sample_size + j] =
- ((short *)sample_ptr)[j];
+ CopySampleToMixingBuffer(&mixer[i], 0, restarted_sample_size,
+ premix_first_buffer, sample_size,
+ num_output_channels);
- mixer[i].playingpos = restarted_sample_size;
+ mixer[i].playing_pos = restarted_sample_size;
sample_size += restarted_sample_size;
}
}
mixer[i].volume -= SOUND_FADING_VOLUME_STEP;
/* adjust volume of actual sound sample */
- if (mixer[i].volume != PSND_MAX_VOLUME)
- for(j=0; j<sample_size; j++)
+ if (mixer[i].volume != SOUND_MAX_VOLUME)
+ for (j = 0; j < sample_size * num_output_channels; j++)
premix_first_buffer[j] =
- (mixer[i].volume * (long)premix_first_buffer[j])
- >> PSND_MAX_VOLUME_BITS;
+ mixer[i].volume * (long)premix_first_buffer[j] / SOUND_MAX_VOLUME;
- /* fill the last mixing buffer with stereo or mono sound */
+ /* adjust left and right channel volume due to stereo sound position */
if (stereo)
{
- int middle_pos = PSND_MAX_LEFT2RIGHT / 2;
- int left_volume = stereo_volume[middle_pos + mixer[i].stereo];
- int right_volume= stereo_volume[middle_pos - mixer[i].stereo];
+ int left_volume = SOUND_VOLUME_LEFT(mixer[i].stereo_position);
+ int right_volume = SOUND_VOLUME_RIGHT(mixer[i].stereo_position);
- for(j=0; j<sample_size; j++)
+ for (j = 0; j < sample_size; j++)
{
- premix_left_buffer[j] =
- (left_volume * premix_first_buffer[j])
- >> PSND_MAX_LEFT2RIGHT_BITS;
- premix_right_buffer[j] =
- (right_volume * 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];
+ premix_first_buffer[2 * j + 0] =
+ left_volume * premix_first_buffer[2 * j + 0] / SOUND_MAX_LEFT2RIGHT;
+ premix_first_buffer[2 * j + 1] =
+ right_volume * premix_first_buffer[2 * j + 1] / SOUND_MAX_LEFT2RIGHT;
}
}
- else
- {
- for(j=0; j<sample_size; j++)
- premix_last_buffer[j] += premix_first_buffer[j];
- }
+
+ /* fill the last mixing buffer with stereo or mono sound */
+ for (j = 0; j < sample_size * num_output_channels; j++)
+ premix_last_buffer[j] += premix_first_buffer[j];
/* delete completed sound entries from the mixer */
- if (mixer[i].playingpos >= mixer[i].data_len)
+ if (mixer[i].playing_pos >= mixer[i].data_len)
{
if (IS_LOOP(mixer[i]))
- mixer[i].playingpos = 0;
+ mixer[i].playing_pos = 0;
else
- Mixer_RemoveSound(i);
+ Mixer_StopChannel(i);
}
else if (mixer[i].volume <= SOUND_FADING_VOLUME_THRESHOLD)
- Mixer_RemoveSound(i);
+ Mixer_StopChannel(i);
}
/* prepare final playing buffer according to system audio format */
- for(i=0; i<max_sample_size * (stereo ? 2 : 1); i++)
+ for (i = 0; i < max_sample_size * num_output_channels; i++)
{
/* cut off at 17 bit value */
if (premix_last_buffer[i] < -65535)
#else /* !AUDIO_STREAMING_DSP */
-static int Mixer_Main_SimpleAudio(struct SoundControl snd_ctrl)
+static int Mixer_Main_SimpleAudio(SoundControl snd_ctrl)
{
- static short premix_first_buffer[SND_BLOCKSIZE];
- static byte playing_buffer[SND_BLOCKSIZE];
- int max_sample_size = SND_BLOCKSIZE;
+ static short premix_first_buffer[DEFAULT_AUDIO_FRAGMENT_SIZE];
+ static byte playing_buffer[DEFAULT_AUDIO_FRAGMENT_SIZE];
+ int max_sample_size = DEFAULT_AUDIO_FRAGMENT_SIZE;
+ int num_output_channels = 1;
void *sample_ptr;
int sample_len;
int sample_pos;
/* pointer, lenght and actual playing position of sound sample */
sample_ptr = mixer[i].data_ptr;
sample_len = mixer[i].data_len;
- sample_pos = mixer[i].playingpos;
+ sample_pos = mixer[i].playing_pos;
sample_size = MIN(max_sample_size, sample_len - sample_pos);
- mixer[i].playingpos += sample_size;
+ mixer[i].playing_pos += sample_size;
/* copy original sample to first mixing buffer */
CopySampleToMixingBuffer(&mixer[i], sample_pos, sample_size,
- premix_first_buffer);
+ premix_first_buffer, 0, num_output_channels);
/* adjust volume of actual sound sample */
- if (mixer[i].volume != PSND_MAX_VOLUME)
- for(j=0; j<sample_size; j++)
+ if (mixer[i].volume != SOUND_MAX_VOLUME)
+ for (j = 0; j < sample_size; j++)
premix_first_buffer[j] =
- (mixer[i].volume * (long)premix_first_buffer[j])
- >> PSND_MAX_VOLUME_BITS;
+ mixer[i].volume * (long)premix_first_buffer[j] / SOUND_MAX_VOLUME;
/* might be needed for u-law /dev/audio */
-#if 0
- for(j=0; j<sample_size; j++)
+#if 1
+ for (j = 0; j < sample_size; j++)
playing_buffer[j] =
linear_to_ulaw(premix_first_buffer[j]);
#endif
/* delete completed sound entries from the mixer */
- if (mixer[i].playingpos >= mixer[i].data_len)
- Mixer_RemoveSound(i);
+ if (mixer[i].playing_pos >= mixer[i].data_len)
+ Mixer_StopChannel(i);
- for(i=0; i<sample_size; i++)
+ for (i = 0; i < sample_size; i++)
playing_buffer[i] = (premix_first_buffer[i] >> 8) ^ 0x80;
/* finally play the sound fragment */
void Mixer_Main()
{
- struct SoundControl snd_ctrl;
+ SoundControl snd_ctrl;
fd_set mixer_fdset;
close(audio.mixer_pipe[1]); /* no writing into pipe needed */
FD_ZERO(&mixer_fdset);
FD_SET(audio.mixer_pipe[0], &mixer_fdset);
- while(1) /* wait for sound playing commands from client */
+ while (1) /* wait for sound playing commands from client */
{
struct timeval delay = { 0, 0 };
select(audio.mixer_pipe[0] + 1, &mixer_fdset, NULL, NULL, NULL);
if (!FD_ISSET(audio.mixer_pipe[0], &mixer_fdset))
continue;
- if (read(audio.mixer_pipe[0], &snd_ctrl, sizeof(snd_ctrl))
- != sizeof(snd_ctrl))
- Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
+
+ ReadSoundControlFromMainProcess(&snd_ctrl);
HandleSoundRequest(snd_ctrl);
#endif /* !AUDIO_STREAMING_DSP */
}
}
-#endif /* PLATFORM_UNIX */
-
-#if defined(PLATFORM_MSDOS)
-static void sound_handler(struct SoundControl snd_ctrl)
-{
- for (i=0; i<audio.num_channels; i++)
- {
- if (!mixer[i].active || mixer[i].loop)
- continue;
-
- mixer[i].playingpos = voice_get_position(mixer[i].voice);
- mixer[i].volume = voice_get_volume(mixer[i].voice);
- if (mixer[i].playingpos == -1 || !mixer[i].volume)
- {
- deallocate_voice(mixer[i].voice);
- Mixer_RemoveSound(i);
- }
- }
-
- HandleSoundRequest(snd_ctrl);
-}
-#endif /* PLATFORM_MSDOS */
-
-
-/* ------------------------------------------------------------------------- */
-/* platform dependant audio initialization code */
-/* ------------------------------------------------------------------------- */
-
-#if defined(AUDIO_LINUX_IOCTL)
-static void InitAudioDevice_Linux(struct AudioFormatInfo *afmt)
-{
- /* "ioctl()" expects pointer to 'int' value for stereo flag
- (boolean is defined as 'char', which will not work here) */
- unsigned int fragment_spec = 0;
- int fragment_size_query;
- int stereo = TRUE;
- struct
- {
- int format_ioctl;
- int format_result;
- }
- formats[] =
- {
- /* supported audio format in preferred order */
- { AFMT_S16_LE, AUDIO_FORMAT_S16 | AUDIO_FORMAT_LE },
- { AFMT_S16_BE, AUDIO_FORMAT_S16 | AUDIO_FORMAT_BE },
- { AFMT_U8, AUDIO_FORMAT_U8 },
- { -1, -1 }
- };
- int i;
-
- /* determine logarithm (log2) of the fragment size */
- while ((1 << fragment_spec) < afmt->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");
-
- i = 0;
- afmt->format = 0;
- while (formats[i].format_result != -1)
- {
- unsigned int audio_format = formats[i].format_ioctl;
- if (ioctl(audio.device_fd, SNDCTL_DSP_SETFMT, &audio_format) == 0)
- {
- afmt->format = formats[i].format_result;
- break;
- }
- }
-
- if (afmt->format == 0) /* no supported audio format found */
- Error(ERR_EXIT_SOUND_SERVER,
- "cannot set audio format of /dev/dsp -- no sounds");
-
- /* try if we can use stereo sound */
- afmt->stereo = TRUE;
- if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0)
- afmt->stereo = FALSE;
-
- if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &afmt->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 */
- if (ioctl(audio.device_fd, SNDCTL_DSP_GETBLKSIZE, &fragment_size_query) < 0)
- Error(ERR_EXIT_SOUND_SERVER,
- "cannot get fragment size of /dev/dsp -- no sounds");
- if (fragment_size_query != afmt->fragment_size)
- Error(ERR_EXIT_SOUND_SERVER,
- "cannot set fragment size of /dev/dsp -- no sounds");
-}
-#endif /* AUDIO_LINUX_IOCTL */
-
-#if defined(PLATFORM_NETBSD)
-static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt)
-{
- audio_info_t a_info;
- boolean stereo = TRUE;
-
- 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;
-
- afmt->format = AUDIO_FORMAT_U8;
- afmt->stereo = TRUE;
-
- if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0)
- {
- /* try to disable stereo */
- a_info.play.channels = 1;
-
- afmt->stereo = FALSE;
-
- if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0)
- Error(ERR_EXIT_SOUND_SERVER,
- "cannot set sample rate of /dev/audio -- no sounds");
- }
-}
-#endif /* PLATFORM_NETBSD */
-
-#if defined(PLATFORM_HPUX)
-static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt)
-{
- struct audio_describe ainfo;
- int audio_ctl;
-
- audio_ctl = open("/dev/audioCtl", O_WRONLY | O_NDELAY);
- if (audio_ctl == -1)
- Error(ERR_EXIT_SOUND_SERVER, "cannot open /dev/audioCtl -- no sounds");
-
- if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1)
- Error(ERR_EXIT_SOUND_SERVER, "no audio info -- no sounds");
-
- if (ioctl(audio_ctl, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) == -1)
- Error(ERR_EXIT_SOUND_SERVER, "ulaw audio not available -- no sounds");
-
- ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1);
- ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000);
-
- afmt->format = AUDIO_FORMAT_U8;
- afmt->stereo = FALSE;
- afmt->sample_rate = 8000;
-
- close(audio_ctl);
-}
-#endif /* PLATFORM_HPUX */
-
-#if defined(PLATFORM_UNIX)
-static void InitAudioDevice(struct AudioFormatInfo *afmt)
-{
- afmt->stereo = TRUE;
- afmt->format = AUDIO_FORMAT_UNKNOWN;
- afmt->sample_rate = DEFAULT_AUDIO_SAMPLE_RATE;
- afmt->fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE;
+#endif /* AUDIO_UNIX_NATIVE */
-#if defined(AUDIO_LINUX_IOCTL)
- InitAudioDevice_Linux(afmt);
-#elif defined(PLATFORM_NETBSD)
- InitAudioDevice_NetBSD(afmt);
-#elif defined(PLATFORM_HPUX)
- InitAudioDevice_HPUX(afmt);
-#else
- /* generic /dev/audio stuff might be placed here */
-#endif
-}
-#endif /* PLATFORM_UNIX */
-#if defined(PLATFORM_UNIX) && !defined(AUDIO_STREAMING_DSP)
+#if defined(AUDIO_UNIX_NATIVE) && !defined(AUDIO_STREAMING_DSP)
/* these two are stolen from "sox"... :) */
return(sample);
}
-#endif /* PLATFORM_UNIX && !AUDIO_STREAMING_DSP */
+#endif /* AUDIO_UNIX_NATIVE && !AUDIO_STREAMING_DSP */
/* THE STUFF ABOVE IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */
#define CHUNK_ID_LEN 4 /* IFF style chunk id length */
#define WAV_HEADER_SIZE 16 /* size of WAV file header */
-static SoundInfo *Load_WAV(char *filename)
+static void *Load_WAV(char *filename)
{
SoundInfo *snd_info;
-#if !defined(TARGET_SDL) && !defined(PLATFORM_MSDOS)
+#if defined(AUDIO_UNIX_NATIVE)
+ struct SoundHeader_WAV header;
+#if 0
byte sound_header_buffer[WAV_HEADER_SIZE];
+ int i;
+#endif
char chunk_name[CHUNK_ID_LEN + 1];
int chunk_size;
+ int data_byte_len;
FILE *file;
- int i;
#endif
if (!audio.sound_available)
return NULL;
}
+ snd_info->data_len = ((Mix_Chunk *)snd_info->data_ptr)->alen;
+
#elif defined(TARGET_ALLEGRO)
if ((snd_info->data_ptr = load_sample(filename)) == NULL)
return NULL;
}
-#else /* PLATFORM_UNIX */
+ snd_info->data_len = ((SAMPLE *)snd_info->data_ptr)->len;
+
+#else /* AUDIO_UNIX_NATIVE */
if ((file = fopen(filename, MODE_READ)) == NULL)
{
}
/* read chunk id "RIFF" */
- getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN);
+ getFileChunkLE(file, chunk_name, &chunk_size);
if (strcmp(chunk_name, "RIFF") != 0)
{
Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename);
}
/* read "RIFF" type id "WAVE" */
- getFileChunk(file, chunk_name, NULL, BYTE_ORDER_LITTLE_ENDIAN);
+ getFileChunkLE(file, chunk_name, NULL);
if (strcmp(chunk_name, "WAVE") != 0)
{
Error(ERR_WARN, "missing 'WAVE' type ID of sound file '%s'", filename);
return NULL;
}
- while (getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN))
+ while (getFileChunkLE(file, chunk_name, &chunk_size))
{
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);
+ if (chunk_size < WAV_HEADER_SIZE)
+ {
+ Error(ERR_WARN, "sound file '%s': chunk 'fmt ' too short", filename);
+ fclose(file);
+ free(snd_info);
+ return NULL;
+ }
+
+ header.compression_code = getFile16BitLE(file);
+ header.num_channels = getFile16BitLE(file);
+ header.sample_rate = getFile32BitLE(file);
+ header.bytes_per_second = getFile32BitLE(file);
+ header.block_align = getFile16BitLE(file);
+ header.bits_per_sample = getFile16BitLE(file);
if (chunk_size > WAV_HEADER_SIZE)
ReadUnusedBytesFromFile(file, chunk_size - WAV_HEADER_SIZE);
+
+ if (header.compression_code != 1)
+ {
+ Error(ERR_WARN, "sound file '%s': compression code %d not supported",
+ filename, header.compression_code);
+ fclose(file);
+ free(snd_info);
+ return NULL;
+ }
+
+ if (header.num_channels != 1 &&
+ header.num_channels != 2)
+ {
+ Error(ERR_WARN, "sound file '%s': number of %d channels not supported",
+ filename, header.num_channels);
+ fclose(file);
+ free(snd_info);
+ return NULL;
+ }
+
+ if (header.bits_per_sample != 8 &&
+ header.bits_per_sample != 16)
+ {
+ Error(ERR_WARN, "sound file '%s': %d bits per sample not supported",
+ filename, header.bits_per_sample);
+ fclose(file);
+ free(snd_info);
+ return NULL;
+ }
+
+ /* warn, but accept wrong sample rate (may be only slightly different) */
+ if (header.sample_rate != DEFAULT_AUDIO_SAMPLE_RATE)
+ Error(ERR_WARN, "sound file '%s': wrong sample rate %d instead of %d",
+ filename, header.sample_rate, DEFAULT_AUDIO_SAMPLE_RATE);
+
+#if 0
+ printf("WAV file: '%s'\n", filename);
+ printf(" Compression code: %d'\n", header.compression_code);
+ printf(" Number of channels: %d'\n", header.num_channels);
+ printf(" Sample rate: %ld'\n", header.sample_rate);
+ printf(" Average bytes per second: %ld'\n", header.bytes_per_second);
+ printf(" Block align: %d'\n", header.block_align);
+ printf(" Significant bits per sample: %d'\n", header.bits_per_sample);
+#endif
}
else if (strcmp(chunk_name, "data") == 0)
{
- snd_info->data_len = chunk_size;
+ data_byte_len = chunk_size;
+
+ snd_info->data_len = data_byte_len;
snd_info->data_ptr = checked_malloc(snd_info->data_len);
/* read sound data */
return NULL;
}
- /* check for odd number of sample bytes (data chunk is word aligned) */
- if ((chunk_size % 2) == 1)
+ /* check for odd number of data bytes (data chunk is word aligned) */
+ if ((data_byte_len % 2) == 1)
ReadUnusedBytesFromFile(file, 1);
}
else /* unknown chunk -- ignore */
return NULL;
}
- snd_info->format = AUDIO_FORMAT_U8;
-
-#endif /* PLATFORM_UNIX */
-
- snd_info->type = SND_TYPE_WAV;
- snd_info->source_filename = getStringCopy(filename);
-
- return snd_info;
-}
-
-static void deleteSoundEntry(SoundInfo **snd_info)
-{
- if (*snd_info)
- {
- char *filename = (*snd_info)->source_filename;
-
-#if 0
- printf("[decrementing reference counter of sound '%s']\n", filename);
-#endif
-
- if (--(*snd_info)->num_references <= 0)
- {
-#if 0
- printf("[deleting sound '%s']\n", filename);
-#endif
-
- /*
- FreeSound(*snd_info);
- */
- deleteNodeFromList(&SoundFileList, filename, FreeSound);
- }
-
- *snd_info = NULL;
- }
-}
-
-static void replaceSoundEntry(SoundInfo **snd_info, char *filename)
-{
- ListNode *node;
-
- /* check if the old and the new sound file are the same */
- if (*snd_info && strcmp((*snd_info)->source_filename, filename) == 0)
+ if (header.bits_per_sample == 8)
+ snd_info->format = AUDIO_FORMAT_U8;
+ else /* header.bits_per_sample == 16 */
{
- /* The old and new sound are the same (have the same filename and path).
- This usually means that this sound does not exist in this sound set
- and a fallback to the existing sound is done. */
-
-#if 0
- printf("[sound '%s' already exists (same list entry)]\n", filename);
-#endif
-
- return;
+ snd_info->format = AUDIO_FORMAT_S16;
+ snd_info->data_len /= 2; /* correct number of samples */
}
- /* delete existing sound file entry */
- deleteSoundEntry(snd_info);
+ snd_info->num_channels = header.num_channels;
+ if (header.num_channels == 2)
+ snd_info->data_len /= 2; /* correct number of samples */
- /* check if the new sound file already exists in the list of sounds */
- if ((node = getNodeFromKey(SoundFileList, filename)) != NULL)
- {
#if 0
- printf("[sound '%s' already exists (other list entry)]\n", filename);
-#endif
-
- *snd_info = (SoundInfo *)node->content;
- (*snd_info)->num_references++;
- }
- else if ((*snd_info = Load_WAV(filename)) != NULL) /* load new sound */
- {
- (*snd_info)->num_references = 1;
- addNodeToList(&SoundFileList, (*snd_info)->source_filename, *snd_info);
- }
-}
-
-static void LoadCustomSound(SoundInfo **snd_info, char *basename)
-{
- char *filename = getCustomSoundFilename(basename);
-
- if (strcmp(basename, SND_FILE_UNDEFINED) == 0)
+ if (header.num_channels == 1) /* convert mono sound to stereo */
{
- deleteSoundEntry(snd_info);
- return;
- }
+ void *buffer_ptr = checked_malloc(data_byte_len * 2);
+ void *sample_ptr = snd_info->data_ptr;
+ int sample_size = snd_info->data_len;
+ int i;
- if (filename == NULL)
- {
- Error(ERR_WARN, "cannot find sound file '%s'", basename);
- return;
+ if (snd_ctrl->format == AUDIO_FORMAT_U8)
+ for (i = 0; i < sample_size; i++)
+ *buffer_ptr++ =
+ ((short)(((byte *)sample_ptr)[i] ^ 0x80)) << 8;
+ else /* AUDIO_FORMAT_S16 */
+ for (i = 0; i < sample_size; i++)
+ *buffer_ptr++ =
+ ((short *)sample_ptr)[i];
}
-
- replaceSoundEntry(snd_info, filename);
-}
-
-void InitSoundList(struct SoundEffectInfo *sounds_list, int num_list_entries)
-{
- if (Sound == NULL)
- Sound = checked_calloc(num_list_entries * sizeof(SoundInfo *));
-
- sound_effect = sounds_list;
- num_sounds = num_list_entries;
-}
-
-void LoadSoundToList(char *basename, int list_pos)
-{
- if (Sound == NULL || list_pos >= num_sounds)
- return;
-
-#if 0
- printf("loading sound '%s' ... [%d]\n",
- basename, getNumNodes(SoundFileList));
#endif
- LoadCustomSound(&Sound[list_pos], basename);
+#endif /* AUDIO_UNIX_NATIVE */
-#if 0
- printf("loading sound '%s' done [%d]\n",
- basename, getNumNodes(SoundFileList));
-#endif
+ snd_info->type = SND_TYPE_WAV;
+ snd_info->source_filename = getStringCopy(filename);
+
+ return snd_info;
}
-static MusicInfo *Load_MOD(char *filename)
+static void *Load_MOD(char *filename)
{
#if defined(TARGET_SDL)
MusicInfo *mod_info;
#endif
}
-void LoadCustomMusic(void)
+static void *Load_WAV_or_MOD(char *filename)
+{
+ if (FileIsSound(filename))
+ return Load_WAV(filename);
+ else if (FileIsMusic(filename))
+ return Load_MOD(filename);
+ else
+ return NULL;
+}
+
+void LoadCustomMusic_NoConf(void)
{
+ static boolean draw_init_text = TRUE; /* only draw at startup */
+ static char *last_music_directory = NULL;
char *music_directory = getCustomMusicDirectory();
DIR *dir;
struct dirent *dir_entry;
+ int num_music = getMusicListSize();
if (!audio.sound_available)
return;
+ if (last_music_directory != NULL &&
+ strcmp(last_music_directory, music_directory) == 0)
+ return; /* old and new music directory are the same */
+
+ if (last_music_directory != NULL)
+ free(last_music_directory);
+ last_music_directory = getStringCopy(music_directory);
+
+ FreeAllMusic_NoConf();
+
if ((dir = opendir(music_directory)) == NULL)
{
Error(ERR_WARN, "cannot read music directory '%s'", music_directory);
return;
}
+ if (draw_init_text)
+ DrawInitText("Loading music:", 120, FC_GREEN);
+
while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */
{
char *basename = dir_entry->d_name;
- char *filename = getPath2(music_directory, basename);
+ char *filename = NULL;
MusicInfo *mus_info = NULL;
+ boolean music_already_used = FALSE;
+ int i;
+ /* skip all music files that are configured in music config file */
+ for (i = 0; i < num_music; i++)
+ {
+ struct FileInfo *music = getMusicListEntry(i);
+
+ if (strcmp(basename, music->filename) == 0)
+ {
+ music_already_used = TRUE;
+ break;
+ }
+ }
+
+ if (music_already_used)
+ continue;
+
+#if 0
+ if (FileIsSound(basename) || FileIsMusic(basename))
+ printf("DEBUG: loading music '%s' ...\n", basename);
+#endif
+
+ if (draw_init_text)
+ DrawInitText(basename, 150, FC_YELLOW);
+
+ filename = getPath2(music_directory, basename);
+
+#if 1
+ if (FileIsMusic(basename))
+ mus_info = Load_WAV_or_MOD(filename);
+#else
if (FileIsSound(basename))
mus_info = Load_WAV(filename);
else if (FileIsMusic(basename))
mus_info = Load_MOD(filename);
+#endif
free(filename);
if (mus_info)
{
- num_music++;
- Music = checked_realloc(Music, num_music * sizeof(MusicInfo *));
- Music[num_music -1] = mus_info;
+ num_music_noconf++;
+ Music_NoConf = checked_realloc(Music_NoConf,
+ num_music_noconf * sizeof(MusicInfo *));
+ Music_NoConf[num_music_noconf - 1] = mus_info;
}
}
closedir(dir);
- if (num_music == 0)
- Error(ERR_WARN, "cannot find any valid music files in directory '%s'",
- music_directory);
+ draw_init_text = FALSE;
}
-void PlayMusic(int nr)
+int getSoundListSize()
{
- if (!audio.music_available)
- return;
+ return (sound_info->num_file_list_entries +
+ sound_info->num_dynamic_file_list_entries);
+}
-#if defined(TARGET_SDL)
+int getMusicListSize()
+{
+ return (music_info->num_file_list_entries +
+ music_info->num_dynamic_file_list_entries);
+}
- nr = nr % num_music;
+struct FileInfo *getSoundListEntry(int pos)
+{
+ int num_list_entries = sound_info->num_file_list_entries;
+ int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries);
- if (Music[nr]->type == MUS_TYPE_MOD)
- {
- Mix_PlayMusic(Music[nr]->data_ptr, -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, Music[nr]->data_ptr, -1);
- }
+ return (pos < num_list_entries ? &sound_info->file_list[list_pos] :
+ &sound_info->dynamic_file_list[list_pos]);
+}
-#else
+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);
- PlaySoundMusic(nr);
+ return (pos < num_list_entries ? &music_info->file_list[list_pos] :
+ &music_info->dynamic_file_list[list_pos]);
+}
-#endif
+static SoundInfo *getSoundInfoEntryFromSoundID(int pos)
+{
+ 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 PlaySound(int nr)
+static MusicInfo *getMusicInfoEntryFromMusicID(int pos)
{
- PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_SOUND);
+ 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];
}
-void PlaySoundStereo(int nr, int stereo)
+int getSoundListPropertyMappingSize()
{
- PlaySoundExt(nr, PSND_MAX_VOLUME, stereo, SND_CTRL_PLAY_SOUND);
+ return sound_info->num_property_mapping_entries;
}
-void PlaySoundLoop(int nr)
+int getMusicListPropertyMappingSize()
{
- PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_LOOP);
+ return music_info->num_property_mapping_entries;
}
-void PlaySoundMusic(int nr)
+struct PropertyMapping *getSoundListPropertyMapping()
{
- PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_MUSIC);
+ return sound_info->property_mapping;
}
-void PlaySoundExt(int nr, int volume, int stereo, int state)
+struct PropertyMapping *getMusicListPropertyMapping()
{
- struct SoundControl snd_ctrl;
+ return music_info->property_mapping;
+}
- if (!audio.sound_available ||
- !audio.sound_enabled ||
- audio.sound_deactivated)
- return;
+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 (volume < PSND_MIN_VOLUME)
- volume = PSND_MIN_VOLUME;
- else if (volume > PSND_MAX_VOLUME)
- volume = PSND_MAX_VOLUME;
+ sound_info = checked_calloc(sizeof(struct ArtworkListInfo));
+ sound_info->type = ARTWORK_TYPE_SOUNDS;
- if (stereo < PSND_MAX_LEFT)
- stereo = PSND_MAX_LEFT;
- else if (stereo > PSND_MAX_RIGHT)
- stereo = PSND_MAX_RIGHT;
+ /* ---------- initialize file list and suffix lists ---------- */
- snd_ctrl.active = TRUE;
- snd_ctrl.nr = nr;
- snd_ctrl.volume = volume;
- snd_ctrl.stereo = stereo;
- snd_ctrl.state = state;
+ sound_info->num_file_list_entries = num_file_list_entries;
+ sound_info->num_dynamic_file_list_entries = 0;
-#if defined(TARGET_SDL)
- if (Sound[nr])
- {
- Mix_Volume(-1, SOUND_MAX_VOLUME);
- Mix_PlayChannel(-1, Sound[nr]->data_ptr, (state & SND_CTRL_LOOP ? -1 : 0));
- }
-#elif defined(PLATFORM_UNIX)
- if (audio.mixer_pid == 0) /* we are child process */
- return;
+ sound_info->file_list =
+ getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens,
+ num_file_list_entries);
+ sound_info->dynamic_file_list = NULL;
- if (write(audio.mixer_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);
+ sound_info->num_suffix_list_entries = 0;
+ for (i = 0; config_suffix_list[i].token != NULL; i++)
+ sound_info->num_suffix_list_entries++;
+
+ sound_info->suffix_list = config_suffix_list;
+
+ /* ---------- initialize base prefix and suffixes lists ---------- */
+
+ sound_info->num_base_prefixes = 0;
+ for (i = 0; base_prefixes[i] != NULL; i++)
+ sound_info->num_base_prefixes++;
+
+ sound_info->num_ext1_suffixes = 0;
+ for (i = 0; ext1_suffixes[i] != NULL; i++)
+ sound_info->num_ext1_suffixes++;
+
+ sound_info->num_ext2_suffixes = 0;
+ for (i = 0; ext2_suffixes[i] != NULL; i++)
+ sound_info->num_ext2_suffixes++;
+
+ sound_info->num_ext3_suffixes = 0;
+ for (i = 0; ext3_suffixes[i] != NULL; i++)
+ sound_info->num_ext3_suffixes++;
+
+ sound_info->num_ignore_tokens = 0;
+ for (i = 0; ignore_tokens[i] != NULL; i++)
+ sound_info->num_ignore_tokens++;
+
+ 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;
+
+ sound_info->num_property_mapping_entries = 0;
+
+ sound_info->property_mapping = NULL;
+
+ /* ---------- initialize artwork reference and content lists ---------- */
+
+ sound_info->sizeof_artwork_list_entry = sizeof(SoundInfo *);
+
+ sound_info->artwork_list =
+ checked_calloc(num_file_list_entries * sizeof(SoundInfo *));
+ sound_info->dynamic_artwork_list = NULL;
+
+ sound_info->content_list = NULL;
+
+ /* ---------- initialize artwork loading/freeing functions ---------- */
+
+ sound_info->load_artwork = Load_WAV;
+ sound_info->free_artwork = FreeSound;
+
+#if 0
+ num_sounds = sound_info->num_file_list_entries;
+ Sound = (SoundInfo **)sound_info->artwork_list;
#endif
}
-void FadeMusic(void)
+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)
{
- if (!audio.sound_available)
- return;
+ int i;
-#if defined(TARGET_SDL)
- Mix_FadeOutMusic(SOUND_FADING_INTERVAL);
- Mix_FadeOutChannel(audio.music_channel, SOUND_FADING_INTERVAL);
-#else
- StopSoundExt(-1, SND_CTRL_FADE_MUSIC);
-#endif
+ music_info = checked_calloc(sizeof(struct ArtworkListInfo));
+ music_info->type = ARTWORK_TYPE_MUSIC;
+
+ /* ---------- initialize file list and suffix lists ---------- */
+
+ music_info->num_file_list_entries = num_file_list_entries;
+ music_info->num_dynamic_file_list_entries = 0;
+
+ music_info->file_list =
+ getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens,
+ num_file_list_entries);
+ music_info->dynamic_file_list = NULL;
+
+ music_info->num_suffix_list_entries = 0;
+ for (i = 0; config_suffix_list[i].token != NULL; i++)
+ music_info->num_suffix_list_entries++;
+
+ music_info->suffix_list = config_suffix_list;
+
+ /* ---------- initialize base prefix and suffixes lists ---------- */
+
+ music_info->num_base_prefixes = 0;
+ for (i = 0; base_prefixes[i] != NULL; i++)
+ music_info->num_base_prefixes++;
+
+ music_info->num_ext1_suffixes = 0;
+ for (i = 0; ext1_suffixes[i] != NULL; i++)
+ music_info->num_ext1_suffixes++;
+
+ music_info->num_ext2_suffixes = 0;
+ for (i = 0; ext2_suffixes[i] != NULL; i++)
+ music_info->num_ext2_suffixes++;
+
+ music_info->num_ext3_suffixes = 0;
+ for (i = 0; ext3_suffixes[i] != NULL; i++)
+ music_info->num_ext3_suffixes++;
+
+ music_info->num_ignore_tokens = 0;
+ for (i = 0; ignore_tokens[i] != NULL; i++)
+ music_info->num_ignore_tokens++;
+
+ 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;
+
+ music_info->num_property_mapping_entries = 0;
+
+ music_info->property_mapping = NULL;
+
+ /* ---------- initialize artwork reference and content lists ---------- */
+
+ music_info->sizeof_artwork_list_entry = sizeof(MusicInfo *);
+
+ music_info->artwork_list =
+ checked_calloc(num_file_list_entries * sizeof(MusicInfo *));
+ music_info->dynamic_artwork_list = NULL;
+
+ music_info->content_list = NULL;
+
+ /* ---------- initialize artwork loading/freeing functions ---------- */
+
+ music_info->load_artwork = Load_WAV_or_MOD;
+ music_info->free_artwork = FreeMusic;
}
-void FadeSound(int nr)
+void PlayMusic(int nr)
{
- StopSoundExt(nr, SND_CTRL_FADE_SOUND);
+ if (!audio.music_available)
+ return;
+
+ PlaySoundMusic(nr);
}
-void FadeSounds()
+void PlaySound(int nr)
{
- FadeMusic();
- StopSoundExt(-1, SND_CTRL_FADE_ALL);
+ PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_SOUND);
}
-void StopMusic(void)
+void PlaySoundStereo(int nr, int stereo_position)
{
-#if defined(TARGET_SDL)
- if (!audio.sound_available)
- return;
-
- Mix_HaltMusic();
- Mix_HaltChannel(audio.music_channel);
-#else
- StopSoundExt(-1, SND_CTRL_STOP_MUSIC);
-#endif
+ PlaySoundExt(nr, SOUND_MAX_VOLUME, stereo_position, SND_CTRL_PLAY_SOUND);
}
-void StopSound(int nr)
+void PlaySoundLoop(int nr)
{
- StopSoundExt(nr, SND_CTRL_STOP_SOUND);
+ PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_LOOP);
}
-void StopSounds()
+void PlaySoundMusic(int nr)
{
- StopMusic();
- StopSoundExt(-1, SND_CTRL_STOP_ALL);
+ PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_MUSIC);
}
-void StopSoundExt(int nr, int state)
+void PlaySoundExt(int nr, int volume, int stereo_position, int state)
{
- struct SoundControl snd_ctrl;
+ SoundControl snd_ctrl;
- if (!audio.sound_available)
+ if (!audio.sound_available ||
+ !audio.sound_enabled ||
+ audio.sound_deactivated)
return;
- snd_ctrl.active = FALSE;
- snd_ctrl.nr = nr;
- snd_ctrl.state = state;
-
-#if defined(TARGET_SDL)
-
- if (state & SND_CTRL_FADE)
- {
- int i;
+ if (volume < SOUND_MIN_VOLUME)
+ volume = SOUND_MIN_VOLUME;
+ else if (volume > SOUND_MAX_VOLUME)
+ volume = SOUND_MAX_VOLUME;
- /*
- for (i=audio.first_sound_channel; i<audio.num_channels; i++)
- */
+ if (stereo_position < SOUND_MAX_LEFT)
+ stereo_position = SOUND_MAX_LEFT;
+ else if (stereo_position > SOUND_MAX_RIGHT)
+ stereo_position = SOUND_MAX_RIGHT;
- for (i=0; i<audio.channels; i++)
- if (i != audio.music_channel || snd_ctrl.music)
- Mix_FadeOutChannel(i, SOUND_FADING_INTERVAL);
- if (state & SND_CTRL_MUSIC)
- Mix_FadeOutMusic(SOUND_FADING_INTERVAL);
- }
- else
- {
- int i;
+ memset(&snd_ctrl, 0, sizeof(SoundControl)); /* to make valgrind happy */
- for (i=0; i<audio.channels; i++)
- if (i != audio.music_channel || snd_ctrl.music)
- Mix_HaltChannel(i);
- if (state & SND_CTRL_MUSIC)
- Mix_HaltMusic();
- }
+ snd_ctrl.active = TRUE;
+ snd_ctrl.nr = nr;
+ snd_ctrl.volume = volume;
+ snd_ctrl.stereo_position = stereo_position;
+ snd_ctrl.state = state;
-#elif !defined(PLATFORM_MSDOS)
+ HandleSoundRequest(snd_ctrl);
+}
- if (audio.mixer_pid == 0) /* we are child process */
+void FadeMusic(void)
+{
+ if (!audio.music_available)
return;
- if (write(audio.mixer_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 /* PLATFORM_MSDOS */
- sound_handler(snd_ctrl);
-#endif
+ StopSoundExt(-1, SND_CTRL_FADE_MUSIC);
}
-ListNode *newListNode()
+void FadeSound(int nr)
{
- return checked_calloc(sizeof(ListNode));
+ StopSoundExt(nr, SND_CTRL_FADE_SOUND);
}
-void addNodeToList(ListNode **node_first, char *key, void *content)
+void FadeSounds()
{
- ListNode *node_new = newListNode();
-
-#if 0
- printf("LIST: adding node with key '%s'\n", key);
-#endif
-
- node_new->key = getStringCopy(key);
- node_new->content = content;
- node_new->next = *node_first;
- *node_first = node_new;
+ StopSoundExt(-1, SND_CTRL_FADE_ALL);
}
-void deleteNodeFromList(ListNode **node_first, char *key,
- void (*destructor_function)(void *))
+void FadeSoundsAndMusic()
{
- if (node_first == NULL || *node_first == NULL)
- return;
-
-#if 0
- printf("[CHECKING LIST KEY '%s' == '%s']\n",
- (*node_first)->key, key);
-#endif
-
- if (strcmp((*node_first)->key, key) == 0)
- {
-#if 0
- printf("[DELETING LIST ENTRY]\n");
-#endif
-
- free((*node_first)->key);
- if (destructor_function)
- destructor_function((*node_first)->content);
- *node_first = (*node_first)->next;
- }
- else
- deleteNodeFromList(&(*node_first)->next, key, destructor_function);
+ FadeSounds();
+ FadeMusic();
}
-ListNode *getNodeFromKey(ListNode *node_first, char *key)
+void StopMusic(void)
{
- if (node_first == NULL)
- return NULL;
+ if (!audio.music_available)
+ return;
- if (strcmp(node_first->key, key) == 0)
- return node_first;
- else
- return getNodeFromKey(node_first->next, key);
+ StopSoundExt(-1, SND_CTRL_STOP_MUSIC);
}
-int getNumNodes(ListNode *node_first)
+void StopSound(int nr)
{
- return (node_first ? 1 + getNumNodes(node_first->next) : 0);
+ StopSoundExt(nr, SND_CTRL_STOP_SOUND);
}
-void dumpList(ListNode *node_first)
+void StopSounds()
{
- ListNode *node = node_first;
-
- while (node)
- {
- printf("['%s' (%d)]\n", node->key,
- ((SoundInfo *)node->content)->num_references);
- node = node->next;
- }
-
- printf("[%d nodes]\n", getNumNodes(node_first));
+ StopMusic();
+ StopSoundExt(-1, SND_CTRL_STOP_ALL);
}
-static void LoadSoundsInfo()
+void StopSoundExt(int nr, int state)
{
- char *filename = getCustomSoundConfigFilename();
- struct SetupFileList *setup_file_list;
- int i;
-
- /* always start with reliable default values */
- for (i=0; i<num_sounds; i++)
- sound_effect[i].filename = NULL;
+ SoundControl snd_ctrl;
- if (filename == NULL)
+ if (!audio.sound_available)
return;
- if ((setup_file_list = loadSetupFileList(filename)))
- {
- for (i=0; i<num_sounds; i++)
- sound_effect[i].filename =
- getStringCopy(getTokenValue(setup_file_list, sound_effect[i].text));
+ memset(&snd_ctrl, 0, sizeof(SoundControl)); /* to make valgrind happy */
- freeSetupFileList(setup_file_list);
+ snd_ctrl.active = FALSE;
+ snd_ctrl.nr = nr;
+ snd_ctrl.state = state;
-#if 1
- for (i=0; i<num_sounds; i++)
- {
- printf("'%s' ", sound_effect[i].text);
- if (sound_effect[i].filename)
- printf("-> '%s'\n", sound_effect[i].filename);
- else
- printf("-> UNDEFINED [-> '%s']\n", sound_effect[i].default_filename);
- }
-#endif
- }
+ HandleSoundRequest(snd_ctrl);
}
static void ReloadCustomSounds()
{
- int i;
-
-#if 0
- printf("DEBUG: reloading sounds '%s' ...\n", artwork.sounds_set_current);
-#endif
-
- LoadSoundsInfo();
-
#if 0
- printf("DEBUG: reloading %d sounds ...\n", num_sounds);
+ printf("DEBUG: reloading sounds '%s' ...\n", artwork.snd_current_identifier);
#endif
- for(i=0; i<num_sounds; i++)
- {
- if (sound_effect[i].filename)
- LoadSoundToList(sound_effect[i].filename, i);
- else
- LoadSoundToList(sound_effect[i].default_filename, i);
- }
-
- /*
- printf("list size == %d\n", getNumNodes(SoundFileList));
- */
+ LoadArtworkConfig(sound_info);
+ ReloadCustomArtworkList(sound_info);
#if 0
- dumpList(SoundFileList);
+ num_sounds = getSoundListSize();
#endif
}
static void ReloadCustomMusic()
{
#if 0
- printf("DEBUG: reloading music '%s' ...\n", artwork.music_set_current);
+ printf("DEBUG: reloading music '%s' ...\n", artwork.mus_current_identifier);
#endif
- FreeAllMusic();
+ LoadArtworkConfig(music_info);
+ ReloadCustomArtworkList(music_info);
- LoadCustomMusic();
+#if 1
+ /* load all music files from directory not defined in "musicinfo.conf" */
+ LoadCustomMusic_NoConf();
+#endif
}
-void InitReloadSounds(char *set_name)
+void InitReloadCustomSounds(char *set_identifier)
{
if (!audio.sound_available)
return;
-#if defined(TARGET_SDL) || defined(TARGET_ALLEGRO)
+#if defined(AUDIO_UNIX_NATIVE)
+ LoadArtworkConfig(sound_info); /* also load config on sound client */
+ WriteReloadInfoToPipe(set_identifier, SND_CTRL_RELOAD_SOUNDS);
+#else
ReloadCustomSounds();
-#elif defined(PLATFORM_UNIX)
- WriteReloadInfoToPipe(set_name, SND_CTRL_RELOAD_SOUNDS);
#endif
}
-void InitReloadMusic(char *set_name)
+void InitReloadCustomMusic(char *set_identifier)
{
if (!audio.music_available)
return;
-#if defined(TARGET_SDL) || defined(TARGET_ALLEGRO)
+#if defined(AUDIO_UNIX_NATIVE)
+ LoadArtworkConfig(music_info); /* also load config on sound client */
+ WriteReloadInfoToPipe(set_identifier, SND_CTRL_RELOAD_MUSIC);
+#else
ReloadCustomMusic();
-#elif defined(PLATFORM_UNIX)
- WriteReloadInfoToPipe(set_name, SND_CTRL_RELOAD_MUSIC);
#endif
}
Mix_FreeChunk(sound->data_ptr);
#elif defined(TARGET_ALLEGRO)
destroy_sample(sound->data_ptr);
-#else /* PLATFORM_UNIX */
+#else /* AUDIO_UNIX_NATIVE */
free(sound->data_ptr);
#endif
}
- if (sound->source_filename)
- free(sound->source_filename);
+ checked_free(sound->source_filename);
free(sound);
}
-void FreeMusic(MusicInfo *music)
+void FreeMusic(void *ptr)
{
+ MusicInfo *music = (MusicInfo *)ptr;
+
if (music == NULL)
return;
Mix_FreeChunk(music->data_ptr);
#elif defined(TARGET_ALLEGRO)
destroy_sample(music->data_ptr);
-#else /* PLATFORM_UNIX */
+#else /* AUDIO_UNIX_NATIVE */
free(music->data_ptr);
#endif
}
free(music);
}
-void FreeAllSounds()
+static void FreeAllMusic_NoConf()
{
int i;
- if (Sound == NULL)
+ if (Music_NoConf == NULL)
return;
- printf("%s: FREEING SOUNDS ...\n",
- audio.mixer_pid == 0 ? "CHILD" : "PARENT");
+ for (i = 0; i < num_music_noconf; i++)
+ FreeMusic(Music_NoConf[i]);
- for(i=0; i<num_sounds; i++)
- deleteSoundEntry(&Sound[i]);
- /*
- FreeSound(Sound[i]);
- */
+ free(Music_NoConf);
- printf("%s: FREEING SOUNDS -- DONE\n",
- audio.mixer_pid == 0 ? "CHILD" : "PARENT");
-
- free(Sound);
+ Music_NoConf = NULL;
+ num_music_noconf = 0;
+}
- Sound = NULL;
- num_sounds = 0;
+void FreeAllSounds()
+{
+ FreeCustomArtworkLists(sound_info);
}
void FreeAllMusic()
{
- int i;
-
- if (Music == NULL)
- return;
-
- for(i=0; i<num_music; i++)
- FreeMusic(Music[i]);
-
- free(Music);
-
- Music = NULL;
- num_music = 0;
+ FreeCustomArtworkLists(music_info);
+ FreeAllMusic_NoConf();
}
/* THE STUFF ABOVE IS ONLY USED BY THE MAIN PROCESS */