cleanup and fixes for texture cable activation/deactivation

Author: d3cod3

src/PatchObject.cpp

@@ -159,8 +159,6 @@ void PatchObject::update(map<int,shared_ptr<PatchObject>> &patchObjects, pdsp::E
                         if(this->getIsPDSPPatchableObject() || this->getName() == "audio device"){
                             this->pdspOut[outPut[i]->fromOutletID] >> patchObjects[outPut[i]->toObjectID]->pdspIn[outPut[i]->toInletID];
                         }
-                    }else if(outPut[i]->type == VP_LINK_TEXTURE){
-                        // TODO
                     }
                     patchObjects[outPut[i]->toObjectID]->_inletParams[outPut[i]->toInletID] = _outletParams[out];
                 }else{
@@ -169,10 +167,7 @@ void PatchObject::update(map<int,shared_ptr<PatchObject>> &patchObjects, pdsp::E
                         if(patchObjects[outPut[i]->toObjectID]->getIsPDSPPatchableObject() && patchObjects[outPut[i]->toObjectID]->pdspIn[outPut[i]->toInletID].getInputsList().size() > 0){
                             patchObjects[outPut[i]->toObjectID]->pdspIn[outPut[i]->toInletID].disconnectIn();
                         }
-                    }else if(outPut[i]->type == VP_LINK_TEXTURE){
-                        // TODO
                     }
-
                 }
             }
         }

src/objects/graphics/ImageExporter.cpp

@@ -79,6 +79,7 @@ void ImageExporter::setupObjectContent(shared_ptr<ofAppGLFWWindow> &mainWindow){
 
 //--------------------------------------------------------------
 void ImageExporter::updateObjectContent(map<int,shared_ptr<PatchObject>> &patchObjects){
+    unusedArgs(patchObjects);
 
     if(isImageSaved){
         isImageSaved = false;
@@ -103,9 +104,11 @@ void ImageExporter::updateObjectContent(map<int,shared_ptr<PatchObject>> &patchO
 
 //--------------------------------------------------------------
 void ImageExporter::drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRenderer>& glRenderer){
+    unusedArgs(font,glRenderer);
+
     ofSetColor(255);
     // draw node texture preview with OF
-    if(static_cast<ofTexture *>(_inletParams[0])->isAllocated()){
+    if(this->inletsConnected[0] && static_cast<ofTexture *>(_inletParams[0])->isAllocated()){
         if(scaledObjW*canvasZoom > 90.0f){
             drawNodeOFTexture(*static_cast<ofTexture *>(_inletParams[0]), posX, posY, drawW, drawH, objOriginX, objOriginY, scaledObjW, scaledObjH, canvasZoom, this->scaleFactor);
         }
@@ -209,7 +212,7 @@ void ImageExporter::drawObjectNodeConfig(){
 
 //--------------------------------------------------------------
 void ImageExporter::removeObjectContent(bool removeFileFromData){
-    
+    unusedArgs(removeFileFromData);
 }
 
 //--------------------------------------------------------------

src/objects/video/VideoGate.cpp

@@ -110,14 +110,15 @@ void VideoGate::setupObjectContent(shared_ptr<ofAppGLFWWindow> &mainWindow){
 
 //--------------------------------------------------------------
 void VideoGate::updateObjectContent(map<int,shared_ptr<PatchObject>> &patchObjects){
+    unusedArgs(patchObjects);
 
     if(this->inletsConnected[0]){
         openInlet = static_cast<int>(floor(*(float *)&_inletParams[0]));
     }
 
-    if(openInlet >= 1 && openInlet < this->numInlets){
+    if(this->inletsConnected[openInlet] && openInlet >= 1 && openInlet < this->numInlets){
         *static_cast<ofTexture *>(_outletParams[0]) = *static_cast<ofTexture *>(_inletParams[openInlet]);
-    }else if(openInlet == 0){
+    }else if(openInlet == 0 || !this->inletsConnected[openInlet]){
         *static_cast<ofTexture *>(_outletParams[0]) = *kuroTex;
     }
 
@@ -139,6 +140,8 @@ void VideoGate::updateObjectContent(map<int,shared_ptr<PatchObject>> &patchObjec
 
 //--------------------------------------------------------------
 void VideoGate::drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRenderer>& glRenderer){
+    unusedArgs(font,glRenderer);
+
     ofSetColor(255);
 
 }
@@ -223,7 +226,7 @@ void VideoGate::drawObjectNodeConfig(){
 
 //--------------------------------------------------------------
 void VideoGate::removeObjectContent(bool removeFileFromData){
-    
+    unusedArgs(removeFileFromData);
 }
 
 //--------------------------------------------------------------
@@ -252,7 +255,7 @@ void VideoGate::resetInletsSettings(){
     _inletParams[0] = new float();  // open
     *(float *)&_inletParams[0] = 0.0f;
 
-    for(size_t i=1;i<this->numInlets;i++){
+    for(int i=1;i<this->numInlets;i++){
         _inletParams[i] = new ofTexture();
     }
 
@@ -261,7 +264,7 @@ void VideoGate::resetInletsSettings(){
 
     this->addInlet(VP_LINK_NUMERIC,"open");
 
-    for(size_t i=1;i<this->numInlets;i++){
+    for(int i=1;i<this->numInlets;i++){
         this->addInlet(VP_LINK_TEXTURE,"t"+ofToString(i));
     }
 

src/objects/video/VideoMixer.cpp

@@ -161,6 +161,8 @@ void VideoMixer::updateObjectContent(map<int,shared_ptr<PatchObject>> &patchObje
 
 //--------------------------------------------------------------
 void VideoMixer::drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRenderer>& glRenderer){
+    unusedArgs(font,glRenderer);
+
     ofSetColor(255);
 
     mixFbo->begin();