comparison src/audacious/main.c @ 2709:47ea8eedd428 trunk

[svn] - drop controlsocket code. this probably does not compile yet.

2708:b66e6a928a6e

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

#include "controlsocket.h"
#include "dnd.h"
#include "effect.h"
#include "ui_equalizer.h"
#include "general.h"
#include "genevent.h"

    {
        dump_version();
        exit(EXIT_SUCCESS);
    }

    if (session == -1) {
        if (!remote)
            session = ctrlsocket_get_session_id();
        else
            session = 0;
    }

    if (filenames != NULL)
    {
        gint pos = 0;
        gint i = 0;
        GList *fns = NULL;

    g_random_set_seed(time(NULL));

    bmp_config_load();

    if (options.session != -1 || !ctrlsocket_setup()) {
        handle_cmd_line_options(&options, TRUE);
        exit(EXIT_SUCCESS);
    }

    plugin_system_init();

        GDK_THREADS_LEAVE();

#ifdef USE_DBUS
    init_dbus();
#endif

    ctrlsocket_start();

    handle_cmd_line_options(&options, FALSE);

    if (options.headless != 1)
    {

2709:47ea8eedd428

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

#include "dnd.h"
#include "effect.h"
#include "ui_equalizer.h"
#include "general.h"
#include "genevent.h"

    {
        dump_version();
        exit(EXIT_SUCCESS);
    }

    if (filenames != NULL)
    {
        gint pos = 0;
        gint i = 0;
        GList *fns = NULL;

    g_random_set_seed(time(NULL));

    bmp_config_load();

    if (options.session != -1) {
        handle_cmd_line_options(&options, TRUE);
        exit(EXIT_SUCCESS);
    }

    plugin_system_init();

        GDK_THREADS_LEAVE();

#ifdef USE_DBUS
    init_dbus();
#endif

    handle_cmd_line_options(&options, FALSE);

    if (options.headless != 1)
    {