From 5fc911f8885fcf0ce0590f9ac6e396d0d19f6dca Mon Sep 17 00:00:00 2001
From: pixhawk <mavteam@student.ethz.ch>
Date: Fri, 26 Nov 2010 10:58:51 +0100
Subject: [PATCH] Changed status message in qgroundcontrol.pro, fixed compile
 error in class Freenect (void* did not work)

---
 qgroundcontrol.pro    | 4 ++--
 src/input/Freenect.cc | 6 ++----
 src/input/Freenect.h  | 6 ++----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index b008ea46c..e7f4f0a51 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -332,7 +332,7 @@ SOURCES += src/main.cc \
     src/ui/map3D/ImageWindowGeode.cc
 
 contains(DEPENDENCIES_PRESENT, osg) { 
-    message("Including headers for OpenSceneGraph")
+    message("Including sources for OpenSceneGraph")
     
     # Enable only if OpenSceneGraph is available
     SOURCES += src/ui/map3D/Q3DWidget.cc
@@ -352,7 +352,7 @@ contains(DEPENDENCIES_PRESENT, osgearth) {
 }
 
 contains(DEPENDENCIES_PRESENT, libfreenect) { 
-    message("Including headers for libfreenect")
+    message("Including sources for libfreenect")
     
     # Enable only if libfreenect is available
     SOURCES += src/input/Freenect.cc
diff --git a/src/input/Freenect.cc b/src/input/Freenect.cc
index 5c2104c8a..a60f094f8 100644
--- a/src/input/Freenect.cc
+++ b/src/input/Freenect.cc
@@ -174,8 +174,7 @@ Freenect::FreenectThread::run(void)
 }
 
 void
-Freenect::rgbCallback(freenect_device* device, freenect_pixel* rgb,
-                      unsigned int timestamp)
+Freenect::rgbCallback(freenect_device* device, freenect_pixel* rgb, uint32_t timestamp)
 {
     Freenect* freenect = static_cast<Freenect *>(freenect_get_user(device));
 
@@ -184,8 +183,7 @@ Freenect::rgbCallback(freenect_device* device, freenect_pixel* rgb,
 }
 
 void
-Freenect::depthCallback(freenect_device* device, void* depth,
-                        unsigned int timestamp)
+Freenect::depthCallback(freenect_device* device, freenect_depth* depth, uint32_t timestamp)
 {
     Freenect* freenect = static_cast<Freenect *>(freenect_get_user(device));
     freenect_depth* data = reinterpret_cast<freenect_depth *>(depth);
diff --git a/src/input/Freenect.h b/src/input/Freenect.h
index 3d47025d5..e3e3925c5 100644
--- a/src/input/Freenect.h
+++ b/src/input/Freenect.h
@@ -25,10 +25,8 @@ public:
     void setTiltAngle(int angle);
 
 private:
-    static void rgbCallback(freenect_device* device, freenect_pixel* rgb,
-                            unsigned int timestamp);
-    static void depthCallback(freenect_device* device, void* depth,
-                              unsigned int timestamp);
+    static void rgbCallback(freenect_device* device, freenect_pixel* rgb, uint32_t timestamp);
+    static void depthCallback(freenect_device* device, freenect_depth* depth, uint32_t timestamp);
 
     freenect_context* context;
     freenect_device* device;
-- 
2.22.0