Attempt to fix camera example to be compatible with ofxRPiCameraVideoGrabber 0.9.0-compatible release

example-camera/src/CameraSource.cpp

@@ -3,9 +3,18 @@
 CameraSource::CameraSource(){
 	name = "Camera Source";
 	
-	_cameraWidth = 320;
-    _cameraHeight = 240;
-	
+	_cameraWidth = 1280;
+    _cameraHeight = 720;
+	
+	#ifdef TARGET_RASPBERRY_PI
+		_omxCameraSettings.width = _cameraWidth;
+		_omxCameraSettings.height = _cameraHeight;
+		_omxCameraSettings.framerate = 30;
+		_omxCameraSettings.isUsingTexture = true;
+		_omxCameraSettings.doRecording = false;
+	
+		_videoGrabber.setup(omxCameraSettings);
+	#else
 		vector<ofVideoDevice> devices = _videoGrabber.listDevices();
 		_cameraFound = false;
 
@@ -21,20 +30,27 @@ CameraSource::CameraSource(){
 			_videoGrabber.setDeviceID(0);
 			_videoGrabber.setup(_cameraWidth, _cameraHeight);
 		}
+	#endif
 
 	allocate(_cameraWidth, _cameraHeight);
 }
 
 void CameraSource::update(){
+	#ifndef TARGET_RASPBERRY_PI
 		if(_videoGrabber.isInitialized()){
 			_videoGrabber.update();
 		}
+	#endif
 }
 
 void CameraSource::draw(){
 	ofClear(0);
 	ofSetHexColor(0xffffff);
-	
+	#ifdef TARGET_RASPBERRY_PI
+		ofDisableNormalizedTexCoords();
+		_videoGrabber.draw(0, 0);
+		ofEnableNormalizedTexCoords();
+	#else
 		if(_videoGrabber.isInitialized()){
 			ofDisableNormalizedTexCoords();
 			_videoGrabber.draw(0, 0);
@@ -42,4 +58,5 @@ void CameraSource::draw(){
 		}else{
 			ofDrawBitmapString("no camera", _cameraWidth / 2.0f - 40.0f, _cameraHeight / 2.0f + 10.0f);
 		}
+	#endif
 }

example-camera/src/CameraSource.h

@@ -10,7 +10,7 @@
 #include "FboSource.h"
 
 #ifdef TARGET_RASPBERRY_PI
-	#include "RPiVideoGrabber.h"
+	#include "ofxRPiCameraVideoGrabber.h"
 #endif
 
 class CameraSource : public ofx::piMapper::FboSource {
@@ -23,7 +23,8 @@ class CameraSource : public ofx::piMapper::FboSource {
 	private:
 	
 		#ifdef TARGET_RASPBERRY_PI
-			RPiVideoGrabber _videoGrabber;
+			OMXCameraSettings _omxCameraSettings;
+			ofxRPiCameraVideoGrabber _videoGrabber;
 		#else
 			ofVideoGrabber _videoGrabber;
 		#endif