Changeset 1932

Timestamp:

06/23/12 05:39:21 (12 months ago)

Author:

philmoz

Message:

Fix edge overlay state display (broken when edge overlay converted to module).

Location:

trunk

Files:

• core/edgeoverlay.c (modified) (2 diffs)
• core/edgeoverlay.h (modified) (1 diff)
• core/gui_osd.c (modified) (1 diff)
• include/conf.h (modified) (1 diff)

trunk/core/edgeoverlay.c

@@ -662 +662 @@
     case EDGE_LIVE:
     {
-        edge_state_draw=0;
+        conf.edge_state_draw=0;
         // In this state we assume no edge overlay in memory,
         // but we are ready to create one if the user presses wishes so.
@@ -699 +699 @@
     case EDGE_FROZEN:
     {
-        edge_state_draw=1;
+        conf.edge_state_draw=1;
         // We have a stored edge overlay in memory and we display
         // it on screen in 'frozen' mode.

trunk/core/edgeoverlay.h

@@ -16 +16 @@
 };
 
-int edge_state_draw;
-
 // Defines of exported to chdk symbols
 #ifdef THIS_IS_CHDK_CORE

trunk/core/gui_osd.c

@@ -280 +280 @@
     // edgeoverlay state
     if (conf.edge_overlay_enable || gui_mode==GUI_MODE_OSD) {
-        if (edge_state_draw==0) gui_print_osd_state_string_chr("EDGE:", "LIVE");
-        else if (edge_state_draw==1) gui_print_osd_state_string_chr("EDGE:", ((conf.edge_overlay_pano==0)?"FROZEN":"PANO"));
+        if (conf.edge_state_draw==0) gui_print_osd_state_string_chr("EDGE:", "LIVE");
+        else if (conf.edge_state_draw==1) gui_print_osd_state_string_chr("EDGE:", ((conf.edge_overlay_pano==0)?"FROZEN":"PANO"));
     }
 #endif

trunk/include/conf.h

@@ -305 +305 @@
     int edge_overlay_play;              // whether edge overlay is switched on also for play mode
     color edge_overlay_color;
+    int edge_state_draw;                // Current state of overlay (Live/Frozen/Pano) [not saved to config file]
 
     int synch_enable;