#include "setup.h"
+struct ListNode
+{
+ char *key;
+ void *content;
+ struct ListNode *next;
+};
+typedef struct ListNode ListNode;
+
+static ListNode *newListNode(void);
+static void addNodeToList(ListNode **, char *, void *);
+static void deleteNodeFromList(ListNode **, char *, void (*function)(void *));
+static ListNode *getNodeFromKey(ListNode *, char *);
+static int getNumNodes(ListNode *);
+
+
+static struct SoundEffectInfo *sound_effect;
+static ListNode *SoundFileList = NULL;
static SoundInfo **Sound = NULL;
static MusicInfo **Music = NULL;
static int num_sounds = 0, num_music = 0;
/* ========================================================================= */
/* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */
+static struct AudioFormatInfo afmt;
+static struct SoundControl playlist[NUM_MIXER_CHANNELS];
static int playing_sounds = 0;
-static struct SoundControl playlist[MAX_SOUNDS_PLAYING];
-static struct SoundControl emptySoundControl =
-{
- -1,0,0, FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE, 0,0, 0,NULL
-};
-
-#if defined(PLATFORM_UNIX)
-static int stereo_volume[PSND_MAX_LEFT2RIGHT+1];
-static char premix_first_buffer[SND_BLOCKSIZE];
-#if defined(AUDIO_STREAMING_DSP)
-static char premix_left_buffer[SND_BLOCKSIZE];
-static char premix_right_buffer[SND_BLOCKSIZE];
-static int premix_last_buffer[SND_BLOCKSIZE];
-#endif
-static unsigned char playing_buffer[SND_BLOCKSIZE];
-#endif
/* forward declaration of internal functions */
-#if defined(AUDIO_STREAMING_DSP)
static void SoundServer_InsertNewSound(struct SoundControl);
-#elif defined(PLATFORM_UNIX)
+static void InitAudioDevice(struct AudioFormatInfo *);
+
+#if defined(PLATFORM_UNIX)
+#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(int);
+static void SoundServer_StopSound(struct SoundControl);
static void SoundServer_StopAllSounds();
#endif
+static void ReloadCustomSounds();
+static void ReloadCustomMusic();
+static void FreeSound(void *);
+
#if defined(PLATFORM_UNIX)
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)
DEVICENAME_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)
+ 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];
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.soundserver_pid > 0) /* we are parent process */
kill(audio.soundserver_pid, SIGTERM);
}
+
+static void WriteReloadInfoToPipe(char *set_name, int type)
+{
+ 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;
+
+ snd_ctrl.active = FALSE;
+ 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;
+ }
+}
+
+static void ReadReloadInfoFromPipe(struct SoundControl snd_ctrl)
+{
+ TreeInfo **ti_ptr = ((snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS) ?
+ &artwork.snd_current : &artwork.mus_current);
+ TreeInfo *ti = *ti_ptr;
+ unsigned long str_size1, str_size2, str_size3;
+ static char *set_name = NULL;
+
+ if (set_name)
+ free(set_name);
+
+ set_name = checked_malloc(snd_ctrl.data_len);
+
+ if (leveldir_current == NULL)
+ leveldir_current = checked_calloc(sizeof(TreeInfo));
+ if (ti == NULL)
+ ti = *ti_ptr = checked_calloc(sizeof(TreeInfo));
+ if (leveldir_current->fullpath != NULL)
+ free(leveldir_current->fullpath);
+ if (ti->basepath != NULL)
+ free(ti->basepath);
+ if (ti->fullpath != NULL)
+ free(ti->fullpath);
+
+ if (read(audio.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");
+
+ if (snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS)
+ artwork.sounds_set_current = set_name;
+ else
+ artwork.music_set_current = set_name;
+}
#endif /* PLATFORM_UNIX */
void InitPlaylist(void)
{
int i;
- for(i=0; i<MAX_SOUNDS_PLAYING; i++)
- playlist[i] = emptySoundControl;
+ for(i=0; i<audio.num_channels; i++)
+ playlist[i].active = FALSE;
playing_sounds = 0;
}
-void StartSoundserver(void)
+static void PlaylistRemoveSound(int pos)
{
- if (!audio.sound_available)
+ if (!playing_sounds || !playlist[pos].active)
return;
-#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
- if (!ForkAudioProcess())
- audio.sound_available = FALSE;
+#if 0
+ printf("REMOVING PLAYLIST SOUND %d\n", pos);
#endif
+
+ playlist[pos].active = FALSE;
+ playing_sounds--;
}
-#if defined(PLATFORM_UNIX)
-void SoundServer(void)
+static void PlaylistInsertSound(struct SoundControl snd_ctrl)
{
- int i;
+ SoundInfo *snd_info;
+ int i, k;
- struct SoundControl snd_ctrl;
- fd_set sound_fdset;
+#if 0
+ printf("NEW SOUND %d HAS ARRIVED [%d]\n", snd_ctrl.nr, num_sounds);
+#endif
- close(audio.soundserver_pipe[1]); /* no writing into pipe needed */
+ if (IS_MUSIC(snd_ctrl))
+ snd_ctrl.nr = snd_ctrl.nr % num_music;
+ else if (snd_ctrl.nr >= num_sounds)
+ return;
- InitPlaylist();
+ 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;
+ }
- 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 0
+ printf("-> %d\n", playing_sounds);
+#endif
-#if defined(PLATFORM_HPUX)
- InitAudioDevice_HPUX();
+ if (playing_sounds == audio.num_channels)
+ {
+ for (i=0; i<audio.num_channels; i++)
+ {
+ if (playlist[i].data_ptr == NULL)
+ {
+#if 1
+ printf("THIS SHOULD NEVER HAPPEN! [%d]\n", i);
#endif
- FD_ZERO(&sound_fdset);
- FD_SET(audio.soundserver_pipe[0], &sound_fdset);
+ PlaylistRemoveSound(i);
+ }
+ }
+ }
- while(1) /* wait for sound playing commands from client */
+ /* if playlist is full, remove oldest sound */
+ if (playing_sounds == audio.num_channels)
{
- 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");
+ int longest = 0, longest_nr = audio.first_sound_channel;
- if (snd_ctrl.reload_sounds || snd_ctrl.reload_music)
+ for (i=audio.first_sound_channel; i<audio.num_channels; i++)
{
- 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;
-
- printf("B\n");
-
- if (leveldir_current == NULL)
- leveldir_current = checked_calloc(sizeof(TreeInfo));
- printf("B.1\n");
- if (ti == NULL)
- ti = *ti_ptr = checked_calloc(sizeof(TreeInfo));
- printf("B.2\n");
- if (leveldir_current->fullpath != NULL)
- free(leveldir_current->fullpath);
- printf("B.3 ['%s']\n", ti->basepath);
-#if 0
- if (ti->basepath != NULL)
- free(ti->basepath);
+#if !defined(PLATFORM_MSDOS)
+ int actual = 100 * playlist[i].playingpos / playlist[i].data_len;
+#else
+ int actual = playlist[i].playingpos;
#endif
- printf("B.4\n");
- if (ti->fullpath != NULL)
- free(ti->fullpath);
- printf("B.5\n");
-
- printf("C\n");
-
- 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");
-
- printf("D\n");
-
- 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");
-
- printf("E\n");
-
- InitPlaylist();
-
- close(audio.device_fd);
-
- printf("X\n");
-
- if (snd_ctrl.reload_sounds)
- {
- artwork.sounds_set_current = set_name;
- audio.func_reload_sounds();
- }
- else
+
+ if (!IS_LOOP(playlist[i]) && actual > longest)
{
- artwork.music_set_current = set_name;
- audio.func_reload_music();
+ longest = actual;
+ longest_nr = i;
}
+ }
+#if defined(PLATFORM_MSDOS)
+ voice_set_volume(playlist[longest_nr].voice, 0);
+ deallocate_voice(playlist[longest_nr].voice);
+#endif
+ PlaylistRemoveSound(longest_nr);
+ }
- free(set_name);
+ /* check if sound is already being played (and how often) */
+ for (k=0, i=audio.first_sound_channel; i<audio.num_channels; i++)
+ if (playlist[i].nr == snd_ctrl.nr)
+ k++;
- continue;
+ /* 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 (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
+ }
}
-#if defined(AUDIO_STREAMING_DSP)
+ return;
+ }
- if (snd_ctrl.fade_sound)
+ /* 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++)
{
- if (!playing_sounds)
+ int actual;
+
+ if (!playlist[i].active || playlist[i].nr != snd_ctrl.nr)
continue;
- 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;
+#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;
+ }
}
- else if (snd_ctrl.stop_all_sounds)
- {
- if (!playing_sounds)
- continue;
- for(i=0; i<MAX_SOUNDS_PLAYING; i++)
- playlist[i] = emptySoundControl;
- playing_sounds = 0;
+#if defined(PLATFORM_MSDOS)
+ voice_set_volume(playlist[longest_nr].voice, 0);
+ deallocate_voice(playlist[longest_nr].voice);
+#endif
+ PlaylistRemoveSound(longest_nr);
+ }
- close(audio.device_fd);
- }
- else if (snd_ctrl.stop_sound)
+ /* add new sound to playlist */
+ 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 == audio.music_channel))
+ */
+ if ((i == audio.music_channel && IS_MUSIC(snd_ctrl)) ||
+ (i != audio.music_channel && !playlist[i].active))
{
- if (!playing_sounds)
- continue;
+ 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 (snd_ctrl.music)
+#if 1
+ if (snd_info->data_len == 0)
{
- playlist[audio.music_channel] = emptySoundControl;
- playing_sounds--;
+ printf("THIS SHOULD NEVER HAPPEN! [snd_info->data_len == 0]\n");
}
+#endif
- for(i=0; i<MAX_SOUNDS_PLAYING; i++)
+#if 1
+ if (IS_MUSIC(snd_ctrl) && i == audio.music_channel && playlist[i].active)
{
- if (i != audio.music_channel && playlist[i].nr == snd_ctrl.nr)
- {
- playlist[i] = emptySoundControl;
- playing_sounds--;
- }
+ printf("THIS SHOULD NEVER HAPPEN! [adding music twice]\n");
+
+#if 1
+ PlaylistRemoveSound(i);
+#endif
}
+#endif
- if (!playing_sounds)
- close(audio.device_fd);
- }
+ playlist[i] = snd_ctrl;
+ playing_sounds++;
- 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);
+#if 0
+ printf("NEW SOUND %d ADDED TO PLAYLIST\n", snd_ctrl.nr);
#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 */
+#if defined(PLATFORM_MSDOS)
+ playlist[i].voice = allocate_voice((SAMPLE *)playlist[i].data_ptr);
- 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 (snd_ctrl.loop)
+ voice_set_playmode(playlist[i].voice, PLAYMODE_LOOP);
- 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);
- }
+ 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 /* !AUDIO_STREAMING_DSP */
}
}
-#endif /* PLATFORM_UNIX */
-#if defined(PLATFORM_MSDOS)
-static void sound_handler(struct SoundControl snd_ctrl)
+static void HandleSoundRequest(struct SoundControl snd_ctrl)
{
int i;
- if (snd_ctrl.fade_sound)
+ if (IS_RELOADING(snd_ctrl)) /* load new sound or music files */
{
- if (!playing_sounds)
- return;
+ ReadReloadInfoFromPipe(snd_ctrl);
+ InitPlaylist();
+ CloseAudioDevice(&audio.device_fd);
- 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;
- }
+ if (snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS)
+ ReloadCustomSounds();
+ else
+ ReloadCustomMusic();
}
- else if (snd_ctrl.stop_all_sounds)
+ else if (IS_FADING(snd_ctrl)) /* fade out existing sound or music */
{
if (!playing_sounds)
return;
- SoundServer_StopAllSounds();
+
+ if (IS_MUSIC(snd_ctrl))
+ {
+ playlist[audio.music_channel].state |= SND_CTRL_FADE;
+ return;
+ }
+
+ for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+ if (playlist[i].nr == snd_ctrl.nr || ALL_SOUNDS(snd_ctrl))
+ playlist[i].state |= SND_CTRL_FADE;
}
- else if (snd_ctrl.stop_sound)
+ else if (IS_STOPPING(snd_ctrl)) /* stop existing sound or music */
{
if (!playing_sounds)
return;
- SoundServer_StopSound(snd_ctrl);
- }
- for (i=0; i<MAX_SOUNDS_PLAYING; i++)
- {
- if (!playlist[i].active || playlist[i].loop)
- continue;
-
- playlist[i].playingpos = voice_get_position(playlist[i].voice);
- playlist[i].volume = voice_get_volume(playlist[i].voice);
- if (playlist[i].playingpos == -1 || !playlist[i].volume)
+ if (IS_MUSIC(snd_ctrl))
{
- deallocate_voice(playlist[i].voice);
- playlist[i] = emptySoundControl;
- playing_sounds--;
+ PlaylistRemoveSound(audio.music_channel);
+ return;
}
- }
- if (snd_ctrl.active)
+ for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+ if (playlist[i].nr == snd_ctrl.nr || ALL_SOUNDS(snd_ctrl))
+ PlaylistRemoveSound(i);
+
+ if (!playing_sounds)
+ CloseAudioDevice(&audio.device_fd);
+ }
+ else if (snd_ctrl.active) /* add new sound to playlist */
+ {
SoundServer_InsertNewSound(snd_ctrl);
+ }
}
-#endif /* PLATFORM_MSDOS */
-#if !defined(PLATFORM_WIN32)
-static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
+void StartSoundserver(void)
{
- int i, k;
+ if (!audio.sound_available)
+ return;
- if (snd_ctrl.music)
- snd_ctrl.nr = snd_ctrl.nr % num_music;
+#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
+ if (!ForkAudioProcess())
+ audio.sound_available = FALSE;
+#endif
+}
- /* if playlist is full, remove oldest sound */
- if (playing_sounds == MAX_SOUNDS_PLAYING)
+#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 SoundServer_Mixer()
+{
+ 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)
{
- int longest = 0, longest_nr = 0;
+ for(i=0; i<=PSND_MAX_LEFT2RIGHT; i++)
+ stereo_volume[i] =
+ (int)sqrt((float)(PSND_MAX_LEFT2RIGHT * PSND_MAX_LEFT2RIGHT - i * i));
- 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
+ stereo_volume_calculated = TRUE;
+ }
+
+ if (!playing_sounds)
+ 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 (!playlist[i].active)
+ continue;
- if (i != audio.music_channel && !playlist[i].loop && actual > longest)
+ /* 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);
+
+ /* are we about to restart a looping sound? */
+ if (IS_LOOP(playlist[i]) && sample_size < max_sample_size)
+ {
+ while (sample_size < max_sample_size)
{
- longest = actual;
- longest_nr = i;
+ 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;
}
}
-#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--;
- }
- /* 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)
- k++;
+ /* 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;
- /* restart loop sounds only if they are just fading out */
- if (k >= 1 && snd_ctrl.loop)
- {
- for(i=0; i<MAX_SOUNDS_PLAYING; i++)
+ /* 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)
{
- if (i != audio.music_channel && playlist[i].nr == snd_ctrl.nr &&
- playlist[i].fade_sound)
+ 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++)
{
- 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
+ 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];
+ }
- return;
+ /* 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
+ PlaylistRemoveSound(i);
+ }
+ else if (playlist[i].volume <= SOUND_FADING_VOLUME_THRESHOLD)
+ PlaylistRemoveSound(i);
}
- /* don't play sound more than n times simultaneously (with n == 2 for now) */
- if (k >= 2)
+ /* prepare final playing buffer according to system audio format */
+ for(i=0; i<max_sample_size * (stereo ? 2 : 1); i++)
{
- int longest = 0, longest_nr = 0;
+ /* 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;
- /* look for oldest equal sound */
- for(i=0; i<MAX_SOUNDS_PLAYING; i++)
+ /* shift to 16 bit value */
+ premix_last_buffer[i] >>= 1;
+
+ if (afmt.format & AUDIO_FORMAT_U8)
{
- int actual;
+ 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;
+ }
+ }
- if (!playlist[i].active ||
- i == audio.music_channel ||
- playlist[i].nr != snd_ctrl.nr)
- continue;
+ /* finally play the sound fragment */
+ write(audio.device_fd, playing_buffer, fragment_size);
-#if !defined(PLATFORM_MSDOS)
- actual = 100 * playlist[i].playingpos / playlist[i].data_len;
-#else
- actual = playlist[i].playingpos;
+ if (!playing_sounds)
+ 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
- if (actual >= longest)
- {
- longest = actual;
- longest_nr = i;
- }
+
+ /* 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)
- voice_set_volume(playlist[longest_nr].voice, 0);
- deallocate_voice(playlist[longest_nr].voice);
-#endif
- playlist[longest_nr] = emptySoundControl;
- playing_sounds--;
+static void sound_handler(struct SoundControl snd_ctrl)
+{
+ int i;
+
+ if (snd_ctrl.fade_sound)
+ {
+ if (!playing_sounds)
+ return;
+
+ for (i=0; i<audio.num_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();
}
-
- /* add new sound to playlist */
- for(i=0; i<MAX_SOUNDS_PLAYING; i++)
+ else if (snd_ctrl.stop_sound)
{
- if (!playlist[i].active ||
- (snd_ctrl.music && i == audio.music_channel))
- {
- SoundInfo *snd_info =
- (snd_ctrl.music ? Music[snd_ctrl.nr] : Sound[snd_ctrl.nr]);
-
- snd_ctrl.data_ptr = snd_info->data_ptr;
- snd_ctrl.data_len = snd_info->data_len;
+ if (!playing_sounds)
+ return;
+ SoundServer_StopSound(snd_ctrl);
+ }
- playlist[i] = snd_ctrl;
- playing_sounds++;
+ for (i=0; i<audio.num_channels; i++)
+ {
+ if (!playlist[i].active || playlist[i].loop)
+ continue;
-#if defined(PLATFORM_MSDOS)
- playlist[i].voice = allocate_voice(playlist[i].data_ptr);
+ 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);
+ PlaylistRemoveSound(i);
+ }
+ }
- if (snd_ctrl.loop)
- voice_set_playmode(playlist[i].voice, PLAYMODE_LOOP);
+ if (snd_ctrl.active)
+ SoundServer_InsertNewSound(snd_ctrl);
+}
+#endif /* PLATFORM_MSDOS */
- voice_set_volume(playlist[i].voice, snd_ctrl.volume);
- voice_set_pan(playlist[i].voice, snd_ctrl.stereo);
- voice_start(playlist[i].voice);
+#if 0
+#if defined(TARGET_SDL)
+static void sound_handler_SDL(struct SoundControl snd_ctrl)
+{
+ /* copy sound_handler() here ... */
+}
+#endif /* TARGET_SDL */
#endif
- break;
- }
- }
+
+#if !defined(PLATFORM_WIN32)
+static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
+{
+ PlaylistInsertSound(snd_ctrl);
}
#endif /* !PLATFORM_WIN32 */
if (!playing_sounds)
return;
- for(i=0;i<MAX_SOUNDS_PLAYING;i++)
+ for(i=0;i<audio.num_channels;i++)
if (snd_ctrl.stop_all_sounds || playlist[i].nr == snd_ctrl.nr)
playlist[i].fade_sound = TRUE;
}
if (!playing_sounds)
return;
- for(i=0; i<MAX_SOUNDS_PLAYING; 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))
voice_set_volume(playlist[i].voice, 0);
deallocate_voice(playlist[i].voice);
#endif
- playlist[i] = emptySoundControl;
- playing_sounds--;
+ PlaylistRemoveSound(i);
}
}
{
int i;
- for(i=0;i<MAX_SOUNDS_PLAYING;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);
#endif
- playlist[i]=emptySoundControl;
+ PlaylistRemoveSound(i);
}
playing_sounds = 0;
/* ------------------------------------------------------------------------- */
#if defined(AUDIO_LINUX_IOCTL)
-static boolean InitAudioDevice_Linux(long fragment_size, int sample_rate)
+static void InitAudioDevice_Linux(struct AudioFormatInfo *afmt)
{
/* "ioctl()" expects pointer to 'int' value for stereo flag
(boolean is defined as 'char', which will not work here) */
+ unsigned int fragment_spec = 0;
+ int fragment_size_query;
int stereo = TRUE;
- unsigned long fragment_spec = 0;
+ struct
+ {
+ int format_ioctl;
+ int format_result;
+ }
+ formats[] =
+ {
+ /* supported audio format in preferred order */
+ { AFMT_S16_LE, AUDIO_FORMAT_S16 | AUDIO_FORMAT_LE },
+ { AFMT_S16_BE, AUDIO_FORMAT_S16 | AUDIO_FORMAT_BE },
+ { AFMT_U8, AUDIO_FORMAT_U8 },
+ { -1, -1 }
+ };
+ int i;
/* determine logarithm (log2) of the fragment size */
- for (fragment_spec=0; (1 << fragment_spec) < fragment_size;
- fragment_spec++);
+ 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
Error(ERR_EXIT_SOUND_SERVER,
"cannot set fragment size of /dev/dsp -- no sounds");
- /* try if we can use stereo sound */
- if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0)
+ i = 0;
+ afmt->format = 0;
+ while (formats[i].format_result != -1)
{
-#ifdef DEBUG
- static boolean reported = FALSE;
-
- if (!reported)
+ unsigned int audio_format = formats[i].format_ioctl;
+ if (ioctl(audio.device_fd, SNDCTL_DSP_SETFMT, &audio_format) == 0)
{
- Error(ERR_RETURN, "cannot get stereo sound on /dev/dsp");
- reported = TRUE;
+ afmt->format = formats[i].format_result;
+ break;
}
-#endif
- stereo = FALSE;
}
- if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &sample_rate) < 0)
+ if (afmt->format == 0) /* no supported audio format found */
+ Error(ERR_EXIT_SOUND_SERVER,
+ "cannot set audio format of /dev/dsp -- no sounds");
+
+ /* try if we can use stereo sound */
+ afmt->stereo = TRUE;
+ if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0)
+ afmt->stereo = FALSE;
+
+ if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &afmt->sample_rate) < 0)
Error(ERR_EXIT_SOUND_SERVER,
"cannot set sample rate of /dev/dsp -- no sounds");
/* get the real fragmentation size; this should return 512 */
- if (ioctl(audio.device_fd, SNDCTL_DSP_GETBLKSIZE, &fragment_size) < 0)
+ if (ioctl(audio.device_fd, SNDCTL_DSP_GETBLKSIZE, &fragment_size_query) < 0)
Error(ERR_EXIT_SOUND_SERVER,
"cannot get fragment size of /dev/dsp -- no sounds");
-
- return (boolean)stereo;
+ if (fragment_size_query != afmt->fragment_size)
+ Error(ERR_EXIT_SOUND_SERVER,
+ "cannot set fragment size of /dev/dsp -- no sounds");
}
#endif /* AUDIO_LINUX_IOCTL */
#if defined(PLATFORM_NETBSD)
-static boolean InitAudioDevice_NetBSD(long fragment_size, int sample_rate)
+static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt)
{
audio_info_t a_info;
boolean stereo = TRUE;
a_info.play.sample_rate = sample_rate;
a_info.blocksize = fragment_size;
+ afmt->format = AUDIO_FORMAT_U8;
+ afmt->stereo = TRUE;
+
if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0)
{
/* try to disable stereo */
a_info.play.channels = 1;
- stereo = FALSE;
+
+ afmt->stereo = FALSE;
if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0)
Error(ERR_EXIT_SOUND_SERVER,
"cannot set sample rate of /dev/audio -- no sounds");
}
-
- return stereo;
}
#endif /* PLATFORM_NETBSD */
#if defined(PLATFORM_HPUX)
-static boolean InitAudioDevice_HPUX()
+static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt)
{
struct audio_describe ainfo;
int audio_ctl;
ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1);
ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000);
- close(audio_ctl);
+ afmt->format = AUDIO_FORMAT_U8;
+ afmt->stereo = FALSE;
+ afmt->sample_rate = 8000;
- return TRUE; /* to provide common interface for InitAudioDevice_...() */
+ close(audio_ctl);
}
#endif /* PLATFORM_HPUX */
+#if defined(PLATFORM_UNIX)
+static void InitAudioDevice(struct AudioFormatInfo *afmt)
+{
+ afmt->stereo = TRUE;
+ afmt->format = AUDIO_FORMAT_UNKNOWN;
+ afmt->sample_rate = DEFAULT_AUDIO_SAMPLE_RATE;
+ afmt->fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE;
+
+#if defined(AUDIO_LINUX_IOCTL)
+ InitAudioDevice_Linux(afmt);
+#elif defined(PLATFORM_NETBSD)
+ InitAudioDevice_NetBSD(afmt);
+#elif defined(PLATFORM_HPUX)
+ InitAudioDevice_HPUX(afmt);
+#else
+ /* generic /dev/audio stuff might be placed here */
+#endif
+}
+#endif /* PLATFORM_UNIX */
+
#if defined(PLATFORM_UNIX) && !defined(AUDIO_STREAMING_DSP)
/* these two are stolen from "sox"... :) */
if (!audio.sound_available)
return NULL;
+#if 0
+ printf("loading WAV file '%s'\n", filename);
+#endif
+
snd_info = checked_calloc(sizeof(SoundInfo));
#if defined(TARGET_SDL)
return NULL;
}
- for (i=0; i<snd_info->data_len; i++)
- ((byte *)snd_info->data_ptr)[i] = ((byte *)snd_info->data_ptr)[i] ^ 0x80;
+ snd_info->format = AUDIO_FORMAT_U8;
#endif /* PLATFORM_UNIX */
return snd_info;
}
-SoundInfo *LoadCustomSound(char *basename)
+static void deleteSoundEntry(SoundInfo **snd_info)
+{
+ if (*snd_info)
+ {
+ char *filename = (*snd_info)->source_filename;
+
+#if 0
+ printf("[decrementing reference counter of sound '%s']\n", filename);
+#endif
+
+ if (--(*snd_info)->num_references <= 0)
+ {
+#if 0
+ printf("[deleting sound '%s']\n", filename);
+#endif
+
+ /*
+ FreeSound(*snd_info);
+ */
+ deleteNodeFromList(&SoundFileList, filename, FreeSound);
+ }
+
+ *snd_info = NULL;
+ }
+}
+
+static void replaceSoundEntry(SoundInfo **snd_info, char *filename)
+{
+ ListNode *node;
+
+ /* check if the old and the new sound file are the same */
+ if (*snd_info && strcmp((*snd_info)->source_filename, filename) == 0)
+ {
+ /* The old and new sound are the same (have the same filename and path).
+ This usually means that this sound does not exist in this sound set
+ and a fallback to the existing sound is done. */
+
+#if 0
+ printf("[sound '%s' already exists (same list entry)]\n", filename);
+#endif
+
+ return;
+ }
+
+ /* delete existing sound file entry */
+ deleteSoundEntry(snd_info);
+
+ /* check if the new sound file already exists in the list of sounds */
+ if ((node = getNodeFromKey(SoundFileList, filename)) != NULL)
+ {
+#if 0
+ printf("[sound '%s' already exists (other list entry)]\n", filename);
+#endif
+
+ *snd_info = (SoundInfo *)node->content;
+ (*snd_info)->num_references++;
+ }
+ else if ((*snd_info = Load_WAV(filename)) != NULL) /* load new sound */
+ {
+ (*snd_info)->num_references = 1;
+ addNodeToList(&SoundFileList, (*snd_info)->source_filename, *snd_info);
+ }
+}
+
+static void LoadCustomSound(SoundInfo **snd_info, char *basename)
{
char *filename = getCustomSoundFilename(basename);
+ if (strcmp(basename, SND_FILE_UNDEFINED) == 0)
+ {
+ deleteSoundEntry(snd_info);
+ return;
+ }
+
if (filename == NULL)
{
Error(ERR_WARN, "cannot find sound file '%s'", basename);
- return FALSE;
+ return;
}
- printf("-> '%s'\n", filename);
-
- return Load_WAV(filename);
+ replaceSoundEntry(snd_info, filename);
}
-void InitSoundList(int num_list_entries)
+void InitSoundList(struct SoundEffectInfo *sounds_list, int num_list_entries)
{
- Sound = checked_calloc(num_list_entries * sizeof(SoundInfo *));
+ if (Sound == NULL)
+ Sound = checked_calloc(num_list_entries * sizeof(SoundInfo *));
+
+ sound_effect = sounds_list;
num_sounds = num_list_entries;
}
if (Sound == NULL || list_pos >= num_sounds)
return;
- if (Sound[list_pos])
- FreeSound(Sound[list_pos]);
+#if 0
+ printf("loading sound '%s' ... [%d]\n",
+ basename, getNumNodes(SoundFileList));
+#endif
+
+ LoadCustomSound(&Sound[list_pos], basename);
- Sound[list_pos] = LoadCustomSound(basename);
+#if 0
+ printf("loading sound '%s' done [%d]\n",
+ basename, getNumNodes(SoundFileList));
+#endif
}
static MusicInfo *Load_MOD(char *filename)
char *filename = getPath2(music_directory, basename);
MusicInfo *mus_info = NULL;
- if (FileIsSound(filename))
+ if (FileIsSound(basename))
mus_info = Load_WAV(filename);
- else if (FileIsMusic(filename))
+ else if (FileIsMusic(basename))
mus_info = Load_MOD(filename);
free(filename);
#if defined(TARGET_SDL)
+ nr = nr % num_music;
+
if (Music[nr]->type == MUS_TYPE_MOD)
{
Mix_PlayMusic(Music[nr]->data_ptr, -1);
void PlaySound(int nr)
{
- PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_NO_LOOP);
+ PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_SOUND);
}
void PlaySoundStereo(int nr, int stereo)
{
- PlaySoundExt(nr, PSND_MAX_VOLUME, stereo, PSND_NO_LOOP);
+ PlaySoundExt(nr, PSND_MAX_VOLUME, stereo, SND_CTRL_PLAY_SOUND);
}
void PlaySoundLoop(int nr)
{
- PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_LOOP);
+ PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_LOOP);
}
void PlaySoundMusic(int nr)
{
- PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_MUSIC);
+ PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_MUSIC);
}
-void PlaySoundExt(int nr, int volume, int stereo, boolean loop_type)
+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 ||
else if (stereo > PSND_MAX_RIGHT)
stereo = PSND_MAX_RIGHT;
- snd_ctrl.nr = nr;
- snd_ctrl.volume = volume;
- snd_ctrl.stereo = stereo;
- snd_ctrl.loop = (loop_type != PSND_NO_LOOP);
- snd_ctrl.music = (loop_type == PSND_MUSIC);
- snd_ctrl.active = TRUE;
-
-#if 0
- snd_ctrl.data_ptr = Sound[nr].data_ptr;
- snd_ctrl.data_len = Sound[nr].data_len;
-#endif
+ snd_ctrl.active = TRUE;
+ snd_ctrl.nr = nr;
+ snd_ctrl.volume = volume;
+ snd_ctrl.stereo = stereo;
+ snd_ctrl.state = state;
#if defined(TARGET_SDL)
- Mix_Volume(-1, SOUND_MAX_VOLUME);
- Mix_PlayChannel(-1, Sound[nr]->data_ptr, (loop_type ? -1 : 0));
+ 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;
Mix_FadeOutMusic(SOUND_FADING_INTERVAL);
Mix_FadeOutChannel(audio.music_channel, SOUND_FADING_INTERVAL);
#else
- StopSoundExt(-1, SSND_FADE_MUSIC);
+ StopSoundExt(-1, SND_CTRL_FADE_MUSIC);
#endif
}
void FadeSound(int nr)
{
- StopSoundExt(nr, SSND_FADE_SOUND);
+ StopSoundExt(nr, SND_CTRL_FADE_SOUND);
}
void FadeSounds()
{
FadeMusic();
- StopSoundExt(-1, SSND_FADE_ALL);
+ StopSoundExt(-1, SND_CTRL_FADE_ALL);
}
void StopMusic(void)
Mix_HaltMusic();
Mix_HaltChannel(audio.music_channel);
#else
- StopSoundExt(-1, SSND_STOP_MUSIC);
+ StopSoundExt(-1, SND_CTRL_STOP_MUSIC);
#endif
}
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;
+ struct SoundControl snd_ctrl;
if (!audio.sound_available)
return;
- if (method & SSND_FADING)
- snd_ctrl.fade_sound = TRUE;
-
- if (method & SSND_ALL)
- snd_ctrl.stop_all_sounds = TRUE;
- else
- {
- snd_ctrl.stop_sound = TRUE;
- snd_ctrl.nr = nr;
- }
-
- if (method & SSND_MUSIC)
- snd_ctrl.music = TRUE;
+ snd_ctrl.active = FALSE;
+ snd_ctrl.nr = nr;
+ snd_ctrl.state = state;
#if defined(TARGET_SDL)
- if (method & SSND_FADING)
+ if (state & SND_CTRL_FADE)
{
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);
- if (snd_ctrl.music)
+ if (state & SND_CTRL_MUSIC)
Mix_FadeOutMusic(SOUND_FADING_INTERVAL);
}
else
for (i=0; i<audio.channels; i++)
if (i != audio.music_channel || snd_ctrl.music)
Mix_HaltChannel(i);
- if (snd_ctrl.music)
+ if (state & SND_CTRL_MUSIC)
Mix_HaltMusic();
}
audio.sound_available = audio.sound_enabled = FALSE;
return;
}
-#else
+#else /* PLATFORM_MSDOS */
sound_handler(snd_ctrl);
#endif
}
-static void InitReloadSoundsOrMusic(char *set_name, int type)
+ListNode *newListNode()
{
- 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;
+ return checked_calloc(sizeof(ListNode));
+}
- if (!audio.sound_available)
+void addNodeToList(ListNode **node_first, char *key, void *content)
+{
+ ListNode *node_new = newListNode();
+
+#if 0
+ printf("LIST: adding node with key '%s'\n", key);
+#endif
+
+ node_new->key = getStringCopy(key);
+ node_new->content = content;
+ node_new->next = *node_first;
+ *node_first = node_new;
+}
+
+void deleteNodeFromList(ListNode **node_first, char *key,
+ void (*destructor_function)(void *))
+{
+ if (node_first == NULL || *node_first == NULL)
return;
- if (leveldir_current == NULL)
- Error(ERR_EXIT, "leveldir_current == NULL");
+#if 0
+ printf("[CHECKING LIST KEY '%s' == '%s']\n",
+ (*node_first)->key, key);
+#endif
- 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 (strcmp((*node_first)->key, key) == 0)
+ {
+#if 0
+ printf("[DELETING LIST ENTRY]\n");
+#endif
+
+ free((*node_first)->key);
+ if (destructor_function)
+ destructor_function((*node_first)->content);
+ *node_first = (*node_first)->next;
+ }
+ else
+ deleteNodeFromList(&(*node_first)->next, key, destructor_function);
+}
+
+ListNode *getNodeFromKey(ListNode *node_first, char *key)
+{
+ if (node_first == NULL)
+ return NULL;
+
+ if (strcmp(node_first->key, key) == 0)
+ return node_first;
+ else
+ return getNodeFromKey(node_first->next, key);
+}
+
+int getNumNodes(ListNode *node_first)
+{
+ return (node_first ? 1 + getNumNodes(node_first->next) : 0);
+}
+
+void dumpList(ListNode *node_first)
+{
+ ListNode *node = node_first;
+
+ while (node)
+ {
+ printf("['%s' (%d)]\n", node->key,
+ ((SoundInfo *)node->content)->num_references);
+ node = node->next;
+ }
+
+ printf("[%d nodes]\n", getNumNodes(node_first));
+}
+
+static void LoadSoundsInfo()
+{
+ char *filename = getCustomSoundConfigFilename();
+ struct SetupFileList *setup_file_list;
+ int i;
+
+ /* always start with reliable default values */
+ for (i=0; i<num_sounds; i++)
+ sound_effect[i].filename = NULL;
+
+ if (filename == NULL)
+ return;
+
+ if ((setup_file_list = loadSetupFileList(filename)))
+ {
+ for (i=0; i<num_sounds; i++)
+ sound_effect[i].filename =
+ getStringCopy(getTokenValue(setup_file_list, sound_effect[i].text));
+
+ freeSetupFileList(setup_file_list);
+
+#if 1
+ for (i=0; i<num_sounds; i++)
+ {
+ printf("'%s' ", sound_effect[i].text);
+ if (sound_effect[i].filename)
+ printf("-> '%s'\n", sound_effect[i].filename);
+ else
+ printf("-> UNDEFINED [-> '%s']\n", sound_effect[i].default_filename);
+ }
+#endif
+ }
+}
+
+static void ReloadCustomSounds()
+{
+ int i;
+
+#if 0
+ printf("DEBUG: reloading sounds '%s' ...\n", artwork.sounds_set_current);
+#endif
+
+ LoadSoundsInfo();
+
+#if 0
+ printf("DEBUG: reloading %d sounds ...\n", num_sounds);
+#endif
+
+ for(i=0; i<num_sounds; i++)
+ {
+ if (sound_effect[i].filename)
+ LoadSoundToList(sound_effect[i].filename, i);
+ else
+ LoadSoundToList(sound_effect[i].default_filename, i);
+ }
+
+ /*
+ printf("list size == %d\n", getNumNodes(SoundFileList));
+ */
+
+#if 0
+ dumpList(SoundFileList);
+#endif
+}
+
+static void ReloadCustomMusic()
+{
+#if 0
+ printf("DEBUG: reloading music '%s' ...\n", artwork.music_set_current);
+#endif
+
+ FreeAllMusic();
+
+ LoadCustomMusic();
+}
+
+static void InitReloadSoundsOrMusic(char *set_name, int type)
+{
+ if (!audio.sound_available)
+ return;
#if defined(TARGET_SDL) || defined(TARGET_ALLEGRO)
- if (type == SND_RELOAD_SOUNDS)
- audio.audio.func_reload_sounds();
+ if (type == SND_CTRL_RELOAD_SOUNDS)
+ ReloadCustomSounds();
else
- audio.audio.func_reload_music();
+ ReloadCustomMusic();
#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.active = FALSE;
+ 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,
audio.sound_available = audio.sound_enabled = FALSE;
return;
}
-
- printf("A\n");
+#endif
#endif
}
void InitReloadSounds(char *set_name)
{
- InitReloadSoundsOrMusic(set_name, SND_RELOAD_SOUNDS);
+ InitReloadSoundsOrMusic(set_name, SND_CTRL_RELOAD_SOUNDS);
}
void InitReloadMusic(char *set_name)
{
- InitReloadSoundsOrMusic(set_name, SND_RELOAD_MUSIC);
+ InitReloadSoundsOrMusic(set_name, SND_CTRL_RELOAD_MUSIC);
}
-void FreeSound(SoundInfo *sound)
+void FreeSound(void *ptr)
{
+ SoundInfo *sound = (SoundInfo *)ptr;
+
if (sound == NULL)
return;
#endif
}
+ if (sound->source_filename)
+ free(sound->source_filename);
+
free(sound);
}
if (Sound == NULL)
return;
+ printf("%s: FREEING SOUNDS ...\n",
+ audio.soundserver_pid == 0 ? "CHILD" : "PARENT");
+
for(i=0; i<num_sounds; i++)
+ deleteSoundEntry(&Sound[i]);
+ /*
FreeSound(Sound[i]);
+ */
+
+ printf("%s: FREEING SOUNDS -- DONE\n",
+ audio.soundserver_pid == 0 ? "CHILD" : "PARENT");
free(Sound);
+
Sound = NULL;
+ num_sounds = 0;
}
void FreeAllMusic()
FreeMusic(Music[i]);
free(Music);
+
Music = NULL;
+ num_music = 0;
}
/* THE STUFF ABOVE IS ONLY USED BY THE MAIN PROCESS */
projects / rocksndiamonds.git / blobdiff