#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;
};
static int playing_sounds = 0;
-static struct SoundControl playlist[MAX_SOUNDS_PLAYING];
+static struct SoundControl playlist[NUM_MIXER_CHANNELS];
static struct SoundControl emptySoundControl =
{
-1,0,0, FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE, 0,0, 0,NULL
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 i;
- for(i=0; i<MAX_SOUNDS_PLAYING; i++)
+ for(i=0; i<NUM_MIXER_CHANNELS; i++)
playlist[i] = emptySoundControl;
playing_sounds = 0;
}
+#if 0
+static void HandleSoundRequest(struct SoundControl snd_ctrl)
+{
+ int i;
+
+ if (snd_ctrl.fade_sound)
+ {
+ if (!playing_sounds)
+ continue;
+
+ if (snd_ctrl.music)
+ playlist[audio.music_channel].fade_sound = TRUE;
+ else
+ for(i=0; i<NUM_MIXER_CHANNELS; i++)
+ if (snd_ctrl.stop_all_sounds ||
+ (i != audio.music_channel && playlist[i].nr == snd_ctrl.nr))
+ playlist[i].fade_sound = TRUE;
+ }
+ else if (snd_ctrl.stop_all_sounds)
+ {
+ if (!playing_sounds)
+ continue;
+
+ for(i=0; i<NUM_MIXER_CHANNELS; i++)
+ playlist[i] = emptySoundControl;
+ playing_sounds = 0;
+
+ close(audio.device_fd);
+ }
+ else if (snd_ctrl.stop_sound)
+ {
+ if (!playing_sounds)
+ continue;
+
+ if (snd_ctrl.music)
+ {
+ playlist[audio.music_channel] = emptySoundControl;
+ playing_sounds--;
+ }
+
+ for(i=0; i<NUM_MIXER_CHANNELS; i++)
+ {
+ if (i != audio.music_channel && playlist[i].nr == snd_ctrl.nr)
+ {
+ playlist[i] = emptySoundControl;
+ playing_sounds--;
+ }
+ }
+
+ if (!playing_sounds)
+ close(audio.device_fd);
+ }
+}
+#endif
+
void StartSoundserver(void)
{
if (!audio.sound_available)
if (snd_ctrl.reload_sounds)
{
artwork.sounds_set_current = set_name;
- audio.func_reload_sounds();
+ ReloadCustomSounds();
}
else
{
artwork.music_set_current = set_name;
- audio.func_reload_music();
+ ReloadCustomMusic();
}
free(set_name);
#if defined(AUDIO_STREAMING_DSP)
+#if 0
+ HandleSoundRequest(snd_ctrl);
+#else
+
if (snd_ctrl.fade_sound)
{
if (!playing_sounds)
if (snd_ctrl.music)
playlist[audio.music_channel].fade_sound = TRUE;
else
- for(i=0; i<MAX_SOUNDS_PLAYING; i++)
+ for(i=0; i<NUM_MIXER_CHANNELS; i++)
if (snd_ctrl.stop_all_sounds ||
(i != audio.music_channel && playlist[i].nr == snd_ctrl.nr))
playlist[i].fade_sound = TRUE;
if (!playing_sounds)
continue;
- for(i=0; i<MAX_SOUNDS_PLAYING; i++)
+ for(i=0; i<NUM_MIXER_CHANNELS; i++)
playlist[i] = emptySoundControl;
playing_sounds = 0;
if (snd_ctrl.music)
{
- playlist[audio.music_channel] = emptySoundControl;
- playing_sounds--;
+ if (playlist[audio.music_channel].active)
+ {
+ playlist[audio.music_channel] = emptySoundControl;
+ playing_sounds--;
+ }
}
- for(i=0; i<MAX_SOUNDS_PLAYING; i++)
+ for(i=0; i<NUM_MIXER_CHANNELS; i++)
{
if (i != audio.music_channel && playlist[i].nr == snd_ctrl.nr)
{
if (!playing_sounds)
close(audio.device_fd);
}
+#endif
if (playing_sounds || snd_ctrl.active)
{
select(audio.soundserver_pipe[0] + 1,
&sound_fdset, NULL, NULL, &delay) < 1)
{
- void *sample_ptr;
- int sample_size;
int max_sample_size;
int fragment_size = afmt.fragment_size;
int sample_bytes = (afmt.format & AUDIO_FORMAT_U8 ? 1 : 2);
memset(premix_last_buffer, 0,
max_sample_size * (stereo ? 2 : 1) * sizeof(long));
- for(i=0; i<MAX_SOUNDS_PLAYING; i++)
+ 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;
- /* get pointer and size of the actual sound sample */
- if (playlist[i].format == AUDIO_FORMAT_U8)
- sample_ptr =
- (byte *)playlist[i].data_ptr + playlist[i].playingpos;
- else
- sample_ptr =
- (short *)playlist[i].data_ptr + playlist[i].playingpos;
-
- sample_size = MIN(max_sample_size,
- playlist[i].data_len - playlist[i].playingpos);
+ /* 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;
- /* fill the first mixing buffer with original sample */
-#if 1
+ /* 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)[j] ^ 0x80)) << 8;
- else
+ ((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)[j];
-#else
- memcpy(premix_first_buffer, sample_ptr,
- sample_size * (playlist[i].format == AUDIO_FORMAT_U8 ?
- sizeof(byte) : sizeof(short)));
-#endif
+ premix_first_buffer[j] =
+ ((short *)sample_ptr)[sample_pos + j];
/* are we about to restart a looping sound? */
if (playlist[i].loop && sample_size < max_sample_size)
{
-#if 1
while (sample_size < max_sample_size)
{
int restarted_sample_size =
- MIN(max_sample_size - sample_size, playlist[i].data_len);
+ 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 *)playlist[i].data_ptr)[j] ^ 0x80)) << 8;
+ ((short)(((byte *)sample_ptr)[j] ^ 0x80)) << 8;
else
for (j=0; j<restarted_sample_size; j++)
premix_first_buffer[sample_size + j] =
- ((short *)playlist[i].data_ptr)[j];
+ ((short *)sample_ptr)[j];
playlist[i].playingpos = restarted_sample_size;
sample_size += restarted_sample_size;
}
-#else
- playlist[i].playingpos = max_sample_size - sample_size;
- memcpy(premix_first_buffer + sample_size * sizeof(short),
- playlist[i].data_ptr,
- (max_sample_size - sample_size) * sizeof(short));
- sample_size = max_sample_size;
-#endif
}
/* decrease volume if sound is fading out */
if (!playing_sounds)
return;
- for (i=0; i<MAX_SOUNDS_PLAYING; i++)
+ 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)) &&
SoundServer_StopSound(snd_ctrl);
}
- for (i=0; i<MAX_SOUNDS_PLAYING; i++)
+ for (i=0; i<NUM_MIXER_CHANNELS; i++)
{
if (!playlist[i].active || playlist[i].loop)
continue;
}
#endif /* PLATFORM_MSDOS */
+#if 0
+#if defined(TARGET_SDL)
+static void sound_handler_SDL(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].loop = PSND_NO_LOOP;
+ }
+ }
+ else if (snd_ctrl.stop_all_sounds)
+ {
+ if (!playing_sounds)
+ return;
+ SoundServer_StopAllSounds();
+ }
+ else if (snd_ctrl.stop_sound)
+ {
+ if (!playing_sounds)
+ return;
+ SoundServer_StopSound(snd_ctrl);
+ }
+
+ for (i=0; i<NUM_MIXER_CHANNELS; i++)
+ {
+ if (!playlist[i].active || playlist[i].loop)
+ continue;
+
+ playlist[i].playingpos = voice_get_position(playlist[i].voice);
+ playlist[i].volume = voice_get_volume(playlist[i].voice);
+ if (playlist[i].playingpos == -1 || !playlist[i].volume)
+ {
+ deallocate_voice(playlist[i].voice);
+ playlist[i] = emptySoundControl;
+ playing_sounds--;
+ }
+ }
+
+ if (snd_ctrl.active)
+ SoundServer_InsertNewSound(snd_ctrl);
+}
+#endif /* TARGET_SDL */
+#endif
+
#if !defined(PLATFORM_WIN32)
static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
{
+ SoundInfo *snd_info;
int i, k;
if (snd_ctrl.music)
snd_ctrl.nr = snd_ctrl.nr % num_music;
+ else if (snd_ctrl.nr >= num_sounds)
+ return;
+
+ snd_info = (snd_ctrl.music ? Music[snd_ctrl.nr] : Sound[snd_ctrl.nr]);
+ if (snd_info == NULL)
+ {
+#if 0
+ printf("sound/music %d undefined\n", snd_ctrl.nr);
+#endif
+ return;
+ }
+
+#if 0
+ printf("-> %d\n", playing_sounds);
+#endif
+
+ if (playing_sounds == NUM_MIXER_CHANNELS)
+ {
+ for (i=0; i<NUM_MIXER_CHANNELS; i++)
+ {
+ if (playlist[i].data_ptr == NULL)
+ {
+#if 1
+ printf("THIS SHOULD NEVER HAPPEN! [%d]\n", i);
+#endif
+
+ playlist[i] = emptySoundControl;
+ playing_sounds--;
+ }
+ }
+ }
/* if playlist is full, remove oldest sound */
- if (playing_sounds == MAX_SOUNDS_PLAYING)
+ if (playing_sounds == NUM_MIXER_CHANNELS)
{
int longest = 0, longest_nr = 0;
- for (i=0; i<MAX_SOUNDS_PLAYING; i++)
+ for (i=0; i<NUM_MIXER_CHANNELS; i++)
{
#if !defined(PLATFORM_MSDOS)
int actual = 100 * playlist[i].playingpos / playlist[i].data_len;
}
/* check if sound is already being played (and how often) */
- for (k=0,i=0; i<MAX_SOUNDS_PLAYING; i++)
+ for (k=0,i=0; i<NUM_MIXER_CHANNELS; i++)
if (i != audio.music_channel && playlist[i].nr == snd_ctrl.nr)
k++;
/* restart loop sounds only if they are just fading out */
if (k >= 1 && snd_ctrl.loop)
{
- for(i=0; i<MAX_SOUNDS_PLAYING; i++)
+ for(i=0; i<NUM_MIXER_CHANNELS; i++)
{
if (i != audio.music_channel && playlist[i].nr == snd_ctrl.nr &&
playlist[i].fade_sound)
int longest = 0, longest_nr = 0;
/* look for oldest equal sound */
- for(i=0; i<MAX_SOUNDS_PLAYING; i++)
+ for(i=0; i<NUM_MIXER_CHANNELS; i++)
{
int actual;
}
/* add new sound to playlist */
- for(i=0; i<MAX_SOUNDS_PLAYING; i++)
+ for(i=0; i<NUM_MIXER_CHANNELS; i++)
{
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;
snd_ctrl.format = snd_info->format;
+#if 1
+ if (snd_info->data_len == 0)
+ {
+ printf("THIS SHOULD NEVER HAPPEN! [snd_info->data_len == 0]\n");
+ }
+#endif
+
+#if 1
+ if (snd_ctrl.music && i == audio.music_channel && playlist[i].active)
+ {
+ printf("THIS SHOULD NEVER HAPPEN! [adding music twice]\n");
+
+#if 1
+ playlist[i] = emptySoundControl;
+ playing_sounds--;
+#endif
+ }
+#endif
+
playlist[i] = snd_ctrl;
playing_sounds++;
if (!playing_sounds)
return;
- for(i=0;i<MAX_SOUNDS_PLAYING;i++)
+ 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;
}
if (!playing_sounds)
return;
- for(i=0; i<MAX_SOUNDS_PLAYING; i++)
+ for(i=0; i<NUM_MIXER_CHANNELS; i++)
{
if ((i == audio.music_channel && snd_ctrl.music) ||
(i != audio.music_channel && playlist[i].nr == nr))
{
int i;
- for(i=0;i<MAX_SOUNDS_PLAYING;i++)
+ for(i=0; i<NUM_MIXER_CHANNELS; i++)
{
#if defined(PLATFORM_MSDOS)
voice_set_volume(playlist[i].voice, 0);
deallocate_voice(playlist[i].voice);
#endif
- playlist[i]=emptySoundControl;
+ playlist[i] = emptySoundControl;
}
playing_sounds = 0;
byte sound_header_buffer[WAV_HEADER_SIZE];
char chunk_name[CHUNK_ID_LEN + 1];
int chunk_size;
- short *data_ptr;
FILE *file;
int i;
#endif
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;
}
- if (0)
+ snd_info->format = AUDIO_FORMAT_U8;
+
+#endif /* PLATFORM_UNIX */
+
+ snd_info->type = SND_TYPE_WAV;
+ snd_info->source_filename = getStringCopy(filename);
+
+ return snd_info;
+}
+
+static void deleteSoundEntry(SoundInfo **snd_info)
+{
+ if (*snd_info)
{
- /* convert unsigned 8 bit sample data to signed 16 bit sample data */
+ char *filename = (*snd_info)->source_filename;
- data_ptr = checked_malloc(snd_info->data_len * sizeof(short));
+#if 0
+ printf("[decrementing reference counter of sound '%s']\n", filename);
+#endif
- for (i=0; i<snd_info->data_len; i++)
- data_ptr[i] = ((short)(((byte *)snd_info->data_ptr)[i] ^ 0x80)) << 8;
+ if (--(*snd_info)->num_references <= 0)
+ {
+#if 0
+ printf("[deleting sound '%s']\n", filename);
+#endif
- free(snd_info->data_ptr);
- snd_info->data_ptr = data_ptr;
+ /*
+ FreeSound(*snd_info);
+ */
+ deleteNodeFromList(&SoundFileList, filename, FreeSound);
+ }
- snd_info->format = AUDIO_FORMAT_S16;
+ *snd_info = NULL;
}
- else
+}
+
+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)
{
- snd_info->format = AUDIO_FORMAT_U8;
+ /* 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;
}
-#endif /* PLATFORM_UNIX */
+ /* delete existing sound file entry */
+ deleteSoundEntry(snd_info);
- snd_info->type = SND_TYPE_WAV;
- snd_info->source_filename = getStringCopy(filename);
+ /* 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
- return snd_info;
+ *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);
+ }
}
-SoundInfo *LoadCustomSound(char *basename)
+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;
}
- 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)
#endif
#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, (loop_type ? -1 : 0));
+ }
#elif defined(PLATFORM_UNIX)
if (audio.soundserver_pid == 0) /* we are child process */
return;
audio.sound_available = audio.sound_enabled = FALSE;
return;
}
-#else
+#else /* PLATFORM_MSDOS */
sound_handler(snd_ctrl);
#endif
}
+ListNode *newListNode()
+{
+ return checked_calloc(sizeof(ListNode));
+}
+
+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 0
+ printf("[CHECKING LIST KEY '%s' == '%s']\n",
+ (*node_first)->key, key);
+#endif
+
+ if (strcmp((*node_first)->key, key) == 0)
+ {
+#if 0
+ printf("[DELETING LIST ENTRY]\n");
+#endif
+
+ free((*node_first)->key);
+ if (destructor_function)
+ destructor_function((*node_first)->content);
+ *node_first = (*node_first)->next;
+ }
+ else
+ deleteNodeFromList(&(*node_first)->next, key, destructor_function);
+}
+
+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();
+
+ 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 defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
#if defined(TARGET_SDL) || defined(TARGET_ALLEGRO)
if (type == SND_RELOAD_SOUNDS)
- audio.func_reload_sounds();
+ ReloadCustomSounds();
else
- audio.func_reload_music();
+ ReloadCustomMusic();
#elif defined(PLATFORM_UNIX)
if (audio.soundserver_pid == 0) /* we are child process */
return;
InitReloadSoundsOrMusic(set_name, SND_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);
projects / rocksndiamonds.git / blobdiff