some more fixes

Author: d3cod3

src/objects/audio_analysis/RMSExtractor.cpp

@@ -110,6 +110,8 @@ void RMSExtractor::updateObjectContent(map<int,shared_ptr<PatchObject>> &patchOb
 
 //--------------------------------------------------------------
 void RMSExtractor::drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRenderer>& glRenderer){
+    unusedArgs(font,glRenderer);
+
     ofSetColor(255);
 
 }
@@ -139,7 +141,7 @@ void RMSExtractor::drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ){
     // Visualize (Object main view)
     if( _nodeCanvas.BeginNodeContent(ImGuiExNodeView_Visualise) ){
 
-        ImGuiEx::plotValue(*(float *)&_outletParams[0], 0.f, 1.f,IM_COL32(255,255,120,255), this->scaleFactor);
+        ImGuiEx::plotValue(*(float *)&_outletParams[0], 0.f, 100.f,IM_COL32(255,255,120,255), this->scaleFactor);
 
         _nodeCanvas.EndNodeContent();
     }
@@ -154,7 +156,7 @@ void RMSExtractor::drawObjectNodeConfig(){
 
 //--------------------------------------------------------------
 void RMSExtractor::removeObjectContent(bool removeFileFromData){
-
+    unusedArgs(removeFileFromData);
 }
 
 OBJECT_REGISTER( RMSExtractor , "rms extractor", OFXVP_OBJECT_CAT_AUDIOANALYSIS)

src/objects/sound/SoundfilePlayer.cpp

@@ -89,6 +89,8 @@ SoundfilePlayer::SoundfilePlayer() : PatchObject("soundfile player"){
 
     this->width         *= 2;
 
+    loaded              = false;
+
 }
 
 //--------------------------------------------------------------
@@ -106,6 +108,12 @@ void SoundfilePlayer::newObject(){
     this->addOutlet(VP_LINK_AUDIO,"audioFileSignal");
     this->addOutlet(VP_LINK_ARRAY,"dataBuffer");
     this->addOutlet(VP_LINK_NUMERIC,"finish");
+
+    this->setCustomVar(static_cast<float>(loop),"LOOP");
+    this->setCustomVar(static_cast<float>(speed),"SPEED");
+    this->setCustomVar(static_cast<float>(volume),"VOLUME");
+    this->setCustomVar(static_cast<float>(cueIN),"CUE_IN");
+    this->setCustomVar(static_cast<float>(cueOUT),"CUE_OUT");
 }
 
 //--------------------------------------------------------------
@@ -229,6 +237,24 @@ void SoundfilePlayer::updateObjectContent(map<int,shared_ptr<PatchObject>> &patc
 
     }
 
+    if(!loaded){
+        loaded = true;
+
+        loop = static_cast<bool>(this->getCustomVar("LOOP"));
+        speed = static_cast<float>(this->getCustomVar("SPEED"));
+        volume = static_cast<float>(this->getCustomVar("VOLUME"));
+        cueIN = static_cast<double>(this->getCustomVar("CUE_IN"));
+        cueOUT = static_cast<double>(this->getCustomVar("CUE_OUT"));
+
+        if(playhead < cueIN){
+            playhead = cueIN;
+        }
+
+        if(playhead > cueOUT){
+            playhead = cueOUT;
+        }
+    }
+
 }
 
 //--------------------------------------------------------------
@@ -371,12 +397,18 @@ void SoundfilePlayer::drawObjectNodeConfig(){
 
     ImGui::Spacing();
     ImGui::PushItemWidth(130*scaleFactor);
-    ImGui::SliderFloat("SPEED",&speed,-1.0f, 1.0f);
-    ImGui::SliderFloat("VOLUME",&volume,0.0f, 1.0f);
+    if(ImGui::SliderFloat("SPEED",&speed,-1.0f, 1.0f)){
+        this->setCustomVar(speed,"SPEED");
+    }
+    if(ImGui::SliderFloat("VOLUME",&volume,0.0f, 1.0f)){
+        this->setCustomVar(volume,"VOLUME");
+    }
     ImGui::PopItemWidth();
     ImGui::Spacing();
     ImGui::Spacing();
-    ImGui::Checkbox("LOOP " ICON_FA_REDO,&loop);
+    if(ImGui::Checkbox("LOOP " ICON_FA_REDO,&loop)){
+        this->setCustomVar(static_cast<float>(loop),"LOOP");
+    }
 
     ImGui::Spacing();
     float tempcueIN = cueIN;
@@ -385,7 +417,7 @@ void SoundfilePlayer::drawObjectNodeConfig(){
         if(playhead < cueIN){
             playhead = cueIN;
         }
-
+        this->setCustomVar(static_cast<float>(cueIN),"CUE_IN");
     }
     ImGui::Spacing();
     float tempcueOUT = cueOUT;
@@ -394,6 +426,7 @@ void SoundfilePlayer::drawObjectNodeConfig(){
         if(playhead > cueOUT){
             playhead = cueOUT;
         }
+        this->setCustomVar(static_cast<float>(cueOUT),"CUE_OUT");
     }
 
     ImGuiEx::ObjectInfo(

src/objects/sound/SoundfilePlayer.h

@@ -105,6 +105,8 @@ class SoundfilePlayer : public PatchObject {
     float               scaledObjW, scaledObjH;
     float               objOriginX, objOriginY;
 
+    bool                loaded;
+
 protected:
 
 

src/objects/video/VideoExporter.cpp

@@ -92,6 +92,7 @@ void VideoExporter::setupObjectContent(shared_ptr<ofAppGLFWWindow> &mainWindow){
 
 //--------------------------------------------------------------
 void VideoExporter::updateObjectContent(map<int,shared_ptr<PatchObject>> &patchObjects){
+    unusedArgs(patchObjects);
 
     if(this->inletsConnected[1]){
         if(*(float *)&_inletParams[1] < 1.0){
@@ -119,6 +120,8 @@ void VideoExporter::updateObjectContent(map<int,shared_ptr<PatchObject>> &patchO
 
 //--------------------------------------------------------------
 void VideoExporter::drawObjectContent(ofTrueTypeFont *font, shared_ptr<ofBaseGLRenderer>& glRenderer){
+    unusedArgs(font,glRenderer);
+
     ofSetColor(255);
 
     if(this->inletsConnected[0]){
@@ -324,7 +327,7 @@ void VideoExporter::drawObjectNodeConfig(){
 
 //--------------------------------------------------------------
 void VideoExporter::removeObjectContent(bool removeFileFromData){
-
+    unusedArgs(removeFileFromData);
 }
 
 

src/ofxVisualProgramming.cpp

@@ -620,11 +620,14 @@ void ofxVisualProgramming::audioProcess(float *input, int bufferSize, int nChann
             inputBuffer.copyFrom(input, bufferSize, nChannels, audioSampleRate);
 
             // compute audio input
-            for(map<int,shared_ptr<PatchObject>>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){
-                it->second->audioIn(inputBuffer);
+            if(!inputBuffer.getBuffer().empty()){
+                for(map<int,shared_ptr<PatchObject>>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){
+                    it->second->audioIn(inputBuffer);
+                }
+
+                lastInputBuffer = inputBuffer;
             }
 
-            lastInputBuffer = inputBuffer;
         }
         if(audioGUIOUTChannels > 0){
             // compute audio output