#define SAME_SOUND_NR(x,y) ((x).nr == (y).nr)
#define SAME_SOUND_DATA(x,y) ((x).data_ptr == (y).data_ptr)
-#if 0
-struct SoundHeader_SUN
-{
- unsigned long magic;
- unsigned long hdr_size;
- unsigned long data_size;
- unsigned long encoding;
- unsigned long sample_rate;
- unsigned long channels;
-};
-
-struct SoundHeader_8SVX
-{
- char magic_FORM[4];
- unsigned long chunk_size;
- char magic_8SVX[4];
-};
-#endif
-
#if defined(AUDIO_UNIX_NATIVE)
struct SoundHeader_WAV
{
typedef struct SoundControl SoundControl;
static struct ArtworkListInfo *sound_info = NULL;
-static SoundInfo **Sound = NULL;
-static MusicInfo **Music = NULL;
-static int num_sounds = 0, num_music = 0;
+static struct ArtworkListInfo *music_info = NULL;
+
+static MusicInfo **Music_NoConf = NULL;
+
+static int num_music_noconf = 0;
static int stereo_volume[SOUND_MAX_LEFT2RIGHT + 1];
static void ReloadCustomSounds();
static void ReloadCustomMusic();
static void FreeSound(void *);
+static void FreeMusic(void *);
+static void FreeAllMusic_NoConf();
+
+static SoundInfo *getSoundInfoEntryFromSoundID(int);
+static MusicInfo *getMusicInfoEntryFromMusicID(int);
/* ------------------------------------------------------------------------- */
int i;
/* look for available audio devices, starting with preferred ones */
- for (i=0; i<sizeof(audio_device_name)/sizeof(char *); i++)
+ for (i = 0; i < sizeof(audio_device_name)/sizeof(char *); i++)
if ((audio_device_fd = OpenAudioDevice(audio_device_name[i])) >= 0)
break;
return FALSE;
}
-#if 0
- printf("PID: %d [%s]\n", getpid(),
- (IS_CHILD_PROCESS(audio.mixer_pid) ? "child" : "parent"));
- Delay(10000 * 0);
-#endif
+ if (audio.mixer_pid == 0) /* we are the child process */
+ audio.mixer_pid = getpid();
- if (IS_CHILD_PROCESS(audio.mixer_pid))
+ if (IS_CHILD_PROCESS())
Mixer_Main(); /* this function never returns */
else
close(audio.mixer_pipe[0]); /* no reading from pipe needed */
if (audio.device_fd)
close(audio.device_fd);
- if (IS_PARENT_PROCESS(audio.mixer_pid))
+ if (IS_PARENT_PROCESS() && HAS_CHILD_PROCESS())
kill(audio.mixer_pid, SIGTERM);
}
/* "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 fragment_size_query = -1;
int stereo = TRUE;
struct
{
static void SendSoundControlToMixerProcess(SoundControl *snd_ctrl)
{
- if (IS_CHILD_PROCESS(audio.mixer_pid))
+ if (IS_CHILD_PROCESS())
return;
if (write(audio.mixer_pipe[1], snd_ctrl, sizeof(SoundControl)) < 0)
static void ReadSoundControlFromMainProcess(SoundControl *snd_ctrl)
{
- if (IS_PARENT_PROCESS(audio.mixer_pid))
+ if (IS_PARENT_PROCESS())
return;
if (read(audio.mixer_pipe[0], snd_ctrl, sizeof(SoundControl))
setup.override_level_sounds :
setup.override_level_music);
- if (IS_CHILD_PROCESS(audio.mixer_pid))
+ if (IS_CHILD_PROCESS())
return;
if (leveldir_current == NULL) /* should never happen */
Error(ERR_EXIT, "leveldir_current == NULL");
+ memset(&snd_ctrl, 0, sizeof(SoundControl)); /* to make valgrind happy */
+
snd_ctrl.active = FALSE;
snd_ctrl.state = type;
snd_ctrl.data_len = strlen(set_identifier) + 1;
&setup.override_level_sounds :
&setup.override_level_music);
- if (set_identifier)
- free(set_identifier);
+ checked_free(set_identifier);
set_identifier = checked_malloc(snd_ctrl->data_len);
if (ti == NULL)
ti = *ti_ptr = checked_calloc(sizeof(TreeInfo));
- if (leveldir_current->fullpath != NULL)
- free(leveldir_current->fullpath);
- if (leveldir_current->sounds_path != NULL)
- free(leveldir_current->sounds_path);
- if (leveldir_current->music_path != NULL)
- free(leveldir_current->music_path);
- if (ti->basepath != NULL)
- free(ti->basepath);
- if (ti->fullpath != NULL)
- free(ti->fullpath);
+
+ checked_free(leveldir_current->fullpath);
+ checked_free(leveldir_current->sounds_path);
+ checked_free(leveldir_current->music_path);
+ checked_free(ti->basepath);
+ checked_free(ti->fullpath);
if (read(audio.mixer_pipe[0], set_identifier,
snd_ctrl->data_len) != snd_ctrl->data_len ||
{
int i;
- for(i=0; i<audio.num_channels; i++)
+ for (i = 0; i < audio.num_channels; i++)
mixer[i].active = FALSE;
mixer_active_channels = 0;
}
{
SoundInfo *snd_info;
int i, k;
-
-#if 0
- printf("NEW SOUND %d ARRIVED [%d] [%d ACTIVE CHANNELS]\n",
- snd_ctrl.nr, num_sounds, mixer_active_channels);
-#endif
+ int num_sounds = getSoundListSize();
+ int num_music = getMusicListSize();
if (IS_MUSIC(snd_ctrl))
{
- if (num_music == 0)
+ if (snd_ctrl.nr >= num_music) /* invalid music */
return;
- snd_ctrl.nr = snd_ctrl.nr % num_music;
+ if (snd_ctrl.nr < 0) /* undefined music */
+ {
+ if (num_music_noconf == 0) /* no fallback music available */
+ return;
+
+ snd_ctrl.nr = UNMAP_NOCONF_MUSIC(snd_ctrl.nr) % num_music_noconf;
+ snd_info = Music_NoConf[snd_ctrl.nr];
+ }
+ else
+ snd_info = getMusicInfoEntryFromMusicID(snd_ctrl.nr);
+ }
+ else
+ {
+ if (snd_ctrl.nr < 0 || snd_ctrl.nr >= num_sounds)
+ return;
+
+ snd_info = getSoundInfoEntryFromSoundID(snd_ctrl.nr);
}
- else if (snd_ctrl.nr >= num_sounds)
- return;
- snd_info = (IS_MUSIC(snd_ctrl) ? Music[snd_ctrl.nr] : Sound[snd_ctrl.nr]);
if (snd_info == NULL)
return;
}
/* check if (and how often) this sound sample is already playing */
- for (k=0, i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (k = 0, i = audio.first_sound_channel; i < audio.num_channels; i++)
if (mixer[i].active && SAME_SOUND_DATA(mixer[i], snd_ctrl))
k++;
-#if 0
- printf("SOUND %d [CURRENTLY PLAYING %d TIMES]\n", snd_ctrl.nr, k);
-#endif
-
/* reset expiration delay for already playing loop sounds */
if (k > 0 && IS_LOOP(snd_ctrl))
{
- for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
if (mixer[i].active && SAME_SOUND_DATA(mixer[i], snd_ctrl))
{
-#if 0
- printf("RESETTING EXPIRATION FOR SOUND %d\n", snd_ctrl.nr);
-#endif
-
if (IS_FADING(mixer[i]))
Mixer_UnFadeChannel(i);
Mixer_SetChannelProperties(i);
Mixer_ResetChannelExpiration(i);
-
-#if 0
- printf("RESETTING VOLUME/STEREO FOR SOUND %d TO %d/%d\n",
- snd_ctrl.nr, snd_ctrl.volume, snd_ctrl.stereo_position);
-#endif
}
}
return;
}
-#if 0
- printf("PLAYING NEW SOUND %d\n", snd_ctrl.nr);
-#endif
-
/* 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++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
int playing_time = playing_current - mixer[i].playing_starttime;
int actual;
if (mixer_active_channels ==
audio.num_channels - (mixer[audio.music_channel].active ? 0 : 1))
{
- for (i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
if (!mixer[i].active)
{
#if 0
#if DEBUG
/* print some debugging information about audio channel usage */
- for (i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
Error(ERR_RETURN, "Mixer_InsertSound: %d [%d]: %ld (%ld)",
i, mixer[i].active, mixer[i].data_len, (long)mixer[i].data_ptr);
#endif
#endif
- for (i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
int playing_time = playing_current - mixer[i].playing_starttime;
int actual = 1000 * playing_time / mixer[i].data_len;
}
/* add the new sound to the mixer */
- for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
-#if 0
- printf("CHECKING CHANNEL %d FOR SOUND %d ...\n", i, snd_ctrl.nr);
-#endif
-
if (!mixer[i].active)
{
-#if 0
- printf("ADDING NEW SOUND %d TO MIXER\n", snd_ctrl.nr);
-#endif
-
#if defined(AUDIO_UNIX_NATIVE)
if (snd_info->data_len == 0)
{
int i;
#if defined(AUDIO_UNIX_NATIVE)
- if (IS_PARENT_PROCESS(audio.mixer_pid))
+ if (IS_PARENT_PROCESS())
{
SendSoundControlToMixerProcess(&snd_ctrl);
return;
#endif
/* deactivate channels that have expired since the last request */
- for (i=0; i<audio.num_channels; i++)
+ for (i = 0; i < audio.num_channels; i++)
if (mixer[i].active && Mixer_ChannelExpired(i))
Mixer_StopChannel(i);
if (IS_RELOADING(snd_ctrl)) /* load new sound or music files */
{
Mixer_StopMusicChannel();
- for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
Mixer_StopChannel(i);
#if defined(AUDIO_UNIX_NATIVE)
return;
}
- for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
if (SAME_SOUND_NR(mixer[i], snd_ctrl) || ALL_SOUNDS(snd_ctrl))
Mixer_FadeChannel(i);
}
return;
}
- for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
if (SAME_SOUND_NR(mixer[i], snd_ctrl) || ALL_SOUNDS(snd_ctrl))
Mixer_StopChannel(i);
return;
/* initialize stereo position conversion information */
- for(i=0; i<=SOUND_MAX_LEFT2RIGHT; i++)
+ for (i = 0; i <= SOUND_MAX_LEFT2RIGHT; i++)
stereo_volume[i] =
(int)sqrt((float)(SOUND_MAX_LEFT2RIGHT * SOUND_MAX_LEFT2RIGHT - i * i));
{
byte *sample_ptr = (byte *)snd_ctrl->data_ptr + num_channels * sample_pos;
- for (i=0; i<num_output_channels; i++)
+ for (i = 0; i < num_output_channels; i++)
{
int offset = (snd_ctrl->num_channels == 1 ? 0 : i);
- for (j=0; j<sample_size; j++)
+ for (j = 0; j < sample_size; j++)
buffer_ptr[output_stepsize * j + i] =
((short)(sample_ptr[stepsize * j + offset] ^ 0x80)) << 8;
}
{
short *sample_ptr= (short *)snd_ctrl->data_ptr + num_channels * sample_pos;
- for (i=0; i<num_output_channels; i++)
+ for (i = 0; i < num_output_channels; i++)
{
int offset = (snd_ctrl->num_channels == 1 ? 0 : i);
- for (j=0; j<sample_size; j++)
+ for (j = 0; j < sample_size; j++)
buffer_ptr[output_stepsize * j + i] =
sample_ptr[stepsize * j + offset];
}
memset(premix_last_buffer, 0,
max_sample_size * num_output_channels * sizeof(long));
- for(i=0; i<audio.num_channels; i++)
+ for (i = 0; i < audio.num_channels; i++)
{
void *sample_ptr;
int sample_len;
/* adjust volume of actual sound sample */
if (mixer[i].volume != SOUND_MAX_VOLUME)
- for(j=0; j<sample_size * num_output_channels; j++)
+ for (j = 0; j < sample_size * num_output_channels; j++)
premix_first_buffer[j] =
mixer[i].volume * (long)premix_first_buffer[j] / SOUND_MAX_VOLUME;
int left_volume = SOUND_VOLUME_LEFT(mixer[i].stereo_position);
int right_volume = SOUND_VOLUME_RIGHT(mixer[i].stereo_position);
- for(j=0; j<sample_size; j++)
+ for (j = 0; j < sample_size; j++)
{
premix_first_buffer[2 * j + 0] =
left_volume * premix_first_buffer[2 * j + 0] / SOUND_MAX_LEFT2RIGHT;
}
/* fill the last mixing buffer with stereo or mono sound */
- for(j=0; j<sample_size * num_output_channels; j++)
+ for (j = 0; j < sample_size * num_output_channels; j++)
premix_last_buffer[j] += premix_first_buffer[j];
/* delete completed sound entries from the mixer */
}
/* prepare final playing buffer according to system audio format */
- for(i=0; i<max_sample_size * num_output_channels; i++)
+ for (i = 0; i < max_sample_size * num_output_channels; i++)
{
/* cut off at 17 bit value */
if (premix_last_buffer[i] < -65535)
/* adjust volume of actual sound sample */
if (mixer[i].volume != SOUND_MAX_VOLUME)
- for(j=0; j<sample_size; j++)
+ for (j = 0; j < sample_size; j++)
premix_first_buffer[j] =
mixer[i].volume * (long)premix_first_buffer[j] / SOUND_MAX_VOLUME;
/* might be needed for u-law /dev/audio */
-#if 1
- for(j=0; j<sample_size; j++)
+ 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].playing_pos >= mixer[i].data_len)
Mixer_StopChannel(i);
- for(i=0; i<sample_size; i++)
+ for (i = 0; i < sample_size; i++)
playing_buffer[i] = (premix_first_buffer[i] >> 8) ^ 0x80;
/* finally play the sound fragment */
FD_ZERO(&mixer_fdset);
FD_SET(audio.mixer_pipe[0], &mixer_fdset);
- while(1) /* wait for sound playing commands from client */
+ while (1) /* wait for sound playing commands from client */
{
struct timeval delay = { 0, 0 };
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)
int i;
if (snd_ctrl->format == AUDIO_FORMAT_U8)
- for (i=0; i<sample_size; i++)
+ for (i = 0; i < sample_size; i++)
*buffer_ptr++ =
((short)(((byte *)sample_ptr)[i] ^ 0x80)) << 8;
else /* AUDIO_FORMAT_S16 */
- for (i=0; i<sample_size; i++)
+ for (i = 0; i < sample_size; i++)
*buffer_ptr++ =
((short *)sample_ptr)[i];
}
return snd_info;
}
-struct FileInfo *getCurrentSoundList()
-{
- return sound_info->file_list;
-}
-
-void InitSoundList(struct ConfigInfo *config_list, int num_file_list_entries,
- struct ConfigInfo *config_suffix_list,
- char **base_prefixes,
- char **ext1_suffixes,
- char **ext2_suffixes)
-{
- int i;
-
- sound_info = checked_calloc(sizeof(struct ArtworkListInfo));
- sound_info->type = ARTWORK_TYPE_SOUNDS;
-
- /* ---------- initialize file list and suffix lists ---------- */
-
- sound_info->num_file_list_entries = num_file_list_entries;
- sound_info->num_dynamic_file_list_entries = 0;
-
- sound_info->num_suffix_list_entries = 0;
- for (i=0; config_suffix_list[i].token != NULL; i++)
- sound_info->num_suffix_list_entries++;
-
- sound_info->file_list =
- getFileListFromConfigList(config_list, config_suffix_list,
- num_file_list_entries);
- sound_info->dynamic_file_list = NULL;
-
- sound_info->suffix_list = config_suffix_list;
-
- /* ---------- initialize base prefix and suffixes lists ---------- */
-
- sound_info->num_base_prefixes = 0;
- for (i=0; base_prefixes[i] != NULL; i++)
- sound_info->num_base_prefixes++;
-
- sound_info->num_ext1_suffixes = 0;
- for (i=0; ext1_suffixes[i] != NULL; i++)
- sound_info->num_ext1_suffixes++;
-
- sound_info->num_ext2_suffixes = 0;
- for (i=0; ext2_suffixes[i] != NULL; i++)
- sound_info->num_ext2_suffixes++;
-
- sound_info->base_prefixes = base_prefixes;
- sound_info->ext1_suffixes = ext1_suffixes;
- sound_info->ext2_suffixes = ext2_suffixes;
-
- /* ---------- initialize artwork reference and content lists ---------- */
-
- sound_info->artwork_list =
- checked_calloc(num_file_list_entries * sizeof(SoundInfo *));
-
- sound_info->content_list = NULL;
-
- /* ---------- initialize artwork loading/freeing functions ---------- */
-
- sound_info->load_artwork = Load_WAV;
- sound_info->free_artwork = FreeSound;
-
- num_sounds = sound_info->num_file_list_entries;
- Sound = (SoundInfo **)sound_info->artwork_list;
-}
-
-static MusicInfo *Load_MOD(char *filename)
+static void *Load_MOD(char *filename)
{
#if defined(TARGET_SDL)
MusicInfo *mod_info;
#endif
}
-void LoadCustomMusic(void)
+static void *Load_WAV_or_MOD(char *filename)
+{
+ if (FileIsSound(filename))
+ return Load_WAV(filename);
+ else if (FileIsMusic(filename))
+ return Load_MOD(filename);
+ else
+ return NULL;
+}
+
+void LoadCustomMusic_NoConf(void)
{
static boolean draw_init_text = TRUE; /* only draw at startup */
static char *last_music_directory = NULL;
char *music_directory = getCustomMusicDirectory();
DIR *dir;
struct dirent *dir_entry;
+ int num_music = getMusicListSize();
if (!audio.sound_available)
return;
free(last_music_directory);
last_music_directory = getStringCopy(music_directory);
- FreeAllMusic();
+ FreeAllMusic_NoConf();
if ((dir = opendir(music_directory)) == NULL)
{
while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */
{
char *basename = dir_entry->d_name;
- char *filename = getPath2(music_directory, basename);
+ char *filename = NULL;
MusicInfo *mus_info = NULL;
+ boolean music_already_used = FALSE;
+ int i;
-#if 0
- printf("DEBUG: loading music '%s' ...\n", basename);
-#endif
+ /* skip all music files that are configured in music config file */
+ for (i = 0; i < num_music; i++)
+ {
+ struct FileInfo *music = getMusicListEntry(i);
+
+ if (strcmp(basename, music->filename) == 0)
+ {
+ music_already_used = TRUE;
+ break;
+ }
+ }
+
+ if (music_already_used)
+ continue;
if (draw_init_text)
DrawInitText(basename, 150, FC_YELLOW);
- if (FileIsSound(basename))
- mus_info = Load_WAV(filename);
- else if (FileIsMusic(basename))
- mus_info = Load_MOD(filename);
+ filename = getPath2(music_directory, basename);
+
+ if (FileIsMusic(basename))
+ mus_info = Load_WAV_or_MOD(filename);
free(filename);
if (mus_info)
{
- num_music++;
- Music = checked_realloc(Music, num_music * sizeof(MusicInfo *));
- Music[num_music - 1] = mus_info;
+ num_music_noconf++;
+ Music_NoConf = checked_realloc(Music_NoConf,
+ num_music_noconf * sizeof(MusicInfo *));
+ Music_NoConf[num_music_noconf - 1] = mus_info;
}
}
closedir(dir);
draw_init_text = FALSE;
+}
+
+int getSoundListSize()
+{
+ return (sound_info->num_file_list_entries +
+ sound_info->num_dynamic_file_list_entries);
+}
+
+int getMusicListSize()
+{
+ return (music_info->num_file_list_entries +
+ music_info->num_dynamic_file_list_entries);
+}
- if (num_music == 0)
- Error(ERR_WARN, "cannot find any valid music files in directory '%s'",
- music_directory);
+struct FileInfo *getSoundListEntry(int pos)
+{
+ int num_list_entries = sound_info->num_file_list_entries;
+ int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries);
+
+ return (pos < num_list_entries ? &sound_info->file_list[list_pos] :
+ &sound_info->dynamic_file_list[list_pos]);
+}
+
+struct FileInfo *getMusicListEntry(int pos)
+{
+ int num_list_entries = music_info->num_file_list_entries;
+ int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries);
+
+ return (pos < num_list_entries ? &music_info->file_list[list_pos] :
+ &music_info->dynamic_file_list[list_pos]);
+}
+
+static SoundInfo *getSoundInfoEntryFromSoundID(int pos)
+{
+ int num_list_entries = sound_info->num_file_list_entries;
+ int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries);
+ SoundInfo **snd_info =
+ (SoundInfo **)(pos < num_list_entries ? sound_info->artwork_list :
+ sound_info->dynamic_artwork_list);
+
+ return snd_info[list_pos];
+}
+
+static MusicInfo *getMusicInfoEntryFromMusicID(int pos)
+{
+ int num_list_entries = music_info->num_file_list_entries;
+ int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries);
+ MusicInfo **mus_info =
+ (MusicInfo **)(pos < num_list_entries ? music_info->artwork_list :
+ music_info->dynamic_artwork_list);
+
+ return mus_info[list_pos];
+}
+
+int getSoundListPropertyMappingSize()
+{
+ return sound_info->num_property_mapping_entries;
+}
+
+int getMusicListPropertyMappingSize()
+{
+ return music_info->num_property_mapping_entries;
+}
+
+struct PropertyMapping *getSoundListPropertyMapping()
+{
+ return sound_info->property_mapping;
+}
+
+struct PropertyMapping *getMusicListPropertyMapping()
+{
+ return music_info->property_mapping;
+}
+
+void InitSoundList(struct ConfigInfo *config_list, int num_file_list_entries,
+ struct ConfigTypeInfo *config_suffix_list,
+ char **base_prefixes, char **ext1_suffixes,
+ char **ext2_suffixes, char **ext3_suffixes,
+ char **ignore_tokens)
+{
+ int i;
+
+ sound_info = checked_calloc(sizeof(struct ArtworkListInfo));
+ sound_info->type = ARTWORK_TYPE_SOUNDS;
+
+ /* ---------- initialize file list and suffix lists ---------- */
+
+ sound_info->num_file_list_entries = num_file_list_entries;
+ sound_info->num_dynamic_file_list_entries = 0;
+
+ sound_info->file_list =
+ getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens,
+ num_file_list_entries);
+ sound_info->dynamic_file_list = NULL;
+
+ sound_info->num_suffix_list_entries = 0;
+ for (i = 0; config_suffix_list[i].token != NULL; i++)
+ sound_info->num_suffix_list_entries++;
+
+ sound_info->suffix_list = config_suffix_list;
+
+ /* ---------- initialize base prefix and suffixes lists ---------- */
+
+ sound_info->num_base_prefixes = 0;
+ for (i = 0; base_prefixes[i] != NULL; i++)
+ sound_info->num_base_prefixes++;
+
+ sound_info->num_ext1_suffixes = 0;
+ for (i = 0; ext1_suffixes[i] != NULL; i++)
+ sound_info->num_ext1_suffixes++;
+
+ sound_info->num_ext2_suffixes = 0;
+ for (i = 0; ext2_suffixes[i] != NULL; i++)
+ sound_info->num_ext2_suffixes++;
+
+ sound_info->num_ext3_suffixes = 0;
+ for (i = 0; ext3_suffixes[i] != NULL; i++)
+ sound_info->num_ext3_suffixes++;
+
+ sound_info->num_ignore_tokens = 0;
+ for (i = 0; ignore_tokens[i] != NULL; i++)
+ sound_info->num_ignore_tokens++;
+
+ sound_info->base_prefixes = base_prefixes;
+ sound_info->ext1_suffixes = ext1_suffixes;
+ sound_info->ext2_suffixes = ext2_suffixes;
+ sound_info->ext3_suffixes = ext3_suffixes;
+ sound_info->ignore_tokens = ignore_tokens;
+
+ sound_info->num_property_mapping_entries = 0;
+
+ sound_info->property_mapping = NULL;
+
+ /* ---------- initialize artwork reference and content lists ---------- */
+
+ sound_info->sizeof_artwork_list_entry = sizeof(SoundInfo *);
+
+ sound_info->artwork_list =
+ checked_calloc(num_file_list_entries * sizeof(SoundInfo *));
+ sound_info->dynamic_artwork_list = NULL;
+
+ sound_info->content_list = NULL;
+
+ /* ---------- initialize artwork loading/freeing functions ---------- */
+
+ sound_info->load_artwork = Load_WAV;
+ sound_info->free_artwork = FreeSound;
+}
+
+void InitMusicList(struct ConfigInfo *config_list, int num_file_list_entries,
+ struct ConfigTypeInfo *config_suffix_list,
+ char **base_prefixes, char **ext1_suffixes,
+ char **ext2_suffixes, char **ext3_suffixes,
+ char **ignore_tokens)
+{
+ int i;
+
+ music_info = checked_calloc(sizeof(struct ArtworkListInfo));
+ music_info->type = ARTWORK_TYPE_MUSIC;
+
+ /* ---------- initialize file list and suffix lists ---------- */
+
+ music_info->num_file_list_entries = num_file_list_entries;
+ music_info->num_dynamic_file_list_entries = 0;
+
+ music_info->file_list =
+ getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens,
+ num_file_list_entries);
+ music_info->dynamic_file_list = NULL;
+
+ music_info->num_suffix_list_entries = 0;
+ for (i = 0; config_suffix_list[i].token != NULL; i++)
+ music_info->num_suffix_list_entries++;
+
+ music_info->suffix_list = config_suffix_list;
+
+ /* ---------- initialize base prefix and suffixes lists ---------- */
+
+ music_info->num_base_prefixes = 0;
+ for (i = 0; base_prefixes[i] != NULL; i++)
+ music_info->num_base_prefixes++;
+
+ music_info->num_ext1_suffixes = 0;
+ for (i = 0; ext1_suffixes[i] != NULL; i++)
+ music_info->num_ext1_suffixes++;
+
+ music_info->num_ext2_suffixes = 0;
+ for (i = 0; ext2_suffixes[i] != NULL; i++)
+ music_info->num_ext2_suffixes++;
+
+ music_info->num_ext3_suffixes = 0;
+ for (i = 0; ext3_suffixes[i] != NULL; i++)
+ music_info->num_ext3_suffixes++;
+
+ music_info->num_ignore_tokens = 0;
+ for (i = 0; ignore_tokens[i] != NULL; i++)
+ music_info->num_ignore_tokens++;
+
+ music_info->base_prefixes = base_prefixes;
+ music_info->ext1_suffixes = ext1_suffixes;
+ music_info->ext2_suffixes = ext2_suffixes;
+ music_info->ext3_suffixes = ext3_suffixes;
+ music_info->ignore_tokens = ignore_tokens;
+
+ music_info->num_property_mapping_entries = 0;
+
+ music_info->property_mapping = NULL;
+
+ /* ---------- initialize artwork reference and content lists ---------- */
+
+ music_info->sizeof_artwork_list_entry = sizeof(MusicInfo *);
+
+ music_info->artwork_list =
+ checked_calloc(num_file_list_entries * sizeof(MusicInfo *));
+ music_info->dynamic_artwork_list = NULL;
+
+ music_info->content_list = NULL;
+
+ /* ---------- initialize artwork loading/freeing functions ---------- */
+
+ music_info->load_artwork = Load_WAV_or_MOD;
+ music_info->free_artwork = FreeMusic;
}
void PlayMusic(int nr)
else if (stereo_position > SOUND_MAX_RIGHT)
stereo_position = SOUND_MAX_RIGHT;
+ memset(&snd_ctrl, 0, sizeof(SoundControl)); /* to make valgrind happy */
+
snd_ctrl.active = TRUE;
snd_ctrl.nr = nr;
snd_ctrl.volume = volume;
void FadeSounds()
{
- FadeMusic();
StopSoundExt(-1, SND_CTRL_FADE_ALL);
}
+void FadeSoundsAndMusic()
+{
+ FadeSounds();
+ FadeMusic();
+}
+
void StopMusic(void)
{
if (!audio.music_available)
if (!audio.sound_available)
return;
+ memset(&snd_ctrl, 0, sizeof(SoundControl)); /* to make valgrind happy */
+
snd_ctrl.active = FALSE;
snd_ctrl.nr = nr;
snd_ctrl.state = state;
static void ReloadCustomSounds()
{
#if 0
- printf("DEBUG: reloading sounds '%s' ...\n", artwork.snd_current_identifier);
+ printf("::: reloading sounds '%s' ...\n", artwork.snd_current_identifier);
#endif
LoadArtworkConfig(sound_info);
static void ReloadCustomMusic()
{
#if 0
- printf("DEBUG: reloading music '%s' ...\n", artwork.mus_current_identifier);
+ printf("::: reloading music '%s' ...\n", artwork.mus_current_identifier);
#endif
- LoadCustomMusic();
+ LoadArtworkConfig(music_info);
+ ReloadCustomArtworkList(music_info);
+
+ /* load all music files from directory not defined in "musicinfo.conf" */
+ LoadCustomMusic_NoConf();
}
void InitReloadCustomSounds(char *set_identifier)
return;
#if defined(AUDIO_UNIX_NATIVE)
+ LoadArtworkConfig(music_info); /* also load config on sound client */
WriteReloadInfoToPipe(set_identifier, SND_CTRL_RELOAD_MUSIC);
#else
ReloadCustomMusic();
#endif
}
- if (sound->source_filename)
- free(sound->source_filename);
+ checked_free(sound->source_filename);
free(sound);
}
-void FreeMusic(MusicInfo *music)
+void FreeMusic(void *ptr)
{
+ MusicInfo *music = (MusicInfo *)ptr;
+
if (music == NULL)
return;
free(music);
}
-void FreeAllSounds()
-{
- FreeCustomArtworkList(sound_info);
-}
-
-void FreeAllMusic()
+static void FreeAllMusic_NoConf()
{
int i;
- if (Music == NULL)
+ if (Music_NoConf == NULL)
return;
- for(i=0; i<num_music; i++)
- FreeMusic(Music[i]);
+ for (i = 0; i < num_music_noconf; i++)
+ FreeMusic(Music_NoConf[i]);
- free(Music);
+ free(Music_NoConf);
- Music = NULL;
- num_music = 0;
+ Music_NoConf = NULL;
+ num_music_noconf = 0;
+}
+
+void FreeAllSounds()
+{
+ FreeCustomArtworkLists(sound_info);
+}
+
+void FreeAllMusic()
+{
+ FreeCustomArtworkLists(music_info);
+ FreeAllMusic_NoConf();
}
/* THE STUFF ABOVE IS ONLY USED BY THE MAIN PROCESS */