comparison src/audacious/main.c @ 2733:cf080b11c3fa trunk

[svn] Implemented more of the stubs in audctrl; Added more methods to objects.xml with implementations in dbus.c. I'm still trying to get plugins working with libaudclient.

2732:2227e8955391

handle_cmd_line_options(BmpCmdLineOpt * options,
                        gboolean remote)
{
    gchar **filenames = options->filenames;
#ifdef HAVE_DBUS
    DBusGProxy *session = audacious_get_dbus_proxy();
#endif

    if (options->version)
    {
        dump_version();

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

    plugin_system_init();

    /* Initialize the playlist system. */
    playlist_init();

     */
    mainwin_setup_menus();

    if (options.headless != 1)
        GDK_THREADS_LEAVE();

#ifdef USE_DBUS
    init_dbus();
#endif

    handle_cmd_line_options(&options, FALSE);

    if (options.headless != 1)
    {

        
        gtk_main();

        GDK_THREADS_LEAVE();

#ifdef USE_DBUS
        free_dbus();
#endif

        g_cond_free(cond_scan);
        g_mutex_free(mutex_scan);

        return EXIT_SUCCESS;
    }

        loop = g_main_loop_new(NULL, TRUE);
        g_timeout_add(10, aud_headless_iteration, NULL);
        g_main_loop_run(loop);

#ifdef USE_DBUS
        free_dbus();
#endif

        return EXIT_SUCCESS;
    }
}

2733:cf080b11c3fa

handle_cmd_line_options(BmpCmdLineOpt * options,
                        gboolean remote)
{
    gchar **filenames = options->filenames;
#ifdef HAVE_DBUS
    // DBusGProxy *session = audacious_get_dbus_proxy();
#endif

    if (options->version)
    {
        dump_version();

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

#ifdef USE_DBUS
    init_dbus();
#endif

    plugin_system_init();

    /* Initialize the playlist system. */
    playlist_init();

     */
    mainwin_setup_menus();

    if (options.headless != 1)
        GDK_THREADS_LEAVE();

    handle_cmd_line_options(&options, FALSE);

    if (options.headless != 1)
    {

        
        gtk_main();

        GDK_THREADS_LEAVE();

        g_cond_free(cond_scan);
        g_mutex_free(mutex_scan);

        return EXIT_SUCCESS;
    }

        loop = g_main_loop_new(NULL, TRUE);
        g_timeout_add(10, aud_headless_iteration, NULL);
        g_main_loop_run(loop);

        return EXIT_SUCCESS;
    }
}