Changeset 529 for trunk

Timestamp:

10/03/08 22:03:11 (5 years ago)

Author:

EWAVR

Message:

• resolved conflict between fast video control and Ev correction

File:

• trunk/core/kbd.c (modified) (3 diffs)

trunk/core/kbd.c

@@ -1359 +1359 @@
     int m=mode_get(); 
     int mode_video = MODE_IS_VIDEO(m) || (movie_status > 1);
+    int ev_video=0;
+
+#if CAM_EV_IN_VIDEO
+    ev_video=get_ev_video_avail(); 
+#endif
 
     if (!(kbd_is_key_pressed(KEY_UP)) && !(kbd_is_key_pressed(KEY_DOWN))) key_pressed = 0;
@@ -1427 +1432 @@
     } 
     
-    if (kbd_is_key_pressed(KEY_LEFT) && mode_video && movie_status == 4) {
+    if (kbd_is_key_pressed(KEY_LEFT) && mode_video && (movie_status == 4) && !ev_video) {
         if (conf.fast_movie_control && key_pressed == 0) {
             movie_status = VIDEO_RECORD_STOPPED;
@@ -1440 +1445 @@
             mode_video &&
 #endif
-                movie_status == 1) {
+                (movie_status == 1) && !ev_video) {
         // BUG this doesn't know whether recording was stopped or paused.
         if (conf.fast_movie_control && key_pressed == 0) {