Changeset 1890

Timestamp:

06/02/12 02:37:43 (12 months ago)

Author:

philmoz

Message:

Fixes for 'motion detect' module handling:

• stops MD module being loaded when any script is run (not just MD scripts)
• unloads MD module when script ends.

Location:

trunk/core

Files:

• gui.c (modified) (1 diff)
• modules.c (modified) (1 diff)
• motion_detector.h (modified) (1 diff)
• script.c (modified) (2 diffs)

trunk/core/gui.c

@@ -1983 +1983 @@
         {
             --show_md_grid;
-            if (module_mdetect_load())
+            // If motion detect library loaded then display the MD grid
+            // Don't call 'module_mdetect_load' here as we don't want to load
+            // the module, just see if it was already loaded.
+            if (libmotiondetect)
                 libmotiondetect->md_draw_grid();
         }

trunk/core/modules.c

@@ -164 +164 @@
 }
 
+void module_mdetect_unload()
+{
+        if (libmotiondetect)
+    {
+        module_unload(MODULE_NAME_MDETECT);  
+        libmotiondetect = 0;
+    }
+}
+
 
 /************* DYNAMIC LIBRARY ZEBRA ******/

trunk/core/motion_detector.h

@@ -119 +119 @@
         extern struct libmotiondetect_sym* libmotiondetect;
     extern struct libmotiondetect_sym* module_mdetect_load();           // 0fail, addr-ok
+    extern void module_mdetect_unload();
 #else
         // This section is for module

trunk/core/script.c

@@ -612 +612 @@
             break;
         case AS_MOTION_DETECTOR:
-            if (module_mdetect_load())
+            // If motion detect module loaded then run the MD code
+            // Don't call module_mdetect_load here as it may cause the
+            // module to be re-loaded after the script is interrupted
+            if (libmotiondetect)
             {
                 if (libmotiondetect->md_detect_motion()==0)
@@ -717 +720 @@
     }
     // If motion detect library loaded then shut down motion detector
-    // Don't call 'module_mdetect_load' here as we don't want to load
-    // the module, just see if it was already loaded.
-    if (libmotiondetect)
-        libmotiondetect->md_close_motion_detector();
+    module_mdetect_unload();
+
         shot_histogram_set(0);
     kbd_key_release_all();