return complete_path;
}
-static char *getStringCat2(char *s1, char *s2)
+char *getStringCat2(char *s1, char *s2)
{
char *complete_string = checked_malloc(strlen(s1) + strlen(s2) + 1);
/* functions for loading artwork configuration information */
/* ------------------------------------------------------------------------- */
+static void FreeCustomArtworkList(struct ArtworkListInfo *,
+ struct ListNodeInfo ***, int *);
+
static int get_parameter_value(int type, char *value)
{
return (strcmp(value, ARG_UNDEFINED) == 0 ? ARG_UNDEFINED_VALUE :
read_token_parameters(extra_file_list, suffix_list, new_list_entry);
}
+static void add_property_mapping(struct PropertyMapping **list,
+ int *num_list_entries,
+ int base_index, int ext1_index,int ext2_index,
+ int artwork_index)
+{
+ struct PropertyMapping *new_list_entry;
+
+ (*num_list_entries)++;
+ *list = checked_realloc(*list,
+ *num_list_entries * sizeof(struct PropertyMapping));
+ new_list_entry = &(*list)[*num_list_entries - 1];
+
+ new_list_entry->base_index = base_index;
+ new_list_entry->ext1_index = ext1_index;
+ new_list_entry->ext2_index = ext2_index;
+
+ new_list_entry->artwork_index = artwork_index;
+}
+
void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
{
struct FileInfo *file_list = artwork_info->file_list;
artwork_info->dynamic_file_list = NULL;
artwork_info->num_dynamic_file_list_entries = 0;
+
+ FreeCustomArtworkList(artwork_info, &artwork_info->dynamic_artwork_list,
+ &artwork_info->num_dynamic_file_list_entries);
+ }
+
+ /* free previous property mapping */
+ if (artwork_info->property_mapping != NULL)
+ {
+ free(artwork_info->property_mapping);
+
+ artwork_info->property_mapping = NULL;
+ artwork_info->num_property_mapping_entries = 0;
}
if (filename == NULL)
for (i=0; i<num_file_list_entries; i++)
read_token_parameters(setup_file_list, suffix_list, &file_list[i]);
- /* set some additional tokens to "known" */
+ /* set all known tokens to "known" keyword */
setTokenValue(setup_file_list, "name", known_token_value);
setTokenValue(setup_file_list, "sort_priority", known_token_value);
for (list = extra_file_list; list != NULL; list = list->next)
{
- struct FileInfo **dynamic_file_list = &artwork_info->dynamic_file_list;
+ struct FileInfo **dynamic_file_list =
+ &artwork_info->dynamic_file_list;
int *num_dynamic_file_list_entries =
&artwork_info->num_dynamic_file_list_entries;
+ struct PropertyMapping **property_mapping =
+ &artwork_info->property_mapping;
+ int *num_property_mapping_entries =
+ &artwork_info->num_property_mapping_entries;
+ int current_summarized_file_list_entry =
+ artwork_info->num_file_list_entries +
+ artwork_info->num_dynamic_file_list_entries;
char *token = list->token;
int len_token = strlen(token);
int start_pos;
suffix_list,
num_suffix_list_entries,
token);
+ add_property_mapping(property_mapping,
+ num_property_mapping_entries,
+ i, -1, -1,
+ current_summarized_file_list_entry);
continue;
}
suffix_list,
num_suffix_list_entries,
token);
+ add_property_mapping(property_mapping,
+ num_property_mapping_entries,
+ i, j, -1,
+ current_summarized_file_list_entry);
continue;
}
suffix_list,
num_suffix_list_entries,
token);
+ add_property_mapping(property_mapping,
+ num_property_mapping_entries,
+ i, j, k,
+ current_summarized_file_list_entry);
continue;
}
}
}
}
+ if (artwork_info->num_dynamic_file_list_entries > 0)
+ {
+ artwork_info->dynamic_artwork_list =
+ checked_calloc(artwork_info->num_dynamic_file_list_entries *
+ artwork_info->sizeof_artwork_list_entry);
+ }
+
if (extra_file_list != NULL &&
options.verbose && IS_PARENT_PROCESS(audio.mixer_pid))
{
struct ListNodeInfo **listnode,
char *basename)
{
-#if 0
- char *filename = getCustomArtworkFilename(basename, artwork_info->type);
-#endif
-
#if 0
printf("GOT CUSTOM ARTWORK FILE '%s'\n", filename);
#endif
return;
}
-#if 0
- if (filename == NULL)
- {
- Error(ERR_WARN, "cannot find artwork file '%s'", basename);
- return;
- }
-
- replaceArtworkListEntry(artwork_info, listnode, filename);
-#else
replaceArtworkListEntry(artwork_info, listnode, basename);
-#endif
}
static void LoadArtworkToList(struct ArtworkListInfo *artwork_info,
+ struct ListNodeInfo **listnode,
char *basename, int list_pos)
{
+#if 0
if (artwork_info->artwork_list == NULL ||
list_pos >= artwork_info->num_file_list_entries)
return;
+#endif
#if 0
printf("loading artwork '%s' ... [%d]\n",
basename, getNumNodes(artwork_info->content_list));
#endif
+#if 1
+ LoadCustomArtwork(artwork_info, listnode, basename);
+#else
LoadCustomArtwork(artwork_info, &artwork_info->artwork_list[list_pos],
basename);
+#endif
#if 0
printf("loading artwork '%s' done [%d]\n",
void ReloadCustomArtworkList(struct ArtworkListInfo *artwork_info)
{
-#if 0
- static struct
- {
- char *text;
- boolean do_it;
- }
- draw_init[] =
- {
- { "", FALSE },
- { "Loading graphics:", TRUE },
- { "Loading sounds:", TRUE },
- { "Loading music:", TRUE }
- };
-#endif
-
- int num_file_list_entries = artwork_info->num_file_list_entries;
struct FileInfo *file_list = artwork_info->file_list;
+ struct FileInfo *dynamic_file_list = artwork_info->dynamic_file_list;
+ int num_file_list_entries = artwork_info->num_file_list_entries;
+ int num_dynamic_file_list_entries =
+ artwork_info->num_dynamic_file_list_entries;
int i;
#if 0
- LoadArtworkConfig(artwork_info);
-#endif
-
-#if 0
- if (draw_init[artwork_info->type].do_it)
- DrawInitText(draw_init[artwork_info->type].text, 120, FC_GREEN);
-#endif
-
-#if 0
- printf("DEBUG: reloading %d artwork files ...\n", num_file_list_entries);
+ printf("DEBUG: reloading %d static artwork files ...\n",
+ num_file_list_entries);
+ printf("DEBUG: reloading %d dynamic artwork files ...\n",
+ num_dynamic_file_list_entries);
#endif
for(i=0; i<num_file_list_entries; i++)
- {
-#if 0
- if (draw_init[artwork_info->type].do_it)
- DrawInitText(file_list[i].token, 150, FC_YELLOW);
-#endif
+ LoadArtworkToList(artwork_info, &artwork_info->artwork_list[i],
+ file_list[i].filename, i);
- LoadArtworkToList(artwork_info, file_list[i].filename, i);
-
-#if 0
- printf("DEBUG: loading artwork file '%s'...\n", file_list[i].filename);
-#endif
- }
-
-#if 0
- draw_init[artwork_info->type].do_it = FALSE;
-#endif
-
- /*
- printf("list size == %d\n", getNumNodes(artwork_info->content_list));
- */
+ for(i=0; i<num_dynamic_file_list_entries; i++)
+ LoadArtworkToList(artwork_info, &artwork_info->dynamic_artwork_list[i],
+ dynamic_file_list[i].filename, i);
#if 0
dumpList(artwork_info->content_list);
#endif
}
-void FreeCustomArtworkList(struct ArtworkListInfo *artwork_info)
+static void FreeCustomArtworkList(struct ArtworkListInfo *artwork_info,
+ struct ListNodeInfo ***list,
+ int *num_list_entries)
{
int i;
- if (artwork_info == NULL || artwork_info->artwork_list == NULL)
+ if (*list == NULL)
+ return;
+
+ for(i=0; i<*num_list_entries; i++)
+ deleteArtworkListEntry(artwork_info, &(*list)[i]);
+ free(*list);
+
+ *list = NULL;
+ *num_list_entries = 0;
+}
+
+void FreeCustomArtworkLists(struct ArtworkListInfo *artwork_info)
+{
+ if (artwork_info == NULL)
return;
#if 0
IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT");
#endif
- for(i=0; i<artwork_info->num_file_list_entries; i++)
- deleteArtworkListEntry(artwork_info, &artwork_info->artwork_list[i]);
+ FreeCustomArtworkList(artwork_info, &artwork_info->artwork_list,
+ &artwork_info->num_file_list_entries);
+
+ FreeCustomArtworkList(artwork_info, &artwork_info->dynamic_artwork_list,
+ &artwork_info->num_dynamic_file_list_entries);
#if 0
printf("%s: FREEING ARTWORK -- DONE\n",
IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT");
#endif
-
- free(artwork_info->artwork_list);
-
- artwork_info->artwork_list = NULL;
- artwork_info->num_file_list_entries = 0;
}