wrappers/cpp: Call setVideoFormat() in constructor so getVideoFormat() return valid format - fixes OpenKinect#308

piedar · piedar · commit 3b74e9c30c96 · 2014-03-22T19:00:11.000-04:00
Signed-off-by: Benn Snyder &lt;benn.snyder@gmail.com&gt;
diff --git a/wrappers/cpp/libfreenect.hpp b/wrappers/cpp/libfreenect.hpp
@@ -67,8 +67,8 @@ namespace Freenect {
 		{
 			if(freenect_open_device(_ctx, &m_dev, _index) < 0) throw std::runtime_error("Cannot open Kinect");
 			freenect_set_user(m_dev, this);
-			freenect_set_video_mode(m_dev, freenect_find_video_mode(FREENECT_RESOLUTION_MEDIUM, FREENECT_VIDEO_RGB));
-			freenect_set_depth_mode(m_dev, freenect_find_depth_mode(FREENECT_RESOLUTION_MEDIUM, FREENECT_DEPTH_11BIT));
+			setVideoFormat(FREENECT_VIDEO_RGB,   FREENECT_RESOLUTION_MEDIUM);
+			setDepthFormat(FREENECT_DEPTH_11BIT, FREENECT_RESOLUTION_MEDIUM);
 			freenect_set_depth_callback(m_dev, freenect_depth_callback);
 			freenect_set_video_callback(m_dev, freenect_video_callback);
 		}

Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,8 @@ namespace Freenect {`
`67`	`67`	`{`
`68`	`68`	`if(freenect_open_device(_ctx, &m_dev, _index) < 0) throw std::runtime_error("Cannot open Kinect");`
`69`	`69`	`freenect_set_user(m_dev, this);`
`70`		`- freenect_set_video_mode(m_dev, freenect_find_video_mode(FREENECT_RESOLUTION_MEDIUM, FREENECT_VIDEO_RGB));`
`71`		`- freenect_set_depth_mode(m_dev, freenect_find_depth_mode(FREENECT_RESOLUTION_MEDIUM, FREENECT_DEPTH_11BIT));`
	`70`	`+ setVideoFormat(FREENECT_VIDEO_RGB, FREENECT_RESOLUTION_MEDIUM);`
	`71`	`+ setDepthFormat(FREENECT_DEPTH_11BIT, FREENECT_RESOLUTION_MEDIUM);`
`72`	`72`	`freenect_set_depth_callback(m_dev, freenect_depth_callback);`
`73`	`73`	`freenect_set_video_callback(m_dev, freenect_video_callback);`
`74`	`74`	`}`