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 :
for (i=0; config_list[i].token != NULL; i++)
{
+#if 0
+ int len_config_token;
+ int len_config_value;
+ boolean is_file_entry;
+
+ printf("%d: '%s' => '%s'\n",
+ i, config_list[i].token, config_list[i].value);
+
+ len_config_token = strlen(config_list[i].token);
+ len_config_value = strlen(config_list[i].value);
+ is_file_entry = TRUE;
+
+#else
int len_config_token = strlen(config_list[i].token);
int len_config_value = strlen(config_list[i].value);
boolean is_file_entry = TRUE;
+#endif
for (j=0; suffix_list[j].token != NULL; j++)
{
int len_suffix = strlen(suffix);
#if 0
- if (IS_PARENT_PROCESS(audio.mixer_pid))
+ if (IS_PARENT_PROCESS())
printf(":::::::::: check '%s' for '%s' ::::::::::\n", token, suffix);
#endif
char *known_token_value = KNOWN_TOKEN_VALUE;
int i;
+ if (file_list_entry->filename != NULL)
+ free(file_list_entry->filename);
+
if (filename != NULL)
{
/* when file definition found, set all parameters to default values */
int parameter_array_size = num_suffix_list_entries * sizeof(int);
#if 0
- if (IS_PARENT_PROCESS(audio.mixer_pid))
+ if (IS_PARENT_PROCESS())
printf("===> found dynamic definition '%s'\n", token);
#endif
new_list_entry = &(*list)[*num_list_entries - 1];
new_list_entry->token = getStringCopy(token);
+ new_list_entry->filename = NULL;
new_list_entry->parameter = checked_calloc(parameter_array_size);
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 ext3_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->ext3_index = ext3_index;
+
+ new_list_entry->artwork_index = artwork_index;
+}
+
void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
{
struct FileInfo *file_list = artwork_info->file_list;
char **base_prefixes = artwork_info->base_prefixes;
char **ext1_suffixes = artwork_info->ext1_suffixes;
char **ext2_suffixes = artwork_info->ext2_suffixes;
+ char **ext3_suffixes = artwork_info->ext3_suffixes;
int num_file_list_entries = artwork_info->num_file_list_entries;
int num_suffix_list_entries = artwork_info->num_suffix_list_entries;
int num_base_prefixes = artwork_info->num_base_prefixes;
int num_ext1_suffixes = artwork_info->num_ext1_suffixes;
int num_ext2_suffixes = artwork_info->num_ext2_suffixes;
+ int num_ext3_suffixes = artwork_info->num_ext3_suffixes;
char *filename = getCustomArtworkConfigFilename(artwork_info->type);
struct SetupFileList *setup_file_list;
struct SetupFileList *extra_file_list = NULL;
struct SetupFileList *list;
char *known_token_value = KNOWN_TOKEN_VALUE;
- int i, j, k;
+ int i, j, k, l;
#if 0
printf("GOT CUSTOM ARTWORK CONFIG FILE '%s'\n", filename);
{
if (file_list[i].filename != NULL)
free(file_list[i].filename);
- file_list[i].filename = NULL;
+ file_list[i].filename = getStringCopy(file_list[i].default_filename);
for (j=0; j<num_suffix_list_entries; j++)
file_list[i].parameter[j] = file_list[i].default_parameter[j];
}
free(artwork_info->dynamic_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;
}
#if 0
- if (IS_PARENT_PROCESS(audio.mixer_pid))
+ if (IS_PARENT_PROCESS())
{
if (parameter_suffix_found)
printf("---> skipping token '%s' (parameter token)\n", token);
if (parameter_suffix_found)
continue;
- /* ---------- step 1: search for matching base prefix ---------- */
+ /* ---------- step 0: search for matching base prefix ---------- */
start_pos = 0;
for (i=0; i<num_base_prefixes && !base_prefix_found; i++)
char *base_prefix = base_prefixes[i];
int len_base_prefix = strlen(base_prefix);
boolean ext1_suffix_found = FALSE;
+ boolean ext2_suffix_found = FALSE;
+ boolean ext3_suffix_found = FALSE;
+ boolean exact_match = FALSE;
+ int base_index = -1;
+ int ext1_index = -1;
+ int ext2_index = -1;
+ int ext3_index = -1;
base_prefix_found = token_suffix_match(token, base_prefix, start_pos);
if (!base_prefix_found)
continue;
+ base_index = i;
+
if (start_pos + len_base_prefix == len_token) /* exact match */
{
+ exact_match = TRUE;
+
add_dynamic_file_list_entry(dynamic_file_list,
num_dynamic_file_list_entries,
extra_file_list,
suffix_list,
num_suffix_list_entries,
token);
+ add_property_mapping(property_mapping,
+ num_property_mapping_entries,
+ base_index, -1, -1, -1,
+ current_summarized_file_list_entry);
continue;
}
#if 0
- if (IS_PARENT_PROCESS(audio.mixer_pid))
+ if (IS_PARENT_PROCESS())
printf("---> examining token '%s': search 1st suffix ...\n", token);
#endif
- /* ---------- step 2: search for matching first suffix ---------- */
+ /* ---------- step 1: search for matching first suffix ---------- */
start_pos += len_base_prefix;
for (j=0; j<num_ext1_suffixes && !ext1_suffix_found; j++)
{
char *ext1_suffix = ext1_suffixes[j];
int len_ext1_suffix = strlen(ext1_suffix);
- boolean ext2_suffix_found = FALSE;
ext1_suffix_found = token_suffix_match(token, ext1_suffix, start_pos);
if (!ext1_suffix_found)
continue;
+ ext1_index = j;
+
if (start_pos + len_ext1_suffix == len_token) /* exact match */
{
+ exact_match = TRUE;
+
add_dynamic_file_list_entry(dynamic_file_list,
num_dynamic_file_list_entries,
extra_file_list,
suffix_list,
num_suffix_list_entries,
token);
+ add_property_mapping(property_mapping,
+ num_property_mapping_entries,
+ base_index, ext1_index, -1, -1,
+ current_summarized_file_list_entry);
continue;
}
+ start_pos += len_ext1_suffix;
+ }
+
+ if (exact_match)
+ break;
+
#if 0
- if (IS_PARENT_PROCESS(audio.mixer_pid))
- printf("---> examining token '%s': search 2nd suffix ...\n", token);
+ if (IS_PARENT_PROCESS())
+ printf("---> examining token '%s': search 2nd suffix ...\n", token);
#endif
- /* ---------- step 3: search for matching second suffix ---------- */
+ /* ---------- step 2: search for matching second suffix ---------- */
- start_pos += len_ext1_suffix;
- for (k=0; k<num_ext2_suffixes && !ext2_suffix_found; k++)
+ for (k=0; k<num_ext2_suffixes && !ext2_suffix_found; k++)
+ {
+ char *ext2_suffix = ext2_suffixes[k];
+ int len_ext2_suffix = strlen(ext2_suffix);
+
+ ext2_suffix_found = token_suffix_match(token, ext2_suffix,start_pos);
+
+ if (!ext2_suffix_found)
+ continue;
+
+ ext2_index = k;
+
+ if (start_pos + len_ext2_suffix == len_token) /* exact match */
{
- char *ext2_suffix = ext2_suffixes[k];
- int len_ext2_suffix = strlen(ext2_suffix);
-
- ext2_suffix_found = token_suffix_match(token, ext2_suffix,start_pos);
-
- if (!ext2_suffix_found)
- continue;
-
- if (start_pos + len_ext2_suffix == len_token) /* exact match */
- {
- add_dynamic_file_list_entry(dynamic_file_list,
- num_dynamic_file_list_entries,
- extra_file_list,
- suffix_list,
- num_suffix_list_entries,
- token);
- continue;
- }
+ exact_match = TRUE;
+
+ add_dynamic_file_list_entry(dynamic_file_list,
+ num_dynamic_file_list_entries,
+ extra_file_list,
+ suffix_list,
+ num_suffix_list_entries,
+ token);
+ add_property_mapping(property_mapping,
+ num_property_mapping_entries,
+ base_index, ext1_index, ext2_index, -1,
+ current_summarized_file_list_entry);
+ continue;
+ }
+
+ start_pos += len_ext2_suffix;
+ }
+
+ if (exact_match)
+ break;
+
+#if 0
+ if (IS_PARENT_PROCESS())
+ printf("---> examining token '%s': search 3rd suffix ...\n",token);
+#endif
+
+ /* ---------- step 3: search for matching third suffix ---------- */
+
+ for (l=0; l<num_ext3_suffixes && !ext3_suffix_found; l++)
+ {
+ char *ext3_suffix = ext3_suffixes[l];
+ int len_ext3_suffix = strlen(ext3_suffix);
+
+ ext3_suffix_found =token_suffix_match(token,ext3_suffix,start_pos);
+
+ if (!ext3_suffix_found)
+ continue;
+
+ ext3_index = l;
+
+ if (start_pos + len_ext3_suffix == len_token) /* exact match */
+ {
+ exact_match = TRUE;
+
+ add_dynamic_file_list_entry(dynamic_file_list,
+ num_dynamic_file_list_entries,
+ extra_file_list,
+ suffix_list,
+ num_suffix_list_entries,
+ token);
+ add_property_mapping(property_mapping,
+ num_property_mapping_entries,
+ base_index, ext1_index, ext2_index, ext3_index,
+ current_summarized_file_list_entry);
+ continue;
}
}
}
}
- if (extra_file_list != NULL &&
- options.verbose && IS_PARENT_PROCESS(audio.mixer_pid))
+ 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())
{
boolean dynamic_tokens_found = FALSE;
boolean unknown_tokens_found = FALSE;
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);
#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, file_list[i].filename, i);
-
-#if 0
- printf("DEBUG: loading artwork file '%s'...\n", file_list[i].filename);
-#endif
- }
+ LoadArtworkToList(artwork_info, &artwork_info->artwork_list[i],
+ file_list[i].filename, i);
#if 0
- draw_init[artwork_info->type].do_it = FALSE;
+ printf("DEBUG: reloading %d dynamic artwork files ...\n",
+ num_dynamic_file_list_entries);
#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
printf("%s: FREEING ARTWORK ...\n",
- IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT");
+ IS_CHILD_PROCESS() ? "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");
+ IS_CHILD_PROCESS() ? "CHILD" : "PARENT");
#endif
-
- free(artwork_info->artwork_list);
-
- artwork_info->artwork_list = NULL;
- artwork_info->num_file_list_entries = 0;
}
projects / rocksndiamonds.git / blobdiff