Changeset 861 for trunk/core/gui_osd.c

Timestamp:

12/11/09 06:50:50 (3 years ago)

Author:

reyalp

Message:

sx200 update from oldgit in ​http://chdk.setepontos.com/index.php/topic,3994.msg44300.html#msg44300
Modified so RGB histogram and zebra on all cams now use #defines instead of hardcoded values.

File:

• trunk/core/gui_osd.c (modified) (4 diffs)

trunk/core/gui_osd.c

@@ -175 +175 @@
     switch (hist) {
         case HISTO_R: 
-            cl=COLOR_RED; 
+            cl=((mode_get()&MODE_MASK) == MODE_REC)?COLOR_HISTO_R:COLOR_HISTO_R_PLAY;
             break;
         case HISTO_G: 
-            cl=COLOR_GREEN; 
-            break;
-        case HISTO_B: 
-            cl=((mode_get()&MODE_MASK) == MODE_REC)?0xDF:0xCC; 
+            cl=((mode_get()&MODE_MASK) == MODE_REC)?COLOR_HISTO_G:COLOR_HISTO_G_PLAY;
+            break;
+        case HISTO_B:
+            cl=((mode_get()&MODE_MASK) == MODE_REC)?COLOR_HISTO_B:COLOR_HISTO_B_PLAY;
             break;
         case HISTO_RGB:
@@ -381 +381 @@
     color cls[] = {
         COLOR_TRANSPARENT,
-        (mrec)?0xDF:0xCC,
-        COLOR_GREEN,
-        (mrec)?COLOR_BLUE_LT:0x99,
-        COLOR_RED,
-        (mrec)?0x66:0xE2,
-        (mrec)?COLOR_YELLOW:0x66,
+        (mrec)?COLOR_HISTO_B:COLOR_HISTO_B_PLAY,
+        (mrec)?COLOR_HISTO_G:COLOR_HISTO_G_PLAY,
+        (mrec)?COLOR_HISTO_BG:COLOR_HISTO_BG_PLAY,
+        (mrec)?COLOR_HISTO_R:COLOR_HISTO_R_PLAY,
+        (mrec)?COLOR_HISTO_RB:COLOR_HISTO_RB_PLAY,
+        (mrec)?COLOR_HISTO_RG:COLOR_HISTO_RG_PLAY,
         COLOR_BLACK
     };
@@ -542 +542 @@
     color cls[] = {
         COLOR_TRANSPARENT,
-        (mrec)?0xDF:0xCC,
-        COLOR_GREEN,
-        (mrec)?COLOR_BLUE_LT:0x99,
-        COLOR_RED,
-        (mrec)?0x66:0xE2,
-        (mrec)?COLOR_YELLOW:0x66,
+        (mrec)?COLOR_HISTO_B:COLOR_HISTO_B_PLAY,
+        (mrec)?COLOR_HISTO_G:COLOR_HISTO_G_PLAY,
+        (mrec)?COLOR_HISTO_BG:COLOR_HISTO_BG_PLAY,
+        (mrec)?COLOR_HISTO_R:COLOR_HISTO_R_PLAY,
+        (mrec)?COLOR_HISTO_RB:COLOR_HISTO_RB_PLAY,
+        (mrec)?COLOR_HISTO_RG:COLOR_HISTO_RG_PLAY,
         COLOR_BLACK
     };
@@ -727 +727 @@
     color cls[] = {
         conf.histo_color>>8,
-        (m)?0xDF:0xCC,
-        COLOR_GREEN,
-        (m)?COLOR_BLUE_LT:0x99,
-        COLOR_RED,
-        (m)?0x66:0xE2,
-        (m)?COLOR_YELLOW:0x66,
+        (m)?COLOR_HISTO_B:COLOR_HISTO_B_PLAY,
+        (m)?COLOR_HISTO_G:COLOR_HISTO_G_PLAY,
+        (m)?COLOR_HISTO_BG:COLOR_HISTO_BG_PLAY,
+        (m)?COLOR_HISTO_R:COLOR_HISTO_R_PLAY,
+        (m)?COLOR_HISTO_RB:COLOR_HISTO_RB_PLAY,
+        (m)?COLOR_HISTO_RG:COLOR_HISTO_RG_PLAY,
         COLOR_WHITE
     };