Merge branch 'unstable' of git://github.com/alito/libfreenect

Reviewed-by: Benn Snyder <[email protected]>

Conflicts:
	wrappers/python/freenect.pyx

Author: piedar

wrappers/python/freenect.pyx

@@ -282,7 +282,7 @@ cpdef init():
     # to both but haven't wrapped the python API for selecting subdevices yet.
     # Also, we don't support audio in the python wrapper yet, so no sense claiming
     # the device.
-    freenect_select_subdevices(ctx, int(FREENECT_DEVICE_MOTOR | FREENECT_DEVICE_CAMERA))
+    freenect_select_subdevices(ctx, <freenect_device_flags> (FREENECT_DEVICE_MOTOR | FREENECT_DEVICE_CAMERA))
     cdef CtxPtr ctx_out
     ctx_out = CtxPtr()
     ctx_out._ptr = ctx
@@ -373,16 +373,19 @@ def runloop(depth=None, video=None, body=None, dev=None):
         if not mdev:
             error_open_device()
             return
+        if depth is not None:
+            freenect_set_depth_mode(mdev._ptr, freenect_find_depth_mode(FREENECT_RESOLUTION_MEDIUM, FREENECT_DEPTH_11BIT))
+        if video is not None:
+            freenect_set_video_mode(mdev._ptr, freenect_find_video_mode(FREENECT_RESOLUTION_MEDIUM, FREENECT_VIDEO_RGB))
+
     else:
         mdev = dev
     devp = mdev._ptr
     ctxp = mdev.ctx._ptr
     if depth is not None:
-        freenect_set_depth_mode(devp, freenect_find_depth_mode(FREENECT_RESOLUTION_MEDIUM, FREENECT_DEPTH_11BIT))
         freenect_start_depth(devp)
         freenect_set_depth_callback(devp, depth_cb)
     if video is not None:
-        freenect_set_video_mode(devp, freenect_find_video_mode(FREENECT_RESOLUTION_MEDIUM, FREENECT_VIDEO_RGB))
         freenect_start_video(devp)
         freenect_set_video_callback(devp, video_cb)
     try: