From 43792d680ec8e09080ad564d7d506b31fafa4bc0 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 29 Sep 2024 22:00:02 -0300 Subject: [PATCH 1/5] video fs::path --- .../video/ofAVFoundationPlayer.h | 8 +++--- .../video/ofAVFoundationPlayer.mm | 25 ++++++++++--------- .../video/ofDirectShowPlayer.cpp | 5 ++-- .../openFrameworks/video/ofDirectShowPlayer.h | 2 +- .../openFrameworks/video/ofGstVideoPlayer.cpp | 11 ++++---- libs/openFrameworks/video/ofVideoBaseTypes.h | 6 ++--- libs/openFrameworks/video/ofVideoPlayer.cpp | 19 +++++++------- libs/openFrameworks/video/ofVideoPlayer.h | 10 ++++---- 8 files changed, 43 insertions(+), 43 deletions(-) diff --git a/libs/openFrameworks/video/ofAVFoundationPlayer.h b/libs/openFrameworks/video/ofAVFoundationPlayer.h index f11757f1a44..37093750afb 100644 --- a/libs/openFrameworks/video/ofAVFoundationPlayer.h +++ b/libs/openFrameworks/video/ofAVFoundationPlayer.h @@ -28,8 +28,8 @@ class ofAVFoundationPlayer : public ofBaseVideoPlayer { ~ofAVFoundationPlayer(); //FIXME: FS - bool load(std::string name); - void loadAsync(std::string name); + bool load(const of::filesystem::path & fileName); + void loadAsync(const of::filesystem::path & fileName); void close(); void update(); @@ -88,7 +88,7 @@ class ofAVFoundationPlayer : public ofBaseVideoPlayer { #endif [[deprecated("use load()")]] - bool loadMovie(std::string name); + bool loadMovie(const of::filesystem::path & fileName); [[deprecated("use getPixels()")]] ofPixels & getPixelsRef(); [[deprecated("use getPixels()")]] @@ -98,7 +98,7 @@ class ofAVFoundationPlayer : public ofBaseVideoPlayer { protected: - bool loadPlayer(std::string name, bool bAsync); + bool loadPlayer(const of::filesystem::path & fileName, bool bAsync); void disposePlayer(); bool isReady() const; diff --git a/libs/openFrameworks/video/ofAVFoundationPlayer.mm b/libs/openFrameworks/video/ofAVFoundationPlayer.mm index d14f197ed8f..f16dd660d24 100644 --- a/libs/openFrameworks/video/ofAVFoundationPlayer.mm +++ b/libs/openFrameworks/video/ofAVFoundationPlayer.mm @@ -52,31 +52,32 @@ } //-------------------------------------------------------------- -void ofAVFoundationPlayer::loadAsync(std::string name){ - loadPlayer(name, true); +void ofAVFoundationPlayer::loadAsync(const of::filesystem::path & fileName){ + loadPlayer(fileName, true); } //-------------------------------------------------------------- -bool ofAVFoundationPlayer::load(std::string name) { - return loadPlayer(name, false); +bool ofAVFoundationPlayer::load(const of::filesystem::path & fileName) { + return loadPlayer(fileName, false); } //-------------------------------------------------------------- // FIXME: fs::path -bool ofAVFoundationPlayer::loadPlayer(std::string name, bool bAsync) { +bool ofAVFoundationPlayer::loadPlayer(const of::filesystem::path & fileName, bool bAsync) { if( ofGetUsingArbTex() == false ){ killTextureCache(); bUseTextureCache = false; } - NSString * videoPath = [NSString stringWithUTF8String:name.c_str()]; - NSString * videoLocalPath = [NSString stringWithUTF8String:ofToDataPath(name).c_str()]; + NSString * videoPath = [NSString stringWithUTF8String:fileName.c_str()]; + NSString * videoLocalPath = [NSString stringWithUTF8String:ofToDataPath(fileName).c_str()]; BOOL bStream = NO; - bStream = bStream || (ofIsStringInString(name, "http://")); - bStream = bStream || (ofIsStringInString(name, "https://")); - bStream = bStream || (ofIsStringInString(name, "rtsp://")); + string fileNameStr { ofPathToString(fileName) }; + bStream = bStream || (ofIsStringInString(fileNameStr, "http://")); + bStream = bStream || (ofIsStringInString(fileNameStr, "https://")); + bStream = bStream || (ofIsStringInString(fileNameStr, "rtsp://")); NSURL * url = nil; if(bStream == YES) { @@ -762,8 +763,8 @@ #endif //-------------------------------------------------------------- DEPRECATED. -bool ofAVFoundationPlayer::loadMovie(std::string name) { - return load(name); +bool ofAVFoundationPlayer::loadMovie(const of::filesystem::path & fileName) { + return load(fileName); } ofPixels & ofAVFoundationPlayer::getPixelsRef() { diff --git a/libs/openFrameworks/video/ofDirectShowPlayer.cpp b/libs/openFrameworks/video/ofDirectShowPlayer.cpp index 8dae2b2eec8..3bd47b79ad1 100644 --- a/libs/openFrameworks/video/ofDirectShowPlayer.cpp +++ b/libs/openFrameworks/video/ofDirectShowPlayer.cpp @@ -1146,9 +1146,8 @@ ofDirectShowPlayer & ofDirectShowPlayer::operator=(ofDirectShowPlayer&& other) { return *this; } -// FIXME: fs::path -bool ofDirectShowPlayer::load(std::string stringPath){ - auto path = ofToDataPath(of::filesystem::path(stringPath)); +bool ofDirectShowPlayer::load(const of::filesystem::path & fileName){ + auto path = ofToDataPath(fileName); close(); player.reset(new DirectShowVideo()); diff --git a/libs/openFrameworks/video/ofDirectShowPlayer.h b/libs/openFrameworks/video/ofDirectShowPlayer.h index f23a23b362b..94c01cc8bf0 100644 --- a/libs/openFrameworks/video/ofDirectShowPlayer.h +++ b/libs/openFrameworks/video/ofDirectShowPlayer.h @@ -20,7 +20,7 @@ class ofDirectShowPlayer : public ofBaseVideoPlayer{ ofDirectShowPlayer(ofDirectShowPlayer &&); ofDirectShowPlayer & operator=(ofDirectShowPlayer&&); - bool load(std::string path); + bool load(const of::filesystem::path & fileName); void update(); void close(); diff --git a/libs/openFrameworks/video/ofGstVideoPlayer.cpp b/libs/openFrameworks/video/ofGstVideoPlayer.cpp index 62313d6523e..15c125787c3 100644 --- a/libs/openFrameworks/video/ofGstVideoPlayer.cpp +++ b/libs/openFrameworks/video/ofGstVideoPlayer.cpp @@ -187,13 +187,14 @@ bool ofGstVideoPlayer::createPipeline(std::string name){ #endif } -void ofGstVideoPlayer::loadAsync(std::string name){ +void ofGstVideoPlayer::loadAsync(const of::filesystem::path & fileName){ bAsyncLoad = true; - load(name); + load(fileName); } // FIXME: fs::path -bool ofGstVideoPlayer::load(std::string name){ +bool ofGstVideoPlayer::load(const of::filesystem::path & fileName){ + std::string name { ofPathToString(fileName) }; if( name.find( "file://",0 ) != std::string::npos){ bIsStream = bAsyncLoad; }else if( name.find( "://",0 ) == std::string::npos){ @@ -217,7 +218,7 @@ bool ofGstVideoPlayer::load(std::string name){ internalPixelFormat = OF_PIXELS_NATIVE; bIsAllocated = false; videoUtils.reallocateOnNextFrame(); - g_object_set(G_OBJECT(videoUtils.getPipeline()), "uri", name.c_str(), (void*)NULL); + g_object_set(G_OBJECT(videoUtils.getPipeline()), "uri", fileName.c_str(), (void*)NULL); gst_element_set_state (videoUtils.getPipeline(), GST_STATE_PAUSED); if(!bIsStream){ gst_element_get_state (videoUtils.getPipeline(), NULL, NULL, -1); @@ -227,7 +228,7 @@ bool ofGstVideoPlayer::load(std::string name){ } }else{ ofGstUtils::startGstMainLoop(); - return createPipeline(name) && + return createPipeline(fileName) && videoUtils.startPipeline() && (bIsStream || allocate()); } diff --git a/libs/openFrameworks/video/ofVideoBaseTypes.h b/libs/openFrameworks/video/ofVideoBaseTypes.h index 0ae647b491c..395d3dc3dd5 100644 --- a/libs/openFrameworks/video/ofVideoBaseTypes.h +++ b/libs/openFrameworks/video/ofVideoBaseTypes.h @@ -207,8 +207,8 @@ class ofBaseVideoPlayer: virtual public ofBaseVideo{ /// \param name The name of the video resource to load. /// \return True if the video was loaded successfully. /// \sa loadAsync() - // FIXME: FS - virtual bool load(std::string name) = 0; + + virtual bool load(const of::filesystem::path & fileName) = 0; /// \brief Asynchronously load a video resource by name. /// /// The list of supported video types and sources (e.g. rtsp:// sources) is @@ -219,7 +219,7 @@ class ofBaseVideoPlayer: virtual public ofBaseVideo{ /// /// \param name The name of the video resource to load. /// \sa isLoaded() - virtual void loadAsync(std::string name); + virtual void loadAsync(const of::filesystem::path & fileName); /// \brief Play the video from the current playhead position. /// diff --git a/libs/openFrameworks/video/ofVideoPlayer.cpp b/libs/openFrameworks/video/ofVideoPlayer.cpp index 8912b61a3bb..9aa4bddf58f 100644 --- a/libs/openFrameworks/video/ofVideoPlayer.cpp +++ b/libs/openFrameworks/video/ofVideoPlayer.cpp @@ -96,8 +96,7 @@ ofVideoPlayer::ofVideoPlayer() { //--------------------------------------------------------------------------- ofVideoPlayer::ofVideoPlayer(const of::filesystem::path & fileName) : ofVideoPlayer() { - // FIXME: Convert internally everything to FS - load(ofPathToString(fileName)); + load(fileName); } //--------------------------------------------------------------------------- @@ -152,16 +151,16 @@ ofPixelFormat ofVideoPlayer::getPixelFormat() const{ } //--------------------------------------------------------------------------- -bool ofVideoPlayer::load(string name){ +bool ofVideoPlayer::load(const of::filesystem::path & fileName){ if( !player ){ setPlayer(std::make_shared()); player->setPixelFormat(internalPixelFormat); } - bool bOk = player->load(name); + bool bOk = player->load(fileName); if( bOk){ - moviePath = name; + moviePath = fileName; if(bUseTexture){ if(player->getTexturePtr()==nullptr){ if(tex.empty()) { @@ -185,19 +184,19 @@ bool ofVideoPlayer::load(string name){ } //--------------------------------------------------------------------------- -void ofVideoPlayer::loadAsync(string name){ +void ofVideoPlayer::loadAsync(const of::filesystem::path & fileName){ if( !player ){ setPlayer(std::make_shared()); player->setPixelFormat(internalPixelFormat); } - player->loadAsync(name); - moviePath = name; + player->loadAsync(fileName); + moviePath = fileName; } //--------------------------------------------------------------------------- -bool ofVideoPlayer::loadMovie(string name){ - return load(name); +bool ofVideoPlayer::loadMovie(const of::filesystem::path & fileName){ + return load(fileName); } //--------------------------------------------------------------------------- diff --git a/libs/openFrameworks/video/ofVideoPlayer.h b/libs/openFrameworks/video/ofVideoPlayer.h index e496453caab..314ff5c2ac6 100644 --- a/libs/openFrameworks/video/ofVideoPlayer.h +++ b/libs/openFrameworks/video/ofVideoPlayer.h @@ -9,10 +9,10 @@ class ofVideoPlayer : public ofBaseVideoDraws { ofVideoPlayer(); ofVideoPlayer(const of::filesystem::path & fileName); - bool load(std::string name); - void loadAsync(std::string name); + bool load(const of::filesystem::path & fileName); + void loadAsync(const of::filesystem::path & fileName); [[deprecated("Use load")]] - bool loadMovie(std::string name); + bool loadMovie(const of::filesystem::path & fileName); /// \brief Get the path to the loaded video file. @@ -20,7 +20,7 @@ class ofVideoPlayer : public ofBaseVideoDraws { /// If no video file is loaded this returns an empty string. /// /// \returns A path to the loaded video or an empty string if not loaded. - std::string getMoviePath() const; + of::filesystem::path getMoviePath() const; bool setPixelFormat(ofPixelFormat pixelFormat); ofPixelFormat getPixelFormat() const; @@ -186,5 +186,5 @@ class ofVideoPlayer : public ofBaseVideoDraws { /// \brief The internal pixel format. mutable ofPixelFormat internalPixelFormat; /// \brief The stored path to the video's path. - std::string moviePath; + of::filesystem::path moviePath; }; From 27b9809de863bf240a65d6bcf8eb3a283ea743f2 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 30 Sep 2024 00:05:32 -0300 Subject: [PATCH 2/5] updates --- addons/ofxEmscripten/src/ofxEmscriptenVideoPlayer.cpp | 7 ++++--- addons/ofxEmscripten/src/ofxEmscriptenVideoPlayer.h | 2 +- libs/openFrameworks/types/ofBaseTypes.cpp | 4 ++-- libs/openFrameworks/video/ofVideoPlayer.cpp | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/addons/ofxEmscripten/src/ofxEmscriptenVideoPlayer.cpp b/addons/ofxEmscripten/src/ofxEmscriptenVideoPlayer.cpp index 7cce165fc4e..f2ff980f152 100644 --- a/addons/ofxEmscripten/src/ofxEmscriptenVideoPlayer.cpp +++ b/addons/ofxEmscripten/src/ofxEmscriptenVideoPlayer.cpp @@ -28,11 +28,12 @@ ofxEmscriptenVideoPlayer::~ofxEmscriptenVideoPlayer() { html5video_player_delete(player_id); } -bool ofxEmscriptenVideoPlayer::load(string name){ +bool ofxEmscriptenVideoPlayer::load(const of::filesystem::path & fileName){ + std::string name = ofPathToString(fileName); if (name.substr(0, 7) == "http://" || name.substr(0, 8) == "https://"){ - html5video_player_load_url(player_id, name.c_str()); + html5video_player_load_url(player_id, fileName.c_str()); } else{ - html5video_player_load(player_id, ofToDataPath(name).c_str()); + html5video_player_load(player_id, ofToDataPath(fileName).c_str()); } return true; } diff --git a/addons/ofxEmscripten/src/ofxEmscriptenVideoPlayer.h b/addons/ofxEmscripten/src/ofxEmscriptenVideoPlayer.h index d94d00a3824..2687a6f77e6 100644 --- a/addons/ofxEmscripten/src/ofxEmscriptenVideoPlayer.h +++ b/addons/ofxEmscripten/src/ofxEmscriptenVideoPlayer.h @@ -16,7 +16,7 @@ class ofxEmscriptenVideoPlayer: public ofBaseVideoPlayer { ~ofxEmscriptenVideoPlayer(); //needs implementing - bool load(const std::string fileName); + bool load(const of::filesystem::path & fileName); void close(); void update(); diff --git a/libs/openFrameworks/types/ofBaseTypes.cpp b/libs/openFrameworks/types/ofBaseTypes.cpp index f9ce9d11dce..146712a8fa5 100644 --- a/libs/openFrameworks/types/ofBaseTypes.cpp +++ b/libs/openFrameworks/types/ofBaseTypes.cpp @@ -47,9 +47,9 @@ ofBaseVideoPlayer::~ofBaseVideoPlayer(){ } -void ofBaseVideoPlayer::loadAsync(std::string name){ +void ofBaseVideoPlayer::loadAsync(const of::filesystem::path & fileName){ ofLogWarning("ofBaseVideoPlayer") << "loadAsync() not implemented, loading synchronously"; - load(name); + load(fileName); } //--------------------------------------------------------------------------- diff --git a/libs/openFrameworks/video/ofVideoPlayer.cpp b/libs/openFrameworks/video/ofVideoPlayer.cpp index 9aa4bddf58f..bc84360afe6 100644 --- a/libs/openFrameworks/video/ofVideoPlayer.cpp +++ b/libs/openFrameworks/video/ofVideoPlayer.cpp @@ -200,7 +200,7 @@ bool ofVideoPlayer::loadMovie(const of::filesystem::path & fileName){ } //--------------------------------------------------------------------------- -string ofVideoPlayer::getMoviePath() const{ +of::filesystem::path ofVideoPlayer::getMoviePath() const { return moviePath; } From a0b0867472e941fe00d9a1c51dcda51fe6c83f2c Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 30 Sep 2024 00:24:23 -0300 Subject: [PATCH 3/5] override --- libs/openFrameworks/video/ofAVFoundationPlayer.h | 5 ++--- libs/openFrameworks/video/ofDirectShowPlayer.h | 2 +- libs/openFrameworks/video/ofGstVideoPlayer.h | 4 ++-- .../video/ofMediaFoundationPlayer.cpp | 13 +++++++------ libs/openFrameworks/video/ofMediaFoundationPlayer.h | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libs/openFrameworks/video/ofAVFoundationPlayer.h b/libs/openFrameworks/video/ofAVFoundationPlayer.h index 37093750afb..6491aa01dd6 100644 --- a/libs/openFrameworks/video/ofAVFoundationPlayer.h +++ b/libs/openFrameworks/video/ofAVFoundationPlayer.h @@ -27,9 +27,8 @@ class ofAVFoundationPlayer : public ofBaseVideoPlayer { ofAVFoundationPlayer(); ~ofAVFoundationPlayer(); - //FIXME: FS - bool load(const of::filesystem::path & fileName); - void loadAsync(const of::filesystem::path & fileName); + bool load(const of::filesystem::path & fileName) override; + void loadAsync(const of::filesystem::path & fileName) override; void close(); void update(); diff --git a/libs/openFrameworks/video/ofDirectShowPlayer.h b/libs/openFrameworks/video/ofDirectShowPlayer.h index 94c01cc8bf0..85e3e3536f5 100644 --- a/libs/openFrameworks/video/ofDirectShowPlayer.h +++ b/libs/openFrameworks/video/ofDirectShowPlayer.h @@ -20,7 +20,7 @@ class ofDirectShowPlayer : public ofBaseVideoPlayer{ ofDirectShowPlayer(ofDirectShowPlayer &&); ofDirectShowPlayer & operator=(ofDirectShowPlayer&&); - bool load(const of::filesystem::path & fileName); + bool load(const of::filesystem::path & fileName) override; void update(); void close(); diff --git a/libs/openFrameworks/video/ofGstVideoPlayer.h b/libs/openFrameworks/video/ofGstVideoPlayer.h index 526a4adea2f..a1bb7ca3a78 100644 --- a/libs/openFrameworks/video/ofGstVideoPlayer.h +++ b/libs/openFrameworks/video/ofGstVideoPlayer.h @@ -13,8 +13,8 @@ class ofGstVideoPlayer: public ofBaseVideoPlayer, public ofGstAppSink{ bool setPixelFormat(ofPixelFormat pixelFormat); ofPixelFormat getPixelFormat() const; - void loadAsync(std::string name); - bool load(std::string uri); + void loadAsync(const of::filesystem::path & fileName) override; + bool load(const of::filesystem::path & fileName) override; void update(); diff --git a/libs/openFrameworks/video/ofMediaFoundationPlayer.cpp b/libs/openFrameworks/video/ofMediaFoundationPlayer.cpp index 84fc84f516c..338e10f4120 100644 --- a/libs/openFrameworks/video/ofMediaFoundationPlayer.cpp +++ b/libs/openFrameworks/video/ofMediaFoundationPlayer.cpp @@ -658,19 +658,20 @@ std::shared_ptr ofMediaFoundationPla } //---------------------------------------------- -bool ofMediaFoundationPlayer::load(std::string name) { - return _load(name, false); +bool ofMediaFoundationPlayer::load(const of::filesystem::path & fileName) { + return _load(fileName, false); } //---------------------------------------------- -void ofMediaFoundationPlayer::loadAsync(std::string name) { - _load(name, true); +void ofMediaFoundationPlayer::loadAsync(const of::filesystem::path & fileName) { + _load(fileName, true); } //---------------------------------------------- -bool ofMediaFoundationPlayer::_load(std::string name, bool abAsync) { +bool ofMediaFoundationPlayer::_load(const of::filesystem::path & fileName, bool abAsync) { close(); + std::string name = ofPathToString(fileName); mBLoadAsync = abAsync; bool bStream = false; @@ -679,7 +680,7 @@ bool ofMediaFoundationPlayer::_load(std::string name, bool abAsync) { bStream = bStream || ofIsStringInString(name, "rtsp://"); bStream = bStream || ofIsStringInString(name, "rtmp://"); - of::filesystem::path absPath = name; + of::filesystem::path absPath = fileName; if (!bStream) { if (ofFile::doesFileExist(absPath)) { diff --git a/libs/openFrameworks/video/ofMediaFoundationPlayer.h b/libs/openFrameworks/video/ofMediaFoundationPlayer.h index 7e53a177956..eb22dd50d25 100644 --- a/libs/openFrameworks/video/ofMediaFoundationPlayer.h +++ b/libs/openFrameworks/video/ofMediaFoundationPlayer.h @@ -99,9 +99,9 @@ class ofMediaFoundationPlayer : public ofBaseVideoPlayer, public of::MediaEngine static void setDurationHackEnabled(bool ab); - bool load(std::string name) override; - void loadAsync(std::string name) override; - void close() override; + bool load(const of::filesystem::path & fileName) override; + void loadAsync(const of::filesystem::path & fileName) override; + void close() override; bool isInitialized() const override; From f7292a45964c68cba4187ffd7639dac30ff4990c Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 7 Oct 2024 15:17:27 -0300 Subject: [PATCH 4/5] more fixes --- addons/ofxiOS/src/video/ofxiOSVideoPlayer.h | 4 ++-- addons/ofxiOS/src/video/ofxiOSVideoPlayer.mm | 8 ++++---- libs/openFrameworks/video/ofMediaFoundationPlayer.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/ofxiOS/src/video/ofxiOSVideoPlayer.h b/addons/ofxiOS/src/video/ofxiOSVideoPlayer.h index 1ce0b787680..866a8304b6c 100644 --- a/addons/ofxiOS/src/video/ofxiOSVideoPlayer.h +++ b/addons/ofxiOS/src/video/ofxiOSVideoPlayer.h @@ -15,7 +15,7 @@ class ofxiOSVideoPlayer : public ofBaseVideoPlayer { void enableTextureCache(); void disableTextureCache(); - bool load(std::string name); + bool load(const of::filesystem::path & fileName); void close(); void update(); @@ -62,7 +62,7 @@ class ofxiOSVideoPlayer : public ofBaseVideoPlayer { void * getAVFoundationVideoPlayer(); [[deprecated("use load()")]] - bool loadMovie(std::string name); + bool loadMovie(const of::filesystem::path & fileName); [[deprecated("use getPixels()")]] ofPixels & getPixelsRef(); [[deprecated("use getPixels()")]] diff --git a/addons/ofxiOS/src/video/ofxiOSVideoPlayer.mm b/addons/ofxiOS/src/video/ofxiOSVideoPlayer.mm index b467e2b5785..d4356ebd07a 100644 --- a/addons/ofxiOS/src/video/ofxiOSVideoPlayer.mm +++ b/addons/ofxiOS/src/video/ofxiOSVideoPlayer.mm @@ -41,14 +41,14 @@ } //---------------------------------------- -bool ofxiOSVideoPlayer::load(string name) { +bool ofxiOSVideoPlayer::load(const of::filesystem::path & fileName) { if(!videoPlayer) { videoPlayer = (__bridge_retained void *)[[AVFoundationVideoPlayer alloc] init]; [(__bridge AVFoundationVideoPlayer *)videoPlayer setWillBeUpdatedExternally:YES]; } - NSString * videoPath = [NSString stringWithUTF8String:ofToDataPath(name).c_str()]; + NSString * videoPath = [NSString stringWithUTF8String:ofToDataPath(fileName).c_str()]; [(__bridge AVFoundationVideoPlayer*)videoPlayer loadWithPath:videoPath]; bResetPixels = true; @@ -589,8 +589,8 @@ } //---------------------------------------- DEPRECATED. -bool ofxiOSVideoPlayer::loadMovie(string name) { - return load(name); +bool ofxiOSVideoPlayer::loadMovie(const of::filesystem::path & fileName) { + return load(fileName); } ofPixels & ofxiOSVideoPlayer::getPixelsRef() { diff --git a/libs/openFrameworks/video/ofMediaFoundationPlayer.h b/libs/openFrameworks/video/ofMediaFoundationPlayer.h index eb22dd50d25..7ac3a75daef 100644 --- a/libs/openFrameworks/video/ofMediaFoundationPlayer.h +++ b/libs/openFrameworks/video/ofMediaFoundationPlayer.h @@ -159,7 +159,7 @@ class ofMediaFoundationPlayer : public ofBaseVideoPlayer, public of::MediaEngine ofEvent MFErrorEvent; protected: - bool _load(std::string name, bool abAsync); + bool _load(const of::filesystem::path & fileName, bool abAsync); void OnMediaEngineEvent(DWORD aEvent, DWORD_PTR param1, DWORD param2) override; class MEDXDeviceManager { From c5399d796690e3f8265b6b570ad169675f96f684 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Mon, 7 Oct 2024 15:18:15 -0300 Subject: [PATCH 5/5] more fixes --- libs/openFrameworks/video/ofAVFoundationPlayer.mm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/openFrameworks/video/ofAVFoundationPlayer.mm b/libs/openFrameworks/video/ofAVFoundationPlayer.mm index f16dd660d24..fca50131ae1 100644 --- a/libs/openFrameworks/video/ofAVFoundationPlayer.mm +++ b/libs/openFrameworks/video/ofAVFoundationPlayer.mm @@ -62,7 +62,6 @@ } //-------------------------------------------------------------- -// FIXME: fs::path bool ofAVFoundationPlayer::loadPlayer(const of::filesystem::path & fileName, bool bAsync) { if( ofGetUsingArbTex() == false ){ killTextureCache(); @@ -74,7 +73,7 @@ BOOL bStream = NO; - string fileNameStr { ofPathToString(fileName) }; + std::string fileNameStr { ofPathToString(fileName) }; bStream = bStream || (ofIsStringInString(fileNameStr, "http://")); bStream = bStream || (ofIsStringInString(fileNameStr, "https://")); bStream = bStream || (ofIsStringInString(fileNameStr, "rtsp://"));