audlegacy: src/audacious/pluginenum.c comparison

comparison src/audacious/pluginenum.c @ 3232:2453bf125b4f trunk

Automated merge with ssh://hg.atheme.org//hg/audacious

author	William Pitcock <nenolod@atheme-project.org>
date	Fri, 03 Aug 2007 20:39:42 -0500
parents	06baa146fc1d 2619f4c62abe
children	e21930ccd5a8

comparison

equal deleted inserted replaced

-:06baa146fc1d
+:2453bf125b4f
 #include "effect.h"
 #include "general.h"
 #include "input.h"
 #include "output.h"
 #include "visualization.h"
+#include "discovery.h"
 const gchar *plugin_dir_list[] = {
 PLUGINSUBS,
 NULL
 };
 GHashTable *plugin_matrix = NULL;
 GList *lowlevel_list = NULL;
 extern GList *vfs_transports;
 static gint
 inputlist_compare_func(gconstpointer a, gconstpointer b)
 {
 return strcasecmp(ap->description, bp->description);
 else
 return 0;
 }
+static gint
+discoverylist_compare_func(gconstpointer a, gconstpointer b)
+{
+const DiscoveryPlugin *ap = a, *bp = b;
+if(ap->description && bp->description)
+return strcasecmp(ap->description, bp->description);
+else
+return 0;
+}
 static gboolean
 plugin_is_duplicate(const gchar * filename)
 {
 GList *l;
 const gchar *basename = g_basename(filename);
 for (l = vp_data.vis_list; l; l = g_list_next(l))
 if (!strcmp(basename, g_basename(VIS_PLUGIN(l->data)->filename)))
 return TRUE;
 for (l = lowlevel_list; l; l = g_list_next(l))
-if (!strcmp(basename, g_basename(VIS_PLUGIN(l->data)->filename)))
+if (!strcmp(basename, g_basename(LOWLEVEL_PLUGIN(l->data)->filename)))
+return TRUE;
+for (l = dp_data.discovery_list; l; l = g_list_next(l))
+if (!strcmp(basename, g_basename(DISCOVERY_PLUGIN(l->data)->filename)))
 return TRUE;
 return FALSE;
 }
 VisPlugin *p = VIS_PLUGIN(plugin);
 p->disable_plugin = vis_disable_plugin;
 vp_data.vis_list = g_list_append(vp_data.vis_list, p);
 }
+static void
+discovery_plugin_init(Plugin * plugin)
+{
+DiscoveryPlugin *p = DISCOVERY_PLUGIN(plugin);
+dp_data.discovery_list = g_list_append(dp_data.discovery_list, p);
+}
 /*******************************************************************/
 static void
 plugin2_dispose(GModule *module, const gchar *str, ...)
 {
 InputPlugin **ip_iter;
 OutputPlugin **op_iter;
 EffectPlugin **ep_iter;
 GeneralPlugin **gp_iter;
 VisPlugin **vp_iter;
+DiscoveryPlugin **dp_iter;
 if (header->magic != PLUGIN_MAGIC)
 return plugin2_dispose(module, "plugin <%s> discarded, invalid module magic", filename);
 if (header->api_version != __AUDACIOUS_PLUGIN_API__)
 PLUGIN(*vp_iter)->filename = g_strdup(filename);
 g_print("plugin2 '%s' provides VisPlugin <%p>\n", filename, *vp_iter);
 vis_plugin_init(PLUGIN(*vp_iter));
 }
 }
