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);
return s_copy;
}
+void setString(char **old_value, char *new_value)
+{
+ if (*old_value != NULL)
+ free(*old_value);
+
+ *old_value = getStringCopy(new_value);
+}
+
/* ------------------------------------------------------------------------- */
/* command line option handling functions */
/* functions for loading artwork configuration information */
/* ------------------------------------------------------------------------- */
-static void FreeCustomArtworkList(struct ArtworkListInfo *,
- struct ListNodeInfo ***, int *);
-
-static int get_parameter_value(int type, char *value)
+int get_parameter_value(int type, char *value)
{
return (strcmp(value, ARG_UNDEFINED) == 0 ? ARG_UNDEFINED_VALUE :
type == TYPE_INTEGER ? get_integer_from_string(value) :
type == TYPE_BOOLEAN ? get_boolean_from_string(value) :
- -1);
+ ARG_UNDEFINED_VALUE);
}
+static void FreeCustomArtworkList(struct ArtworkListInfo *,
+ struct ListNodeInfo ***, int *);
+
struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list,
struct ConfigInfo *suffix_list,
int num_file_list_entries)
struct FileInfo *file_list;
int num_file_list_entries_found = 0;
int num_suffix_list_entries = 0;
- int list_pos = 0;
+ int list_pos;
int i, j;
file_list = checked_calloc(num_file_list_entries * sizeof(struct FileInfo));
for (i=0; i<num_file_list_entries; i++)
{
file_list[i].token = NULL;
+
file_list[i].default_filename = NULL;
file_list[i].filename = NULL;
if (num_suffix_list_entries > 0)
{
- int parameter_array_size = num_suffix_list_entries * sizeof(int);
+ int parameter_array_size = num_suffix_list_entries * sizeof(char *);
file_list[i].default_parameter = checked_calloc(parameter_array_size);
file_list[i].parameter = checked_calloc(parameter_array_size);
for (j=0; j<num_suffix_list_entries; j++)
{
- int default_parameter =
- get_parameter_value(suffix_list[j].type, suffix_list[j].value);
-
- file_list[i].default_parameter[j] = default_parameter;
- file_list[i].parameter[j] = default_parameter;
+ setString(&file_list[i].default_parameter[j], suffix_list[j].value);
+ setString(&file_list[i].parameter[j], suffix_list[j].value);
}
}
}
+ list_pos = 0;
for (i=0; config_list[i].token != NULL; i++)
{
int len_config_token = strlen(config_list[i].token);
strcmp(&config_list[i].token[len_config_token - len_suffix],
suffix_list[j].token) == 0)
{
- file_list[list_pos].default_parameter[j] =
- get_parameter_value(suffix_list[j].type, config_list[i].value);
+ setString(&file_list[list_pos].default_parameter[j],
+ config_list[i].value);
is_file_entry = FALSE;
break;
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
if (filename != NULL)
{
+ setString(&file_list_entry->filename, filename);
+
/* when file definition found, set all parameters to default values */
for (i=0; suffix_list[i].token != NULL; i++)
- file_list_entry->parameter[i] =
- get_parameter_value(suffix_list[i].type, suffix_list[i].value);
+ setString(&file_list_entry->parameter[i], suffix_list[i].value);
- file_list_entry->filename = getStringCopy(filename);
+ file_list_entry->redefined = TRUE;
/* mark config file token as well known from default config */
setTokenValue(setup_file_list, file_list_entry->token, known_token_value);
}
else
- file_list_entry->filename =
- getStringCopy(file_list_entry->default_filename);
+ setString(&file_list_entry->filename, file_list_entry->default_filename);
/* check for config tokens that can be build by base token and suffixes */
for (i=0; suffix_list[i].token != NULL; i++)
if (value != NULL)
{
- file_list_entry->parameter[i] =
- get_parameter_value(suffix_list[i].type, value);
+ setString(&file_list_entry->parameter[i], value);
/* mark config file token as well known from default config */
setTokenValue(setup_file_list, token, known_token_value);
char *token)
{
struct FileInfo *new_list_entry;
- int parameter_array_size = num_suffix_list_entries * sizeof(int);
+ int parameter_array_size = num_suffix_list_entries * sizeof(char *);
#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 base_index, int ext1_index,
+ int ext2_index, int ext3_index,
int artwork_index)
{
struct PropertyMapping *new_list_entry;
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;
}
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);
/* always start with reliable default values */
for (i=0; i<num_file_list_entries; i++)
{
- if (file_list[i].filename != NULL)
- free(file_list[i].filename);
- file_list[i].filename = NULL;
+ setString(&file_list[i].filename, 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];
+ setString(&file_list[i].parameter[j], file_list[i].default_parameter[j]);
+
+ file_list[i].redefined = FALSE;
}
/* free previous dynamic artwork file array */
}
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);
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);
}
#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,
token);
add_property_mapping(property_mapping,
num_property_mapping_entries,
- i, -1, -1,
+ 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,
token);
add_property_mapping(property_mapping,
num_property_mapping_entries,
- i, j, -1,
+ 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);
- add_property_mapping(property_mapping,
- num_property_mapping_entries,
- i, j, k,
- current_summarized_file_list_entry);
- 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;
}
}
}
artwork_info->sizeof_artwork_list_entry);
}
- if (extra_file_list != NULL &&
- options.verbose && IS_PARENT_PROCESS(audio.mixer_pid))
+ if (extra_file_list != NULL && options.verbose && IS_PARENT_PROCESS())
{
boolean dynamic_tokens_found = FALSE;
boolean unknown_tokens_found = FALSE;
#if 0
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++)
LoadArtworkToList(artwork_info, &artwork_info->artwork_list[i],
file_list[i].filename, i);
+#if 0
+ printf("DEBUG: reloading %d dynamic artwork files ...\n",
+ num_dynamic_file_list_entries);
+#endif
+
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
printf("%s: FREEING ARTWORK ...\n",
- IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT");
+ IS_CHILD_PROCESS() ? "CHILD" : "PARENT");
#endif
FreeCustomArtworkList(artwork_info, &artwork_info->artwork_list,
#if 0
printf("%s: FREEING ARTWORK -- DONE\n",
- IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT");
+ IS_CHILD_PROCESS() ? "CHILD" : "PARENT");
#endif
}
counter[counter_nr][1] = Counter();
}
+
+void debug_print_parent_only(char *format, ...)
+{
+ if (!IS_PARENT_PROCESS())
+ return;
+
+ if (format)
+ {
+ va_list ap;
+
+ va_start(ap, format);
+ vprintf(format, ap);
+ va_end(ap);
+
+ printf("\n");
+ }
+}
projects / rocksndiamonds.git / blobdiff