Merge tag 'v0.5.1' into dfsg

libfreenect v0.5.1 Tabula

* tag 'v0.5.1':
  Fix CPack libusb dependency - fixes OpenKinect#420
  win32: Fix scattered sources causing link errors
  OSX: Link freenect-cpp_pcview to libfreenect
  Install libfreenect.pc on OSX - fixes OpenKinect#410 Fix broken link in README.md
  Add cpp_pcview example
  Update python wrapper.
  python: Add .gitattributes which treats the Python freenect.c as binary
  Ignore .pyc files from Python
  Python wrapper: handle non-standard modes properly
  Python wrapper: prevent *Ptr classes from being created from Python
  Java wrapper: Don't set video or depth formats at startup.
  Implement all FREENECTAPI functions in fakenect to avoid issues with Java wrapper
  bump java wrapper version, bundle with all dependencies
  Use native byte ordering on byte buffers
  Add convenient Makefile
  python: add Python library to link command

Author: yarikoptic

.gitattributes

@@ -0,0 +1 @@
+wrappers/python/freenect.c binary

CMakeLists.txt

@@ -188,7 +188,7 @@ IF ( BUILD_CPACK_TGZ OR BUILD_CPACK_DEB OR BUILD_CPACK_RPM )
   set(CPACK_PACKAGE_DESCRIPTION "libfreenect for kinect")
   set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "libfreenect library for using kinect")
   set(CPACK_PACKAGE_NAME "libfreenect-dev")
-  set(CPACK_DEBIAN_PACKAGE_DEPENDS "libusb-1.0.0-dev")
+  set(CPACK_DEBIAN_PACKAGE_DEPENDS "libusb-1.0-0-dev")
 
   set(CPACK_PACKAGE_CONTACT "OpenKinect <openkinect@googlegroups.com>")
   #set(CPACK_PACKAGE_VENDOR "")

README.md

@@ -134,7 +134,7 @@ Wrappers are not guaranteed to be API stable or up to date.
     # cython freenect.pyx
     python2 setup.py build_ext --inplace
 
