diff --git a/interface/external/freenect/include/libfreenect-audio.h b/interface/external/freenect/include/libfreenect-audio.h index 108cf38178..3f2febabba 100644 --- a/interface/external/freenect/include/libfreenect-audio.h +++ b/interface/external/freenect/include/libfreenect-audio.h @@ -24,7 +24,8 @@ * either License. */ -#pragma once +#ifndef LIBFREENECT_AUDIO_H +#define LIBFREENECT_AUDIO_H #include #include @@ -113,3 +114,7 @@ FREENECTAPI int freenect_stop_audio(freenect_device* dev); #ifdef __cplusplus } #endif + +#endif // + + diff --git a/interface/external/freenect/include/libfreenect-registration.h b/interface/external/freenect/include/libfreenect-registration.h index 7ad2b5bb80..2ef5d60981 100644 --- a/interface/external/freenect/include/libfreenect-registration.h +++ b/interface/external/freenect/include/libfreenect-registration.h @@ -24,7 +24,8 @@ * either License. */ -#pragma once +#ifndef LIBFREENECT_REGISTRATION_H +#define LIBFREENECT_REGISTRATION_H #include #include @@ -124,3 +125,5 @@ FREENECTAPI void freenect_camera_to_world(freenect_device* dev, #ifdef __cplusplus } #endif + +#endif // LIBFREENECT_REGISTRATION_H diff --git a/interface/external/freenect/include/libfreenect.h b/interface/external/freenect/include/libfreenect.h index 13c7c4c538..470558c33a 100644 --- a/interface/external/freenect/include/libfreenect.h +++ b/interface/external/freenect/include/libfreenect.h @@ -24,7 +24,8 @@ * either License. */ -#pragma once +#ifndef LIBFREENECT_H +#define LIBFREENECT_H #include @@ -302,6 +303,15 @@ FREENECTAPI int freenect_supported_subdevices(void); */ FREENECTAPI void freenect_select_subdevices(freenect_context *ctx, freenect_device_flags subdevs); +/** + * Returns the devices that are enabled after calls to freenect_open_device() + * On newer kinects the motor and audio are automatically disabled for now + * + * @param ctx Context to set future subdevice selection for + * @return Flags representing the subdevices that were actually opened (see freenect_device_flags) + */ +FREENECTAPI freenect_device_flags freenect_enabled_subdevices(freenect_context *ctx); + /** * Opens a kinect device via a context. Index specifies the index of * the device on the current state of the bus. Bus resets may cause @@ -617,3 +627,6 @@ FREENECTAPI int freenect_set_depth_mode(freenect_device* dev, const freenect_fra #ifdef __cplusplus } #endif + +#endif // + diff --git a/interface/external/freenect/lib/MacOS/libfreenect.a b/interface/external/freenect/lib/MacOS/libfreenect.a index 81c2b3a283..19a9fc1806 100644 Binary files a/interface/external/freenect/lib/MacOS/libfreenect.a and b/interface/external/freenect/lib/MacOS/libfreenect.a differ diff --git a/interface/external/freenect/lib/MacOS/libfreenect_sync.a b/interface/external/freenect/lib/MacOS/libfreenect_sync.a index 6a2938d585..9f739a4500 100644 Binary files a/interface/external/freenect/lib/MacOS/libfreenect_sync.a and b/interface/external/freenect/lib/MacOS/libfreenect_sync.a differ diff --git a/interface/external/freenect/lib/UNIX/libfreenect.a b/interface/external/freenect/lib/UNIX/libfreenect.a index 604faaee0a..0b50cca696 100644 Binary files a/interface/external/freenect/lib/UNIX/libfreenect.a and b/interface/external/freenect/lib/UNIX/libfreenect.a differ diff --git a/interface/external/freenect/lib/UNIX/libfreenect_sync.a b/interface/external/freenect/lib/UNIX/libfreenect_sync.a index 7e509c8b38..85b7479a75 100644 Binary files a/interface/external/freenect/lib/UNIX/libfreenect_sync.a and b/interface/external/freenect/lib/UNIX/libfreenect_sync.a differ