audlegacy: src/audacious/main.c comparison

comparison src/audacious/main.c @ 4355:3aeb45aeeaed

fixed headless mode; minor cleanups

author	mf0102 <0102@gmx.at>
date	Sun, 16 Mar 2008 23:18:35 +0100
parents	ac1f6d211223
children	87cb9d3402d4

comparison

equal deleted inserted replaced

-:168479ee6aab
+:3aeb45aeeaed
 gboolean headless;
 gboolean no_log;
 gboolean enqueue_to_temp;
 gboolean version;
 gchar *previous_session_id;
-	gboolean macpack;
+gboolean macpack;
 };
 typedef struct _AudCmdLineOpt AudCmdLineOpt;
 AudCmdLineOpt options;
 rowstride = gdk_pixbuf_get_rowstride(pixbuf);
 has_alpha = gdk_pixbuf_get_has_alpha(pixbuf);
 /* create the colourspace for the CGImage. */
 colorspace = CGColorSpaceCreateDeviceRGB();
-data_provider = CGDataProviderCreateWithData(NULL, data, pixbuf_height * rowstride, NULL);
+data_provider = CGDataProviderCreateWithData(NULL, data,
+pixbuf_height * rowstride,
+NULL);
 image = CGImageCreate(pixbuf_width, pixbuf_height, 8,
-	has_alpha ? 32 : 24, rowstride, colorspace,
+has_alpha ? 32 : 24, rowstride, colorspace,
-	has_alpha ? kCGImageAlphaLast : 0,
+has_alpha ? kCGImageAlphaLast : 0,
-	data_provider, NULL, FALSE,
+data_provider, NULL, FALSE,
-	kCGRenderingIntentDefault);
+kCGRenderingIntentDefault);
 /* release the colourspace and data provider, we have what we want. */
 CGDataProviderRelease(data_provider);
 CGColorSpaceRelease(colorspace);
 {"show-main-window", 'm', 0, G_OPTION_ARG_NONE, &options.mainwin, N_("Display the main window"), NULL},
 {"activate", 'a', 0, G_OPTION_ARG_NONE, &options.activate, N_("Display all open Audacious windows"), NULL},
 {"headless", 'H', 0, G_OPTION_ARG_NONE, &options.headless, N_("Enable headless operation"), NULL},
 {"no-log", 'N', 0, G_OPTION_ARG_NONE, &options.no_log, N_("Print all errors and warnings to stdout"), NULL},
 {"version", 'v', 0, G_OPTION_ARG_NONE, &options.version, N_("Show version and builtin features"), NULL},
