diff --git a/src/Sources/VideoSource.cpp b/src/Sources/VideoSource.cpp index dd3dc55..022c370 100644 --- a/src/Sources/VideoSource.cpp +++ b/src/Sources/VideoSource.cpp @@ -11,7 +11,7 @@ VideoSource::VideoSource(){ loaded = false; type = SourceType::SOURCE_TYPE_VIDEO; #ifdef TARGET_RASPBERRY_PI - omxPlayer = 0; + _omxPlayer = 0; #else _videoPlayer = 0; _initialVolumeSet = false; @@ -22,8 +22,8 @@ void VideoSource::loadVideo(string & filePath){ path = filePath; setNameFromPath(filePath); #ifdef TARGET_RASPBERRY_PI - omxPlayer = OMXPlayerCache::instance()->load(filePath); - texture = &(omxPlayer->getTextureReference()); + _omxPlayer = OMXPlayerCache::instance()->load(filePath); + texture = &(_omxPlayer->getTextureReference()); #else _videoPlayer = make_unique(); _videoPlayer->load(filePath); @@ -52,7 +52,7 @@ void VideoSource::clear(){ void VideoSource::togglePause(){ #ifdef TARGET_RASPBERRY_PI - omxPlayer->togglePause(); + _omxPlayer->togglePause(); #else _videoPlayer->setPaused(!_videoPlayer->isPaused()); #endif diff --git a/src/Sources/VideoSource.h b/src/Sources/VideoSource.h index b614b18..18726c9 100644 --- a/src/Sources/VideoSource.h +++ b/src/Sources/VideoSource.h @@ -34,7 +34,7 @@ class VideoSource : public BaseSource { private: #ifdef TARGET_RASPBERRY_PI - ofxOMXPlayer * omxPlayer; // Naming different for less confusion + ofxOMXPlayer * _omxPlayer; #else unique_ptr _videoPlayer; bool _initialVolumeSet;