+if (header->dp_list)
+{
+for (dp_iter = header->dp_list; *dp_iter != NULL; dp_iter++)
+{
+PLUGIN(*dp_iter)->filename = g_strdup(filename);
+g_print("plugin2 '%s' provides DiscoveryPlugin <%p>\n", filename, *dp_iter);
+discovery_plugin_init(PLUGIN(*dp_iter));
+}
+}
 }
 void
 plugin2_unload(PluginHeader *header)
 {
 gchar *dir, **disabled;
 GList *node;
 OutputPlugin *op;
 InputPlugin *ip;
 LowlevelPlugin *lp;
+DiscoveryPlugin *dp;
 gint dirsel = 0, i = 0;
 if (!g_module_supported()) {
 report_error("Module loading not supported! Plugins will not be loaded.\n");
 return;
 NULL);
 #ifndef DISABLE_USER_PLUGIN_DIR
 scan_plugins(bmp_paths[BMP_PATH_USER_PLUGIN_DIR]);
 /*
-* This is in a separate loop so if the user puts them in the
+* This is in a separate lo
+* DiscoveryPlugin *dpop so if the user puts them in the
 * wrong dir we'll still get them in the right order (home dir
 * first)                                                - Zinx
 */
 while (plugin_dir_list[dirsel]) {
 dir = g_build_filename(bmp_paths[BMP_PATH_USER_PLUGIN_DIR],
 gp_data.enabled_list = NULL;
 vp_data.vis_list = g_list_sort(vp_data.vis_list, vislist_compare_func);
 vp_data.enabled_list = NULL;
+dp_data.discovery_list = g_list_sort(dp_data.discovery_list, discoverylist_compare_func);
+dp_data.enabled_list = NULL;
 general_enable_from_stringified_list(cfg.enabled_gplugins);
 vis_enable_from_stringified_list(cfg.enabled_vplugins);
 effect_enable_from_stringified_list(cfg.enabled_eplugins);
+discovery_enable_from_stringified_list(cfg.enabled_dplugins);
 g_free(cfg.enabled_gplugins);
 cfg.enabled_gplugins = NULL;
 g_free(cfg.enabled_vplugins);
 cfg.enabled_vplugins = NULL;
 g_free(cfg.enabled_eplugins);
 cfg.enabled_eplugins = NULL;
+g_free(cfg.enabled_dplugins);
+cfg.enabled_dplugins = NULL;
 for (node = op_data.output_list; node; node = g_list_next(node)) {
 op = OUTPUT_PLUGIN(node->data);
 /*
 * Only test basename to avoid problems when changing
 ip = INPUT_PLUGIN(node->data);
 if (ip->init)
 ip->init();
 }
+for (node = dp_data.discovery_list; node; node = g_list_next(node)) {
+dp = DISCOVERY_PLUGIN(node->data);
+if (dp->init)
+dp->init();
+}
 for (node = lowlevel_list; node; node = g_list_next(node)) {
 lp = LOWLEVEL_PLUGIN(node->data);
 if (lp->init)
 lp->init();
 }
 OutputPlugin *op;
 EffectPlugin *ep;
 GeneralPlugin *gp;
 VisPlugin *vp;
 LowlevelPlugin *lp;
+DiscoveryPlugin *dp;
 GList *node;
 g_message("Shutting down plugin system");
 if (playback_get_playing()) {
 {
 g_list_free(vp_data.vis_list);
 vp_data.vis_list = NULL;
 }
+for (node = get_discovery_list(); node; node = g_list_next(node)) {
+dp = DISCOVERY_PLUGIN(node->data);
+if (dp && dp->cleanup) {
+dp->cleanup();
+GDK_THREADS_LEAVE();
+while (g_main_context_iteration(NULL, FALSE));
+GDK_THREADS_ENTER();
+}
+if (dp->handle)
+g_module_close(dp->handle);
+}
+if (dp_data.discovery_list != NULL)
+{
+g_list_free(dp_data.discovery_list);
+dp_data.discovery_list = NULL;
+}
 for (node = lowlevel_list; node; node = g_list_next(node)) {
 lp = LOWLEVEL_PLUGIN(node->data);
 if (lp && lp->cleanup) {
 lp->cleanup();
 GDK_THREADS_LEAVE();

Mercurial > audlegacy

comparison src/audacious/pluginenum.c @ 3232:2453bf125b4f trunk