diff --git a/example-camera/example-camera.xcodeproj/project.xcworkspace/xcuserdata/kr15h.xcuserdatad/UserInterfaceState.xcuserstate b/example-camera/example-camera.xcodeproj/project.xcworkspace/xcuserdata/kr15h.xcuserdatad/UserInterfaceState.xcuserstate index 2767758..d9de56e 100644 Binary files a/example-camera/example-camera.xcodeproj/project.xcworkspace/xcuserdata/kr15h.xcuserdatad/UserInterfaceState.xcuserstate and b/example-camera/example-camera.xcodeproj/project.xcworkspace/xcuserdata/kr15h.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/example-camera/src/CameraSource.cpp b/example-camera/src/CameraSource.cpp index 898f2a6..74db15d 100644 --- a/example-camera/src/CameraSource.cpp +++ b/example-camera/src/CameraSource.cpp @@ -9,13 +9,13 @@ CameraSource::CameraSource(){ vector devices = _videoGrabber.listDevices(); _cameraFound = false; - for(int i = 0; i < devices.size(); i++){ - if(devices[i].bAvailable){ - ofLogNotice() << devices[i].id << ": " << devices[i].deviceName; + for(int i = 0; i < devices.size(); i++){ + if(devices[i].bAvailable){ + ofLogNotice() << devices[i].id << ": " << devices[i].deviceName; _cameraFound = true; break; - } - } + } + } if(_cameraFound){ _videoGrabber.setDeviceID(0); diff --git a/example-camera/src/CameraSource.h b/example-camera/src/CameraSource.h index d6d9e3e..eeef906 100644 --- a/example-camera/src/CameraSource.h +++ b/example-camera/src/CameraSource.h @@ -9,6 +9,10 @@ #include "ofMain.h" #include "FboSource.h" +#ifdef TARGET_RASPBERRY_PI + #include "RPiVideoGrabber.h" +#endif + class CameraSource : public ofx::piMapper::FboSource { public: CameraSource(); @@ -17,7 +21,12 @@ class CameraSource : public ofx::piMapper::FboSource { void draw(); private: - ofVideoGrabber _videoGrabber; + + #ifdef TARGET_RASPBERRY_PI + RPiVideoGrabber _videoGrabber; + #else + ofVideoGrabber _videoGrabber; + #endif int _cameraWidth; int _cameraHeight; bool _cameraFound;