comparison src/rcfile.c @ 1329:1fc356f629fe

Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
author zas_
date Thu, 26 Feb 2009 20:50:36 +0000
parents 2b78c7198fbf
children 588d96cda850
comparison
equal deleted inserted replaced
1328:fb7708d359ea 1329:1fc356f629fe
369 WRITE_BOOL(*options, fullscreen.clean_flip); 369 WRITE_BOOL(*options, fullscreen.clean_flip);
370 WRITE_BOOL(*options, fullscreen.disable_saver); 370 WRITE_BOOL(*options, fullscreen.disable_saver);
371 WRITE_BOOL(*options, fullscreen.above); 371 WRITE_BOOL(*options, fullscreen.above);
372 372
373 373
374 // WRITE_SUBTITLE("Histogram Options");
375 WRITE_UINT(*options, histogram.last_channel_mode);
376 WRITE_UINT(*options, histogram.last_log_mode);
377
378
379 // WRITE_SUBTITLE("Image Overlay Options"); 374 // WRITE_SUBTITLE("Image Overlay Options");
380 WRITE_UINT(*options, image_overlay.common.state); 375 WRITE_UINT(*options, image_overlay.common.state);
381 WRITE_BOOL(*options, image_overlay.common.show_at_startup); 376 WRITE_BOOL(*options, image_overlay.common.show_at_startup);
382 WRITE_CHAR(*options, image_overlay.common.template_string); 377 WRITE_CHAR(*options, image_overlay.common.template_string);
378 WRITE_INT(*options, image_overlay.common.histogram_channel);
379 WRITE_INT(*options, image_overlay.common.histogram_mode);
383 WRITE_SEPARATOR(); 380 WRITE_SEPARATOR();
384 381
385 // g_string_append_printf(outstr, "# these are relative positions:\n"); 382 // g_string_append_printf(outstr, "# these are relative positions:\n");
386 // g_string_append_printf(outstr, "# x >= 0: |x| pixels from left border\n"); 383 // g_string_append_printf(outstr, "# x >= 0: |x| pixels from left border\n");
387 // g_string_append_printf(outstr, "# x < 0 : |x| pixels from right border\n"); 384 // g_string_append_printf(outstr, "# x < 0 : |x| pixels from right border\n");
672 if (READ_INT(*options, fullscreen.screen)) continue; 669 if (READ_INT(*options, fullscreen.screen)) continue;
673 if (READ_BOOL(*options, fullscreen.clean_flip)) continue; 670 if (READ_BOOL(*options, fullscreen.clean_flip)) continue;
674 if (READ_BOOL(*options, fullscreen.disable_saver)) continue; 671 if (READ_BOOL(*options, fullscreen.disable_saver)) continue;
675 if (READ_BOOL(*options, fullscreen.above)) continue; 672 if (READ_BOOL(*options, fullscreen.above)) continue;
676 673
677 /* histogram */
678 if (READ_UINT(*options, histogram.last_channel_mode)) continue;
679 if (READ_UINT(*options, histogram.last_log_mode)) continue;
680
681 /* image overlay */ 674 /* image overlay */
682 if (READ_UINT(*options, image_overlay.common.state)) continue; 675 if (READ_UINT(*options, image_overlay.common.state)) continue;
683 if (READ_BOOL(*options, image_overlay.common.show_at_startup)) continue; 676 if (READ_BOOL(*options, image_overlay.common.show_at_startup)) continue;
684 if (READ_CHAR(*options, image_overlay.common.template_string)) continue; 677 if (READ_CHAR(*options, image_overlay.common.template_string)) continue;
678 if (READ_INT(*options, image_overlay.common.histogram_channel)) continue;
679 if (READ_INT(*options, image_overlay.common.histogram_mode)) continue;
685 680
686 if (READ_INT(*options, image_overlay.common.x)) continue; 681 if (READ_INT(*options, image_overlay.common.x)) continue;
687 if (READ_INT(*options, image_overlay.common.y)) continue; 682 if (READ_INT(*options, image_overlay.common.y)) continue;
688 683
689 684