comparison src/audacious/main.c @ 4661:e4e7999a21bc

Move D-Bus initialization before plugin system and playlist initialization. (The other changes in this changeset are to remedy the problem arising from the move, which resulted in annoying pause during startup due to D-Bus being initialized when assumed not to be.)

4660:c0b6a5de9eb5

handle_cmd_line_options(gboolean skip)
{
    gchar **filenames = options.filenames;
#ifdef USE_DBUS
    DBusGProxy *session = audacious_get_dbus_proxy();
    gboolean is_running = audacious_remote_is_running(session);
#endif

    if (options.version)
    {
        print_version();

           plugin init functions may want to add custom menu entries */
        ui_manager_init();
        ui_manager_create_menus();
    }

    plugin_system_init();
    playlist_system_init();

    handle_cmd_line_options(FALSE);

#ifdef USE_DBUS
    init_dbus();
#endif

    playlist_start_get_info_thread();

    output_set_volume((cfg.saved_volume & 0xff00) >> 8,
                      (cfg.saved_volume & 0x00ff));

4661:e4e7999a21bc

handle_cmd_line_options(gboolean skip)
{
    gchar **filenames = options.filenames;
#ifdef USE_DBUS
    DBusGProxy *session = audacious_get_dbus_proxy();
    gboolean is_running;

    if (skip)
      is_running = audacious_remote_is_running(session);
    else
      is_running = FALSE;
#endif

    if (options.version)
    {
        print_version();

           plugin init functions may want to add custom menu entries */
        ui_manager_init();
        ui_manager_create_menus();
    }

#ifdef USE_DBUS
    init_dbus();
#endif

    plugin_system_init();
    playlist_system_init();

    handle_cmd_line_options(FALSE);


    playlist_start_get_info_thread();

    output_set_volume((cfg.saved_volume & 0xff00) >> 8,
                      (cfg.saved_volume & 0x00ff));