diff --git a/apps/projectGenerator b/apps/projectGenerator index a59f24da613..51f2ad14aad 160000 --- a/apps/projectGenerator +++ b/apps/projectGenerator @@ -1 +1 @@ -Subproject commit a59f24da613b6094cd22cdd15d5748eb221f9c1f +Subproject commit 51f2ad14aad8031ca1e0001791089d0742fa1699 diff --git a/libs/openFrameworks/utils/ofConstants.h b/libs/openFrameworks/utils/ofConstants.h index 5c959d2fafe..5a3dcd4d770 100644 --- a/libs/openFrameworks/utils/ofConstants.h +++ b/libs/openFrameworks/utils/ofConstants.h @@ -2,7 +2,7 @@ // version: ------------------------ #define OF_VERSION_MAJOR 0 -#define OF_VERSION_MINOR 12 +#define OF_VERSION_MINOR 13 #define OF_VERSION_PATCH 0 #define OF_VERSION_PRE_RELEASE "master" diff --git a/libs/openFrameworks/video/ofAVFoundationPlayer.h b/libs/openFrameworks/video/ofAVFoundationPlayer.h index 6491aa01dd6..f1277af8c38 100644 --- a/libs/openFrameworks/video/ofAVFoundationPlayer.h +++ b/libs/openFrameworks/video/ofAVFoundationPlayer.h @@ -27,8 +27,8 @@ class ofAVFoundationPlayer : public ofBaseVideoPlayer { ofAVFoundationPlayer(); ~ofAVFoundationPlayer(); - bool load(const of::filesystem::path & fileName) override; - void loadAsync(const of::filesystem::path & fileName) override; + bool load(const of::filesystem::path & fileName); + void loadAsync(const of::filesystem::path & fileName); void close(); void update(); diff --git a/libs/openFrameworks/video/ofVideoBaseTypes.h b/libs/openFrameworks/video/ofVideoBaseTypes.h index 395d3dc3dd5..2ba82e82a6d 100644 --- a/libs/openFrameworks/video/ofVideoBaseTypes.h +++ b/libs/openFrameworks/video/ofVideoBaseTypes.h @@ -209,6 +209,10 @@ class ofBaseVideoPlayer: virtual public ofBaseVideo{ /// \sa loadAsync() virtual bool load(const of::filesystem::path & fileName) = 0; + virtual bool load(std::string name) { + return load(of::filesystem::path(name)); + } + /// \brief Asynchronously load a video resource by name. /// /// The list of supported video types and sources (e.g. rtsp:// sources) is @@ -220,7 +224,9 @@ class ofBaseVideoPlayer: virtual public ofBaseVideo{ /// \param name The name of the video resource to load. /// \sa isLoaded() virtual void loadAsync(const of::filesystem::path & fileName); - + virtual bool loadAsync(std::string name) { + loadAsync(of::filesystem::path(name)); + } /// \brief Play the video from the current playhead position. /// /// \sa getPosition() diff --git a/libs/openFrameworks/video/ofVideoPlayer.h b/libs/openFrameworks/video/ofVideoPlayer.h index 314ff5c2ac6..8e265fdd974 100644 --- a/libs/openFrameworks/video/ofVideoPlayer.h +++ b/libs/openFrameworks/video/ofVideoPlayer.h @@ -11,6 +11,7 @@ class ofVideoPlayer : public ofBaseVideoDraws { bool load(const of::filesystem::path & fileName); void loadAsync(const of::filesystem::path & fileName); + [[deprecated("Use load")]] bool loadMovie(const of::filesystem::path & fileName);