# HG changeset patch # User Eleni Maria Stea # Date 1380988960 -10800 # Node ID fdbd55eaa14e236115ae1b1760bce55365f95698 # Parent 80df8030105bf88966cc2183a5af19aa5d7e4df5 add frame class, mutices diff -r 80df8030105b -r fdbd55eaa14e .hgignore --- a/.hgignore Sat Oct 05 16:03:08 2013 +0300 +++ b/.hgignore Sat Oct 05 19:02:40 2013 +0300 @@ -1,4 +1,5 @@ syntax: glob +*.orig *.o *.settings *.cproject diff -r 80df8030105b -r fdbd55eaa14e src/frame.cc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/frame.cc Sat Oct 05 19:02:40 2013 +0300 @@ -0,0 +1,27 @@ +#include +#include + +#include "frame.h" + +static pthread_mutex_t video_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t depth_mutex = PTHREAD_MUTEX_INITIALIZER; + +void init_frame_mx() +{ + pthread_mutex_init(&video_mutex, NULL); + pthread_mutex_init(&depth_mutex, NULL); +} + +void video_cb(freenect_device *kin_dev, void *rgb, uint32_t time) +{ + pthread_mutex_lock(&video_mutex); + printf("Started video.\n"); + pthread_mutex_unlock(&video_mutex); +} + +void depth_cb(freenect_device *kin_dev, void *depth, uint32_t time) +{ + pthread_mutex_lock(&depth_mutex); + printf("Started depth.\n"); + pthread_mutex_unlock(&depth_mutex); +} diff -r 80df8030105b -r fdbd55eaa14e src/frame.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/frame.h Sat Oct 05 19:02:40 2013 +0300 @@ -0,0 +1,20 @@ +#ifndef FRAME_H_ +#define FRAME_H_ + +#include + +class Frame { +private: + int width; + int height; + +public: + Frame(); + +}; + +void init_frame_mx(); +void video_cb(freenect_device *kin_dev, void *rgb, uint32_t time); +void depth_cb(freenect_device *kin_dev, void *depth, uint32_t time); + +#endif // FRAME_H_ diff -r 80df8030105b -r fdbd55eaa14e src/kinect.cc --- a/src/kinect.cc Sat Oct 05 16:03:08 2013 +0300 +++ b/src/kinect.cc Sat Oct 05 19:02:40 2013 +0300 @@ -1,13 +1,9 @@ #include #include #include + #include "kinect.h" - -static void video_cb(freenect_device *kin_dev, void *rgb, uint32_t time); -static void depth_cb(freenect_device *kin_dev, void *depth, uint32_t time); - -static pthread_mutex_t video_mutex = PTHREAD_MUTEX_INITIALIZER; -static pthread_mutex_t depth_mutex = PTHREAD_MUTEX_INITIALIZER; +#include "frame.h" bool init_kinect(freenect_context **kin_ctx, freenect_device **kin_dev, KinectParams *kin_params) { @@ -42,8 +38,7 @@ return false; } - pthread_mutex_init(&video_mutex, NULL); - pthread_mutex_init(&depth_mutex, NULL); + init_frame_mx(); freenect_set_video_callback(*kin_dev, video_cb); freenect_set_depth_callback(*kin_dev, depth_cb); @@ -86,17 +81,3 @@ freenect_close_device(kin_dev); freenect_shutdown(kin_ctx); } - -void video_cb(freenect_device *kin_dev, void *rgb, uint32_t time) -{ - pthread_mutex_lock(&video_mutex); - printf("Started video.\n"); - pthread_mutex_unlock(&video_mutex); -} - -void depth_cb(freenect_device *kin_dev, void *depth, uint32_t time) -{ - pthread_mutex_lock(&depth_mutex); - printf("Started depth.\n"); - pthread_mutex_unlock(&depth_mutex); -}