-For example, start with [demo_cv_async.py](https://gihub.com/OpenKinect/libfreenect/tree/master/wrappers/python/devmo_cv_async.py).
+For example, start with [demo_cv_async.py](https://github.com/OpenKinect/libfreenect/tree/master/wrappers/python/demo_cv_async.py).
 
 
 # Code Contributions

fakenect/fakenect.c

@@ -219,6 +219,11 @@ freenect_raw_tilt_state* freenect_get_tilt_state(freenect_device *dev)
 	return &state;
 }
 
+freenect_tilt_status_code freenect_get_tilt_status(freenect_raw_tilt_state *state)
+{
+    return state->tilt_status;
+}
+
 void freenect_get_mks_accel(freenect_raw_tilt_state *state, double* x, double* y, double* z)
 {
 	//the documentation for the accelerometer (http://www.kionix.com/Product%20Sheets/KXSD9%20Product%20Brief.pdf)
@@ -261,6 +266,21 @@ freenect_frame_mode freenect_find_video_mode(freenect_resolution res, freenect_v
     return out;
 }
 
+int freenect_get_video_mode_count()
+{
+    return 1;
+}
+
+freenect_frame_mode freenect_get_video_mode(int mode_num)
+{
+    return freenect_find_video_mode(FREENECT_RESOLUTION_MEDIUM, FREENECT_VIDEO_RGB);
+}
+
+freenect_frame_mode freenect_get_current_video_mode(freenect_device *dev)
+{
+    return freenect_get_video_mode(0);
+}
+
 freenect_frame_mode freenect_find_depth_mode(freenect_resolution res, freenect_depth_format fmt) {
     assert(FREENECT_RESOLUTION_MEDIUM == res);
     assert(FREENECT_DEPTH_11BIT == fmt);
@@ -270,6 +290,21 @@ freenect_frame_mode freenect_find_depth_mode(freenect_resolution res, freenect_d
     return out;
 }
 
+int freenect_get_depth_mode_count()
+{
+    return 1;
+}
+
+freenect_frame_mode freenect_get_depth_mode(int mode_num)
+{
+    return freenect_find_depth_mode(FREENECT_RESOLUTION_MEDIUM, FREENECT_DEPTH_11BIT);
+}
+
+freenect_frame_mode freenect_get_current_depth_mode(freenect_device *dev)
+{
+    return freenect_get_depth_mode(0);
+}
+
 int freenect_num_devices(freenect_context *ctx)
 {
 	// Always 1 device
@@ -283,12 +318,23 @@ int freenect_open_device(freenect_context *ctx, freenect_device **dev, int index
 	return 0;
 }
 
+int freenect_open_device_by_camera_serial(freenect_context *ctx, freenect_device **dev, const char* camera_serial)
+{
+    *dev = fake_dev;
+    return 0;
+}
+
 int freenect_init(freenect_context **ctx, freenect_usb_context *usb_ctx)
 {
 	*ctx = fake_ctx;
 	return 0;
 }
 
+int freenect_supported_subdevices(void)
+{
+    return FREENECT_DEVICE_MOTOR | FREENECT_DEVICE_CAMERA;
+}
+
 void freenect_select_subdevices(freenect_context *ctx, freenect_device_flags subdevs) {
 	// Ideally, we'd actually check for MOTOR and CAMERA and AUDIO, but for now
 	// we just ignore them and provide all captured data.

src/CMakeLists.txt

@@ -5,14 +5,13 @@
 include_directories (${CMAKE_CURRENT_SOURCE_DIR})
 
 include_directories(${LIBUSB_1_INCLUDE_DIRS})
-LIST(APPEND SRC core.c tilt.c cameras.c flags.c usb_libusb10.c registration.c)
+LIST(APPEND SRC core.c tilt.c cameras.c flags.c usb_libusb10.c registration.c audio.c loader.c)
 IF(WIN32)
   set_source_files_properties(${SRC} PROPERTIES LANGUAGE CXX)
 ENDIF(WIN32)
 
-# Audio
+# Audio Firmware
 include(FindPythonInterp)
-LIST(APPEND SRC audio.c loader.c)
 IF(BUILD_REDIST_PACKAGE)
   # If this build is intended for a redistributable package, we can't include audios.bin, so we should include fwfetcher.py
   # and the package should run "python fwfetcher.py $INSTALL_PREFIX/share" as a postinst hook
@@ -47,7 +46,7 @@ target_link_libraries (freenectstatic ${LIBUSB_1_LIBRARIES})
 install (FILES "../include/libfreenect.h" "../include/libfreenect_registration.h" "../include/libfreenect_audio.h"
   DESTINATION ${PROJECT_INCLUDE_INSTALL_DIR})
 
-IF(UNIX AND NOT APPLE)
+IF(UNIX)
   # Produce a pkg-config file for linking against the shared lib
   configure_file ("libfreenect.pc.in" "libfreenect.pc" @ONLY)
   install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libfreenect.pc"

wrappers/cpp/CMakeLists.txt

@@ -13,11 +13,13 @@ endif()
 include_directories(.)
 
 add_executable(freenect-cppview cppview.cpp)
+add_executable(freenect-cpp_pcview cpp_pc_view.cpp)
 
 # Mac just has everything already
 if(APPLE)
   set(CMAKE_EXE_LINKER_FLAGS "-framework OpenGL -framework GLUT")
   target_link_libraries(freenect-cppview freenect)
+  target_link_libraries(freenect-cpp_pcview freenect)
 else()
   find_package(Threads REQUIRED)
   find_package(OpenGL REQUIRED)
@@ -26,9 +28,13 @@ else()
   include_directories(${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR} ${USB_INCLUDE_DIRS})
 
   target_link_libraries(freenect-cppview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
+  target_link_libraries(freenect-cpp_pcview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
 install (TARGETS freenect-cppview
   DESTINATION bin)
 
+install (TARGETS freenect-cpp_pcview
+  DESTINATION bin)
+
 ENDIF()