-	#ifdef GDK_WINDOWING_QUARTZ
+#ifdef GDK_WINDOWING_QUARTZ
-	{"macpack", 'n', 0, G_OPTION_ARG_NONE, &options.macpack, N_("Used in macpacking"), NULL}, /* Make this hidden */
+{"macpack", 'n', 0, G_OPTION_ARG_NONE, &options.macpack, N_("Used in macpacking"), NULL}, /* Make this hidden */
-	#endif
+#endif
 {G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &options.filenames, N_("FILE..."), NULL},
 {NULL},
 };
 static gboolean
 for (i = 0; filenames[i] != NULL; i++)
 {
 gchar *filename;
 gchar *current_dir = g_get_current_dir();
-		if (!strstr(filenames[i], "://"))
+if (!strstr(filenames[i], "://"))
-		{
+{
 if (filenames[i][0] == '/')
-	               filename = g_strdup_printf("file:///%s", filenames[i]);
+filename = g_strdup_printf("file:///%s", filenames[i]);
 else
-	               filename = g_strdup_printf("file:///%s/%s", current_dir, filenames[i]);
+filename = g_strdup_printf("file:///%s/%s", current_dir,
-		}
+filenames[i]);
+}
 else
 filename = g_strdup(filenames[i]);
 fns = g_list_prepend(fns, filename);
 for (i = 0; filenames[i] != NULL; i++)
 {
 gchar *filename;
 gchar *current_dir = g_get_current_dir();
-		if (!strstr(filenames[i], "://"))
+if (!strstr(filenames[i], "://"))
-		{
+{
 if (filenames[i][0] == '/')
-	               filename = g_strdup_printf("file:///%s", filenames[i]);
+filename = g_strdup_printf("file:///%s", filenames[i]);
 else
-	               filename = g_strdup_printf("file:///%s/%s", current_dir, filenames[i]);
+filename = g_strdup_printf("file:///%s/%s", current_dir,
-		}
+filenames[i]);
+}
 else
 filename = g_strdup(filenames[i]);
 fns = g_list_prepend(fns, filename);
 cond_scan = g_cond_new();
 mutex_scan = g_mutex_new();
 gtk_rc_add_default_file(bmp_paths[BMP_PATH_GTKRC_FILE]);
-gtk_init_check_ok = gtk_init_check(&argc, &argv);
 memset(&options, '\0', sizeof(AudCmdLineOpt));
 options.session = -1;
 context = g_option_context_new(_("- play multimedia files"));
 g_option_context_add_main_entries(context, cmd_entries, PACKAGE_NAME);
-g_option_context_add_group(context, gtk_get_option_group(TRUE));
+g_option_context_add_group(context, gtk_get_option_group(FALSE));
 g_option_context_add_group(context, egg_sm_client_get_option_group());
 g_option_context_parse(context, &argc, &argv, &error);
+gtk_init_check_ok = gtk_init_check(&argc, &argv);
 if (error != NULL)
 {
-if(error->message)
+/* checking for MacOS X -psn_0_* errors*/
-{   /* checking for MacOS X -psn_0_* errors*/
+if(error->message && !g_strrstr(error->message,"-psn_0_")) {
-char* s = g_strrstr(error->message,"-psn_0_");
+g_printerr(_("%s: %s\nTry `%s --help' for more information.\n"),
-if(!s)
+argv[0], error->message, argv[0]);
-{
+exit(EXIT_FAILURE);
-g_printerr(_("%s: %s\nTry `%s --help' for more information.\n"),
-argv[0], error->message, argv[0]);
-exit(EXIT_FAILURE);
-}
 }
-}
+if (!gtk_init_check_ok && argc < 2) {
-if (!gtk_init_check_ok) {
-if (argc < 2) {
 /* GTK check failed, and no arguments passed to indicate
 that user is intending to only remote control a running
 session */
 g_printerr(_("%s: Unable to open display, exiting.\n"), argv[0]);
 exit(EXIT_FAILURE);
 }
 handle_cmd_line_options(&options, TRUE);
 /* we could be running headless, so GTK probably wont matter */
-if (options.headless != 1)
+if (options.headless == FALSE)
 exit(EXIT_SUCCESS);
 }
 if (options.no_log == FALSE)
 bmp_setup_logger();
 bmp_config_load();
 mowgli_init();
-if (options.headless != 1)
+if (options.headless == FALSE)
 {
 ui_main_check_theme_engine();
 /* register icons in stock
 NOTE: should be called before UIManager */
 #ifdef USE_DBUS
 init_dbus();
 #endif
-if (options.headless != 1)
+if (options.headless == FALSE)
 {
 bmp_set_default_icon();
 #ifdef GDK_WINDOWING_QUARTZ
 set_dock_icon();
 #endif
 * input plugins are setup'ed
 * but not if we're running headless --nenolod
 */
 mainwin_setup_menus();
-if (options.headless != 1)
+if (options.headless == FALSE)
 {
 ui_main_set_initial_volume();
 /* FIXME: delayed, because it deals directly with the plugin
 * interface to set menu items */

Mercurial > audlegacy

comparison src/audacious/main.c @ 4355:3aeb45aeeaed