Mercurial > audlegacy
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.)
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Fri, 27 Jun 2008 17:57:39 +0300 |
parents | 23e712435e3e |
children | 8a783f826316 |
comparison
equal
deleted
inserted
replaced
4660:c0b6a5de9eb5 | 4661:e4e7999a21bc |
---|---|
318 handle_cmd_line_options(gboolean skip) | 318 handle_cmd_line_options(gboolean skip) |
319 { | 319 { |
320 gchar **filenames = options.filenames; | 320 gchar **filenames = options.filenames; |
321 #ifdef USE_DBUS | 321 #ifdef USE_DBUS |
322 DBusGProxy *session = audacious_get_dbus_proxy(); | 322 DBusGProxy *session = audacious_get_dbus_proxy(); |
323 gboolean is_running = audacious_remote_is_running(session); | 323 gboolean is_running; |
324 | |
325 if (skip) | |
326 is_running = audacious_remote_is_running(session); | |
327 else | |
328 is_running = FALSE; | |
324 #endif | 329 #endif |
325 | 330 |
326 if (options.version) | 331 if (options.version) |
327 { | 332 { |
328 print_version(); | 333 print_version(); |
724 plugin init functions may want to add custom menu entries */ | 729 plugin init functions may want to add custom menu entries */ |
725 ui_manager_init(); | 730 ui_manager_init(); |
726 ui_manager_create_menus(); | 731 ui_manager_create_menus(); |
727 } | 732 } |
728 | 733 |
734 #ifdef USE_DBUS | |
735 init_dbus(); | |
736 #endif | |
737 | |
729 plugin_system_init(); | 738 plugin_system_init(); |
730 playlist_system_init(); | 739 playlist_system_init(); |
731 | 740 |
732 handle_cmd_line_options(FALSE); | 741 handle_cmd_line_options(FALSE); |
733 | 742 |
734 #ifdef USE_DBUS | |
735 init_dbus(); | |
736 #endif | |
737 | 743 |
738 playlist_start_get_info_thread(); | 744 playlist_start_get_info_thread(); |
739 | 745 |
740 output_set_volume((cfg.saved_volume & 0xff00) >> 8, | 746 output_set_volume((cfg.saved_volume & 0xff00) >> 8, |
741 (cfg.saved_volume & 0x00ff)); | 747 (cfg.saved_volume & 0x00ff)); |