while (node)
{
printf("['%s' (%d)]\n", node->key,
- ((struct ArtworkListNodeInfo *)node->content)->num_references);
+ ((struct ListNodeInfo *)node->content)->num_references);
node = node->next;
}
/* functions for loading artwork configuration information */
/* ========================================================================= */
+struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list,
+ char *suffix_list[],
+ int num_file_list_entries)
+{
+ struct FileInfo *file_list;
+ int num_suffix_list_entries = 0;
+ int list_pos = -1;
+ int i, j;
+
+ file_list = checked_calloc(num_file_list_entries * sizeof(struct FileInfo));
+
+ for (i=0; suffix_list[i] != NULL; i++)
+ num_suffix_list_entries++;
+
+ if (num_suffix_list_entries > 0)
+ {
+ for (i=0; i<num_file_list_entries; i++)
+ {
+ file_list[i].default_parameter =
+ checked_calloc(num_suffix_list_entries * sizeof(int));
+ file_list[i].parameter =
+ checked_calloc(num_suffix_list_entries * sizeof(int));
+
+ for (j=0; j<num_suffix_list_entries; j++)
+ {
+ file_list[i].default_parameter[j] = -1;
+ file_list[i].parameter[j] = -1;
+ }
+ }
+ }
+
+ for (i=0; config_list[i].token != NULL; i++)
+ {
+ int len_config_token = strlen(config_list[i].token);
+ boolean is_file_entry = TRUE;
+
+ for (j=0; suffix_list[j] != NULL; j++)
+ {
+ int len_suffix = strlen(suffix_list[j]);
+
+ if (len_suffix < len_config_token &&
+ strcmp(&config_list[i].token[len_config_token - len_suffix],
+ suffix_list[j]) == 0)
+ {
+ file_list[list_pos].default_parameter[j] = atoi(config_list[i].value);
+
+ is_file_entry = FALSE;
+ break;
+ }
+ }
+
+ if (is_file_entry)
+ {
+ list_pos++;
+
+ if (list_pos >= num_file_list_entries)
+ Error(ERR_EXIT, "inconsistant config list information -- please fix");
+
+ file_list[list_pos].token = config_list[i].token;
+ file_list[list_pos].default_filename = config_list[i].value;
+ }
+ }
+
+ if (list_pos != num_file_list_entries - 1)
+ Error(ERR_EXIT, "inconsistant config list information -- please fix");
+
+ return file_list;
+}
+
static void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
{
- int num_list_entries = artwork_info->num_list_entries;
- struct ArtworkConfigInfo *config_list = artwork_info->config_list;
+ int num_file_list_entries = artwork_info->num_file_list_entries;
+ int num_suffix_list_entries = artwork_info->num_suffix_list_entries;
+ struct FileInfo *file_list = artwork_info->file_list;
char *filename = getCustomArtworkConfigFilename(artwork_info->type);
struct SetupFileList *setup_file_list;
- int i;
+ int i, j;
#if 0
printf("GOT CUSTOM ARTWORK CONFIG FILE '%s'\n", filename);
#endif
/* always start with reliable default values */
- for (i=0; i<num_list_entries; i++)
- config_list[i].filename = NULL;
+ for (i=0; i<num_file_list_entries; i++)
+ {
+ file_list[i].filename = NULL;
+
+ for (j=0; j<num_suffix_list_entries; j++)
+ {
+ file_list[i].parameter[j] = file_list[i].default_parameter[j];
+ }
+ }
if (filename == NULL)
return;
if ((setup_file_list = loadSetupFileList(filename)))
{
- for (i=0; i<num_list_entries; i++)
- config_list[i].filename =
- getStringCopy(getTokenValue(setup_file_list, config_list[i].token));
+ for (i=0; i<num_file_list_entries; i++)
+ file_list[i].filename =
+ getStringCopy(getTokenValue(setup_file_list, file_list[i].token));
freeSetupFileList(setup_file_list);
#if 0
- for (i=0; i<num_list_entries; i++)
+ for (i=0; i<num_file_list_entries; i++)
{
- printf("'%s' ", config_list[i].token);
- if (config_list[i].filename)
- printf("-> '%s'\n", config_list[i].filename);
+ printf("'%s' ", file_list[i].token);
+ if (file_list[i].filename)
+ printf("-> '%s'\n", file_list[i].filename);
else
- printf("-> UNDEFINED [-> '%s']\n", config_list[i].default_filename);
+ printf("-> UNDEFINED [-> '%s']\n", file_list[i].default_filename);
}
#endif
}
}
-void deleteArtworkListEntry(struct ArtworkListInfo *artwork_info,
- struct ArtworkListNodeInfo **listnode)
+static void deleteArtworkListEntry(struct ArtworkListInfo *artwork_info,
+ struct ListNodeInfo **listnode)
{
if (*listnode)
{
printf("[deleting artwork '%s']\n", filename);
#endif
- deleteNodeFromList(&artwork_info->file_list, filename,
+ deleteNodeFromList(&artwork_info->content_list, filename,
artwork_info->free_artwork);
}
}
static void replaceArtworkListEntry(struct ArtworkListInfo *artwork_info,
- struct ArtworkListNodeInfo **listnode,
+ struct ListNodeInfo **listnode,
char *filename)
{
ListNode *node;
deleteArtworkListEntry(artwork_info, listnode);
/* check if the new artwork file already exists in the list of artworks */
- if ((node = getNodeFromKey(artwork_info->file_list, filename)) != NULL)
+ if ((node = getNodeFromKey(artwork_info->content_list, filename)) != NULL)
{
#if 0
printf("[artwork '%s' already exists (other list entry)]\n", filename);
#endif
- *listnode = (struct ArtworkListNodeInfo *)node->content;
+ *listnode = (struct ListNodeInfo *)node->content;
(*listnode)->num_references++;
}
else if ((*listnode = artwork_info->load_artwork(filename)) != NULL)
{
(*listnode)->num_references = 1;
- addNodeToList(&artwork_info->file_list, (*listnode)->source_filename,
+ addNodeToList(&artwork_info->content_list, (*listnode)->source_filename,
*listnode);
}
}
static void LoadCustomArtwork(struct ArtworkListInfo *artwork_info,
- struct ArtworkListNodeInfo **listnode,
+ struct ListNodeInfo **listnode,
char *basename)
{
char *filename = getCustomArtworkFilename(basename, artwork_info->type);
replaceArtworkListEntry(artwork_info, listnode, filename);
}
-void LoadArtworkToList(struct ArtworkListInfo *artwork_info,
- char *basename, int list_pos)
+static void LoadArtworkToList(struct ArtworkListInfo *artwork_info,
+ char *basename, int list_pos)
{
if (artwork_info->artwork_list == NULL ||
- list_pos >= artwork_info->num_list_entries)
+ list_pos >= artwork_info->num_file_list_entries)
return;
#if 0
printf("loading artwork '%s' ... [%d]\n",
- basename, getNumNodes(artwork_info->file_list));
+ basename, getNumNodes(artwork_info->content_list));
#endif
LoadCustomArtwork(artwork_info, &artwork_info->artwork_list[list_pos],
#if 0
printf("loading artwork '%s' done [%d]\n",
- basename, getNumNodes(artwork_info->file_list));
+ basename, getNumNodes(artwork_info->content_list));
#endif
}
-void ReloadCustomArtworkFiles(struct ArtworkListInfo *artwork_info)
+void ReloadCustomArtworkList(struct ArtworkListInfo *artwork_info)
{
static struct
{
{ "Loading music:", TRUE }
};
- int num_list_entries = artwork_info->num_list_entries;
- struct ArtworkConfigInfo *config_list = artwork_info->config_list;
+ int num_file_list_entries = artwork_info->num_file_list_entries;
+ struct FileInfo *file_list = artwork_info->file_list;
int i;
-#if 0
- Delay(5000);
-#endif
-
-#if 0
- printf("DEBUG: reloading sounds '%s' ...\n",artwork.snd_current_identifier);
-#endif
-
LoadArtworkConfig(artwork_info);
if (draw_init[artwork_info->type].do_it)
DrawInitText(draw_init[artwork_info->type].text, 120, FC_GREEN);
#if 0
- printf("DEBUG: reloading %d sounds ...\n", num_list_entries);
+ printf("DEBUG: reloading %d sounds ...\n", num_file_list_entries);
#endif
- for(i=0; i<num_list_entries; i++)
+ for(i=0; i<num_file_list_entries; i++)
{
if (draw_init[artwork_info->type].do_it)
- DrawInitText(config_list[i].token, 150, FC_YELLOW);
+ DrawInitText(file_list[i].token, 150, FC_YELLOW);
- if (config_list[i].filename)
- LoadArtworkToList(artwork_info, config_list[i].filename, i);
+ if (file_list[i].filename)
+ LoadArtworkToList(artwork_info, file_list[i].filename, i);
else
- LoadArtworkToList(artwork_info, config_list[i].default_filename, i);
+ LoadArtworkToList(artwork_info, file_list[i].default_filename, i);
}
draw_init[artwork_info->type].do_it = FALSE;
/*
- printf("list size == %d\n", getNumNodes(artwork_info->file_list));
+ printf("list size == %d\n", getNumNodes(artwork_info->content_list));
*/
#if 0
- dumpList(artwork_info->file_list);
+ dumpList(artwork_info->content_list);
#endif
}
+void FreeCustomArtworkList(struct ArtworkListInfo *artwork_info)
+{
+ int i;
+
+ if (artwork_info->artwork_list == NULL)
+ return;
+
+#if 0
+ printf("%s: FREEING ARTWORK ...\n",
+ 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]);
+
+#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;
+}
+
/* ========================================================================= */
/* functions only needed for non-Unix (non-command-line) systems */
projects / rocksndiamonds.git / blobdiff