Changeset 1222

Timestamp:

07/04/11 22:08:33 (23 months ago)

Author:

reyalp

Message:

g12 modemap correction, + convert MODE_IS_VIDEO to function from philmoz in ​http://chdk.setepontos.com/index.php?topic=650.msg69647#msg69647

Location:

trunk

Files:

• include/modelist.h (modified) (1 diff)
• include/platform.h (modified) (1 diff)
• platform/g12/shooting.c (modified) (1 diff)
• platform/generic/shooting.c (modified) (1 diff)

trunk/include/modelist.h

@@ -104 +104 @@
         MODE_SCN_FISHEYE                , // sx30
         MODE_SCN_MINIATURE              , // sx30
-        MODE_SCN_HDR                    , // g12
+        MODE_SCN_HDR                    , // g12 (HDR scene mode)
+    MODE_VIDEO_MINIATURE    , // g12 (miniature effect video mode)
 };
 

trunk/include/platform.h

@@ -16 +16 @@
 #include "modelist.h"
 
-// this is nasty, but not as nasty as checking each of the flags all over the place
-#define MODE_IS_VIDEO(m)   (((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_STD || \
-                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_SPEED ||  \
-                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_COMPACT || \
-                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_MY_COLORS || \
-                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_COLOR_ACCENT || \
-                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_COLOR_SWAP || \
-                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_TIME_LAPSE || \
-                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_PORTRAIT || \
-                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_NIGHT || \
-                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_INDOOR || \
-                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_FOLIAGE || \
-                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_SNOW  || \
-                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_BEACH || \
-                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_AQUARIUM || \
-                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_SUPER_MACRO || \
-                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_STITCH || \
-                            ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_MANUAL)
+// converted large macro to function in platform/generic/shooting.c (philmoz July 2011)
+extern int mode_is_video(int);
+#define MODE_IS_VIDEO(m)    mode_is_video(m)
 
 /* propcase ID constants. These are in their own header files for easier sed processing */

trunk/platform/g12/shooting.c

@@ -96 +96 @@
         { MODE_AV,                 32770  },
         { MODE_M,                  32769  },
+    { MODE_VIDEO_COLOR_ACCENT, 2612   },
+    { MODE_VIDEO_COLOR_SWAP,   2613   },
         { MODE_VIDEO_STD,          2614   }, // video standby
+    { MODE_VIDEO_MINIATURE,    2620   },
         { MODE_LOWLIGHT,           32801  },
         { MODE_QUICK,                      33315  },

trunk/platform/generic/shooting.c

@@ -1455 +1455 @@
 }
 
+// Converted from MODE_IS_VIDEO macro (philmoz July 2011)
+int mode_is_video(int m)
+{
+    m = m & MODE_SHOOTING_MASK;
+    return (m==MODE_VIDEO_STD || \
+            m==MODE_VIDEO_SPEED ||  \
+            m==MODE_VIDEO_COMPACT || \
+            m==MODE_VIDEO_MY_COLORS || \
+            m==MODE_VIDEO_COLOR_ACCENT || \
+            m==MODE_VIDEO_COLOR_SWAP || \
+            m==MODE_VIDEO_MINIATURE || \
+            m==MODE_VIDEO_TIME_LAPSE || \
+            m==MODE_VIDEO_PORTRAIT || \
+            m==MODE_VIDEO_NIGHT || \
+            m==MODE_VIDEO_INDOOR || \
+            m==MODE_VIDEO_FOLIAGE || \
+            m==MODE_VIDEO_SNOW  || \
+            m==MODE_VIDEO_BEACH || \
+            m==MODE_VIDEO_AQUARIUM || \
+            m==MODE_VIDEO_SUPER_MACRO || \
+            m==MODE_VIDEO_STITCH || \
+            m==MODE_VIDEO_MANUAL);
+}
+
 // currently nothing needs to override this, so not weak
 int /*__attribute__((weak))*/ mode_get(void) {