Changeset 1569 for trunk/core/luascript.c

Timestamp:

01/16/12 08:22:51 (17 months ago)

Author:

philmoz

Message:

Update trunk with latest changes from reyalp-flt branch.

Location:

trunk

Files:

• . (modified) (1 prop)
• core/luascript.c (modified) (4 diffs)

trunk/core/luascript.c

@@ -14 +14 @@
 #include "console.h"
 #include "action_stack.h"
-#include "motion_detector.h"
 #include "ptp.h"
 #include "core.h"
@@ -779 +778 @@
 static int luaCB_md_get_cell_diff( lua_State* L )
 {
-  lua_pushnumber( L, md_get_cell_diff(luaL_checknumber(L,1),
-                                      luaL_checknumber(L,2)));
-  return 1;
+    if (module_mdetect_load())
+        lua_pushnumber( L, libmotiondetect->md_get_cell_diff(luaL_checknumber(L,1), luaL_checknumber(L,2)));
+    else
+        lua_pushnumber( L, 0 );
+    return 1;
 }
 
@@ -803 +804 @@
   int pixels_step = (luaL_optnumber(L,15,6));
   int msecs_before_trigger = (luaL_optnumber(L,16,0));
-  if(md_init_motion_detector(
+  if (module_mdetect_load() && libmotiondetect->md_init_motion_detector(
     columns, rows, pixel_measure_mode, detection_timeout, 
     measure_interval, threshold, draw_grid,
@@ -825 +826 @@
     kbd_reset_autoclicked_key();
 
+    // Push selected file as script return value
         lua_pushstring( Lt, (fn && fn[0])? fn : NULL );
-
 }