comparison src/audacious/pluginenum.c @ 2763:637359219e10 trunk

[svn] Reverted the modifications that were initially needed for DBus support.

2762:c89362b15525

#include <glib.h>
#include <gmodule.h>
#include <glib/gprintf.h>
#include <string.h>


#ifdef USE_DBUS
#include "dbus.h"
#include "dbus-service.h"
#endif

#include "main.h"
#include "ui_main.h"
#include "playback.h"
#include "playlist.h"
#include "strings.h"

    NULL
};

GHashTable *plugin_matrix = NULL;
GList *lowlevel_list = NULL;

#ifdef USE_DBUS
static DBusGProxy *dbus_proxy = NULL;
static DBusGConnection *connection = NULL;
#endif

extern GList *vfs_transports;

static gint
inputlist_compare_func(gconstpointer a, gconstpointer b)

static void
general_plugin_init(Plugin * plugin)
{
    GeneralPlugin *p = GENERAL_PLUGIN(plugin);
    p->xmms_session = -1;
#ifdef USE_DBUS
    p->dbus_proxy = dbus_proxy;
#endif
    gp_data.general_list = g_list_append(gp_data.general_list, p);
}

static void
vis_plugin_init(Plugin * plugin)
{
    VisPlugin *p = VIS_PLUGIN(plugin);
    p->xmms_session = -1;
#ifdef USE_DBUS
    p->dbus_proxy = dbus_proxy;
#endif
    p->disable_plugin = vis_disable_plugin;
    vp_data.vis_list = g_list_append(vp_data.vis_list, p);
}

static void

    GList *node;
    OutputPlugin *op;
    InputPlugin *ip;
    LowlevelPlugin *lp;
    gint dirsel = 0, i = 0;

#ifdef USE_DBUS
	GError *error = NULL;
	connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);

	if (connection == NULL)
	{
		g_printerr("audtool: D-Bus error: %s", error->message);
		g_error_free(error);

		exit(EXIT_FAILURE);
	}

	dbus_proxy = dbus_g_proxy_new_for_name(connection, AUDACIOUS_DBUS_SERVICE,
                                           AUDACIOUS_DBUS_PATH,
                                           AUDACIOUS_DBUS_INTERFACE);
#endif

    if (!g_module_supported()) {
        report_error("Module loading not supported! Plugins will not be loaded.\n");
        return;
    }

2763:637359219e10

#include <glib.h>
#include <gmodule.h>
#include <glib/gprintf.h>
#include <string.h>

#include "main.h"
#include "ui_main.h"
#include "playback.h"
#include "playlist.h"
#include "strings.h"

    NULL
};

GHashTable *plugin_matrix = NULL;
GList *lowlevel_list = NULL;

extern GList *vfs_transports;

static gint
inputlist_compare_func(gconstpointer a, gconstpointer b)

static void
general_plugin_init(Plugin * plugin)
{
    GeneralPlugin *p = GENERAL_PLUGIN(plugin);
    p->xmms_session = -1;
    gp_data.general_list = g_list_append(gp_data.general_list, p);
}

static void
vis_plugin_init(Plugin * plugin)
{
    VisPlugin *p = VIS_PLUGIN(plugin);
    p->xmms_session = -1;
    p->disable_plugin = vis_disable_plugin;
    vp_data.vis_list = g_list_append(vp_data.vis_list, p);
}

static void

    GList *node;
    OutputPlugin *op;
    InputPlugin *ip;
    LowlevelPlugin *lp;
    gint dirsel = 0, i = 0;

    if (!g_module_supported()) {
        report_error("Module loading not supported! Plugins will not be loaded.\n");
        return;
    }