return sound_info->file_list;
}
-void InitSoundList(struct ConfigInfo *config_list,
+void InitSoundList(struct ConfigInfo *config_list, int num_file_list_entries,
struct ConfigInfo *config_suffix_list,
- int num_file_list_entries)
+ 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;
- sound_info->custom_setup_list = NULL;
+
+ /* ---------- 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->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;
{
num_music++;
Music = checked_realloc(Music, num_music * sizeof(MusicInfo *));
- Music[num_music -1] = mus_info;
+ Music[num_music - 1] = mus_info;
}
}
printf("DEBUG: reloading sounds '%s' ...\n", artwork.snd_current_identifier);
#endif
+ LoadArtworkConfig(sound_info);
ReloadCustomArtworkList(sound_info);
}
LoadCustomMusic();
}
-void InitReloadSounds(char *set_identifier)
+void InitReloadCustomSounds(char *set_identifier)
{
if (!audio.sound_available)
return;
#if defined(AUDIO_UNIX_NATIVE)
+ LoadArtworkConfig(sound_info); /* also load config on sound client */
WriteReloadInfoToPipe(set_identifier, SND_CTRL_RELOAD_SOUNDS);
#else
ReloadCustomSounds();
#endif
}
-void InitReloadMusic(char *set_identifier)
+void InitReloadCustomMusic(char *set_identifier)
{
if (!audio.music_available)
return;
void FreeAllSounds()
{
- FreeCustomArtworkList(sound_info);
+ FreeCustomArtworkLists(sound_info);
}
void FreeAllMusic()