search

jvcleave / ofxRPiCameraVideoGrabber

development of ofxRPiCameraVideoGrabber, an addon to control the native Raspberry Pi camera in openFrameworks
89 stars 17 forks source link

Redifinition of DirectDisplayOptions #21

Closed kr15h closed 8 years ago

kr15h commented 8 years ago

When using together with ofxOMXPlayer, this error happens.

/home/pi/openFrameworks/addons/ofxRPiCameraVideoGrabber/src/DirectDisplay.h:7:7: error: redefinition of ‘class DirectDisplayOptions’
 class DirectDisplayOptions
       ^
In file included from /home/pi/openFrameworks/addons/ofxOMXPlayer/src/ofxOMXPlayer.h:5:0,
                 from /home/pi/openFrameworks/addons/ofxPiMapper/src/Sources/VideoSource.h:7,
                 from /home/pi/openFrameworks/addons/ofxPiMapper/src/MediaServer/MediaServer.h:22,
                 from /home/pi/openFrameworks/addons/ofxPiMapper/src/Surfaces/SurfaceManager.h:7,
                 from /home/pi/openFrameworks/addons/ofxPiMapper/src/ofxPiMapper.h:4,
                 from /home/pi/openFrameworks/addons/ofxPiMapper/example-camera/src/ofApp.h:13,
                 from /home/pi/openFrameworks/addons/ofxPiMapper/example-camera/src/main.cpp:2:
/home/pi/openFrameworks/addons/ofxOMXPlayer/src/ofxOMXPlayerSettings.h:9:7: error: previous definition of ‘class DirectDisplayOptions’
 class DirectDisplayOptions
kr15h commented 8 years ago

Maybe using namespaces could help here. If the code is different. Else adding #pragma once?

jvcleave commented 8 years ago

yeah - there is quite a bit of overlap that needs cleaned up

jvcleave commented 8 years ago

should be good with these (a lot of other stuff changed though so may be easier for you to just do local changes)

https://github.com/jvcleave/ofxOMXPlayer/commit/b4d6a78ba036adb82a314b1496e0cd61faae6448 https://github.com/jvcleave/ofxRPiCameraVideoGrabber/commit/1112f3bc90f56a1ed63079e0848b32c24ab8f241