Changeset 601

Timestamp:

11/29/08 18:28:30 (4 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)

Location:

trunk

Files:

• CHDK/LANG/english.lng (modified) (1 diff)
• CHDK/LANG/german.lng (modified) (1 diff)
• core/conf.c (modified) (1 diff)
• core/gui.c (modified) (1 diff)
• core/gui_4wins.c (modified) (2 diffs)
• core/gui_lang.c (modified) (1 diff)
• core/gui_lang.h (modified) (1 diff)
• core/gui_osd.c (modified) (1 diff)
• core/raw.c (modified) (1 diff)
• include/conf.h (modified) (1 diff)

trunk/CHDK/LANG/english.lng

@@ -574 +574 @@
 433 "I beat you"
 434 "The game ended a draw"
+435 "Disable Raw @ EdgerOverlay"
+436 "Disable Raw @ Auto Mode"

trunk/CHDK/LANG/german.lng

@@ -612 +612 @@
 433 "Ich habe gewonnen :-)"
 434 "Unentschieden"
+
+435 "RAW im EdgeOverlayModus aus"
+436 "RAW im Auto Modus aus"

trunk/core/conf.c

@@ -391 +391 @@
     CONF_INFO(228, conf.raw_timer,     CONF_DEF_VALUE, i:0, NULL),
     CONF_INFO(229, conf.platformid,     CONF_DEF_VALUE, i:(int)PLATFORMID, NULL),
+    CONF_INFO(230, conf.save_raw_in_edgeoverlay,     CONF_DEF_VALUE, i:0, NULL),
+    CONF_INFO(231, conf.save_raw_in_auto,     CONF_DEF_VALUE, i:0, NULL),
     };
 #define CONF_NUM (sizeof(conf_info)/sizeof(conf_info[0]))

trunk/core/gui.c

@@ -737 +737 @@
     {0x5c,LANG_MENU_RAW_SAVE_IN_BURST,                MENUITEM_BOOL,      &conf.save_raw_in_burst },
     {0x5c,LANG_MENU_RAW_SAVE_IN_TIMER,                MENUITEM_BOOL,      &conf.save_raw_in_timer },
-
+    {0x5c,LANG_MENU_RAW_SAVE_IN_EDGEOVERLAY,          MENUITEM_BOOL,      &conf.save_raw_in_edgeoverlay },
+    {0x5c,LANG_MENU_RAW_SAVE_IN_AUTO,                 MENUITEM_BOOL,      &conf.save_raw_in_auto },
                 #if CAM_BRACKETING
         {0x5c,LANG_MENU_RAW_SAVE_IN_EV_BRACKETING,                MENUITEM_BOOL,      &conf.save_raw_in_ev_bracketing },

trunk/core/gui_4wins.c

@@ -239 +239 @@
                 draw_txt_string(30, 12, lang_str(LANG_CONNECT4_HUMAN), MAKE_COLOR(BG_COLOR, COLOR_WHITE));
         else
-                draw_txt_string(30, 12, lang_str(PLATFORM), MAKE_COLOR(BG_COLOR, COLOR_WHITE));
+                draw_txt_string(30, 12, PLATFORM, MAKE_COLOR(BG_COLOR, COLOR_WHITE));
 }
 //-------------------------------------------------------------------
@@ -325 +325 @@
                 draw_txt_string(30, 12, lang_str(LANG_CONNECT4_HUMAN), MAKE_COLOR(BG_COLOR, COLOR_WHITE));
         else
-                draw_txt_string(30, 12, lang_str(PLATFORM), MAKE_COLOR(BG_COLOR, COLOR_WHITE));
+                draw_txt_string(30, 12, PLATFORM, MAKE_COLOR(BG_COLOR, COLOR_WHITE));
 
         if(cur_player==2&&!mode_rival) set();

trunk/core/gui_lang.c

@@ -555 +555 @@
 "433 \"I beat you\"\n"
 "434 \"The game ended a draw\"\n"
+"435 \"Disable Raw @ Edgeoverlay\"\n"
+"436 \"Disable RAW @ Auto\"\n"
 ;
 

trunk/core/gui_lang.h

@@ -544 +544 @@
 #define LANG_CONNECT4_CAM_WIN              433
 #define LANG_CONNECT4_DRAW                 434
+
+#define LANG_MENU_RAW_SAVE_IN_EDGEOVERLAY  435
+#define LANG_MENU_RAW_SAVE_IN_AUTO         436
 //-------------------------------------------------------------------
 
-#define GUI_LANG_ITEMS                  434
+#define GUI_LANG_ITEMS                  436
 
 //-------------------------------------------------------------------

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) 

trunk/core/raw.c

@@ -126 +126 @@
     state_shooting_progress = SHOOTING_PROGRESS_PROCESSING;
 
-     if (conf.save_raw && (!((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 (conf.save_raw && (!((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)) ) {
         long v;
 int timer; char txt[30];

trunk/include/conf.h

@@ -16 +16 @@
     int save_raw_in_sports;
     int save_raw_in_burst;
+    int save_raw_in_edgeoverlay;
+    int save_raw_in_auto;
     int save_raw_in_ev_bracketing;
     int save_raw_in_timer;