/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2001 Artsoft Entertainment *
+* (c) 1994-2006 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 <errno.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"
-static SoundInfo **Sound = NULL;
-static MusicInfo **Music = NULL;
-static int num_sounds = 0, num_music = 0;
+/* 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 */
+#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
-static int playing_sounds = 0;
-static struct SoundControl playlist[MAX_SOUNDS_PLAYING];
-static struct SoundControl emptySoundControl =
+#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])
+
+#define SAME_SOUND_NR(x,y) ((x).nr == (y).nr)
+#define SAME_SOUND_DATA(x,y) ((x).data_ptr == (y).data_ptr)
+
+#define SOUND_VOLUME_FROM_PERCENT(v,p) ((p) < 0 ? SOUND_MIN_VOLUME : \
+ (p) > 100 ? (v) : \
+ (p) * (v) / 100)
+
+#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)
+
+#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))
+
+
+#if defined(AUDIO_UNIX_NATIVE)
+struct SoundHeader_WAV
{
- -1,0,0, FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE, 0,0, 0,NULL
+ unsigned short compression_code;
+ unsigned short num_channels;
+ unsigned int sample_rate;
+ unsigned int bytes_per_second;
+ unsigned short block_align;
+ unsigned short bits_per_sample;
};
-
-#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];
+
+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;
+
+ 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;
+
+struct SoundControl
+{
+ boolean active;
+
+ int nr;
+ int volume;
+ int stereo_position;
+
+ int state;
+
+ unsigned int playing_starttime;
+ unsigned int playing_pos;
+
+ 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 */
+
+#if defined(TARGET_ALLEGRO)
+ int voice;
#endif
+};
+typedef struct SoundControl SoundControl;
-/* forward declaration of internal functions */
-#if defined(AUDIO_STREAMING_DSP)
-static void SoundServer_InsertNewSound(struct SoundControl);
-#elif defined(PLATFORM_UNIX)
+static struct ArtworkListInfo *sound_info = NULL;
+static struct ArtworkListInfo *music_info = NULL;
+
+static MusicInfo **Music_NoConf = NULL;
+
+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 SoundControl mixer[NUM_MIXER_CHANNELS];
+static int mixer_active_channels = 0;
+
+#if defined(AUDIO_UNIX_NATIVE)
+static struct AudioFormatInfo afmt;
+
+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
-
-#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(struct SoundControl);
-static void SoundServer_StopAllSounds();
#endif
-#if defined(PLATFORM_UNIX)
+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)
+
static int OpenAudioDevice(char *audio_device_name)
{
- int audio_fd;
+ int audio_device_fd;
/* check if desired audio device is accessible */
if (access(audio_device_name, W_OK) != 0)
return -1;
/* try to open audio device in non-blocking mode */
- if ((audio_fd = open(audio_device_name, O_WRONLY | O_NONBLOCK)) < 0)
- return audio_fd;
+ if ((audio_device_fd = open(audio_device_name, O_WRONLY | O_NONBLOCK)) < 0)
+ return audio_device_fd;
/* re-open audio device in blocking mode */
- close(audio_fd);
- audio_fd = open(audio_device_name, O_WRONLY);
+ close(audio_device_fd);
+ audio_device_fd = open(audio_device_name, O_WRONLY);
- return audio_fd;
+ return audio_device_fd;
+}
+
+static void CloseAudioDevice(int *audio_device_fd)
+{
+ if (*audio_device_fd == 0)
+ return;
+
+ close(*audio_device_fd);
+ *audio_device_fd = -1;
}
static boolean TestAudioDevices(void)
static char *audio_device_name[] =
{
DEVICENAME_DSP,
+ DEVICENAME_SOUND_DSP,
DEVICENAME_AUDIO
};
- int audio_fd = -1;
+ 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++)
- if ((audio_fd = OpenAudioDevice(audio_device_name[i])) >= 0)
+ for (i = 0; i < sizeof(audio_device_name)/sizeof(char *); i++)
+ if ((audio_device_fd = OpenAudioDevice(audio_device_name[i])) >= 0)
break;
- if (audio_fd < 0)
+ if (audio_device_fd < 0)
{
Error(ERR_WARN, "cannot open audio device -- no sound");
return FALSE;
}
- close(audio_fd);
+ close(audio_device_fd);
audio.device_name = audio_device_name[i];
return TRUE;
}
-#if !defined(TARGET_SDL)
static boolean ForkAudioProcess(void)
{
- if (pipe(audio.soundserver_pipe) < 0)
+ if (pipe(audio.mixer_pipe) < 0)
{
Error(ERR_WARN, "cannot create pipe -- no sounds");
return FALSE;
}
- if ((audio.soundserver_pid = fork()) < 0)
+ if ((audio.mixer_pid = fork()) < 0)
{
Error(ERR_WARN, "cannot create sound server process -- no sounds");
return FALSE;
}
- if (audio.soundserver_pid == 0) /* we are child process */
- {
- SoundServer();
+ if (audio.mixer_pid == 0) /* we are the child process */
+ audio.mixer_pid = getpid();
- /* never reached */
- exit(0);
- }
- else /* we are parent */
- close(audio.soundserver_pipe[0]); /* no reading from pipe needed */
+ 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)
{
audio.music_available = TRUE;
audio.loops_available = TRUE;
#endif
+
+ audio.num_channels = NUM_MIXER_CHANNELS;
+ audio.music_channel = MUSIC_CHANNEL;
+ audio.first_sound_channel = FIRST_SOUND_CHANNEL;
}
void UnixCloseAudio(void)
if (audio.device_fd)
close(audio.device_fd);
- if (audio.soundserver_pid > 0) /* we are parent process */
- kill(audio.soundserver_pid, SIGTERM);
+ if (IS_PARENT_PROCESS() && HAS_CHILD_PROCESS())
+ kill(audio.mixer_pid, SIGTERM);
}
-#endif /* PLATFORM_UNIX */
-void InitPlaylist(void)
+
+/* ------------------------------------------------------------------------- */
+/* 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;
- for(i=0; i<MAX_SOUNDS_PLAYING; i++)
- playlist[i] = emptySoundControl;
- playing_sounds = 0;
+ /* 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 */
-void StartSoundserver(void)
+#if defined(PLATFORM_NETBSD)
+static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt)
{
- if (!audio.sound_available)
- return;
+ audio_info_t a_info;
+ boolean stereo = TRUE;
-#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
- if (!ForkAudioProcess())
- audio.sound_available = FALSE;
-#endif
+ 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_UNIX)
-void SoundServer(void)
+#if defined(PLATFORM_HPUX)
+static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt)
{
- int i;
+ 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");
- struct SoundControl snd_ctrl;
- fd_set sound_fdset;
+ if (ioctl(audio_ctl, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) == -1)
+ Error(ERR_EXIT_SOUND_SERVER, "ulaw audio not available -- no sounds");
- close(audio.soundserver_pipe[1]); /* no writing into pipe needed */
+ ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1);
+ ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000);
- InitPlaylist();
+ afmt->format = AUDIO_FORMAT_U8;
+ afmt->stereo = FALSE;
+ afmt->sample_rate = 8000;
- 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));
+ close(audio_ctl);
+}
+#endif /* PLATFORM_HPUX */
-#if defined(PLATFORM_HPUX)
- InitAudioDevice_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 */
+/* ------------------------------------------------------------------------- */
- FD_ZERO(&sound_fdset);
- FD_SET(audio.soundserver_pipe[0], &sound_fdset);
+static void SendSoundControlToMixerProcess(SoundControl *snd_ctrl)
+{
+ if (IS_CHILD_PROCESS())
+ return;
- while(1) /* wait for sound playing commands from client */
+ if (write(audio.mixer_pipe[1], snd_ctrl, sizeof(SoundControl)) < 0)
{
- 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");
+ Error(ERR_WARN, "cannot pipe to child process -- no sounds");
+ audio.sound_available = audio.sound_enabled = FALSE;
+ return;
+ }
+}
- if (snd_ctrl.reload_sounds || snd_ctrl.reload_music)
- {
- char *set_name = checked_malloc(snd_ctrl.data_len);
- TreeInfo **ti_ptr =
- (snd_ctrl.reload_sounds ? &artwork.snd_current : &artwork.mus_current);
- TreeInfo *ti = *ti_ptr;
- unsigned long str_size1, str_size2, str_size3;
-
- 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.soundserver_pipe[0], set_name,
- snd_ctrl.data_len) != snd_ctrl.data_len ||
- read(audio.soundserver_pipe[0], leveldir_current,
- sizeof(TreeInfo)) != sizeof(TreeInfo) ||
- read(audio.soundserver_pipe[0], ti,
- sizeof(TreeInfo)) != sizeof(TreeInfo) ||
- read(audio.soundserver_pipe[0], &str_size1,
- sizeof(unsigned long)) != sizeof(unsigned long) ||
- read(audio.soundserver_pipe[0], &str_size2,
- sizeof(unsigned long)) != sizeof(unsigned long) ||
- read(audio.soundserver_pipe[0], &str_size3,
- 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);
-
- if (read(audio.soundserver_pipe[0], leveldir_current->fullpath,
- str_size1) != str_size1 ||
- read(audio.soundserver_pipe[0], ti->basepath,
- str_size2) != str_size2 ||
- read(audio.soundserver_pipe[0], ti->fullpath,
- str_size3) != str_size3)
- Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
-
- InitPlaylist();
-
- close(audio.device_fd);
-
- if (snd_ctrl.reload_sounds)
- {
- artwork.sounds_set_current = set_name;
- audio.func_reload_sounds();
- }
- else
- {
- artwork.music_set_current = set_name;
- audio.func_reload_music();
- }
+static void ReadSoundControlFromMainProcess(SoundControl *snd_ctrl)
+{
+ if (IS_PARENT_PROCESS())
+ return;
- free(set_name);
+ if (read(audio.mixer_pipe[0], snd_ctrl, sizeof(SoundControl))
+ != sizeof(SoundControl))
+ Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
+}
- continue;
- }
+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 int str_size1 = strlen(leveldir_current->fullpath) + 1;
+ unsigned int str_size2 = strlen(leveldir_current->sounds_path) + 1;
+ unsigned int str_size3 = strlen(leveldir_current->music_path) + 1;
+ unsigned int str_size4 = strlen(ti->basepath) + 1;
+ unsigned int str_size5 = strlen(ti->fullpath) + 1;
+ boolean override_level_artwork = (type == SND_CTRL_RELOAD_SOUNDS ?
+ gfx.override_level_sounds :
+ gfx.override_level_music);
+
+ if (IS_CHILD_PROCESS())
+ return;
-#if defined(AUDIO_STREAMING_DSP)
+ if (leveldir_current == NULL) /* should never happen */
+ Error(ERR_EXIT, "leveldir_current == NULL");
- if (snd_ctrl.fade_sound)
- {
- if (!playing_sounds)
- continue;
+ clear_mem(&snd_ctrl, sizeof(SoundControl)); /* to make valgrind happy */
- if (snd_ctrl.music)
- playlist[audio.music_channel].fade_sound = TRUE;
- else
- for(i=0; i<MAX_SOUNDS_PLAYING; i++)
- if (snd_ctrl.stop_all_sounds ||
- (i != audio.music_channel && playlist[i].nr == snd_ctrl.nr))
- playlist[i].fade_sound = TRUE;
- }
- else if (snd_ctrl.stop_all_sounds)
- {
- if (!playing_sounds)
- continue;
+ snd_ctrl.active = FALSE;
+ snd_ctrl.state = type;
+ snd_ctrl.data_len = strlen(set_identifier) + 1;
- for(i=0; i<MAX_SOUNDS_PLAYING; i++)
- playlist[i] = emptySoundControl;
- playing_sounds = 0;
+ if (write(audio.mixer_pipe[1], &snd_ctrl,
+ sizeof(snd_ctrl)) < 0 ||
+ 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(TreeInfo)) < 0 ||
+ write(audio.mixer_pipe[1], &str_size1,
+ sizeof(unsigned int)) < 0 ||
+ write(audio.mixer_pipe[1], &str_size2,
+ sizeof(unsigned int)) < 0 ||
+ write(audio.mixer_pipe[1], &str_size3,
+ sizeof(unsigned int)) < 0 ||
+ write(audio.mixer_pipe[1], &str_size4,
+ sizeof(unsigned int)) < 0 ||
+ write(audio.mixer_pipe[1], &str_size5,
+ sizeof(unsigned int)) < 0 ||
+ write(audio.mixer_pipe[1], leveldir_current->fullpath,
+ str_size1) < 0 ||
+ 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_size5) < 0)
+ {
+ Error(ERR_WARN, "cannot pipe to child process -- no sounds");
+ audio.sound_available = audio.sound_enabled = FALSE;
+ return;
+ }
+}
- close(audio.device_fd);
- }
- else if (snd_ctrl.stop_sound)
- {
- if (!playing_sounds)
- continue;
+static void ReadReloadInfoFromPipe(SoundControl *snd_ctrl)
+{
+ TreeInfo **ti_ptr = ((snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS) ?
+ &artwork.snd_current : &artwork.mus_current);
+ TreeInfo *ti = *ti_ptr;
+ unsigned int 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 ?
+ &gfx.override_level_sounds :
+ &gfx.override_level_music);
+
+ checked_free(set_identifier);
+
+ 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));
+
+ 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,
+ sizeof(TreeInfo)) != sizeof(TreeInfo) ||
+ read(audio.mixer_pipe[0], &str_size1,
+ sizeof(unsigned int)) != sizeof(unsigned int) ||
+ read(audio.mixer_pipe[0], &str_size2,
+ sizeof(unsigned int)) != sizeof(unsigned int) ||
+ read(audio.mixer_pipe[0], &str_size3,
+ sizeof(unsigned int)) != sizeof(unsigned int) ||
+ read(audio.mixer_pipe[0], &str_size4,
+ sizeof(unsigned int)) != sizeof(unsigned int) ||
+ read(audio.mixer_pipe[0], &str_size5,
+ sizeof(unsigned int)) != sizeof(unsigned int))
+ Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
+
+ leveldir_current->fullpath = checked_calloc(str_size1);
+ 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], 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_size5) != str_size5)
+ Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
+
+ if (snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS)
+ artwork.snd_current_identifier = set_identifier;
+ else
+ artwork.mus_current_identifier = set_identifier;
+}
- if (snd_ctrl.music)
- {
- playlist[audio.music_channel] = emptySoundControl;
- playing_sounds--;
- }
+#endif /* AUDIO_UNIX_NATIVE */
- for(i=0; i<MAX_SOUNDS_PLAYING; i++)
- {
- if (i != audio.music_channel && playlist[i].nr == snd_ctrl.nr)
- {
- playlist[i] = emptySoundControl;
- playing_sounds--;
- }
- }
- if (!playing_sounds)
- close(audio.device_fd);
- }
+/* ------------------------------------------------------------------------- */
+/* mixer functions */
+/* ------------------------------------------------------------------------- */
- 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);
+void Mixer_InitChannels()
+{
+ int i;
+
+ for (i = 0; i < audio.num_channels; i++)
+ mixer[i].active = FALSE;
+ mixer_active_channels = 0;
+}
+
+static void Mixer_ResetChannelExpiration(int channel)
+{
+ 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
- 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);
- }
- }
+}
-#else /* !AUDIO_STREAMING_DSP */
+static boolean Mixer_ChannelExpired(int channel)
+{
+ if (!mixer[channel].active)
+ return TRUE;
- 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 (IS_LOOP(mixer[channel]) && !IS_MUSIC(mixer[channel]) &&
+ DelayReached(&mixer[channel].playing_starttime,
+ SOUND_LOOP_EXPIRATION_TIME))
+ return TRUE;
- 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 */
- }
+#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;
}
-#endif /* PLATFORM_UNIX */
-#if defined(PLATFORM_MSDOS)
-static void sound_handler(struct SoundControl snd_ctrl)
+static boolean Mixer_AllocateChannel(int channel)
{
- int i;
+#if defined(TARGET_ALLEGRO)
+ mixer[channel].voice = allocate_voice((SAMPLE *)mixer[channel].data_ptr);
+ if (mixer[channel].voice < 0)
+ return FALSE;
+#endif
- if (snd_ctrl.fade_sound)
- {
- if (!playing_sounds)
- return;
+ return TRUE;
+}
- for (i=0; i<MAX_SOUNDS_PLAYING; i++)
- if ((snd_ctrl.stop_all_sounds ||
- (i != audio.music_channel && playlist[i].nr == snd_ctrl.nr) ||
- (i == audio.music_channel && snd_ctrl.music)) &&
- !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();
- }
- else if (snd_ctrl.stop_sound)
+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_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)
{
- if (!playing_sounds)
- return;
- SoundServer_StopSound(snd_ctrl);
+ /* 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);
}
+#endif
+}
+
+static void Mixer_StopChannel(int channel)
+{
+ if (!mixer[channel].active)
+ return;
- for (i=0; i<MAX_SOUNDS_PLAYING; i++)
+#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(TARGET_SDL)
+ Mix_FadeOutChannel(channel, SOUND_FADING_INTERVAL);
+#elif defined(TARGET_ALLEGRO)
+ if (voice_check(mixer[channel].voice))
+ voice_ramp_volume(mixer[channel].voice, SOUND_FADING_INTERVAL, 0);
+#endif
+}
+
+static void Mixer_FadeMusicChannel()
+{
+ Mixer_FadeChannel(audio.music_channel);
+
+#if defined(TARGET_SDL)
+ Mix_FadeOutMusic(SOUND_FADING_INTERVAL);
+#endif
+}
+
+static void Mixer_UnFadeChannel(int channel)
+{
+ if (!mixer[channel].active || !IS_FADING(mixer[channel]))
+ return;
+
+ 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(SoundControl snd_ctrl)
+{
+ SoundInfo *snd_info;
+ int i, k;
+ int num_sounds = getSoundListSize();
+ int num_music = getMusicListSize();
+
+ if (IS_MUSIC(snd_ctrl))
{
- if (!playlist[i].active || playlist[i].loop)
- continue;
+ if (snd_ctrl.nr >= num_music) /* invalid music */
+ return;
- 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)
+ if (snd_ctrl.nr < 0) /* undefined music */
{
- deallocate_voice(playlist[i].voice);
- playlist[i] = emptySoundControl;
- playing_sounds--;
+ 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;
- if (snd_ctrl.active)
- SoundServer_InsertNewSound(snd_ctrl);
-}
-#endif /* PLATFORM_MSDOS */
+ snd_info = getSoundInfoEntryFromSoundID(snd_ctrl.nr);
+ }
-#if !defined(PLATFORM_WIN32)
-static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
-{
- int i, k;
+ if (snd_info == NULL)
+ return;
- if (snd_ctrl.music)
- snd_ctrl.nr = snd_ctrl.nr % num_music;
+ /* 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 (i != audio.music_channel && !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 (i != audio.music_channel && 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 (i != audio.music_channel && 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);
}
}
/* don't play sound more than n times simultaneously (with n == 2 for now) */
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 ||
- i == audio.music_channel ||
- 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
+ actual = 1000 * playing_time / mixer[i].data_len;
+
if (actual >= longest)
{
longest = actual;
}
}
-#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);
}
- /* add new sound to playlist */
- 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 ||
- (snd_ctrl.music && i == audio.music_channel))
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
- SoundInfo *snd_info =
- (snd_ctrl.music ? Music[snd_ctrl.nr] : Sound[snd_ctrl.nr]);
+ 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
- snd_ctrl.data_ptr = snd_info->data_ptr;
- snd_ctrl.data_len = snd_info->data_len;
+ 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;
+
+#if 0
+#if DEBUG
+ /* print some debugging information about audio channel usage */
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
+ {
+ Error(ERR_INFO, "Mixer_InsertSound: %d [%d]: %d (%d)",
+ i, mixer[i].active, mixer[i].data_len, (int)mixer[i].data_ptr);
+ }
+#endif
+#endif
- playlist[i] = snd_ctrl;
- playing_sounds++;
+ 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)
- playlist[i].voice = allocate_voice((SAMPLE *)playlist[i].data_ptr);
+ if (!IS_LOOP(mixer[i]) && actual > longest)
+ {
+ longest = actual;
+ longest_nr = i;
+ }
+ }
- if (snd_ctrl.loop)
- voice_set_playmode(playlist[i].voice, PLAYMODE_LOOP);
+ Mixer_StopChannel(longest_nr);
+ }
- voice_set_volume(playlist[i].voice, snd_ctrl.volume);
- voice_set_pan(playlist[i].voice, snd_ctrl.stereo);
- voice_start(playlist[i].voice);
+ /* add the new sound to the mixer */
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
+ {
+ if (!mixer[i].active)
+ {
+#if defined(AUDIO_UNIX_NATIVE)
+ if (snd_info->data_len == 0)
+ {
+ printf("THIS SHOULD NEVER HAPPEN! [snd_info->data_len == 0]\n");
+ }
#endif
+
+ 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)
+#if defined(AUDIO_UNIX_NATIVE)
+ if (IS_PARENT_PROCESS())
+ {
+ SendSoundControlToMixerProcess(&snd_ctrl);
return;
+ }
+#endif
- 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;
-}
-*/
+ /* 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 !defined(PLATFORM_WIN32)
-#if defined(PLATFORM_MSDOS)
-static void SoundServer_StopSound(struct SoundControl snd_ctrl)
-{
- int nr = snd_ctrl.nr;
- int i;
+ 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 (!playing_sounds)
- return;
+#if defined(AUDIO_UNIX_NATIVE)
+ CloseAudioDevice(&audio.device_fd);
+ ReadReloadInfoFromPipe(&snd_ctrl);
+#endif
- for(i=0; i<MAX_SOUNDS_PLAYING; 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 ((i == audio.music_channel && snd_ctrl.music) ||
- (i != audio.music_channel && playlist[i].nr == nr))
+ if (IS_MUSIC(snd_ctrl))
{
-#if defined(PLATFORM_MSDOS)
- voice_set_volume(playlist[i].voice, 0);
- deallocate_voice(playlist[i].voice);
-#endif
- playlist[i] = emptySoundControl;
- playing_sounds--;
+ 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;
+ }
-#if !defined(PLATFORM_MSDOS)
- if (!playing_sounds)
- close(audio.device_fd);
+ 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 */
+ {
+ Mixer_InsertSound(snd_ctrl);
+ }
}
-static void SoundServer_StopAllSounds()
+void StartMixer(void)
{
int i;
- for(i=0;i<MAX_SOUNDS_PLAYING;i++)
- {
-#if defined(PLATFORM_MSDOS)
- voice_set_volume(playlist[i].voice, 0);
- deallocate_voice(playlist[i].voice);
+#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
- playlist[i]=emptySoundControl;
- }
- playing_sounds = 0;
-#if !defined(PLATFORM_MSDOS)
- close(audio.device_fd);
+ if (!audio.sound_available)
+ return;
+
+ /* 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
}
-#endif /* PLATFORM_MSDOS */
-#endif /* !PLATFORM_WIN32 */
+#if defined(AUDIO_UNIX_NATIVE)
-/* ------------------------------------------------------------------------- */
-/* platform dependant audio initialization code */
-/* ------------------------------------------------------------------------- */
+static void CopySampleToMixingBuffer(SoundControl *snd_ctrl,
+ int sample_pos, int sample_size,
+ short *buffer_base_ptr, int buffer_pos,
+ int num_output_channels)
+{
+ 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 defined(AUDIO_LINUX_IOCTL)
-static boolean InitAudioDevice_Linux(long fragment_size, int sample_rate)
+ if (snd_ctrl->format == AUDIO_FORMAT_U8)
+ {
+ 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 */
+ {
+ 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()
{
- /* "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;
+ static short premix_first_buffer[DEFAULT_AUDIO_FRAGMENT_SIZE];
+ static int 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 (!mixer_active_channels)
+ return;
- /* determine logarithm (log2) of the fragment size */
- for (fragment_spec=0; (1 << fragment_spec) < fragment_size;
- fragment_spec++);
+ if (audio.device_fd < 0)
+ {
+ if ((audio.device_fd = OpenAudioDevice(audio.device_name)) < 0)
+ return;
- /* 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;
+ InitAudioDevice(&afmt);
+ }
- /* 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 */
+ stereo = afmt.stereo;
+ fragment_size = afmt.fragment_size;
+ sample_bytes = (afmt.format & AUDIO_FORMAT_U8 ? 1 : 2);
+ num_output_channels = (stereo ? 2 : 1);
+ max_sample_size = fragment_size / (num_output_channels * sample_bytes);
- 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");
+ /* first clear the last premixing buffer */
+ clear_mem(premix_last_buffer,
+ max_sample_size * num_output_channels * sizeof(int));
- /* try if we can use stereo sound */
- if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0)
+ for (i = 0; i < audio.num_channels; i++)
{
-#ifdef DEBUG
- static boolean reported = FALSE;
+ // void *sample_ptr;
+ int sample_len;
+ int sample_pos;
+ int sample_size;
+
+ if (!mixer[i].active)
+ continue;
- if (!reported)
+ if (Mixer_ChannelExpired(i))
{
- Error(ERR_RETURN, "cannot get stereo sound on /dev/dsp");
- reported = TRUE;
+ Mixer_StopChannel(i);
+ continue;
}
-#endif
- stereo = FALSE;
- }
- if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &sample_rate) < 0)
- Error(ERR_EXIT_SOUND_SERVER,
- "cannot set sample rate of /dev/dsp -- no sounds");
+ /* 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].playing_pos;
+ sample_size = MIN(max_sample_size, sample_len - sample_pos);
+ mixer[i].playing_pos += sample_size;
- /* 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");
+ /* copy original sample to first mixing buffer */
+ CopySampleToMixingBuffer(&mixer[i], sample_pos, sample_size,
+ premix_first_buffer, 0, num_output_channels);
- return (boolean)stereo;
-}
-#endif /* AUDIO_LINUX_IOCTL */
+ /* are we about to restart a looping sound? */
+ if (IS_LOOP(mixer[i]) && sample_size < max_sample_size)
+ {
+ while (sample_size < max_sample_size)
+ {
+ int restarted_sample_size =
+ MIN(max_sample_size - sample_size, sample_len);
-#if defined(PLATFORM_NETBSD)
-static boolean InitAudioDevice_NetBSD(long fragment_size, int sample_rate)
-{
- audio_info_t a_info;
- boolean stereo = TRUE;
+ CopySampleToMixingBuffer(&mixer[i], 0, restarted_sample_size,
+ premix_first_buffer, sample_size,
+ num_output_channels);
- 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;
+ mixer[i].playing_pos = restarted_sample_size;
+ sample_size += restarted_sample_size;
+ }
+ }
- if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0)
+ /* decrease volume if sound is fading out */
+ if (IS_FADING(mixer[i]) &&
+ mixer[i].volume >= SOUND_FADING_VOLUME_THRESHOLD)
+ mixer[i].volume -= SOUND_FADING_VOLUME_STEP;
+
+ /* adjust volume of actual sound sample */
+ if (mixer[i].volume != SOUND_MAX_VOLUME)
+ for (j = 0; j < sample_size * num_output_channels; j++)
+ premix_first_buffer[j] =
+ mixer[i].volume * (int)premix_first_buffer[j] / SOUND_MAX_VOLUME;
+
+ /* adjust left and right channel volume due to stereo sound position */
+ if (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++)
+ {
+ 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;
+ }
+ }
+
+ /* 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].playing_pos >= mixer[i].data_len)
+ {
+ if (IS_LOOP(mixer[i]))
+ mixer[i].playing_pos = 0;
+ else
+ Mixer_StopChannel(i);
+ }
+ else if (mixer[i].volume <= SOUND_FADING_VOLUME_THRESHOLD)
+ Mixer_StopChannel(i);
+ }
+
+ /* prepare final playing buffer according to system audio format */
+ for (i = 0; i < max_sample_size * num_output_channels; i++)
{
- /* try to disable stereo */
- a_info.play.channels = 1;
- stereo = FALSE;
+ /* cut off at 17 bit value */
+ if (premix_last_buffer[i] < -65535)
+ premix_last_buffer[i] = -65535;
+ else if (premix_last_buffer[i] > 65535)
+ premix_last_buffer[i] = 65535;
- if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0)
- Error(ERR_EXIT_SOUND_SERVER,
- "cannot set sample rate of /dev/audio -- no sounds");
+ /* shift to 16 bit value */
+ premix_last_buffer[i] >>= 1;
+
+ if (afmt.format & AUDIO_FORMAT_U8)
+ {
+ playing_buffer[i] = (premix_last_buffer[i] >> 8) ^ 0x80;
+ }
+ else if (afmt.format & AUDIO_FORMAT_LE) /* 16 bit */
+ {
+ playing_buffer[2 * i + 0] = premix_last_buffer[i] & 0xff;
+ playing_buffer[2 * i + 1] = premix_last_buffer[i] >> 8;
+ }
+ else /* big endian */
+ {
+ playing_buffer[2 * i + 0] = premix_last_buffer[i] >> 8;
+ playing_buffer[2 * i + 1] = premix_last_buffer[i] & 0xff;
+ }
}
- return stereo;
+ /* finally play the sound fragment */
+ if (write(audio.device_fd, playing_buffer, fragment_size) == -1)
+ Error(ERR_WARN, "write() failed; %s", strerror(errno));
+
+ if (!mixer_active_channels)
+ CloseAudioDevice(&audio.device_fd);
}
-#endif /* PLATFORM_NETBSD */
-#if defined(PLATFORM_HPUX)
-static boolean InitAudioDevice_HPUX()
+#else /* !AUDIO_STREAMING_DSP */
+
+static int Mixer_Main_SimpleAudio(SoundControl snd_ctrl)
{
- struct audio_describe ainfo;
- int audio_ctl;
+ 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;
+ int sample_size;
+ int i, j;
+
+ i = 1;
+
+ /* 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].playing_pos;
+ sample_size = MIN(max_sample_size, sample_len - sample_pos);
+ mixer[i].playing_pos += sample_size;
+
+ /* copy original sample to first mixing buffer */
+ CopySampleToMixingBuffer(&mixer[i], sample_pos, sample_size,
+ premix_first_buffer, 0, num_output_channels);
+
+ /* adjust volume of actual sound sample */
+ if (mixer[i].volume != SOUND_MAX_VOLUME)
+ for (j = 0; j < sample_size; j++)
+ premix_first_buffer[j] =
+ mixer[i].volume * (int)premix_first_buffer[j] / SOUND_MAX_VOLUME;
+
+ /* might be needed for u-law /dev/audio */
+ for (j = 0; j < sample_size; j++)
+ playing_buffer[j] =
+ linear_to_ulaw(premix_first_buffer[j]);
+
+ /* delete completed sound entries from the mixer */
+ if (mixer[i].playing_pos >= mixer[i].data_len)
+ Mixer_StopChannel(i);
+
+ for (i = 0; i < sample_size; i++)
+ playing_buffer[i] = (premix_first_buffer[i] >> 8) ^ 0x80;
+
+ /* finally play the sound fragment */
+ write(audio.device_fd, playing_buffer, sample_size);
+
+ return sample_size;
+}
+#endif /* !AUDIO_STREAMING_DSP */
- audio_ctl = open("/dev/audioCtl", O_WRONLY | O_NDELAY);
- if (audio_ctl == -1)
- Error(ERR_EXIT_SOUND_SERVER, "cannot open /dev/audioCtl -- no sounds");
+void Mixer_Main()
+{
+ SoundControl snd_ctrl;
+ fd_set mixer_fdset;
- if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1)
- Error(ERR_EXIT_SOUND_SERVER, "no audio info -- no sounds");
+ close(audio.mixer_pipe[1]); /* no writing into pipe needed */
- if (ioctl(audio_ctl, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) == -1)
- Error(ERR_EXIT_SOUND_SERVER, "ulaw audio not available -- no sounds");
+ Mixer_InitChannels();
- ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1);
- ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000);
+#if defined(PLATFORM_HPUX)
+ InitAudioDevice(&afmt);
+#endif
- close(audio_ctl);
+ FD_ZERO(&mixer_fdset);
+ FD_SET(audio.mixer_pipe[0], &mixer_fdset);
+
+ while (1) /* wait for sound playing commands from client */
+ {
+ struct timeval delay = { 0, 0 };
+
+ FD_SET(audio.mixer_pipe[0], &mixer_fdset);
+ select(audio.mixer_pipe[0] + 1, &mixer_fdset, NULL, NULL, NULL);
+ if (!FD_ISSET(audio.mixer_pipe[0], &mixer_fdset))
+ continue;
+
+ ReadSoundControlFromMainProcess(&snd_ctrl);
- return TRUE; /* to provide common interface for InitAudioDevice_...() */
+ HandleSoundRequest(snd_ctrl);
+
+#if defined(AUDIO_STREAMING_DSP)
+
+ while (mixer_active_channels &&
+ select(audio.mixer_pipe[0] + 1,
+ &mixer_fdset, NULL, NULL, &delay) < 1)
+ {
+ FD_SET(audio.mixer_pipe[0], &mixer_fdset);
+
+ Mixer_Main_DSP();
+ }
+
+#else /* !AUDIO_STREAMING_DSP */
+
+ if (!snd_ctrl.active || IS_LOOP(snd_ctrl) ||
+ (audio.device_fd = OpenAudioDevice(audio.device_name)) < 0)
+ continue;
+
+ InitAudioDevice(&afmt);
+
+ delay.tv_sec = 0;
+ delay.tv_usec = 0;
+
+ while (mixer_active_channels &&
+ select(audio.mixer_pipe[0] + 1,
+ &mixer_fdset, NULL, NULL, &delay) < 1)
+ {
+ int wait_percent = 90; /* wait 90% of the real playing time */
+ int sample_size;
+
+ FD_SET(audio.mixer_pipe[0], &mixer_fdset);
+
+ sample_size = Mixer_Main_SimpleAudio(snd_ctrl);
+
+ delay.tv_sec = 0;
+ delay.tv_usec =
+ ((sample_size * 10 * wait_percent) / afmt.sample_rate) * 1000;
+ }
+
+ CloseAudioDevice(&audio.device_fd);
+
+ Mixer_InitChannels(); /* remove all sounds from mixer */
+
+#endif /* !AUDIO_STREAMING_DSP */
+ }
}
-#endif /* PLATFORM_HPUX */
+#endif /* AUDIO_UNIX_NATIVE */
+
-#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 */
+
+ clear_mem(&header, sizeof(struct SoundHeader_WAV)); /* to make gcc happy */
if ((file = fopen(filename, MODE_READ)) == NULL)
{
}
/* read chunk id "RIFF" */
- getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN);
- if (strcmp(chunk_name, "RIFF") != 0)
+ getFileChunkLE(file, chunk_name, &chunk_size);
+ if (!strEqual(chunk_name, "RIFF"))
{
Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename);
fclose(file);
return NULL;
}
- /* 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(snd_info);
- return NULL;
- }
+ /* read "RIFF" type id "WAVE" */
+ getFileChunkLE(file, chunk_name, NULL);
+ if (!strEqual(chunk_name, "WAVE"))
+ {
+ Error(ERR_WARN, "missing 'WAVE' type ID of sound file '%s'", filename);
+ fclose(file);
+ free(snd_info);
+ return NULL;
+ }
+
+ while (getFileChunkLE(file, chunk_name, &chunk_size))
+ {
+ if (strEqual(chunk_name, "fmt "))
+ {
+ 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;
+ }
- while (getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN))
- {
- 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);
+ /* 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 (chunk_size > WAV_HEADER_SIZE)
- ReadUnusedBytesFromFile(file, chunk_size - WAV_HEADER_SIZE);
+#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: %d'\n", header.sample_rate);
+ printf(" Average bytes per second: %d'\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)
+ else if (strEqual(chunk_name, "data"))
{
- 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;
}
- for (i=0; i<snd_info->data_len; i++)
- ((byte *)snd_info->data_ptr)[i] = ((byte *)snd_info->data_ptr)[i] ^ 0x80;
-
-#endif /* PLATFORM_UNIX */
-
- snd_info->type = SND_TYPE_WAV;
- snd_info->source_filename = getStringCopy(filename);
-
- return snd_info;
-}
-
-SoundInfo *LoadCustomSound(char *basename)
-{
- char *filename = getCustomSoundFilename(basename);
-
- if (filename == NULL)
+ if (header.bits_per_sample == 8)
+ snd_info->format = AUDIO_FORMAT_U8;
+ else /* header.bits_per_sample == 16 */
{
- Error(ERR_WARN, "cannot find sound file '%s'", basename);
- return FALSE;
+ snd_info->format = AUDIO_FORMAT_S16;
+ snd_info->data_len /= 2; /* correct number of samples */
}
- return Load_WAV(filename);
-}
+ snd_info->num_channels = header.num_channels;
+ if (header.num_channels == 2)
+ snd_info->data_len /= 2; /* correct number of samples */
-void InitSoundList(int num_list_entries)
-{
- Sound = checked_calloc(num_list_entries * sizeof(SoundInfo *));
- num_sounds = num_list_entries;
-}
+#if 0
+ if (header.num_channels == 1) /* convert mono sound to stereo */
+ {
+ 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;
-void LoadSoundToList(char *basename, int list_pos)
-{
- if (Sound == NULL || list_pos >= num_sounds)
- 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];
+ }
+#endif
+
+#endif /* AUDIO_UNIX_NATIVE */
- if (Sound[list_pos])
- FreeSound(Sound[list_pos]);
+ snd_info->type = SND_TYPE_WAV;
+ snd_info->source_filename = getStringCopy(filename);
- Sound[list_pos] = LoadCustomSound(basename);
+ 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 1
+ if (FileIsMusic(filename))
+ return Load_MOD(filename);
+ else if (FileIsSound(filename))
+ return Load_WAV(filename);
+ else
+ return NULL;
+#else
+ if (FileIsSound(filename))
+ return Load_WAV(filename);
+ else if (FileIsMusic(filename))
+ return Load_MOD(filename);
+ else
+ return NULL;
+#endif
+}
+
+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 &&
+ 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);
+
+ 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 (strEqual(basename, music->filename))
+ {
+ music_already_used = TRUE;
+ break;
+ }
+ }
+
+ if (music_already_used)
+ continue;
+
+ if (draw_init_text)
+ DrawInitText(basename, 150, FC_YELLOW);
- if (FileIsSound(basename))
- mus_info = Load_WAV(filename);
- else if (FileIsMusic(basename))
- mus_info = Load_MOD(filename);
+ filename = getPath2(music_directory, basename);
+
+ if (FileIsMusic(basename))
+ mus_info = Load_WAV_or_MOD(filename);
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];
+}
+
+static MusicInfo *getMusicInfoEntryFromMusicID(int pos)
+{
+ 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];
+}
+
+int getSoundListPropertyMappingSize()
+{
+ return sound_info->num_property_mapping_entries;
+}
+
+int getMusicListPropertyMappingSize()
+{
+ return music_info->num_property_mapping_entries;
+}
+
+struct PropertyMapping *getSoundListPropertyMapping()
+{
+ return sound_info->property_mapping;
+}
+
+struct PropertyMapping *getMusicListPropertyMapping()
+{
+ return music_info->property_mapping;
+}
+
+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;
+
+ sound_info = checked_calloc(sizeof(struct ArtworkListInfo));
+ sound_info->type = ARTWORK_TYPE_SOUNDS;
+
+ /* ---------- initialize file list and suffix lists ---------- */
+
+ sound_info->num_file_list_entries = num_file_list_entries;
+ sound_info->num_dynamic_file_list_entries = 0;
+
+ sound_info->file_list =
+ getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens,
+ num_file_list_entries);
+ sound_info->dynamic_file_list = NULL;
+
+ 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;
+}
+
+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)
+{
+ int i;
+
+ 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 PlayMusic(int nr)
+{
+ if (!audio.music_available)
+ return;
+
+ PlaySoundMusic(nr);
}
void PlaySound(int nr)
{
- PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_NO_LOOP);
+ 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);
+ PlaySoundExt(nr, SOUND_MAX_VOLUME, stereo_position, SND_CTRL_PLAY_SOUND);
}
void PlaySoundLoop(int nr)
{
- PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_LOOP);
+ PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_LOOP);
}
void PlaySoundMusic(int nr)
{
- PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_MUSIC);
+ PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_MUSIC);
}
-void PlaySoundExt(int nr, int volume, int stereo, boolean loop_type)
+void PlaySoundExt(int nr, int volume, int stereo_position, int state)
{
- struct SoundControl snd_ctrl = emptySoundControl;
+ 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;
+ volume = SETUP_SOUND_VOLUME(volume, state);
- if (stereo < PSND_MAX_LEFT)
- stereo = PSND_MAX_LEFT;
- else if (stereo > PSND_MAX_RIGHT)
- stereo = PSND_MAX_RIGHT;
+ if (volume < SOUND_MIN_VOLUME)
+ volume = SOUND_MIN_VOLUME;
+ else if (volume > SOUND_MAX_VOLUME)
+ volume = SOUND_MAX_VOLUME;
- snd_ctrl.nr = nr;
- snd_ctrl.volume = volume;
- snd_ctrl.stereo = stereo;
- snd_ctrl.loop = (loop_type != PSND_NO_LOOP);
- snd_ctrl.music = (loop_type == PSND_MUSIC);
- snd_ctrl.active = TRUE;
+ if (stereo_position < SOUND_MAX_LEFT)
+ stereo_position = SOUND_MAX_LEFT;
+ else if (stereo_position > SOUND_MAX_RIGHT)
+ stereo_position = SOUND_MAX_RIGHT;
-#if 0
- snd_ctrl.data_ptr = Sound[nr].data_ptr;
- snd_ctrl.data_len = Sound[nr].data_len;
-#endif
+ clear_mem(&snd_ctrl, sizeof(SoundControl)); /* to make valgrind happy */
-#if defined(TARGET_SDL)
- Mix_Volume(-1, SOUND_MAX_VOLUME);
- Mix_PlayChannel(-1, Sound[nr]->data_ptr, (loop_type ? -1 : 0));
-#elif defined(PLATFORM_UNIX)
- if (audio.soundserver_pid == 0) /* we are child process */
- return;
+ snd_ctrl.active = TRUE;
+ snd_ctrl.nr = nr;
+ snd_ctrl.volume = volume;
+ snd_ctrl.stereo_position = stereo_position;
+ snd_ctrl.state = 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
+ HandleSoundRequest(snd_ctrl);
}
void FadeMusic(void)
{
- if (!audio.sound_available)
+ if (!audio.music_available)
return;
-#if defined(TARGET_SDL)
- Mix_FadeOutMusic(SOUND_FADING_INTERVAL);
- Mix_FadeOutChannel(audio.music_channel, SOUND_FADING_INTERVAL);
-#else
- StopSoundExt(-1, SSND_FADE_MUSIC);
-#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);
}
void StopMusic(void)
{
-#if defined(TARGET_SDL)
- if (!audio.sound_available)
+ if (!audio.music_available)
return;
- Mix_HaltMusic();
- Mix_HaltChannel(audio.music_channel);
-#else
- StopSoundExt(-1, SSND_STOP_MUSIC);
-#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);
+ 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 (method & SSND_FADING)
- snd_ctrl.fade_sound = TRUE;
+ clear_mem(&snd_ctrl, sizeof(SoundControl)); /* to make valgrind happy */
- if (method & SSND_ALL)
- snd_ctrl.stop_all_sounds = TRUE;
- else
- {
- snd_ctrl.stop_sound = TRUE;
- snd_ctrl.nr = nr;
- }
+ snd_ctrl.active = FALSE;
+ snd_ctrl.nr = nr;
+ snd_ctrl.state = state;
- if (method & SSND_MUSIC)
- snd_ctrl.music = TRUE;
+ HandleSoundRequest(snd_ctrl);
+}
-#if defined(TARGET_SDL)
+static void ReloadCustomSounds()
+{
+#if 0
+ printf("::: reloading sounds '%s' ...\n", artwork.snd_current_identifier);
+#endif
- if (method & SSND_FADING)
- {
- int i;
+ LoadArtworkConfig(sound_info);
+ ReloadCustomArtworkList(sound_info);
+}
- for (i=0; i<audio.channels; i++)
- if (i != audio.music_channel || snd_ctrl.music)
- Mix_FadeOutChannel(i, SOUND_FADING_INTERVAL);
- if (snd_ctrl.music)
- Mix_FadeOutMusic(SOUND_FADING_INTERVAL);
- }
- else
- {
- int i;
+static void ReloadCustomMusic()
+{
+#if 0
+ printf("::: reloading music '%s' ...\n", artwork.mus_current_identifier);
+#endif
- for (i=0; i<audio.channels; i++)
- if (i != audio.music_channel || snd_ctrl.music)
- Mix_HaltChannel(i);
- if (snd_ctrl.music)
- Mix_HaltMusic();
- }
+ LoadArtworkConfig(music_info);
+ ReloadCustomArtworkList(music_info);
-#elif !defined(PLATFORM_MSDOS)
+ /* load all music files from directory not defined in "musicinfo.conf" */
+ LoadCustomMusic_NoConf();
+}
- if (audio.soundserver_pid == 0) /* we are child process */
+void InitReloadCustomSounds(char *set_identifier)
+{
+ if (!audio.sound_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;
- }
+#if defined(AUDIO_UNIX_NATIVE)
+ LoadArtworkConfig(sound_info); /* also load config on sound client */
+ WriteReloadInfoToPipe(set_identifier, SND_CTRL_RELOAD_SOUNDS);
#else
- sound_handler(snd_ctrl);
+ ReloadCustomSounds();
#endif
}
-static void InitReloadSoundsOrMusic(char *set_name, int type)
+void InitReloadCustomMusic(char *set_identifier)
{
-#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
- struct SoundControl snd_ctrl = emptySoundControl;
- TreeInfo *ti =
- (type == SND_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;
-#endif
-
- if (!audio.sound_available)
- return;
-
-#if defined(TARGET_SDL) || defined(TARGET_ALLEGRO)
- if (type == SND_RELOAD_SOUNDS)
- audio.func_reload_sounds();
- else
- audio.func_reload_music();
-#elif defined(PLATFORM_UNIX)
- if (audio.soundserver_pid == 0) /* we are child process */
+ if (!audio.music_available)
return;
- if (leveldir_current == NULL) /* should never happen */
- Error(ERR_EXIT, "leveldir_current == NULL");
-
- snd_ctrl.reload_sounds = (type == SND_RELOAD_SOUNDS);
- snd_ctrl.reload_music = (type == SND_RELOAD_MUSIC);
- snd_ctrl.data_len = strlen(set_name) + 1;
-
- if (write(audio.soundserver_pipe[1], &snd_ctrl,
- sizeof(snd_ctrl)) < 0 ||
- write(audio.soundserver_pipe[1], set_name,
- snd_ctrl.data_len) < 0 ||
- write(audio.soundserver_pipe[1], leveldir_current,
- sizeof(TreeInfo)) < 0 ||
- write(audio.soundserver_pipe[1], ti,
- sizeof(TreeInfo)) < 0 ||
- write(audio.soundserver_pipe[1], &str_size1,
- sizeof(unsigned long)) < 0 ||
- write(audio.soundserver_pipe[1], &str_size2,
- sizeof(unsigned long)) < 0 ||
- write(audio.soundserver_pipe[1], &str_size3,
- sizeof(unsigned long)) < 0 ||
- write(audio.soundserver_pipe[1], leveldir_current->fullpath,
- str_size1) < 0 ||
- write(audio.soundserver_pipe[1], ti->basepath,
- str_size2) < 0 ||
- write(audio.soundserver_pipe[1], ti->fullpath,
- str_size3) < 0)
- {
- Error(ERR_WARN, "cannot pipe to child process -- no sounds");
- audio.sound_available = audio.sound_enabled = FALSE;
- return;
- }
+#if defined(AUDIO_UNIX_NATIVE)
+ LoadArtworkConfig(music_info); /* also load config on sound client */
+ WriteReloadInfoToPipe(set_identifier, SND_CTRL_RELOAD_MUSIC);
+#else
+ ReloadCustomMusic();
#endif
}
-void InitReloadSounds(char *set_name)
-{
- InitReloadSoundsOrMusic(set_name, SND_RELOAD_SOUNDS);
-}
-
-void InitReloadMusic(char *set_name)
+void FreeSound(void *ptr)
{
- InitReloadSoundsOrMusic(set_name, SND_RELOAD_MUSIC);
-}
+ SoundInfo *sound = (SoundInfo *)ptr;
-void FreeSound(SoundInfo *sound)
-{
if (sound == NULL)
return;
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
}
+ 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;
- for(i=0; i<num_sounds; i++)
- FreeSound(Sound[i]);
+ for (i = 0; i < num_music_noconf; i++)
+ FreeMusic(Music_NoConf[i]);
- free(Sound);
+ free(Music_NoConf);
- Sound = NULL;
- num_sounds = 0;
+ Music_NoConf = NULL;
+ num_music_noconf = 0;
}
-void FreeAllMusic()
+void FreeAllSounds()
{
- int i;
-
- if (Music == NULL)
- return;
-
- for(i=0; i<num_music; i++)
- FreeMusic(Music[i]);
-
- free(Music);
+ FreeCustomArtworkLists(sound_info);
+}
- Music = NULL;
- num_music = 0;
+void FreeAllMusic()
+{
+ FreeCustomArtworkLists(music_info);
+ FreeAllMusic_NoConf();
}
/* THE STUFF ABOVE IS ONLY USED BY THE MAIN PROCESS */
projects / rocksndiamonds.git / blobdiff