switched from ofxHapPlayer to native OF video player due to some incompatibility issues with of0.11.2

Author: d3cod3

README.md

@@ -77,8 +77,6 @@ In order to build ofxVisualProgramming, you'll need this addons:
 
 #### [ofxJSON](https://github.com/jeffcrouse/ofxJSON)
 
-#### [ofxHapPlayer](https://github.com/d3cod3/ofxHapPlayer)
-
 #### [ofxImGui](https://github.com/d3cod3/ofxImGui)
 
 #### [ofxInfiniteCanvas](https://github.com/d3cod3/ofxInfiniteCanvas)
@@ -122,7 +120,6 @@ git clone https://github.com/arturoc/ofxEasing
 git clone https://github.com/d3cod3/ofxFFmpegRecorder
 git clone https://github.com/kylemcdonald/ofxFft
 git clone https://github.com/jeffcrouse/ofxJSON
-git clone --branch=libavformat https://github.com/d3cod3/ofxHapPlayer
 git clone https://github.com/d3cod3/ofxImGui
 git clone https://github.com/d3cod3/ofxInfiniteCanvas
 git clone https://github.com/danomatika/ofxLua
@@ -396,8 +393,6 @@ ofxFFmpegRecorder original addon by [Furkan Üzümcü](https://github.com/Furkan
 
 ofxJSON original addon by [Jeff Crouse](https://github.com/jeffcrouse/)
 
-ofxHapPlayer original addon by [Tom Butterworth](https://github.com/bangnoise)
-
 ofxImGui original addon by [Jason Van Cleave](https://github.com/jvcleave)
 
 ofxInfiniteCanvas original addon by [Roy Macdonald](https://github.com/roymacdonald)

addon_config.mk

@@ -73,7 +73,7 @@ common:
 
 
 linux64:
-        ADDON_DEPENDENCIES += ofxHapPlayer ofxNDI
+        ADDON_DEPENDENCIES += ofxNDI
         ADDON_SOURCES_EXCLUDE = src/objects/video/SyphonSender% src/objects/video/SyphonReceiver%
 
 msys2:
@@ -83,4 +83,4 @@ vs:
         ADDON_SOURCES_EXCLUDE = src/objects/scripting/BashScript% src/objects/video/VideoSender% src/objects/video/VideoReceiver% src/objects/video/SyphonSender% src/objects/video/SyphonReceiver%
 
 osx:
-        ADDON_DEPENDENCIES += ofxHapPlayer ofxNDI ofxSyphon
+        ADDON_DEPENDENCIES += ofxNDI ofxSyphon

src/objects/video/VideoPlayer.cpp

@@ -55,11 +55,7 @@ VideoPlayer::VideoPlayer() : PatchObject("video player"){
 
     this->initInletsState();
 
-    #ifndef TARGET_WIN32
-        video = new ofxHapPlayer();
-    #else
-        video = new ofVideoPlayer();
-    #endif
+    video = new ofVideoPlayer();
 
     lastMessage         = "";
     isNewObject         = false;
@@ -156,12 +152,7 @@ void VideoPlayer::drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRen
             static_cast<ofTexture *>(_outletParams[0])->allocate(video->getWidth(),video->getHeight(),GL_RGB);
             static_cast<ofTexture *>(_outletParams[0])->clear();
         }else{
-            //static_cast<ofTexture *>(_outletParams[0])->loadData(video->getPixels());
-            #ifndef TARGET_WIN32
-                *static_cast<ofTexture *>(_outletParams[0]) = *video->getTexture();
-            #else
-                static_cast<ofTexture *>(_outletParams[0])->loadData(video->getPixels());
-            #endif
+            static_cast<ofTexture *>(_outletParams[0])->loadData(video->getPixels());
         }
 
         // listen to message control (_inletParams[0])
@@ -242,17 +233,7 @@ void VideoPlayer::drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRen
 
             // draw node texture preview with OF
             if(scaledObjW*canvasZoom > 90.0f){
-                #ifndef TARGET_WIN32
-                if(video->getShader()){
-                    video->getShader()->begin();
-                    drawNodeOFTexture(*static_cast<ofTexture *>(_outletParams[0]), posX, posY, drawW, drawH, objOriginX, objOriginY, scaledObjW, scaledObjH, canvasZoom, this->scaleFactor);
-                    video->getShader()->end();
-                }else{
-                    drawNodeOFTexture(*static_cast<ofTexture *>(_outletParams[0]), posX, posY, drawW, drawH, objOriginX, objOriginY, scaledObjW, scaledObjH, canvasZoom, this->scaleFactor);
-                }
-                #else
-                    drawNodeOFTexture(*static_cast<ofTexture *>(_outletParams[0]), posX, posY, drawW, drawH, objOriginX, objOriginY, scaledObjW, scaledObjH, canvasZoom, this->scaleFactor);
-                #endif
+                drawNodeOFTexture(*static_cast<ofTexture *>(_outletParams[0]), posX, posY, drawW, drawH, objOriginX, objOriginY, scaledObjW, scaledObjH, canvasZoom, this->scaleFactor);
             }
         }
 
@@ -327,16 +308,6 @@ void VideoPlayer::drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ){
     canvasZoom = _nodeCanvas.GetCanvasScale();
 
     // file dialog
-    #ifndef TARGET_WIN32
-    if(ImGuiEx::getFileDialog(fileDialog, loadVideoFlag, "Select a video file encoded with the HAP codec", imgui_addons::ImGuiFileBrowser::DialogMode::OPEN, ".mov,.mp4,.mpg,.mpeg,.avi", "", scaleFactor)){
-        ofFile file (fileDialog.selected_path);
-        if (file.exists()){
-            filepath = copyFileToPatchFolder(this->patchFolderPath,file.getAbsolutePath());
-            isFileLoaded = false;
-            needToLoadVideo = true;
-        }
-    }
-    #else
     if(ImGuiEx::getFileDialog(fileDialog, loadVideoFlag, "Select a video file", imgui_addons::ImGuiFileBrowser::DialogMode::OPEN, ".mov,.mp4,.mpg,.mpeg,.avi", "", scaleFactor)){
         ofFile file (fileDialog.selected_path);
         if (file.exists()){
@@ -345,7 +316,6 @@ void VideoPlayer::drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ){
             needToLoadVideo = true;
         }
     }
-    #endif
 
 
 }
@@ -374,12 +344,7 @@ void VideoPlayer::drawObjectNodeConfig(){
     if (ImGui::IsItemHovered()){
         ImGui::BeginTooltip();
         ImGui::PushTextWrapPos(ImGui::GetFontSize() * 35.0f);
-        #ifndef TARGET_WIN32
-            ImGui::TextUnformatted("Open a video file. Compatible extensions: .mov .mp4 .mpg .mpeg .avi | Compatible codec: HAP");
-        #else
-            ImGui::TextUnformatted("Open a video file. Compatible extensions: .mov .mp4 .mpg .mpeg .avi");
-        #endif
-
+        ImGui::TextUnformatted("Open a video file. Compatible extensions: .mov .mp4 .mpg .mpeg .avi");
         ImGui::PopTextWrapPos();
         ImGui::EndTooltip();
     }
@@ -432,33 +397,18 @@ void VideoPlayer::drawObjectNodeConfig(){
         }
     }
 
-    #ifndef TARGET_WIN32
-        ImGuiEx::ObjectInfo(
-                "Simple object for playing video files. It use the HAP codec as standard, so you can use only videos encoded with HAP. More info here: https://hap.video/using-hap.html",
-                "https://mosaic.d3cod3.org/reference.php?r=video-player", scaleFactor);
-        // file dialog
-        if(ImGuiEx::getFileDialog(fileDialog, loadVideoFlag, "Select a video file encoded with the HAP codec", imgui_addons::ImGuiFileBrowser::DialogMode::OPEN, "*.*", "", scaleFactor)){
-            ofFile file (fileDialog.selected_path);
-            if (file.exists()){
-                filepath = copyFileToPatchFolder(this->patchFolderPath,file.getAbsolutePath());
-                isFileLoaded = false;
-                needToLoadVideo = true;
-            }
-        }
-    #else
-        ImGuiEx::ObjectInfo(
-                "Simple object for playing video files. In mac OSX you can upload .mov and .mp4 files; in linux .mp4, .mpeg and .mpg, while in windows .mp4 and .avi can be used.",
-                "https://mosaic.d3cod3.org/reference.php?r=video-player", scaleFactor);
-        // file dialog
-        if(ImGuiEx::getFileDialog(fileDialog, loadVideoFlag, "Select a video file", imgui_addons::ImGuiFileBrowser::DialogMode::OPEN, "*.*", "", scaleFactor)){
-            ofFile file (fileDialog.selected_path);
-            if (file.exists()){
-                filepath = copyFileToPatchFolder(this->patchFolderPath,file.getAbsolutePath());
-                isFileLoaded = false;
-                needToLoadVideo = true;
-            }
+    ImGuiEx::ObjectInfo(
+            "Simple object for playing video files. In mac OSX you can upload .mov and .mp4 files; in linux .mp4, .mpeg and .mpg, while in windows .mp4 and .avi can be used.",
+            "https://mosaic.d3cod3.org/reference.php?r=video-player", scaleFactor);
+    // file dialog
+    if(ImGuiEx::getFileDialog(fileDialog, loadVideoFlag, "Select a video file", imgui_addons::ImGuiFileBrowser::DialogMode::OPEN, "*.*", "", scaleFactor)){
+        ofFile file (fileDialog.selected_path);
+        if (file.exists()){
+            filepath = copyFileToPatchFolder(this->patchFolderPath,file.getAbsolutePath());
+            isFileLoaded = false;
+            needToLoadVideo = true;
         }
-    #endif
+    }
 
 
 }

src/objects/video/VideoPlayer.h

@@ -39,10 +39,6 @@
 #include "ImGuiFileBrowser.h"
 #include "IconsFontAwesome5.h"
 
-#ifndef TARGET_WIN32
-    #include "ofxHapPlayer.h"
-#endif
-
 class VideoPlayer : public PatchObject {
 
 public:
@@ -62,11 +58,9 @@ class VideoPlayer : public PatchObject {
 
     void            loadVideoFile();
 
-    #ifndef TARGET_WIN32
-        ofxHapPlayer*       video;
-    #else
-        ofVideoPlayer*      video;
-    #endif
+
+    ofVideoPlayer*      video;
+
     float               posX, posY, drawW, drawH;
     bool                isNewObject;
     bool                isFileLoaded;