Mercurial > audlegacy

comparison src/audacious/main.c @ 2506:630910fd140f trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - changed plugin directory to ~/.local/share/audacious/Plugins (seems more logical to me) - updated migrate_config.sh to reflect the change - reindented a bit
author mf0102
date Mon, 12 Feb 2007 08:13:53 -0800
parents 5fcdef6e3754
children 3a1fc6f7c187
comparison
equal deleted inserted replaced
2505:87c53f0e9e0d 2506:630910fd140f
502 502
503 bmp_paths[BMP_PATH_USER_DIR] = 503 bmp_paths[BMP_PATH_USER_DIR] =
504 g_build_filename(xdg_config_home, "audacious", NULL); 504 g_build_filename(xdg_config_home, "audacious", NULL);
505 bmp_paths[BMP_PATH_USER_SKIN_DIR] = 505 bmp_paths[BMP_PATH_USER_SKIN_DIR] =
506 g_build_filename(xdg_data_home, "audacious", "Skins", NULL); 506 g_build_filename(xdg_data_home, "audacious", "Skins", NULL);
507 // FIXME: Think of something better for Plugins, XDG is missing this
508 bmp_paths[BMP_PATH_USER_PLUGIN_DIR] = 507 bmp_paths[BMP_PATH_USER_PLUGIN_DIR] =
509 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "Plugins", NULL); 508 g_build_filename(xdg_data_home, "audacious", "Plugins", NULL);
509
510 bmp_paths[BMP_PATH_SKIN_THUMB_DIR] = 510 bmp_paths[BMP_PATH_SKIN_THUMB_DIR] =
511 g_build_filename(xdg_cache_home, "audacious", "thumbs", NULL); 511 g_build_filename(xdg_cache_home, "audacious", "thumbs", NULL);
512 512
513 bmp_paths[BMP_PATH_CONFIG_FILE] = 513 bmp_paths[BMP_PATH_CONFIG_FILE] =
514 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "config", NULL); 514 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "config", NULL);
525 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "accels", NULL); 525 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "accels", NULL);
526 bmp_paths[BMP_PATH_LOG_FILE] = 526 bmp_paths[BMP_PATH_LOG_FILE] =
527 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "log", NULL); 527 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "log", NULL);
528 528
529 bmp_paths[BMP_PATH_GTKRC_FILE] = 529 bmp_paths[BMP_PATH_GTKRC_FILE] =
530 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "gtkrc", NULL); 530 g_build_filename(bmp_paths[BMP_PATH_USER_DIR], "gtkrc", NULL);
531 531
532 g_free(xdg_config_home); 532 g_free(xdg_config_home);
533 g_free(xdg_data_home); 533 g_free(xdg_data_home);
534 g_free(xdg_cache_home); 534 g_free(xdg_cache_home);
535 535
975 } 975 }
976 976
977 static gboolean 977 static gboolean
978 aud_headless_iteration(gpointer unused) 978 aud_headless_iteration(gpointer unused)
979 { 979 {
980 audcore_generic_events(); 980 audcore_generic_events();
981 free_vis_data(); 981 free_vis_data();
982 return TRUE; 982 return TRUE;
983 } 983 }
984 984
985 gint 985 gint
986 main(gint argc, gchar ** argv) 986 main(gint argc, gchar ** argv)
987 { 987 {
1187 return EXIT_SUCCESS; 1187 return EXIT_SUCCESS;
1188 } 1188 }
1189 // if we are running headless 1189 // if we are running headless
1190 else 1190 else
1191 { 1191 {
1192 GMainLoop *loop; 1192 GMainLoop *loop;
1193 1193
1194 mainwin_set_info_text(); 1194 mainwin_set_info_text();
1195 playlist_start_get_info_thread(); 1195 playlist_start_get_info_thread();
1196 1196
1197 starting_up = FALSE; 1197 starting_up = FALSE;
1198 1198
1199 loop = g_main_loop_new(NULL, TRUE); 1199 loop = g_main_loop_new(NULL, TRUE);
1200 g_timeout_add(10, aud_headless_iteration, NULL); 1200 g_timeout_add(10, aud_headless_iteration, NULL);
1201 g_main_loop_run(loop); 1201 g_main_loop_run(loop);
1202 1202
1203 return EXIT_SUCCESS; 1203 return EXIT_SUCCESS;
1204 } 1204 }
1205 } 1205 }