Mercurial > audlegacy

comparison src/audacious/main.c @ 2907:21b27e97bfb9 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove pointless starting_up variable. With transition to UIManager actions, the codepaths it was blocking will no longer be executed at startup.
author William Pitcock <nenolod@atheme.org>
date Thu, 28 Jun 2007 01:42:49 -0500
parents 68f3b7ff4333
children 6a474a7954a0
comparison
equal deleted inserted replaced
2906:68f3b7ff4333 2907:21b27e97bfb9
389 389
390 gchar *bmp_paths[BMP_PATH_COUNT] = {}; 390 gchar *bmp_paths[BMP_PATH_COUNT] = {};
391 391
392 GList *dock_window_list = NULL; 392 GList *dock_window_list = NULL;
393 393
394 gboolean starting_up = TRUE;
395
396 /* XXX: case-sensitivity is bad for lazy nenolods. :( -nenolod */ 394 /* XXX: case-sensitivity is bad for lazy nenolods. :( -nenolod */
397 static gchar *pl_candidates[] = { 395 static gchar *pl_candidates[] = {
398 PLUGIN_FILENAME("ALSA"), 396 PLUGIN_FILENAME("ALSA"),
399 PLUGIN_FILENAME("coreaudio"), 397 PLUGIN_FILENAME("coreaudio"),
400 PLUGIN_FILENAME("OSS"), 398 PLUGIN_FILENAME("OSS"),
1261 hint_set_always(cfg.always_on_top); 1259 hint_set_always(cfg.always_on_top);
1262 1260
1263 playlist_start_get_info_thread(); 1261 playlist_start_get_info_thread();
1264 mainwin_attach_idle_func(); 1262 mainwin_attach_idle_func();
1265 1263
1266
1267 starting_up = FALSE;
1268 has_x11_connection = TRUE; 1264 has_x11_connection = TRUE;
1269 1265
1270 if (cfg.resume_playback_on_startup) 1266 if (cfg.resume_playback_on_startup)
1271 { 1267 {
1272 if (cfg.resume_playback_on_startup_time != -1 && 1268 if (cfg.resume_playback_on_startup_time != -1 &&
1307 GMainLoop *loop; 1303 GMainLoop *loop;
1308 1304
1309 mainwin_set_info_text(); 1305 mainwin_set_info_text();
1310 playlist_start_get_info_thread(); 1306 playlist_start_get_info_thread();
1311 1307
1312 starting_up = FALSE;
1313
1314 loop = g_main_loop_new(NULL, TRUE); 1308 loop = g_main_loop_new(NULL, TRUE);
1315 g_timeout_add(10, aud_headless_iteration, NULL); 1309 g_timeout_add(10, aud_headless_iteration, NULL);
1316 g_main_loop_run(loop); 1310 g_main_loop_run(loop);
1317 1311
1318 return EXIT_SUCCESS; 1312 return EXIT_SUCCESS;