Changeset 1232 for trunk/platform/generic/shooting.c

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

File:

• trunk/platform/generic/shooting.c (modified) (2 diffs)

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*/ 
+            );
 }