Changeset 601 for trunk/core/gui_osd.c

Timestamp:

11/29/08 18:28:30 (5 years ago)

Author:

phyrephox

Message:

+ added two new "raw exception" options: you can now disable the writing of raw/dng automatically when you enable edgeoverlay or set the modedial of the camera to auto (options are OFF at default)

• small fix in connect4

note: somehow all these checks in raw.c and gui_osd.c make me dizzy (self-inflicted, i know), probably should be done in another way (in the future, of course)

File:

• trunk/core/gui_osd.c (modified) (1 diff)

trunk/core/gui_osd.c

@@ -684 +684 @@
     int x, m=(mode_get()&MODE_SHOOTING_MASK);
     static int b;
-    if ((!((movie_status > 1) && conf.save_raw_in_video   )) && (!((m==MODE_SPORTS) && conf.save_raw_in_sports)) && (!((shooting_get_prop(PROPCASE_DRIVE_MODE)==1) && conf.save_raw_in_burst && !(m==MODE_SPORTS)))  && (!((shooting_get_prop(PROPCASE_DRIVE_MODE)>=2) && conf.save_raw_in_timer)) && (!((shooting_get_prop(PROPCASE_BRACKET_MODE)==1) && conf.save_raw_in_ev_bracketing)) )
+    if ((!((movie_status > 1) && conf.save_raw_in_video   )) && (!((m==MODE_SPORTS) && conf.save_raw_in_sports)) && (!((m==MODE_AUTO) && conf.save_raw_in_auto)) && (!(conf.edge_overlay_enable && conf.save_raw_in_edgeoverlay)) && (!((shooting_get_prop(PROPCASE_DRIVE_MODE)==1) && conf.save_raw_in_burst && !(m==MODE_SPORTS)))  && (!((shooting_get_prop(PROPCASE_DRIVE_MODE)>=2) && conf.save_raw_in_timer)) && (!((shooting_get_prop(PROPCASE_BRACKET_MODE)==1) && conf.save_raw_in_ev_bracketing)) )
     { 
     if (conf.show_remaining_raw)