a1ex avatar a1ex committed 21fcd40

Refactoring: CONFIG_NO_DEDICATED_MOVIE_MODE (5D2, 50D, 7D, 5D3, 6D, 650D, M)

Comments (0)

Files changed (9)

platform/5D2.212/internals.h

 
 /** You can't AF by pressing shutter halfway in LiveView */
 #define CONFIG_NO_HALFSHUTTER_AF_IN_LIVEVIEW
+
+/** We can record movies in regular photo modes - M, P, Tv, Av... */
+#define CONFIG_NO_DEDICATED_MOVIE_MODE

platform/5D3.113/internals.h

 
 /** Perfect sync using EVF_STATE **/
 #define CONFIG_EVF_STATE_SYNC
+
+/** We can record movies in regular photo modes - M, P, Tv, Av... */
+#define CONFIG_NO_DEDICATED_MOVIE_MODE

platform/650D.101/internals.h

 
 /** FPS override: Canon changes FPS registers often; we need to undo their changes asap */
 #define CONFIG_FPS_AGGRESSIVE_UPDATE
+
+/** We can record movies in regular photo modes - M, P, Tv, Av... */
+#define CONFIG_NO_DEDICATED_MOVIE_MODE

platform/6D.112/internals.h

 
 /** FPS override: Canon changes FPS registers often; we need to undo their changes asap */
 #define CONFIG_FPS_AGGRESSIVE_UPDATE
+
+/** We can record movies in regular photo modes - M, P, Tv, Av... */
+#define CONFIG_NO_DEDICATED_MOVIE_MODE

platform/7D.203/internals.h

 /* we can use virtual keyboard here */
 //#define CONFIG_VKBD_IMPLEMENTED
 
+/** We can record movies in regular photo modes - M, P, Tv, Av... */
+#define CONFIG_NO_DEDICATED_MOVIE_MODE

platform/EOSM.106/internals.h

 /** FPS override: Canon changes FPS registers often; we need to undo their changes asap */
 #define CONFIG_FPS_AGGRESSIVE_UPDATE
 
+/** We can record movies in regular photo modes - M, P, Tv, Av... */
+#define CONFIG_NO_DEDICATED_MOVIE_MODE
 {
     if (shooting_mode == m) return;
     
-    if (m == SHOOTMODE_MOVIE && lv) { fake_simple_button(BGMT_LV); msleep(300); } // don't switch to movie mode from photo liveview (unstable on 60D)
-    
     ml_changing_shooting_mode = 1;
     prop_request_change(PROP_SHOOTING_MODE, &m, 4);
     msleep(500);
 PROP_INT(PROP_MOVIE_SOUND_RECORD, sound_recording_mode);
 volatile PROP_INT(PROP_DATE_FORMAT, date_format);
 
-#ifndef CONFIG_5D2
+#ifdef CONFIG_NO_DEDICATED_MOVIE_MODE
+int ae_mode_movie = 1;
+#else
 volatile PROP_INT(PROP_AE_MODE_MOVIE, ae_mode_movie);
-#else
-int ae_mode_movie = 1;
 #endif
 
 volatile int shooting_mode;
 {
     shooting_mode = buf[0];
 
-    #ifdef CONFIG_5D2
+    #ifdef CONFIG_NO_DEDICATED_MOVIE_MODE
     ae_mode_movie = shooting_mode == SHOOTMODE_M;
     #endif
 }
 
 bool FAST is_movie_mode()
 {
-    #if defined(CONFIG_50D) || defined(CONFIG_5D2)
+    #ifdef CONFIG_NO_DEDICATED_MOVIE_MODE
     return lv && lv_movie_select == LVMS_ENABLE_MOVIE
-            #if !defined(CONFIG_50D)
+            #ifdef CONFIG_5D2
             && expsim == 2  // movie enabled, but photo display is considered photo mode
             #endif
         ;
-    #elif defined(CONFIG_5D3) || defined(CONFIG_7D) || defined(CONFIG_EOSM) || defined(CONFIG_650D) || defined(CONFIG_6D)
-    return lv_movie_select == LVMS_ENABLE_MOVIE;
     #else
     return shooting_mode == SHOOTMODE_MOVIE;
     #endif
     if (!is_movie_mode())
     {
         #ifdef CONFIG_50D
-        if (!lv) force_liveview();
         GUI_SetLvMode(2);
         GUI_SetMovieSize_b(1);
+        #elif defined(CONFIG_5D2)
+        GUI_SetLvMode(2);
         #else
-            #ifdef CONFIG_5D2
-                GUI_SetLvMode(2);
-            #else
-                #ifdef CONFIG_500D
-                if (shooting_mode == SHOOTMODE_ADEP) set_shooting_mode(SHOOTMODE_CA);
-                #endif
-                set_shooting_mode(SHOOTMODE_MOVIE);
-            #endif
+        while (!is_movie_mode())
+        {
+            NotifyBox(2000, "Please switch to Movie mode.");
+            msleep(500);
+        }
         #endif
         msleep(500); 
     }
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.