# HG changeset patch # User Eleni Maria Stea # Date 1383508736 -7200 # Node ID 4f1b8ddcd32ed0a94b2273f370b24e2e420955e3 # Parent db8f1c036d0e53dcf2a68736b2d5dd6a34016a9b minor fixes diff -r db8f1c036d0e -r 4f1b8ddcd32e src/kinect.cc --- a/src/kinect.cc Sun Nov 03 20:36:45 2013 +0200 +++ b/src/kinect.cc Sun Nov 03 21:58:56 2013 +0200 @@ -7,18 +7,18 @@ KinectParams::KinectParams() { - angle = 10; + angle = 10; - video_width = KINECT_VIDEO_WIDTH; - video_height = KINECT_VIDEO_HEIGHT; - depth_width = KINECT_DEPTH_WIDTH; - depth_height = KINECT_DEPTH_HEIGHT; + video_width = KINECT_VIDEO_WIDTH; + video_height = KINECT_VIDEO_HEIGHT; + depth_width = KINECT_DEPTH_WIDTH; + depth_height = KINECT_DEPTH_HEIGHT; - led_color = LED_RED; - video_format = FREENECT_VIDEO_RGB; - depth_format = FREENECT_DEPTH_11BIT; - video_res = FREENECT_RESOLUTION_MEDIUM; - depth_res = FREENECT_RESOLUTION_MEDIUM; + led_color = LED_RED; + video_format = FREENECT_VIDEO_RGB; + depth_format = FREENECT_DEPTH_11BIT; + video_res = FREENECT_RESOLUTION_MEDIUM; + depth_res = FREENECT_RESOLUTION_MEDIUM; } bool init_kinect(freenect_context **kin_ctx, freenect_device **kin_dev, KinectParams *kin_params) @@ -57,32 +57,32 @@ return true; } -bool init_kinect_frames(freenect_context **kin_ctx, freenect_device **kin_dev, +bool init_kinect_frames(freenect_context *kin_ctx, freenect_device *kin_dev, KinectParams *kin_params) { - freenect_set_video_callback(*kin_dev, video_cb); - freenect_set_depth_callback(*kin_dev, depth_cb); + freenect_set_video_callback(kin_dev, video_cb); + freenect_set_depth_callback(kin_dev, depth_cb); - if(freenect_set_video_mode(*kin_dev, + if(freenect_set_video_mode(kin_dev, freenect_find_video_mode(kin_params->video_res, kin_params->video_format)) < 0) { fprintf(stderr, "Failed to set kinect video mode.\n"); return false; } - if(freenect_set_depth_mode(*kin_dev, + if(freenect_set_depth_mode(kin_dev, freenect_find_depth_mode(kin_params->depth_res, kin_params->depth_format)) < 0) { fprintf(stderr, "Failed to set kinect depth mode.\n"); return false; } - if(freenect_start_video(*kin_dev) < 0) { + if(freenect_start_video(kin_dev) < 0) { fprintf(stderr, "Failed to start kinect video.\n"); return false; } - if(freenect_start_depth(*kin_dev) < 0) { + if(freenect_start_depth(kin_dev) < 0) { fprintf(stderr, "Failed to start kinect depth video.\n"); return false; } diff -r db8f1c036d0e -r 4f1b8ddcd32e src/kinect.h --- a/src/kinect.h Sun Nov 03 20:36:45 2013 +0200 +++ b/src/kinect.h Sun Nov 03 21:58:56 2013 +0200 @@ -27,7 +27,7 @@ }; bool init_kinect(freenect_context **kin_ctx, freenect_device **kin_dev, KinectParams *kin_params); -bool init_kinect_frames(freenect_context **kin_ctx, freenect_device **kin_dev, KinectParams *kin_params); +bool init_kinect_frames(freenect_context *kin_ctx, freenect_device *kin_dev, KinectParams *kin_params); void stop_kinect_video_frames(freenect_device *kin_dev); void stop_kinect_depth_frames(freenect_device *kin_dev); diff -r db8f1c036d0e -r 4f1b8ddcd32e src/main.cc --- a/src/main.cc Sun Nov 03 20:36:45 2013 +0200 +++ b/src/main.cc Sun Nov 03 21:58:56 2013 +0200 @@ -27,7 +27,7 @@ if(!init_kinect(&kin_ctx, &kin_dev, &kin_params)) return 1; - if(!init_kinect_frames(&kin_ctx, &kin_dev, &kin_params)) { + if(!init_kinect_frames(kin_ctx, kin_dev, &kin_params)) { stop_kinect(kin_ctx, kin_dev); return 1; }