/* ========================================================================= */
/* 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 struct AudioFormatInfo afmt;
+static struct SoundControl mixer[NUM_MIXER_CHANNELS];
+static int mixer_active_channels = 0;
-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
-};
+/* forward declaration of internal functions */
+static void Mixer_Main(void);
+static void Mixer_InsertNewSound(struct SoundControl);
+static void InitAudioDevice(struct AudioFormatInfo *);
#if defined(PLATFORM_UNIX)
-static int stereo_volume[PSND_MAX_LEFT2RIGHT + 1];
-static short premix_first_buffer[SND_BLOCKSIZE];
-#if defined(AUDIO_STREAMING_DSP)
-static short premix_left_buffer[SND_BLOCKSIZE];
-static short premix_right_buffer[SND_BLOCKSIZE];
-static long premix_last_buffer[SND_BLOCKSIZE];
-#endif
-static byte playing_buffer[SND_BLOCKSIZE];
-#endif
-
-/* forward declaration of internal functions */
-#if defined(AUDIO_STREAMING_DSP)
-static void SoundServer_InsertNewSound(struct SoundControl);
-static void InitAudioDevice_DSP(struct AudioFormatInfo *);
-#elif defined(PLATFORM_HPUX)
-static void InitAudioDevice_HPUX(struct AudioFormatInfo *);
-#elif defined(PLATFORM_UNIX)
+#if !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();
+static void Mixer_InsertNewSound(struct SoundControl);
+static void Mixer_StopSound(struct SoundControl);
+static void Mixer_StopAllSounds();
#endif
static void ReloadCustomSounds();
#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 */
+ if (audio.mixer_pid == 0) /* we are child process */
{
- SoundServer();
+ Mixer_Main();
/* never reached */
exit(0);
}
else /* we are parent */
- close(audio.soundserver_pipe[0]); /* no reading from pipe needed */
+ 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);
-}
-#endif /* PLATFORM_UNIX */
-
-void InitPlaylist(void)
-{
- int i;
-
- for(i=0; i<NUM_MIXER_CHANNELS; i++)
- playlist[i] = emptySoundControl;
- playing_sounds = 0;
-}
-
-#if 1
-static void PlaylistRemoveSound(int pos)
-{
- if (!playing_sounds || !playlist[pos].active)
- return;
-
- playlist[pos] = emptySoundControl;
- playing_sounds--;
-
- if (!playing_sounds)
- CloseAudioDevice(&audio.device_fd);
+ if (audio.mixer_pid > 0) /* we are parent process */
+ kill(audio.mixer_pid, SIGTERM);
}
static void WriteReloadInfoToPipe(char *set_name, int type)
{
- struct SoundControl snd_ctrl = emptySoundControl;
+ struct SoundControl snd_ctrl;
TreeInfo *ti = (type == SND_CTRL_RELOAD_SOUNDS ? artwork.snd_current :
artwork.mus_current);
unsigned long str_size1 = strlen(leveldir_current->fullpath) + 1;
unsigned long str_size2 = strlen(ti->basepath) + 1;
unsigned long str_size3 = strlen(ti->fullpath) + 1;
+ if (audio.mixer_pid == 0) /* we are child process */
+ 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");
if (ti->fullpath != NULL)
free(ti->fullpath);
- if (read(audio.soundserver_pipe[0], set_name,
+ if (read(audio.mixer_pipe[0], set_name,
snd_ctrl.data_len) != snd_ctrl.data_len ||
- read(audio.soundserver_pipe[0], leveldir_current,
+ 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");
else
artwork.music_set_current = set_name;
}
+#endif /* PLATFORM_UNIX */
-static void HandleSoundRequest(struct SoundControl snd_ctrl)
+void Mixer_InitChannels()
{
int i;
- if (IS_RELOADING(snd_ctrl))
- {
- ReadReloadInfoFromPipe(snd_ctrl);
- InitPlaylist();
- CloseAudioDevice(&audio.device_fd);
-
- if (snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS)
- ReloadCustomSounds();
- else
- ReloadCustomMusic();
- }
- else if (IS_FADING(snd_ctrl))
- {
- if (!playing_sounds)
- return;
-
- if (IS_MUSIC(snd_ctrl))
- {
- playlist[MUSIC_CHANNEL].state |= SND_CTRL_FADE;
- 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;
- }
- else if (IS_STOPPING(snd_ctrl))
- {
- if (!playing_sounds)
- return;
-
- if (IS_MUSIC(snd_ctrl))
- {
- PlaylistRemoveSound(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=0; i<audio.num_channels; i++)
+ mixer[i].active = FALSE;
+ mixer_active_channels = 0;
}
-#endif
-void StartSoundserver(void)
+static void Mixer_FadeSound(int channel)
{
- if (!audio.sound_available)
- return;
-
-#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
- if (!ForkAudioProcess())
- audio.sound_available = FALSE;
-#endif
+ mixer[channel].state |= SND_CTRL_FADE;
}
-#if defined(PLATFORM_UNIX)
-void SoundServer(void)
+static void Mixer_RemoveSound(int channel)
{
- int i;
-
- struct SoundControl snd_ctrl;
- fd_set sound_fdset;
-
- close(audio.soundserver_pipe[1]); /* no writing into pipe needed */
-
- InitPlaylist();
-
- 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));
+ if (!mixer_active_channels || !mixer[channel].active)
+ return;
-#if defined(PLATFORM_HPUX)
- InitAudioDevice_HPUX(&afmt);
+#if 0
+ printf("REMOVING MIXER SOUND %d\n", channel);
#endif
- FD_ZERO(&sound_fdset);
- FD_SET(audio.soundserver_pipe[0], &sound_fdset);
-
- while(1) /* wait for sound playing commands from client */
- {
- FD_SET(audio.soundserver_pipe[0], &sound_fdset);
- select(audio.soundserver_pipe[0] + 1, &sound_fdset, NULL, NULL, NULL);
- if (!FD_ISSET(audio.soundserver_pipe[0], &sound_fdset))
- continue;
- if (read(audio.soundserver_pipe[0], &snd_ctrl, sizeof(snd_ctrl))
- != sizeof(snd_ctrl))
- Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
-
- HandleSoundRequest(snd_ctrl);
-
- if (IS_RELOADING(snd_ctrl))
- continue;
-
-#if defined(AUDIO_STREAMING_DSP)
-
- if (playing_sounds || snd_ctrl.active)
- {
- if (playing_sounds ||
- (audio.device_fd = OpenAudioDevice(audio.device_name)) >= 0)
- {
- struct timeval delay = { 0, 0 };
-
- if (!playing_sounds) /* we just opened the audio device */
- InitAudioDevice_DSP(&afmt);
-
- 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)
- {
- int max_sample_size;
- int fragment_size = afmt.fragment_size;
- int sample_bytes = (afmt.format & AUDIO_FORMAT_U8 ? 1 : 2);
- boolean stereo = afmt.stereo;
-
- FD_SET(audio.soundserver_pipe[0], &sound_fdset);
-
- 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++)
- {
- void *sample_ptr;
- int sample_len;
- int sample_pos;
- int sample_size;
- int j;
-
- if (!playlist[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_size = MIN(max_sample_size, sample_len - sample_pos);
- playlist[i].playingpos += sample_size;
-
- /* copy original sample to first mixing buffer */
- if (playlist[i].format == AUDIO_FORMAT_U8)
- for (j=0; j<sample_size; j++)
- premix_first_buffer[j] =
- ((short)(((byte *)sample_ptr)[sample_pos + j] ^ 0x80)) << 8;
- else /* AUDIO_FORMAT_S16 */
- for (j=0; j<sample_size; j++)
- premix_first_buffer[j] =
- ((short *)sample_ptr)[sample_pos + j];
-
- /* are we about to restart a looping sound? */
- if (IS_LOOP(playlist[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)
- for (j=0; j<restarted_sample_size; j++)
- premix_first_buffer[sample_size + j] =
- ((short)(((byte *)sample_ptr)[j] ^ 0x80)) << 8;
- else
- for (j=0; j<restarted_sample_size; j++)
- premix_first_buffer[sample_size + j] =
- ((short *)sample_ptr)[j];
-
- playlist[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;
-
- /* 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;
-
- /* 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 * premix_first_buffer[j])
- >> PSND_MAX_LEFT2RIGHT_BITS;
- premix_right_buffer[j] =
- (right_volume * premix_first_buffer[j])
- >> PSND_MAX_LEFT2RIGHT_BITS;
-
- premix_last_buffer[2 * j + 0] += premix_left_buffer[j];
- premix_last_buffer[2 * j + 1] += premix_right_buffer[j];
- }
- }
- else
- {
- 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)
- {
- if (IS_LOOP(playlist[i]))
- playlist[i].playingpos = 0;
- else
- {
- playlist[i] = emptySoundControl;
- playing_sounds--;
- }
- }
- else if (playlist[i].volume <= SOUND_FADING_VOLUME_THRESHOLD)
- {
- playlist[i] = emptySoundControl;
- playing_sounds--;
- }
- }
-
- /* prepare final playing buffer according to system audio format */
- for(i=0; i<max_sample_size * (stereo ? 2 : 1); i++)
- {
- /* 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;
-
- /* 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;
- }
- }
-
- /* 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 */
-
- if (snd_ctrl.active && !IS_LOOP(snd_ctrl))
- {
- struct timeval delay = { 0, 0 };
- byte *sample_ptr;
- long sample_size, max_sample_size = SND_BLOCKSIZE;
- long sample_rate = 8000; /* standard "/dev/audio" sampling rate */
- int wait_percent = 90; /* wait 90% of the real playing time */
- int i;
-
- if ((audio.device_fd = OpenAudioDevice(audio.device_name)) >= 0)
- {
- playing_sounds = 1;
-
- while (playing_sounds &&
- select(audio.soundserver_pipe[0] + 1,
- &sound_fdset, NULL, NULL, &delay) < 1)
- {
- FD_SET(audio.soundserver_pipe[0], &sound_fdset);
-
- /* get pointer and size of the actual sound sample */
- sample_ptr = snd_ctrl.data_ptr + snd_ctrl.playingpos;
- sample_size =
- MIN(max_sample_size, snd_ctrl.data_len - snd_ctrl.playingpos);
- snd_ctrl.playingpos += sample_size;
-
- /* fill the first mixing buffer with original sample */
- memcpy(premix_first_buffer,sample_ptr,sample_size);
-
- /* adjust volume of actual sound sample */
- if (snd_ctrl.volume != PSND_MAX_VOLUME)
- for(i=0;i<sample_size;i++)
- premix_first_buffer[i] =
- (snd_ctrl.volume * (int)premix_first_buffer[i])
- >> PSND_MAX_VOLUME_BITS;
-
- for(i=0;i<sample_size;i++)
- playing_buffer[i] =
- linear_to_ulaw(((int)premix_first_buffer[i]) << 8);
-
- if (snd_ctrl.playingpos >= snd_ctrl.data_len)
- playing_sounds = 0;
-
- /* finally play the sound fragment */
- write(audio.device_fd,playing_buffer,sample_size);
-
- delay.tv_sec = 0;
- delay.tv_usec = ((sample_size*10*wait_percent)/(sample_rate))*1000;
- }
- close(audio.device_fd);
- }
- }
-#endif /* !AUDIO_STREAMING_DSP */
- }
-}
-#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);
+ mixer[channel].active = FALSE;
+ mixer_active_channels--;
}
-#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)
+static void Mixer_InsertSound(struct SoundControl snd_ctrl)
{
SoundInfo *snd_info;
int i, k;
}
#if 0
- printf("-> %d\n", playing_sounds);
+ printf("-> %d\n", mixer_active_channels);
#endif
- if (playing_sounds == NUM_MIXER_CHANNELS)
+ if (mixer_active_channels == audio.num_channels)
{
- for (i=0; i<NUM_MIXER_CHANNELS; i++)
+ for (i=0; i<audio.num_channels; i++)
{
- if (playlist[i].data_ptr == NULL)
+ if (mixer[i].data_ptr == NULL)
{
#if 1
printf("THIS SHOULD NEVER HAPPEN! [%d]\n", i);
#endif
- playlist[i] = emptySoundControl;
- playing_sounds--;
+ Mixer_RemoveSound(i);
}
}
}
- /* if playlist is full, remove oldest sound */
- if (playing_sounds == NUM_MIXER_CHANNELS)
+ /* if mixer is full, remove oldest sound */
+ if (mixer_active_channels == audio.num_channels)
{
- int longest = 0, longest_nr = 0;
+ int longest = 0, longest_nr = audio.first_sound_channel;
- for (i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
+ for (i=audio.first_sound_channel; i<audio.num_channels; i++)
{
#if !defined(PLATFORM_MSDOS)
- int actual = 100 * playlist[i].playingpos / playlist[i].data_len;
+ int actual = 100 * mixer[i].playingpos / mixer[i].data_len;
#else
- int actual = playlist[i].playingpos;
+ int actual = mixer[i].playingpos;
#endif
- if (!IS_LOOP(playlist[i]) && actual > longest)
+ if (!IS_LOOP(mixer[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);
+ voice_set_volume(mixer[longest_nr].voice, 0);
+ deallocate_voice(mixer[longest_nr].voice);
#endif
- playlist[longest_nr] = emptySoundControl;
- playing_sounds--;
+ Mixer_RemoveSound(longest_nr);
}
/* 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)
+ 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=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
+ for(i=audio.first_sound_channel; i<audio.num_channels; i++)
{
- if (playlist[i].nr == snd_ctrl.nr && IS_FADING(playlist[i]))
+ if (mixer[i].nr == snd_ctrl.nr && IS_FADING(mixer[i]))
{
- playlist[i].state &= ~SND_CTRL_FADE;
- playlist[i].volume = PSND_MAX_VOLUME;
+ mixer[i].state &= ~SND_CTRL_FADE;
+ mixer[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);
+ mixer[i].state |= SND_CTRL_LOOP;
+ voice_stop_volumeramp(mixer[i].voice);
+ voice_ramp_volume(mixer[i].voice, mixer[i].volume, 1000);
#endif
}
}
/* don't play sound more than n times simultaneously (with n == 2 for now) */
if (k >= 2)
{
- int longest = 0, longest_nr = 0;
+ int longest = 0, longest_nr = audio.first_sound_channel;
/* look for oldest equal sound */
- for(i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
+ for(i=audio.first_sound_channel; i<audio.num_channels; i++)
{
int actual;
- if (!playlist[i].active || playlist[i].nr != snd_ctrl.nr)
+ if (!mixer[i].active || mixer[i].nr != snd_ctrl.nr)
continue;
#if !defined(PLATFORM_MSDOS)
- actual = 100 * playlist[i].playingpos / playlist[i].data_len;
+ actual = 100 * mixer[i].playingpos / mixer[i].data_len;
#else
- actual = playlist[i].playingpos;
+ actual = mixer[i].playingpos;
#endif
if (actual >= longest)
{
}
#if defined(PLATFORM_MSDOS)
- voice_set_volume(playlist[longest_nr].voice, 0);
- deallocate_voice(playlist[longest_nr].voice);
+ voice_set_volume(mixer[longest_nr].voice, 0);
+ deallocate_voice(mixer[longest_nr].voice);
#endif
- playlist[longest_nr] = emptySoundControl;
- playing_sounds--;
+ Mixer_RemoveSound(longest_nr);
}
- /* add new sound to playlist */
- for(i=0; i<NUM_MIXER_CHANNELS; i++)
+ /* 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 (!playlist[i].active ||
- (IS_MUSIC(snd_ctrl) && i == MUSIC_CHANNEL))
+ if (!mixer[i].active ||
+ (IS_MUSIC(snd_ctrl) && i == audio.music_channel))
*/
- if ((i == MUSIC_CHANNEL && IS_MUSIC(snd_ctrl)) ||
- (i != MUSIC_CHANNEL && !playlist[i].active))
+ if ((i == audio.music_channel && IS_MUSIC(snd_ctrl)) ||
+ (i != audio.music_channel && !mixer[i].active))
{
snd_ctrl.data_ptr = snd_info->data_ptr;
snd_ctrl.data_len = snd_info->data_len;
snd_ctrl.format = snd_info->format;
+ snd_ctrl.playingpos = 0;
+ snd_ctrl.playingtime = 0;
+
#if 1
if (snd_info->data_len == 0)
{
#endif
#if 1
- if (IS_MUSIC(snd_ctrl) && i == MUSIC_CHANNEL && playlist[i].active)
+ if (IS_MUSIC(snd_ctrl) && i == audio.music_channel && mixer[i].active)
{
printf("THIS SHOULD NEVER HAPPEN! [adding music twice]\n");
#if 1
- playlist[i] = emptySoundControl;
- playing_sounds--;
+ Mixer_RemoveSound(i);
#endif
}
#endif
- playlist[i] = snd_ctrl;
- playing_sounds++;
+ mixer[i] = snd_ctrl;
+ mixer_active_channels++;
#if 0
- printf("NEW SOUND %d ADDED TO PLAYLIST\n", snd_ctrl.nr);
+ printf("NEW SOUND %d ADDED TO MIXER\n", snd_ctrl.nr);
#endif
#if defined(PLATFORM_MSDOS)
- playlist[i].voice = allocate_voice((SAMPLE *)playlist[i].data_ptr);
+ mixer[i].voice = allocate_voice((SAMPLE *)mixer[i].data_ptr);
if (snd_ctrl.loop)
- voice_set_playmode(playlist[i].voice, PLAYMODE_LOOP);
+ voice_set_playmode(mixer[i].voice, PLAYMODE_LOOP);
- voice_set_volume(playlist[i].voice, snd_ctrl.volume);
- voice_set_pan(playlist[i].voice, snd_ctrl.stereo);
- voice_start(playlist[i].voice);
+ voice_set_volume(mixer[i].voice, snd_ctrl.volume);
+ voice_set_pan(mixer[i].voice, snd_ctrl.stereo);
+ voice_start(mixer[i].voice);
#endif
break;
}
}
}
+
+static void HandleSoundRequest(struct SoundControl snd_ctrl)
+{
+ int i;
+
+ if (IS_RELOADING(snd_ctrl)) /* load new sound or music files */
+ {
+ ReadReloadInfoFromPipe(snd_ctrl);
+ Mixer_InitChannels();
+ CloseAudioDevice(&audio.device_fd);
+
+ if (snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS)
+ ReloadCustomSounds();
+ else
+ ReloadCustomMusic();
+ }
+ else if (IS_FADING(snd_ctrl)) /* fade out existing sound or music */
+ {
+ if (!mixer_active_channels)
+ return;
+
+ if (IS_MUSIC(snd_ctrl))
+ {
+ mixer[audio.music_channel].state |= SND_CTRL_FADE;
+ return;
+ }
+
+ for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+ if (mixer[i].nr == snd_ctrl.nr || ALL_SOUNDS(snd_ctrl))
+ mixer[i].state |= SND_CTRL_FADE;
+ }
+ else if (IS_STOPPING(snd_ctrl)) /* stop existing sound or music */
+ {
+ if (!mixer_active_channels)
+ return;
+
+ if (IS_MUSIC(snd_ctrl))
+ {
+ Mixer_RemoveSound(audio.music_channel);
+ return;
+ }
+
+ for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+ if (mixer[i].nr == snd_ctrl.nr || ALL_SOUNDS(snd_ctrl))
+ Mixer_RemoveSound(i);
+
+ if (!mixer_active_channels)
+ CloseAudioDevice(&audio.device_fd);
+ }
+ else if (snd_ctrl.active) /* add new sound to mixer */
+ {
+ Mixer_InsertNewSound(snd_ctrl);
+ }
+}
+
+void StartMixer(void)
+{
+ if (!audio.sound_available)
+ return;
+
+#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
+ if (!ForkAudioProcess())
+ audio.sound_available = FALSE;
+#endif
+}
+
+#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
+
+static void CopySampleToMixingBuffer(struct SoundControl *snd_ctrl,
+ int sample_pos, int sample_size,
+ short *buffer_ptr)
+{
+ void *sample_ptr = snd_ctrl->data_ptr;
+ int i;
+
+ if (snd_ctrl->format == AUDIO_FORMAT_U8)
+ for (i=0; i<sample_size; i++)
+ *buffer_ptr++ =
+ ((short)(((byte *)sample_ptr)[sample_pos + i] ^ 0x80)) << 8;
+ else /* AUDIO_FORMAT_S16 */
+ for (i=0; i<sample_size; i++)
+ *buffer_ptr++ =
+ ((short *)sample_ptr)[sample_pos + i];
+}
+
+#if defined(AUDIO_STREAMING_DSP)
+static void Mixer_Main_DSP()
+{
+ static int stereo_volume[PSND_MAX_LEFT2RIGHT + 1];
+ static boolean stereo_volume_calculated = FALSE;
+ static short premix_first_buffer[SND_BLOCKSIZE];
+ static short premix_left_buffer[SND_BLOCKSIZE];
+ static short premix_right_buffer[SND_BLOCKSIZE];
+ static long premix_last_buffer[SND_BLOCKSIZE];
+ static byte playing_buffer[SND_BLOCKSIZE];
+ boolean stereo;
+ int fragment_size;
+ int sample_bytes;
+ int max_sample_size;
+ int i, j;
+
+ if (!stereo_volume_calculated)
+ {
+ for(i=0; i<=PSND_MAX_LEFT2RIGHT; i++)
+ stereo_volume[i] =
+ (int)sqrt((float)(PSND_MAX_LEFT2RIGHT * PSND_MAX_LEFT2RIGHT - i * i));
+
+ stereo_volume_calculated = TRUE;
+ }
+
+ if (!mixer_active_channels)
+ return;
+
+ if (audio.device_fd < 0)
+ {
+ if ((audio.device_fd = OpenAudioDevice(audio.device_name)) < 0)
+ return;
+
+ 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<audio.num_channels; i++)
+ {
+ void *sample_ptr;
+ int sample_len;
+ int sample_pos;
+ int sample_size;
+
+ if (!mixer[i].active)
+ continue;
+
+ /* pointer, lenght and actual playing position of sound sample */
+ sample_ptr = mixer[i].data_ptr;
+ sample_len = mixer[i].data_len;
+ sample_pos = mixer[i].playingpos;
+ sample_size = MIN(max_sample_size, sample_len - sample_pos);
+ mixer[i].playingpos += sample_size;
+
+ /* copy original sample to first mixing buffer */
+ CopySampleToMixingBuffer(&mixer[i], sample_pos, sample_size,
+ premix_first_buffer);
+
+ /* 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 (mixer[i].format == AUDIO_FORMAT_U8)
+ for (j=0; j<restarted_sample_size; j++)
+ premix_first_buffer[sample_size + j] =
+ ((short)(((byte *)sample_ptr)[j] ^ 0x80)) << 8;
+ else
+ for (j=0; j<restarted_sample_size; j++)
+ premix_first_buffer[sample_size + j] =
+ ((short *)sample_ptr)[j];
+
+ mixer[i].playingpos = restarted_sample_size;
+ sample_size += restarted_sample_size;
+ }
+ }
+
+ /* 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 != 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;
+
+ /* 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 + mixer[i].stereo];
+ int right_volume= stereo_volume[middle_pos - mixer[i].stereo];
+
+ for(j=0; j<sample_size; j++)
+ {
+ premix_left_buffer[j] =
+ (left_volume * premix_first_buffer[j])
+ >> PSND_MAX_LEFT2RIGHT_BITS;
+ premix_right_buffer[j] =
+ (right_volume * premix_first_buffer[j])
+ >> PSND_MAX_LEFT2RIGHT_BITS;
+
+ premix_last_buffer[2 * j + 0] += premix_left_buffer[j];
+ premix_last_buffer[2 * j + 1] += premix_right_buffer[j];
+ }
+ }
+ else
+ {
+ for(j=0; j<sample_size; j++)
+ premix_last_buffer[j] += premix_first_buffer[j];
+ }
+
+ /* delete completed sound entries from the mixer */
+ if (mixer[i].playingpos >= mixer[i].data_len)
+ {
+ if (IS_LOOP(mixer[i]))
+ mixer[i].playingpos = 0;
+ else
+ Mixer_RemoveSound(i);
+ }
+ else if (mixer[i].volume <= SOUND_FADING_VOLUME_THRESHOLD)
+ Mixer_RemoveSound(i);
+ }
+
+ /* prepare final playing buffer according to system audio format */
+ for(i=0; i<max_sample_size * (stereo ? 2 : 1); i++)
+ {
+ /* 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;
+
+ /* 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;
+ }
+ }
+
+ /* finally play the sound fragment */
+ write(audio.device_fd, playing_buffer, fragment_size);
+
+ if (!mixer_active_channels)
+ CloseAudioDevice(&audio.device_fd);
+}
+
+#else /* !AUDIO_STREAMING_DSP */
+
+static int Mixer_Main_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 = 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;
+
+ /* copy original sample to first mixing buffer */
+ CopySampleToMixingBuffer(&mixer[i], sample_pos, sample_size,
+ premix_first_buffer);
+
+ /* 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
+
+ /* delete completed sound entries from the mixer */
+ if (mixer[i].playingpos >= mixer[i].data_len)
+ Mixer_RemoveSound(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 Mixer_Main()
+{
+ struct SoundControl snd_ctrl;
+ fd_set mixer_fdset;
+
+ close(audio.mixer_pipe[1]); /* no writing into pipe needed */
+
+ Mixer_InitChannels();
+
+#if defined(PLATFORM_HPUX)
+ InitAudioDevice(&afmt);
+#endif
+
+ 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;
+ if (read(audio.mixer_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 (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_UNIX */
+
+#if defined(PLATFORM_MSDOS)
+static void sound_handler(struct SoundControl snd_ctrl)
+{
+ int i;
+
+ if (snd_ctrl.fade_sound)
+ {
+ if (!mixer_active_channels)
+ return;
+
+ for (i=0; i<audio.num_channels; i++)
+ if ((snd_ctrl.stop_all_sounds ||
+ (i != audio.music_channel && mixer[i].nr == snd_ctrl.nr) ||
+ (i == audio.music_channel && snd_ctrl.music)) &&
+ !mixer[i].fade_sound)
+ {
+ mixer[i].fade_sound = TRUE;
+ if (voice_check(mixer[i].voice))
+ voice_ramp_volume(mixer[i].voice, 1000, 0);
+ mixer[i].state &= ~SND_CTRL_IS_LOOP;
+ }
+ }
+ else if (snd_ctrl.stop_all_sounds)
+ {
+ if (!mixer_active_channels)
+ return;
+ Mixer_StopAllSounds();
+ }
+ else if (snd_ctrl.stop_sound)
+ {
+ if (!mixer_active_channels)
+ return;
+ Mixer_StopSound(snd_ctrl);
+ }
+
+ for (i=0; i<audio.num_channels; i++)
+ {
+ if (!mixer[i].active || mixer[i].loop)
+ continue;
+
+ mixer[i].playingpos = voice_get_position(mixer[i].voice);
+ mixer[i].volume = voice_get_volume(mixer[i].voice);
+ if (mixer[i].playingpos == -1 || !mixer[i].volume)
+ {
+ deallocate_voice(mixer[i].voice);
+ Mixer_RemoveSound(i);
+ }
+ }
+
+ if (snd_ctrl.active)
+ Mixer_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 Mixer_InsertNewSound(struct SoundControl snd_ctrl)
+{
+ Mixer_InsertSound(snd_ctrl);
+}
#endif /* !PLATFORM_WIN32 */
/*
-void SoundServer_FadeSound(int nr)
+void Mixer_FadeSound(int nr)
{
int i;
- if (!playing_sounds)
+ if (!mixer_active_channels)
return;
- 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;
+ for(i=0;i<audio.num_channels;i++)
+ if (snd_ctrl.stop_all_sounds || mixer[i].nr == snd_ctrl.nr)
+ mixer[i].fade_sound = TRUE;
}
*/
#if !defined(PLATFORM_WIN32)
#if defined(PLATFORM_MSDOS)
-static void SoundServer_StopSound(struct SoundControl snd_ctrl)
+static void Mixer_StopSound(struct SoundControl snd_ctrl)
{
int nr = snd_ctrl.nr;
int i;
- if (!playing_sounds)
+ if (!mixer_active_channels)
return;
- for(i=0; i<NUM_MIXER_CHANNELS; i++)
+ for(i=0; i<audio.num_channels; i++)
{
if ((i == audio.music_channel && snd_ctrl.music) ||
- (i != audio.music_channel && playlist[i].nr == nr))
+ (i != audio.music_channel && mixer[i].nr == nr))
{
#if defined(PLATFORM_MSDOS)
- voice_set_volume(playlist[i].voice, 0);
- deallocate_voice(playlist[i].voice);
+ voice_set_volume(mixer[i].voice, 0);
+ deallocate_voice(mixer[i].voice);
#endif
- playlist[i] = emptySoundControl;
- playing_sounds--;
+ Mixer_RemoveSound(i);
}
}
#if !defined(PLATFORM_MSDOS)
- if (!playing_sounds)
+ if (!mixer_active_channels)
close(audio.device_fd);
#endif
}
-static void SoundServer_StopAllSounds()
+static void Mixer_StopAllSounds()
{
int i;
- for(i=0; i<NUM_MIXER_CHANNELS; i++)
+ for(i=0; i<audio.num_channels; i++)
{
#if defined(PLATFORM_MSDOS)
- voice_set_volume(playlist[i].voice, 0);
- deallocate_voice(playlist[i].voice);
+ voice_set_volume(mixer[i].voice, 0);
+ deallocate_voice(mixer[i].voice);
#endif
- playlist[i] = emptySoundControl;
+ Mixer_RemoveSound(i);
}
- playing_sounds = 0;
+ mixer_active_channels = 0;
#if !defined(PLATFORM_MSDOS)
close(audio.device_fd);
#endif /* PLATFORM_HPUX */
#if defined(PLATFORM_UNIX)
-static void InitAudioDevice_DSP(struct AudioFormatInfo *afmt)
+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
}
#endif /* PLATFORM_UNIX */
void PlaySoundExt(int nr, int volume, int stereo, int state)
{
- struct SoundControl snd_ctrl = emptySoundControl;
+ struct SoundControl snd_ctrl;
if (!audio.sound_available ||
!audio.sound_enabled ||
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 */
+ if (audio.mixer_pid == 0) /* we are child process */
return;
- if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0)
+ if (write(audio.mixer_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0)
{
Error(ERR_WARN, "cannot pipe to child process -- no sounds");
audio.sound_available = audio.sound_enabled = FALSE;
void StopSoundExt(int nr, int state)
{
- struct SoundControl snd_ctrl = emptySoundControl;
+ struct SoundControl snd_ctrl;
if (!audio.sound_available)
return;
- snd_ctrl.nr = nr;
- snd_ctrl.state = state;
+ snd_ctrl.active = FALSE;
+ snd_ctrl.nr = nr;
+ snd_ctrl.state = state;
#if defined(TARGET_SDL)
{
int i;
+ /*
+ for (i=audio.first_sound_channel; i<audio.num_channels; i++)
+ */
+
for (i=0; i<audio.channels; i++)
if (i != audio.music_channel || snd_ctrl.music)
Mix_FadeOutChannel(i, SOUND_FADING_INTERVAL);
#elif !defined(PLATFORM_MSDOS)
- if (audio.soundserver_pid == 0) /* we are child process */
+ if (audio.mixer_pid == 0) /* we are child process */
return;
- if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0)
+ if (write(audio.mixer_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0)
{
Error(ERR_WARN, "cannot pipe to child process -- no sounds");
audio.sound_available = audio.sound_enabled = FALSE;
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;
- }
-#endif
-
+ WriteReloadInfoToPipe(set_name, SND_CTRL_RELOAD_SOUNDS);
#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");
+ audio.mixer_pid == 0 ? "CHILD" : "PARENT");
for(i=0; i<num_sounds; i++)
deleteSoundEntry(&Sound[i]);
*/
printf("%s: FREEING SOUNDS -- DONE\n",
- audio.soundserver_pid == 0 ? "CHILD" : "PARENT");
+ audio.mixer_pid == 0 ? "CHILD" : "PARENT");
free(Sound);