Changeset 1232

Timestamp:

07/10/11 06:39:42 (23 months ago)

Author:

reyalp

Message:

add new cameras video modes to mode_is_video, use in shooting_can_focus, formatting

Location:

trunk

Files:

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

trunk/include/modelist.h

@@ -98 +98 @@
     MODE_LOWLIGHT           , // g11
     MODE_SCN_NOSTALGIC      , // s90
-        MODE_SCN_SMART_SHUTTER  , // sx30/g12 (Smart Shutter, Smile detection mode)
-        MODE_SCN_LOWLIGHT               , // sx30
-        MODE_SCN_SUPER_VIVID    , // sx30
-        MODE_SCN_POSTER_EFFECT  , // sx30
-        MODE_SCN_FISHEYE                , // sx30
-        MODE_SCN_MINIATURE              , // sx30
-        MODE_SCN_HDR                    , // g12 (HDR scene mode)
+    MODE_SCN_SMART_SHUTTER    , // sx30/g12 (Smart Shutter, Smile detection mode)
+    MODE_SCN_LOWLIGHT        , // sx30
+    MODE_SCN_SUPER_VIVID    , // sx30
+    MODE_SCN_POSTER_EFFECT    , // sx30
+    MODE_SCN_FISHEYE        , // sx30
+    MODE_SCN_MINIATURE        , // sx30
+    MODE_SCN_HDR            , // g12 (HDR scene mode)
     MODE_VIDEO_MINIATURE    , // g12 (miniature effect video mode)
-        MODE_VIDEO_IFRAME_MOVIE , // sx220
-        MODE_VIDEO_MOVIE_DIGEST , // sx220
-        MODE_SCN_HIGHSPEED_BURST, // sx220
-        MODE_SCN_BEST_IMAGE             , // sx220
-        MODE_SCN_TOY_CAMERA     , // sx220
-        MODE_SCN_MONOCHROME     , // sx220
+    MODE_VIDEO_IFRAME_MOVIE , // sx220
+    MODE_VIDEO_MOVIE_DIGEST    , // sx220 (the camera automatically record a short video clip (up to approximately 4 seconds) every time you shoot a still image.)
+    MODE_SCN_HIGHSPEED_BURST, // sx220
+    MODE_SCN_BEST_IMAGE        , // sx220
+    MODE_SCN_TOY_CAMERA    , // sx220
+    MODE_SCN_MONOCHROME    , // sx220
     MODE_SCN_WINK_SELF_TIMER, // sx30/g12 (Smart Shutter, Wink Self Timer mode)
     MODE_SCN_FACE_SELF_TIMER, // sx30/g12 (Smart Shutter, Face Self Timer mode)

trunk/platform/generic/shooting.c

@@ -750 +750 @@
 }
 
-// TODO this should probably use MODE_IS_VIDEO
 short shooting_can_focus()
 {
+ int m=mode_get()&MODE_SHOOTING_MASK;
 #if !CAM_CAN_SD_OVER_NOT_IN_MF && CAM_CAN_SD_OVERRIDE
- int m=mode_get()&MODE_SHOOTING_MASK;
- int mode_video=((m==MODE_VIDEO_STD) ||
-                            (m==MODE_VIDEO_SPEED) ||
-                            (m==MODE_VIDEO_COMPACT) ||
-                            (m==MODE_VIDEO_MY_COLORS) ||
-                            (m==MODE_VIDEO_TIME_LAPSE) ||
-                            (m==MODE_VIDEO_COLOR_ACCENT));
-  return (shooting_get_focus_mode() || mode_video);
+  return (shooting_get_focus_mode() || MODE_IS_VIDEO(m));
 #elif !CAM_CAN_SD_OVERRIDE
- int m=mode_get()&MODE_SHOOTING_MASK;
- int mode_video=((m==MODE_VIDEO_STD) ||
-                            (m==MODE_VIDEO_SPEED) ||
-                            (m==MODE_VIDEO_COMPACT) ||
-                            (m==MODE_VIDEO_MY_COLORS) ||
-                (m==MODE_VIDEO_TIME_LAPSE) ||
-                            (m==MODE_VIDEO_COLOR_ACCENT));
-  return mode_video;
+  return MODE_IS_VIDEO(m);
 #elif defined (CAMERA_ixus800_sd700)
- int m=mode_get()&MODE_SHOOTING_MASK;
 // TODO whats the reason for this ?!?
   return (shooting_get_zoom()<8) && (m!=MODE_AUTO) && (m!=MODE_SCN_UNDERWATER);
@@ -1451 +1436 @@
 {
     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);
+    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 ||
+            m==MODE_VIDEO_MINIATURE ||
+            m==MODE_VIDEO_IFRAME_MOVIE
+// not clear if this should be considered a video mode ?
+/*            m==MODE_VIDEO_MOVIE_DIGEST*/ 
+            );
 }