#include "setup.h"
+#define IS_PARENT_PROCESS(pid) ((pid) > 0)
+#define IS_CHILD_PROCESS(pid) ((pid) == 0)
+
struct ListNode
{
char *key;
/* ========================================================================= */
/* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */
-static struct AudioFormatInfo afmt =
-{
- TRUE, 0, DEFAULT_AUDIO_SAMPLE_RATE, DEFAULT_AUDIO_FRAGMENT_SIZE
-};
-
-static int playing_sounds = 0;
-static struct SoundControl playlist[NUM_MIXER_CHANNELS];
-static struct SoundControl emptySoundControl =
-{
-#if 1
- FALSE, -1, 0, 0, FALSE, 0, 0, 0, NULL
-#else
- -1,0,0, FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE, 0,0, 0,NULL
-#endif
-};
+static struct AudioFormatInfo afmt;
+static struct SoundControl mixer[NUM_MIXER_CHANNELS];
+static int mixer_active_channels = 0;
/* forward declaration of internal functions */
-static void SoundServer_InsertNewSound(struct SoundControl);
static void InitAudioDevice(struct AudioFormatInfo *);
+static void Mixer_Main(void);
-#if defined(PLATFORM_UNIX)
-#if !defined(AUDIO_STREAMING_DSP)
+#if defined(PLATFORM_UNIX) && !defined(AUDIO_STREAMING_DSP)
static unsigned char linear_to_ulaw(int);
static int ulaw_to_linear(unsigned char);
#endif
-#elif defined(PLATFORM_MSDOS)
-static void SoundServer_InsertNewSound(struct SoundControl);
-static void SoundServer_StopSound(struct SoundControl);
-static void SoundServer_StopAllSounds();
-#endif
static void ReloadCustomSounds();
static void ReloadCustomMusic();
#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();
-
- /* never reached */
- exit(0);
- }
- else /* we are parent */
- close(audio.soundserver_pipe[0]); /* no reading from pipe needed */
+ if (IS_CHILD_PROCESS(audio.mixer_pid))
+ Mixer_Main(); /* this function never returns */
+ else
+ close(audio.mixer_pipe[0]); /* no reading from pipe needed */
return TRUE;
}
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(audio.mixer_pid))
+ kill(audio.mixer_pid, SIGTERM);
}
-#endif /* PLATFORM_UNIX */
-void InitPlaylist(void)
+static void SendSoundControlToMixerProcess(SoundControl *snd_ctrl)
{
- int i;
+ if (IS_CHILD_PROCESS(audio.mixer_pid))
+ return;
- for(i=0; i<NUM_MIXER_CHANNELS; i++)
- playlist[i] = emptySoundControl;
- playing_sounds = 0;
+ 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;
+ }
}
-#if 1
-static void PlaylistRemoveSound(int pos)
+static void ReadSoundControlFromMainProcess(SoundControl *snd_ctrl)
{
- if (!playing_sounds || !playlist[pos].active)
+ if (IS_PARENT_PROCESS(audio.mixer_pid))
return;
- playlist[pos] = emptySoundControl;
- playing_sounds--;
+ 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_name, int type)
{
- struct SoundControl snd_ctrl = emptySoundControl;
+ 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 (IS_CHILD_PROCESS(audio.mixer_pid))
+ return;
+
+ if (leveldir_current == NULL) /* should never happen */
+ Error(ERR_EXIT, "leveldir_current == NULL");
+
+ snd_ctrl.active = FALSE;
snd_ctrl.state = type;
snd_ctrl.data_len = strlen(set_name) + 1;
- if (write(audio.soundserver_pipe[1], &snd_ctrl,
+ if (write(audio.mixer_pipe[1], &snd_ctrl,
sizeof(snd_ctrl)) < 0 ||
- write(audio.soundserver_pipe[1], set_name,
+ write(audio.mixer_pipe[1], set_name,
snd_ctrl.data_len) < 0 ||
- write(audio.soundserver_pipe[1], leveldir_current,
+ write(audio.mixer_pipe[1], leveldir_current,
sizeof(TreeInfo)) < 0 ||
- write(audio.soundserver_pipe[1], ti,
+ write(audio.mixer_pipe[1], ti,
sizeof(TreeInfo)) < 0 ||
- write(audio.soundserver_pipe[1], &str_size1,
+ write(audio.mixer_pipe[1], &str_size1,
sizeof(unsigned long)) < 0 ||
- write(audio.soundserver_pipe[1], &str_size2,
+ write(audio.mixer_pipe[1], &str_size2,
sizeof(unsigned long)) < 0 ||
- write(audio.soundserver_pipe[1], &str_size3,
+ write(audio.mixer_pipe[1], &str_size3,
sizeof(unsigned long)) < 0 ||
- write(audio.soundserver_pipe[1], leveldir_current->fullpath,
+ write(audio.mixer_pipe[1], leveldir_current->fullpath,
str_size1) < 0 ||
- write(audio.soundserver_pipe[1], ti->basepath,
+ write(audio.mixer_pipe[1], ti->basepath,
str_size2) < 0 ||
- write(audio.soundserver_pipe[1], ti->fullpath,
+ write(audio.mixer_pipe[1], ti->fullpath,
str_size3) < 0)
{
Error(ERR_WARN, "cannot pipe to child process -- no sounds");
}
}
-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;
if (set_name)
free(set_name);
- set_name = checked_malloc(snd_ctrl.data_len);
+ set_name = checked_malloc(snd_ctrl->data_len);
if (leveldir_current == NULL)
leveldir_current = checked_calloc(sizeof(TreeInfo));
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,
+ if (read(audio.mixer_pipe[0], set_name,
+ snd_ctrl->data_len) != snd_ctrl->data_len ||
+ read(audio.mixer_pipe[0], leveldir_current,
sizeof(TreeInfo)) != sizeof(TreeInfo) ||
- read(audio.soundserver_pipe[0], ti,
+ read(audio.mixer_pipe[0], ti,
sizeof(TreeInfo)) != sizeof(TreeInfo) ||
- read(audio.soundserver_pipe[0], &str_size1,
+ read(audio.mixer_pipe[0], &str_size1,
sizeof(unsigned long)) != sizeof(unsigned long) ||
- read(audio.soundserver_pipe[0], &str_size2,
+ read(audio.mixer_pipe[0], &str_size2,
sizeof(unsigned long)) != sizeof(unsigned long) ||
- read(audio.soundserver_pipe[0], &str_size3,
+ read(audio.mixer_pipe[0], &str_size3,
sizeof(unsigned long)) != sizeof(unsigned long))
Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
ti->basepath = checked_calloc(str_size2);
ti->fullpath = checked_calloc(str_size3);
- if (read(audio.soundserver_pipe[0], leveldir_current->fullpath,
+ if (read(audio.mixer_pipe[0], leveldir_current->fullpath,
str_size1) != str_size1 ||
- read(audio.soundserver_pipe[0], ti->basepath,
+ read(audio.mixer_pipe[0], ti->basepath,
str_size2) != str_size2 ||
- read(audio.soundserver_pipe[0], ti->fullpath,
+ read(audio.mixer_pipe[0], ti->fullpath,
str_size3) != str_size3)
Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
- if (snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS)
+ if (snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS)
artwork.sounds_set_current = set_name;
else
artwork.music_set_current = set_name;
}
+#endif /* PLATFORM_UNIX */
-static void HandleSoundRequest(struct SoundControl snd_ctrl)
+void Mixer_InitChannels()
{
int i;
+ for(i=0; i<audio.num_channels; i++)
+ mixer[i].active = FALSE;
+ mixer_active_channels = 0;
+}
+
+static void Mixer_PlayChannel(int channel)
+{
+ /* start with inactive channel in case something goes wrong */
+ mixer[channel].active = FALSE;
+
+ if (IS_MUSIC_MODULE(mixer[channel]))
+ return;
+
+ mixer[channel].playingpos = 0;
+ mixer[channel].playingtime = 0;
+
+#if defined(TARGET_SDL)
+ Mix_Volume(channel, SOUND_MAX_VOLUME);
+ Mix_PlayChannel(channel, mixer[channel].data_ptr,
+ IS_LOOP(mixer[channel]) ? -1 : 0);
+#elif defined(PLATFORM_MSDOS)
+ mixer[channel].voice = allocate_voice((SAMPLE *)mixer[channel].data_ptr);
+ if (mixer[channel].voice < 0)
+ return;
+
+ if (IS_LOOP(mixer[channel]))
+ voice_set_playmode(mixer[channel].voice, PLAYMODE_LOOP);
+
+ voice_set_volume(mixer[channel].voice, mixer[channel].volume);
+ voice_set_pan(mixer[channel].voice, mixer[channel].stereo);
+ voice_start(mixer[channel].voice);
+#endif
+
+ mixer[channel].active = TRUE;
+ mixer_active_channels++;
+}
+
+static void Mixer_PlayMusicChannel()
+{
+ Mixer_PlayChannel(audio.music_channel);
+
+#if defined(TARGET_SDL)
+ if (IS_MUSIC_MODULE(mixer[audio.music_channel]))
+ {
+ /* 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 (!mixer_active_channels || !mixer[channel].active)
+ return;
+
+#if defined(TARGET_SDL)
+ Mix_HaltChannel(channel);
+#elif defined(PLATFORM_MSDOS)
+ 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)
+{
+ mixer[channel].state |= SND_CTRL_FADE;
+
+#if defined(TARGET_SDL)
+ Mix_FadeOutChannel(channel, SOUND_FADING_INTERVAL);
+#elif defined(PLATFORM_MSDOS)
+ if (voice_check(mixer[channel].voice))
+ voice_ramp_volume(mixer[channel].voice, SOUND_FADING_INTERVAL, 0);
+ mixer[channel].state &= ~SND_CTRL_IS_LOOP;
+#endif
+}
+
+static void Mixer_FadeMusicChannel()
+{
+ Mixer_FadeChannel(audio.music_channel);
+
+#if defined(TARGET_SDL)
+ Mix_FadeOutMusic(SOUND_FADING_INTERVAL);
+#endif
+}
+
+static void Mixer_InsertSound(SoundControl snd_ctrl)
+{
+ SoundInfo *snd_info;
+ int i, k;
+
+#if 0
+ printf("NEW SOUND %d HAS ARRIVED [%d]\n", snd_ctrl.nr, num_sounds);
+#endif
+
+ if (IS_MUSIC(snd_ctrl))
+ snd_ctrl.nr = snd_ctrl.nr % num_music;
+ else if (snd_ctrl.nr >= num_sounds)
+ return;
+
+ 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.data_ptr = snd_info->data_ptr;
+ snd_ctrl.data_len = snd_info->data_len;
+ snd_ctrl.format = snd_info->format;
+
+ if (IS_MUSIC(snd_ctrl))
+ {
+ mixer[audio.music_channel] = snd_ctrl;
+
+ Mixer_PlayChannel(audio.music_channel);
+
+ return;
+ }
+
+#if 0
+ printf("-> %d\n", mixer_active_channels);
+#endif
+
+ if (mixer_active_channels == audio.num_channels)
+ {
+ for (i=0; i<audio.num_channels; i++)
+ {
+ if (mixer[i].data_ptr == NULL)
+ {
+#if 1
+ printf("THIS SHOULD NEVER HAPPEN! [%d]\n", i);
+#endif
+
+ Mixer_StopChannel(i);
+ }
+ }
+ }
+
+ /* if mixer is full, remove oldest sound */
+ if (mixer_active_channels == audio.num_channels)
+ {
+ int longest = 0, longest_nr = audio.first_sound_channel;
+
+ 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
+
+ if (!IS_LOOP(mixer[i]) && actual > longest)
+ {
+ longest = actual;
+ longest_nr = i;
+ }
+ }
+
+ 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++;
+
+ /* restart loop sounds only if they are just fading out */
+ if (k >= 1 && IS_LOOP(snd_ctrl))
+ {
+ for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+ {
+ if (mixer[i].nr == snd_ctrl.nr && IS_FADING(mixer[i]))
+ {
+ 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
+ }
+ }
+
+ return;
+ }
+
+ /* don't play sound more than n times simultaneously (with n == 2 for now) */
+ if (k >= 2)
+ {
+ 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++)
+ {
+ int actual;
+
+ if (!mixer[i].active || mixer[i].nr != snd_ctrl.nr)
+ continue;
+
+#if !defined(PLATFORM_MSDOS)
+ actual = 100 * mixer[i].playingpos / mixer[i].data_len;
+#else
+ actual = mixer[i].playingpos;
+#endif
+ if (actual >= longest)
+ {
+ longest = actual;
+ longest_nr = i;
+ }
+ }
+
+ Mixer_StopChannel(longest_nr);
+ }
+
+ /* add new sound to mixer */
+ for(i=0; 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 0
+ printf("ADDING NEW SOUND %d TO MIXER\n", snd_ctrl.nr);
+#endif
+
+#if 1
+ 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_StopChannel(i);
+#endif
+ }
+#endif
+
+#if 0
+ snd_ctrl.data_ptr = snd_info->data_ptr;
+ snd_ctrl.data_len = snd_info->data_len;
+ snd_ctrl.format = snd_info->format;
+#endif
+
+ mixer[i] = snd_ctrl;
+
+ Mixer_PlayChannel(i);
+
+ break;
+ }
+ }
+}
+
+static void HandleSoundRequest(SoundControl snd_ctrl)
+{
+ int i;
+
+#if defined(AUDIO_UNIX_NATIVE)
+ if (IS_PARENT_PROCESS(audio.mixer_pid))
+ {
+ SendSoundControlToMixerProcess(&snd_ctrl);
+ return;
+ }
+#elif defined(TARGET_ALLEGRO)
+ for (i=0; i<audio.num_channels; i++)
+ {
+ if (!mixer[i].active || IS_LOOP(mixer[i]))
+ 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 == 0)
+ Mixer_StopChannel(i);
+ }
+#endif /* TARGET_ALLEGRO */
+
if (IS_RELOADING(snd_ctrl)) /* load new sound or music files */
{
- ReadReloadInfoFromPipe(snd_ctrl);
- InitPlaylist();
+ ReadReloadInfoFromPipe(&snd_ctrl);
+ Mixer_InitChannels();
CloseAudioDevice(&audio.device_fd);
if (snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS)
}
else if (IS_FADING(snd_ctrl)) /* fade out existing sound or music */
{
- if (!playing_sounds)
+ if (!mixer_active_channels)
return;
if (IS_MUSIC(snd_ctrl))
{
- playlist[MUSIC_CHANNEL].state |= SND_CTRL_FADE;
+ Mixer_FadeChannel(audio.music_channel);
return;
}
- for(i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
- if (playlist[i].nr == snd_ctrl.nr || ALL_SOUNDS(snd_ctrl))
- playlist[i].state |= SND_CTRL_FADE;
+ for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+ if (mixer[i].nr == snd_ctrl.nr || ALL_SOUNDS(snd_ctrl))
+ Mixer_FadeChannel(i);
}
else if (IS_STOPPING(snd_ctrl)) /* stop existing sound or music */
{
- if (!playing_sounds)
+ if (!mixer_active_channels)
return;
if (IS_MUSIC(snd_ctrl))
{
- PlaylistRemoveSound(MUSIC_CHANNEL);
+ Mixer_StopChannel(audio.music_channel);
return;
}
- for(i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
- if (playlist[i].nr == snd_ctrl.nr || ALL_SOUNDS(snd_ctrl))
- PlaylistRemoveSound(i);
+ for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+ if (mixer[i].nr == snd_ctrl.nr || ALL_SOUNDS(snd_ctrl))
+ Mixer_StopChannel(i);
- if (!playing_sounds)
+ if (!mixer_active_channels)
CloseAudioDevice(&audio.device_fd);
}
- else if (snd_ctrl.active) /* add new sound to playlist */
+ else if (snd_ctrl.active) /* add new sound to mixer */
{
- SoundServer_InsertNewSound(snd_ctrl);
+ Mixer_InsertSound(snd_ctrl);
}
}
-#endif
-void StartSoundserver(void)
+void StartMixer(void)
{
if (!audio.sound_available)
return;
#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
-static void CopySampleToMixingBuffer(struct SoundControl *snd_ctrl,
+static void CopySampleToMixingBuffer(SoundControl *snd_ctrl,
int sample_pos, int sample_size,
short *buffer_ptr)
{
}
#if defined(AUDIO_STREAMING_DSP)
-static void SoundServer_Mixer()
+static void Mixer_Main_DSP()
{
static int stereo_volume[PSND_MAX_LEFT2RIGHT + 1];
static boolean stereo_volume_calculated = FALSE;
static short premix_right_buffer[SND_BLOCKSIZE];
static long premix_last_buffer[SND_BLOCKSIZE];
static byte playing_buffer[SND_BLOCKSIZE];
+ boolean stereo;
+ int fragment_size;
+ int sample_bytes;
int max_sample_size;
- int fragment_size = afmt.fragment_size;
- int sample_bytes = (afmt.format & AUDIO_FORMAT_U8 ? 1 : 2);
- boolean stereo = afmt.stereo;
int i, j;
if (!stereo_volume_calculated)
stereo_volume_calculated = TRUE;
}
- if (!playing_sounds)
+ if (!mixer_active_channels)
return;
if (audio.device_fd < 0)
InitAudioDevice(&afmt);
}
+ 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);
/* first clear the last premixing buffer */
memset(premix_last_buffer, 0,
max_sample_size * (stereo ? 2 : 1) * sizeof(long));
- for(i=0; i<NUM_MIXER_CHANNELS; i++)
+ for(i=0; i<audio.num_channels; i++)
{
void *sample_ptr;
int sample_len;
int sample_pos;
int sample_size;
- if (!playlist[i].active)
+ if (!mixer[i].active)
continue;
/* pointer, lenght and actual playing position of sound sample */
- sample_ptr = playlist[i].data_ptr;
- sample_len = playlist[i].data_len;
- sample_pos = playlist[i].playingpos;
+ sample_ptr = mixer[i].data_ptr;
+ sample_len = mixer[i].data_len;
+ sample_pos = mixer[i].playingpos;
sample_size = MIN(max_sample_size, sample_len - sample_pos);
- playlist[i].playingpos += sample_size;
+ mixer[i].playingpos += sample_size;
/* copy original sample to first mixing buffer */
- CopySampleToMixingBuffer(&playlist[i], sample_pos, sample_size,
+ CopySampleToMixingBuffer(&mixer[i], sample_pos, sample_size,
premix_first_buffer);
/* are we about to restart a looping sound? */
- if (IS_LOOP(playlist[i]) && sample_size < max_sample_size)
+ 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 (playlist[i].format == AUDIO_FORMAT_U8)
+ 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;
premix_first_buffer[sample_size + j] =
((short *)sample_ptr)[j];
- playlist[i].playingpos = restarted_sample_size;
+ mixer[i].playingpos = restarted_sample_size;
sample_size += restarted_sample_size;
}
}
/* decrease volume if sound is fading out */
- if (IS_FADING(playlist[i]) &&
- playlist[i].volume >= SOUND_FADING_VOLUME_THRESHOLD)
- playlist[i].volume -= SOUND_FADING_VOLUME_STEP;
+ 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 (playlist[i].volume != PSND_MAX_VOLUME)
+ if (mixer[i].volume != PSND_MAX_VOLUME)
for(j=0; j<sample_size; j++)
premix_first_buffer[j] =
- (playlist[i].volume * (long)premix_first_buffer[j])
+ (mixer[i].volume * (long)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];
+ int left_volume = stereo_volume[middle_pos + mixer[i].stereo];
+ int right_volume= stereo_volume[middle_pos - mixer[i].stereo];
for(j=0; j<sample_size; j++)
{
premix_last_buffer[j] += premix_first_buffer[j];
}
- /* delete completed sound entries from the playlist */
- if (playlist[i].playingpos >= playlist[i].data_len)
+ /* delete completed sound entries from the mixer */
+ if (mixer[i].playingpos >= mixer[i].data_len)
{
- if (IS_LOOP(playlist[i]))
- playlist[i].playingpos = 0;
+ if (IS_LOOP(mixer[i]))
+ mixer[i].playingpos = 0;
else
- PlaylistRemoveSound(i);
+ Mixer_StopChannel(i);
}
- else if (playlist[i].volume <= SOUND_FADING_VOLUME_THRESHOLD)
- PlaylistRemoveSound(i);
+ else if (mixer[i].volume <= SOUND_FADING_VOLUME_THRESHOLD)
+ Mixer_StopChannel(i);
}
/* prepare final playing buffer according to system audio format */
/* finally play the sound fragment */
write(audio.device_fd, playing_buffer, fragment_size);
- if (!playing_sounds)
+ if (!mixer_active_channels)
CloseAudioDevice(&audio.device_fd);
}
-#else /* !AUDIO_STREAMING_DSP */
-
-static int SoundServer_SimpleAudio(struct SoundControl snd_ctrl)
-{
- static short premix_first_buffer[SND_BLOCKSIZE];
- static byte playing_buffer[SND_BLOCKSIZE];
- int max_sample_size = SND_BLOCKSIZE;
- 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 = playlist[i].data_ptr;
- sample_len = playlist[i].data_len;
- sample_pos = playlist[i].playingpos;
- sample_size = MIN(max_sample_size, sample_len - sample_pos);
- playlist[i].playingpos += sample_size;
-
- /* copy original sample to first mixing buffer */
- CopySampleToMixingBuffer(&playlist[i], sample_pos, sample_size,
- premix_first_buffer);
-
- /* 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 * (long)premix_first_buffer[j])
- >> PSND_MAX_VOLUME_BITS;
-
- /* might be needed for u-law /dev/audio */
-#if 0
- for(j=0; j<sample_size; j++)
- playing_buffer[j] =
- linear_to_ulaw(premix_first_buffer[j]);
-#endif
-
- /* delete completed sound entries from the playlist */
- if (playlist[i].playingpos >= playlist[i].data_len)
- PlaylistRemoveSound(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 */
-
-void SoundServer()
-{
- struct SoundControl snd_ctrl;
- fd_set sound_fdset;
-
- close(audio.soundserver_pipe[1]); /* no writing into pipe needed */
-
- InitPlaylist();
-
-#if defined(PLATFORM_HPUX)
- InitAudioDevice(&afmt);
-#endif
-
- FD_ZERO(&sound_fdset);
- FD_SET(audio.soundserver_pipe[0], &sound_fdset);
-
- while(1) /* wait for sound playing commands from client */
- {
- struct timeval delay = { 0, 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");
-
- HandleSoundRequest(snd_ctrl);
-
-#if defined(AUDIO_STREAMING_DSP)
-
- while (playing_sounds && select(audio.soundserver_pipe[0] + 1,
- &sound_fdset, NULL, NULL, &delay) < 1)
- {
- FD_SET(audio.soundserver_pipe[0], &sound_fdset);
-
- SoundServer_Mixer();
- }
-
-#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 (playing_sounds && select(audio.soundserver_pipe[0] + 1,
- &sound_fdset, NULL, NULL, &delay) < 1)
- {
- int wait_percent = 90; /* wait 90% of the real playing time */
- int sample_size;
-
- FD_SET(audio.soundserver_pipe[0], &sound_fdset);
-
- sample_size = SoundServer_SimpleAudio(snd_ctrl);
-
- delay.tv_sec = 0;
- delay.tv_usec =
- ((sample_size * 10 * wait_percent) / afmt.sample_rate) * 1000;
- }
-
- CloseAudioDevice(&audio.device_fd);
-
- /* delete all sounds from playlist */
- InitPlaylist();
-
-#endif /* !AUDIO_STREAMING_DSP */
- }
-}
-#endif /* PLATFORM_UNIX */
-
-#if defined(PLATFORM_MSDOS)
-static void sound_handler(struct SoundControl snd_ctrl)
-{
- int i;
-
- if (snd_ctrl.fade_sound)
- {
- if (!playing_sounds)
- return;
-
- for (i=0; i<NUM_MIXER_CHANNELS; 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].state &= ~SND_CTRL_IS_LOOP;
- }
- }
- else if (snd_ctrl.stop_all_sounds)
- {
- if (!playing_sounds)
- return;
- SoundServer_StopAllSounds();
- }
- else if (snd_ctrl.stop_sound)
- {
- if (!playing_sounds)
- return;
- SoundServer_StopSound(snd_ctrl);
- }
-
- for (i=0; i<NUM_MIXER_CHANNELS; i++)
- {
- if (!playlist[i].active || playlist[i].loop)
- continue;
-
- playlist[i].playingpos = voice_get_position(playlist[i].voice);
- playlist[i].volume = voice_get_volume(playlist[i].voice);
- if (playlist[i].playingpos == -1 || !playlist[i].volume)
- {
- deallocate_voice(playlist[i].voice);
- playlist[i] = emptySoundControl;
- playing_sounds--;
- }
- }
-
- if (snd_ctrl.active)
- SoundServer_InsertNewSound(snd_ctrl);
-}
-#endif /* PLATFORM_MSDOS */
-
-#if 0
-#if defined(TARGET_SDL)
-static void sound_handler_SDL(struct SoundControl snd_ctrl)
-{
- /* copy sound_handler() here ... */
-}
-#endif /* TARGET_SDL */
-#endif
-
-#if !defined(PLATFORM_WIN32)
-static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
-{
- SoundInfo *snd_info;
- int i, k;
-
-#if 0
- printf("NEW SOUND %d HAS ARRIVED [%d]\n", snd_ctrl.nr, num_sounds);
-#endif
-
- if (IS_MUSIC(snd_ctrl))
- snd_ctrl.nr = snd_ctrl.nr % num_music;
- else if (snd_ctrl.nr >= num_sounds)
- return;
-
- snd_info = (IS_MUSIC(snd_ctrl) ? Music[snd_ctrl.nr] : Sound[snd_ctrl.nr]);
- if (snd_info == NULL)
- {
-#if 0
- printf("sound/music %d undefined\n", snd_ctrl.nr);
-#endif
- return;
- }
-
-#if 0
- printf("-> %d\n", playing_sounds);
-#endif
+#else /* !AUDIO_STREAMING_DSP */
- if (playing_sounds == NUM_MIXER_CHANNELS)
- {
- for (i=0; i<NUM_MIXER_CHANNELS; i++)
- {
- if (playlist[i].data_ptr == NULL)
- {
-#if 1
- printf("THIS SHOULD NEVER HAPPEN! [%d]\n", i);
-#endif
+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;
+ void *sample_ptr;
+ int sample_len;
+ int sample_pos;
+ int sample_size;
+ int i, j;
- playlist[i] = emptySoundControl;
- playing_sounds--;
- }
- }
- }
+ i = 1;
- /* if playlist is full, remove oldest sound */
- if (playing_sounds == NUM_MIXER_CHANNELS)
- {
- int longest = 0, longest_nr = 0;
+ /* 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_size = MIN(max_sample_size, sample_len - sample_pos);
+ mixer[i].playingpos += sample_size;
- for (i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
- {
-#if !defined(PLATFORM_MSDOS)
- int actual = 100 * playlist[i].playingpos / playlist[i].data_len;
-#else
- int actual = playlist[i].playingpos;
-#endif
+ /* copy original sample to first mixing buffer */
+ CopySampleToMixingBuffer(&mixer[i], sample_pos, sample_size,
+ premix_first_buffer);
- if (!IS_LOOP(playlist[i]) && 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);
+ /* adjust volume of actual sound sample */
+ if (mixer[i].volume != PSND_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;
+
+ /* might be needed for u-law /dev/audio */
+#if 0
+ for(j=0; j<sample_size; j++)
+ playing_buffer[j] =
+ linear_to_ulaw(premix_first_buffer[j]);
#endif
- playlist[longest_nr] = emptySoundControl;
- playing_sounds--;
- }
- /* check if sound is already being played (and how often) */
- for (k=0, i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
- if (playlist[i].nr == snd_ctrl.nr)
- k++;
+ /* delete completed sound entries from the mixer */
+ if (mixer[i].playingpos >= mixer[i].data_len)
+ Mixer_StopChannel(i);
- /* restart loop sounds only if they are just fading out */
- if (k >= 1 && IS_LOOP(snd_ctrl))
- {
- for(i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
- {
- if (playlist[i].nr == snd_ctrl.nr && IS_FADING(playlist[i]))
- {
- playlist[i].state &= ~SND_CTRL_FADE;
- playlist[i].volume = PSND_MAX_VOLUME;
-#if defined(PLATFORM_MSDOS)
- playlist[i].state |= SND_CTRL_LOOP;
- voice_stop_volumeramp(playlist[i].voice);
- voice_ramp_volume(playlist[i].voice, playlist[i].volume, 1000);
-#endif
- }
- }
+ for(i=0; i<sample_size; i++)
+ playing_buffer[i] = (premix_first_buffer[i] >> 8) ^ 0x80;
- return;
- }
+ /* finally play the sound fragment */
+ write(audio.device_fd, playing_buffer, sample_size);
- /* don't play sound more than n times simultaneously (with n == 2 for now) */
- if (k >= 2)
- {
- int longest = 0, longest_nr = 0;
+ return sample_size;
+}
+#endif /* !AUDIO_STREAMING_DSP */
- /* look for oldest equal sound */
- for(i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
- {
- int actual;
+void Mixer_Main()
+{
+ SoundControl snd_ctrl;
+ fd_set mixer_fdset;
- if (!playlist[i].active || playlist[i].nr != snd_ctrl.nr)
- continue;
+ close(audio.mixer_pipe[1]); /* no writing into pipe needed */
-#if !defined(PLATFORM_MSDOS)
- actual = 100 * playlist[i].playingpos / playlist[i].data_len;
-#else
- actual = playlist[i].playingpos;
-#endif
- if (actual >= longest)
- {
- longest = actual;
- longest_nr = i;
- }
- }
+ Mixer_InitChannels();
-#if defined(PLATFORM_MSDOS)
- voice_set_volume(playlist[longest_nr].voice, 0);
- deallocate_voice(playlist[longest_nr].voice);
+#if defined(PLATFORM_HPUX)
+ InitAudioDevice(&afmt);
#endif
- playlist[longest_nr] = emptySoundControl;
- playing_sounds--;
- }
- /* add new sound to playlist */
- for(i=0; i<NUM_MIXER_CHANNELS; i++)
- {
-#if 0
- printf("CHECKING CHANNEL %d FOR SOUND %d ...\n", i, snd_ctrl.nr);
-#endif
+ FD_ZERO(&mixer_fdset);
+ FD_SET(audio.mixer_pipe[0], &mixer_fdset);
- /*
- if (!playlist[i].active ||
- (IS_MUSIC(snd_ctrl) && i == MUSIC_CHANNEL))
- */
- if ((i == MUSIC_CHANNEL && IS_MUSIC(snd_ctrl)) ||
- (i != MUSIC_CHANNEL && !playlist[i].active))
- {
- snd_ctrl.data_ptr = snd_info->data_ptr;
- snd_ctrl.data_len = snd_info->data_len;
- snd_ctrl.format = snd_info->format;
+ while(1) /* wait for sound playing commands from client */
+ {
+ struct timeval delay = { 0, 0 };
-#if 1
- if (snd_info->data_len == 0)
- {
- printf("THIS SHOULD NEVER HAPPEN! [snd_info->data_len == 0]\n");
- }
-#endif
+ 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;
-#if 1
- if (IS_MUSIC(snd_ctrl) && i == MUSIC_CHANNEL && playlist[i].active)
- {
- printf("THIS SHOULD NEVER HAPPEN! [adding music twice]\n");
+ ReadSoundControlFromMainProcess(&snd_ctrl);
-#if 1
- playlist[i] = emptySoundControl;
- playing_sounds--;
-#endif
- }
-#endif
+ HandleSoundRequest(snd_ctrl);
- playlist[i] = snd_ctrl;
- playing_sounds++;
+#if defined(AUDIO_STREAMING_DSP)
-#if 0
- printf("NEW SOUND %d ADDED TO PLAYLIST\n", snd_ctrl.nr);
-#endif
+ while (mixer_active_channels &&
+ select(audio.mixer_pipe[0] + 1,
+ &mixer_fdset, NULL, NULL, &delay) < 1)
+ {
+ FD_SET(audio.mixer_pipe[0], &mixer_fdset);
-#if defined(PLATFORM_MSDOS)
- playlist[i].voice = allocate_voice((SAMPLE *)playlist[i].data_ptr);
+ Mixer_Main_DSP();
+ }
- if (snd_ctrl.loop)
- voice_set_playmode(playlist[i].voice, PLAYMODE_LOOP);
+#else /* !AUDIO_STREAMING_DSP */
- voice_set_volume(playlist[i].voice, snd_ctrl.volume);
- voice_set_pan(playlist[i].voice, snd_ctrl.stereo);
- voice_start(playlist[i].voice);
-#endif
- break;
- }
- }
-}
-#endif /* !PLATFORM_WIN32 */
+ if (!snd_ctrl.active || IS_LOOP(snd_ctrl) ||
+ (audio.device_fd = OpenAudioDevice(audio.device_name)) < 0)
+ continue;
-/*
-void SoundServer_FadeSound(int nr)
-{
- int i;
+ InitAudioDevice(&afmt);
- if (!playing_sounds)
- return;
+ delay.tv_sec = 0;
+ delay.tv_usec = 0;
- for(i=0;i<NUM_MIXER_CHANNELS;i++)
- if (snd_ctrl.stop_all_sounds || playlist[i].nr == snd_ctrl.nr)
- playlist[i].fade_sound = TRUE;
-}
-*/
+ 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;
-#if !defined(PLATFORM_WIN32)
-#if defined(PLATFORM_MSDOS)
-static void SoundServer_StopSound(struct SoundControl snd_ctrl)
-{
- int nr = snd_ctrl.nr;
- int i;
+ FD_SET(audio.mixer_pipe[0], &mixer_fdset);
- if (!playing_sounds)
- return;
+ sample_size = Mixer_Main_SimpleAudio(snd_ctrl);
- for(i=0; i<NUM_MIXER_CHANNELS; i++)
- {
- if ((i == audio.music_channel && snd_ctrl.music) ||
- (i != audio.music_channel && playlist[i].nr == nr))
- {
-#if defined(PLATFORM_MSDOS)
- voice_set_volume(playlist[i].voice, 0);
- deallocate_voice(playlist[i].voice);
-#endif
- playlist[i] = emptySoundControl;
- playing_sounds--;
+ delay.tv_sec = 0;
+ delay.tv_usec =
+ ((sample_size * 10 * wait_percent) / afmt.sample_rate) * 1000;
}
- }
-#if !defined(PLATFORM_MSDOS)
- if (!playing_sounds)
- close(audio.device_fd);
-#endif
-}
+ CloseAudioDevice(&audio.device_fd);
-static void SoundServer_StopAllSounds()
-{
- int i;
+ Mixer_InitChannels(); /* remove all sounds from mixer */
- for(i=0; i<NUM_MIXER_CHANNELS; i++)
- {
-#if defined(PLATFORM_MSDOS)
- voice_set_volume(playlist[i].voice, 0);
- deallocate_voice(playlist[i].voice);
-#endif
- playlist[i] = emptySoundControl;
+#endif /* !AUDIO_STREAMING_DSP */
}
- playing_sounds = 0;
-
-#if !defined(PLATFORM_MSDOS)
- close(audio.device_fd);
-#endif
}
-#endif /* PLATFORM_MSDOS */
-#endif /* !PLATFORM_WIN32 */
+#endif /* PLATFORM_UNIX */
/* ------------------------------------------------------------------------- */
#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;
+
#if defined(AUDIO_LINUX_IOCTL)
InitAudioDevice_Linux(afmt);
#elif defined(PLATFORM_NETBSD)
void PlaySoundExt(int nr, int volume, int stereo, int state)
{
- struct SoundControl snd_ctrl = emptySoundControl;
+ SoundControl snd_ctrl;
if (!audio.sound_available ||
!audio.sound_enabled ||
snd_ctrl.stereo = stereo;
snd_ctrl.state = state;
-#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.soundserver_pid == 0) /* we are child process */
- return;
-
- if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0)
- {
- Error(ERR_WARN, "cannot pipe to child process -- no sounds");
- audio.sound_available = audio.sound_enabled = FALSE;
- return;
- }
-#elif defined(PLATFORM_MSDOS)
- sound_handler(snd_ctrl);
-#endif
+ HandleSoundRequest(snd_ctrl);
}
void FadeMusic(void)
void StopSoundExt(int nr, int state)
{
- struct SoundControl snd_ctrl = emptySoundControl;
+ SoundControl snd_ctrl;
if (!audio.sound_available)
return;
- snd_ctrl.nr = nr;
- snd_ctrl.state = state;
-
-#if defined(TARGET_SDL)
-
- if (state & SND_CTRL_FADE)
- {
- int i;
-
- 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;
-
- 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();
- }
-
-#elif !defined(PLATFORM_MSDOS)
-
- if (audio.soundserver_pid == 0) /* we are child process */
- return;
+ snd_ctrl.active = FALSE;
+ snd_ctrl.nr = nr;
+ 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;
- }
-#else /* PLATFORM_MSDOS */
- sound_handler(snd_ctrl);
-#endif
+ HandleSoundRequest(snd_ctrl);
}
ListNode *newListNode()
LoadCustomMusic();
}
-static void InitReloadSoundsOrMusic(char *set_name, int type)
+void InitReloadSounds(char *set_name)
{
-#if 0
-#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
- struct SoundControl snd_ctrl = emptySoundControl;
- TreeInfo *ti = (state == 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;
-#endif
-#endif
-
if (!audio.sound_available)
return;
#if defined(TARGET_SDL) || defined(TARGET_ALLEGRO)
- if (type == SND_CTRL_RELOAD_SOUNDS)
- ReloadCustomSounds();
- else
- ReloadCustomMusic();
+ ReloadCustomSounds();
#elif defined(PLATFORM_UNIX)
- if (audio.soundserver_pid == 0) /* we are child process */
- return;
-
- if (leveldir_current == NULL) /* should never happen */
- Error(ERR_EXIT, "leveldir_current == NULL");
-
-#if 1
- WriteReloadInfoToPipe(set_name, type);
-#else
-
- snd_ctrl.state = type;
- 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;
- }
+ WriteReloadInfoToPipe(set_name, SND_CTRL_RELOAD_SOUNDS);
#endif
-
-#endif
-}
-
-void InitReloadSounds(char *set_name)
-{
- InitReloadSoundsOrMusic(set_name, SND_CTRL_RELOAD_SOUNDS);
}
void InitReloadMusic(char *set_name)
{
- InitReloadSoundsOrMusic(set_name, SND_CTRL_RELOAD_MUSIC);
+ if (!audio.music_available)
+ return;
+
+#if defined(TARGET_SDL) || defined(TARGET_ALLEGRO)
+ ReloadCustomMusic();
+#elif defined(PLATFORM_UNIX)
+ WriteReloadInfoToPipe(set_name, SND_CTRL_RELOAD_MUSIC);
+#endif
}
void FreeSound(void *ptr)
return;
printf("%s: FREEING SOUNDS ...\n",
- audio.soundserver_pid == 0 ? "CHILD" : "PARENT");
+ IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT");
for(i=0; i<num_sounds; i++)
deleteSoundEntry(&Sound[i]);
*/
printf("%s: FREEING SOUNDS -- DONE\n",
- audio.soundserver_pid == 0 ? "CHILD" : "PARENT");
+ IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT");
free(Sound);
projects / rocksndiamonds.git / blobdiff