|
|
@ -6,7 +6,6 @@ namespace ofx { |
|
|
|
bool VideoSource::enableAudio = false; |
|
|
|
|
|
|
|
VideoSource::VideoSource() { |
|
|
|
//cout << "VideoSource constr" << endl;
|
|
|
|
loadable = true; |
|
|
|
loaded = false; |
|
|
|
type = SourceType::SOURCE_TYPE_VIDEO; |
|
|
@ -14,7 +13,6 @@ namespace ofx { |
|
|
|
omxPlayer = NULL; |
|
|
|
#else |
|
|
|
videoPlayer = NULL; |
|
|
|
|
|
|
|
#endif |
|
|
|
} |
|
|
|
|
|
|
@ -22,22 +20,18 @@ namespace ofx { |
|
|
|
|
|
|
|
void VideoSource::loadVideo(std::string & filePath) { |
|
|
|
path = filePath; |
|
|
|
//cout << "loading video: " << filePath << endl;
|
|
|
|
setNameFromPath(filePath); |
|
|
|
#ifdef TARGET_RASPBERRY_PI |
|
|
|
// Do things with the OMX player
|
|
|
|
ofxOMXPlayerSettings settings; |
|
|
|
settings.videoPath = filePath; |
|
|
|
settings.useHDMIForAudio = true; //default true
|
|
|
|
settings.enableTexture = true; //default true
|
|
|
|
settings.enableLooping = true; //default true
|
|
|
|
settings.enableAudio = VideoSource::enableAudio; //default true, save resources by disabling
|
|
|
|
//settings.doFlipTexture = true; //default false
|
|
|
|
settings.useHDMIForAudio = true; |
|
|
|
settings.enableTexture = true; |
|
|
|
settings.enableLooping = true; |
|
|
|
settings.enableAudio = VideoSource::enableAudio |
|
|
|
omxPlayer = new ofxOMXPlayer(); |
|
|
|
omxPlayer->setup(settings); |
|
|
|
texture = &(omxPlayer->getTextureReference()); |
|
|
|
#else |
|
|
|
// regular ofVideoPlayer
|
|
|
|
videoPlayer = new ofVideoPlayer(); |
|
|
|
videoPlayer->loadMovie(filePath); |
|
|
|
videoPlayer->setLoopState(OF_LOOP_NORMAL); |
|
|
@ -62,8 +56,6 @@ namespace ofx { |
|
|
|
delete videoPlayer; |
|
|
|
videoPlayer = NULL; |
|
|
|
#endif |
|
|
|
//path = "";
|
|
|
|
//name = "";
|
|
|
|
loaded = false; |
|
|
|
} |
|
|
|
|
|
|
@ -74,5 +66,5 @@ namespace ofx { |
|
|
|
} |
|
|
|
} |
|
|
|
#endif |
|
|
|
} |
|
|
|
} |
|
|
|
} // namespace piMapper
|
|
|
|
} // namespace ofx
|