From 087caebf2944100dd9b9a92e0744cb37325579f7 Mon Sep 17 00:00:00 2001 From: d3cod3 Date: Tue, 18 Feb 2025 09:08:09 +0100 Subject: [PATCH 01/21] working on 0.7.3 --- src/ofxVPConfig.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ofxVPConfig.h b/src/ofxVPConfig.h index 49918491..7e18bf31 100644 --- a/src/ofxVPConfig.h +++ b/src/ofxVPConfig.h @@ -33,7 +33,7 @@ #pragma once #define PACKAGE_OFXVP "ofxVisualProgramming" -#define VERSION_OFXVP "0.7.2" +#define VERSION_OFXVP "0.7.3" #define DESCRIPTION_OFXVP "A visual programming patching environment for OF" #define MOSAIC_CHECK_STRING "https://mosaic.d3cod3.org" From 77ecac9feeeaac05d31c8df16597359ccfbf38cd Mon Sep 17 00:00:00 2001 From: d3cod3 Date: Wed, 26 Mar 2025 19:58:07 +0000 Subject: [PATCH 02/21] switched to pugiXML, added ofxVP xml engine based on pugiXML --- src/PatchObject.cpp | 465 ++----- src/PatchObject.h | 5 +- src/core/ofxVPXmlEngine.cpp | 170 ++- src/core/ofxVPXmlEngine.h | 93 +- src/core/parameters/ofxVPObjectParameter.h | 10 +- src/objects/audio_analysis/AudioAnalyzer.cpp | 104 +- src/objects/audio_analysis/BPMExtractor.cpp | 18 +- src/objects/audio_analysis/FftExtractor.cpp | 15 +- .../audio_analysis/MelBandsExtractor.cpp | 15 +- src/objects/audio_analysis/PitchExtractor.cpp | 17 +- src/objects/audio_analysis/RMSExtractor.cpp | 17 +- src/objects/communications/OscReceiver.cpp | 165 ++- src/objects/communications/OscSender.cpp | 152 +-- src/objects/data/Receiver.cpp | 76 +- src/objects/data/Sender.cpp | 132 +- src/objects/gui/moComment.cpp | 49 +- src/objects/gui/moMessage.cpp | 45 +- src/objects/gui/moSignalViewer.cpp | 27 +- src/objects/gui/moTimeline.cpp | 98 +- src/objects/gui/moValuePlotter.cpp | 47 +- src/objects/sound/AudioDevice.cpp | 371 +++--- src/objects/sound/AudioExporter.cpp | 29 +- src/objects/sound/AudioExporter.h | 1 + src/objects/sound/Crossfader.cpp | 15 +- src/objects/sound/Mixer.cpp | 15 +- src/objects/sound/Oscillator.cpp | 24 +- src/objects/sound/PDPatch.cpp | 15 +- src/objects/sound/Panner.cpp | 15 +- src/objects/sound/PolyphonicOscillator.cpp | 24 +- src/objects/sound/QuadPanner.cpp | 15 +- src/objects/sound/SamplePlayer.cpp | 15 +- src/objects/sound/SigMult.cpp | 15 +- src/objects/sound/SignalOperator.cpp | 15 +- src/objects/sound/SignalTrigger.cpp | 15 +- src/objects/sound/SoundfilePlayer.cpp | 15 +- src/objects/sound/SummingMixer.cpp | 15 +- src/objects/sound/pdspADSR.cpp | 16 +- src/objects/sound/pdspAHR.cpp | 16 +- src/objects/sound/pdspBitCruncher.cpp | 15 +- src/objects/sound/pdspBitNoise.cpp | 19 +- src/objects/sound/pdspChorusEffect.cpp | 15 +- src/objects/sound/pdspCombFilter.cpp | 15 +- src/objects/sound/pdspCompressor.cpp | 16 +- src/objects/sound/pdspDataOscillator.cpp | 25 +- src/objects/sound/pdspDecimator.cpp | 15 +- src/objects/sound/pdspDelay.cpp | 15 +- src/objects/sound/pdspDucker.cpp | 16 +- src/objects/sound/pdspHiCut.cpp | 15 +- src/objects/sound/pdspKick.cpp | 16 +- src/objects/sound/pdspLFO.cpp | 16 +- src/objects/sound/pdspLowCut.cpp | 15 +- src/objects/sound/pdspParametricEQ.cpp | 45 +- src/objects/sound/pdspResonant2PoleFilter.cpp | 15 +- src/objects/sound/pdspReverb.cpp | 15 +- src/ofxVisualProgramming.cpp | 1133 +++++++---------- src/ofxVisualProgramming.h | 3 +- 56 files changed, 1451 insertions(+), 2339 deletions(-) diff --git a/src/PatchObject.cpp b/src/PatchObject.cpp index ce6ab6bb..98b3b813 100644 --- a/src/PatchObject.cpp +++ b/src/PatchObject.cpp @@ -547,9 +547,7 @@ bool PatchObject::connectTo(map> &patchObjects, int _inletParams[toInlet] = new ofSoundBuffer(); if(patchObjects[fromObjectID]->getIsPDSPPatchableObject() && getIsPDSPPatchableObject()){ patchObjects[fromObjectID]->pdspOut[fromOutlet] >> pdspIn[toInlet]; - }/*else if(patchObjects[fromObjectID]->getName() == "audio device" && getIsPDSPPatchableObject()){ - patchObjects[fromObjectID]->pdspOut[fromOutlet] >> pdspIn[toInlet]; - }*/ + } } // check special connections @@ -660,396 +658,212 @@ void PatchObject::disconnectLink(map> &patchObjects, //---------------------------------------------------------------------------------- LOAD/SAVE //-------------------------------------------------------------- bool PatchObject::loadConfig(shared_ptr &mainWindow, pdsp::Engine &engine,int oTag, string &configFile){ - ofxXmlSettings XML; - bool loaded = false; - - -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(configFile)){ -#else - if (XML.load(configFile)){ -#endif - - patchFile = configFile; - if(XML.pushTag("object", oTag)){ + patchFile = configFile; + ofxVPXml.loadMosaicPatch(patchFile); - nId = XML.getValue("id", 0); - name = XML.getValue("name","none"); - filepath = XML.getValue("filepath","none"); - subpatchName = XML.getValue("subpatch","root"); + pugi::xml_node objNode = ofxVPXml.getObjectAtPos(oTag); - move(XML.getValue("position:x", 0),XML.getValue("position:y", 0)); + // exit with false if object at oTag do not exists + if(ofxVPXml.isEmptyNode(objNode)) return false; - if(XML.pushTag("vars")){ - int totalCustomVars = XML.getNumTags("var"); - for (int i=0;ix, this->y + this->height*.5f) ); - XML.popTag(); - } - } - XML.popTag(); - } + nId = ofxVPXml.getPatchChildInt(objNode,"id"); + name = ofxVPXml.getPatchChildString(objNode,"name"); + filepath = ofxVPXml.getPatchChildString(objNode,"filepath"); + subpatchName = ofxVPXml.getPatchChildString(objNode,"subpatch"); + if(subpatchName == ""){ + subpatchName = "root"; + } - setup(mainWindow); - setupDSP(engine); - - if(XML.pushTag("outlets")){ - int totalOutlets = XML.getNumTags("link"); - outletsPositions.clear(); - outletsIDs.clear(); - outletsWirelessSend.clear(); - for (int i=0;ix + this->width, this->y + this->height*.5f) ); - XML.popTag(); - } - } - XML.popTag(); - } + ofVec2f p = ofxVPXml.getObjectPosition(nId); + move(p.x,p.y); - XML.popTag(); // if(XML.pushTag("object", oTag)) + pugi::xpath_node_set objVars = ofxVPXml.getObjectVars(nId); + if(!objVars.empty()){ + for(auto & var: objVars){ + auto v = var.node(); + customVars[ofxVPXml.getPatchChildString(v,"name")] = ofxVPXml.getPatchChildFloat(v,"value"); + } + } - loaded = true; + pugi::xpath_node_set objInlets = ofxVPXml.getObjectInlets(nId); + if(!objInlets.empty()){ + inletsPositions.clear(); + inletsIDs.clear(); + inletsWirelessReceive.clear(); + for(auto & inlet: objInlets){ + auto i = inlet.node(); + inletsType.push_back(ofxVPXml.getPatchChildInt(i,"type")); + inletsNames.push_back(ofxVPXml.getPatchChildString(i,"name")); + inletsIDs.push_back(""); + inletsWirelessReceive.push_back(false); + inletsPositions.push_back( ImVec2(this->x, this->y + this->height*.5f) ); + } + } + setup(mainWindow); + setupDSP(engine); + + pugi::xpath_node_set objOutlets = ofxVPXml.getObjectOutlets(nId); + if(!objOutlets.empty()){ + outletsPositions.clear(); + outletsIDs.clear(); + outletsWirelessSend.clear(); + for(auto & outlet: objOutlets){ + auto o = outlet.node(); + outletsType.push_back(ofxVPXml.getPatchChildInt(o,"type")); + outletsNames.push_back(ofxVPXml.getPatchChildString(o,"name")); + outletsIDs.push_back(""); + outletsWirelessSend.push_back(false); + outletsPositions.push_back( ImVec2( this->x + this->width, this->y + this->height*.5f) ); } } - return loaded; + return true; } //-------------------------------------------------------------- bool PatchObject::saveConfig(bool newConnection){ - ofxXmlSettings XML; - bool saved = false; if(patchFile != ""){ -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - // first save of the object - if(nId == -1){ - int freeId = 0; - int maxId = 0; - for (int i=0;i maxId){ - maxId = XML.getValue("id",-1); - } - XML.popTag(); - } - } - freeId = maxId+1; - - if(freeId >= 0){ - nId = freeId; - int newObject = XML.addTag("object"); - - if(XML.pushTag("object",newObject)){ - XML.addTag("id"); - XML.setValue("id",nId); - XML.addTag("name"); - XML.setValue("name",name); - XML.addTag("filepath"); - XML.setValue("filepath",filepath); - XML.addTag("subpatch"); - XML.setValue("subpatch",subpatchName); - XML.addTag("position"); - XML.setValue("position:x",static_cast(x)); - XML.setValue("position:y",static_cast(y)); - - // Save Custom Vars (GUI, vars, etc...) - int newCustomVars = XML.addTag("vars"); - if(XML.pushTag("vars",newCustomVars)){ - for(map::iterator it = customVars.begin(); it != customVars.end(); it++ ){ - int newVar = XML.addTag("var"); - if(XML.pushTag("var",newVar)){ - XML.setValue("name",it->first); - XML.setValue("value",it->second); - XML.popTag(); - } - } - XML.popTag(); - } + ofxVPXml.loadMosaicPatch(patchFile); - // Save inlets - int newInlets = XML.addTag("inlets"); - if(XML.pushTag("inlets",newInlets)){ - for(int i=0;i(inletsType.size());i++){ - int newLink = XML.addTag("link"); - if(XML.pushTag("link",newLink)){ - XML.setValue("type",inletsType.at(i)); - XML.setValue("name",inletsNames.at(i)); - XML.popTag(); - } - } - XML.popTag(); - } + // first save of the object + if(nId == -1){ - // Save oulets & links - int newOutlets = XML.addTag("outlets"); - if(XML.pushTag("outlets",newOutlets)){ - for(int i=0;i(outletsType.size());i++){ - int newLink = XML.addTag("link"); - if(XML.pushTag("link",newLink)){ - XML.setValue("type",outletsType.at(i)); - XML.setValue("name",outletsNames.at(i)); - XML.popTag(); - } - } - XML.popTag(); - } + nId = ofxVPXml.addNewObject(name,filepath,subpatchName,ofVec2f(static_cast(x),static_cast(y))); - XML.popTag(); - } - } + // Save Custom Vars (GUI, vars, etc...) + for(map::iterator it = customVars.begin(); it != customVars.end(); it++ ){ + ofxVPXml.addObjectVar(nId, it->first, it->second); + } - }else{ // object previously saved - for(int i=0;i(x)); - XML.setValue("position:y",static_cast(y)); - - // Dynamic reloading custom vars (reconfig capabilities objects, as ShaderObject, etc...) - XML.removeTag("vars"); - int newCustomVars = XML.addTag("vars"); - if(XML.pushTag("vars",newCustomVars)){ - for(map::iterator it = customVars.begin(); it != customVars.end(); it++ ){ - int newLink = XML.addTag("var"); - if(XML.pushTag("var",newLink)){ - XML.setValue("name",it->first); - XML.setValue("value",it->second); - XML.popTag(); - } - } - XML.popTag(); - } + // Save inlets + for(int i=0;i(inletsType.size());i++){ + ofxVPXml.addObjectInlet(nId,inletsType.at(i),inletsNames.at(i)); + } - // Dynamic reloading inlets (reconfig capabilities objects, as ShaderObject, etc...) - XML.removeTag("inlets"); - int newInlets = XML.addTag("inlets"); - if(XML.pushTag("inlets",newInlets)){ - for(int i=0;i(inletsType.size());i++){ - int newLink = XML.addTag("link"); - if(XML.pushTag("link",newLink)){ - XML.setValue("type",inletsType.at(i)); - XML.setValue("name",inletsNames.at(i)); - XML.popTag(); - } - } - XML.popTag(); - } + // Save oulets & links + for(int i=0;i(outletsType.size());i++){ + ofxVPXml.addObjectOutlet(nId,outletsType.at(i),outletsNames.at(i)); + } - // Fixed static outlets - if(XML.pushTag("outlets")){ - for(int j=0;j(outletsType.size());j++){ - if(XML.pushTag("link", j)){ - if(static_cast(outPut.size()) > 0 && newConnection){ - int totalTo = XML.getNumTags("to"); - if(outPut.at(static_cast(outPut.size())-1)->fromOutletID == j){ - int newTo = XML.addTag("to"); - if(XML.pushTag("to", newTo)){ - XML.setValue("id",outPut.at(static_cast(outPut.size())-1)->toObjectID); - XML.setValue("inlet",outPut.at(static_cast(outPut.size())-1)->toInletID); - XML.popTag(); - } - } - if(static_cast(outPut.size())static_cast(outPut.size());z--){ - XML.removeTag("to",j-1); - } - } - } - XML.popTag(); - } - } - XML.popTag(); - } - } - XML.popTag(); + }else{ // previously saved object + ofxVPXml.setObjectFilepath(nId, filepath); + ofxVPXml.setObjectSubpatch(nId, subpatchName); + ofxVPXml.setObjectPos(nId, ofVec2f(static_cast(x),static_cast(y))); + + + // Dynamic reloading custom vars (reconfig capabilities objects, as ShaderObject, etc...) + ofxVPXml.removeObjectVars(nId); + ofxVPXml.appendObjectVarsBlock(nId); + for(map::iterator it = customVars.begin(); it != customVars.end(); it++ ){ + ofxVPXml.addObjectVar(nId, it->first, it->second); + } + + // Dynamic reloading inlets (reconfig capabilities objects, as ShaderObject, etc...) + ofxVPXml.removeObjectInlets(nId); + ofxVPXml.appendObjectInletsBlock(nId); + for(int i=0;i(inletsType.size());i++){ + ofxVPXml.addObjectInlet(nId,inletsType.at(i),inletsNames.at(i)); + } + + // Fixed static outlets + for(int j=0;j(outletsType.size());j++){ + if(static_cast(outPut.size()) > 0 && newConnection){ + int totalTo = ofxVPXml.getObjectLinks(nId,j).size(); + if(outPut.at(static_cast(outPut.size())-1)->fromOutletID == j){ + ofxVPXml.addObjectLink(nId, j, outPut.at(static_cast(outPut.size())-1)->toObjectID, outPut.at(static_cast(outPut.size())-1)->toInletID); + } + if(static_cast(outPut.size())static_cast(outPut.size());z--){ + ofxVPXml.removeObjectLink(nId, j-1, z); + } } } } -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - saved = XML.saveFile(); -#else - saved = XML.save(); -#endif + } + } - return saved; + return true; } //-------------------------------------------------------------- bool PatchObject::removeLinkFromConfig(int outlet, int toObjectID, int toInletID){ - ofxXmlSettings XML; - bool saved = false; if(patchFile != ""){ -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - for(int i=0;i needErase; - for(int v=0;v(r)); - } - } + ofxVPXml.loadMosaicPatch(patchFile); - XML.popTag(); - } - } - XML.popTag(); + pugi::xpath_node_set vars = ofxVPXml.getObjectVars(nId); + if(!vars.empty()){ + for(auto & var: vars){ + auto v = var.node(); + std::string vn = ofxVPXml.getPatchChildString(v,"name"); + if(ofIsStringInString(vn,"GUI_")){ + customVars.erase(vn); + ofxVPXml.removeObjectVar(nId, vn); } } } -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - saved = XML.saveFile(); -#else - saved = XML.save(); -#endif + return true; } - return saved; + return false; } //-------------------------------------------------------------- map PatchObject::loadCustomVars(){ map tempVars; - ofxXmlSettings XML; - if(patchFile != ""){ -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - for(int i=0;i OtoDel; + std::vector OOtoDel; + std::vector LtoDel; + + auto objectsXml = getPatchObjects(); + if(!objectsXml.empty()){ + for(auto & obj: objectsXml){ + auto n = obj.node(); + int oid = getPatchChildInt(n,"id"); + if(oid != objid){ + pugi::xpath_node_set oo = getObjectOutlets(oid); + if(!oo.empty()){ + int oindex = 0; + for(auto & outlet: oo){ + pugi::xpath_node_set objLinks = getObjectLinks(oid,oindex); + if(!objLinks.empty()){ + int lindex = 0; + for(auto & link: objLinks){ + auto l = link.node(); + if(getPatchChildInt(l,"id") == objid && getPatchChildInt(l,"inlet") >= objNumInlets){ + OtoDel.push_back(oid); + OOtoDel.push_back(oindex); + LtoDel.push_back(lindex); + } + lindex++; + } + } + oindex++; + } + } + } + } + } + + + // if there is something to remove + if(OtoDel.size() > 0){ + for(size_t i=OtoDel.size()-1;i>0;i--){ + removeObjectLink(OtoDel[i],OOtoDel[i],LtoDel[i]); + //ofLog(OF_LOG_NOTICE,"%i - Removing link from object %s, outlet %i link %i",i,getObjectName(OtoDel[i]).c_str(),OOtoDel[i],LtoDel[i]); + } + removeObjectLink(OtoDel[0],OOtoDel[0],LtoDel[0]); + //ofLog(OF_LOG_NOTICE,"0 - Removing link from object %s, outlet %i link %i",getObjectName(OtoDel[0]).c_str(),OOtoDel[0],LtoDel[0]); + } +} + //-------------------------------------------------------------- void ofxVPXmlEngine::addObjectVar(int objid, std::string varName, float varValue){ pugi::xml_node n = getObjectNode(objid); @@ -760,6 +850,15 @@ void ofxVPXmlEngine::removeObjectVar(int objid, std::string varName){ } } +//-------------------------------------------------------------- +void ofxVPXmlEngine::removeObjectVars(int objid){ + pugi::xml_node n = getObjectNode(objid); + + n.remove_child("vars"); + + saveMosaicPatch(filepath); +} + //-------------------------------------------------------------- void ofxVPXmlEngine::setMosaicConfig(std::string configVar, int value){ setPatchValue(settingNode,configVar,value); @@ -767,19 +866,60 @@ void ofxVPXmlEngine::setMosaicConfig(std::string configVar, int value){ } //-------------------------------------------------------------- -int ofxVPXmlEngine::getMosaicConfig(std::string configVar){ +int ofxVPXmlEngine::getMosaicConfigInt(std::string configVar){ return getPatchChildInt(settingNode,configVar); } +//-------------------------------------------------------------- +float ofxVPXmlEngine::getMosaicConfigFloat(std::string configVar){ + return getPatchChildFloat(settingNode,configVar); +} + +//-------------------------------------------------------------- +bool ofxVPXmlEngine::getMosaicConfigBool(std::string configVar){ + return getPatchChildBool(settingNode,configVar); +} + +//-------------------------------------------------------------- +bool ofxVPXmlEngine::checkReleaseIsPrePugiXml(std::string currentRelease){ + size_t major = size_t(ofToInt(string(1,currentRelease.at(0)))); + size_t minor = size_t(ofToInt(string(1,currentRelease.at(1)))); + size_t patch = size_t(ofToInt(string(1,currentRelease.at(2)))); + + size_t pre_major = 0; + size_t pre_minor = 7; + size_t pre_patch = 2; + + if( (patch > pre_patch && minor >= pre_minor && major >= pre_major) || ( minor > pre_minor && major >= pre_major) || (major > pre_major) ){ + return false; + }else{ + return true; + } +} + + +//-------------------------------------------------------------- +pugi::xml_node ofxVPXmlEngine::getObjectAtPos(int pos){ + auto objectsXml = getPatchObjects(); + int index = 0; + for(auto & obj: objectsXml){ + auto n = obj.node(); + if(index == pos){ + return n; + } + index++; + } + return empty; +} + + //-------------------------------------------------------------- pugi::xml_node ofxVPXmlEngine::getObjectNode(int id){ - if(isMosaicPatch){ - auto objectsXml = getPatchObjects(); - for(auto & obj: objectsXml){ - auto n = obj.node(); - if(getPatchChildInt(n,"id") == id){ - return n; - } + auto objectsXml = getPatchObjects(); + for(auto & obj: objectsXml){ + auto n = obj.node(); + if(getPatchChildInt(n,"id") == id){ + return n; } } return empty; diff --git a/src/core/ofxVPXmlEngine.h b/src/core/ofxVPXmlEngine.h index 3f537426..1affadac 100644 --- a/src/core/ofxVPXmlEngine.h +++ b/src/core/ofxVPXmlEngine.h @@ -51,8 +51,11 @@ class ofxVPXmlEngine{ ~ofxVPXmlEngine() {} // LOAD/SAVE + std::string getMosaicPatch() { return filepath; } void loadMosaicPatch(std::string path); void saveMosaicPatch(std::string path); + bool isPatchOK() { return isMosaicPatch; } + pugi::xpath_node_set getScriptLanguageMethods(std::string path); // TESTING void printTests(); @@ -69,26 +72,52 @@ class ofxVPXmlEngine{ // CHECKS bool checkIsMosaicPatch(); - bool nodeExists(pugi::xml_node &node,std::string name) { assert(isLoaded); return bool(node.child(name.c_str())); } + bool objIDExists(int id); + bool nodeExists(pugi::xml_node &node,std::string name) { return bool(node.child(name.c_str())); } bool checkIsObjectNode(pugi::xml_node node); + bool isEmptyNode(pugi::xml_node n) {return n == empty ? true : false; } + + // GETTERS + pugi::xml_node getObjectAtPos(int pos); + pugi::xpath_node_set getPatchObjects() { return xml.select_nodes("object");} + pugi::xpath_node_set getObjectVars(int id); + pugi::xpath_node_set getObjectInlets(int id); + pugi::xpath_node_set getObjectOutlets(int id); + pugi::xpath_node_set getObjectLinks(int objid, int outlet_order); + + pugi::xml_node getObjectNode(int id); + std::string getObjectName(int id); + std::string getObjectFilepath(int id); + std::string getObjectSubpatch(int id); + ofVec2f getObjectPosition(int id); + + bool getPatchChildBool(pugi::xml_node &node, std::string childname) { return node.child(childname.c_str()).text().as_bool(); } + int getPatchChildInt(pugi::xml_node &node, std::string childname) { return node.child(childname.c_str()).text().as_int(); } + float getPatchChildFloat(pugi::xml_node &node, std::string childname) { return node.child(childname.c_str()).text().as_float(); } + std::string getPatchChildString(pugi::xml_node &node, std::string childname) { return node.child(childname.c_str()).text().as_string(); } // READ/WRITE/REMOVE int getLastObjectID(); - void addNewObject(std::string name, std::string _filepath, std::string subpatch, ofVec2f pos); + int addNewObject(std::string name, std::string _filepath, std::string subpatch, ofVec2f pos); void setObjectFilepath(int objid, std::string _filepath); void setObjectSubpatch(int objid, std::string subpatch); void setObjectPos(int objid, ofVec2f pos); + void appendObjectInletsBlock(int objid) { getObjectNode(objid).append_child("inlets"); } + void appendObjectOutletsBlock(int objid) { getObjectNode(objid).append_child("outlets"); } + void appendObjectVarsBlock(int objid) { getObjectNode(objid).append_child("vars"); } void removeObject(int id); void addObjectInlet(int objid, int type, std::string name); void setObjectInletType(int objid, int inlet_order, int type); void setObjectInletName(int objid, int inlet_order, std::string name); void removeObjectInlet(int objid, int inlet_order); + void removeObjectInlets(int objid); void addObjectOutlet(int objid, int type, std::string name); void setObjectOutletType(int objid, int outlet_order, int type); void setObjectOutletName(int objid, int outlet_order, std::string name); void removeObjectOutlet(int objid, int outlet_order); + void removeObjectOutlets(int objid); void addObjectLink(int objid, int outlet_order, int toObjId, int toInletId); void setObjectLinkToObjID(int objid, int outlet_order, int link_order, int toObjId); @@ -96,35 +125,52 @@ class ofxVPXmlEngine{ void removeObjectLink(int objid, int outlet_order, int link_order); void removeAllObjectOutletLinks(int objid, int outlet_order); void removeAllObjectLinks(int objid); + void removeAllLinksToObject(int objid, int objNumInlets); void addObjectVar(int objid, std::string varName, float varValue); void setObjectVar(int objid, std::string varName, float varValue); void removeObjectVar(int objid, std::string varName); + void removeObjectVars(int objid); void setMosaicConfig(std::string configVar, int value); - int getMosaicConfig(std::string configVar); + int getMosaicConfigInt(std::string configVar); + float getMosaicConfigFloat(std::string configVar); + bool getMosaicConfigBool(std::string configVar); - std::string getMosaicRelease(){ assert(isLoaded); return ofxVP_XML_ENGINE_VALUE_CAST(getPatchValue(xml,"release")); } + void setMosaicRelease(std::string release) { setPatchValue(xml,"release",release); saveMosaicPatch(filepath); } + std::string getMosaicRelease(){ return ofxVP_XML_ENGINE_VALUE_CAST(getPatchValue(xml,"release")); } size_t getMosaicReleaseMAJOR(){ return size_t(ofToInt(string(1,getMosaicRelease().at(0)))); } size_t getMosaicReleaseMINOR(){ return size_t(ofToInt(string(1,getMosaicRelease().at(1)))); } size_t getMosaicReleasePATCH(){ return size_t(ofToInt(string(1,getMosaicRelease().at(2)))); } + + bool checkReleaseIsPrePugiXml(std::string currentRelease); + + void setPatchValue(pugi::xml_node &node, std::string childname, int value) { + assert(isLoaded); + if(node.child(childname.c_str()).empty()){ + node.append_child(childname.c_str()); + } + node.child(childname.c_str()).text().set(std::to_string(value).c_str()); + } + void setPatchValue(pugi::xml_node &node, std::string childname, float value) { + assert(isLoaded); + if(node.child(childname.c_str()).empty()){ + node.append_child(childname.c_str()); + } + node.child(childname.c_str()).text().set(std::to_string(value).c_str()); + } + void setPatchValue(pugi::xml_node &node, std::string childname, std::string value) { + assert(isLoaded); + if(node.child(childname.c_str()).empty()){ + node.append_child(childname.c_str()); + } + node.child(childname.c_str()).text().set(value.c_str()); + } private: - pugi::xml_node getPatchChildNode(pugi::xml_node parent, std::string name) { assert(isLoaded); return parent.select_node(name.c_str()).node(); } - - pugi::xml_node getObjectNode(int id); - std::string getObjectName(int id); - std::string getObjectFilepath(int id); - std::string getObjectSubpatch(int id); - ofVec2f getObjectPosition(int id); - - pugi::xpath_node_set getPatchObjects() { assert(isMosaicPatch); return xml.select_nodes("object");} - pugi::xpath_node_set getObjectVars(int id); - pugi::xpath_node_set getObjectInlets(int id); - pugi::xpath_node_set getObjectOutlets(int id); - pugi::xpath_node_set getObjectLinks(int objid, int outlet_order); + pugi::xml_node getPatchChildNode(pugi::xml_node parent, std::string name) { return parent.select_node(name.c_str()).node(); } float getObjectVar(int objid, std::string varname); int getInletType(int objid, int inlet_order); @@ -134,18 +180,7 @@ class ofxVPXmlEngine{ int getLinkID(int objid, int outlet_order, int link_order); int getLinkToInlet(int objid, int outlet_order, int link_order); - bool getPatchChildBool(pugi::xml_node &node, std::string childname) { assert(isLoaded); return node.child(childname.c_str()).text().as_bool(); } - int getPatchChildInt(pugi::xml_node &node, std::string childname) { assert(isLoaded); return node.child(childname.c_str()).text().as_int(); } - float getPatchChildFloat(pugi::xml_node &node, std::string childname) { assert(isLoaded); return node.child(childname.c_str()).text().as_float(); } - std::string getPatchChildString(pugi::xml_node &node, std::string childname) { assert(isLoaded); return node.child(childname.c_str()).text().as_string(); } - - const pugi::char_t* getPatchValue(pugi::xml_node &node, std::string name){ assert(isLoaded); return node.child_value(name.c_str()); } - - void setPatchValue(pugi::xml_node &node, std::string childname, int value) { assert(isLoaded); node.child(childname.c_str()).text().set(std::to_string(value).c_str()); } - void setPatchValue(pugi::xml_node &node, std::string childname, float value) { assert(isLoaded); node.child(childname.c_str()).text().set(std::to_string(value).c_str()); } - void setPatchValue(pugi::xml_node &node, std::string childname, std::string value) { assert(isLoaded); node.child(childname.c_str()).text().set(value.c_str()); } - - + const pugi::char_t* getPatchValue(pugi::xml_node &node, std::string name){ return node.child_value(name.c_str()); } pugi::xml_document xml; pugi::xml_node settingNode; diff --git a/src/core/parameters/ofxVPObjectParameter.h b/src/core/parameters/ofxVPObjectParameter.h index dbd82af4..a4cf7acd 100644 --- a/src/core/parameters/ofxVPObjectParameter.h +++ b/src/core/parameters/ofxVPObjectParameter.h @@ -9,7 +9,6 @@ #pragma once #include "ofxVPBaseParameter.h" -#include "ofxXmlSettings.h" //#include "" #include "sstream" @@ -32,14 +31,17 @@ class ofxVPObjectParameter : public ofxVPBaseParameter { // writes the ofxVPBaseParameter data to XML. // The xml's cursor is already pushed into the right tag. - virtual void saveTo( ofxXmlSettings& _xmlHandle) const { + virtual void saveTo( pugi::xml_node& _xmlHandle) const { // ensure tags are there - _xmlHandle.addValue(OFXVP_PARAM_XML_TAG_VALUE, this->serialize() ); + if(_xmlHandle.child(OFXVP_PARAM_XML_TAG_VALUE).empty()){ + _xmlHandle.append_child(OFXVP_PARAM_XML_TAG_VALUE); + } + _xmlHandle.child(OFXVP_PARAM_XML_TAG_VALUE).text().set(this->serialize().c_str()); } // load ofxVPBaseParameter from xml // xml's cursor is pushed to the root of the tag to load - bool loadFrom(const ofxXmlSettings& _xmlHandle){ + bool loadFrom(const pugi::xml_node& _xmlHandle){ //effectName = _xmlHandle.getValue("paramName", getType() ); diff --git a/src/objects/audio_analysis/AudioAnalyzer.cpp b/src/objects/audio_analysis/AudioAnalyzer.cpp index a8ea42c6..69e3b773 100644 --- a/src/objects/audio_analysis/AudioAnalyzer.cpp +++ b/src/objects/audio_analysis/AudioAnalyzer.cpp @@ -304,74 +304,66 @@ void AudioAnalyzer::audioOutObject(ofSoundBuffer &inputBuffer){ //-------------------------------------------------------------- void AudioAnalyzer::loadAudioSettings(){ - ofxXmlSettings XML; -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } + ofxVPXml.loadMosaicPatch(this->patchFile); - // Beat Tracking - beatTrack = new ofxBTrack(); - beatTrack->setup(bufferSize); - beatTrack->setConfidentThreshold(0.35); + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); - // Audio Analysis - fft = ofxFft::create(bufferSize, OF_FFT_WINDOW_HAMMING); + // Beat Tracking + beatTrack = new ofxBTrack(); + beatTrack->setup(bufferSize); + beatTrack->setConfidentThreshold(0.35); - fftBinSize = fft->getBinSize(); - fft_binSizeHz = ((sampleRate/2)/(fftBinSize-1)); - fft_StrongestBinValue = 0.0f; - fft_StrongestBinIndex = 0; - fft_pitchBin = 0; + // Audio Analysis + fft = ofxFft::create(bufferSize, OF_FFT_WINDOW_HAMMING); - autoCorrelation = new float[bufferSize]; - autoCorrelationNorm = new float[bufferSize]; - spectrum = new float[fftBinSize]; - binsToMel = new int[fftBinSize]; - melBins = new float[MEL_SCALE_CRITICAL_BANDS]; + fftBinSize = fft->getBinSize(); + fft_binSizeHz = ((sampleRate/2)/(fftBinSize-1)); + fft_StrongestBinValue = 0.0f; + fft_StrongestBinIndex = 0; + fft_pitchBin = 0; - _s_spectrum = new float[fftBinSize]; - _s_melBins = new float[MEL_SCALE_CRITICAL_BANDS]; + autoCorrelation = new float[bufferSize]; + autoCorrelationNorm = new float[bufferSize]; + spectrum = new float[fftBinSize]; + binsToMel = new int[fftBinSize]; + melBins = new float[MEL_SCALE_CRITICAL_BANDS]; + _s_spectrum = new float[fftBinSize]; + _s_melBins = new float[MEL_SCALE_CRITICAL_BANDS]; - rms = 0.0f; - pitch = 0.0f; - _s_rms = 0.0f; - _s_pitch = 0.0f; - setupMelScale(); + rms = 0.0f; + pitch = 0.0f; + _s_rms = 0.0f; + _s_pitch = 0.0f; - audioInputLevel = this->getCustomVar("INPUT_LEVEL"); - smoothingValue = this->getCustomVar("SMOOTHING"); - - _outletParams[0] = new vector(); - // SIGNAL BUFFER - plot_data = new float[bufferSize]; - for(int i=0;i>(this->_outletParams[0])->push_back(0.0f); - plot_data[i] = 0.0f; - } - // SPECTRUM - for(int i=0;i>(this->_outletParams[0])->push_back(0.0f); - } + setupMelScale(); - // MEL BANDS - for(int i=0;i>(this->_outletParams[0])->push_back(0.0f); - } + audioInputLevel = this->getCustomVar("INPUT_LEVEL"); + smoothingValue = this->getCustomVar("SMOOTHING"); - // SINGLE VALUES (RMS, PITCH, BPM, BEAT) - for(int i=0;i<4;i++){ - ofxVP_CAST_PIN_PTR>(this->_outletParams[0])->push_back(0.0f); - } + _outletParams[0] = new vector(); + // SIGNAL BUFFER + plot_data = new float[bufferSize]; + for(int i=0;i>(this->_outletParams[0])->push_back(0.0f); + plot_data[i] = 0.0f; + } + // SPECTRUM + for(int i=0;i>(this->_outletParams[0])->push_back(0.0f); + } + + // MEL BANDS + for(int i=0;i>(this->_outletParams[0])->push_back(0.0f); + } + + // SINGLE VALUES (RMS, PITCH, BPM, BEAT) + for(int i=0;i<4;i++){ + ofxVP_CAST_PIN_PTR>(this->_outletParams[0])->push_back(0.0f); } } diff --git a/src/objects/audio_analysis/BPMExtractor.cpp b/src/objects/audio_analysis/BPMExtractor.cpp index 683a6b6b..c0304140 100755 --- a/src/objects/audio_analysis/BPMExtractor.cpp +++ b/src/objects/audio_analysis/BPMExtractor.cpp @@ -73,20 +73,12 @@ void BPMExtractor::newObject(){ void BPMExtractor::setupObjectContent(shared_ptr &mainWindow){ unusedArgs(mainWindow); - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - bufferSize = XML.getValue("buffer_size",0); - spectrumSize = (bufferSize/2) + 1; - arrayPosition = bufferSize + spectrumSize + MEL_SCALE_CRITICAL_BANDS + 1; - XML.popTag(); - } - } + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); + + spectrumSize = (bufferSize/2) + 1; + arrayPosition = bufferSize + spectrumSize + MEL_SCALE_CRITICAL_BANDS + 1; } diff --git a/src/objects/audio_analysis/FftExtractor.cpp b/src/objects/audio_analysis/FftExtractor.cpp index dc455b64..48bcc0b8 100755 --- a/src/objects/audio_analysis/FftExtractor.cpp +++ b/src/objects/audio_analysis/FftExtractor.cpp @@ -72,19 +72,10 @@ void FftExtractor::newObject(){ void FftExtractor::setupObjectContent(shared_ptr &mainWindow){ unusedArgs(mainWindow); - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - bufferSize = XML.getValue("buffer_size",0); - spectrumSize = (bufferSize/2) + 1; - XML.popTag(); - } - } + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); + spectrumSize = (bufferSize/2) + 1; // INIT FFT BUFFER for(int i=0;i<(bufferSize/2)+1;i++){ diff --git a/src/objects/audio_analysis/MelBandsExtractor.cpp b/src/objects/audio_analysis/MelBandsExtractor.cpp index 21f8c42c..9e74a674 100755 --- a/src/objects/audio_analysis/MelBandsExtractor.cpp +++ b/src/objects/audio_analysis/MelBandsExtractor.cpp @@ -63,19 +63,10 @@ void MelBandsExtractor::newObject(){ void MelBandsExtractor::setupObjectContent(shared_ptr &mainWindow){ unusedArgs(mainWindow); - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - bufferSize = XML.getValue("buffer_size",0); - spectrumSize = (bufferSize/2) + 1; - XML.popTag(); - } - } + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); + spectrumSize = (bufferSize/2) + 1; // INIT FFT BUFFER for(int i=0;i &mainWindow){ unusedArgs(mainWindow); - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - bufferSize = XML.getValue("buffer_size",0); - spectrumSize = (bufferSize/2) + 1; - arrayPosition = bufferSize + spectrumSize + MEL_SCALE_CRITICAL_BANDS; - XML.popTag(); - } - } + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); + spectrumSize = (bufferSize/2) + 1; + arrayPosition = bufferSize + spectrumSize + MEL_SCALE_CRITICAL_BANDS; } diff --git a/src/objects/audio_analysis/RMSExtractor.cpp b/src/objects/audio_analysis/RMSExtractor.cpp index e5d6c3f8..fa37bfa6 100755 --- a/src/objects/audio_analysis/RMSExtractor.cpp +++ b/src/objects/audio_analysis/RMSExtractor.cpp @@ -64,20 +64,11 @@ void RMSExtractor::newObject(){ void RMSExtractor::setupObjectContent(shared_ptr &mainWindow){ unusedArgs(mainWindow); - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - bufferSize = XML.getValue("buffer_size",0); - spectrumSize = (bufferSize/2) + 1; - arrayPosition = bufferSize + spectrumSize + MEL_SCALE_CRITICAL_BANDS - 1; - XML.popTag(); - } - } + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); + spectrumSize = (bufferSize/2) + 1; + arrayPosition = bufferSize + spectrumSize + MEL_SCALE_CRITICAL_BANDS - 1; } diff --git a/src/objects/communications/OscReceiver.cpp b/src/objects/communications/OscReceiver.cpp index 31a85bf4..06a997fc 100644 --- a/src/objects/communications/OscReceiver.cpp +++ b/src/objects/communications/OscReceiver.cpp @@ -291,68 +291,50 @@ void OscReceiver::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void OscReceiver::initOutlets(){ - ofxXmlSettings XML; -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(this->patchFile)){ -#else - if (XML.load(this->patchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - - // Load object outlet config - for(int i=0;inId){ - vector tempTypes; - if(XML.pushTag("outlets")){ - for (int t=0;tnumOutlets = totalOutlets-1; - - int tempCounter = 0; - for (int t=0;t(this->_outletParams[tempCounter]) = 0.0f; - osc_labels.push_back(XML.getValue("name","")); - osc_labels_type.push_back(VP_LINK_NUMERIC); - tempCounter++; - }else if(tempTypes.at(tempCounter) == 1){ - _outletParams[tempCounter] = new string(); - *ofxVP_CAST_PIN_PTR(_outletParams[tempCounter]) = ""; - osc_labels.push_back(XML.getValue("name","")); - osc_labels_type.push_back(VP_LINK_STRING); - tempCounter++; - }else if(tempTypes.at(tempCounter) == 2){ - _outletParams[tempCounter] = new vector(); - osc_labels.push_back(XML.getValue("name","")); - osc_labels_type.push_back(VP_LINK_ARRAY); - tempCounter++; - }else if(tempTypes.at(tempCounter) == 3){ - _outletParams[tempCounter] = new ofTexture(); - osc_labels.push_back(XML.getValue("name","")); - osc_labels_type.push_back(VP_LINK_TEXTURE); - tempCounter++; - } - } - XML.popTag(); - } - } - XML.popTag(); - } + + this->ofxVPXml.loadMosaicPatch(this->patchFile); + + pugi::xpath_node_set thisOutlets = this->ofxVPXml.getObjectOutlets(this->nId); + pugi::xpath_node_set thisVars = this->ofxVPXml.getObjectVars(this->nId); + + // Get object outlets config + if(!thisOutlets.empty()){ + vector tempTypes; + for(auto & outlet: thisOutlets){ + auto o = outlet.node(); + int type = this->ofxVPXml.getPatchChildInt(o,"type"); + tempTypes.push_back(type); + } + this->numOutlets = thisVars.size()-1; + int tempCounter = 0; + for(auto & var: thisVars){ + auto v = var.node(); + + std::string varName = this->ofxVPXml.getPatchChildString(v,"name"); + if(varName != "PORT"){ + if(tempTypes.at(tempCounter) == 0){ + _outletParams[tempCounter] = new float(); + *ofxVP_CAST_PIN_PTR(this->_outletParams[tempCounter]) = 0.0f; + osc_labels.push_back(varName); + osc_labels_type.push_back(VP_LINK_NUMERIC); + tempCounter++; + }else if(tempTypes.at(tempCounter) == 1){ + _outletParams[tempCounter] = new string(); + *ofxVP_CAST_PIN_PTR(_outletParams[tempCounter]) = ""; + osc_labels.push_back(varName); + osc_labels_type.push_back(VP_LINK_STRING); + tempCounter++; + }else if(tempTypes.at(tempCounter) == 2){ + _outletParams[tempCounter] = new vector(); + osc_labels.push_back(varName); + osc_labels_type.push_back(VP_LINK_ARRAY); + tempCounter++; + }else if(tempTypes.at(tempCounter) == 3){ + _outletParams[tempCounter] = new ofTexture(); + osc_labels.push_back(varName); + osc_labels_type.push_back(VP_LINK_TEXTURE); + tempCounter++; } - XML.popTag(); } } } @@ -369,43 +351,42 @@ void OscReceiver::resetOutlets(){ this->height *= 2; } - ofxXmlSettings XML; -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(this->patchFile)){ -#else - if (XML.load(this->patchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - - // Save new object outlet config - for(int i=0;inId){ - // Dynamic reloading outlets - XML.removeTag("outlets"); - int newOutlets = XML.addTag("outlets"); - if(XML.pushTag("outlets",newOutlets)){ - for(int j=0;j(this->outletsType.size());j++){ - int newLink = XML.addTag("link"); - if(XML.pushTag("link",newLink)){ - XML.setValue("type",this->outletsType.at(j)); - XML.popTag(); - } - } - XML.popTag(); - } + this->ofxVPXml.loadMosaicPatch(this->patchFile); + + // Load existing Links + pugi::xpath_node_set objOutlets = this->ofxVPXml.getObjectOutlets(this->nId); + vector tempLinks; + if(!objOutlets.empty()){ + int oIndex = 0; + for(auto & outlet: objOutlets){ + pugi::xpath_node_set objLinks = this->ofxVPXml.getObjectLinks(this->nId,oIndex); + if(!objLinks.empty()){ + for(auto & link: objLinks){ + auto l = link.node(); + tempLinks.push_back(ofVec3f(oIndex,this->ofxVPXml.getPatchChildInt(l,"id"),this->ofxVPXml.getPatchChildInt(l,"inlet"))); } - XML.popTag(); } + oIndex++; } + } -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - XML.saveFile(); -#else - XML.save(); -#endif + // Save new object outlet config + + // Dynamic reloading outlets + this->ofxVPXml.removeObjectOutlets(this->nId); + this->ofxVPXml.appendObjectOutletsBlock(this->nId); + for(int j=0;j(this->outletsType.size());j++){ + this->ofxVPXml.addObjectOutlet(this->nId,this->outletsType.at(j),this->outletsNames.at(j)); + // re-add previous links + for(int z=0;z(tempLinks.size());z++){ + if(static_cast(floor(tempLinks.at(z).x)) == j){ + this->ofxVPXml.addObjectLink(this->nId,j,static_cast(floor(tempLinks.at(z).y)),static_cast(floor(tempLinks.at(z).z))); + } + } } + ofNotifyEvent(this->reconnectOutletsEvent, this->nId); + this->saveConfig(false); } diff --git a/src/objects/communications/OscSender.cpp b/src/objects/communications/OscSender.cpp index 784cb398..798e67b8 100644 --- a/src/objects/communications/OscSender.cpp +++ b/src/objects/communications/OscSender.cpp @@ -315,74 +315,57 @@ void OscSender::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void OscSender::initInlets(){ - ofxXmlSettings XML; -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(this->patchFile)){ -#else - if (XML.load(this->patchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - - // Get object inlets config - for(int i=0;inId){ - vector tempTypes; - if(XML.pushTag("inlets")){ - for (int t=0;tnumInlets = totalOutlets-2; - - int tempCounter = 0; - for (int t=0;t(this->_inletParams[tempCounter]) = 0.0f; - osc_labels.push_back(XML.getValue("name","")); - osc_labels_type.push_back(VP_LINK_NUMERIC); - tempCounter++; - }else if(tempTypes.at(tempCounter) == 1){ // string - _inletParams[tempCounter] = new string(); // control - *ofxVP_CAST_PIN_PTR(_inletParams[tempCounter]) = ""; - osc_labels.push_back(XML.getValue("name","")); - osc_labels_type.push_back(VP_LINK_STRING); - tempCounter++; - }else if(tempTypes.at(tempCounter) == 2){ // vector - _inletParams[tempCounter] = new vector(); - osc_labels.push_back(XML.getValue("name","")); - osc_labels_type.push_back(VP_LINK_ARRAY); - tempCounter++; - }else if(tempTypes.at(tempCounter) == 3){ // ofTexture - _inletParams[tempCounter] = new ofTexture(); - osc_labels.push_back(XML.getValue("name","")); - osc_labels_type.push_back(VP_LINK_TEXTURE); - tempCounter++; - } - } - XML.popTag(); - } - } - XML.popTag(); - } + + this->ofxVPXml.loadMosaicPatch(this->patchFile); + + pugi::xpath_node_set thisInlets = this->ofxVPXml.getObjectInlets(this->nId); + pugi::xpath_node_set thisVars = this->ofxVPXml.getObjectVars(this->nId); + + // Get object inlets config + if(!thisInlets.empty()){ + vector tempTypes; + for(auto & inlet: thisInlets){ + auto i = inlet.node(); + int type = this->ofxVPXml.getPatchChildInt(i,"type"); + tempTypes.push_back(type); + } + this->numInlets = thisVars.size()-2; + int tempCounter = 0; + for(auto & var: thisVars){ + auto v = var.node(); + + bool isreceiverIP = false; + std::string varName = this->ofxVPXml.getPatchChildString(v,"name"); + if (varName.find('@') != std::string::npos){ + isreceiverIP = true; + }else{ + isreceiverIP = false; + } + + if(varName != "PORT" && !isreceiverIP){ + if(tempTypes.at(tempCounter) == 0){ // float + _inletParams[tempCounter] = new float(); + *ofxVP_CAST_PIN_PTR(this->_inletParams[tempCounter]) = 0.0f; + osc_labels.push_back(varName); + osc_labels_type.push_back(VP_LINK_NUMERIC); + tempCounter++; + }else if(tempTypes.at(tempCounter) == 1){ // string + _inletParams[tempCounter] = new string(); // control + *ofxVP_CAST_PIN_PTR(_inletParams[tempCounter]) = ""; + osc_labels.push_back(varName); + osc_labels_type.push_back(VP_LINK_STRING); + tempCounter++; + }else if(tempTypes.at(tempCounter) == 2){ // vector + _inletParams[tempCounter] = new vector(); + osc_labels.push_back(varName); + osc_labels_type.push_back(VP_LINK_ARRAY); + tempCounter++; + }else if(tempTypes.at(tempCounter) == 3){ // ofTexture + _inletParams[tempCounter] = new ofTexture(); + osc_labels.push_back(varName); + osc_labels_type.push_back(VP_LINK_TEXTURE); + tempCounter++; } - XML.popTag(); } } } @@ -393,33 +376,18 @@ void OscSender::initInlets(){ //-------------------------------------------------------------- string OscSender::getHostFromConfig(){ - ofxXmlSettings XML; -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(this->patchFile)){ -#else - if (XML.load(this->patchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); + pugi::xml_node obj = this->ofxVPXml.getObjectNode(this->nId); - // Get object inlets config - for(int i=0;inId){ - string temp = XML.getValue("filepath","none"); + std::string temp = this->ofxVPXml.getPatchChildString(obj,"filepath"); - size_t found = temp.find_last_of("/"); - if(found != string::npos){ - return temp.substr(found+1); - }else{ - if(temp == "none"){ - return "localhost"; - }else{ - return temp; - } - } - } - XML.popTag(); - } + size_t found = temp.find_last_of("/"); + if(found != string::npos){ + return temp.substr(found+1); + }else{ + if(temp == "none"){ + return "localhost"; + }else{ + return temp; } } diff --git a/src/objects/data/Receiver.cpp b/src/objects/data/Receiver.cpp index 497626f1..3728bfb7 100644 --- a/src/objects/data/Receiver.cpp +++ b/src/objects/data/Receiver.cpp @@ -296,32 +296,16 @@ void vpReceiver::initWireless(){ changeDataType(receiveTypeIndex); this->wirelessType = receiveTypeIndex; - ofxXmlSettings XML; -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(this->patchFile)){ -#else - if (XML.load(this->patchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - - // Get object inlets config - for(int i=0;inId){ - if (XML.pushTag("vars")){ - int totalVars = XML.getNumTags("var"); - for (int t=0;tofxVPXml.loadMosaicPatch(this->patchFile); + + pugi::xpath_node_set vars = this->ofxVPXml.getObjectVars(this->nId); + + if(!vars.empty()){ + for(auto & var: vars){ + auto v = var.node(); + std::string n = this->ofxVPXml.getPatchChildString(v,"name"); + if(n != "DATA_TYPE" && n != "IS_RECEIVING" && n != "_unassigned"){ + varName = n; } } } @@ -424,43 +408,13 @@ void vpReceiver::changeDataType(int type, bool init){ // changed inlets/outlet type if(!init){ // remove links - ofxXmlSettings XML; - -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(this->patchFile)){ -#else - if (XML.load(this->patchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - - // Save new object config - for(int i=0;inId){ - // Dynamic reloading outlets - XML.removeTag("outlets"); - int newOutlets = XML.addTag("outlets"); - if(XML.pushTag("outlets",newOutlets)){ - int newLink = XML.addTag("link"); - if(XML.pushTag("link",newLink)){ - XML.setValue("type",this->outletsType.at(0)); - XML.setValue("name",this->outletsNames.at(0)); - XML.popTag(); - } - XML.popTag(); - } - } - XML.popTag(); - } - } -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - XML.saveFile(); -#else - XML.save(); -#endif + this->ofxVPXml.loadMosaicPatch(this->patchFile); - } + // Dynamic reloading outlets + this->ofxVPXml.removeObjectOutlets(this->nId); + this->ofxVPXml.appendObjectOutletsBlock(this->nId); + this->ofxVPXml.addObjectOutlet(this->nId,this->outletsType.at(0),this->outletsNames.at(0)); this->outPut.clear(); } diff --git a/src/objects/data/Sender.cpp b/src/objects/data/Sender.cpp index ecaec339..004302dc 100644 --- a/src/objects/data/Sender.cpp +++ b/src/objects/data/Sender.cpp @@ -292,33 +292,16 @@ void vpSender::initWireless(){ changeDataType(sendTypeIndex); this->wirelessType = sendTypeIndex; - ofxXmlSettings XML; -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(this->patchFile)){ -#else - if (XML.load(this->patchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - - // Get object inlets config - for(int i=0;inId){ - if (XML.pushTag("vars")){ - int totalVars = XML.getNumTags("var"); - for (int t=0;tofxVPXml.loadMosaicPatch(this->patchFile); + + pugi::xpath_node_set vars = this->ofxVPXml.getObjectVars(this->nId); + + if(!vars.empty()){ + for(auto & var: vars){ + auto v = var.node(); + std::string n = this->ofxVPXml.getPatchChildString(v,"name"); + if(n != "DATA_TYPE" && n != "IS_SENDING" && n != "_unassigned"){ + varName = n; } } } @@ -424,73 +407,52 @@ void vpSender::changeDataType(int type, bool init){ this->setOutletWirelessSend(wirelessPin,true); - ofxXmlSettings XML; + // Save new object config + this->ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(this->patchFile)){ -#else - if (XML.load(this->patchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - - // Save new object config - for(int i=0;inId){ - // Dynamic reloading outlets - XML.removeTag("outlets"); - int newOutlets = XML.addTag("outlets"); - if(XML.pushTag("outlets",newOutlets)){ - for(int j=0;j(this->outletsType.size());j++){ - int newLink = XML.addTag("link"); - if(XML.pushTag("link",newLink)){ - XML.setValue("type",this->outletsType.at(j)); - XML.setValue("name",this->outletsNames.at(j)); - XML.popTag(); - } - } - XML.popTag(); - } - }else{ - // remove links to this object if are not of the same type as before - if(XML.pushTag("outlets")){ - int totalLinks = XML.getNumTags("link"); - for(int l=0;l delLinks; - for(int t=0;tnId && type != this->outletsType.at(wirelessPin)){ - delLinks.push_back(true); - }else{ - delLinks.push_back(false); - } - XML.popTag(); - } + // Dynamic reloading outlets + this->ofxVPXml.removeObjectOutlets(this->nId); + this->ofxVPXml.appendObjectOutletsBlock(this->nId); + for(int j=0;j(this->outletsType.size());j++){ + this->ofxVPXml.addObjectOutlet(this->nId,this->outletsType.at(j),this->outletsNames.at(j)); + } + + // remove links to this object if are not of the same type as before + pugi::xpath_node_set objs = this->ofxVPXml.getPatchObjects(); + + if(!objs.empty()){ + for(auto & obj: objs){ + auto o = obj.node(); + int tid = this->ofxVPXml.getPatchChildInt(o,"id"); + if(tid != this->nId){ + pugi::xpath_node_set outlets = this->ofxVPXml.getObjectOutlets(tid); + if(!outlets.empty()){ + int oIndex = 0; + for(auto & outlet: outlets){ + auto out = outlet.node(); + int type = this->ofxVPXml.getPatchChildInt(out,"type"); + pugi::xpath_node_set links = this->ofxVPXml.getObjectLinks(tid,oIndex); + if(!links.empty()){ + vector delLinks; + for(auto & link: links){ + auto l = link.node(); + if(this->ofxVPXml.getPatchChildInt(l,"id") == this->nId && type != this->outletsType.at(wirelessPin)){ + delLinks.push_back(true); + }else{ + delLinks.push_back(false); } - for(int d=delLinks.size()-1;d>=0;d--){ - if(delLinks.at(d)){ - XML.removeTag("to",d); - } + } + for(int d=delLinks.size()-1;d>=0;d--){ + if(delLinks.at(d)){ + this->ofxVPXml.removeObjectLink(tid,oIndex,d); } - XML.popTag(); } } - XML.popTag(); + oIndex++; } } - XML.popTag(); } } - -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - XML.saveFile(); -#else - XML.save(); -#endif - } if(!init){ diff --git a/src/objects/gui/moComment.cpp b/src/objects/gui/moComment.cpp index f00922d9..69259c6a 100644 --- a/src/objects/gui/moComment.cpp +++ b/src/objects/gui/moComment.cpp @@ -179,54 +179,27 @@ void moComment::drawObjectNodeConfig(){ //-------------------------------------------------------------- void moComment::removeObjectContent(bool removeFileFromData){ - + unusedArgs(removeFileFromData); } //-------------------------------------------------------------- void moComment::loadCommentSetting(){ - ofxXmlSettings XML; -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - for(int i=0;inId){ - actualComment = XML.getValue("text","none"); - } - XML.popTag(); - } - } - } + ofxVPXml.loadMosaicPatch(this->patchFile); + + pugi::xml_node obj = this->ofxVPXml.getObjectNode(this->nId); + actualComment = this->ofxVPXml.getPatchChildString(obj,"text"); + } //-------------------------------------------------------------- void moComment::saveCommentSetting(){ - ofxXmlSettings XML; -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - for(int i=0;inId){ - XML.setValue("text",actualComment); - } - XML.popTag(); - } - } -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - XML.saveFile(); -#else - XML.save(); -#endif - } + ofxVPXml.loadMosaicPatch(this->patchFile); + + pugi::xml_node obj = this->ofxVPXml.getObjectNode(this->nId); + this->ofxVPXml.setPatchValue(obj,"text",actualComment); + } OBJECT_REGISTER( moComment, "comment", OFXVP_OBJECT_CAT_GUI) diff --git a/src/objects/gui/moMessage.cpp b/src/objects/gui/moMessage.cpp index 56321abe..a50c4d03 100644 --- a/src/objects/gui/moMessage.cpp +++ b/src/objects/gui/moMessage.cpp @@ -149,54 +149,23 @@ void moMessage::drawObjectNodeConfig(){ //-------------------------------------------------------------- void moMessage::removeObjectContent(bool removeFileFromData){ - + unusedArgs(removeFileFromData); } //-------------------------------------------------------------- void moMessage::loadMessageSetting(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - for(int i=0;inId){ - actualMessage = XML.getValue("text","none"); - } - XML.popTag(); - } - } - } + pugi::xml_node obj = this->ofxVPXml.getObjectNode(this->nId); + actualMessage = this->ofxVPXml.getPatchChildString(obj,"text"); } //-------------------------------------------------------------- void moMessage::saveMessageSetting(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - for(int i=0;inId){ - XML.setValue("text",actualMessage); - } - XML.popTag(); - } - } -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - XML.saveFile(); -#else - XML.save(); -#endif - } + pugi::xml_node obj = this->ofxVPXml.getObjectNode(this->nId); + this->ofxVPXml.setPatchValue(obj,"text",actualMessage); } diff --git a/src/objects/gui/moSignalViewer.cpp b/src/objects/gui/moSignalViewer.cpp index 69e2a5d6..abc3adc5 100644 --- a/src/objects/gui/moSignalViewer.cpp +++ b/src/objects/gui/moSignalViewer.cpp @@ -158,25 +158,14 @@ void moSignalViewer::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void moSignalViewer::loadAudioSettings(){ - ofxXmlSettings XML; - -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - - plot_data = new float[bufferSize]; - for(int i=0;i>(_outletParams[2])->push_back(0.0f); - plot_data[i] = 0.0f; - } - - XML.popTag(); - } + ofxVPXml.loadMosaicPatch(this->patchFile); + + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); + plot_data = new float[bufferSize]; + for(int i=0;i>(_outletParams[2])->push_back(0.0f); + plot_data[i] = 0.0f; } } diff --git a/src/objects/gui/moTimeline.cpp b/src/objects/gui/moTimeline.cpp index ae3e6a84..1bd09394 100755 --- a/src/objects/gui/moTimeline.cpp +++ b/src/objects/gui/moTimeline.cpp @@ -86,6 +86,7 @@ moTimeline::moTimeline() : PatchObject("timeline"){ waitTime = 100; this->setIsSharedContextObj(true); + this->setIsResizable(true); } @@ -683,82 +684,39 @@ void moTimeline::updateOutletsConfig(){ //-------------------------------------------------------------- void moTimeline::saveOutletConfig(){ - ofxXmlSettings XML; -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - - // Load Links - vector tempLinks; - for(int i=0;inId){ - if (XML.pushTag("outlets")){ - int totalOutlets = XML.getNumTags("link"); - for(int j=0;jofxVPXml.loadMosaicPatch(this->patchFile); + + // Load existing Links + pugi::xpath_node_set objOutlets = this->ofxVPXml.getObjectOutlets(this->nId); + vector tempLinks; + if(!objOutlets.empty()){ + int oIndex = 0; + for(auto & outlet: objOutlets){ + pugi::xpath_node_set objLinks = this->ofxVPXml.getObjectLinks(this->nId,oIndex); + if(!objLinks.empty()){ + for(auto & link: objLinks){ + auto l = link.node(); + tempLinks.push_back(ofVec3f(oIndex,this->ofxVPXml.getPatchChildInt(l,"id"),this->ofxVPXml.getPatchChildInt(l,"inlet"))); } - XML.popTag(); } + oIndex++; } + } - // Save new object outlet config - for(int i=0;inId){ - // Dynamic reloading outlets - XML.removeTag("outlets"); - int newOutlets = XML.addTag("outlets"); - if(XML.pushTag("outlets",newOutlets)){ - for(int j=0;j(this->outletsType.size());j++){ - int newLink = XML.addTag("link"); - if(XML.pushTag("link",newLink)){ - XML.setValue("type",this->outletsType.at(j)); - - // re-add previous links - for(int z=0;z(tempLinks.size());z++){ - if(static_cast(floor(tempLinks.at(z).x)) == j){ - int newTo = XML.addTag("to"); - if(XML.pushTag("to", newTo)){ - XML.setValue("id",static_cast(floor(tempLinks.at(z).y))); - XML.setValue("inlet",static_cast(floor(tempLinks.at(z).z))); - XML.popTag(); - } - } - } - - XML.popTag(); - } - } - XML.popTag(); - } - } - XML.popTag(); + // Save new object outlet config + + // Dynamic reloading outlets + this->ofxVPXml.removeObjectOutlets(this->nId); + this->ofxVPXml.appendObjectOutletsBlock(this->nId); + for(int j=0;j(this->outletsType.size());j++){ + this->ofxVPXml.addObjectOutlet(this->nId,this->outletsType.at(j),this->outletsNames.at(j)); + // re-add previous links + for(int z=0;z(tempLinks.size());z++){ + if(static_cast(floor(tempLinks.at(z).x)) == j){ + this->ofxVPXml.addObjectLink(this->nId,j,static_cast(floor(tempLinks.at(z).y)),static_cast(floor(tempLinks.at(z).z))); } } - -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - XML.saveFile(); -#else - XML.save(); -#endif } ofNotifyEvent(this->reconnectOutletsEvent, this->nId); diff --git a/src/objects/gui/moValuePlotter.cpp b/src/objects/gui/moValuePlotter.cpp index 4365fa4d..f8735594 100644 --- a/src/objects/gui/moValuePlotter.cpp +++ b/src/objects/gui/moValuePlotter.cpp @@ -207,54 +207,23 @@ void moValuePlotter::drawObjectNodeConfig(){ //-------------------------------------------------------------- void moValuePlotter::removeObjectContent(bool removeFileFromData){ - + unusedArgs(removeFileFromData); } //-------------------------------------------------------------- void moValuePlotter::loadVariableName(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - for(int i=0;inId){ - name = XML.getValue("varname","none"); - } - XML.popTag(); - } - } - } + pugi::xml_node obj = this->ofxVPXml.getObjectNode(this->nId); + name = this->ofxVPXml.getPatchChildString(obj,"varname"); } //-------------------------------------------------------------- -void moValuePlotter::saveVariableName(){ - ofxXmlSettings XML; +void moValuePlotter::saveVariableName(){ + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - for(int i=0;inId){ - XML.setValue("varname",name); - } - XML.popTag(); - } - } -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - XML.saveFile(); -#else - XML.save(); -#endif - } + pugi::xml_node obj = this->ofxVPXml.getObjectNode(this->nId); + this->ofxVPXml.setPatchValue(obj,"varname",name); } OBJECT_REGISTER( moValuePlotter, "value plotter", OFXVP_OBJECT_CAT_GUI) diff --git a/src/objects/sound/AudioDevice.cpp b/src/objects/sound/AudioDevice.cpp index 3f97978c..92de9515 100644 --- a/src/objects/sound/AudioDevice.cpp +++ b/src/objects/sound/AudioDevice.cpp @@ -223,162 +223,151 @@ void AudioDevice::resetSystemObject(){ } } - ofxXmlSettings XML; - deviceLoaded = false; -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - - if (XML.pushTag("settings")){ - in_channels = XML.getValue("input_channels",0); - out_channels = XML.getValue("output_channels",0); - sampleRateIN = XML.getValue("sample_rate_in",0); - sampleRateOUT= XML.getValue("sample_rate_out",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } + this->ofxVPXml.loadMosaicPatch(this->patchFile); - this->numInlets = out_channels; - this->numOutlets = in_channels; + in_channels = this->ofxVPXml.getMosaicConfigInt("input_channels"); + out_channels = this->ofxVPXml.getMosaicConfigInt("output_channels"); + sampleRateIN = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + sampleRateOUT= this->ofxVPXml.getMosaicConfigInt("sample_rate_out"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); - IN_CH.clear(); - PN_IN_CH.resize(in_channels); - LC_IN_CH.resize(in_channels); - HC_IN_CH.resize(in_channels); - IN_SCOPE.resize(in_channels); - OUT_CH.resize(out_channels); + bool isNumOutletChanged = true; + if(this->numOutlets == in_channels){ + isNumOutletChanged = false; + } - shortBuffer = new short[bufferSize]; - for (int i = 0; i < bufferSize; i++){ - shortBuffer[i] = 0; - } + this->numInlets = out_channels; + this->numOutlets = in_channels; - for( int i = 0; i < out_channels; i++){ - _inletParams[i] = new ofSoundBuffer(shortBuffer,static_cast(bufferSize),1,static_cast(sampleRateOUT)); - } + IN_CH.clear(); + PN_IN_CH.resize(in_channels); + LC_IN_CH.resize(in_channels); + HC_IN_CH.resize(in_channels); + IN_SCOPE.resize(in_channels); + OUT_CH.resize(out_channels); - for( unsigned int i = 0; i < this->pdspOut.size(); i++){ - this->pdspOut[i].disconnectOut(); - } - this->pdspOut.clear(); + shortBuffer = new short[bufferSize]; + for (int i = 0; i < bufferSize; i++){ + shortBuffer[i] = 0; + } - for( int i = 0; i < in_channels; i++){ - _outletParams[i] = new ofSoundBuffer(); - ofSoundBuffer temp; - IN_CH.push_back(temp); + for( int i = 0; i < out_channels; i++){ + _inletParams[i] = new ofSoundBuffer(shortBuffer,static_cast(bufferSize),1,static_cast(sampleRateOUT)); + } - pdsp::PatchNode *tempPN = new pdsp::PatchNode(); - this->pdspOut[i] = *tempPN; - } + for( unsigned int i = 0; i < this->pdspOut.size(); i++){ + this->pdspOut[i].disconnectOut(); + } + this->pdspOut.clear(); - this->inletsType.clear(); - this->inletsNames.clear(); - this->inletsIDs.clear(); - this->inletsWirelessReceive.clear(); + for( int i = 0; i < in_channels; i++){ + _outletParams[i] = new ofSoundBuffer(); + ofSoundBuffer temp; + IN_CH.push_back(temp); - for( int i = 0; i < out_channels; i++){ - this->addInlet(VP_LINK_AUDIO,"OUT CHANNEL "+ofToString(i+1)); - } + pdsp::PatchNode *tempPN = new pdsp::PatchNode(); + this->pdspOut[i] = *tempPN; + } - this->outletsType.clear(); - this->outletsNames.clear(); - this->outletsIDs.clear(); - this->outletsWirelessSend.clear(); - for( int i = 0; i < in_channels; i++){ - this->addOutlet(VP_LINK_AUDIO,"IN CHANNEL "+ofToString(i+1)); - } + this->inletsType.clear(); + this->inletsNames.clear(); + this->inletsIDs.clear(); + this->inletsWirelessReceive.clear(); - this->inletsConnected.clear(); - this->initInletsState(); + for( int i = 0; i < out_channels; i++){ + this->addInlet(VP_LINK_AUDIO,"OUT CHANNEL "+ofToString(i+1)); + } - for(int i=0;inumInlets;i++){ - if(i(tempInletsConn.size())){ - if(tempInletsConn.at(i)){ - this->inletsConnected.push_back(true); - }else{ - this->inletsConnected.push_back(false); - } + this->outletsType.clear(); + this->outletsNames.clear(); + this->outletsIDs.clear(); + this->outletsWirelessSend.clear(); + for( int i = 0; i < in_channels; i++){ + this->addOutlet(VP_LINK_AUDIO,"IN CHANNEL "+ofToString(i+1)); + } + + this->inletsConnected.clear(); + this->initInletsState(); + + for(int i=0;inumInlets;i++){ + if(i(tempInletsConn.size())){ + if(tempInletsConn.at(i)){ + this->inletsConnected.push_back(true); }else{ this->inletsConnected.push_back(false); } + }else{ + this->inletsConnected.push_back(false); } + } - this->height = OBJECT_HEIGHT; + this->height = OBJECT_HEIGHT; - if(this->numInlets > 6 || this->numOutlets > 6){ - this->height *= 2; - } + if(this->numInlets > 6 || this->numOutlets > 6){ + this->height *= 2; + } - if(this->numInlets > 12 || this->numOutlets > 12){ - this->height *= 2; + if(this->numInlets > 12 || this->numOutlets > 12){ + this->height *= 2; + } + + // ---------------------------------------- Save new object config + + + this->ofxVPXml.loadMosaicPatch(this->patchFile); + + // Dynamic reloading outlets + if(isNumOutletChanged){ + this->ofxVPXml.removeObjectOutlets(this->nId); + this->ofxVPXml.appendObjectOutletsBlock(this->nId); + for(int j=0;j(this->outletsType.size());j++){ + this->ofxVPXml.addObjectOutlet(this->nId,this->outletsType.at(j),this->outletsNames.at(j)); } + } - // Save new object config - for(int i=0;inId){ - // Dynamic reloading outlets - XML.removeTag("outlets"); - int newOutlets = XML.addTag("outlets"); - if(XML.pushTag("outlets",newOutlets)){ - for(int j=0;j(this->outletsType.size());j++){ - int newLink = XML.addTag("link"); - if(XML.pushTag("link",newLink)){ - XML.setValue("type",this->outletsType.at(j)); - XML.setValue("name",this->outletsNames.at(j)); - XML.popTag(); - } - } - XML.popTag(); - } - }else{ - // remove links to this object if exceed new inlets number - if(XML.pushTag("outlets")){ - int totalLinks = XML.getNumTags("link"); - for(int l=0;l delLinks; - for(int t=0;tnId && XML.getValue("inlet", -1) > this->getNumInlets()-1){ - delLinks.push_back(true); - }else{ - delLinks.push_back(false); - } - XML.popTag(); - } + // remove links to this object if exceed new inlets number + pugi::xpath_node_set objs = this->ofxVPXml.getPatchObjects(); + + if(!objs.empty()){ + for(auto & obj: objs){ + auto o = obj.node(); + int tid = this->ofxVPXml.getPatchChildInt(o,"id"); + if(tid != this->nId){ + pugi::xpath_node_set objOutlets = this->ofxVPXml.getObjectOutlets(tid); + if(!objOutlets.empty()){ + int oIndex = 0; + for(auto & outlet: objOutlets){ + pugi::xpath_node_set ooLinks = this->ofxVPXml.getObjectLinks(tid,oIndex); + if(!ooLinks.empty()){ + vector delLinks; + for(auto & link: ooLinks){ + auto l = link.node(); + if(this->ofxVPXml.getPatchChildInt(l,"id") == this->nId && this->ofxVPXml.getPatchChildInt(l,"inlet") > this->getNumInlets()-1){ + delLinks.push_back(true); + }else{ + delLinks.push_back(false); } - for(int d=delLinks.size()-1;d>=0;d--){ - if(delLinks.at(d)){ - XML.removeTag("to",d); - } + } + for(int d=delLinks.size()-1;d>=0;d--){ + if(delLinks.at(d)){ + this->ofxVPXml.removeObjectLink(tid,oIndex,d); } - XML.popTag(); } } - XML.popTag(); + oIndex++; } } - XML.popTag(); } } -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - XML.saveFile(); -#else - XML.save(); -#endif - deviceLoaded = true; + } this->saveConfig(false); + } //-------------------------------------------------------------- @@ -393,109 +382,91 @@ void AudioDevice::loadDeviceInfo(){ } } - ofxXmlSettings XML; - -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - in_channels = XML.getValue("input_channels",0); - out_channels = XML.getValue("output_channels",0); - sampleRateIN = XML.getValue("sample_rate_in",0); - sampleRateOUT= XML.getValue("sample_rate_out",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } + this->ofxVPXml.loadMosaicPatch(this->patchFile); - bool isNewObject = true; + in_channels = this->ofxVPXml.getMosaicConfigInt("input_channels"); + out_channels = this->ofxVPXml.getMosaicConfigInt("output_channels"); + sampleRateIN = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + sampleRateOUT= this->ofxVPXml.getMosaicConfigInt("sample_rate_out"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); - int totalObjects = XML.getNumTags("object"); - for (int i=0;inId){ - isNewObject = false; - } - XML.popTag(); - } - } + bool isNewObject = !this->ofxVPXml.objIDExists(this->nId); - this->numInlets = out_channels; - this->numOutlets = in_channels; + this->numInlets = out_channels; + this->numOutlets = in_channels; - IN_CH.clear(); - PN_IN_CH.resize(in_channels); - LC_IN_CH.resize(in_channels); - HC_IN_CH.resize(in_channels); - IN_SCOPE.resize(in_channels); - OUT_CH.resize(out_channels); + IN_CH.clear(); + PN_IN_CH.resize(in_channels); + LC_IN_CH.resize(in_channels); + HC_IN_CH.resize(in_channels); + IN_SCOPE.resize(in_channels); + OUT_CH.resize(out_channels); - shortBuffer = new short[bufferSize]; - for (int i = 0; i < bufferSize; i++){ - shortBuffer[i] = 0; - } + shortBuffer = new short[bufferSize]; + for (int i = 0; i < bufferSize; i++){ + shortBuffer[i] = 0; + } - for( int i = 0; i < out_channels; i++){ - _inletParams[i] = new ofSoundBuffer(shortBuffer,static_cast(bufferSize),1,static_cast(sampleRateOUT)); - } + for( int i = 0; i < out_channels; i++){ + _inletParams[i] = new ofSoundBuffer(shortBuffer,static_cast(bufferSize),1,static_cast(sampleRateOUT)); + } - for( int i = 0; i < (int)this->pdspOut.size(); i++){ - this->pdspOut[i].disconnectOut(); - } - this->pdspOut.clear(); + for( int i = 0; i < (int)this->pdspOut.size(); i++){ + this->pdspOut[i].disconnectOut(); + } + this->pdspOut.clear(); - for( int i = 0; i < in_channels; i++){ - _outletParams[i] = new ofSoundBuffer(); - ofSoundBuffer temp; - IN_CH.push_back(temp); + for( int i = 0; i < in_channels; i++){ + _outletParams[i] = new ofSoundBuffer(); + ofSoundBuffer temp; + IN_CH.push_back(temp); - pdsp::PatchNode *tempPN = new pdsp::PatchNode(); - this->pdspOut[i] = *tempPN; - } + pdsp::PatchNode *tempPN = new pdsp::PatchNode(); + this->pdspOut[i] = *tempPN; + } - this->inletsType.clear(); - this->inletsNames.clear(); + this->inletsType.clear(); + this->inletsNames.clear(); - for( int i = 0; i < out_channels; i++){ - this->addInlet(VP_LINK_AUDIO,"OUT CHANNEL "+ofToString(i+1)); - } + for( int i = 0; i < out_channels; i++){ + this->addInlet(VP_LINK_AUDIO,"OUT CHANNEL "+ofToString(i+1)); + } - if(isNewObject){ - this->outletsType.clear(); - this->outletsNames.clear(); - for( int i = 0; i < in_channels; i++){ - this->addOutlet(VP_LINK_AUDIO,"IN CHANNEL "+ofToString(i+1)); - } + if(isNewObject){ + this->outletsType.clear(); + this->outletsNames.clear(); + for( int i = 0; i < in_channels; i++){ + this->addOutlet(VP_LINK_AUDIO,"IN CHANNEL "+ofToString(i+1)); } + } - this->inletsConnected.clear(); - this->initInletsState(); + this->inletsConnected.clear(); + this->initInletsState(); - for(int i=0;inumInlets;i++){ - if(i(tempInletsConn.size())){ - if(tempInletsConn.at(i)){ - this->inletsConnected.push_back(true); - }else{ - this->inletsConnected.push_back(false); - } + for(int i=0;inumInlets;i++){ + if(i(tempInletsConn.size())){ + if(tempInletsConn.at(i)){ + this->inletsConnected.push_back(true); }else{ this->inletsConnected.push_back(false); } + }else{ + this->inletsConnected.push_back(false); } + } - this->height = OBJECT_HEIGHT; + this->height = OBJECT_HEIGHT; - if(this->numInlets > 6 || this->numOutlets > 6){ - this->height *= 2; - } - - if(this->numInlets > 12 || this->numOutlets > 12){ - this->height *= 2; - } + if(this->numInlets > 6 || this->numOutlets > 6){ + this->height *= 2; + } - deviceLoaded = true; + if(this->numInlets > 12 || this->numOutlets > 12){ + this->height *= 2; } + + deviceLoaded = true; + } OBJECT_REGISTER( AudioDevice, "audio device", OFXVP_OBJECT_CAT_SOUND) diff --git a/src/objects/sound/AudioExporter.cpp b/src/objects/sound/AudioExporter.cpp index 4a9da412..0c979ad7 100644 --- a/src/objects/sound/AudioExporter.cpp +++ b/src/objects/sound/AudioExporter.cpp @@ -51,6 +51,7 @@ AudioExporter::AudioExporter() : PatchObject("audio exporter"){ isAudioOUTObject = true; exportAudioFlag = false; + recording = false; audioFPS = 0.0f; audioCounter = 0; @@ -237,11 +238,13 @@ void AudioExporter::drawObjectNodeConfig(){ recButtonLabel = "STOP"; string tmpstr = "START EXPORTING AUDIO"; ofLog(OF_LOG_NOTICE,"%s",tmpstr.c_str()); + recording = true; }else if(recorder.isRecording()){ recorder.stop(); recButtonLabel = "REC"; string tmpstr = "FINISHED EXPORTING AUDIO"; ofLog(OF_LOG_NOTICE,"%s",tmpstr.c_str()); + recording = false; } } } @@ -286,24 +289,14 @@ void AudioExporter::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void AudioExporter::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); - plot_data = new float[bufferSize]; - for(int i=0;i= 1000){ + if(ofGetElapsedTimeMillis()-lastAudioTimeReset >= 1000000){ lastAudioTimeReset = ofGetElapsedTimeMillis(); audioFPS = audioCounter; audioCounter = 0; @@ -320,7 +313,7 @@ void AudioExporter::audioOutObject(ofSoundBuffer &inputBuffer){ } if(this->inletsConnected[0] && !ofxVP_CAST_PIN_PTR(_inletParams[0])->getBuffer().empty()){ - if(recorder.isRecording()){ + if(recorder.isRecording() && recording){ recorder.addBuffer(*ofxVP_CAST_PIN_PTR(_inletParams[0]),audioFPS); } diff --git a/src/objects/sound/AudioExporter.h b/src/objects/sound/AudioExporter.h index 472fb9b9..29107193 100644 --- a/src/objects/sound/AudioExporter.h +++ b/src/objects/sound/AudioExporter.h @@ -71,6 +71,7 @@ class AudioExporter : public PatchObject { bool bang; bool exportAudioFlag; + bool recording; int bufferSize; int sampleRate; diff --git a/src/objects/sound/Crossfader.cpp b/src/objects/sound/Crossfader.cpp index 4f5a1b84..42ce5a1c 100755 --- a/src/objects/sound/Crossfader.cpp +++ b/src/objects/sound/Crossfader.cpp @@ -181,19 +181,10 @@ void Crossfader::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void Crossfader::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/Mixer.cpp b/src/objects/sound/Mixer.cpp index d7c03140..73e11049 100755 --- a/src/objects/sound/Mixer.cpp +++ b/src/objects/sound/Mixer.cpp @@ -297,19 +297,10 @@ void Mixer::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void Mixer::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/Oscillator.cpp b/src/objects/sound/Oscillator.cpp index 334f860d..7bb23e44 100755 --- a/src/objects/sound/Oscillator.cpp +++ b/src/objects/sound/Oscillator.cpp @@ -402,25 +402,15 @@ void Oscillator::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void Oscillator::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - - plot_data = new float[bufferSize]; - for(int i=0;i>(_outletParams[6])->push_back(0.0f); - plot_data[i] = 0.0f; - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); - XML.popTag(); - } + plot_data = new float[bufferSize]; + for(int i=0;i>(_outletParams[6])->push_back(0.0f); + plot_data[i] = 0.0f; } } diff --git a/src/objects/sound/PDPatch.cpp b/src/objects/sound/PDPatch.cpp index a2a05800..28aba92d 100644 --- a/src/objects/sound/PDPatch.cpp +++ b/src/objects/sound/PDPatch.cpp @@ -379,19 +379,10 @@ void PDPatch::audioOutObject(ofSoundBuffer &outputBuffer){ //-------------------------------------------------------------- void PDPatch::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); lastInputBuffer.allocate(bufferSize,4); lastInputBuffer1.allocate(bufferSize,1); diff --git a/src/objects/sound/Panner.cpp b/src/objects/sound/Panner.cpp index f8581623..0727f2c2 100755 --- a/src/objects/sound/Panner.cpp +++ b/src/objects/sound/Panner.cpp @@ -177,19 +177,10 @@ void Panner::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void Panner::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/PolyphonicOscillator.cpp b/src/objects/sound/PolyphonicOscillator.cpp index 8598c624..b23a82c8 100755 --- a/src/objects/sound/PolyphonicOscillator.cpp +++ b/src/objects/sound/PolyphonicOscillator.cpp @@ -465,25 +465,15 @@ void PolyphonicOscillator::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void PolyphonicOscillator::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - - plot_data = new float[bufferSize]; - for(int i=0;i>(_outletParams[5])->push_back(0.0f); - plot_data[i] = 0.0f; - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); - XML.popTag(); - } + plot_data = new float[bufferSize]; + for(int i=0;i>(_outletParams[5])->push_back(0.0f); + plot_data[i] = 0.0f; } } diff --git a/src/objects/sound/QuadPanner.cpp b/src/objects/sound/QuadPanner.cpp index d3a11229..908d7851 100755 --- a/src/objects/sound/QuadPanner.cpp +++ b/src/objects/sound/QuadPanner.cpp @@ -203,19 +203,10 @@ void QuadPanner::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void QuadPanner::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/SamplePlayer.cpp b/src/objects/sound/SamplePlayer.cpp index bf7cb872..42cfd6a9 100755 --- a/src/objects/sound/SamplePlayer.cpp +++ b/src/objects/sound/SamplePlayer.cpp @@ -399,19 +399,10 @@ void SamplePlayer::audioOutObject(ofSoundBuffer &outputBuffer){ //-------------------------------------------------------------- void SamplePlayer::loadSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if(XML.pushTag("settings")){ - sampleRate = static_cast(XML.getValue("sample_rate_out",0)); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); for(int i=0;i>(_outletParams[1])->push_back(0.0f); diff --git a/src/objects/sound/SigMult.cpp b/src/objects/sound/SigMult.cpp index c6a0abf1..4294e92b 100755 --- a/src/objects/sound/SigMult.cpp +++ b/src/objects/sound/SigMult.cpp @@ -172,19 +172,10 @@ void SigMult::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void SigMult::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/SignalOperator.cpp b/src/objects/sound/SignalOperator.cpp index c9cceb19..414993a9 100755 --- a/src/objects/sound/SignalOperator.cpp +++ b/src/objects/sound/SignalOperator.cpp @@ -203,19 +203,10 @@ void SignalOperator::audioOutObject(ofSoundBuffer &outputBuffer){ //-------------------------------------------------------------- void SignalOperator::loadSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if(XML.pushTag("settings")){ - sampleRate = static_cast(XML.getValue("sample_rate_out",0)); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); shortBuffer = new short[bufferSize]; for (int i = 0; i < bufferSize; i++){ diff --git a/src/objects/sound/SignalTrigger.cpp b/src/objects/sound/SignalTrigger.cpp index 10c8af48..a695bd6d 100755 --- a/src/objects/sound/SignalTrigger.cpp +++ b/src/objects/sound/SignalTrigger.cpp @@ -187,19 +187,10 @@ void SignalTrigger::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void SignalTrigger::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/SoundfilePlayer.cpp b/src/objects/sound/SoundfilePlayer.cpp index e3d1d9a4..44aab2cd 100755 --- a/src/objects/sound/SoundfilePlayer.cpp +++ b/src/objects/sound/SoundfilePlayer.cpp @@ -509,19 +509,10 @@ void SoundfilePlayer::audioOutObject(ofSoundBuffer &outputBuffer){ //-------------------------------------------------------------- void SoundfilePlayer::loadSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if(XML.pushTag("settings")){ - sampleRate = static_cast(XML.getValue("sample_rate_out",0)); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); for(int i=0;i>(_outletParams[1])->push_back(0.0f); diff --git a/src/objects/sound/SummingMixer.cpp b/src/objects/sound/SummingMixer.cpp index 80ad490a..e1692bf3 100644 --- a/src/objects/sound/SummingMixer.cpp +++ b/src/objects/sound/SummingMixer.cpp @@ -232,19 +232,10 @@ void SummingMixer::audioOutObject(ofSoundBuffer &outputBuffer){ //-------------------------------------------------------------- void SummingMixer::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/pdspADSR.cpp b/src/objects/sound/pdspADSR.cpp index a84f11fb..18407b20 100755 --- a/src/objects/sound/pdspADSR.cpp +++ b/src/objects/sound/pdspADSR.cpp @@ -235,20 +235,10 @@ void pdspADSR::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void pdspADSR::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/pdspAHR.cpp b/src/objects/sound/pdspAHR.cpp index 92e0dbd4..13646682 100755 --- a/src/objects/sound/pdspAHR.cpp +++ b/src/objects/sound/pdspAHR.cpp @@ -219,20 +219,10 @@ void pdspAHR::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void pdspAHR::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/pdspBitCruncher.cpp b/src/objects/sound/pdspBitCruncher.cpp index 09919833..09c0535b 100755 --- a/src/objects/sound/pdspBitCruncher.cpp +++ b/src/objects/sound/pdspBitCruncher.cpp @@ -172,19 +172,10 @@ void pdspBitCruncher::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void pdspBitCruncher::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/pdspBitNoise.cpp b/src/objects/sound/pdspBitNoise.cpp index 73beac54..514db40d 100755 --- a/src/objects/sound/pdspBitNoise.cpp +++ b/src/objects/sound/pdspBitNoise.cpp @@ -207,23 +207,14 @@ void pdspBitNoise::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void pdspBitNoise::loadAudioSettings(){ - ofxXmlSettings XML; -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); + ofxVPXml.loadMosaicPatch(this->patchFile); - for(int i=0;i>(_outletParams[2])->push_back(0.0f); - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); - XML.popTag(); - } + for(int i=0;i>(_outletParams[2])->push_back(0.0f); } } diff --git a/src/objects/sound/pdspChorusEffect.cpp b/src/objects/sound/pdspChorusEffect.cpp index dc212ef3..b52ad48e 100755 --- a/src/objects/sound/pdspChorusEffect.cpp +++ b/src/objects/sound/pdspChorusEffect.cpp @@ -214,19 +214,10 @@ void pdspChorusEffect::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void pdspChorusEffect::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/pdspCombFilter.cpp b/src/objects/sound/pdspCombFilter.cpp index 68f33d51..19c9c4a2 100755 --- a/src/objects/sound/pdspCombFilter.cpp +++ b/src/objects/sound/pdspCombFilter.cpp @@ -211,19 +211,10 @@ void pdspCombFilter::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void pdspCombFilter::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/pdspCompressor.cpp b/src/objects/sound/pdspCompressor.cpp index c9108a87..da76228a 100755 --- a/src/objects/sound/pdspCompressor.cpp +++ b/src/objects/sound/pdspCompressor.cpp @@ -267,20 +267,10 @@ void pdspCompressor::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void pdspCompressor::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/pdspDataOscillator.cpp b/src/objects/sound/pdspDataOscillator.cpp index 92db08de..a37c8381 100755 --- a/src/objects/sound/pdspDataOscillator.cpp +++ b/src/objects/sound/pdspDataOscillator.cpp @@ -223,25 +223,16 @@ void pdspDataOscillator::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void pdspDataOscillator::loadAudioSettings(){ - ofxXmlSettings XML; -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - - plot_data = new float[bufferSize]; - for(int i=0;i>(_outletParams[1])->push_back(0.0f); - plot_data[i] = 0.0f; - } + ofxVPXml.loadMosaicPatch(this->patchFile); - XML.popTag(); - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); + + plot_data = new float[bufferSize]; + for(int i=0;i>(_outletParams[1])->push_back(0.0f); + plot_data[i] = 0.0f; } } diff --git a/src/objects/sound/pdspDecimator.cpp b/src/objects/sound/pdspDecimator.cpp index 880055b6..e29c3a80 100755 --- a/src/objects/sound/pdspDecimator.cpp +++ b/src/objects/sound/pdspDecimator.cpp @@ -169,19 +169,10 @@ void pdspDecimator::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void pdspDecimator::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/pdspDelay.cpp b/src/objects/sound/pdspDelay.cpp index 65cacc2e..5ccb5533 100755 --- a/src/objects/sound/pdspDelay.cpp +++ b/src/objects/sound/pdspDelay.cpp @@ -209,19 +209,10 @@ void pdspDelay::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void pdspDelay::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/pdspDucker.cpp b/src/objects/sound/pdspDucker.cpp index c75f5a2d..271d2098 100755 --- a/src/objects/sound/pdspDucker.cpp +++ b/src/objects/sound/pdspDucker.cpp @@ -261,20 +261,10 @@ void pdspDucker::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void pdspDucker::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/pdspHiCut.cpp b/src/objects/sound/pdspHiCut.cpp index 4d0ba55d..85c10a4a 100755 --- a/src/objects/sound/pdspHiCut.cpp +++ b/src/objects/sound/pdspHiCut.cpp @@ -197,19 +197,10 @@ void pdspHiCut::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void pdspHiCut::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/pdspKick.cpp b/src/objects/sound/pdspKick.cpp index f44ad5f1..2cc62be2 100755 --- a/src/objects/sound/pdspKick.cpp +++ b/src/objects/sound/pdspKick.cpp @@ -336,20 +336,10 @@ void pdspKick::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void pdspKick::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/pdspLFO.cpp b/src/objects/sound/pdspLFO.cpp index 1f4ef686..331d38f1 100755 --- a/src/objects/sound/pdspLFO.cpp +++ b/src/objects/sound/pdspLFO.cpp @@ -221,20 +221,10 @@ void pdspLFO::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void pdspLFO::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/pdspLowCut.cpp b/src/objects/sound/pdspLowCut.cpp index 22b5a3d8..d809c133 100755 --- a/src/objects/sound/pdspLowCut.cpp +++ b/src/objects/sound/pdspLowCut.cpp @@ -196,19 +196,10 @@ void pdspLowCut::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void pdspLowCut::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/pdspParametricEQ.cpp b/src/objects/sound/pdspParametricEQ.cpp index 555b0816..26bd2c4a 100755 --- a/src/objects/sound/pdspParametricEQ.cpp +++ b/src/objects/sound/pdspParametricEQ.cpp @@ -334,39 +334,30 @@ void pdspParametricEQ::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void pdspParametricEQ::loadAudioSettings(){ - ofxXmlSettings XML; -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); + ofxVPXml.loadMosaicPatch(this->patchFile); - XML.popTag(); - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); - fft = ofxFft::create(bufferSize, OF_FFT_WINDOW_HAMMING); - spectrum = new float[fft->getBinSize()]; - l1Filter = new std::vector; - m1Filter = new std::vector; - m2Filter = new std::vector; - h1Filter = new std::vector; - parametricFilter = new std::vector; + fft = ofxFft::create(bufferSize, OF_FFT_WINDOW_HAMMING); + spectrum = new float[fft->getBinSize()]; + l1Filter = new std::vector; + m1Filter = new std::vector; + m2Filter = new std::vector; + h1Filter = new std::vector; + parametricFilter = new std::vector; - for(int i=0;igetBinSize();i++){ - ofxVP_CAST_PIN_PTR>(_outletParams[1])->push_back(0.0f); + for(int i=0;igetBinSize();i++){ + ofxVP_CAST_PIN_PTR>(_outletParams[1])->push_back(0.0f); - l1Filter->push_back(0.0f); - m1Filter->push_back(0.0f); - m2Filter->push_back(0.0f); - h1Filter->push_back(0.0f); - parametricFilter->push_back(0.0f); + l1Filter->push_back(0.0f); + m1Filter->push_back(0.0f); + m2Filter->push_back(0.0f); + h1Filter->push_back(0.0f); + parametricFilter->push_back(0.0f); - spectrum[i] = 0.0f; - } + spectrum[i] = 0.0f; } } diff --git a/src/objects/sound/pdspResonant2PoleFilter.cpp b/src/objects/sound/pdspResonant2PoleFilter.cpp index 78652126..ae05a4ac 100755 --- a/src/objects/sound/pdspResonant2PoleFilter.cpp +++ b/src/objects/sound/pdspResonant2PoleFilter.cpp @@ -239,19 +239,10 @@ void pdspResonant2PoleFilter::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void pdspResonant2PoleFilter::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/objects/sound/pdspReverb.cpp b/src/objects/sound/pdspReverb.cpp index 6a49fce9..e555687a 100755 --- a/src/objects/sound/pdspReverb.cpp +++ b/src/objects/sound/pdspReverb.cpp @@ -251,19 +251,10 @@ void pdspReverb::removeObjectContent(bool removeFileFromData){ //-------------------------------------------------------------- void pdspReverb::loadAudioSettings(){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(this->patchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif - if (XML.pushTag("settings")){ - sampleRate = XML.getValue("sample_rate_in",0); - bufferSize = XML.getValue("buffer_size",0); - XML.popTag(); - } - } + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); } //-------------------------------------------------------------- diff --git a/src/ofxVisualProgramming.cpp b/src/ofxVisualProgramming.cpp index efde5c61..391e75a6 100755 --- a/src/ofxVisualProgramming.cpp +++ b/src/ofxVisualProgramming.cpp @@ -56,6 +56,7 @@ ofxVisualProgramming::ofxVisualProgramming(){ // System engine = new pdsp::Engine(); + pauseDSP = false; font = new ofTrueTypeFont(); fontSize = 8; @@ -140,6 +141,8 @@ void ofxVisualProgramming::setup(ofxImGui::Gui* _guiRef, string release){ // Load resources font->load(MAIN_FONT,fontSize); + isPrePugiXmlRelease = ofxVPXml.checkReleaseIsPrePugiXml(release); + // Initialise GUI if( _guiRef == nullptr ){ ofxVPGui = new ofxImGui::Gui(); @@ -585,7 +588,7 @@ void ofxVisualProgramming::drawSubpatchNavigation(){ int move_from = *(const int*)payload->Data; std::string move_to = it->first; - // disconnect object links ( in and out) + // disconnect object links ( in and out ) disconnectObject(move_from); // switch object subpatch patchObjects[move_from]->setSubpatch(move_to); @@ -804,6 +807,7 @@ void ofxVisualProgramming::audioProcess(float *input, int bufferSize, int nChann if(bLoadingNewPatch) return; if(bLoadingNewObject) return; + if(pauseDSP) return; if(audioSampleRate != 0 && dspON){ @@ -938,74 +942,31 @@ shared_ptr ofxVisualProgramming::getLastAddedObject(){ void ofxVisualProgramming::resetObject(int &id){ if ((id != -1) && (patchObjects[id] != nullptr)){ - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(currentPatchFile); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(currentPatchFile)){ -#else - if (XML.load(currentPatchFile)){ -#endif - - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ - if(it->second != nullptr){ - vector> tempBuffer; - for(int j=0;j(it->second->outPut.size());j++){ - if(it->second->outPut[j]->toObjectID == id){ - if(it->second->outPut[j]->toInletID < patchObjects[id]->getNumInlets()){ - tempBuffer.push_back(it->second->outPut[j]); - if(it->second->outPut[j]->type == VP_LINK_AUDIO){ - // reconnect dsp link - patchObjects[it->first]->pdspOut[it->second->outPut[j]->fromOutletID] >> patchObjects[id]->pdspIn[it->second->outPut[j]->toInletID]; - } - } - }else{ + for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + if(it->second != nullptr){ + vector> tempBuffer; + for(int j=0;j(it->second->outPut.size());j++){ + if(it->second->outPut[j]->toObjectID == id){ + if(it->second->outPut[j]->toInletID < patchObjects[id]->getNumInlets()){ tempBuffer.push_back(it->second->outPut[j]); - } - } - it->second->outPut = tempBuffer; - } - } - - int totalObjects = XML.getNumTags("object"); - - // remove links to the resetted object - for(int i=0;i= patchObjects[id]->getNumInlets()){ - delLink = true; - } - XML.popTag(); - if(delLink){ - XML.removeTag("to",t); - } - } - } - XML.popTag(); - } + if(it->second->outPut[j]->type == VP_LINK_AUDIO){ + // reconnect dsp link + patchObjects[it->first]->pdspOut[it->second->outPut[j]->fromOutletID] >> patchObjects[id]->pdspIn[it->second->outPut[j]->toInletID]; } - XML.popTag(); } + }else{ + tempBuffer.push_back(it->second->outPut[j]); } - XML.popTag(); } + it->second->outPut = tempBuffer; } + } -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - XML.saveFile(); -#else - XML.save(); -#endif + // remove links to the resetted object + ofxVPXml.removeAllLinksToObject(id,patchObjects[id]->getNumInlets()); - } } } @@ -1033,54 +994,31 @@ void ofxVisualProgramming::resetObject(int id){ void ofxVisualProgramming::reconnectObjectOutlets(int &id){ if ((id != -1) && (patchObjects[id] != nullptr)){ - ofxXmlSettings XML; -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(currentPatchFile)){ -#else - if (XML.load(currentPatchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - - // relink object outlets from XML - for(int i=0;igetName().c_str(),z,patchObjects[toObjectID]->getName().c_str(),toInletID); - std::this_thread::sleep_for(std::chrono::milliseconds(10)); - } - } - - XML.popTag(); - } - } - XML.popTag(); - } + ofxVPXml.loadMosaicPatch(currentPatchFile); + + pugi::xpath_node_set objOutlets = ofxVPXml.getObjectOutlets(id); + if(!objOutlets.empty()){ + int oindex = 0; + for(auto & outlet: objOutlets){ + auto o = outlet.node(); + int linkType = ofxVPXml.getPatchChildInt(o,"type"); + pugi::xpath_node_set objLinks = ofxVPXml.getObjectLinks(id,oindex); + if(!objLinks.empty()){ + for(auto & link: objLinks){ + auto l = link.node(); + int toObjectID = ofxVPXml.getPatchChildInt(l,"id"); + if(isObjectIDInPatchMap(toObjectID)){ + if(connect(id,oindex,toObjectID,ofxVPXml.getPatchChildInt(l,"inlet"),linkType)){ + //ofLog(OF_LOG_NOTICE,"Connected object %s, outlet %i TO object %s, inlet %i",patchObjects[id]->getName().c_str(),z,patchObjects[toObjectID]->getName().c_str(),toInletID); + std::this_thread::sleep_for(std::chrono::milliseconds(10)); } - - XML.popTag(); } - XML.popTag(); } - XML.popTag(); } + oindex++; } - } + } } @@ -1215,68 +1153,11 @@ void ofxVisualProgramming::removeObject(int &id){ if(targetID == lastAddedObjectID) lastAddedObjectID=0; - ofxXmlSettings XML; -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(currentPatchFile)){ -#else - if (XML.load(currentPatchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - - for(int i=0;i>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ @@ -1335,73 +1216,15 @@ void ofxVisualProgramming::disconnectObject(int id){ if ( (id != -1) && (patchObjects[id] != nullptr) && (patchObjects[id]->getName() != "audio device") ){ - bool found = false; - - ofxXmlSettings XML; -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(currentPatchFile)){ -#else - if (XML.load(currentPatchFile)){ -#endif - int totalObjects = XML.getNumTags("object"); - - for(int i=0;ioutPut.size();i++){ + patchObjects[id]->disconnectLink(patchObjects,patchObjects[id]->outPut.at(i)->id); + } - // disconnect all object links to other objects - for(size_t i=0;ioutPut.size();i++){ - patchObjects[id]->disconnectLink(patchObjects,patchObjects[id]->outPut.at(i)->id); - } - // remove links to the selected object - for(int i=0;i>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ @@ -1428,9 +1251,10 @@ void ofxVisualProgramming::disconnectObject(int id){ } } - } - bLoadingNewObject = false; + bLoadingNewObject = false; + + } } //-------------------------------------------------------------- @@ -1475,9 +1299,7 @@ bool ofxVisualProgramming::connect(int fromID, int fromOutlet, int toID,int toIn patchObjects[toID]->_inletParams[toInlet] = new ofSoundBuffer(); if(patchObjects[fromID]->getIsPDSPPatchableObject() && patchObjects[toID]->getIsPDSPPatchableObject()){ patchObjects[fromID]->pdspOut[fromOutlet] >> patchObjects[toID]->pdspIn[toInlet]; - }/*else if(patchObjects[fromID]->getName() == "audio device" && patchObjects[toID]->getIsPDSPPatchableObject()){ - patchObjects[fromID]->pdspOut[fromOutlet] >> patchObjects[toID]->pdspIn[toInlet]; - }*/ + } } checkSpecialConnection(fromID,toID,linkType); @@ -1572,20 +1394,11 @@ void ofxVisualProgramming::newPatch(string release){ string newFileName = "patch_"+ofGetTimestampString("%y%m%d")+alphabet.at(newFileCounter)+".xml"; ofFile fileToRead(ofToDataPath("empty_patch.xml",true)); + pauseDSP = true; + // set patch release - ofxXmlSettings XML; -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(fileToRead.getAbsolutePath())){ -#else - if (XML.load(fileToRead.getAbsolutePath())){ -#endif - XML.setValue("release",release); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - XML.saveFile(); -#else - XML.save(); -#endif - } + ofxVPXml.loadMosaicPatch(fileToRead.getAbsolutePath()); + ofxVPXml.setMosaicRelease(release); ofFile newPatchFile(ofToDataPath("temp/"+newFileName,true)); @@ -1599,6 +1412,8 @@ void ofxVisualProgramming::newPatch(string release){ //-------------------------------------------------------------- void ofxVisualProgramming::newTempPatchFromFile(string patchFile){ + pauseDSP = true; + string newFileName = "patch_"+ofGetTimestampString("%y%m%d")+alphabet.at(newFileCounter)+".xml"; ofFile fileToRead(patchFile); ofFile newPatchFile(ofToDataPath("temp/"+newFileName,true)); @@ -1624,7 +1439,6 @@ void ofxVisualProgramming::newTempPatchFromFile(string patchFile){ string oldDataPath = oldData.getAbsolutePath(); - // copy new data content #ifdef OFXVP_DEBUG std::cout << "Copying from " << dataFolderOrigin.getAbsolutePath() << " to " << oldDataPath << std::endl; @@ -1645,9 +1459,9 @@ void ofxVisualProgramming::newTempPatchFromFile(string patchFile){ //-------------------------------------------------------------- void ofxVisualProgramming::preloadPatch(string patchFile){ - currentPatchFile = patchFile; - tempPatchFile = currentPatchFile; + pauseDSP = true; + currentPatchFile = patchFile; actualObjectID = 0; // clear previous patch @@ -1685,6 +1499,7 @@ void ofxVisualProgramming::preloadPatch(string patchFile){ void ofxVisualProgramming::openPatch(string patchFile){ bLoadingNewPatch = true; + pauseDSP = true; // reset subpatch level currentSubpatch = "root"; @@ -1709,408 +1524,345 @@ void ofxVisualProgramming::loadPatch(string patchFile){ loadPatchTime = ofGetElapsedTimeMillis(); - ofxXmlSettings XML; + ofxVPXml.loadMosaicPatch(patchFile); + string tstr; -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(patchFile)){ -#else - if (XML.load(patchFile)){ -#endif + // Load main settings - // Load main settings - if (XML.pushTag("settings")){ - // Setup projector dimension - output_width = XML.getValue("output_width",0); - output_height = XML.getValue("output_height",0); - // setup canvas - ImVec2 tr = ImVec2(XML.getValue("canvasTranslationX",0),XML.getValue("canvasTranslationY",0)); - if(tr.x != 0 && tr.y != 0){ - nodeCanvas.SetCanvasTranslation(tr); - } + // Setup projector dimension + output_width = ofxVPXml.getMosaicConfigInt("output_width"); + output_height = ofxVPXml.getMosaicConfigInt("output_height"); + // setup canvas + ImVec2 tr = ImVec2(ofxVPXml.getMosaicConfigFloat("canvasTranslationX"),ofxVPXml.getMosaicConfigFloat("canvasTranslationY")); + if(tr.x != 0 && tr.y != 0){ + nodeCanvas.SetCanvasTranslation(tr); + } - // setup audio - dspON = XML.getValue("dsp",0); - audioINDev = XML.getValue("audio_in_device",0); - audioOUTDev = XML.getValue("audio_out_device",0); - audioSampleRate = XML.getValue("sample_rate_out",0); - audioBufferSize = XML.getValue("buffer_size",0); - bpm = XML.getValue("bpm",0); - // pre 0.4.0 patches auto fix - if(bpm == 0){ - bpm = 120; - XML.setValue("bpm",bpm); - } + // setup audio + dspON = ofxVPXml.getMosaicConfigInt("dsp"); + audioINDev = ofxVPXml.getMosaicConfigInt("audio_in_device"); + audioOUTDev = ofxVPXml.getMosaicConfigInt("audio_out_device"); + audioSampleRate = ofxVPXml.getMosaicConfigInt("sample_rate_out"); + audioBufferSize = ofxVPXml.getMosaicConfigInt("buffer_size"); + bpm = ofxVPXml.getMosaicConfigInt("bpm"); + // pre 0.4.0 patches auto fix + if(bpm == 0){ + bpm = 120; + ofxVPXml.setMosaicConfig("bpm",bpm); + } - delete engine; - engine = nullptr; - engine = new pdsp::Engine(); + delete engine; + engine = nullptr; + engine = new pdsp::Engine(); - soundStreamIN.close(); + soundStreamIN.close(); #if defined(TARGET_WIN32) - audioDevices = soundStreamIN.getDeviceList(ofSoundDevice::Api::MS_DS); + audioDevices = soundStreamIN.getDeviceList(ofSoundDevice::Api::MS_DS); #elif defined(TARGET_OSX) - audioDevices = soundStreamIN.getDeviceList(ofSoundDevice::Api::OSX_CORE); + audioDevices = soundStreamIN.getDeviceList(ofSoundDevice::Api::OSX_CORE); #else - audioDevices = soundStreamIN.getDeviceList(ofSoundDevice::Api::PULSE); + audioDevices = soundStreamIN.getDeviceList(ofSoundDevice::Api::PULSE); #endif - audioDevicesStringIN.clear(); - audioDevicesID_IN.clear(); - audioDevicesStringOUT.clear(); - audioDevicesID_OUT.clear(); - audioDevicesSR.clear(); - tstr = "------------------- AUDIO DEVICES"; - ofLog(OF_LOG_NOTICE,"%s",tstr.c_str()); - for(size_t i=0;i= 44100){ - haveMinSR = true; - break; - } + bool haveMinSR = false; + for(size_t sr=0;sr= 44100){ + haveMinSR = true; + break; + } + } + if(audioDevices[i].inputChannels > 0 && haveMinSR){ + audioDevicesStringIN.push_back(" "+audioDevices[i].name); + audioDevicesID_IN.push_back(i); + for(size_t sr=0;sr= 44100){ + audioDevicesSR.push_back(ofToString(audioDevices[i].sampleRates.at(sr))); } - if(audioDevices[i].inputChannels > 0 && haveMinSR){ - audioDevicesStringIN.push_back(" "+audioDevices[i].name); - audioDevicesID_IN.push_back(i); - for(size_t sr=0;sr= 44100){ - audioDevicesSR.push_back(ofToString(audioDevices[i].sampleRates.at(sr))); - } - } - ofLog(OF_LOG_NOTICE,"INPUT Device[%zu]: %s (IN:%i - OUT:%i), Sample Rates: %s",i,audioDevices[i].name.c_str(),audioDevices[i].inputChannels,audioDevices[i].outputChannels,tempSR.c_str()); - } - if(audioDevices[i].outputChannels > 0 && haveMinSR){ - audioDevicesStringOUT.push_back(" "+audioDevices[i].name); - audioDevicesID_OUT.push_back(i); - for(size_t sr=0;sr= 44100){ - audioDevicesSR.push_back(ofToString(audioDevices[i].sampleRates.at(sr))); - } - } - ofLog(OF_LOG_NOTICE,"OUTPUT Device[%zu]: %s (IN:%i - OUT:%i), Sample Rates: %s",i,audioDevices[i].name.c_str(),audioDevices[i].inputChannels,audioDevices[i].outputChannels,tempSR.c_str()); + } + ofLog(OF_LOG_NOTICE,"INPUT Device[%zu]: %s (IN:%i - OUT:%i), Sample Rates: %s",i,audioDevices[i].name.c_str(),audioDevices[i].inputChannels,audioDevices[i].outputChannels,tempSR.c_str()); + } + if(audioDevices[i].outputChannels > 0 && haveMinSR){ + audioDevicesStringOUT.push_back(" "+audioDevices[i].name); + audioDevicesID_OUT.push_back(i); + for(size_t sr=0;sr= 44100){ + audioDevicesSR.push_back(ofToString(audioDevices[i].sampleRates.at(sr))); } + } + ofLog(OF_LOG_NOTICE,"OUTPUT Device[%zu]: %s (IN:%i - OUT:%i), Sample Rates: %s",i,audioDevices[i].name.c_str(),audioDevices[i].inputChannels,audioDevices[i].outputChannels,tempSR.c_str()); + } - // remove duplicates from sample rates vector - std::sort( audioDevicesSR.begin(), audioDevicesSR.end() ); - audioDevicesSR.erase( std::unique( audioDevicesSR.begin(), audioDevicesSR.end() ), audioDevicesSR.end() ); - std::sort( audioDevicesSR.begin(), audioDevicesSR.end(), [] (const std::string& lhs, const std::string& rhs) { - return std::stoi(lhs) < std::stoi(rhs); - } ); + // remove duplicates from sample rates vector + std::sort( audioDevicesSR.begin(), audioDevicesSR.end() ); + audioDevicesSR.erase( std::unique( audioDevicesSR.begin(), audioDevicesSR.end() ), audioDevicesSR.end() ); + std::sort( audioDevicesSR.begin(), audioDevicesSR.end(), [] (const std::string& lhs, const std::string& rhs) { + return std::stoi(lhs) < std::stoi(rhs); + } ); - //ofLog(OF_LOG_NOTICE,"Device[%zu]: %s (IN:%i - OUT:%i), Sample Rates: %s",i,audioDevices[i].name.c_str(),audioDevices[i].inputChannels,audioDevices[i].outputChannels,tempSR.c_str()); - } + //ofLog(OF_LOG_NOTICE,"Device[%zu]: %s (IN:%i - OUT:%i), Sample Rates: %s",i,audioDevices[i].name.c_str(),audioDevices[i].inputChannels,audioDevices[i].outputChannels,tempSR.c_str()); + } - // check audio devices index - audioGUIINIndex = -1; - audioGUIOUTIndex = -1; + // check audio devices index + audioGUIINIndex = -1; + audioGUIOUTIndex = -1; - audioGUIINChannels = 0; - audioGUIOUTChannels = 0; + audioGUIINChannels = 0; + audioGUIOUTChannels = 0; - // check input devices - if(!audioDevicesID_IN.empty()){ - for(size_t i=0;i(audioDevices[audioINDev].inputChannels); - //audioSampleRate = audioDevices[audioINDev].sampleRates[0]; - }else{ - audioGUIINChannels = 0; - } + // select default devices + if(isInputDeviceAvailable){ + audioGUIINChannels = static_cast(audioDevices[audioINDev].inputChannels); + //audioSampleRate = audioDevices[audioINDev].sampleRates[0]; + }else{ + audioGUIINChannels = 0; + } - if(isOutputDeviceAvailable){ - audioGUIOUTChannels = static_cast(audioDevices[audioOUTDev].outputChannels); - //audioSampleRate = audioDevices[audioOUTDev].sampleRates[0]; - }else{ - audioGUIOUTChannels = 0; - } + if(isOutputDeviceAvailable){ + audioGUIOUTChannels = static_cast(audioDevices[audioOUTDev].outputChannels); + //audioSampleRate = audioDevices[audioOUTDev].sampleRates[0]; + }else{ + audioGUIOUTChannels = 0; + } - XML.setValue("buffer_size",audioBufferSize); - XML.setValue("sample_rate_in",audioSampleRate); - XML.setValue("sample_rate_out",audioSampleRate); - XML.setValue("input_channels",audioGUIINChannels); - XML.setValue("output_channels",audioGUIOUTChannels); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - XML.saveFile(); -#else - XML.save(); -#endif + ofxVPXml.setMosaicConfig("buffer_size",audioBufferSize); + ofxVPXml.setMosaicConfig("sample_rate_in",audioSampleRate); + ofxVPXml.setMosaicConfig("sample_rate_out",audioSampleRate); + ofxVPXml.setMosaicConfig("input_channels",audioGUIINChannels); + ofxVPXml.setMosaicConfig("output_channels",audioGUIOUTChannels); - for(size_t bs=0;bssetChannels(audioGUIINChannels, audioGUIOUTChannels); - this->setChannels(audioGUIINChannels,0); + // at least we need one audio device available (input or output) to start the engine + if(dspON && (isInputDeviceAvailable || isOutputDeviceAvailable)){ + engine->setChannels(audioGUIINChannels, audioGUIOUTChannels); + this->setChannels(audioGUIINChannels,0); - for(int in=0;inaudio_in(in) >> this->in(in); - } - this->out_silent() >> engine->blackhole(); + for(int in=0;inaudio_in(in) >> this->in(in); + } + this->out_silent() >> engine->blackhole(); - if(isInputDeviceAvailable){ - engine->setInputDeviceID(audioDevices[audioINDev].deviceID); - } + if(isInputDeviceAvailable){ + engine->setInputDeviceID(audioDevices[audioINDev].deviceID); + } - if(isOutputDeviceAvailable){ - engine->setOutputDeviceID(audioDevices[audioOUTDev].deviceID); - } + if(isOutputDeviceAvailable){ + engine->setOutputDeviceID(audioDevices[audioOUTDev].deviceID); + } - engine->setup(audioSampleRate, audioBufferSize, audioNumBuffers); - engine->sequencer.setTempo(bpm); + engine->setup(audioSampleRate, audioBufferSize, audioNumBuffers); + engine->sequencer.setTempo(bpm); - if(isInputDeviceAvailable){ - tstr = "------------------- Soundstream INPUT Started on"; - ofLog(OF_LOG_NOTICE,"%s",tstr.c_str()); - ofLog(OF_LOG_NOTICE,"Audio device: %s",audioDevices[audioINDev].name.c_str()); - }else{ - tstr = "------------------------------ Soundstream INPUT OFF, no input audio device available"; - ofLog(OF_LOG_ERROR,"%s",tstr.c_str()); - } + if(isInputDeviceAvailable){ + tstr = "------------------- Soundstream INPUT Started on"; + ofLog(OF_LOG_NOTICE,"%s",tstr.c_str()); + ofLog(OF_LOG_NOTICE,"Audio device: %s",audioDevices[audioINDev].name.c_str()); + }else{ + tstr = "------------------------------ Soundstream INPUT OFF, no input audio device available"; + ofLog(OF_LOG_ERROR,"%s",tstr.c_str()); + } - if(isOutputDeviceAvailable){ - tstr = "------------------- Soundstream OUTPUT Started on"; - ofLog(OF_LOG_NOTICE,"%s",tstr.c_str()); - ofLog(OF_LOG_NOTICE,"Audio device: %s",audioDevices[audioOUTDev].name.c_str()); + if(isOutputDeviceAvailable){ + tstr = "------------------- Soundstream OUTPUT Started on"; + ofLog(OF_LOG_NOTICE,"%s",tstr.c_str()); + ofLog(OF_LOG_NOTICE,"Audio device: %s",audioDevices[audioOUTDev].name.c_str()); - }else{ - tstr = "------------------------------ Soundstream OUTPUT OFF, no output audio device available"; - ofLog(OF_LOG_ERROR,"%s",tstr.c_str()); - } + }else{ + tstr = "------------------------------ Soundstream OUTPUT OFF, no output audio device available"; + ofLog(OF_LOG_ERROR,"%s",tstr.c_str()); + } - std::this_thread::sleep_for(std::chrono::milliseconds(200)); - } + std::this_thread::sleep_for(std::chrono::milliseconds(200)); + } - XML.popTag(); - } - - bPopulatingObjectsMap = true; - - int totalObjects = XML.getNumTags("object"); - - if(totalObjects > 0){ - // load all the patch objects ( all the non GL sharing context ) - for(int i=0;i tempObj = selectObject(objname); - if(tempObj != nullptr && !tempObj->getIsSharedContextObject()){ - loaded = tempObj->loadConfig(mainWindow,*engine,i,patchFile); - if(loaded){ - tempObj->setPatchfile(currentPatchFile); - tempObj->setIsRetina(isRetina,scaleFactor); - string objSubpatch = XML.getValue("subpatch",""); - if(objSubpatch == "") objSubpatch = "root"; // retro compatibility for pre-subpatch patches - tempObj->setSubpatch(objSubpatch); - if (subpatchesMap.find(objSubpatch) == subpatchesMap.end()) { - vector _sp; - subpatchesMap[objSubpatch] = _sp; - } - ofAddListener(tempObj->removeEvent ,this,&ofxVisualProgramming::removeObject); - ofAddListener(tempObj->resetEvent ,this,&ofxVisualProgramming::resetObject); - ofAddListener(tempObj->reconnectOutletsEvent ,this,&ofxVisualProgramming::reconnectObjectOutlets); - ofAddListener(tempObj->duplicateEvent ,this,&ofxVisualProgramming::duplicateObject); - // Insert the new object into the map - patchObjects[tempObj->getId()] = tempObj; - actualObjectID = tempObj->getId(); - lastAddedObjectID = tempObj->getId(); - nodeCanvas.addNodeToMap(tempObj->getId(),tempObj->getName()); - // if wireless object, add reference to subpatch data map - if(objname == "sender"){ - SubpatchConnection _t; - _t.objID = tempObj->getId(); - _t.inOut = 1; - subpatchesMap[objSubpatch].push_back(_t); - }else if(objname == "receiver"){ - SubpatchConnection _t; - _t.objID = tempObj->getId(); - _t.inOut = 0; - subpatchesMap[objSubpatch].push_back(_t); - } + bPopulatingObjectsMap = true; + + pugi::xpath_node_set objs = ofxVPXml.getPatchObjects(); + + if(!objs.empty()){ + // load all the patch objects ( all the non GL sharing context ) + int oi = 0; + for(auto & obj: objs){ + auto o = obj.node(); + std::string objname = ofxVPXml.getPatchChildString(o,"name"); + bool loaded = false; + + if(isObjectInLibrary(objname)){ + shared_ptr tempObj = selectObject(objname); + if(tempObj != nullptr && !tempObj->getIsSharedContextObject()){ + loaded = tempObj->loadConfig(mainWindow,*engine,oi,patchFile); + if(loaded){ + tempObj->setPatchfile(currentPatchFile); + tempObj->setIsRetina(isRetina,scaleFactor); + std::string objSubpatch = ofxVPXml.getPatchChildString(o,"subpatch"); + if(objSubpatch == "") objSubpatch = "root"; // retro compatibility for pre-subpatch patches + tempObj->setSubpatch(objSubpatch); + if (subpatchesMap.find(objSubpatch) == subpatchesMap.end()) { + vector _sp; + subpatchesMap[objSubpatch] = _sp; + } + ofAddListener(tempObj->removeEvent ,this,&ofxVisualProgramming::removeObject); + ofAddListener(tempObj->resetEvent ,this,&ofxVisualProgramming::resetObject); + ofAddListener(tempObj->reconnectOutletsEvent ,this,&ofxVisualProgramming::reconnectObjectOutlets); + ofAddListener(tempObj->duplicateEvent ,this,&ofxVisualProgramming::duplicateObject); + // Insert the new object into the map + patchObjects[tempObj->getId()] = tempObj; + actualObjectID = tempObj->getId(); + lastAddedObjectID = tempObj->getId(); + nodeCanvas.addNodeToMap(tempObj->getId(),tempObj->getName()); + // if wireless object, add reference to subpatch data map + if(objname == "sender"){ + SubpatchConnection _t; + _t.objID = tempObj->getId(); + _t.inOut = 1; + subpatchesMap[objSubpatch].push_back(_t); + }else if(objname == "receiver"){ + SubpatchConnection _t; + _t.objID = tempObj->getId(); + _t.inOut = 0; + subpatchesMap[objSubpatch].push_back(_t); + } #ifdef OFXVP_DEBUG - std::cout << "Loading "<< tempObj->getName() << std::endl; + std::cout << "Loading "<< tempObj->getName() << std::endl; #endif - std::this_thread::sleep_for(std::chrono::milliseconds(10)); - } - } + std::this_thread::sleep_for(std::chrono::milliseconds(10)); } - XML.popTag(); } } + oi++; + } - // Load Links ( of all the non GL sharing context ) - for(int i=0;i tempObj = selectObject(objname); - if(tempObj != nullptr && !tempObj->getIsSharedContextObject()){ - int fromID = XML.getValue("id", -1); - if (XML.pushTag("outlets")){ - int totalOutlets = XML.getNumTags("link"); - for(int j=0;jgetName().c_str(),z,patchObjects[toObjectID]->getName().c_str(),toInletID); - std::this_thread::sleep_for(std::chrono::milliseconds(10)); - } - } - - XML.popTag(); - } + // Load Links ( of all the non GL sharing context excluding audio connections ) + for(auto & obj: objs){ + auto o = obj.node(); + std::string objname = ofxVPXml.getPatchChildString(o,"name"); + if(isObjectInLibrary(objname)){ + shared_ptr tempObj = selectObject(objname); + if(tempObj != nullptr && !tempObj->getIsSharedContextObject()){ + int fromID = ofxVPXml.getPatchChildInt(o,"id"); + pugi::xpath_node_set objOutlets = ofxVPXml.getObjectOutlets(fromID); + if(!objOutlets.empty()){ + int oIndex = 0; + for(auto & outlet: objOutlets){ + auto out = outlet.node(); + int linkType = ofxVPXml.getPatchChildInt(out,"type"); + if(linkType != VP_LINK_AUDIO){ + pugi::xpath_node_set outletLinks = ofxVPXml.getObjectLinks(fromID, oIndex); + if(!outletLinks.empty()){ + for(auto & link: outletLinks){ + auto l = link.node(); + int toObjectID = ofxVPXml.getPatchChildInt(l,"id"); + int toInletID = ofxVPXml.getPatchChildInt(l,"inlet"); + + // fix loading patches with non-existent objects (older OFXVP versions) + if(isObjectIDInPatchMap(toObjectID)){ + if(connect(fromID,oIndex,toObjectID,toInletID,linkType)){ + //ofLog(OF_LOG_NOTICE,"Connected object %s, outlet %i TO object %s, inlet %i",patchObjects[fromID]->getName().c_str(),oIndex,patchObjects[toObjectID]->getName().c_str(),toInletID); + std::this_thread::sleep_for(std::chrono::milliseconds(10)); } } - XML.popTag(); } } - - XML.popTag(); } + oIndex++; } } - XML.popTag(); } } - } - bPopulatingObjectsMap = false; - - activateDSP(); - - if(totalObjects > 0){ - // activate all audio PDSP connection - for(int i=0;i tempObj = selectObject(objname); - if(tempObj != nullptr && !tempObj->getIsSharedContextObject()){ - int fromID = XML.getValue("id", -1); - if (XML.pushTag("outlets")){ - int totalOutlets = XML.getNumTags("link"); - for(int j=0;jgetName().c_str(),z,patchObjects[toObjectID]->getName().c_str(),toInletID); - std::this_thread::sleep_for(std::chrono::milliseconds(10)); - } - } - - XML.popTag(); - } - } - } - XML.popTag(); - } - } + } - XML.popTag(); - } - } - } - XML.popTag(); - } - } - } + bPopulatingObjectsMap = false; - } + activateDSP(); bLoadingNewPatch = false; + pauseDSP = false; deferredLoadTime = ofGetElapsedTimeMillis(); deferredLoad = true; } + //-------------------------------------------------------------- void ofxVisualProgramming::loadPatchSharedContextObjects(){ @@ -2118,109 +1870,139 @@ void ofxVisualProgramming::loadPatchSharedContextObjects(){ std::cout << "Loading GL sharing context objects" << std::endl; #endif - ofxXmlSettings XML; + pugi::xpath_node_set objs = ofxVPXml.getPatchObjects(); + + if(!objs.empty()){ + // activate all audio PDSP connection ( audio links ) + for(auto & obj: objs){ + auto o = obj.node(); + std::string objname = ofxVPXml.getPatchChildString(o,"name"); + if(isObjectInLibrary(objname)){ + shared_ptr tempObj = selectObject(objname); + if(tempObj != nullptr && !tempObj->getIsSharedContextObject()){ + int fromID = ofxVPXml.getPatchChildInt(o,"id"); + pugi::xpath_node_set objOutlets = ofxVPXml.getObjectOutlets(fromID); + if(!objOutlets.empty()){ + int oIndex = 0; + for(auto & outlet: objOutlets){ + auto out = outlet.node(); + int linkType = ofxVPXml.getPatchChildInt(out,"type"); + if(linkType == VP_LINK_AUDIO){ + pugi::xpath_node_set outletLinks = ofxVPXml.getObjectLinks(fromID, oIndex); + if(!outletLinks.empty()){ + for(auto & link: outletLinks){ + auto l = link.node(); + int toObjectID = ofxVPXml.getPatchChildInt(l,"id"); + int toInletID = ofxVPXml.getPatchChildInt(l,"inlet"); + + // fix loading patches with non-existent objects (older OFXVP versions) + if(isObjectIDInPatchMap(toObjectID)){ + if(connect(fromID,oIndex,toObjectID,toInletID,linkType)){ + //ofLog(OF_LOG_NOTICE,"Connected object %s, outlet %i TO object %s, inlet %i",patchObjects[fromID]->getName().c_str(),oIndex,patchObjects[toObjectID]->getName().c_str(),toInletID); + std::this_thread::sleep_for(std::chrono::milliseconds(10)); + } + } + } + } + } -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(currentPatchFile)){ -#else - if (XML.load(currentPatchFile)){ -#endif + oIndex++; + } + } + } + } + } + } - int totalObjects = XML.getNumTags("object"); - - if(totalObjects > 0){ - - // load the sharing context objects ( needs to be loaded at last ) - for(int i=0;i tempObj = selectObject(objname); - if(tempObj != nullptr && tempObj->getIsSharedContextObject()){ - loaded = tempObj->loadConfig(mainWindow,*engine,i,currentPatchFile); - if(loaded){ - tempObj->setPatchfile(currentPatchFile); - tempObj->setIsRetina(isRetina,scaleFactor); - string objSubpatch = XML.getValue("subpatch",""); - if(objSubpatch == "") objSubpatch = "root"; // retro compatibility for pre-subpatch patches - tempObj->setSubpatch(objSubpatch); - if (subpatchesMap.find(objSubpatch) == subpatchesMap.end()) { - vector _sp; - subpatchesMap[objSubpatch] = _sp; - } - ofAddListener(tempObj->removeEvent ,this,&ofxVisualProgramming::removeObject); - ofAddListener(tempObj->resetEvent ,this,&ofxVisualProgramming::resetObject); - ofAddListener(tempObj->reconnectOutletsEvent ,this,&ofxVisualProgramming::reconnectObjectOutlets); - ofAddListener(tempObj->duplicateEvent ,this,&ofxVisualProgramming::duplicateObject); - // Insert the new patch into the map - patchObjects[tempObj->getId()] = tempObj; - actualObjectID = tempObj->getId(); - lastAddedObjectID = tempObj->getId(); - nodeCanvas.addNodeToMap(tempObj->getId(),tempObj->getName()); + if(!objs.empty()){ + + // load the sharing context objects ( needs to be loaded at last ) + int oi = 0; + for(auto & obj: objs){ + auto o = obj.node(); + std::string objname = ofxVPXml.getPatchChildString(o,"name"); + bool loaded = false; + + if(isObjectInLibrary(objname)){ + shared_ptr tempObj = selectObject(objname); + if(tempObj != nullptr && tempObj->getIsSharedContextObject()){ + loaded = tempObj->loadConfig(mainWindow,*engine,oi,currentPatchFile); + if(loaded){ + tempObj->setPatchfile(currentPatchFile); + tempObj->setIsRetina(isRetina,scaleFactor); + std::string objSubpatch = ofxVPXml.getPatchChildString(o,"subpatch"); + if(objSubpatch == "") objSubpatch = "root"; // retro compatibility for pre-subpatch patches + tempObj->setSubpatch(objSubpatch); + if (subpatchesMap.find(objSubpatch) == subpatchesMap.end()) { + vector _sp; + subpatchesMap[objSubpatch] = _sp; + } + ofAddListener(tempObj->removeEvent ,this,&ofxVisualProgramming::removeObject); + ofAddListener(tempObj->resetEvent ,this,&ofxVisualProgramming::resetObject); + ofAddListener(tempObj->reconnectOutletsEvent ,this,&ofxVisualProgramming::reconnectObjectOutlets); + ofAddListener(tempObj->duplicateEvent ,this,&ofxVisualProgramming::duplicateObject); + // Insert the new patch into the map + patchObjects[tempObj->getId()] = tempObj; + actualObjectID = tempObj->getId(); + lastAddedObjectID = tempObj->getId(); + nodeCanvas.addNodeToMap(tempObj->getId(),tempObj->getName()); #ifdef OFXVP_DEBUG - std::cout << "Loading "<< tempObj->getName() << std::endl; + std::cout << "Loading "<< tempObj->getName() << std::endl; #endif - std::this_thread::sleep_for(std::chrono::milliseconds(10)); - } - } + std::this_thread::sleep_for(std::chrono::milliseconds(10)); } - XML.popTag(); } } + oi++; + } - // Load Links to shared context objects only - for(int i=0;i _tempToObj = selectObject(toObjName); - if(_tempToObj != nullptr && _tempToObj->getIsSharedContextObject()){ - // fix loading patches with non-existent objects (older OFXVP versions) - if(isObjectIDInPatchMap(toObjectID)){ - if(connect(fromID,j,toObjectID,toInletID,linkType)){ - //ofLog(OF_LOG_NOTICE,"Connected object %s, outlet %i TO object %s, inlet %i",patchObjects[fromID]->getName().c_str(),z,patchObjects[toObjectID]->getName().c_str(),toInletID); - std::this_thread::sleep_for(std::chrono::milliseconds(10)); - } - } - } + // Load Links to shared context objects only + oi = 0; + for(auto & obj: objs){ + auto o = obj.node(); + std::string objname = ofxVPXml.getPatchChildString(o,"name"); + if(isObjectInLibrary(objname)){ + int fromID = ofxVPXml.getPatchChildInt(o,"id"); + pugi::xpath_node_set objOutlets = ofxVPXml.getObjectOutlets(fromID); + if(!objOutlets.empty()){ + int oIndex = 0; + for(auto & outlet: objOutlets){ + auto out = outlet.node(); + int linkType = ofxVPXml.getPatchChildInt(out,"type"); + pugi::xpath_node_set outletLinks = ofxVPXml.getObjectLinks(fromID, oIndex); + if(!outletLinks.empty()){ + for(auto & link: outletLinks){ + auto l = link.node(); + int toObjectID = ofxVPXml.getPatchChildInt(l,"id"); + int toInletID = ofxVPXml.getPatchChildInt(l,"inlet"); + string toObjName = getObjectNameFromID(toObjectID); + + if(toObjName != ""){ + shared_ptr _tempToObj = selectObject(toObjName); + if(_tempToObj != nullptr && _tempToObj->getIsSharedContextObject()){ + // fix loading patches with non-existent objects (older OFXVP versions) + if(isObjectIDInPatchMap(toObjectID)){ + if(connect(fromID,oIndex,toObjectID,toInletID,linkType)){ + //ofLog(OF_LOG_NOTICE,"Connected object %s, outlet %i TO object %s, inlet %i",patchObjects[fromID]->getName().c_str(),oIndex,patchObjects[toObjectID]->getName().c_str(),toInletID); + std::this_thread::sleep_for(std::chrono::milliseconds(10)); } - - XML.popTag(); } } - XML.popTag(); } } - - XML.popTag(); } + oIndex++; } - XML.popTag(); } + oi++; } } - //nodeCanvas.debugNodeMap(); - } + + //nodeCanvas.debugNodeMap(); } //-------------------------------------------------------------- @@ -2298,23 +2080,8 @@ void ofxVisualProgramming::savePatchAs(string patchFile){ //-------------------------------------------------------------- void ofxVisualProgramming::setPatchVariable(string var, int value){ - ofxXmlSettings XML; - -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - if (XML.loadFile(currentPatchFile)){ -#else - if (XML.load(currentPatchFile)){ -#endif - if (XML.pushTag("settings")){ - XML.setValue(var,value); -#if OF_VERSION_MAJOR == 0 && OF_VERSION_MINOR < 12 - XML.saveFile(); -#else - XML.save(); -#endif - XML.popTag(); - } - } + ofxVPXml.loadMosaicPatch(currentPatchFile); + ofxVPXml.setMosaicConfig(var, value); } //-------------------------------------------------------------- diff --git a/src/ofxVisualProgramming.h b/src/ofxVisualProgramming.h index d267f539..6aceb819 100755 --- a/src/ofxVisualProgramming.h +++ b/src/ofxVisualProgramming.h @@ -134,6 +134,7 @@ class ofxVisualProgramming : public pdsp::Wrapper { // PATCH FILE ofxVPXmlEngine ofxVPXml; + bool isPrePugiXmlRelease; // PATCH CANVAS ofRectangle canvasViewport; @@ -176,7 +177,6 @@ class ofxVisualProgramming : public pdsp::Wrapper { // LOAD/SAVE string currentPatchFile; string currentPatchFolderPath; - string tempPatchFile; int output_width; int output_height; string alphabet; @@ -225,6 +225,7 @@ class ofxVisualProgramming : public pdsp::Wrapper { bool isInputDeviceAvailable; bool isOutputDeviceAvailable; bool dspON; + bool pauseDSP; // MEMORY uint64_t loadPatchTime; From 5f43dedbb7d0f3c0f882f82e18130891673f5b85 Mon Sep 17 00:00:00 2001 From: d3cod3 Date: Mon, 14 Apr 2025 17:28:55 +0100 Subject: [PATCH 03/21] added kiss fft library --- libs/kiss/_kiss_fft_guts.h | 150 +++++++++++++ libs/kiss/kiss_fft.c | 427 +++++++++++++++++++++++++++++++++++++ libs/kiss/kiss_fft.h | 127 +++++++++++ libs/kiss/kiss_fftr.c | 159 ++++++++++++++ libs/kiss/kiss_fftr.h | 46 ++++ 5 files changed, 909 insertions(+) create mode 100755 libs/kiss/_kiss_fft_guts.h create mode 100755 libs/kiss/kiss_fft.c create mode 100755 libs/kiss/kiss_fft.h create mode 100755 libs/kiss/kiss_fftr.c create mode 100755 libs/kiss/kiss_fftr.h diff --git a/libs/kiss/_kiss_fft_guts.h b/libs/kiss/_kiss_fft_guts.h new file mode 100755 index 00000000..1c1d4d7f --- /dev/null +++ b/libs/kiss/_kiss_fft_guts.h @@ -0,0 +1,150 @@ +/* +Copyright (c) 2003-2004, Mark Borgerding + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +/* kiss_fft.h + defines kiss_fft_scalar as either short or a float type + and defines + typedef struct { kiss_fft_scalar r; kiss_fft_scalar i; }kiss_fft_cpx; */ +#include "kiss_fft.h" +#include + +#define MAXFACTORS 32 +/* e.g. an fft of length 128 has 4 factors + as far as kissfft is concerned + 4*4*4*2 + */ + +struct kiss_fft_state{ + int nfft; + int inverse; + int factors[2*MAXFACTORS]; + kiss_fft_cpx twiddles[1]; +}; + +/* + Explanation of macros dealing with complex math: + + C_MUL(m,a,b) : m = a*b + C_FIXDIV( c , div ) : if a fixed point impl., c /= div. noop otherwise + C_SUB( res, a,b) : res = a - b + C_SUBFROM( res , a) : res -= a + C_ADDTO( res , a) : res += a + * */ +#ifdef FIXED_POINT +#if (FIXED_POINT==32) +# define FRACBITS 31 +# define SAMPPROD int64_t +#define SAMP_MAX 2147483647 +#else +# define FRACBITS 15 +# define SAMPPROD int32_t +#define SAMP_MAX 32767 +#endif + +#define SAMP_MIN -SAMP_MAX + +#if defined(CHECK_OVERFLOW) +# define CHECK_OVERFLOW_OP(a,op,b) \ + if ( (SAMPPROD)(a) op (SAMPPROD)(b) > SAMP_MAX || (SAMPPROD)(a) op (SAMPPROD)(b) < SAMP_MIN ) { \ + fprintf(stderr,"WARNING:overflow @ " __FILE__ "(%d): (%d " #op" %d) = %ld\n",__LINE__,(a),(b),(SAMPPROD)(a) op (SAMPPROD)(b) ); } +#endif + + +# define smul(a,b) ( (SAMPPROD)(a)*(b) ) +# define sround( x ) (kiss_fft_scalar)( ( (x) + (1<<(FRACBITS-1)) ) >> FRACBITS ) + +# define S_MUL(a,b) sround( smul(a,b) ) + +# define C_MUL(m,a,b) \ + do{ (m).r = sround( smul((a).r,(b).r) - smul((a).i,(b).i) ); \ + (m).i = sround( smul((a).r,(b).i) + smul((a).i,(b).r) ); }while(0) + +# define DIVSCALAR(x,k) \ + (x) = sround( smul( x, SAMP_MAX/k ) ) + +# define C_FIXDIV(c,div) \ + do { DIVSCALAR( (c).r , div); \ + DIVSCALAR( (c).i , div); }while (0) + +# define C_MULBYSCALAR( c, s ) \ + do{ (c).r = sround( smul( (c).r , s ) ) ;\ + (c).i = sround( smul( (c).i , s ) ) ; }while(0) + +#else /* not FIXED_POINT*/ + +# define S_MUL(a,b) ( (a)*(b) ) +#define C_MUL(m,a,b) \ + do{ (m).r = (a).r*(b).r - (a).i*(b).i;\ + (m).i = (a).r*(b).i + (a).i*(b).r; }while(0) +# define C_FIXDIV(c,div) /* NOOP */ +# define C_MULBYSCALAR( c, s ) \ + do{ (c).r *= (s);\ + (c).i *= (s); }while(0) +#endif + +#ifndef CHECK_OVERFLOW_OP +# define CHECK_OVERFLOW_OP(a,op,b) /* noop */ +#endif + +#define C_ADD( res, a,b)\ + do { \ + CHECK_OVERFLOW_OP((a).r,+,(b).r)\ + CHECK_OVERFLOW_OP((a).i,+,(b).i)\ + (res).r=(a).r+(b).r; (res).i=(a).i+(b).i; \ + }while(0) +#define C_SUB( res, a,b)\ + do { \ + CHECK_OVERFLOW_OP((a).r,-,(b).r)\ + CHECK_OVERFLOW_OP((a).i,-,(b).i)\ + (res).r=(a).r-(b).r; (res).i=(a).i-(b).i; \ + }while(0) +#define C_ADDTO( res , a)\ + do { \ + CHECK_OVERFLOW_OP((res).r,+,(a).r)\ + CHECK_OVERFLOW_OP((res).i,+,(a).i)\ + (res).r += (a).r; (res).i += (a).i;\ + }while(0) + +#define C_SUBFROM( res , a)\ + do {\ + CHECK_OVERFLOW_OP((res).r,-,(a).r)\ + CHECK_OVERFLOW_OP((res).i,-,(a).i)\ + (res).r -= (a).r; (res).i -= (a).i; \ + }while(0) + + +#ifdef FIXED_POINT +# define KISS_FFT_COS(phase) floor(.5+SAMP_MAX * cos (phase)) +# define KISS_FFT_SIN(phase) floor(.5+SAMP_MAX * sin (phase)) +# define HALF_OF(x) ((x)>>1) +#elif defined(USE_SIMD) +# define KISS_FFT_COS(phase) _mm_set1_ps( cos(phase) ) +# define KISS_FFT_SIN(phase) _mm_set1_ps( sin(phase) ) +# define HALF_OF(x) ((x)*_mm_set1_ps(.5)) +#else +# define KISS_FFT_COS(phase) (kiss_fft_scalar) cos(phase) +# define KISS_FFT_SIN(phase) (kiss_fft_scalar) sin(phase) +# define HALF_OF(x) ((x)*.5) +#endif + +#define kf_cexp(x,phase) \ + do{ \ + (x)->r = KISS_FFT_COS(phase);\ + (x)->i = KISS_FFT_SIN(phase);\ + }while(0) + + +/* a debugging function */ +#define pcpx(c)\ + fprintf(stderr,"%g + %gi\n",(double)((c)->r),(double)((c)->i) ) diff --git a/libs/kiss/kiss_fft.c b/libs/kiss/kiss_fft.c new file mode 100755 index 00000000..fb048e7b --- /dev/null +++ b/libs/kiss/kiss_fft.c @@ -0,0 +1,427 @@ +/* +Copyright (c) 2003-2004, Mark Borgerding + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + + +#include "_kiss_fft_guts.h" +/* The guts header contains all the multiplication and addition macros that are defined for + fixed or floating point complex numbers. It also delares the kf_ internal functions. + */ + +static kiss_fft_cpx *scratchbuf=NULL; +static size_t nscratchbuf=0; +static kiss_fft_cpx *tmpbuf=NULL; +static size_t ntmpbuf=0; + +#define CHECKBUF(buf,nbuf,n) \ + do { \ + if ( nbuf < (size_t)(n) ) {\ + free(buf); \ + buf = (kiss_fft_cpx*)KISS_FFT_MALLOC(sizeof(kiss_fft_cpx)*(n)); \ + nbuf = (size_t)(n); \ + } \ + }while(0) + + +static void kf_bfly2( + kiss_fft_cpx * Fout, + const size_t fstride, + const kiss_fft_cfg st, + int m + ) +{ + kiss_fft_cpx * Fout2; + kiss_fft_cpx * tw1 = st->twiddles; + kiss_fft_cpx t; + Fout2 = Fout + m; + do{ + C_FIXDIV(*Fout,2); C_FIXDIV(*Fout2,2); + + C_MUL (t, *Fout2 , *tw1); + tw1 += fstride; + C_SUB( *Fout2 , *Fout , t ); + C_ADDTO( *Fout , t ); + ++Fout2; + ++Fout; + }while (--m); +} + +static void kf_bfly4( + kiss_fft_cpx * Fout, + const size_t fstride, + const kiss_fft_cfg st, + const size_t m + ) +{ + kiss_fft_cpx *tw1,*tw2,*tw3; + kiss_fft_cpx scratch[6]; + size_t k=m; + const size_t m2=2*m; + const size_t m3=3*m; + + tw3 = tw2 = tw1 = st->twiddles; + + do { + C_FIXDIV(*Fout,4); C_FIXDIV(Fout[m],4); C_FIXDIV(Fout[m2],4); C_FIXDIV(Fout[m3],4); + + C_MUL(scratch[0],Fout[m] , *tw1 ); + C_MUL(scratch[1],Fout[m2] , *tw2 ); + C_MUL(scratch[2],Fout[m3] , *tw3 ); + + C_SUB( scratch[5] , *Fout, scratch[1] ); + C_ADDTO(*Fout, scratch[1]); + C_ADD( scratch[3] , scratch[0] , scratch[2] ); + C_SUB( scratch[4] , scratch[0] , scratch[2] ); + C_SUB( Fout[m2], *Fout, scratch[3] ); + tw1 += fstride; + tw2 += fstride*2; + tw3 += fstride*3; + C_ADDTO( *Fout , scratch[3] ); + + if(st->inverse) { + Fout[m].r = scratch[5].r - scratch[4].i; + Fout[m].i = scratch[5].i + scratch[4].r; + Fout[m3].r = scratch[5].r + scratch[4].i; + Fout[m3].i = scratch[5].i - scratch[4].r; + }else{ + Fout[m].r = scratch[5].r + scratch[4].i; + Fout[m].i = scratch[5].i - scratch[4].r; + Fout[m3].r = scratch[5].r - scratch[4].i; + Fout[m3].i = scratch[5].i + scratch[4].r; + } + ++Fout; + }while(--k); +} + +static void kf_bfly3( + kiss_fft_cpx * Fout, + const size_t fstride, + const kiss_fft_cfg st, + size_t m + ) +{ + size_t k=m; + const size_t m2 = 2*m; + kiss_fft_cpx *tw1,*tw2; + kiss_fft_cpx scratch[5]; + kiss_fft_cpx epi3; + epi3 = st->twiddles[fstride*m]; + + tw1=tw2=st->twiddles; + + do{ + C_FIXDIV(*Fout,3); C_FIXDIV(Fout[m],3); C_FIXDIV(Fout[m2],3); + + C_MUL(scratch[1],Fout[m] , *tw1); + C_MUL(scratch[2],Fout[m2] , *tw2); + + C_ADD(scratch[3],scratch[1],scratch[2]); + C_SUB(scratch[0],scratch[1],scratch[2]); + tw1 += fstride; + tw2 += fstride*2; + + Fout[m].r = Fout->r - HALF_OF(scratch[3].r); + Fout[m].i = Fout->i - HALF_OF(scratch[3].i); + + C_MULBYSCALAR( scratch[0] , epi3.i ); + + C_ADDTO(*Fout,scratch[3]); + + Fout[m2].r = Fout[m].r + scratch[0].i; + Fout[m2].i = Fout[m].i - scratch[0].r; + + Fout[m].r -= scratch[0].i; + Fout[m].i += scratch[0].r; + + ++Fout; + }while(--k); +} + +static void kf_bfly5( + kiss_fft_cpx * Fout, + const size_t fstride, + const kiss_fft_cfg st, + int m + ) +{ + kiss_fft_cpx *Fout0,*Fout1,*Fout2,*Fout3,*Fout4; + int u; + kiss_fft_cpx scratch[13]; + kiss_fft_cpx * twiddles = st->twiddles; + kiss_fft_cpx *tw; + kiss_fft_cpx ya,yb; + ya = twiddles[fstride*m]; + yb = twiddles[fstride*2*m]; + + Fout0=Fout; + Fout1=Fout0+m; + Fout2=Fout0+2*m; + Fout3=Fout0+3*m; + Fout4=Fout0+4*m; + + tw=st->twiddles; + for ( u=0; ur += scratch[7].r + scratch[8].r; + Fout0->i += scratch[7].i + scratch[8].i; + + scratch[5].r = scratch[0].r + S_MUL(scratch[7].r,ya.r) + S_MUL(scratch[8].r,yb.r); + scratch[5].i = scratch[0].i + S_MUL(scratch[7].i,ya.r) + S_MUL(scratch[8].i,yb.r); + + scratch[6].r = S_MUL(scratch[10].i,ya.i) + S_MUL(scratch[9].i,yb.i); + scratch[6].i = -S_MUL(scratch[10].r,ya.i) - S_MUL(scratch[9].r,yb.i); + + C_SUB(*Fout1,scratch[5],scratch[6]); + C_ADD(*Fout4,scratch[5],scratch[6]); + + scratch[11].r = scratch[0].r + S_MUL(scratch[7].r,yb.r) + S_MUL(scratch[8].r,ya.r); + scratch[11].i = scratch[0].i + S_MUL(scratch[7].i,yb.r) + S_MUL(scratch[8].i,ya.r); + scratch[12].r = - S_MUL(scratch[10].i,yb.i) + S_MUL(scratch[9].i,ya.i); + scratch[12].i = S_MUL(scratch[10].r,yb.i) - S_MUL(scratch[9].r,ya.i); + + C_ADD(*Fout2,scratch[11],scratch[12]); + C_SUB(*Fout3,scratch[11],scratch[12]); + + ++Fout0;++Fout1;++Fout2;++Fout3;++Fout4; + } +} + +/* perform the butterfly for one stage of a mixed radix FFT */ +static void kf_bfly_generic( + kiss_fft_cpx * Fout, + const size_t fstride, + const kiss_fft_cfg st, + int m, + int p + ) +{ + int u,k,q1,q; + kiss_fft_cpx * twiddles = st->twiddles; + kiss_fft_cpx t; + int Norig = st->nfft; + + CHECKBUF(scratchbuf,nscratchbuf,p); + + for ( u=0; u=Norig) twidx-=Norig; + C_MUL(t,scratchbuf[q] , twiddles[twidx] ); + C_ADDTO( Fout[ k ] ,t); + } + k += m; + } + } +} + +static +void kf_work( + kiss_fft_cpx * Fout, + const kiss_fft_cpx * f, + const size_t fstride, + int in_stride, + int * factors, + const kiss_fft_cfg st + ) +{ + kiss_fft_cpx * Fout_beg=Fout; + const int p=*factors++; /* the radix */ + const int m=*factors++; /* stage's fft length/p */ + const kiss_fft_cpx * Fout_end = Fout + p*m; + +#ifdef _OPENMP + // use openmp extensions at the + // top-level (not recursive) + if (fstride==1) { + int k; + + // execute the p different work units in different threads +# pragma omp parallel for + for (k=0;k floor_sqrt) + p = n; /* no more factors, skip to end */ + } + n /= p; + *facbuf++ = p; + *facbuf++ = n; + } while (n > 1); +} + +/* + * + * User-callable function to allocate all necessary storage space for the fft. + * + * The return value is a contiguous block of memory, allocated with malloc. As such, + * It can be freed with free(), rather than a kiss_fft-specific function. + * */ +kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem ) +{ + kiss_fft_cfg st=NULL; + size_t memneeded = sizeof(struct kiss_fft_state) + + sizeof(kiss_fft_cpx)*(nfft-1); /* twiddle factors*/ + + if ( lenmem==NULL ) { + st = ( kiss_fft_cfg)KISS_FFT_MALLOC( memneeded ); + }else{ + if (mem != NULL && *lenmem >= memneeded) + st = (kiss_fft_cfg)mem; + *lenmem = memneeded; + } + if (st) { + int i; + st->nfft=nfft; + st->inverse = inverse_fft; + + for (i=0;iinverse) + phase *= -1; + kf_cexp(st->twiddles+i, phase ); + } + + kf_factor(nfft,st->factors); + } + return st; +} + + + + +void kiss_fft_stride(kiss_fft_cfg st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout,int in_stride) +{ + if (fin == fout) { + CHECKBUF(tmpbuf,ntmpbuf,st->nfft); + kf_work(tmpbuf,fin,1,in_stride, st->factors,st); + memcpy(fout,tmpbuf,sizeof(kiss_fft_cpx)*st->nfft); + }else{ + kf_work( fout, fin, 1,in_stride, st->factors,st ); + } +} + +void kiss_fft(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout) +{ + kiss_fft_stride(cfg,fin,fout,1); +} + + +/* not really necessary to call, but if someone is doing in-place ffts, they may want to free the + buffers from CHECKBUF + */ +void kiss_fft_cleanup(void) +{ + free(scratchbuf); + scratchbuf = NULL; + nscratchbuf=0; + free(tmpbuf); + tmpbuf=NULL; + ntmpbuf=0; +} + +int kiss_fft_next_fast_size(int n) +{ + while(1) { + int m=n; + while ( (m%2) == 0 ) m/=2; + while ( (m%3) == 0 ) m/=3; + while ( (m%5) == 0 ) m/=5; + if (m<=1) + break; /* n is completely factorable by twos, threes, and fives */ + n++; + } + return n; +} diff --git a/libs/kiss/kiss_fft.h b/libs/kiss/kiss_fft.h new file mode 100755 index 00000000..4fea9b16 --- /dev/null +++ b/libs/kiss/kiss_fft.h @@ -0,0 +1,127 @@ +#ifndef KISS_FFT_H +#define KISS_FFT_H + +#include +#include +#include +#include + +/* + stdlib.h includes malloc, and malloc.h is deprecated. +*/ +// #include + +#ifdef __cplusplus +extern "C" { +#endif + +/* + ATTENTION! + If you would like a : + -- a utility that will handle the caching of fft objects + -- real-only (no imaginary time component ) FFT + -- a multi-dimensional FFT + -- a command-line utility to perform ffts + -- a command-line utility to perform fast-convolution filtering + + Then see kfc.h kiss_fftr.h kiss_fftnd.h fftutil.c kiss_fastfir.c + in the tools/ directory. +*/ + +#ifdef USE_SIMD +# include +# define kiss_fft_scalar __m128 +#define KISS_FFT_MALLOC(nbytes) memalign(16,nbytes) +#else +#define KISS_FFT_MALLOC malloc +#endif + + +#ifdef FIXED_POINT +#include +# if (FIXED_POINT == 32) +# define kiss_fft_scalar int32_t +# else +# define kiss_fft_scalar int16_t +# endif +#else +# ifndef kiss_fft_scalar +/* default is float */ +# define kiss_fft_scalar float +# endif +#endif + +typedef struct { + kiss_fft_scalar r; + kiss_fft_scalar i; +}kiss_fft_cpx; + +typedef struct kiss_fft_state* kiss_fft_cfg; + +/* + * kiss_fft_alloc + * + * Initialize a FFT (or IFFT) algorithm's cfg/state buffer. + * + * typical usage: kiss_fft_cfg mycfg=kiss_fft_alloc(1024,0,NULL,NULL); + * + * The return value from fft_alloc is a cfg buffer used internally + * by the fft routine or NULL. + * + * If lenmem is NULL, then kiss_fft_alloc will allocate a cfg buffer using malloc. + * The returned value should be free()d when done to avoid memory leaks. + * + * The state can be placed in a user supplied buffer 'mem': + * If lenmem is not NULL and mem is not NULL and *lenmem is large enough, + * then the function places the cfg in mem and the size used in *lenmem + * and returns mem. + * + * If lenmem is not NULL and ( mem is NULL or *lenmem is not large enough), + * then the function returns NULL and places the minimum cfg + * buffer size in *lenmem. + * */ + +kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem); + +/* + * kiss_fft(cfg,in_out_buf) + * + * Perform an FFT on a complex input buffer. + * for a forward FFT, + * fin should be f[0] , f[1] , ... ,f[nfft-1] + * fout will be F[0] , F[1] , ... ,F[nfft-1] + * Note that each element is complex and can be accessed like + f[k].r and f[k].i + * */ +void kiss_fft(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout); + +/* + A more generic version of the above function. It reads its input from every Nth sample. + * */ +void kiss_fft_stride(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout,int fin_stride); + +/* If kiss_fft_alloc allocated a buffer, it is one contiguous + buffer and can be simply free()d when no longer needed*/ +#define kiss_fft_free free + +/* + Cleans up some memory that gets managed internally. Not necessary to call, but it might clean up + your compiler output to call this before you exit. +*/ +void kiss_fft_cleanup(void); + + +/* + * Returns the smallest integer k, such that k>=n and k has only "fast" factors (2,3,5) + */ +int kiss_fft_next_fast_size(int n); + +/* for real ffts, we need an even size */ +#define kiss_fftr_next_fast_size_real(n) \ + (kiss_fft_next_fast_size( ((n)+1)>>1)<<1) + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/libs/kiss/kiss_fftr.c b/libs/kiss/kiss_fftr.c new file mode 100755 index 00000000..bfd989fe --- /dev/null +++ b/libs/kiss/kiss_fftr.c @@ -0,0 +1,159 @@ +/* +Copyright (c) 2003-2004, Mark Borgerding + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include "kiss_fftr.h" +#include "_kiss_fft_guts.h" + +struct kiss_fftr_state{ + kiss_fft_cfg substate; + kiss_fft_cpx * tmpbuf; + kiss_fft_cpx * super_twiddles; +#ifdef USE_SIMD + long pad; +#endif +}; + +kiss_fftr_cfg kiss_fftr_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem) +{ + int i; + kiss_fftr_cfg st = NULL; + size_t subsize, memneeded; + + if (nfft & 1) { + fprintf(stderr,"Real FFT optimization must be even.\n"); + return NULL; + } + nfft >>= 1; + + kiss_fft_alloc (nfft, inverse_fft, NULL, &subsize); + memneeded = sizeof(struct kiss_fftr_state) + subsize + sizeof(kiss_fft_cpx) * ( nfft * 3 / 2); + + if (lenmem == NULL) { + st = (kiss_fftr_cfg) KISS_FFT_MALLOC (memneeded); + } else { + if (*lenmem >= memneeded) + st = (kiss_fftr_cfg) mem; + *lenmem = memneeded; + } + if (!st) + return NULL; + + st->substate = (kiss_fft_cfg) (st + 1); /*just beyond kiss_fftr_state struct */ + st->tmpbuf = (kiss_fft_cpx *) (((char *) st->substate) + subsize); + st->super_twiddles = st->tmpbuf + nfft; + kiss_fft_alloc(nfft, inverse_fft, st->substate, &subsize); + + for (i = 0; i < nfft/2; ++i) { + double phase = + -3.14159265358979323846264338327 * ((double) (i+1) / nfft + .5); + if (inverse_fft) + phase *= -1; + kf_cexp (st->super_twiddles+i,phase); + } + return st; +} + +void kiss_fftr(kiss_fftr_cfg st,const kiss_fft_scalar *timedata,kiss_fft_cpx *freqdata) +{ + /* input buffer timedata is stored row-wise */ + int k,ncfft; + kiss_fft_cpx fpnk,fpk,f1k,f2k,tw,tdc; + + if ( st->substate->inverse) { + fprintf(stderr,"kiss fft usage error: improper alloc\n"); + exit(1); + } + + ncfft = st->substate->nfft; + + /*perform the parallel fft of two real signals packed in real,imag*/ + kiss_fft( st->substate , (const kiss_fft_cpx*)timedata, st->tmpbuf ); + /* The real part of the DC element of the frequency spectrum in st->tmpbuf + * contains the sum of the even-numbered elements of the input time sequence + * The imag part is the sum of the odd-numbered elements + * + * The sum of tdc.r and tdc.i is the sum of the input time sequence. + * yielding DC of input time sequence + * The difference of tdc.r - tdc.i is the sum of the input (dot product) [1,-1,1,-1... + * yielding Nyquist bin of input time sequence + */ + + tdc.r = st->tmpbuf[0].r; + tdc.i = st->tmpbuf[0].i; + C_FIXDIV(tdc,2); + CHECK_OVERFLOW_OP(tdc.r ,+, tdc.i); + CHECK_OVERFLOW_OP(tdc.r ,-, tdc.i); + freqdata[0].r = tdc.r + tdc.i; + freqdata[ncfft].r = tdc.r - tdc.i; +#ifdef USE_SIMD + freqdata[ncfft].i = freqdata[0].i = _mm_set1_ps(0); +#else + freqdata[ncfft].i = freqdata[0].i = 0; +#endif + + for ( k=1;k <= ncfft/2 ; ++k ) { + fpk = st->tmpbuf[k]; + fpnk.r = st->tmpbuf[ncfft-k].r; + fpnk.i = - st->tmpbuf[ncfft-k].i; + C_FIXDIV(fpk,2); + C_FIXDIV(fpnk,2); + + C_ADD( f1k, fpk , fpnk ); + C_SUB( f2k, fpk , fpnk ); + C_MUL( tw , f2k , st->super_twiddles[k-1]); + + freqdata[k].r = HALF_OF(f1k.r + tw.r); + freqdata[k].i = HALF_OF(f1k.i + tw.i); + freqdata[ncfft-k].r = HALF_OF(f1k.r - tw.r); + freqdata[ncfft-k].i = HALF_OF(tw.i - f1k.i); + } +} + +void kiss_fftri(kiss_fftr_cfg st,const kiss_fft_cpx *freqdata,kiss_fft_scalar *timedata) +{ + /* input buffer timedata is stored row-wise */ + int k, ncfft; + + if (st->substate->inverse == 0) { + fprintf (stderr, "kiss fft usage error: improper alloc\n"); + exit (1); + } + + ncfft = st->substate->nfft; + + st->tmpbuf[0].r = freqdata[0].r + freqdata[ncfft].r; + st->tmpbuf[0].i = freqdata[0].r - freqdata[ncfft].r; + C_FIXDIV(st->tmpbuf[0],2); + + for (k = 1; k <= ncfft / 2; ++k) { + kiss_fft_cpx fk, fnkc, fek, fok, tmp; + fk = freqdata[k]; + fnkc.r = freqdata[ncfft - k].r; + fnkc.i = -freqdata[ncfft - k].i; + C_FIXDIV( fk , 2 ); + C_FIXDIV( fnkc , 2 ); + + C_ADD (fek, fk, fnkc); + C_SUB (tmp, fk, fnkc); + C_MUL (fok, tmp, st->super_twiddles[k-1]); + C_ADD (st->tmpbuf[k], fek, fok); + C_SUB (st->tmpbuf[ncfft - k], fek, fok); +#ifdef USE_SIMD + st->tmpbuf[ncfft - k].i *= _mm_set1_ps(-1.0); +#else + st->tmpbuf[ncfft - k].i *= -1; +#endif + } + kiss_fft (st->substate, st->tmpbuf, (kiss_fft_cpx *) timedata); +} diff --git a/libs/kiss/kiss_fftr.h b/libs/kiss/kiss_fftr.h new file mode 100755 index 00000000..72e5a577 --- /dev/null +++ b/libs/kiss/kiss_fftr.h @@ -0,0 +1,46 @@ +#ifndef KISS_FTR_H +#define KISS_FTR_H + +#include "kiss_fft.h" +#ifdef __cplusplus +extern "C" { +#endif + + +/* + + Real optimized version can save about 45% cpu time vs. complex fft of a real seq. + + + + */ + +typedef struct kiss_fftr_state *kiss_fftr_cfg; + + +kiss_fftr_cfg kiss_fftr_alloc(int nfft,int inverse_fft,void * mem, size_t * lenmem); +/* + nfft must be even + + If you don't care to allocate space, use mem = lenmem = NULL +*/ + + +void kiss_fftr(kiss_fftr_cfg cfg,const kiss_fft_scalar *timedata,kiss_fft_cpx *freqdata); +/* + input timedata has nfft scalar points + output freqdata has nfft/2+1 complex points +*/ + +void kiss_fftri(kiss_fftr_cfg cfg,const kiss_fft_cpx *freqdata,kiss_fft_scalar *timedata); +/* + input freqdata has nfft/2+1 complex points + output timedata has nfft scalar points +*/ + +#define kiss_fftr_free free + +#ifdef __cplusplus +} +#endif +#endif From 715fb5db48026d4fdaef173b4fe5f89e2d820a31 Mon Sep 17 00:00:00 2001 From: d3cod3 Date: Mon, 14 Apr 2025 17:37:05 +0100 Subject: [PATCH 04/21] added internal Fft implementation, reduced addons dependencies --- README.md | 5 +- addon_config.mk | 4 +- src/core/ofxVPFFT.h | 352 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 355 insertions(+), 6 deletions(-) create mode 100644 src/core/ofxVPFFT.h diff --git a/README.md b/README.md index 2632bcb1..8edcf8dd 100644 --- a/README.md +++ b/README.md @@ -71,8 +71,6 @@ In order to build ofxVisualProgramming, you'll need this addons: #### [ofxFFmpegRecorder](https://github.com/d3cod3/ofxFFmpegRecorder) -#### [ofxFft](https://github.com/kylemcdonald/ofxFft) - #### [ofxGLEditor](https://github.com/Akira-Hayasaka/ofxGLEditor) #### [ofxImGui](https://github.com/d3cod3/ofxImGui) @@ -119,7 +117,6 @@ git clone https://github.com/d3cod3/ofxBTrack git clone https://github.com/kylemcdonald/ofxCv 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/Akira-Hayasaka/ofxGLEditor git clone https://github.com/d3cod3/ofxImGui git clone https://github.com/d3cod3/ofxInfiniteCanvas @@ -345,7 +342,7 @@ ofxAudioFile, ofxPDSP original addons by [Nicola Pisanti](https://github.com/npi ofxBTrack original addon by [Nao Tokui](https://github.com/naotokui) -ofxCv, ofxFft original addons by [Kyle McDonald](https://github.com/kylemcdonald) +ofxCv original addons by [Kyle McDonald](https://github.com/kylemcdonald) ofxEasing original addon by [Arturo Castro](https://github.com/arturoc) diff --git a/addon_config.mk b/addon_config.mk index c19b9250..8f3efcb8 100644 --- a/addon_config.mk +++ b/addon_config.mk @@ -24,8 +24,8 @@ meta: common: # dependencies with other addons, a list of them separated by spaces # or use += in several lines - ADDON_DEPENDENCIES = ofxKinect ofxOpenCv ofxOsc ofxXmlSettings - ADDON_DEPENDENCIES += ofxAudioFile ofxBTrack ofxCv ofxEasing ofxFFmpegRecorder ofxFft + ADDON_DEPENDENCIES = ofxKinect ofxOpenCv ofxOsc + ADDON_DEPENDENCIES += ofxAudioFile ofxBTrack ofxCv ofxEasing ofxFFmpegRecorder ADDON_DEPENDENCIES += ofxGLEditor ofxImGui ofxLua ofxMidi ofxMtlMapping2D ADDON_DEPENDENCIES += ofxOpenDHT ofxPd ofxPDSP ofxTimeline ofxWarp diff --git a/src/core/ofxVPFFT.h b/src/core/ofxVPFFT.h new file mode 100644 index 00000000..4fa26156 --- /dev/null +++ b/src/core/ofxVPFFT.h @@ -0,0 +1,352 @@ +/*============================================================================== + + ofxVisualProgramming: A visual programming patching environment for OF + + Copyright (c) 2025 Emanuele Mazza aka n3m3da + + ofxVisualProgramming is distributed under the MIT License. + This gives everyone the freedoms to use ofxVisualProgramming in any context: + commercial or non-commercial, public or private, open or closed source. + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + See https://github.com/d3cod3/ofxVisualProgramming for documentation + + Original Fft code from ofxFft by Kyle McDonald + Simplified, stripped and reduced for ofxVP + +==============================================================================*/ + +#pragma once + +#include "ofMain.h" +#include "ofTypes.h" +#include "kiss_fftr.h" + +namespace ofxVP { + +class Fft { +public: + + void setup(int signalSize){ + this->signalSize = signalSize; + this->binSize = (signalSize / 2) + 1; + + signalNormalized = true; + signal = new float[signalSize]; + + cartesianUpdated = true; + cartesianNormalized = true; + real = new float[binSize]; + imag = new float[binSize]; + + polarUpdated = true; + polarNormalized = true; + amplitude = new float[binSize]; + phase = new float[binSize]; + + clear(); + + window = new float[signalSize]; + inverseWindow = new float[signalSize]; + + // Hamming window type + for(int i = 0; i < signalSize; i++) + window[i] = .54 - .46 * cos((TWO_PI * i) / (signalSize - 1)); + + windowSum = 0; + for(int i = 0; i < signalSize; i++) + windowSum += window[i]; + + for(int i = 0; i < signalSize; i++) + inverseWindow[i] = 1. / window[i]; + + fftCfg = kiss_fftr_alloc(signalSize, 0, NULL, NULL); + ifftCfg = kiss_fftr_alloc(signalSize, 1, NULL, NULL); + windowedSignal = new float[signalSize]; + cx_out = new kiss_fft_cpx[binSize]; + cx_in = new kiss_fft_cpx[binSize]; + } + ~Fft(){ + delete [] signal; + delete [] real; + delete [] imag; + delete [] amplitude; + delete [] phase; + delete [] window; + delete [] inverseWindow; + kiss_fftr_free(fftCfg); + kiss_fftr_free(ifftCfg); + delete [] windowedSignal; + delete [] cx_out; + delete [] cx_in; + } + + void setSignal(const vector& signal){ + setSignal(&signal[0]); + } + void setSignal(const float* signal){ + clearUpdates(); + copySignal(signal); + signalUpdated = true; + signalNormalized = true; + } + void setCartesian(float* real, float* imag = NULL){ + clearUpdates(); + copyReal(real); + copyImaginary(imag); + cartesianUpdated = true; + cartesianNormalized = true; + } + void setPolar(float* amplitude, float* phase = NULL){ + clearUpdates(); + copyAmplitude(amplitude); + copyPhase(phase); + polarUpdated = true; + polarNormalized = true; + } + + int getSignalSize(){ + return signalSize; + } + float* getSignal(){ + prepareSignal(); + return signal; + } + void clampSignal(){ + prepareSignal(); + for(int i = 0; i < signalSize; i++) { + if(signal[i] > 1) + signal[i] = 1; + else if(signal[i] < -1) + signal[i] = -1; + } + } + + int getBinSize() { + return binSize; + } + float* getReal(){ + prepareCartesian(); + return real; + } + float* getImaginary(){ + prepareCartesian(); + return imag; + } + float* getAmplitude(){ + preparePolar(); + return amplitude; + } + float* getPhase(){ + preparePolar(); + return phase; + } + + float getAmplitudeAtBin(float bin){ + float* amplitude = getAmplitude(); + int lowBin = ofClamp(floorf(bin), 0, binSize - 1); + int highBin = ofClamp(ceilf(bin), 0, binSize - 1); + return ofMap(bin, lowBin, highBin, amplitude[lowBin], amplitude[highBin]); + } + float getBinFromFrequency(float frequency, float sampleRate = 44100){ + return frequency * binSize / (sampleRate / 2); + } + float getAmplitudeAtFrequency(float frequency, float sampleRate = 44100){ + return getAmplitudeAtBin(getBinFromFrequency(frequency, sampleRate)); + } + +private: + kiss_fftr_cfg fftCfg, ifftCfg; + float* windowedSignal; + kiss_fft_cpx* cx_out; + kiss_fft_cpx* cx_in; + +protected: + + void executeFft(){ + memcpy(windowedSignal, signal, sizeof(float) * signalSize); + runWindow(windowedSignal); + kiss_fftr(fftCfg, windowedSignal, cx_out); + + for(int i = 0; i < binSize; i++) { + real[i] = cx_out[i].r; + imag[i] = cx_out[i].i; + } + cartesianUpdated = true; + } + void executeIfft(){ + for(int i = 0; i < binSize; i++) { + cx_in[i].r = real[i]; + cx_in[i].i = imag[i]; + }for(int i = 0; i < binSize; i++) { + cx_in[i].r = real[i]; + cx_in[i].i = imag[i]; + } + kiss_fftri(ifftCfg, cx_in, signal); + runInverseWindow(signal); + + signalUpdated = true; + kiss_fftri(ifftCfg, cx_in, signal); + runInverseWindow(signal); + + signalUpdated = true; + } + + void clear(){ + memset(signal, 0, sizeof(float) * signalSize); + memset(real, 0, sizeof(float) * binSize); + memset(imag, 0, sizeof(float) * binSize); + memset(amplitude, 0, sizeof(float) * binSize); + memset(phase, 0, sizeof(float) * binSize); + } + + // time domain data and methods + float windowSum; + float *window, *inverseWindow; + + inline void runWindow(float* signal) { + for(int i = 0; i < signalSize; i++) + signal[i] *= window[i]; + + } + + inline void runInverseWindow(float* signal) { + for(int i = 0; i < signalSize; i++) + signal[i] *= inverseWindow[i]; + + } + + float *signal; + bool signalUpdated, signalNormalized; + void prepareSignal(){ + if(!signalUpdated) + updateSignal(); + if(!signalNormalized) + normalizeSignal(); + } + void updateSignal(){ + prepareCartesian(); + executeIfft(); + signalUpdated = true; + signalNormalized = false; + } + void normalizeSignal(){ + float normalizer = (float) windowSum / (2 * signalSize); + for (int i = 0; i < signalSize; i++) + signal[i] *= normalizer; + signalNormalized = true; + } + void copySignal(const float* signal){ + memcpy(this->signal, signal, sizeof(float) * signalSize); + } + + // frequency domain data and methods + int signalSize, binSize; + + float *real, *imag; + bool cartesianUpdated, cartesianNormalized; + void prepareCartesian(){ + if(!cartesianUpdated) { + if(!polarUpdated) + executeFft(); + else + updateCartesian(); + } + if(!cartesianNormalized) + normalizeCartesian(); + } + void updateCartesian(){ + for(int i = 0; i < binSize; i++) { + real[i] = cosf(phase[i]) * amplitude[i]; + imag[i] = sinf(phase[i]) * amplitude[i]; + } + cartesianUpdated = true; + cartesianNormalized = polarNormalized; + } + void normalizeCartesian(){ + float normalizer = 2. / windowSum; + for(int i = 0; i < binSize; i++) { + real[i] *= normalizer; + imag[i] *= normalizer; + } + cartesianNormalized = true; + } + void copyReal(float* real){ + memcpy(this->real, real, sizeof(float) * binSize); + } + void copyImaginary(float* imag){ + if(imag == NULL) + memset(this->imag, 0, sizeof(float) * binSize); + else + memcpy(this->imag, imag, sizeof(float) * binSize); + } + + float *amplitude, *phase; + bool polarUpdated, polarNormalized; + void preparePolar(){ + if(!polarUpdated) + updatePolar(); + if(!polarNormalized) + normalizePolar(); + } + void updatePolar(){ + prepareCartesian(); + for(int i = 0; i < binSize; i++) { + amplitude[i] = cartesianToAmplitude(real[i], imag[i]); + phase[i] = cartesianToPhase(real[i], imag[i]); + } + polarUpdated = true; + polarNormalized = cartesianNormalized; + } + void normalizePolar(){ + float normalizer = 2. / windowSum; + for(int i = 0; i < binSize; i++) + amplitude[i] *= normalizer; + polarNormalized = true; + } + void copyAmplitude(float* amplitude){ + memcpy(this->amplitude, amplitude, sizeof(float) * binSize); + } + void copyPhase(float* phase){ + if(phase == NULL) + memset(this->phase, 0, sizeof(float) * binSize); + else + memcpy(this->phase, phase, sizeof(float) * binSize); + } + + void clearUpdates(){ + cartesianUpdated = false; + polarUpdated = false; + cartesianNormalized = false; + polarNormalized = false; + signalUpdated = false; + signalNormalized = false; + } + + inline float cartesianToAmplitude(float x, float y) { + return sqrtf(x * x + y * y); + } + + inline float cartesianToPhase(float x, float y) { + return atan2f(y, x); + } +}; + +} From a68df9775b2524df895074d66dfa903297984bc2 Mon Sep 17 00:00:00 2001 From: d3cod3 Date: Mon, 14 Apr 2025 17:37:46 +0100 Subject: [PATCH 05/21] updated fft objects to new code --- src/objects/audio_analysis/AudioAnalyzer.cpp | 11 ++++++++--- src/objects/audio_analysis/AudioAnalyzer.h | 4 ++-- src/objects/sound/pdspParametricEQ.cpp | 3 ++- src/objects/sound/pdspParametricEQ.h | 4 ++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/objects/audio_analysis/AudioAnalyzer.cpp b/src/objects/audio_analysis/AudioAnalyzer.cpp index 69e3b773..4af46ad0 100644 --- a/src/objects/audio_analysis/AudioAnalyzer.cpp +++ b/src/objects/audio_analysis/AudioAnalyzer.cpp @@ -316,10 +316,15 @@ void AudioAnalyzer::loadAudioSettings(){ beatTrack->setConfidentThreshold(0.35); // Audio Analysis - fft = ofxFft::create(bufferSize, OF_FFT_WINDOW_HAMMING); + fft = new ofxVP::Fft(); + fft->setup(bufferSize); - fftBinSize = fft->getBinSize(); - fft_binSizeHz = ((sampleRate/2)/(fftBinSize-1)); + fftBinSize = (bufferSize / 2) + 1; + // avoid division by 0 + if(fftBinSize<=1){ + fftBinSize = 2; + } + fft_binSizeHz = (sampleRate/2)/(fftBinSize-1); fft_StrongestBinValue = 0.0f; fft_StrongestBinIndex = 0; fft_pitchBin = 0; diff --git a/src/objects/audio_analysis/AudioAnalyzer.h b/src/objects/audio_analysis/AudioAnalyzer.h index 17ba8e56..59b4a015 100644 --- a/src/objects/audio_analysis/AudioAnalyzer.h +++ b/src/objects/audio_analysis/AudioAnalyzer.h @@ -36,7 +36,7 @@ #include "PatchObject.h" -#include "ofxFft.h" +#include "ofxVPFFT.h" #include "ofxBTrack.h" #include "imgui_plot.h" @@ -82,7 +82,7 @@ class AudioAnalyzer : public PatchObject { std::mutex audioMutex; // Analysis variables - ofxFft *fft; + ofxVP::Fft *fft; ofxBTrack *beatTrack; float *plot_data; diff --git a/src/objects/sound/pdspParametricEQ.cpp b/src/objects/sound/pdspParametricEQ.cpp index 26bd2c4a..9c5b5ad5 100755 --- a/src/objects/sound/pdspParametricEQ.cpp +++ b/src/objects/sound/pdspParametricEQ.cpp @@ -340,7 +340,8 @@ void pdspParametricEQ::loadAudioSettings(){ sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); - fft = ofxFft::create(bufferSize, OF_FFT_WINDOW_HAMMING); + fft = new ofxVP::Fft(); + fft->setup(bufferSize); spectrum = new float[fft->getBinSize()]; l1Filter = new std::vector; m1Filter = new std::vector; diff --git a/src/objects/sound/pdspParametricEQ.h b/src/objects/sound/pdspParametricEQ.h index 141c60bc..dc8557f2 100755 --- a/src/objects/sound/pdspParametricEQ.h +++ b/src/objects/sound/pdspParametricEQ.h @@ -36,7 +36,7 @@ #include "PatchObject.h" -#include "ofxFft.h" +#include "ofxVPFFT.h" #include "imgui_plot.h" #include "imgui-knobs.h" @@ -65,7 +65,7 @@ class pdspParametricEQ : public PatchObject{ void loadAudioSettings(); - ofxFft *fft; + ofxVP::Fft *fft; float *spectrum; pdsp::Scope scope; From 66efb39de1fadef3fbc6f4abb95435fb7c6d8478 Mon Sep 17 00:00:00 2001 From: d3cod3 Date: Tue, 15 Apr 2025 19:31:52 +0100 Subject: [PATCH 06/21] file renaming --- src/core/{ofxVPFFT.h => ofxVPFft.h} | 3 +-- src/objects/audio_analysis/AudioAnalyzer.h | 2 +- src/objects/sound/pdspParametricEQ.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) rename src/core/{ofxVPFFT.h => ofxVPFft.h} (99%) diff --git a/src/core/ofxVPFFT.h b/src/core/ofxVPFft.h similarity index 99% rename from src/core/ofxVPFFT.h rename to src/core/ofxVPFft.h index 4fa26156..ce5fbbf9 100644 --- a/src/core/ofxVPFFT.h +++ b/src/core/ofxVPFft.h @@ -36,7 +36,6 @@ #pragma once #include "ofMain.h" -#include "ofTypes.h" #include "kiss_fftr.h" namespace ofxVP { @@ -349,4 +348,4 @@ class Fft { } }; -} +}// End namespace ofxVP diff --git a/src/objects/audio_analysis/AudioAnalyzer.h b/src/objects/audio_analysis/AudioAnalyzer.h index 59b4a015..a9877bfb 100644 --- a/src/objects/audio_analysis/AudioAnalyzer.h +++ b/src/objects/audio_analysis/AudioAnalyzer.h @@ -36,7 +36,7 @@ #include "PatchObject.h" -#include "ofxVPFFT.h" +#include "ofxVPFft.h" #include "ofxBTrack.h" #include "imgui_plot.h" diff --git a/src/objects/sound/pdspParametricEQ.h b/src/objects/sound/pdspParametricEQ.h index dc8557f2..e928a860 100755 --- a/src/objects/sound/pdspParametricEQ.h +++ b/src/objects/sound/pdspParametricEQ.h @@ -36,7 +36,7 @@ #include "PatchObject.h" -#include "ofxVPFFT.h" +#include "ofxVPFft.h" #include "imgui_plot.h" #include "imgui-knobs.h" From 8a855054df5717db0ecc9469ac4349f62446aad9 Mon Sep 17 00:00:00 2001 From: d3cod3 Date: Tue, 15 Apr 2025 19:32:27 +0100 Subject: [PATCH 07/21] updated file --- src/physics/ofxParticles.h | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/physics/ofxParticles.h b/src/physics/ofxParticles.h index 0e7103e2..9becf781 100644 --- a/src/physics/ofxParticles.h +++ b/src/physics/ofxParticles.h @@ -2,7 +2,8 @@ // ofxParticles.h // // Created by Timothy Scaffidi on 6/14/12. -// Copyright (c) 2012 __MyCompanyName__. All rights reserved. +// +// Updated for ofxVP // #pragma once @@ -385,25 +386,25 @@ class ofxParticleSystem { } void attractTo(ofPoint p, const float accel, const float minDist, const bool consumeParticle = false) { - for(list::iterator it = particles.begin(); it != particles.end(); it++) { + for(std::list::iterator it = particles.begin(); it != particles.end(); it++) { (**it).attractTo(p, accel, minDist, consumeParticle); } } void gravitateTo(ofPoint p, const float gravity, const float mass, const float minDist, const float consumeParticle) { - for(list::iterator it = particles.begin(); it != particles.end(); it++) { + for(std::list::iterator it = particles.begin(); it != particles.end(); it++) { (**it).gravitateTo(p, gravity, mass, minDist, consumeParticle); } } void rotateAround(ofPoint p, const float accel, const float minDist, const float consumeParticle) { - for(list::iterator it = particles.begin(); it != particles.end(); it++) { + for(std::list::iterator it = particles.begin(); it != particles.end(); it++) { (**it).rotateAround(p, accel, minDist, consumeParticle); } } void applyVectorField(float * field, int fieldWidth, int fieldHeight, int numComponents, ofRectangle areaOfInfluence, float force) { - for(list::iterator it = particles.begin(); it != particles.end(); it++) { + for(std::list::iterator it = particles.begin(); it != particles.end(); it++) { ofxParticle & p = (**it); ofVec2f pos(p.position.x,p.position.y); if(areaOfInfluence.inside(pos)) { @@ -419,7 +420,7 @@ class ofxParticleSystem { int update(float timeStep, float drag) { int particlesRemoved = 0; - for(list::iterator it = particles.begin(); it != particles.end(); it++) { + for(std::list::iterator it = particles.begin(); it != particles.end(); it++) { if((**it).isAlive()) { (**it).update(timeStep, drag); } @@ -435,19 +436,19 @@ class ofxParticleSystem { } void draw() { - for(list::iterator it = particles.begin(); it != particles.end(); it++) { + for(std::list::iterator it = particles.begin(); it != particles.end(); it++) { (**it).draw(); } } void draw(ofTexture &tex) { - for(list::iterator it = particles.begin(); it != particles.end(); it++) { + for(std::list::iterator it = particles.begin(); it != particles.end(); it++) { (**it).draw(tex); } } void draw(ofTexture &tex, ofTexture &tex2) { - for(list::iterator it = particles.begin(); it != particles.end(); it++) { + for(std::list::iterator it = particles.begin(); it != particles.end(); it++) { int index = (**it).particleID; if(index%2==0) (**it).draw(tex); @@ -458,7 +459,7 @@ class ofxParticleSystem { int getNumParticles() {return numParticles;} - void binParticles(vector particles, const int binPower, const ofRectangle bounds) { + void binParticles(std::vector particles, const int binPower, const ofRectangle bounds) { if (this->binPower != binPower || bounds != binBounds) { this->binPower = binPower; @@ -486,15 +487,15 @@ class ofxParticleSystem { } } - int getNeighbors(vector &neighbors, const ofxParticle p, const float radius) { + int getNeighbors(std::vector &neighbors, const ofxParticle p, const float radius) { return getNeighbors(neighbors, p.position, radius); } - int getNeighbors(vector &neighbors, const ofVec3f p, const float radius) { + int getNeighbors(std::vector &neighbors, const ofVec3f p, const float radius) { return getNeighbors(neighbors, p.x, p.y, radius); } - int getNeighbors(vector &neighbors, float targetX, float targetY, const float radius) { + int getNeighbors(std::vector &neighbors, float targetX, float targetY, const float radius) { //adapted from kylemcdonalds binned particle system int x, y, p, bindex, minX, minY, maxX, maxY; unsigned int minXBin, maxXBin, minYBin, maxYBin; @@ -534,11 +535,11 @@ class ofxParticleSystem { private: - list particles; + std::list particles; int numParticles; int totalParticlesEmitted; - vector> bins; + std::vector> bins; ofRectangle binBounds; int binPower; int xbins, ybins; From 5eced5424d7f24ec1e7cb1b4ccf7d6e68f4b4992 Mon Sep 17 00:00:00 2001 From: d3cod3 Date: Tue, 15 Apr 2025 19:33:58 +0100 Subject: [PATCH 08/21] added A-Chaos non-linear strahge attractors library --- src/physics/AChaosLib/AChaosBaker.h | 62 +++++++++++++ src/physics/AChaosLib/AChaosBase.h | 66 ++++++++++++++ src/physics/AChaosLib/AChaosClifford.h | 60 ++++++++++++ src/physics/AChaosLib/AChaosCollatz.h | 56 ++++++++++++ src/physics/AChaosLib/AChaosDuffing.h | 55 +++++++++++ src/physics/AChaosLib/AChaosGinger.h | 53 +++++++++++ src/physics/AChaosLib/AChaosHenon.h | 50 ++++++++++ src/physics/AChaosLib/AChaosHenonF.h | 73 +++++++++++++++ src/physics/AChaosLib/AChaosHenonHeilles.h | 59 ++++++++++++ src/physics/AChaosLib/AChaosHenonPhase.h | 56 ++++++++++++ src/physics/AChaosLib/AChaosIkeda.h | 60 ++++++++++++ src/physics/AChaosLib/AChaosJong.h | 61 +++++++++++++ src/physics/AChaosLib/AChaosLib.h | 40 ++++++++ src/physics/AChaosLib/AChaosLogistic.h | 41 +++++++++ src/physics/AChaosLib/AChaosLogistic1.h | 43 +++++++++ src/physics/AChaosLib/AChaosLorenz.h | 81 +++++++++++++++++ src/physics/AChaosLib/AChaosLorenzEuler.h | 67 ++++++++++++++ src/physics/AChaosLib/AChaosLyapunov.h | 67 ++++++++++++++ src/physics/AChaosLib/AChaosNavierStokes.h | 91 +++++++++++++++++++ .../AChaosLib/AChaosNavierStokesEuler.h | 71 +++++++++++++++ src/physics/AChaosLib/AChaosRossler.h | 72 +++++++++++++++ src/physics/AChaosLib/AChaosStein.h | 44 +++++++++ src/physics/AChaosLib/AChaosStein1.h | 42 +++++++++ src/physics/AChaosLib/AChaosTorus.h | 48 ++++++++++ src/physics/AChaosLib/AChaosVerhulst.h | 44 +++++++++ src/physics/AChaosLib/AChaosVisualizer.h | 85 +++++++++++++++++ 26 files changed, 1547 insertions(+) create mode 100644 src/physics/AChaosLib/AChaosBaker.h create mode 100644 src/physics/AChaosLib/AChaosBase.h create mode 100755 src/physics/AChaosLib/AChaosClifford.h create mode 100644 src/physics/AChaosLib/AChaosCollatz.h create mode 100644 src/physics/AChaosLib/AChaosDuffing.h create mode 100644 src/physics/AChaosLib/AChaosGinger.h create mode 100644 src/physics/AChaosLib/AChaosHenon.h create mode 100644 src/physics/AChaosLib/AChaosHenonF.h create mode 100644 src/physics/AChaosLib/AChaosHenonHeilles.h create mode 100644 src/physics/AChaosLib/AChaosHenonPhase.h create mode 100644 src/physics/AChaosLib/AChaosIkeda.h create mode 100644 src/physics/AChaosLib/AChaosJong.h create mode 100644 src/physics/AChaosLib/AChaosLib.h create mode 100644 src/physics/AChaosLib/AChaosLogistic.h create mode 100644 src/physics/AChaosLib/AChaosLogistic1.h create mode 100644 src/physics/AChaosLib/AChaosLorenz.h create mode 100644 src/physics/AChaosLib/AChaosLorenzEuler.h create mode 100644 src/physics/AChaosLib/AChaosLyapunov.h create mode 100644 src/physics/AChaosLib/AChaosNavierStokes.h create mode 100644 src/physics/AChaosLib/AChaosNavierStokesEuler.h create mode 100644 src/physics/AChaosLib/AChaosRossler.h create mode 100644 src/physics/AChaosLib/AChaosStein.h create mode 100644 src/physics/AChaosLib/AChaosStein1.h create mode 100644 src/physics/AChaosLib/AChaosTorus.h create mode 100644 src/physics/AChaosLib/AChaosVerhulst.h create mode 100644 src/physics/AChaosLib/AChaosVisualizer.h diff --git a/src/physics/AChaosLib/AChaosBaker.h b/src/physics/AChaosLib/AChaosBaker.h new file mode 100644 index 00000000..34df7bb6 --- /dev/null +++ b/src/physics/AChaosLib/AChaosBaker.h @@ -0,0 +1,62 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ + +#pragma once +#include "AChaosBase.h" + +class AChaosBaker : public AChaosBase { +public: + + REAL eval, init; + bool fold_cut; + + AChaosBaker(){} + ~AChaosBaker(){} + + void setup(REAL * params = NULL){ + AChaosBase::setup(params, 2, 1); + + if(params==NULL){ + eval = 0.85f; + init = 0.85f; + fold_cut = false; + REAL p[2] = {init,(REAL)fold_cut}; + set(p); + } else { + set(params); + } + + } + + void reset(){ + init = iv[0]; + fold_cut = iv[1] > 0.0f; + eval = init; + } + + void calc(){ + + if (!fold_cut) /* fold */ + { + if (eval > 0.5) + eval = 2. - (eval*2.); + else + eval *= 2.; + } + else /* cut */ + { + if (eval < 0.5) + eval *= 2.; + else + eval = (eval*2.) - 1.; + } + + ov[0] = eval; + + } +}; diff --git a/src/physics/AChaosLib/AChaosBase.h b/src/physics/AChaosLib/AChaosBase.h new file mode 100644 index 00000000..c0b8d465 --- /dev/null +++ b/src/physics/AChaosLib/AChaosBase.h @@ -0,0 +1,66 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ +#pragma once + +// comment for 64bits version (not all objects support) +#define ACHAOS32 + +#ifdef ACHAOS32 +// 32bit + typedef float REAL; + #define SIN sinf + #define COS cosf + +#else +// 64bit + typedef double REAL; + #define SIN sin + #define COS cos + +#endif + + + +class AChaosBase { +public: + AChaosBase(){} + virtual ~AChaosBase(){} + + std::vector iv; + std::vector ov; + + virtual void setup(REAL * params = NULL, int numiv=1, int numov=1){ + iv.clear(); + ov.clear(); + for(int i=0; i ¶ms){ + iv.clear(); + for(int i=0; i & getVec(){return ov;} +}; diff --git a/src/physics/AChaosLib/AChaosClifford.h b/src/physics/AChaosLib/AChaosClifford.h new file mode 100755 index 00000000..6c0f479b --- /dev/null +++ b/src/physics/AChaosLib/AChaosClifford.h @@ -0,0 +1,60 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ +#pragma once +#include "AChaosBase.h" + +#define clif_calc(a,b,c,d) (SIN((a)*(b))+(c)*COS((a)*(d))) + +class AChaosClifford : public AChaosBase { +public: + + REAL a, b, c, d, nx, ny; + + AChaosClifford(){} + ~AChaosClifford(){} + + void setup(REAL * params = NULL){ + AChaosBase::setup(params, 6,2); + if(params==NULL){ + //init + a = -1.4f; + b = 1.6f; + c = 1.0f; + d = 0.7f; + //do not init x and y for more chaotic results + nx = 0.0f; + ny = 0.0f; + + REAL p[6] = {a,b,c,d,nx,ny}; + set(p); + } else { + set(params); + } + + } + + void reset(){ + a = iv[0]; + b = iv[1]; + c = iv[2]; + d = iv[3]; + nx = iv[4]; + ny = iv[5]; + } + + void calc(){ + // clifford attractor + // lx1 = sin (a*ny) + c*cos(a*nx); + // ly1 = sin (b*nx) + d*cos(b*ny); + nx = clif_calc(a, ny, c, nx); + ny = clif_calc(b, nx, d, ny); + + ov[0] = nx; + ov[1] = ny; + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosCollatz.h b/src/physics/AChaosLib/AChaosCollatz.h new file mode 100644 index 00000000..e8036d30 --- /dev/null +++ b/src/physics/AChaosLib/AChaosCollatz.h @@ -0,0 +1,56 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ + +#pragma once +#include "AChaosBase.h" + +class AChaosCollatz : public AChaosBase { +public: + + long value, offset; + bool mode; + + + AChaosCollatz(){} + ~AChaosCollatz(){} + + void setup(REAL * params = NULL){ + AChaosBase::setup(params, 3, 1); + + if(params==NULL){ + //init + value = offset = 0; + mode = 0; + + REAL p[3] = {(REAL)value,(REAL)offset,(REAL)mode}; + set(p); + } else { set(params); } + } + + void reset(){ + value = (long) iv[0]; + offset = (long) iv[1]; + mode = iv[2]>0; + } + + void calc(){ + + short int stub = value % 2; //par ou impar + + if(!mode) { // L.Collatz collatz mode + if (!stub) value /= 2; //par ]e metade + else value = 3*value+1; //impar ]e 3n+1 + } + else if (mode) { // Terras collatz mode + if (!stub) value /= 2; //par ]e metade + else value = 0.5*(3*value+1); //impar ]e 1/2(3n+1) + } + + ov[0] = (REAL)value; + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosDuffing.h b/src/physics/AChaosLib/AChaosDuffing.h new file mode 100644 index 00000000..9b027cea --- /dev/null +++ b/src/physics/AChaosLib/AChaosDuffing.h @@ -0,0 +1,55 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ +#pragma once +#include "AChaosBase.h" + +class AChaosDuffing : public AChaosBase { +public: + + REAL a, b, w, t, dt, nx, ny; + + AChaosDuffing(){} + ~AChaosDuffing(){} + + void setup(REAL * params = NULL){ + + AChaosBase::setup(params, 7, 2); + if(params==NULL){ + //init + a = 0.25f; + b = 0.3f; + w = 1.0f; + nx = 0.0f; + ny = 0.0f; + dt = 0.01f; + t = 0.0f; + REAL p[7] = {a,b,w,nx,ny,dt,t}; + set(p); + } else { set(params); } + + } + + void reset(){ + a = iv[0]; + b = iv[1]; + w = iv[2]; + nx = iv[3]; + ny = iv[4]; + dt = iv[5]; + t = iv[6]; + } + + void calc(){ + t += dt; + nx = ny; + ny = nx-(nx*nx*nx)-(a*ny)+(b*COS(w*t)); + + ov[0] = nx; + ov[1] = ny; + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosGinger.h b/src/physics/AChaosLib/AChaosGinger.h new file mode 100644 index 00000000..8327e18c --- /dev/null +++ b/src/physics/AChaosLib/AChaosGinger.h @@ -0,0 +1,53 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ +#pragma once +#include "AChaosBase.h" + +class AChaosGinger : public AChaosBase { +public: + + REAL seed, nx, ny; + + AChaosGinger(){} + ~AChaosGinger(){} + + void setup(REAL * params = NULL){ + + AChaosBase::setup(params, 3, 2); + if(params==NULL){ + //init + seed = 0.82f; + nx = 0.7f; + ny = 1.2f; + + REAL p[3] = {seed,nx,ny}; + set(p); + } else { set(params); } + } + + void reset(){ + seed = iv[0]; + nx = iv[1]; + ny = iv[2]; + } + + void calc(){ + // ginger formulae + REAL x1,y1; + + y1 = nx; + if (nx<0.) nx = -nx; + x1 = 1. - ny - seed*nx; + + nx = x1; + ny = y1; + + ov[0] = nx; + ov[1] = ny; + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosHenon.h b/src/physics/AChaosLib/AChaosHenon.h new file mode 100644 index 00000000..733c02ac --- /dev/null +++ b/src/physics/AChaosLib/AChaosHenon.h @@ -0,0 +1,50 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ +#pragma once +#include "AChaosBase.h" + +class AChaosHenon : public AChaosBase { +public: + + REAL a, b, nx, ny; + + AChaosHenon(){} + ~AChaosHenon(){} + + void setup(REAL * params = NULL){ + AChaosBase::setup(params, 4,2); + if(params==NULL){ + //init + a = 1.4f; + b = 0.3f; + nx = 1.0f; + ny = 1.0f; + + REAL p[4] = {a,b,nx,ny}; + set(p); + } else { + set(params); + } + } + + void reset(){ + a = iv[0]; + b = iv[1]; + nx = iv[2]; + ny = iv[3]; + } + + void calc(){ + // henon + nx = (ny + 1) - (a * (nx*nx)); + ny = b * nx; + + ov[0] = nx; + ov[1] = ny; + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosHenonF.h b/src/physics/AChaosLib/AChaosHenonF.h new file mode 100644 index 00000000..c2e343b9 --- /dev/null +++ b/src/physics/AChaosLib/AChaosHenonF.h @@ -0,0 +1,73 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ +#pragma once +#include "AChaosBase.h" + +class AChaosHenonF : public AChaosBase { +public: + + REAL a, b, nx, ny, dt, t; + + AChaosHenonF(){} + ~AChaosHenonF(){} + + + void setup(REAL * params = NULL){ + AChaosBase::setup(params, 5,2); + if(params==NULL){ + //init + a = 1.4f; + b = 0.3f; + nx = 1.0f; + ny = 1.0f; + dt = 0.01f; + t=0.0f; + REAL p[5] = {nx,ny,a,b,dt}; + set(p); + } else { + set(params); + } + } + + + void reset(){ + nx = iv[0]; + ny = iv[1]; + a = iv[2]; + b = iv[3]; + dt = iv[4]; + } + + void calc(){ + // Henon Phase Diagrams + REAL cosa=COS(a),sina=SIN(a), lx1, ly1, nx2=nx*nx; + + //henon calc + lx1 = (ny + 1) - (a * nx2); + ly1 = b * nx; + + //advance 'a' by dt _AFTER_ calculating henon + t += dt; + a *= t; + + //henon phase + nx = nx*cosa - (ny -nx2)*sina; + ny = nx*sina - (ny -nx2)*cosa; + + +/* + // henonf attractor + + lx1 = nx*cos (a) - (ny - (nx*nx))*sin(a); + ly1 = nx*sin(a) - (ny - (nx*nx))*cos(a); +*/ + + ov[0] = nx; + ov[1] = ny; + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosHenonHeilles.h b/src/physics/AChaosLib/AChaosHenonHeilles.h new file mode 100644 index 00000000..71007b75 --- /dev/null +++ b/src/physics/AChaosLib/AChaosHenonHeilles.h @@ -0,0 +1,59 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ +#pragma once +#include "AChaosBase.h" + +class AChaosHenonHeilles : public AChaosBase { +public: + + REAL nx, ny, nxdot, nydot, e, dt; + + AChaosHenonHeilles(){} + ~AChaosHenonHeilles(){} + + void setup(REAL * params = NULL){ + + AChaosBase::setup(params, 5, 4); + if(params==NULL){ + //init + nx = 1.0f; + ny = 1.0f; + nydot = 1.4f; + e = 0.125f; + dt = 0.02; + REAL p[5] = {nx,ny, nydot,e,dt}; + set(p); + } else { set(params); } + + } + + void reset(){ + nx = iv[0]; + ny = iv[1]; + nydot = iv[2]; + e = iv[3]; + dt = iv[4]; + } + + void calc(){ + // henon_heilles_calc + REAL xdd,ydd; + + xdd = -nx-(2*nx*ny); + ydd = ny*ny -ny -(nx*nx); + nxdot += xdd*dt; + nydot += ydd*dt; + nx += nxdot*dt; + ny += nydot*dt; + + ov[0] = nx; + ov[1] = ny; + ov[2] = nxdot; + ov[3] = nydot; + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosHenonPhase.h b/src/physics/AChaosLib/AChaosHenonPhase.h new file mode 100644 index 00000000..f7a3350c --- /dev/null +++ b/src/physics/AChaosLib/AChaosHenonPhase.h @@ -0,0 +1,56 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ +#pragma once +#include "AChaosBase.h" + +class AChaosHenonPhase : public AChaosBase { +public: + + REAL a, b, nx, ny, dt, t; + + AChaosHenonPhase(){} + ~AChaosHenonPhase(){} + + void setup(REAL * params = NULL){ + + AChaosBase::setup(params, 5, 2); + if(params==NULL){ + //init + a = 1.4f; + b = 0.3f; + nx = 1.0f; + ny = 1.0f; + dt = 0.01f; + t=0.0f; + REAL p[5] = {nx,ny, a,b,dt}; + set(p); + } else { set(params); } + + } + + + + void reset(){ + nx = iv[0]; + ny = iv[1]; + a = iv[2]; + b = iv[3]; + dt = iv[4]; + } + + void calc(){ + // Henon Phase Diagrams + REAL cosa=COS(a),sina=SIN(a); + + nx = nx*cosa-(ny-nx*nx)*sina; + ny = nx*sina-(ny-nx*nx)*cosa; + + ov[0] = nx; + ov[1] = ny; + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosIkeda.h b/src/physics/AChaosLib/AChaosIkeda.h new file mode 100644 index 00000000..e5a7be51 --- /dev/null +++ b/src/physics/AChaosLib/AChaosIkeda.h @@ -0,0 +1,60 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ +#pragma once +#include "AChaosBase.h" + +class AChaosIkeda : public AChaosBase { +public: + + REAL a, b, k, p, nx, ny; + + AChaosIkeda(){} + ~AChaosIkeda(){} + + void setup(REAL * params = NULL){ + + AChaosBase::setup(params, 6, 2); + if(params==NULL){ + //init + a=0.85; + b=0.9; + k=0.4; + p=7.7; + nx=0; + ny=0; + REAL pa[6] = {nx,ny,a,b,k,p}; + set(pa); + } else { set(params); } + + } + + void reset(){ + nx = iv[0]; + ny = iv[1]; + a = iv[2]; + b = iv[3]; + k = iv[4]; + p = iv[5]; + } + + void calc(){ + REAL x0 = nx, y0 = ny; + REAL temp = (p/(1+x0*x0+y0*y0)); + REAL cosx = (COS(b-temp)); + REAL sinx = (SIN(b-temp)); + /* + xn+1 = a + k*( x0*cos(b-(p/(1+x0*x0+y0*y0))) - y0*sin(b-(p/(1*x0*x0+y0*y0))) ) + yn+1 = k*( x0*sin(b-(p/(1+x0*x0+y0*y0))) - y0*cos(b-(p/(1*x0*x0+y0*y0))) ) + */ + nx = a + k*(x0*cosx)-y0*sinx; + ny = k*sinx -y0*cosx; + + ov[0] = nx; + ov[1] = ny; + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosJong.h b/src/physics/AChaosLib/AChaosJong.h new file mode 100644 index 00000000..5121cc96 --- /dev/null +++ b/src/physics/AChaosLib/AChaosJong.h @@ -0,0 +1,61 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ + +#pragma once +#include "AChaosBase.h" + +class AChaosJong : public AChaosBase { +public: + + REAL a, b, c, d, nx, ny; + + AChaosJong(){} + ~AChaosJong(){} + + void setup(REAL * params = NULL){ + + AChaosBase::setup(params, 6, 2); + if(params==NULL){ + //init + a = 1.4f; + b = -2.3f; + c = 2.4f; + d = -2.1f; + nx = 0.0f; + ny = 0.0f; + REAL p[6] = {a,b,c,d,nx,ny}; + set(p); + } else { set(params); } + + } + + void reset(){ + a = iv[0]; + b = iv[1]; + c = iv[2]; + d = iv[3]; + nx = iv[4]; + ny = iv[5]; + } + + void calc(){ + // Peter de Jong attractor + // lx1 = sin(a*ny)-cos(b*nx); + // ly1 = sin(c*nx)-cos(d*ny); + + nx = SIN(a*ny)-COS(b*nx); + ny = SIN(c*nx)-COS(d*ny); + + ov[0] = nx; + ov[1] = ny; + + } + + + +}; diff --git a/src/physics/AChaosLib/AChaosLib.h b/src/physics/AChaosLib/AChaosLib.h new file mode 100644 index 00000000..9c3d42ec --- /dev/null +++ b/src/physics/AChaosLib/AChaosLib.h @@ -0,0 +1,40 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT + + A-Chaos Lib is a systematic approach to emulate the use of up-to-date known strange attractors' non-linear equations. + + A big thank you to Richard Dudas for putting the Chaos Collection out there and for providing a code cushion that allowed solving + all non-linearity non-working coding problems. Thank you to Mikhail Malt, whose Chaos Lib for Ircam's PatchWork/OpenMusic was + the chaos primer for musical programming systems and Richard's inspiration for the famous Max Chaos Collection. + Thank you also to Paul Bourke whose www pages have been highly enlighting on non-linear processes. + +*/ +#pragma once + +#include "AChaosBaker.h" +#include "AChaosClifford.h" +#include "AChaosCollatz.h" +#include "AChaosDuffing.h" +#include "AChaosGinger.h" +#include "AChaosHenon.h" +#include "AChaosHenonF.h" +#include "AChaosHenonHeilles.h" +#include "AChaosHenonPhase.h" +#include "AChaosIkeda.h" +#include "AChaosJong.h" +#include "AChaosLogistic.h" +#include "AChaosLogistic1.h" +#include "AChaosLorenz.h" +#include "AChaosLorenzEuler.h" +#include "AChaosLyapunov.h" +#include "AChaosNavierStokes.h" +#include "AChaosNavierStokesEuler.h" +#include "AChaosRossler.h" +#include "AChaosStein.h" +#include "AChaosStein1.h" +#include "AChaosTorus.h" +#include "AChaosVerhulst.h" diff --git a/src/physics/AChaosLib/AChaosLogistic.h b/src/physics/AChaosLib/AChaosLogistic.h new file mode 100644 index 00000000..205450de --- /dev/null +++ b/src/physics/AChaosLib/AChaosLogistic.h @@ -0,0 +1,41 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ +#pragma once +#include "AChaosBase.h" + +class AChaosLogistic : public AChaosBase { +public: + + REAL seed, lambda; + + AChaosLogistic(){} + ~AChaosLogistic(){} + + void setup(REAL * params = NULL){ + + AChaosBase::setup(params, 2, 1); + if(params==NULL){ + //init + seed = 0.777f; + lambda = 3.9f; + REAL p[2] = {seed,lambda}; + set(p); + } else { set(params); } + } + + void reset(){ + seed = iv[0]; + lambda = iv[1]; + } + + void calc(){ + seed = lambda * seed * (1.0-seed); + + ov[0] = seed; + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosLogistic1.h b/src/physics/AChaosLib/AChaosLogistic1.h new file mode 100644 index 00000000..e26ddb7c --- /dev/null +++ b/src/physics/AChaosLib/AChaosLogistic1.h @@ -0,0 +1,43 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ +#pragma once +#include "AChaosBase.h" + +class AChaosLogistic1 : public AChaosBase { +public: + + REAL seed, lambda, gamma; + + AChaosLogistic1(){} + ~AChaosLogistic1(){} + + void setup(REAL * params = NULL){ + + AChaosBase::setup(params, 3, 1); + if(params==NULL){ + //init + seed = 0.777f; + lambda = 3.9f; + gamma = 3.43f; + REAL p[3] = {seed,lambda,gamma}; + set(p); + } else { set(params); } + } + + void reset(){ + seed = iv[0]; + lambda = iv[1]; + gamma = iv[2]; + } + + void calc(){ + seed = (seed*lambda) -(gamma*seed*seed); + + ov[0] = seed; + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosLorenz.h b/src/physics/AChaosLib/AChaosLorenz.h new file mode 100644 index 00000000..4fb181b7 --- /dev/null +++ b/src/physics/AChaosLib/AChaosLorenz.h @@ -0,0 +1,81 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ + +#pragma once +#include "AChaosBase.h" +#define lorx(x, y, a) (a) * ((y) - (x)); +#define lory(x, y, z, a) ((x) * ((r) - (z))) - (y); +#define lorz(x, y, z, c) ((x) * (y)) - ((z) * (c)); + +class AChaosLorenz : public AChaosBase { +public: + + REAL a, r, c, nx, ny, nz,dt; //eq variables + + AChaosLorenz(){} + ~AChaosLorenz(){} + + void setup(REAL * params = NULL){ + + AChaosBase::setup(params, 7, 3); + if(params==NULL){ + //classic lorenz + a=10.0; + r=28.0; + c= 2.67; + nx=0.1; + ny=0.1; + nz=0.1; + dt=0.01; + REAL p[7] = {nx,ny,nz,a,r,c,dt}; + set(p); + } else { set(params); } + + } + + + + void reset(){ + nx = iv[0]; + ny = iv[1]; + nz = iv[2]; + a = iv[3]; + r = iv[4]; + c = iv[5]; + dt = iv[6]; + } + + void calc(){ + + REAL dt2, fx, fy, fz, + ffx, ffy, ffz, + dtfx, dtfy, dtfz; + + dt2 = dt/2.; + + fx = lorx (nx,ny,a); + fz = lorz(nx,ny,nz,c); + fy = lory(nx,ny,nz,r); + + dtfx = nx + (dt*fx); + dtfy = ny + (dt*fy); + dtfz = nz + (dt*fz); + + ffx = lorx (dtfx,dtfy,a); + ffz = lorz(dtfx,dtfy,dtfz,c); + ffy = lory(dtfx,dtfy,dtfz,r); + + nx += (dt2*(fx+ffx)); + ny += (dt2*(fy+ffy)); + nz += (dt2*(fz+ffz)); + + ov[0] = nx; + ov[1] = ny; + ov[2] = nz; + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosLorenzEuler.h b/src/physics/AChaosLib/AChaosLorenzEuler.h new file mode 100644 index 00000000..f0486470 --- /dev/null +++ b/src/physics/AChaosLib/AChaosLorenzEuler.h @@ -0,0 +1,67 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ + +#pragma once +#include "AChaosBase.h" +#define lorx(x, y, a) (a) * ((y) - (x)); +#define lory(x, y, z, a) ((x) * ((r) - (z))) - (y); +#define lorz(x, y, z, c) ((x) * (y)) - ((z) * (c)); + +class AChaosLorenzEuler : public AChaosBase { +public: + + REAL a, r, c, nx, ny, nz,dt; //eq variables + + AChaosLorenzEuler(){} + ~AChaosLorenzEuler(){} + + void setup(REAL * params = NULL){ + + AChaosBase::setup(params, 7, 3); + if(params==NULL){ + //classic lorenz + a=10.0; + r=28.0; + c= 2.67; + nx=0.1; + ny=0.1; + nz=0.1; + dt=0.01; + REAL p[7] = {nx,ny,nz,a,r,c,dt}; + set(p); + } else { set(params); } + + } + + + void reset(){ + nx = iv[0]; + ny = iv[1]; + nz = iv[2]; + a = iv[3]; + r = iv[4]; + c = iv[5]; + dt = iv[6]; + } + + void calc(){ + REAL dx, dy, dz; + + dx = ((ny*a)-(nx*a))*dt; + dy = ((nx*r)-ny-(nx*nz))*dt; + dz = ((nx*ny)-(nz*c))*dt; + + nx += dx; + ny += dy; + nz += dz; + + ov[0] = nx; + ov[1] = ny; + ov[2] = nz; + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosLyapunov.h b/src/physics/AChaosLib/AChaosLyapunov.h new file mode 100644 index 00000000..eb1bf261 --- /dev/null +++ b/src/physics/AChaosLib/AChaosLyapunov.h @@ -0,0 +1,67 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ + +#pragma once +#include "AChaosBase.h" +#define lorx(x, y, a) (a) * ((y) - (x)); +#define lory(x, y, z, a) ((x) * ((r) - (z))) - (y); +#define lorz(x, y, z, c) ((x) * (y)) - ((z) * (c)); + +class AChaosLyapunov : public AChaosBase { +public: + + REAL a[6], b[6], nx, ny; + + AChaosLyapunov(){} + ~AChaosLyapunov(){} + + void setup(REAL * params = NULL){ + + AChaosBase::setup(params, 14, 2); + if(params==NULL){ + + a[0] = -1.4f; + a[1] = 0.7f; + a[2] = -0.16f; + a[3] = -1.21f; + a[4] = 1.11f; + a[5] = -1.46f; + b[0] = -0.19f; + b[1] = 0.04f; + b[2] = 1.59f; + b[3] = 1.3f; + b[4] = 1.68f; + b[5] = 1.76f; + nx = ny = 0.0f; + REAL p[14] = {a[0],a[1],a[2],a[3],a[4],a[5], + b[0],b[1],b[2],b[3],b[4],b[5],nx,ny}; + set(p); + } else { set(params); } + + } + + void reset(){ + nx = iv[12]; + ny = iv[13]; + for(int i=0; i<6; i++){ + a[i] = iv[i]; + } + for(int i=0; i<6; i++){ + b[i] = iv[i+6]; + } + } + + void calc(){ + // maybe lyapunov attractor : quadratic eq + nx = a[0] + a[1]*nx + a[2]*nx*nx + a[3]*nx*ny + a[4]*ny + a[5]*ny*ny; + ny = b[0] + b[1]*nx + b[2]*nx*nx + b[3]*nx*ny + b[4]*ny + b[5]*ny*ny; + + ov[0] = nx; + ov[1] = ny; + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosNavierStokes.h b/src/physics/AChaosLib/AChaosNavierStokes.h new file mode 100644 index 00000000..51883376 --- /dev/null +++ b/src/physics/AChaosLib/AChaosNavierStokes.h @@ -0,0 +1,91 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ +#pragma once +#include "AChaosBase.h" + +class AChaosNavierStokes : public AChaosBase { +public: + + REAL a, b, c, d, e, r, dt; + + AChaosNavierStokes(){} + ~AChaosNavierStokes(){} + + void setup(REAL * params = NULL){ + + AChaosBase::setup(params, 7, 5); + + if(params==NULL){ + //classic navierstokes + a = 1.0; + b = 1.0; + c = 1.0; + d = 1.0; + e = 1.0; + r = 28.0; + dt = 0.01; + REAL p[7] = {a,b,c,d,e,r,dt}; + set(p); + } else { set(params); } + + } + + void reset(){ + a = iv[0]; + b = iv[1]; + c = iv[2]; + d = iv[3]; + e = iv[4]; + r = iv[5]; + dt = iv[6]; + } + +#define nava(a, b, c, d, e) ((-2*(a)) + (4*(b)*(c)) + (4*(d)*(e))) +#define navb(a, b, c) ((-9*(b)) + (3*(a)*(c))) +#define navc(a, b, c, r) ((-5*(c)) + (-7*(a)*(b)) + (r)) +#define navd(a, d, e) ((-5*(d)) - ((a)*(e))) +#define nave(a, d, e) ((-3*(a)*(d)) - (e)) + + void calc(){ + + REAL dt2=dt/2., afa, bfb, cfc, dfd, efe; + REAL fa, fb, fc, fd, fe; + REAL ffa, ffb, ffc, ffd, ffe; + + fa=nava(a, b, c, d, e); + fb=navb(a, b, c); + fc=navc(a, b, c, r); + fd=navd(a, d, e); + fe=nave(a, d, e); + + afa = a +(dt*fa); + bfb = b +(dt*fb); + cfc = c +(dt*fc); + dfd = d +(dt*fd); + efe = e +(dt*fe); + + ffa = nava(afa,bfb,cfc,dfd,efe); + ffb = navb(afa,bfb,cfc); + ffc = navc(afa,bfb,cfc,r); + ffd = navd(afa,dfd,efe); + ffe = nave(afa,dfd,efe); + + a += (dt2*(fa+ffa)); + b += (dt2*(fb+ffb)); + c += (dt2*(fc+ffc)); + d += (dt2*(fd+ffd)); + e += (dt2*(fe+ffe)); + + ov[0] = a; + ov[1] = b; + ov[2] = c; + ov[3] = d; + ov[4] = e; + + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosNavierStokesEuler.h b/src/physics/AChaosLib/AChaosNavierStokesEuler.h new file mode 100644 index 00000000..4ef0a1cc --- /dev/null +++ b/src/physics/AChaosLib/AChaosNavierStokesEuler.h @@ -0,0 +1,71 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ +#pragma once +#include "AChaosBase.h" + +class AChaosNavierStokesEuler : public AChaosBase { +public: + + REAL a, b, c, d, e, r, dt; + + AChaosNavierStokesEuler(){} + ~AChaosNavierStokesEuler(){} + + void setup(REAL * params = NULL){ + + AChaosBase::setup(params, 7, 5); + if(params==NULL){ + //classic navierstokes + a = 1.0; + b = 1.0; + c = 1.0; + d = 1.0; + e = 1.0; + r = 28.0; + dt = 0.01; + REAL p[7] = {a,b,c,d,e,r,dt}; + set(p); + } else { set(params); } + + } + + void reset(){ + a = iv[0]; + b = iv[1]; + c = iv[2]; + d = iv[3]; + e = iv[4]; + r = iv[5]; + dt = iv[6]; + } + + + void calc(){ + + REAL da, db, dc, dd, de; + + da=((a * -2) + (4 * b * c) + (4 * d * e))*dt; + db=((b * -9) + (3 * a * c))*dt; + dc=((c * -5) + (-7 * a * b) + r)*dt; + dd=((d * -5) - (a * e))*dt; + de=((a * d * -3) - e)*dt; + + a += da; + b += db; + c += dc; + d += dd; + e += de; + + ov[0] = a; + ov[1] = b; + ov[2] = c; + ov[3] = d; + ov[4] = e; + + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosRossler.h b/src/physics/AChaosLib/AChaosRossler.h new file mode 100644 index 00000000..acb15f83 --- /dev/null +++ b/src/physics/AChaosLib/AChaosRossler.h @@ -0,0 +1,72 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ +#pragma once +#include "AChaosBase.h" + +#define rosx(y,z) -((y)+(z)) +#define rosy(x,y,a) (x)+((a)*(y)) +#define rosz(x,z,b,c) (b)+((x)*(z))-((c)*(z)) + +class AChaosRossler : public AChaosBase { +public: + + REAL a, b, c, nx, ny, nz,dt; + + AChaosRossler(){} + ~AChaosRossler(){} + + void setup(REAL * params = NULL){ + + AChaosBase::setup(params, 7, 3); + if(params==NULL){ + //classic rossler + a = 0.2; + b = 0.2; + c = 5.7; + nx = 1; + ny = 1; + nz = 1; + dt = 0.01; + REAL p[7] = {a,b,c,nx,ny,nz,dt}; + set(p); + } else { set(params); } + + } + + void reset(){ + a = iv[0]; + b = iv[1]; + c = iv[2]; + nx = iv[3]; + ny = iv[4]; + nz = iv[5]; + dt = iv[6]; + } + + + void calc(){ + REAL fx, fy, fz, ffx, ffy, ffz, dt2 = dt/2.; + REAL dtfx, dtfy, dtfz; + + fx = rosx(ny,nz); + fy = rosy(nx,ny,a); + fz = rosz(nx,nz,b,c); + + ffx = rosx((ny+dt*fy), (nz+(dt*fz))); + ffy = rosy((nx+dt*nx), (ny+dt*ny), a); + ffz = rosz((nx+dt*fx), (nz+dt*nz), b, c); + + nx += (dt2*(fx+ffx)); + ny += (dt2*(fy+ffy)); + nz += (dt2*(fz+ffz)); + + ov[0] = nx; + ov[1] = ny; + ov[2] = nz; + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosStein.h b/src/physics/AChaosLib/AChaosStein.h new file mode 100644 index 00000000..096b7325 --- /dev/null +++ b/src/physics/AChaosLib/AChaosStein.h @@ -0,0 +1,44 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ +#pragma once +#include "AChaosBase.h" +#define pie 3.14159265358979323846 + +class AChaosStein : public AChaosBase { +public: + + REAL seed, lambda; + + AChaosStein(){} + ~AChaosStein(){} + + void setup(REAL * params = NULL){ + + AChaosBase::setup(params, 2, 1); + if(params==NULL){ + //init + seed = 0.777f; + lambda = 1.7f; + + REAL p[2] = {seed, lambda}; + set(p); + } else { set(params); } + } + + + void reset(){ + seed = iv[0]; + lambda = iv[1]; + } + + void calc(){ + seed = lambda * SIN(pie*seed); + + ov[0] = seed; + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosStein1.h b/src/physics/AChaosLib/AChaosStein1.h new file mode 100644 index 00000000..de986a4b --- /dev/null +++ b/src/physics/AChaosLib/AChaosStein1.h @@ -0,0 +1,42 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ +#pragma once +#include "AChaosBase.h" +#define pie 3.14159265358979323846 +class AChaosStein1 : public AChaosBase { +public: + + REAL seed, lambda; + + AChaosStein1(){} + ~AChaosStein1(){} + + void setup(REAL * params = NULL){ + + AChaosBase::setup(params, 2, 1); + if(params==NULL){ + //init + seed = 0.87f; + lambda = 2.25f; + + REAL p[2] = {seed, lambda}; + set(p); + } else { set(params); } + } + + void reset(){ + seed = iv[0]; + lambda = iv[1]; + } + + void calc(){ + seed = lambda * seed * seed * SIN(pie*seed); + + ov[0] = seed; + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosTorus.h b/src/physics/AChaosLib/AChaosTorus.h new file mode 100644 index 00000000..c6a35939 --- /dev/null +++ b/src/physics/AChaosLib/AChaosTorus.h @@ -0,0 +1,48 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ +#pragma once +#include "AChaosBase.h" +#define pi 3.14159265358979323846264338327950288419716939937510f +#define twopi 2.*pi +class AChaosTorus : public AChaosBase { +public: + + REAL x0, y0, cr; + + AChaosTorus(){} + ~AChaosTorus(){} + + void setup(REAL * params = NULL){ + + AChaosBase::setup(params, 3, 2); + if(params==NULL){ + //init + x0 = 0.777f; + y0 = 1.2f; + cr = 1.26f; + + REAL p[3] = {x0,y0,cr}; + set(p); + } else { set(params); } + + } + + void reset(){ + x0 = iv[0]; + y0 = iv[1]; + cr = iv[2]; + } + + void calc(){ + x0 = fmodf((x0+cr*SIN(y0)), twopi); + y0 = fmodf((x0+y0), twopi); + + ov[0] = x0; + ov[1] = y0; + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosVerhulst.h b/src/physics/AChaosLib/AChaosVerhulst.h new file mode 100644 index 00000000..131c9fcf --- /dev/null +++ b/src/physics/AChaosLib/AChaosVerhulst.h @@ -0,0 +1,44 @@ +/* + 32/64 bits A-Chaos Lib in openFrameworks + (c) s373.net/x 2004, 2012, 2015 + http://s373.net/code/A-Chaos-Lib/A-Chaos.html + programmed by Andre Sier, revised 2015 + License: MIT +*/ +#pragma once +#include "AChaosBase.h" + +class AChaosVerhulst : public AChaosBase { +public: + + REAL seed, lambda; + + AChaosVerhulst(){} + ~AChaosVerhulst(){} + + void setup(REAL * params = NULL){ + + AChaosBase::setup(params, 2, 1); + if(params==NULL){ + //init + seed = 0.5f; + lambda = 2.89f; + + REAL p[2] = {seed,lambda}; + set(p); + } else { set(params); } + + + } + + void reset(){ + seed = iv[0]; + lambda = iv[1]; + } + + void calc(){ + seed = seed + (seed * lambda * (1.0-seed)); + + ov[0] = seed; + } +}; \ No newline at end of file diff --git a/src/physics/AChaosLib/AChaosVisualizer.h b/src/physics/AChaosLib/AChaosVisualizer.h new file mode 100644 index 00000000..1ee62738 --- /dev/null +++ b/src/physics/AChaosLib/AChaosVisualizer.h @@ -0,0 +1,85 @@ +// +// AChaosVisualizer.h +// +// Created by andré sier on 20151021. +// +// Updated by n3m3da on 2025 +// + +#pragma once + +#include "AChaosBase.h" + +class AChaosChannel { +public: + REAL min, max; + std::vector mystory; + int planets = 512; + AChaosChannel(){ + min = 1e10; + max = -1e10; + mystory.clear(); + } + void setPlanets(int p){ + planets = p; + } + void update(REAL val){ + if(val < min) min = val; + if(val > max) max = val; + mystory.push_back(val); + if(mystory.size()>planets){ + mystory.erase(mystory.begin()); + } + } +}; + +class AChaosVisualizer { +public: + + AChaosBase *obj; + std::vector channels; + int n; + + void setup(AChaosBase *ptr){ + obj = ptr; + n=obj->ov.size(); + for(int i=0; i Date: Tue, 15 Apr 2025 19:35:22 +0100 Subject: [PATCH 09/21] added OrderedMap class, original code from Memo Akten, updated for ofxVP --- src/core/ofxVPOrderedMap.h | 277 +++++++++++++++++++++++++++++++++++++ 1 file changed, 277 insertions(+) create mode 100644 src/core/ofxVPOrderedMap.h diff --git a/src/core/ofxVPOrderedMap.h b/src/core/ofxVPOrderedMap.h new file mode 100644 index 00000000..efbea35a --- /dev/null +++ b/src/core/ofxVPOrderedMap.h @@ -0,0 +1,277 @@ +// __ +// ____ ___ ___ ____ ___ ____ / /__ __ +// / __ `__ \/ _ \/ __ `__ \/ __ \ / __/ | / / +// / / / / / / __/ / / / / / /_/ // /_ | |/ / +// /_/ /_/ /_/\___/_/ /_/ /_/\____(_)__/ |___/ +// +// +// Created by Memo Akten, www.memo.tv +// +// acts like a std::map, but preserves order of insertion +// +// Original code by Memo Akten, updated for ofxVP +// +// Use it with std::shared_ptr: +// +// Ex. ofxVP::OrderedMap > patchObjects; + +#pragma once + +#include "ofMain.h" + +namespace ofxVP { + +template +class OrderedMap { + +public: + + // get size + int size() const; + + // add new item + // item will be cloned, stored internally and added to an stl::map and stl::vector as a pointer + // if T is shared_ptr, ownership is taken care of automatically by shared_ptr + // returns a reference to the new object added + T& push_back(const keyType& key, const T& t); + + // return reference to the stored object + // throws an exception of the index or key doesn't exist + T& at(int index); // get by index + const T& at(int index) const; // get by index + + T& at(const keyType& key); // get by key + const T& at(const keyType& key) const; // get by key + + // [] operator overloads for above + // these also throw an exception if the index or key doesn't exist + T& operator[](int index); // get by index + const T& operator[](int index) const; + + T& operator[](const keyType& key); // get by key + const T& operator[](const keyType& key) const; + + // get the key for item at index. returns blank if doesn't exist + keyType keyFor(int index) const; + + // get the index for item with key. returns -ve if doesn't exist + int indexFor(const keyType& key) const; + + // see if key exists + bool exists(const keyType& key) const; + + // check if the stored object is null + bool checkNullptr(const T& t) const; + + // change key + void changeKey(int index, const keyType& newKey); + void changeKey(const keyType& oldKey, const keyType& newKey); + + // erase by key or index + void erase(int index); + void erase(const keyType& key); + + // clear + void clear(); + + + // ADVANCED + // if you know the index and the key + // fast erase without any validity checks + void fastErase(int index, const keyType& key); + +private: + std::map > _map; // the actual data is stored here, along with index in vector + std::vector< keyType > _vector; // vector of keys (to store the order) + + void validateIndex(int index, std::string errorMessage) const; + void validateKey(const keyType& key, std::string errorMessage) const; + + // if something is erased, the indices in the map need to be updated + void updateMapIndices(); + +}; + +//-------------------------------------------------------------- +template +void OrderedMap::clear() { + _vector.clear(); + _map.clear(); +} + +//-------------------------------------------------------------- +template +int OrderedMap::size() const { + // if these aren't equal, something went wrong somewhere. + if(_map.size() != _vector.size()) throw runtime_error("ofxVP::OrderedMap::size() - map size doesn't equal vector size"); + return _vector.size(); +} + +//-------------------------------------------------------------- +template +T& OrderedMap::push_back(const keyType& key, const T& t) { + if(exists(key)) { + throw invalid_argument("ofxVP::OrderedMap::push_back(keyType, T&) - key already exists"); + return at(key); + } else { + _map[key] = make_pair(t, _vector.size()); + _vector.push_back(key); + size(); // to validate if correctly added to both containers, should be ok + return at(key); + } +} + +//-------------------------------------------------------------- +template +T& OrderedMap::at(int index) { + validateIndex(index, "ofxVP::OrderedMap::at(int)"); + return at(_vector[index]); +} + +//-------------------------------------------------------------- +template +const T& OrderedMap::at(int index) const { + validateIndex(index, "ofxVP::OrderedMap::at(int)"); + return at(_vector[index]); +} + +//-------------------------------------------------------------- +template +T& OrderedMap::at(const keyType& key) { + validateKey(key, "ofxVP::OrderedMap::at(keyType)"); + return _map.at(key).first; +} + +//-------------------------------------------------------------- +template +const T& OrderedMap::at(const keyType& key) const { + validateKey(key, "ofxVP::OrderedMap::at(keyType)"); + return _map.at(key).first; +} + +//-------------------------------------------------------------- +template +T& OrderedMap::operator[](int index) { + return at(index); +} + +//-------------------------------------------------------------- +template +const T& OrderedMap::operator[](int index) const { + return at(index); +} + +//-------------------------------------------------------------- +template +T& OrderedMap::operator[](const keyType& key) { + return at(key); +} + +//-------------------------------------------------------------- +template +const T& OrderedMap::operator[](const keyType& key) const { + return at(key); +} + +//-------------------------------------------------------------- +template +keyType OrderedMap::keyFor(int index) const { + validateIndex(index, "ofxVP::OrderedMap::keyFor(int)"); + return _vector[index]; +} + +//-------------------------------------------------------------- +template +int OrderedMap::indexFor(const keyType& key) const { + validateKey(key, "ofxVP::OrderedMap::indexFor(keyType)"); + return _map.at(key).second; +} + +//-------------------------------------------------------------- +template +void OrderedMap::changeKey(int index, const keyType& newKey) { + validateIndex(index, "ofxVP::OrderedMap::changeKey(int)"); + changeKey(keyFor(index), newKey); +} + +//-------------------------------------------------------------- +template +void OrderedMap::changeKey(const keyType& oldKey, const keyType& newKey) { + validateKey(oldKey, "ofxVP::OrderedMap::changeKey(keyType)"); + + // save temp copy + auto t = _map[oldKey]; + + // erase from map, and reinsert + _map.erase(oldKey); + _map[newKey] = t; + + // change key from the vector + _vector.at(t.second) = newKey; +} + +//-------------------------------------------------------------- +template +void OrderedMap::erase(int index) { + validateIndex(index, "ofxVP::OrderedMap::erase(int)"); + fastErase(index, keyFor(index)); + size(); // validate map and vector have same sizes to make sure everything worked alright +} + +//-------------------------------------------------------------- +template +void OrderedMap::erase(const keyType& key) { + validateKey(key, "ofxVP::OrderedMap::erase(keyType)"); + fastErase(indexFor(key), key); + size(); // validate map and vector have same sizes to make sure everything worked alright +} + + +//-------------------------------------------------------------- +template +void OrderedMap::fastErase(int index, const keyType& key) { + _map.erase(key); + _vector.erase(_vector.begin() + index); + updateMapIndices(); +} + + +//-------------------------------------------------------------- +template +bool OrderedMap::exists(const keyType& key) const { + return _map.find(key) != _map.end(); +} + +//-------------------------------------------------------------- +template +bool OrderedMap::checkNullptr(const T& t) const { + return t == nullptr; +} + +//-------------------------------------------------------------- +template +void OrderedMap::validateIndex(int index, std::string errorMessage) const { + #ifdef OFXVP_DEBUG + if(index<0 || index >= _vector.size()) throw invalid_argument(errorMessage + " - index doesn't exist"); + #endif +} + +//-------------------------------------------------------------- +template +void OrderedMap::validateKey(const keyType& key, std::string errorMessage) const { + #ifdef OFXVP_DEBUG + if(!exists(key)) throw invalid_argument(errorMessage + " - key doesn't exist"); + #endif +} + +//-------------------------------------------------------------- +template +void OrderedMap::updateMapIndices() { + for(int i=0; i<_vector.size(); i++) { + const keyType& key = _vector[i]; + _map[key].second = i; + } +} + + +} // End namespace ofxVP From 9e35c061dc74c3930088337f3146cbfd4d49ef98 Mon Sep 17 00:00:00 2001 From: d3cod3 Date: Tue, 15 Apr 2025 19:35:41 +0100 Subject: [PATCH 10/21] reordering files --- src/core/{ => imgui}/FileBrowser/ImGuiFileBrowser.cpp | 0 src/core/{ => imgui}/FileBrowser/ImGuiFileBrowser.h | 0 src/core/{ => imgui}/FileBrowser/dirent_win.h | 0 src/core/{ => imgui}/IconsFontAwesome5.h | 0 src/core/{ => imgui}/imgui-knobs.cpp | 0 src/core/{ => imgui}/imgui-knobs.h | 0 src/core/{ => imgui}/imgui_controls.cpp | 0 src/core/{ => imgui}/imgui_controls.h | 0 src/core/{ => imgui}/imgui_helpers.h | 0 src/core/{ => imgui}/imgui_node_canvas.cpp | 0 src/core/{ => imgui}/imgui_node_canvas.h | 0 src/core/{ => imgui}/imgui_plot.cpp | 0 src/core/{ => imgui}/imgui_plot.h | 0 src/core/{ => imgui}/imgui_profiler.h | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename src/core/{ => imgui}/FileBrowser/ImGuiFileBrowser.cpp (100%) rename src/core/{ => imgui}/FileBrowser/ImGuiFileBrowser.h (100%) rename src/core/{ => imgui}/FileBrowser/dirent_win.h (100%) rename src/core/{ => imgui}/IconsFontAwesome5.h (100%) rename src/core/{ => imgui}/imgui-knobs.cpp (100%) rename src/core/{ => imgui}/imgui-knobs.h (100%) rename src/core/{ => imgui}/imgui_controls.cpp (100%) rename src/core/{ => imgui}/imgui_controls.h (100%) rename src/core/{ => imgui}/imgui_helpers.h (100%) rename src/core/{ => imgui}/imgui_node_canvas.cpp (100%) rename src/core/{ => imgui}/imgui_node_canvas.h (100%) rename src/core/{ => imgui}/imgui_plot.cpp (100%) rename src/core/{ => imgui}/imgui_plot.h (100%) rename src/core/{ => imgui}/imgui_profiler.h (100%) diff --git a/src/core/FileBrowser/ImGuiFileBrowser.cpp b/src/core/imgui/FileBrowser/ImGuiFileBrowser.cpp similarity index 100% rename from src/core/FileBrowser/ImGuiFileBrowser.cpp rename to src/core/imgui/FileBrowser/ImGuiFileBrowser.cpp diff --git a/src/core/FileBrowser/ImGuiFileBrowser.h b/src/core/imgui/FileBrowser/ImGuiFileBrowser.h similarity index 100% rename from src/core/FileBrowser/ImGuiFileBrowser.h rename to src/core/imgui/FileBrowser/ImGuiFileBrowser.h diff --git a/src/core/FileBrowser/dirent_win.h b/src/core/imgui/FileBrowser/dirent_win.h similarity index 100% rename from src/core/FileBrowser/dirent_win.h rename to src/core/imgui/FileBrowser/dirent_win.h diff --git a/src/core/IconsFontAwesome5.h b/src/core/imgui/IconsFontAwesome5.h similarity index 100% rename from src/core/IconsFontAwesome5.h rename to src/core/imgui/IconsFontAwesome5.h diff --git a/src/core/imgui-knobs.cpp b/src/core/imgui/imgui-knobs.cpp similarity index 100% rename from src/core/imgui-knobs.cpp rename to src/core/imgui/imgui-knobs.cpp diff --git a/src/core/imgui-knobs.h b/src/core/imgui/imgui-knobs.h similarity index 100% rename from src/core/imgui-knobs.h rename to src/core/imgui/imgui-knobs.h diff --git a/src/core/imgui_controls.cpp b/src/core/imgui/imgui_controls.cpp similarity index 100% rename from src/core/imgui_controls.cpp rename to src/core/imgui/imgui_controls.cpp diff --git a/src/core/imgui_controls.h b/src/core/imgui/imgui_controls.h similarity index 100% rename from src/core/imgui_controls.h rename to src/core/imgui/imgui_controls.h diff --git a/src/core/imgui_helpers.h b/src/core/imgui/imgui_helpers.h similarity index 100% rename from src/core/imgui_helpers.h rename to src/core/imgui/imgui_helpers.h diff --git a/src/core/imgui_node_canvas.cpp b/src/core/imgui/imgui_node_canvas.cpp similarity index 100% rename from src/core/imgui_node_canvas.cpp rename to src/core/imgui/imgui_node_canvas.cpp diff --git a/src/core/imgui_node_canvas.h b/src/core/imgui/imgui_node_canvas.h similarity index 100% rename from src/core/imgui_node_canvas.h rename to src/core/imgui/imgui_node_canvas.h diff --git a/src/core/imgui_plot.cpp b/src/core/imgui/imgui_plot.cpp similarity index 100% rename from src/core/imgui_plot.cpp rename to src/core/imgui/imgui_plot.cpp diff --git a/src/core/imgui_plot.h b/src/core/imgui/imgui_plot.h similarity index 100% rename from src/core/imgui_plot.h rename to src/core/imgui/imgui_plot.h diff --git a/src/core/imgui_profiler.h b/src/core/imgui/imgui_profiler.h similarity index 100% rename from src/core/imgui_profiler.h rename to src/core/imgui/imgui_profiler.h From 0d3c173c04302aae55f41874796e2f8ba4795897 Mon Sep 17 00:00:00 2001 From: d3cod3 Date: Tue, 15 Apr 2025 20:10:00 +0100 Subject: [PATCH 11/21] added std:: for readability --- src/PatchObject.cpp | 60 +++--- src/PatchObject.h | 126 ++++++------- src/ThreadedCommand.h | 2 +- src/objects/audio_analysis/AudioAnalyzer.cpp | 2 +- src/objects/audio_analysis/AudioAnalyzer.h | 2 +- src/objects/audio_analysis/BPMExtractor.cpp | 4 +- src/objects/audio_analysis/BPMExtractor.h | 2 +- src/objects/audio_analysis/FftExtractor.cpp | 4 +- src/objects/audio_analysis/FftExtractor.h | 2 +- .../audio_analysis/MelBandsExtractor.cpp | 4 +- .../audio_analysis/MelBandsExtractor.h | 2 +- src/objects/audio_analysis/PitchExtractor.cpp | 4 +- src/objects/audio_analysis/PitchExtractor.h | 2 +- src/objects/audio_analysis/RMSExtractor.cpp | 4 +- src/objects/audio_analysis/RMSExtractor.h | 2 +- src/objects/communications/ArduinoSerial.cpp | 2 +- src/objects/communications/ArduinoSerial.h | 2 +- src/objects/communications/KeyPressed.cpp | 2 +- src/objects/communications/KeyPressed.h | 2 +- src/objects/communications/KeyReleased.cpp | 2 +- src/objects/communications/KeyReleased.h | 2 +- src/objects/communications/MidiKey.cpp | 2 +- src/objects/communications/MidiKey.h | 2 +- src/objects/communications/MidiKnob.cpp | 2 +- src/objects/communications/MidiKnob.h | 2 +- src/objects/communications/MidiPad.cpp | 2 +- src/objects/communications/MidiPad.h | 2 +- src/objects/communications/MidiReceiver.cpp | 2 +- src/objects/communications/MidiReceiver.h | 2 +- src/objects/communications/MidiSender.cpp | 2 +- src/objects/communications/MidiSender.h | 2 +- src/objects/communications/OscReceiver.cpp | 2 +- src/objects/communications/OscReceiver.h | 2 +- src/objects/communications/OscSender.cpp | 2 +- src/objects/communications/OscSender.h | 2 +- .../computer_vision/BackgroundSubtraction.cpp | 2 +- .../computer_vision/BackgroundSubtraction.h | 2 +- src/objects/computer_vision/ColorTracking.cpp | 2 +- src/objects/computer_vision/ColorTracking.h | 2 +- .../computer_vision/ContourTracking.cpp | 2 +- src/objects/computer_vision/ContourTracking.h | 2 +- src/objects/computer_vision/HaarTracking.cpp | 2 +- src/objects/computer_vision/HaarTracking.h | 2 +- .../computer_vision/MotionDetection.cpp | 2 +- src/objects/computer_vision/MotionDetection.h | 2 +- src/objects/computer_vision/OpticalFlow.cpp | 2 +- src/objects/computer_vision/OpticalFlow.h | 2 +- src/objects/data/BangMultiplexer.cpp | 2 +- src/objects/data/BangMultiplexer.h | 2 +- src/objects/data/BangToFloat.cpp | 2 +- src/objects/data/BangToFloat.h | 2 +- src/objects/data/DataToFile.cpp | 2 +- src/objects/data/DataToFile.h | 2 +- src/objects/data/DataToTexture.cpp | 2 +- src/objects/data/DataToTexture.h | 2 +- src/objects/data/FileToData.cpp | 2 +- src/objects/data/FileToData.h | 2 +- src/objects/data/FloatMultiplexer.cpp | 2 +- src/objects/data/FloatMultiplexer.h | 2 +- src/objects/data/FloatsToVector.cpp | 2 +- src/objects/data/FloatsToVector.h | 2 +- src/objects/data/Receiver.cpp | 4 +- src/objects/data/Receiver.h | 2 +- src/objects/data/Sender.cpp | 4 +- src/objects/data/Sender.h | 2 +- src/objects/data/TextureToData.cpp | 2 +- src/objects/data/TextureToData.h | 2 +- src/objects/data/VectorAt.cpp | 2 +- src/objects/data/VectorAt.h | 2 +- src/objects/data/VectorConcat.cpp | 2 +- src/objects/data/VectorConcat.h | 2 +- src/objects/data/VectorExtract.cpp | 2 +- src/objects/data/VectorExtract.h | 2 +- src/objects/data/VectorGate.cpp | 2 +- src/objects/data/VectorGate.h | 2 +- src/objects/data/VectorOperator.cpp | 2 +- src/objects/data/VectorOperator.h | 2 +- src/objects/graphics/ColorPalette.cpp | 2 +- src/objects/graphics/ColorPalette.h | 2 +- src/objects/graphics/ImageExporter.cpp | 2 +- src/objects/graphics/ImageExporter.h | 2 +- src/objects/graphics/ImageLoader.cpp | 2 +- src/objects/graphics/ImageLoader.h | 2 +- src/objects/gui/mo2DPad.cpp | 2 +- src/objects/gui/mo2DPad.h | 2 +- src/objects/gui/moBang.cpp | 2 +- src/objects/gui/moBang.h | 2 +- src/objects/gui/moComment.cpp | 2 +- src/objects/gui/moComment.h | 2 +- src/objects/gui/moDataViewer.cpp | 2 +- src/objects/gui/moDataViewer.h | 2 +- src/objects/gui/moMessage.cpp | 2 +- src/objects/gui/moMessage.h | 2 +- src/objects/gui/moMultiSlider.cpp | 2 +- src/objects/gui/moMultiSlider.h | 2 +- src/objects/gui/moMultiToggle.cpp | 2 +- src/objects/gui/moMultiToggle.h | 2 +- src/objects/gui/moPianoKeyboard.cpp | 2 +- src/objects/gui/moPianoKeyboard.h | 2 +- src/objects/gui/moPlayerControls.cpp | 2 +- src/objects/gui/moPlayerControls.h | 2 +- src/objects/gui/moSignalViewer.cpp | 2 +- src/objects/gui/moSignalViewer.h | 2 +- src/objects/gui/moSlider.cpp | 2 +- src/objects/gui/moSlider.h | 2 +- src/objects/gui/moSonogram.cpp | 2 +- src/objects/gui/moSonogram.h | 2 +- src/objects/gui/moTimeline.cpp | 2 +- src/objects/gui/moTimeline.h | 2 +- src/objects/gui/moTrigger.cpp | 2 +- src/objects/gui/moTrigger.h | 2 +- src/objects/gui/moVUMeter.cpp | 2 +- src/objects/gui/moVUMeter.h | 2 +- src/objects/gui/moValuePlotter.cpp | 2 +- src/objects/gui/moValuePlotter.h | 2 +- src/objects/gui/moVideoViewer.cpp | 2 +- src/objects/gui/moVideoViewer.h | 2 +- src/objects/logic/BooleanOperator.cpp | 2 +- src/objects/logic/BooleanOperator.h | 2 +- src/objects/logic/Conditional.cpp | 2 +- src/objects/logic/Conditional.h | 2 +- src/objects/logic/Counter.cpp | 2 +- src/objects/logic/Counter.h | 2 +- src/objects/logic/DelayBang.cpp | 2 +- src/objects/logic/DelayBang.h | 2 +- src/objects/logic/DelayFloat.cpp | 2 +- src/objects/logic/DelayFloat.h | 2 +- src/objects/logic/Gate.cpp | 2 +- src/objects/logic/Gate.h | 2 +- src/objects/logic/Inverter.cpp | 2 +- src/objects/logic/Inverter.h | 2 +- src/objects/logic/LoadBang.cpp | 2 +- src/objects/logic/LoadBang.h | 2 +- src/objects/logic/Spigot.cpp | 2 +- src/objects/logic/Spigot.h | 2 +- src/objects/logic/TimedSemaphore.cpp | 2 +- src/objects/logic/TimedSemaphore.h | 2 +- src/objects/math/Clamp.cpp | 2 +- src/objects/math/Clamp.h | 2 +- src/objects/math/Constant.cpp | 2 +- src/objects/math/Constant.h | 2 +- src/objects/math/CosineGenerator.cpp | 2 +- src/objects/math/CosineGenerator.h | 2 +- src/objects/math/Map.cpp | 2 +- src/objects/math/Map.h | 2 +- src/objects/math/Metronome.cpp | 2 +- src/objects/math/Metronome.h | 2 +- src/objects/math/NumberOperator.cpp | 2 +- src/objects/math/NumberOperator.h | 2 +- src/objects/math/SimpleNoise.cpp | 2 +- src/objects/math/SimpleNoise.h | 2 +- src/objects/math/SimpleRandom.cpp | 2 +- src/objects/math/SimpleRandom.h | 2 +- src/objects/math/SineGenerator.cpp | 2 +- src/objects/math/SineGenerator.h | 2 +- src/objects/math/Smooth.cpp | 2 +- src/objects/math/Smooth.h | 2 +- src/objects/scripting/BashScript.cpp | 2 +- src/objects/scripting/BashScript.h | 2 +- src/objects/scripting/LuaScript.cpp | 2 +- src/objects/scripting/LuaScript.h | 2 +- src/objects/scripting/SchemeScript.cpp | 2 +- src/objects/scripting/SchemeScript.h | 2 +- src/objects/scripting/ShaderObject.cpp | 4 +- src/objects/scripting/ShaderObject.h | 2 +- src/objects/sound/AudioDevice.cpp | 2 +- src/objects/sound/AudioDevice.h | 2 +- src/objects/sound/AudioExporter.cpp | 2 +- src/objects/sound/AudioExporter.h | 2 +- src/objects/sound/AudioGate.cpp | 2 +- src/objects/sound/AudioGate.h | 2 +- src/objects/sound/Crossfader.cpp | 2 +- src/objects/sound/Crossfader.h | 2 +- src/objects/sound/FrequencyToNote.cpp | 2 +- src/objects/sound/FrequencyToNote.h | 2 +- src/objects/sound/Mixer.cpp | 2 +- src/objects/sound/Mixer.h | 2 +- src/objects/sound/NoteToFrequency.cpp | 2 +- src/objects/sound/NoteToFrequency.h | 2 +- src/objects/sound/Oscillator.cpp | 2 +- src/objects/sound/Oscillator.h | 2 +- src/objects/sound/PDPatch.cpp | 2 +- src/objects/sound/PDPatch.h | 2 +- src/objects/sound/Panner.cpp | 2 +- src/objects/sound/Panner.h | 2 +- src/objects/sound/PolyphonicOscillator.cpp | 2 +- src/objects/sound/PolyphonicOscillator.h | 2 +- src/objects/sound/QuadPanner.cpp | 2 +- src/objects/sound/QuadPanner.h | 2 +- src/objects/sound/Quantizer.cpp | 2 +- src/objects/sound/Quantizer.h | 2 +- src/objects/sound/SamplePlayer.cpp | 2 +- src/objects/sound/SamplePlayer.h | 2 +- src/objects/sound/SigMult.cpp | 2 +- src/objects/sound/SigMult.h | 2 +- src/objects/sound/SignalOperator.cpp | 2 +- src/objects/sound/SignalOperator.h | 2 +- src/objects/sound/SignalTrigger.cpp | 2 +- src/objects/sound/SignalTrigger.h | 2 +- src/objects/sound/SoundfilePlayer.cpp | 2 +- src/objects/sound/SoundfilePlayer.h | 2 +- src/objects/sound/SummingMixer.cpp | 2 +- src/objects/sound/SummingMixer.h | 2 +- src/objects/sound/pdspADSR.cpp | 2 +- src/objects/sound/pdspADSR.h | 2 +- src/objects/sound/pdspAHR.cpp | 2 +- src/objects/sound/pdspAHR.h | 2 +- src/objects/sound/pdspAddressSequencer.cpp | 2 +- src/objects/sound/pdspAddressSequencer.h | 2 +- src/objects/sound/pdspBitCruncher.cpp | 2 +- src/objects/sound/pdspBitCruncher.h | 2 +- src/objects/sound/pdspBitNoise.cpp | 2 +- src/objects/sound/pdspBitNoise.h | 2 +- src/objects/sound/pdspChorusEffect.cpp | 2 +- src/objects/sound/pdspChorusEffect.h | 2 +- src/objects/sound/pdspCombFilter.cpp | 2 +- src/objects/sound/pdspCombFilter.h | 2 +- src/objects/sound/pdspCompressor.cpp | 2 +- src/objects/sound/pdspCompressor.h | 2 +- src/objects/sound/pdspDataOscillator.cpp | 2 +- src/objects/sound/pdspDataOscillator.h | 2 +- src/objects/sound/pdspDecimator.cpp | 2 +- src/objects/sound/pdspDecimator.h | 2 +- src/objects/sound/pdspDelay.cpp | 2 +- src/objects/sound/pdspDelay.h | 2 +- src/objects/sound/pdspDucker.cpp | 2 +- src/objects/sound/pdspDucker.h | 2 +- src/objects/sound/pdspHiCut.cpp | 2 +- src/objects/sound/pdspHiCut.h | 2 +- src/objects/sound/pdspKick.cpp | 2 +- src/objects/sound/pdspKick.h | 2 +- src/objects/sound/pdspLFO.cpp | 2 +- src/objects/sound/pdspLFO.h | 2 +- src/objects/sound/pdspLowCut.cpp | 2 +- src/objects/sound/pdspLowCut.h | 2 +- src/objects/sound/pdspParametricEQ.cpp | 2 +- src/objects/sound/pdspParametricEQ.h | 2 +- src/objects/sound/pdspResonant2PoleFilter.cpp | 2 +- src/objects/sound/pdspResonant2PoleFilter.h | 2 +- src/objects/sound/pdspReverb.cpp | 2 +- src/objects/sound/pdspReverb.h | 2 +- src/objects/sound/pdspSequencer.cpp | 2 +- src/objects/sound/pdspSequencer.h | 2 +- src/objects/string/RandomString.cpp | 2 +- src/objects/string/RandomString.h | 2 +- src/objects/string/StringAt.cpp | 2 +- src/objects/string/StringAt.h | 2 +- src/objects/string/StringConcat.cpp | 2 +- src/objects/string/StringConcat.h | 2 +- src/objects/string/StringExtract.cpp | 2 +- src/objects/string/StringExtract.h | 2 +- src/objects/string/StringGate.cpp | 2 +- src/objects/string/StringGate.h | 2 +- src/objects/string/StringMultiplexer.cpp | 2 +- src/objects/string/StringMultiplexer.h | 2 +- src/objects/surface/FboComposer.cpp | 2 +- src/objects/surface/FboComposer.h | 2 +- src/objects/surface/FboEffect.cpp | 2 +- src/objects/surface/FboEffect.h | 2 +- src/objects/surface/FboParticles.cpp | 2 +- src/objects/surface/FboParticles.h | 2 +- src/objects/video/KinectGrabber.cpp | 2 +- src/objects/video/KinectGrabber.h | 2 +- src/objects/video/PixelsToTexture.cpp | 2 +- src/objects/video/PixelsToTexture.h | 2 +- src/objects/video/TextureInformation.cpp | 2 +- src/objects/video/TextureInformation.h | 2 +- src/objects/video/TextureToPixels.cpp | 2 +- src/objects/video/TextureToPixels.h | 2 +- src/objects/video/ToGrayScaleTexture.cpp | 2 +- src/objects/video/ToGrayScaleTexture.h | 2 +- src/objects/video/VideoCrop.cpp | 2 +- src/objects/video/VideoCrop.h | 2 +- src/objects/video/VideoDelay.cpp | 2 +- src/objects/video/VideoDelay.h | 2 +- src/objects/video/VideoExporter.cpp | 2 +- src/objects/video/VideoExporter.h | 2 +- src/objects/video/VideoGate.cpp | 2 +- src/objects/video/VideoGate.h | 2 +- src/objects/video/VideoGrabber.cpp | 2 +- src/objects/video/VideoGrabber.h | 2 +- src/objects/video/VideoMixer.cpp | 2 +- src/objects/video/VideoMixer.h | 2 +- src/objects/video/VideoPlayer.cpp | 2 +- src/objects/video/VideoPlayer.h | 2 +- src/objects/video/VideoStreaming.cpp | 2 +- src/objects/video/VideoStreaming.h | 2 +- src/objects/video/VideoTimelapse.cpp | 2 +- src/objects/video/VideoTimelapse.h | 2 +- src/objects/video/VideoTransform.cpp | 2 +- src/objects/video/VideoTransform.h | 2 +- src/objects/windowing/LivePatching.cpp | 2 +- src/objects/windowing/LivePatching.h | 2 +- src/objects/windowing/OutputWindow.cpp | 6 +- src/objects/windowing/OutputWindow.h | 2 +- src/objects/windowing/ProjectionMapping.cpp | 2 +- src/objects/windowing/ProjectionMapping.h | 2 +- src/ofxVisualProgramming.cpp | 174 +++++++++--------- src/ofxVisualProgramming.h | 80 ++++---- src/utils.h | 6 +- 300 files changed, 528 insertions(+), 528 deletions(-) diff --git a/src/PatchObject.cpp b/src/PatchObject.cpp index 98b3b813..399f222c 100644 --- a/src/PatchObject.cpp +++ b/src/PatchObject.cpp @@ -93,7 +93,7 @@ PatchObject::~PatchObject(){ } //-------------------------------------------------------------- -void PatchObject::setup(shared_ptr &mainWindow){ +void PatchObject::setup(std::shared_ptr &mainWindow){ // init vars for(int i=0;i(inletsType.size());i++){ @@ -142,7 +142,7 @@ void PatchObject::setupDSP(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void PatchObject::update(map> &patchObjects, pdsp::Engine &engine){ +void PatchObject::update(std::map> &patchObjects, pdsp::Engine &engine){ if(willErase) return; @@ -197,12 +197,12 @@ void PatchObject::update(map> &patchObjects, pdsp::E } //-------------------------------------------------------------- -void PatchObject::updateWirelessLinks(map> &patchObjects){ +void PatchObject::updateWirelessLinks(std::map> &patchObjects){ if(willErase) return; // Continuosly update float type ONLY wireless links - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ for(int in=0;insecond->getNumInlets();in++){ for(int out=0;outgetNumOutlets();out++){ @@ -223,7 +223,7 @@ void PatchObject::updateWirelessLinks(map> &patchObj if(initWirelessLink && resetWirelessPin != -1){ initWirelessLink = false; if(this->getOutletWirelessSend(resetWirelessPin)){ - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ for(int in=0;insecond->getNumInlets();in++){ if(this->getOutletType(resetWirelessPin) == it->second->getInletType(in) && this->getOutletID(resetWirelessPin) == it->second->getInletID(in) && it->second->getInletWirelessReceive(in)){ @@ -247,7 +247,7 @@ void PatchObject::updateWirelessLinks(map> &patchObj // Manually close wireless link from internal object code ( GUI ) if(resetWirelessLink && resetWirelessPin != -1){ resetWirelessLink = false; - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ if(this->getId() != it->first){ for(int in=0;insecond->getNumInlets();in++){ @@ -274,12 +274,12 @@ void PatchObject::draw(ofTrueTypeFont *font){ if(willErase) return; // Draw the specific object content () - drawObjectContent(font,(shared_ptr&)ofGetCurrentRenderer()); + drawObjectContent(font,(std::shared_ptr&)ofGetCurrentRenderer()); } //-------------------------------------------------------------- -void PatchObject::drawImGuiNode(ImGuiEx::NodeCanvas& _nodeCanvas, map> &patchObjects){ +void PatchObject::drawImGuiNode(ImGuiEx::NodeCanvas& _nodeCanvas, std::map> &patchObjects){ if(willErase) return; @@ -298,7 +298,7 @@ void PatchObject::drawImGuiNode(ImGuiEx::NodeCanvas& _nodeCanvas, mapwidth, this->height ); // Begin Node - string displayName = ""; + std::string displayName = ""; if(this->getSpecialName() != ""){ displayName = PatchObject::getDisplayName()+" "+this->getSpecialName(); }else{ @@ -316,11 +316,11 @@ void PatchObject::drawImGuiNode(ImGuiEx::NodeCanvas& _nodeCanvas, map(inletsType.size());i++){ auto pinCol = getInletColor(i); - vector tempLinkData; + std::vector tempLinkData; // if connected, get link origin (outlet origin position and link id) if(inletsConnected[i]){ - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ for(int j=0;j(it->second->outPut.size());j++){ if(it->second->outPut[j]->toObjectID == nId && it->second->outPut[j]->toInletID == i){ @@ -383,7 +383,7 @@ void PatchObject::drawImGuiNode(ImGuiEx::NodeCanvas& _nodeCanvas, map tempLinkData; + std::vector tempLinkData; for(int j=0;j(outPut.size());j++){ if(!outPut[j]->isDisabled && outPut[j]->fromOutletID == i){ @@ -506,16 +506,16 @@ bool PatchObject::getIsOutletConnected(int oid){ //---------------------------------------------------------------------------------- PatchLinks utils //-------------------------------------------------------------- -bool PatchObject::connectTo(map> &patchObjects, int fromObjectID, int fromOutlet, int toInlet, int linkType){ +bool PatchObject::connectTo(std::map> &patchObjects, int fromObjectID, int fromOutlet, int toInlet, int linkType){ bool connected = false; if( (fromObjectID != -1) && (patchObjects[fromObjectID] != nullptr) && (fromObjectID!=this->getId()) && (this->getId() != -1) && (patchObjects[fromObjectID]->getOutletType(fromOutlet) == getInletType(toInlet)) && !inletsConnected[toInlet]){ //cout << "Mosaic :: "<< "Connect object " << getName().c_str() << ":" << ofToString(getId()) << " to object " << getName().c_str() << ":" << ofToString(this->getId()) << endl; - shared_ptr tempLink = shared_ptr(new PatchLink()); + std::shared_ptr tempLink = std::shared_ptr(new PatchLink()); - string tmpID = ofToString(fromObjectID)+ofToString(fromOutlet)+ofToString(this->getId())+ofToString(toInlet); + std::string tmpID = ofToString(fromObjectID)+ofToString(fromOutlet)+ofToString(this->getId())+ofToString(toInlet); tempLink->id = stoi(tmpID); tempLink->posFrom = patchObjects[fromObjectID]->getOutletPosition(fromOutlet); @@ -569,9 +569,9 @@ bool PatchObject::connectTo(map> &patchObjects, int } //-------------------------------------------------------------- -void PatchObject::disconnectFrom(map> &patchObjects, int objectInlet){ +void PatchObject::disconnectFrom(std::map> &patchObjects, int objectInlet){ - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ for(int j=0;j(it->second->outPut.size());j++){ if(it->second->outPut[j]->toObjectID == this->getId() && it->second->outPut[j]->toInletID == objectInlet){ @@ -585,7 +585,7 @@ void PatchObject::disconnectFrom(map> &patchObjects, } } - vector> tempBuffer; + std::vector> tempBuffer; tempBuffer.reserve(it->second->outPut.size()-tempEraseLinks.size()); for(int s=0;s(it->second->outPut.size());s++){ @@ -612,9 +612,9 @@ void PatchObject::disconnectFrom(map> &patchObjects, } //-------------------------------------------------------------- -void PatchObject::disconnectLink(map> &patchObjects, int linkID){ +void PatchObject::disconnectLink(std::map> &patchObjects, int linkID){ - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ for(int j=0;j(it->second->outPut.size());j++){ if(it->second->outPut[j]->id == linkID){ @@ -628,7 +628,7 @@ void PatchObject::disconnectLink(map> &patchObjects, } } - vector> tempBuffer; + std::vector> tempBuffer; tempBuffer.reserve(it->second->outPut.size()-tempEraseLinks.size()); for(int s=0;s(it->second->outPut.size());s++){ @@ -657,7 +657,7 @@ void PatchObject::disconnectLink(map> &patchObjects, //---------------------------------------------------------------------------------- LOAD/SAVE //-------------------------------------------------------------- -bool PatchObject::loadConfig(shared_ptr &mainWindow, pdsp::Engine &engine,int oTag, string &configFile){ +bool PatchObject::loadConfig(std::shared_ptr &mainWindow, pdsp::Engine &engine,int oTag, string &configFile){ patchFile = configFile; ofxVPXml.loadMosaicPatch(patchFile); @@ -853,7 +853,7 @@ bool PatchObject::clearCustomVars(){ //-------------------------------------------------------------- map PatchObject::loadCustomVars(){ - map tempVars; + std::map tempVars; if(patchFile != ""){ @@ -926,7 +926,7 @@ ofColor PatchObject::getOutletColor(const int& oid) const { } //-------------------------------------------------------------- -string PatchObject::getInletTypeName(const int& iid) const{ +std::string PatchObject::getInletTypeName(const int& iid) const{ switch( getInletType(iid) ) { case 0: return "float"; break; @@ -952,7 +952,7 @@ string PatchObject::getInletTypeName(const int& iid) const{ } //-------------------------------------------------------------- -string PatchObject::getOutletTypeName(const int& oid) const{ +std::string PatchObject::getOutletTypeName(const int& oid) const{ switch( getOutletType(oid) ) { case 0: return "float"; break; @@ -979,7 +979,7 @@ string PatchObject::getOutletTypeName(const int& oid) const{ //---------------------------------------------------------------------------------- SETTERS //-------------------------------------------------------------- -void PatchObject::setPatchfile(string pf) { +void PatchObject::setPatchfile(std::string pf) { patchFile = pf; ofxVPXml.loadMosaicPatch(patchFile); ofFile temp(patchFile); @@ -987,9 +987,9 @@ void PatchObject::setPatchfile(string pf) { if(filepath != "none"){ ofFile t2(filepath); if(t2.isDirectory()){ - string tst = filepath.substr(0, filepath.size()-1); + std::string tst = filepath.substr(0, filepath.size()-1); size_t needle = tst.find_last_of("/"); - string folderName = filepath.substr(needle+1); + std::string folderName = filepath.substr(needle+1); filepath = patchFolderPath+folderName; }else{ filepath = patchFolderPath+t2.getFileName(); @@ -1004,7 +1004,7 @@ void PatchObject::setPatchfile(string pf) { } //-------------------------------------------------------------- -void PatchObject::keyPressed(ofKeyEventArgs &e,map> &patchObjects){ +void PatchObject::keyPressed(ofKeyEventArgs &e,std::map> &patchObjects){ unusedArgs(patchObjects); if(!willErase){ @@ -1012,7 +1012,7 @@ void PatchObject::keyPressed(ofKeyEventArgs &e,map> } //-------------------------------------------------------------- -void PatchObject::keyReleased(ofKeyEventArgs &e,map> &patchObjects){ +void PatchObject::keyReleased(ofKeyEventArgs &e,std::map> &patchObjects){ if(!willErase){ // DELETE SELECTED OBJECTS if(e.key == OF_KEY_BACKSPACE){ diff --git a/src/PatchObject.h b/src/PatchObject.h index 5474ab96..099d253e 100644 --- a/src/PatchObject.h +++ b/src/PatchObject.h @@ -83,21 +83,21 @@ class PatchObject : public ofxVPHasUID { void setup(shared_ptr &mainWindow); void setupDSP(pdsp::Engine &engine); - void update(map> &patchObjects, pdsp::Engine &engine); - void updateWirelessLinks(map> &patchObjects); + void update(std::map> &patchObjects, pdsp::Engine &engine); + void updateWirelessLinks(std::map> &patchObjects); void draw(ofTrueTypeFont *font); - void drawImGuiNode(ImGuiEx::NodeCanvas& _nodeCanvas, map> &patchObjects); + void drawImGuiNode(ImGuiEx::NodeCanvas& _nodeCanvas, std::map> &patchObjects); void drawImGuiNodeConfig(); // Virtual Methods virtual void newObject() {} - virtual void autoloadFile(string _fp) { unusedArgs(_fp); } - virtual void autosaveNewFile(string fromFile) { unusedArgs(fromFile); } + virtual void autoloadFile(std::string _fp) { unusedArgs(_fp); } + virtual void autosaveNewFile(std::string fromFile) { unusedArgs(fromFile); } - virtual void setupObjectContent(shared_ptr &mainWindow) { unusedArgs(mainWindow); } + virtual void setupObjectContent(std::shared_ptr &mainWindow) { unusedArgs(mainWindow); } virtual void setupAudioOutObjectContent(pdsp::Engine &engine) { unusedArgs(engine); } - virtual void updateObjectContent(map> &patchObjects) { unusedArgs(patchObjects); } + virtual void updateObjectContent(std::map> &patchObjects) { unusedArgs(patchObjects); } virtual void updateAudioObjectContent(pdsp::Engine &engine) { unusedArgs(engine); } virtual void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) { unusedArgs(font,glRenderer); } virtual void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) { unusedArgs(_nodeCanvas); } @@ -112,8 +112,8 @@ class PatchObject : public ofxVPHasUID { virtual void resetResolution(int fromID=-1, int newWidth=-1, int newHeight=-1) { unusedArgs(fromID,newWidth,newHeight); } // Keyboard Events - void keyPressed(ofKeyEventArgs &e,map> &patchObjects); - void keyReleased(ofKeyEventArgs &e,map> &patchObjects); + void keyPressed(ofKeyEventArgs &e,std::map> &patchObjects); + void keyReleased(ofKeyEventArgs &e,std::map> &patchObjects); // Sound void audioIn(ofSoundBuffer &inputBuffer); @@ -122,32 +122,32 @@ class PatchObject : public ofxVPHasUID { void move(int _x, int _y); // PatchLinks utils - bool connectTo(map> &patchObjects, int fromObjectID, int fromOutlet, int toInlet, int linkType); - void disconnectFrom(map> &patchObjects, int objectInlet); - void disconnectLink(map> &patchObjects, int linkID); + bool connectTo(std::map> &patchObjects, int fromObjectID, int fromOutlet, int toInlet, int linkType); + void disconnectFrom(std::map> &patchObjects, int objectInlet); + void disconnectLink(std::map> &patchObjects, int linkID); void openWirelessLink(int objectOutlet) { if(getNumOutlets()>objectOutlet){ resetWirelessPin=objectOutlet;initWirelessLink = true; } }; void closeWirelessLink(int objectOutlet) { if(getNumOutlets()>objectOutlet){ resetWirelessPin=objectOutlet;resetWirelessLink = true; } }; // LOAD/SAVE - bool loadConfig(shared_ptr &mainWindow, pdsp::Engine &engine,int oTag, string &configFile); + bool loadConfig(std::shared_ptr &mainWindow, pdsp::Engine &engine,int oTag, string &configFile); bool saveConfig(bool newConnection); bool removeLinkFromConfig(int outlet, int toObjectID, int toInletID); - void addInlet(int type,string name) { inletsType.push_back(type);inletsNames.push_back(name); inletsIDs.push_back(""); inletsWirelessReceive.push_back(false); inletsPositions.push_back( ImVec2(this->x, this->y + this->height*.5f) ); } - void addOutlet(int type,string name = "") { outletsType.push_back(type);outletsNames.push_back(name); outletsIDs.push_back(""); outletsWirelessSend.push_back(false); outletsPositions.push_back( ImVec2( this->x + this->width, this->y + this->height*.5f) ); } + void addInlet(int type,std::string name) { inletsType.push_back(type);inletsNames.push_back(name); inletsIDs.push_back(""); inletsWirelessReceive.push_back(false); inletsPositions.push_back( ImVec2(this->x, this->y + this->height*.5f) ); } + void addOutlet(int type,std::string name = "") { outletsType.push_back(type);outletsNames.push_back(name); outletsIDs.push_back(""); outletsWirelessSend.push_back(false); outletsPositions.push_back( ImVec2( this->x + this->width, this->y + this->height*.5f) ); } void initInletsState() { for(int i=0;i loadCustomVars(); + void setCustomVar(float value, std::string name){ customVars[name] = value; saveConfig(false); } + float getCustomVar(std::string name) { if ( customVars.find(name) != customVars.end() ) { return customVars[name]; }else{ return 0; } } + float existsCustomVar(std::string name) { if ( customVars.find(name) != customVars.end() ) { return true; }else{ return false; } } + void substituteCustomVar(std::string oldName, std::string newName) { if ( customVars.find(oldName) != customVars.end() ) { customVars[newName] = customVars[oldName]; customVars.erase(oldName); } } + bool clearCustomVars(); + std::map loadCustomVars(); // GETTERS int getId() const { return nId; } ofPoint getPos() const { return ofPoint(x,y); } - string getName() const { return name; } - string getSpecialName() const { return specialName; } + std::string getName() const { return name; } + std::string getSpecialName() const { return specialName; } bool getIsResizable() const { return isResizable; } bool getIsRetina() const { return isRetina; } bool getIsSystemObject() const { return isSystemObject; } @@ -159,16 +159,16 @@ class PatchObject : public ofxVPHasUID { bool getIsSharedContextObject() const { return isSharedContextObject; } bool getIsHardwareObject() const { return isHardwareObject; } int getInletType(int iid) const { return inletsType[iid]; } - string getInletID(int iid) const { return inletsIDs[iid]; } + std::string getInletID(int iid) const { return inletsIDs[iid]; } bool getInletWirelessReceive(int iid) const { return inletsWirelessReceive[iid]; } - string getInletTypeName(const int& iid) const; + std::string getInletTypeName(const int& iid) const; ofColor getInletColor(const int& iid) const; ofColor getOutletColor(const int& oid) const; int getOutletType(int oid) const { return outletsType[oid]; } - string getOutletName(int oid) const { return outletsNames[oid]; } - string getOutletID(int oid) const { return outletsIDs[oid]; } + std::string getOutletName(int oid) const { return outletsNames[oid]; } + std::string getOutletID(int oid) const { return outletsIDs[oid]; } bool getOutletWirelessSend(int oid) const { return outletsWirelessSend[oid]; } - string getOutletTypeName(const int& oid) const; + std::string getOutletTypeName(const int& oid) const; ImVec2 getInletPosition(int iid); ImVec2 getOutletPosition(int oid); int getNumInlets() { return static_cast(inletsType.size()); } @@ -182,14 +182,14 @@ class PatchObject : public ofxVPHasUID { int getOutputHeight() { return output_height; } float getConfigmenuWidth() { return configMenuWidth; } - string getFilepath() { return filepath; } + std::string getFilepath() { return filepath; } // SETTERS - void setName(string _name) { name = _name; } - void setSpecialName(string _name) { specialName = _name; } - void setFilepath(string fp) { filepath = fp; } + void setName(std::string _name) { name = _name; } + void setSpecialName(std::string _name) { specialName = _name; } + void setFilepath(std::string fp) { filepath = fp; } - void setPatchfile(string pf); + void setPatchfile(std::string pf); void setIsTextureObj(bool it) { isTextureObject = it; } void setIsSharedContextObj(bool isc) { isSharedContextObject = isc; } @@ -201,9 +201,9 @@ class PatchObject : public ofxVPHasUID { void setIsObjectSelected(bool s) { isObjectSelected = s; } void setConfigmenuWidth(float cmw) { configMenuWidth = cmw; } void setDimensions(float w, float h) { width = w; height = h;} - void setSubpatch(string sp) { subpatchName = sp; } - void setInletID(int inlet, string ID) { inletsIDs[inlet] = ID; } - void setOutletID(int outlet, string ID) { outletsIDs[outlet] = ID; } + void setSubpatch(std::string sp) { subpatchName = sp; } + void setInletID(int inlet, std::string ID) { inletsIDs[inlet] = ID; } + void setOutletID(int outlet, std::string ID) { outletsIDs[outlet] = ID; } void setInletWirelessReceive(int inlet, bool wireless) { inletsWirelessReceive.at(inlet) = wireless; } void setOutletWirelessSend(int outlet, bool wireless) { outletsWirelessSend.at(outlet) = wireless; } @@ -212,22 +212,22 @@ class PatchObject : public ofxVPHasUID { static const std::string server_name() {return "PatchObjectServer";} // patch object connections - vector> outPut; - vector linksToDisconnect; - vector linksDeactivated; - vector objectsSelected; - vector inletsConnected; + std::vector> outPut; + std::vector linksToDisconnect; + std::vector linksDeactivated; + std::vector objectsSelected; + std::vector inletsConnected; // subpatch vars - string subpatchName; + std::string subpatchName; // inlets/outlets void *_inletParams[MAX_INLETS]; void *_outletParams[MAX_OUTLETS]; // PDSP nodes - map pdspIn; - map pdspOut; + std::map pdspIn; + std::map pdspOut; // events ofEvent resetEvent; @@ -235,10 +235,10 @@ class PatchObject : public ofxVPHasUID { ofEvent reconnectOutletsEvent; ofEvent duplicateEvent; - string specialLinkTypeName; + std::string specialLinkTypeName; // Wireless object vars - string wirelessName; + std::string wirelessName; int wirelessType; protected: @@ -258,22 +258,22 @@ class PatchObject : public ofxVPHasUID { float scaleFactor; // Core vars - string name; - string specialName; - string filepath; - string patchFile; - string patchFolderPath; - vector inletsNames; - vector outletsNames; - vector inletsIDs; - vector outletsIDs; - vector inletsWirelessReceive; - vector outletsWirelessSend; - vector inletsPositions; // ImVec2 to prevent too much type casting - vector outletsPositions; // Will hold screenpositions of pins, updated by ImGui - vector inletsType; - vector outletsType; - map customVars; + std::string name; + std::string specialName; + std::string filepath; + std::string patchFile; + std::string patchFolderPath; + std::vector inletsNames; + std::vector outletsNames; + std::vector inletsIDs; + std::vector outletsIDs; + std::vector inletsWirelessReceive; + std::vector outletsWirelessSend; + std::vector inletsPositions; // ImVec2 to prevent too much type casting + std::vector outletsPositions; // Will hold screenpositions of pins, updated by ImGui + std::vector inletsType; + std::vector outletsType; + std::map customVars; int numInlets; @@ -303,7 +303,7 @@ class PatchObject : public ofxVPHasUID { class PatchObjectDriver : public pugg::Driver { public: - PatchObjectDriver(string name, int version) : pugg::Driver(PatchObject::server_name(),name,version) {} + PatchObjectDriver(std::string name, int version) : pugg::Driver(PatchObject::server_name(),name,version) {} virtual PatchObject* create() = 0; }; diff --git a/src/ThreadedCommand.h b/src/ThreadedCommand.h index 8e435de6..e05749c0 100644 --- a/src/ThreadedCommand.h +++ b/src/ThreadedCommand.h @@ -83,7 +83,7 @@ class ThreadedCommand: public ofThread{ protected: std::condition_variable condition; - string command; + std::string command; int sys_status; bool executed; bool commandExecuted; diff --git a/src/objects/audio_analysis/AudioAnalyzer.cpp b/src/objects/audio_analysis/AudioAnalyzer.cpp index 4af46ad0..b880aa30 100644 --- a/src/objects/audio_analysis/AudioAnalyzer.cpp +++ b/src/objects/audio_analysis/AudioAnalyzer.cpp @@ -92,7 +92,7 @@ void AudioAnalyzer::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void AudioAnalyzer::updateObjectContent(map> &patchObjects){ +void AudioAnalyzer::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0]){ diff --git a/src/objects/audio_analysis/AudioAnalyzer.h b/src/objects/audio_analysis/AudioAnalyzer.h index a9877bfb..c370e218 100644 --- a/src/objects/audio_analysis/AudioAnalyzer.h +++ b/src/objects/audio_analysis/AudioAnalyzer.h @@ -51,7 +51,7 @@ class AudioAnalyzer : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/audio_analysis/BPMExtractor.cpp b/src/objects/audio_analysis/BPMExtractor.cpp index c0304140..a8a94474 100755 --- a/src/objects/audio_analysis/BPMExtractor.cpp +++ b/src/objects/audio_analysis/BPMExtractor.cpp @@ -83,12 +83,12 @@ void BPMExtractor::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void BPMExtractor::updateObjectContent(map> &patchObjects){ +void BPMExtractor::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0]){ if(!isNewConnection){ isNewConnection = true; - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ if(patchObjects[it->first] != nullptr && it->first != this->getId() && !patchObjects[it->first]->getWillErase()){ for(int o=0;o(it->second->outPut.size());o++){ diff --git a/src/objects/audio_analysis/BPMExtractor.h b/src/objects/audio_analysis/BPMExtractor.h index 1c092f0a..a1aa4e27 100755 --- a/src/objects/audio_analysis/BPMExtractor.h +++ b/src/objects/audio_analysis/BPMExtractor.h @@ -44,7 +44,7 @@ class BPMExtractor : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/audio_analysis/FftExtractor.cpp b/src/objects/audio_analysis/FftExtractor.cpp index 48bcc0b8..c6eb1da2 100755 --- a/src/objects/audio_analysis/FftExtractor.cpp +++ b/src/objects/audio_analysis/FftExtractor.cpp @@ -85,12 +85,12 @@ void FftExtractor::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void FftExtractor::updateObjectContent(map> &patchObjects){ +void FftExtractor::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0]){ if(!isNewConnection){ isNewConnection = true; - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ if(patchObjects[it->first] != nullptr && it->first != this->getId() && !patchObjects[it->first]->getWillErase()){ for(int o=0;o(it->second->outPut.size());o++){ diff --git a/src/objects/audio_analysis/FftExtractor.h b/src/objects/audio_analysis/FftExtractor.h index ee23135e..e5440c31 100755 --- a/src/objects/audio_analysis/FftExtractor.h +++ b/src/objects/audio_analysis/FftExtractor.h @@ -46,7 +46,7 @@ class FftExtractor : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/audio_analysis/MelBandsExtractor.cpp b/src/objects/audio_analysis/MelBandsExtractor.cpp index 9e74a674..e17c2cb7 100755 --- a/src/objects/audio_analysis/MelBandsExtractor.cpp +++ b/src/objects/audio_analysis/MelBandsExtractor.cpp @@ -76,12 +76,12 @@ void MelBandsExtractor::setupObjectContent(shared_ptr &mainWind } //-------------------------------------------------------------- -void MelBandsExtractor::updateObjectContent(map> &patchObjects){ +void MelBandsExtractor::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0]){ if(!isNewConnection){ isNewConnection = true; - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ if(patchObjects[it->first] != nullptr && it->first != this->getId() && !patchObjects[it->first]->getWillErase()){ for(int o=0;o(it->second->outPut.size());o++){ diff --git a/src/objects/audio_analysis/MelBandsExtractor.h b/src/objects/audio_analysis/MelBandsExtractor.h index 4a38c72d..e2ff6c30 100755 --- a/src/objects/audio_analysis/MelBandsExtractor.h +++ b/src/objects/audio_analysis/MelBandsExtractor.h @@ -45,7 +45,7 @@ class MelBandsExtractor : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/audio_analysis/PitchExtractor.cpp b/src/objects/audio_analysis/PitchExtractor.cpp index f15d6944..f941a52d 100755 --- a/src/objects/audio_analysis/PitchExtractor.cpp +++ b/src/objects/audio_analysis/PitchExtractor.cpp @@ -73,11 +73,11 @@ void PitchExtractor::setupObjectContent(shared_ptr &mainWindow) } //-------------------------------------------------------------- -void PitchExtractor::updateObjectContent(map> &patchObjects){ +void PitchExtractor::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0]){ if(!isNewConnection){ isNewConnection = true; - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ if(patchObjects[it->first] != nullptr && it->first != this->getId() && !patchObjects[it->first]->getWillErase()){ for(int o=0;o(it->second->outPut.size());o++){ diff --git a/src/objects/audio_analysis/PitchExtractor.h b/src/objects/audio_analysis/PitchExtractor.h index 42472b69..4e6ec9b0 100755 --- a/src/objects/audio_analysis/PitchExtractor.h +++ b/src/objects/audio_analysis/PitchExtractor.h @@ -44,7 +44,7 @@ class PitchExtractor : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/audio_analysis/RMSExtractor.cpp b/src/objects/audio_analysis/RMSExtractor.cpp index fa37bfa6..e0e23b39 100755 --- a/src/objects/audio_analysis/RMSExtractor.cpp +++ b/src/objects/audio_analysis/RMSExtractor.cpp @@ -73,11 +73,11 @@ void RMSExtractor::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void RMSExtractor::updateObjectContent(map> &patchObjects){ +void RMSExtractor::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0]){ if(!isNewConnection){ isNewConnection = true; - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ if(patchObjects[it->first] != nullptr && it->first != this->getId() && !patchObjects[it->first]->getWillErase()){ for(int o=0;o(it->second->outPut.size());o++){ diff --git a/src/objects/audio_analysis/RMSExtractor.h b/src/objects/audio_analysis/RMSExtractor.h index 2061fc1b..7a70b2b2 100755 --- a/src/objects/audio_analysis/RMSExtractor.h +++ b/src/objects/audio_analysis/RMSExtractor.h @@ -44,7 +44,7 @@ class RMSExtractor : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/communications/ArduinoSerial.cpp b/src/objects/communications/ArduinoSerial.cpp index 6a217893..f46f9bbf 100644 --- a/src/objects/communications/ArduinoSerial.cpp +++ b/src/objects/communications/ArduinoSerial.cpp @@ -100,7 +100,7 @@ void ArduinoSerial::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void ArduinoSerial::updateObjectContent(map> &patchObjects){ +void ArduinoSerial::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(deviceNameList.size() > 0){ diff --git a/src/objects/communications/ArduinoSerial.h b/src/objects/communications/ArduinoSerial.h index c1d828e4..c2e697e9 100644 --- a/src/objects/communications/ArduinoSerial.h +++ b/src/objects/communications/ArduinoSerial.h @@ -47,7 +47,7 @@ class ArduinoSerial : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/communications/KeyPressed.cpp b/src/objects/communications/KeyPressed.cpp index f68f40f8..4c9edf44 100755 --- a/src/objects/communications/KeyPressed.cpp +++ b/src/objects/communications/KeyPressed.cpp @@ -69,7 +69,7 @@ void KeyPressed::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void KeyPressed::updateObjectContent(map> &patchObjects){ +void KeyPressed::updateObjectContent(std::map> &patchObjects){ if(lastKey == static_cast(floor(this->getCustomVar("KEY"))) && lastKey != -1){ lastKey = -1; diff --git a/src/objects/communications/KeyPressed.h b/src/objects/communications/KeyPressed.h index 50b9e0ae..076913a8 100755 --- a/src/objects/communications/KeyPressed.h +++ b/src/objects/communications/KeyPressed.h @@ -44,7 +44,7 @@ class KeyPressed : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/communications/KeyReleased.cpp b/src/objects/communications/KeyReleased.cpp index 7322042a..6dcec686 100755 --- a/src/objects/communications/KeyReleased.cpp +++ b/src/objects/communications/KeyReleased.cpp @@ -69,7 +69,7 @@ void KeyReleased::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void KeyReleased::updateObjectContent(map> &patchObjects){ +void KeyReleased::updateObjectContent(std::map> &patchObjects){ if(lastKey == static_cast(floor(this->getCustomVar("KEY"))) && lastKey != -1){ lastKey = -1; diff --git a/src/objects/communications/KeyReleased.h b/src/objects/communications/KeyReleased.h index 1f0d67d6..be33e913 100755 --- a/src/objects/communications/KeyReleased.h +++ b/src/objects/communications/KeyReleased.h @@ -44,7 +44,7 @@ class KeyReleased : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/communications/MidiKey.cpp b/src/objects/communications/MidiKey.cpp index 6e226937..6c40c0b4 100755 --- a/src/objects/communications/MidiKey.cpp +++ b/src/objects/communications/MidiKey.cpp @@ -85,7 +85,7 @@ void MidiKey::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void MidiKey::updateObjectContent(map> &patchObjects){ +void MidiKey::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0] && this->inletsConnected[1]){ if(static_cast(floor(*ofxVP_CAST_PIN_PTR(this->_inletParams[0]))) == savedPitch){ diff --git a/src/objects/communications/MidiKey.h b/src/objects/communications/MidiKey.h index f2749cbd..88929a34 100755 --- a/src/objects/communications/MidiKey.h +++ b/src/objects/communications/MidiKey.h @@ -44,7 +44,7 @@ class MidiKey : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/communications/MidiKnob.cpp b/src/objects/communications/MidiKnob.cpp index f3398ea8..ef5587d6 100755 --- a/src/objects/communications/MidiKnob.cpp +++ b/src/objects/communications/MidiKnob.cpp @@ -78,7 +78,7 @@ void MidiKnob::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void MidiKnob::updateObjectContent(map> &patchObjects){ +void MidiKnob::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0] && this->inletsConnected[1]){ if(static_cast(floor(*ofxVP_CAST_PIN_PTR(this->_inletParams[0]))) == savedControl){ diff --git a/src/objects/communications/MidiKnob.h b/src/objects/communications/MidiKnob.h index 305fa4ed..57e9be03 100755 --- a/src/objects/communications/MidiKnob.h +++ b/src/objects/communications/MidiKnob.h @@ -46,7 +46,7 @@ class MidiKnob : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/communications/MidiPad.cpp b/src/objects/communications/MidiPad.cpp index 7d10bb6a..ea16c720 100755 --- a/src/objects/communications/MidiPad.cpp +++ b/src/objects/communications/MidiPad.cpp @@ -88,7 +88,7 @@ void MidiPad::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void MidiPad::updateObjectContent(map> &patchObjects){ +void MidiPad::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0]){ if(static_cast(floor(*ofxVP_CAST_PIN_PTR(this->_inletParams[0]))) == savedPitch){ diff --git a/src/objects/communications/MidiPad.h b/src/objects/communications/MidiPad.h index 17888c4b..14701c2b 100755 --- a/src/objects/communications/MidiPad.h +++ b/src/objects/communications/MidiPad.h @@ -44,7 +44,7 @@ class MidiPad : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/communications/MidiReceiver.cpp b/src/objects/communications/MidiReceiver.cpp index c13c0b63..eaefeb5f 100644 --- a/src/objects/communications/MidiReceiver.cpp +++ b/src/objects/communications/MidiReceiver.cpp @@ -89,7 +89,7 @@ void MidiReceiver::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void MidiReceiver::updateObjectContent(map> &patchObjects){ +void MidiReceiver::updateObjectContent(std::map> &patchObjects){ if(midiDevicesList.size() > 0){ if(midiIn.isOpen()){ diff --git a/src/objects/communications/MidiReceiver.h b/src/objects/communications/MidiReceiver.h index 355cf270..dbc5bca0 100644 --- a/src/objects/communications/MidiReceiver.h +++ b/src/objects/communications/MidiReceiver.h @@ -46,7 +46,7 @@ class MidiReceiver : public PatchObject, public ofxMidiListener { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/communications/MidiSender.cpp b/src/objects/communications/MidiSender.cpp index 1666f9a2..d6333d97 100644 --- a/src/objects/communications/MidiSender.cpp +++ b/src/objects/communications/MidiSender.cpp @@ -84,7 +84,7 @@ void MidiSender::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void MidiSender::updateObjectContent(map> &patchObjects){ +void MidiSender::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(midiDevicesList.size() > 0){ diff --git a/src/objects/communications/MidiSender.h b/src/objects/communications/MidiSender.h index 8458cd9d..8b756913 100644 --- a/src/objects/communications/MidiSender.h +++ b/src/objects/communications/MidiSender.h @@ -46,7 +46,7 @@ class MidiSender : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/communications/OscReceiver.cpp b/src/objects/communications/OscReceiver.cpp index 06a997fc..7ae37197 100644 --- a/src/objects/communications/OscReceiver.cpp +++ b/src/objects/communications/OscReceiver.cpp @@ -69,7 +69,7 @@ void OscReceiver::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void OscReceiver::updateObjectContent(map> &patchObjects){ +void OscReceiver::updateObjectContent(std::map> &patchObjects){ if(osc_labels.size() > 0 && loaded && osc_receiver.isListening()){ while(osc_receiver.hasWaitingMessages()){ diff --git a/src/objects/communications/OscReceiver.h b/src/objects/communications/OscReceiver.h index 888b6ec2..0ac4531d 100644 --- a/src/objects/communications/OscReceiver.h +++ b/src/objects/communications/OscReceiver.h @@ -46,7 +46,7 @@ class OscReceiver : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/communications/OscSender.cpp b/src/objects/communications/OscSender.cpp index 798e67b8..62991a7e 100644 --- a/src/objects/communications/OscSender.cpp +++ b/src/objects/communications/OscSender.cpp @@ -70,7 +70,7 @@ void OscSender::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void OscSender::updateObjectContent(map> &patchObjects){ +void OscSender::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(loaded){ diff --git a/src/objects/communications/OscSender.h b/src/objects/communications/OscSender.h index 0863f826..52df4084 100644 --- a/src/objects/communications/OscSender.h +++ b/src/objects/communications/OscSender.h @@ -46,7 +46,7 @@ class OscSender : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/computer_vision/BackgroundSubtraction.cpp b/src/objects/computer_vision/BackgroundSubtraction.cpp index f92f5f64..c558ebba 100644 --- a/src/objects/computer_vision/BackgroundSubtraction.cpp +++ b/src/objects/computer_vision/BackgroundSubtraction.cpp @@ -114,7 +114,7 @@ void BackgroundSubtraction::setupObjectContent(shared_ptr &main } //-------------------------------------------------------------- -void BackgroundSubtraction::updateObjectContent(map> &patchObjects){ +void BackgroundSubtraction::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); // External background reset (BANG) diff --git a/src/objects/computer_vision/BackgroundSubtraction.h b/src/objects/computer_vision/BackgroundSubtraction.h index 7b99fd61..2f7376da 100644 --- a/src/objects/computer_vision/BackgroundSubtraction.h +++ b/src/objects/computer_vision/BackgroundSubtraction.h @@ -47,7 +47,7 @@ class BackgroundSubtraction : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/computer_vision/ColorTracking.cpp b/src/objects/computer_vision/ColorTracking.cpp index a4e0d58a..6d77f5dd 100644 --- a/src/objects/computer_vision/ColorTracking.cpp +++ b/src/objects/computer_vision/ColorTracking.cpp @@ -103,7 +103,7 @@ void ColorTracking::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void ColorTracking::updateObjectContent(map> &patchObjects){ +void ColorTracking::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0] && ofxVP_CAST_PIN_PTR(_inletParams[0])->isAllocated()){ diff --git a/src/objects/computer_vision/ColorTracking.h b/src/objects/computer_vision/ColorTracking.h index 0645f9d4..d2d2565c 100644 --- a/src/objects/computer_vision/ColorTracking.h +++ b/src/objects/computer_vision/ColorTracking.h @@ -46,7 +46,7 @@ class ColorTracking : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/computer_vision/ContourTracking.cpp b/src/objects/computer_vision/ContourTracking.cpp index 7efef7a1..ce269da9 100644 --- a/src/objects/computer_vision/ContourTracking.cpp +++ b/src/objects/computer_vision/ContourTracking.cpp @@ -100,7 +100,7 @@ void ContourTracking::setupObjectContent(shared_ptr &mainWindow } //-------------------------------------------------------------- -void ContourTracking::updateObjectContent(map> &patchObjects){ +void ContourTracking::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0] && ofxVP_CAST_PIN_PTR(_inletParams[0])->isAllocated()){ diff --git a/src/objects/computer_vision/ContourTracking.h b/src/objects/computer_vision/ContourTracking.h index b87111da..d60e463e 100644 --- a/src/objects/computer_vision/ContourTracking.h +++ b/src/objects/computer_vision/ContourTracking.h @@ -46,7 +46,7 @@ class ContourTracking : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/computer_vision/HaarTracking.cpp b/src/objects/computer_vision/HaarTracking.cpp index e3a64464..4a8e10c1 100644 --- a/src/objects/computer_vision/HaarTracking.cpp +++ b/src/objects/computer_vision/HaarTracking.cpp @@ -105,7 +105,7 @@ void HaarTracking::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void HaarTracking::updateObjectContent(map> &patchObjects){ +void HaarTracking::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); // HAAR Tracking UPDATE diff --git a/src/objects/computer_vision/HaarTracking.h b/src/objects/computer_vision/HaarTracking.h index c4779a25..43dc560f 100644 --- a/src/objects/computer_vision/HaarTracking.h +++ b/src/objects/computer_vision/HaarTracking.h @@ -48,7 +48,7 @@ class HaarTracking : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/computer_vision/MotionDetection.cpp b/src/objects/computer_vision/MotionDetection.cpp index 9a70b044..ea666bbb 100644 --- a/src/objects/computer_vision/MotionDetection.cpp +++ b/src/objects/computer_vision/MotionDetection.cpp @@ -84,7 +84,7 @@ void MotionDetection::setupObjectContent(shared_ptr &mainWindow } //-------------------------------------------------------------- -void MotionDetection::updateObjectContent(map> &patchObjects){ +void MotionDetection::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); // MOTION DETECTION UPDATE diff --git a/src/objects/computer_vision/MotionDetection.h b/src/objects/computer_vision/MotionDetection.h index efc893c5..dd698c61 100644 --- a/src/objects/computer_vision/MotionDetection.h +++ b/src/objects/computer_vision/MotionDetection.h @@ -48,7 +48,7 @@ class MotionDetection : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/computer_vision/OpticalFlow.cpp b/src/objects/computer_vision/OpticalFlow.cpp index 3467237a..076280ee 100644 --- a/src/objects/computer_vision/OpticalFlow.cpp +++ b/src/objects/computer_vision/OpticalFlow.cpp @@ -103,7 +103,7 @@ void OpticalFlow::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void OpticalFlow::updateObjectContent(map> &patchObjects){ +void OpticalFlow::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); // OPTICAL FLOW UPDATE diff --git a/src/objects/computer_vision/OpticalFlow.h b/src/objects/computer_vision/OpticalFlow.h index e813ecc3..d69241af 100644 --- a/src/objects/computer_vision/OpticalFlow.h +++ b/src/objects/computer_vision/OpticalFlow.h @@ -47,7 +47,7 @@ class OpticalFlow : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/data/BangMultiplexer.cpp b/src/objects/data/BangMultiplexer.cpp index 3c589cb4..47367b43 100755 --- a/src/objects/data/BangMultiplexer.cpp +++ b/src/objects/data/BangMultiplexer.cpp @@ -86,7 +86,7 @@ void BangMultiplexer::setupObjectContent(shared_ptr &mainWindow } //-------------------------------------------------------------- -void BangMultiplexer::updateObjectContent(map> &patchObjects){ +void BangMultiplexer::updateObjectContent(std::map> &patchObjects){ for(int i=0;inumInlets;i++){ if(this->inletsConnected[i]){ diff --git a/src/objects/data/BangMultiplexer.h b/src/objects/data/BangMultiplexer.h index 053e8c06..2d34314c 100755 --- a/src/objects/data/BangMultiplexer.h +++ b/src/objects/data/BangMultiplexer.h @@ -44,7 +44,7 @@ class BangMultiplexer : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/data/BangToFloat.cpp b/src/objects/data/BangToFloat.cpp index 95c935fa..9b20c507 100644 --- a/src/objects/data/BangToFloat.cpp +++ b/src/objects/data/BangToFloat.cpp @@ -77,7 +77,7 @@ void BangToFloat::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void BangToFloat::updateObjectContent(map> &patchObjects){ +void BangToFloat::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0]){ if(*ofxVP_CAST_PIN_PTR(this->_inletParams[0]) < 1.0){ diff --git a/src/objects/data/BangToFloat.h b/src/objects/data/BangToFloat.h index 222f1f84..bf28855c 100644 --- a/src/objects/data/BangToFloat.h +++ b/src/objects/data/BangToFloat.h @@ -44,7 +44,7 @@ class BangToFloat : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/data/DataToFile.cpp b/src/objects/data/DataToFile.cpp index ddc1e0c2..ff7dca7a 100755 --- a/src/objects/data/DataToFile.cpp +++ b/src/objects/data/DataToFile.cpp @@ -76,7 +76,7 @@ void DataToFile::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void DataToFile::updateObjectContent(map> &patchObjects){ +void DataToFile::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[1]){ diff --git a/src/objects/data/DataToFile.h b/src/objects/data/DataToFile.h index 0dca1c81..3e6c54d4 100755 --- a/src/objects/data/DataToFile.h +++ b/src/objects/data/DataToFile.h @@ -48,7 +48,7 @@ class DataToFile : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/data/DataToTexture.cpp b/src/objects/data/DataToTexture.cpp index 36712c55..1b142f75 100644 --- a/src/objects/data/DataToTexture.cpp +++ b/src/objects/data/DataToTexture.cpp @@ -92,7 +92,7 @@ void DataToTexture::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void DataToTexture::updateObjectContent(map> &patchObjects){ +void DataToTexture::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(needReset){ diff --git a/src/objects/data/DataToTexture.h b/src/objects/data/DataToTexture.h index 53f0d6d3..0b7c5b46 100644 --- a/src/objects/data/DataToTexture.h +++ b/src/objects/data/DataToTexture.h @@ -44,7 +44,7 @@ class DataToTexture : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/data/FileToData.cpp b/src/objects/data/FileToData.cpp index 7e87b4be..87fa5ab7 100644 --- a/src/objects/data/FileToData.cpp +++ b/src/objects/data/FileToData.cpp @@ -76,7 +76,7 @@ void FileToData::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void FileToData::updateObjectContent(map> &patchObjects){ +void FileToData::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(fileOpened){ diff --git a/src/objects/data/FileToData.h b/src/objects/data/FileToData.h index 44364c6b..e5e92085 100644 --- a/src/objects/data/FileToData.h +++ b/src/objects/data/FileToData.h @@ -48,7 +48,7 @@ class FileToData : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/data/FloatMultiplexer.cpp b/src/objects/data/FloatMultiplexer.cpp index 945e8aae..4879a022 100755 --- a/src/objects/data/FloatMultiplexer.cpp +++ b/src/objects/data/FloatMultiplexer.cpp @@ -88,7 +88,7 @@ void FloatMultiplexer::setupObjectContent(shared_ptr &mainWindo } //-------------------------------------------------------------- -void FloatMultiplexer::updateObjectContent(map> &patchObjects){ +void FloatMultiplexer::updateObjectContent(std::map> &patchObjects){ for(int i=0;inumInlets;i++){ if(this->inletsConnected[i]){ if(*ofxVP_CAST_PIN_PTR(this->_inletParams[i]) != inletsMemory.at(i)){ diff --git a/src/objects/data/FloatMultiplexer.h b/src/objects/data/FloatMultiplexer.h index 71d925fe..815f4036 100755 --- a/src/objects/data/FloatMultiplexer.h +++ b/src/objects/data/FloatMultiplexer.h @@ -44,7 +44,7 @@ class FloatMultiplexer : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/data/FloatsToVector.cpp b/src/objects/data/FloatsToVector.cpp index b0b337af..49ce5b26 100755 --- a/src/objects/data/FloatsToVector.cpp +++ b/src/objects/data/FloatsToVector.cpp @@ -88,7 +88,7 @@ void FloatsToVector::setupObjectContent(shared_ptr &mainWindow) } //-------------------------------------------------------------- -void FloatsToVector::updateObjectContent(map> &patchObjects){ +void FloatsToVector::updateObjectContent(std::map> &patchObjects){ for(int i=0;inumInlets;i++){ if(this->inletsConnected[i]){ ofxVP_CAST_PIN_PTR>(this->_outletParams[0])->at(i) = *ofxVP_CAST_PIN_PTR(this->_inletParams[i]); diff --git a/src/objects/data/FloatsToVector.h b/src/objects/data/FloatsToVector.h index 21264576..d0b6763e 100755 --- a/src/objects/data/FloatsToVector.h +++ b/src/objects/data/FloatsToVector.h @@ -44,7 +44,7 @@ class FloatsToVector : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/data/Receiver.cpp b/src/objects/data/Receiver.cpp index 3728bfb7..7120f634 100644 --- a/src/objects/data/Receiver.cpp +++ b/src/objects/data/Receiver.cpp @@ -98,7 +98,7 @@ void vpReceiver::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void vpReceiver::updateObjectContent(map> &patchObjects){ +void vpReceiver::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(receiveTypeIndex == VP_LINK_NUMERIC){ @@ -130,7 +130,7 @@ void vpReceiver::updateObjectContent(map> &patchObje if(signalSendEvent){ signalSendEvent = false; - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ if(it->second->getName() == "sender"){ for(int wid=0;widsecond->getNumOutlets();wid++){ diff --git a/src/objects/data/Receiver.h b/src/objects/data/Receiver.h index ad492a6a..27b122c5 100644 --- a/src/objects/data/Receiver.h +++ b/src/objects/data/Receiver.h @@ -45,7 +45,7 @@ class vpReceiver : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/data/Sender.cpp b/src/objects/data/Sender.cpp index 004302dc..81a7b412 100644 --- a/src/objects/data/Sender.cpp +++ b/src/objects/data/Sender.cpp @@ -93,7 +93,7 @@ void vpSender::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void vpSender::updateObjectContent(map> &patchObjects){ +void vpSender::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(sendTypeIndex == VP_LINK_NUMERIC){ @@ -125,7 +125,7 @@ void vpSender::updateObjectContent(map> &patchObject if(resetLinks){ resetLinks = false; - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ vector> tempBuffer; for(int j=0;j(it->second->outPut.size());j++){ diff --git a/src/objects/data/Sender.h b/src/objects/data/Sender.h index 4ea95f5d..6be777ab 100644 --- a/src/objects/data/Sender.h +++ b/src/objects/data/Sender.h @@ -45,7 +45,7 @@ class vpSender : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/data/TextureToData.cpp b/src/objects/data/TextureToData.cpp index fca08b56..c196fe7d 100644 --- a/src/objects/data/TextureToData.cpp +++ b/src/objects/data/TextureToData.cpp @@ -76,7 +76,7 @@ void TextureToData::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void TextureToData::updateObjectContent(map> &patchObjects){ +void TextureToData::updateObjectContent(std::map> &patchObjects){ ofxVP_CAST_PIN_PTR>(this->_outletParams[0])->clear(); if(this->inletsConnected[0] && ofxVP_CAST_PIN_PTR(_inletParams[0])->isAllocated()){ if(!newConnection){ diff --git a/src/objects/data/TextureToData.h b/src/objects/data/TextureToData.h index ec04bb9f..b70ce123 100644 --- a/src/objects/data/TextureToData.h +++ b/src/objects/data/TextureToData.h @@ -44,7 +44,7 @@ class TextureToData : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/data/VectorAt.cpp b/src/objects/data/VectorAt.cpp index 12b46a3f..5e68948b 100755 --- a/src/objects/data/VectorAt.cpp +++ b/src/objects/data/VectorAt.cpp @@ -72,7 +72,7 @@ void VectorAt::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void VectorAt::updateObjectContent(map> &patchObjects){ +void VectorAt::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(!loaded){ diff --git a/src/objects/data/VectorAt.h b/src/objects/data/VectorAt.h index deb0ff55..94459ec2 100755 --- a/src/objects/data/VectorAt.h +++ b/src/objects/data/VectorAt.h @@ -44,7 +44,7 @@ class VectorAt : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/data/VectorConcat.cpp b/src/objects/data/VectorConcat.cpp index 175e4cd1..061667ee 100755 --- a/src/objects/data/VectorConcat.cpp +++ b/src/objects/data/VectorConcat.cpp @@ -84,7 +84,7 @@ void VectorConcat::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void VectorConcat::updateObjectContent(map> &patchObjects){ +void VectorConcat::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); ofxVP_CAST_PIN_PTR>(this->_outletParams[0])->clear(); diff --git a/src/objects/data/VectorConcat.h b/src/objects/data/VectorConcat.h index f72595bd..4d5d8473 100755 --- a/src/objects/data/VectorConcat.h +++ b/src/objects/data/VectorConcat.h @@ -44,7 +44,7 @@ class VectorConcat : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/data/VectorExtract.cpp b/src/objects/data/VectorExtract.cpp index 4bf6029f..24260b04 100755 --- a/src/objects/data/VectorExtract.cpp +++ b/src/objects/data/VectorExtract.cpp @@ -77,7 +77,7 @@ void VectorExtract::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void VectorExtract::updateObjectContent(map> &patchObjects){ +void VectorExtract::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); ofxVP_CAST_PIN_PTR>(this->_outletParams[0])->clear(); diff --git a/src/objects/data/VectorExtract.h b/src/objects/data/VectorExtract.h index c9ee9823..209a8dc0 100755 --- a/src/objects/data/VectorExtract.h +++ b/src/objects/data/VectorExtract.h @@ -44,7 +44,7 @@ class VectorExtract : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/data/VectorGate.cpp b/src/objects/data/VectorGate.cpp index ab8404f3..8304a4a3 100644 --- a/src/objects/data/VectorGate.cpp +++ b/src/objects/data/VectorGate.cpp @@ -100,7 +100,7 @@ void VectorGate::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void VectorGate::updateObjectContent(map> &patchObjects){ +void VectorGate::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(needReset){ diff --git a/src/objects/data/VectorGate.h b/src/objects/data/VectorGate.h index 8eafc8d5..246882de 100644 --- a/src/objects/data/VectorGate.h +++ b/src/objects/data/VectorGate.h @@ -45,7 +45,7 @@ class VectorGate : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/data/VectorOperator.cpp b/src/objects/data/VectorOperator.cpp index 727323ec..1a40c5da 100755 --- a/src/objects/data/VectorOperator.cpp +++ b/src/objects/data/VectorOperator.cpp @@ -78,7 +78,7 @@ void VectorOperator::setupObjectContent(shared_ptr &mainWindow) } //-------------------------------------------------------------- -void VectorOperator::updateObjectContent(map> &patchObjects){ +void VectorOperator::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(!loaded){ diff --git a/src/objects/data/VectorOperator.h b/src/objects/data/VectorOperator.h index 2edb1cc8..895e71ef 100755 --- a/src/objects/data/VectorOperator.h +++ b/src/objects/data/VectorOperator.h @@ -46,7 +46,7 @@ class VectorOperator : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/graphics/ColorPalette.cpp b/src/objects/graphics/ColorPalette.cpp index f380c6f3..cab284ef 100644 --- a/src/objects/graphics/ColorPalette.cpp +++ b/src/objects/graphics/ColorPalette.cpp @@ -101,7 +101,7 @@ void ColorPalette::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void ColorPalette::updateObjectContent(map> &patchObjects){ +void ColorPalette::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0] && !ofxVP_CAST_PIN_PTR>(this->_inletParams[0])->empty()){ diff --git a/src/objects/graphics/ColorPalette.h b/src/objects/graphics/ColorPalette.h index ca4887d5..b9e0c787 100644 --- a/src/objects/graphics/ColorPalette.h +++ b/src/objects/graphics/ColorPalette.h @@ -49,7 +49,7 @@ class ColorPalette : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/graphics/ImageExporter.cpp b/src/objects/graphics/ImageExporter.cpp index 4098e69a..7287d610 100644 --- a/src/objects/graphics/ImageExporter.cpp +++ b/src/objects/graphics/ImageExporter.cpp @@ -86,7 +86,7 @@ void ImageExporter::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void ImageExporter::updateObjectContent(map> &patchObjects){ +void ImageExporter::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(isImageSaved){ diff --git a/src/objects/graphics/ImageExporter.h b/src/objects/graphics/ImageExporter.h index 0cb4b63a..2eba6cd2 100644 --- a/src/objects/graphics/ImageExporter.h +++ b/src/objects/graphics/ImageExporter.h @@ -47,7 +47,7 @@ class ImageExporter : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/graphics/ImageLoader.cpp b/src/objects/graphics/ImageLoader.cpp index a7d03ab7..80d7dce4 100644 --- a/src/objects/graphics/ImageLoader.cpp +++ b/src/objects/graphics/ImageLoader.cpp @@ -92,7 +92,7 @@ void ImageLoader::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void ImageLoader::updateObjectContent(map> &patchObjects){ +void ImageLoader::updateObjectContent(std::map> &patchObjects){ if(!isFileLoaded && img->isAllocated()){ isFileLoaded = true; diff --git a/src/objects/graphics/ImageLoader.h b/src/objects/graphics/ImageLoader.h index c57eb7d8..d73720ae 100644 --- a/src/objects/graphics/ImageLoader.h +++ b/src/objects/graphics/ImageLoader.h @@ -48,7 +48,7 @@ class ImageLoader : public PatchObject { void autoloadFile(string _fp) override; void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/gui/mo2DPad.cpp b/src/objects/gui/mo2DPad.cpp index c1e4d3ec..fb24e965 100644 --- a/src/objects/gui/mo2DPad.cpp +++ b/src/objects/gui/mo2DPad.cpp @@ -78,7 +78,7 @@ void mo2DPad::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void mo2DPad::updateObjectContent(map> &patchObjects){ +void mo2DPad::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0]){ diff --git a/src/objects/gui/mo2DPad.h b/src/objects/gui/mo2DPad.h index b6d165fb..4f223b7d 100644 --- a/src/objects/gui/mo2DPad.h +++ b/src/objects/gui/mo2DPad.h @@ -46,7 +46,7 @@ class mo2DPad : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/gui/moBang.cpp b/src/objects/gui/moBang.cpp index 27ad35b0..9aa0e544 100644 --- a/src/objects/gui/moBang.cpp +++ b/src/objects/gui/moBang.cpp @@ -115,7 +115,7 @@ void moBang::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void moBang::updateObjectContent(map> &patchObjects){ +void moBang::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); } diff --git a/src/objects/gui/moBang.h b/src/objects/gui/moBang.h index f2a71252..76c40ec6 100644 --- a/src/objects/gui/moBang.h +++ b/src/objects/gui/moBang.h @@ -46,7 +46,7 @@ class moBang : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/gui/moComment.cpp b/src/objects/gui/moComment.cpp index 69259c6a..71c77221 100644 --- a/src/objects/gui/moComment.cpp +++ b/src/objects/gui/moComment.cpp @@ -85,7 +85,7 @@ void moComment::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void moComment::updateObjectContent(map> &patchObjects){ +void moComment::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0]){ if(*ofxVP_CAST_PIN_PTR(this->_inletParams[0]) < 1.0){ diff --git a/src/objects/gui/moComment.h b/src/objects/gui/moComment.h index 44fab04b..a2c2455f 100644 --- a/src/objects/gui/moComment.h +++ b/src/objects/gui/moComment.h @@ -46,7 +46,7 @@ class moComment : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/gui/moDataViewer.cpp b/src/objects/gui/moDataViewer.cpp index a7453e80..20919176 100755 --- a/src/objects/gui/moDataViewer.cpp +++ b/src/objects/gui/moDataViewer.cpp @@ -79,7 +79,7 @@ void moDataViewer::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void moDataViewer::updateObjectContent(map> &patchObjects){ +void moDataViewer::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(!loaded){ diff --git a/src/objects/gui/moDataViewer.h b/src/objects/gui/moDataViewer.h index 6efb82da..2c7f3406 100755 --- a/src/objects/gui/moDataViewer.h +++ b/src/objects/gui/moDataViewer.h @@ -46,7 +46,7 @@ class moDataViewer : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/gui/moMessage.cpp b/src/objects/gui/moMessage.cpp index a50c4d03..eac9078b 100644 --- a/src/objects/gui/moMessage.cpp +++ b/src/objects/gui/moMessage.cpp @@ -74,7 +74,7 @@ void moMessage::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void moMessage::updateObjectContent(map> &patchObjects){ +void moMessage::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0] && *ofxVP_CAST_PIN_PTR(this->_inletParams[0]) >= 1.0){ if(this->inletsConnected[1]){ diff --git a/src/objects/gui/moMessage.h b/src/objects/gui/moMessage.h index 0cb86c35..4a2d8db6 100644 --- a/src/objects/gui/moMessage.h +++ b/src/objects/gui/moMessage.h @@ -46,7 +46,7 @@ class moMessage : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/gui/moMultiSlider.cpp b/src/objects/gui/moMultiSlider.cpp index ed94ffa7..b0346f9f 100644 --- a/src/objects/gui/moMultiSlider.cpp +++ b/src/objects/gui/moMultiSlider.cpp @@ -85,7 +85,7 @@ void moMultiSlider::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void moMultiSlider::updateObjectContent(map> &patchObjects){ +void moMultiSlider::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0]){ diff --git a/src/objects/gui/moMultiSlider.h b/src/objects/gui/moMultiSlider.h index f41fb727..96844468 100644 --- a/src/objects/gui/moMultiSlider.h +++ b/src/objects/gui/moMultiSlider.h @@ -44,7 +44,7 @@ class moMultiSlider : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/gui/moMultiToggle.cpp b/src/objects/gui/moMultiToggle.cpp index 2751aa45..20ef1ae1 100644 --- a/src/objects/gui/moMultiToggle.cpp +++ b/src/objects/gui/moMultiToggle.cpp @@ -90,7 +90,7 @@ void moMultiToggle::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void moMultiToggle::updateObjectContent(map> &patchObjects){ +void moMultiToggle::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0]){ diff --git a/src/objects/gui/moMultiToggle.h b/src/objects/gui/moMultiToggle.h index 7bd84515..ec254ae6 100644 --- a/src/objects/gui/moMultiToggle.h +++ b/src/objects/gui/moMultiToggle.h @@ -44,7 +44,7 @@ class moMultiToggle : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/gui/moPianoKeyboard.cpp b/src/objects/gui/moPianoKeyboard.cpp index a9bc983a..e6b18346 100755 --- a/src/objects/gui/moPianoKeyboard.cpp +++ b/src/objects/gui/moPianoKeyboard.cpp @@ -75,7 +75,7 @@ void moPianoKeyboard::setupObjectContent(shared_ptr &mainWindow } //-------------------------------------------------------------- -void moPianoKeyboard::updateObjectContent(map> &patchObjects){ +void moPianoKeyboard::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0]){ diff --git a/src/objects/gui/moPianoKeyboard.h b/src/objects/gui/moPianoKeyboard.h index 140326d0..d6e84fcd 100755 --- a/src/objects/gui/moPianoKeyboard.h +++ b/src/objects/gui/moPianoKeyboard.h @@ -44,7 +44,7 @@ class moPianoKeyboard : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/gui/moPlayerControls.cpp b/src/objects/gui/moPlayerControls.cpp index 43e5d57c..0938d523 100644 --- a/src/objects/gui/moPlayerControls.cpp +++ b/src/objects/gui/moPlayerControls.cpp @@ -77,7 +77,7 @@ void moPlayerControls::setupObjectContent(shared_ptr &mainWindo } //-------------------------------------------------------------- -void moPlayerControls::updateObjectContent(map> &patchObjects){ +void moPlayerControls::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0]){ if(*ofxVP_CAST_PIN_PTR(this->_inletParams[0]) < 1.0){ diff --git a/src/objects/gui/moPlayerControls.h b/src/objects/gui/moPlayerControls.h index 780894a7..94ad013f 100644 --- a/src/objects/gui/moPlayerControls.h +++ b/src/objects/gui/moPlayerControls.h @@ -45,7 +45,7 @@ class moPlayerControls : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/gui/moSignalViewer.cpp b/src/objects/gui/moSignalViewer.cpp index abc3adc5..cbce5457 100644 --- a/src/objects/gui/moSignalViewer.cpp +++ b/src/objects/gui/moSignalViewer.cpp @@ -87,7 +87,7 @@ void moSignalViewer::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void moSignalViewer::updateObjectContent(map> &patchObjects){ +void moSignalViewer::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0]){ diff --git a/src/objects/gui/moSignalViewer.h b/src/objects/gui/moSignalViewer.h index c343cbc9..e438e495 100644 --- a/src/objects/gui/moSignalViewer.h +++ b/src/objects/gui/moSignalViewer.h @@ -46,7 +46,7 @@ class moSignalViewer : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/gui/moSlider.cpp b/src/objects/gui/moSlider.cpp index 6499b804..a4520005 100644 --- a/src/objects/gui/moSlider.cpp +++ b/src/objects/gui/moSlider.cpp @@ -73,7 +73,7 @@ void moSlider::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void moSlider::updateObjectContent(map> &patchObjects){ +void moSlider::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0]){ diff --git a/src/objects/gui/moSlider.h b/src/objects/gui/moSlider.h index 4be248ed..afa6eff3 100644 --- a/src/objects/gui/moSlider.h +++ b/src/objects/gui/moSlider.h @@ -44,7 +44,7 @@ class moSlider : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/gui/moSonogram.cpp b/src/objects/gui/moSonogram.cpp index b4ec160a..97e698cb 100644 --- a/src/objects/gui/moSonogram.cpp +++ b/src/objects/gui/moSonogram.cpp @@ -100,7 +100,7 @@ void moSonogram::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void moSonogram::updateObjectContent(map> &patchObjects){ +void moSonogram::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0] && !ofxVP_CAST_PIN_PTR>(this->_inletParams[0])->empty()){ diff --git a/src/objects/gui/moSonogram.h b/src/objects/gui/moSonogram.h index 32ec0f0a..4999ae0d 100644 --- a/src/objects/gui/moSonogram.h +++ b/src/objects/gui/moSonogram.h @@ -45,7 +45,7 @@ class moSonogram : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/gui/moTimeline.cpp b/src/objects/gui/moTimeline.cpp index 1bd09394..1a2a906c 100755 --- a/src/objects/gui/moTimeline.cpp +++ b/src/objects/gui/moTimeline.cpp @@ -155,7 +155,7 @@ void moTimeline::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void moTimeline::updateObjectContent(map> &patchObjects){ +void moTimeline::updateObjectContent(std::map> &patchObjects){ if(!timelineLoaded){ timelineLoaded = true; diff --git a/src/objects/gui/moTimeline.h b/src/objects/gui/moTimeline.h index 6af91fc1..42ac003c 100755 --- a/src/objects/gui/moTimeline.h +++ b/src/objects/gui/moTimeline.h @@ -54,7 +54,7 @@ class moTimeline : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/gui/moTrigger.cpp b/src/objects/gui/moTrigger.cpp index 7e9019bd..d9b928b9 100644 --- a/src/objects/gui/moTrigger.cpp +++ b/src/objects/gui/moTrigger.cpp @@ -75,7 +75,7 @@ void moTrigger::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void moTrigger::updateObjectContent(map> &patchObjects){ +void moTrigger::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0]){ diff --git a/src/objects/gui/moTrigger.h b/src/objects/gui/moTrigger.h index 2d4c23b4..391a2ab9 100644 --- a/src/objects/gui/moTrigger.h +++ b/src/objects/gui/moTrigger.h @@ -45,7 +45,7 @@ class moTrigger : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/gui/moVUMeter.cpp b/src/objects/gui/moVUMeter.cpp index 5d3c9220..5766b8ec 100644 --- a/src/objects/gui/moVUMeter.cpp +++ b/src/objects/gui/moVUMeter.cpp @@ -67,7 +67,7 @@ void moVUMeter::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void moVUMeter::updateObjectContent(map> &patchObjects){ +void moVUMeter::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0] && !ofxVP_CAST_PIN_PTR(_inletParams[0])->getBuffer().empty()){ diff --git a/src/objects/gui/moVUMeter.h b/src/objects/gui/moVUMeter.h index 2f2eac44..f47c19a7 100644 --- a/src/objects/gui/moVUMeter.h +++ b/src/objects/gui/moVUMeter.h @@ -46,7 +46,7 @@ class moVUMeter : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/gui/moValuePlotter.cpp b/src/objects/gui/moValuePlotter.cpp index f8735594..551ef45c 100644 --- a/src/objects/gui/moValuePlotter.cpp +++ b/src/objects/gui/moValuePlotter.cpp @@ -99,7 +99,7 @@ void moValuePlotter::setupObjectContent(shared_ptr &mainWindow) } //-------------------------------------------------------------- -void moValuePlotter::updateObjectContent(map> &patchObjects){ +void moValuePlotter::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[1] || this->inletsConnected[2]){ if(lastMinRange.get() != *ofxVP_CAST_PIN_PTR(this->_inletParams[1]) || lastMaxRange.get() != *ofxVP_CAST_PIN_PTR(this->_inletParams[2])){ diff --git a/src/objects/gui/moValuePlotter.h b/src/objects/gui/moValuePlotter.h index 9d1230c7..77264d49 100644 --- a/src/objects/gui/moValuePlotter.h +++ b/src/objects/gui/moValuePlotter.h @@ -46,7 +46,7 @@ class moValuePlotter : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/gui/moVideoViewer.cpp b/src/objects/gui/moVideoViewer.cpp index a0557d42..5a6d2e03 100644 --- a/src/objects/gui/moVideoViewer.cpp +++ b/src/objects/gui/moVideoViewer.cpp @@ -85,7 +85,7 @@ void moVideoViewer::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void moVideoViewer::updateObjectContent(map> &patchObjects){ +void moVideoViewer::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(!loaded){ diff --git a/src/objects/gui/moVideoViewer.h b/src/objects/gui/moVideoViewer.h index 687ef0a0..c2d06aae 100644 --- a/src/objects/gui/moVideoViewer.h +++ b/src/objects/gui/moVideoViewer.h @@ -44,7 +44,7 @@ class moVideoViewer : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/logic/BooleanOperator.cpp b/src/objects/logic/BooleanOperator.cpp index ce98da49..796fbd34 100755 --- a/src/objects/logic/BooleanOperator.cpp +++ b/src/objects/logic/BooleanOperator.cpp @@ -78,7 +78,7 @@ void BooleanOperator::setupObjectContent(shared_ptr &mainWindow } //-------------------------------------------------------------- -void BooleanOperator::updateObjectContent(map> &patchObjects){ +void BooleanOperator::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0] && this->inletsConnected[1]){ if(_operator == Bool_Operator_AND){ diff --git a/src/objects/logic/BooleanOperator.h b/src/objects/logic/BooleanOperator.h index 5a5884b8..2b686ae4 100755 --- a/src/objects/logic/BooleanOperator.h +++ b/src/objects/logic/BooleanOperator.h @@ -46,7 +46,7 @@ class BooleanOperator : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/logic/Conditional.cpp b/src/objects/logic/Conditional.cpp index 8de388cb..4af11b5c 100755 --- a/src/objects/logic/Conditional.cpp +++ b/src/objects/logic/Conditional.cpp @@ -81,7 +81,7 @@ void Conditional::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void Conditional::updateObjectContent(map> &patchObjects){ +void Conditional::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[1]){ number = *ofxVP_CAST_PIN_PTR(this->_inletParams[1]); diff --git a/src/objects/logic/Conditional.h b/src/objects/logic/Conditional.h index 107c21be..71dc29fd 100755 --- a/src/objects/logic/Conditional.h +++ b/src/objects/logic/Conditional.h @@ -46,7 +46,7 @@ class Conditional : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/logic/Counter.cpp b/src/objects/logic/Counter.cpp index 94e02e96..91af9bfc 100755 --- a/src/objects/logic/Counter.cpp +++ b/src/objects/logic/Counter.cpp @@ -92,7 +92,7 @@ void Counter::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void Counter::updateObjectContent(map> &patchObjects){ +void Counter::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(!this->inletsConnected[1]){ diff --git a/src/objects/logic/Counter.h b/src/objects/logic/Counter.h index 6f58531a..15fe4e31 100755 --- a/src/objects/logic/Counter.h +++ b/src/objects/logic/Counter.h @@ -45,7 +45,7 @@ class Counter : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/logic/DelayBang.cpp b/src/objects/logic/DelayBang.cpp index da39fc36..ad784616 100755 --- a/src/objects/logic/DelayBang.cpp +++ b/src/objects/logic/DelayBang.cpp @@ -91,7 +91,7 @@ void DelayBang::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void DelayBang::updateObjectContent(map> &patchObjects){ +void DelayBang::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[1]){ wait = static_cast(floor(*ofxVP_CAST_PIN_PTR(this->_inletParams[1]))); } diff --git a/src/objects/logic/DelayBang.h b/src/objects/logic/DelayBang.h index 10f21695..0e44597c 100755 --- a/src/objects/logic/DelayBang.h +++ b/src/objects/logic/DelayBang.h @@ -46,7 +46,7 @@ class DelayBang : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/logic/DelayFloat.cpp b/src/objects/logic/DelayFloat.cpp index e62f3756..2cef2a0a 100755 --- a/src/objects/logic/DelayFloat.cpp +++ b/src/objects/logic/DelayFloat.cpp @@ -86,7 +86,7 @@ void DelayFloat::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void DelayFloat::updateObjectContent(map> &patchObjects){ +void DelayFloat::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0]){ if(*ofxVP_CAST_PIN_PTR(this->_inletParams[0]) == 1.0 && !bang){ diff --git a/src/objects/logic/DelayFloat.h b/src/objects/logic/DelayFloat.h index 538be9cb..11808070 100755 --- a/src/objects/logic/DelayFloat.h +++ b/src/objects/logic/DelayFloat.h @@ -44,7 +44,7 @@ class DelayFloat : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/logic/Gate.cpp b/src/objects/logic/Gate.cpp index ab6e67bf..6ce5ba8f 100644 --- a/src/objects/logic/Gate.cpp +++ b/src/objects/logic/Gate.cpp @@ -102,7 +102,7 @@ void Gate::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void Gate::updateObjectContent(map> &patchObjects){ +void Gate::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(needReset){ diff --git a/src/objects/logic/Gate.h b/src/objects/logic/Gate.h index b1a6c925..c2fbe448 100644 --- a/src/objects/logic/Gate.h +++ b/src/objects/logic/Gate.h @@ -45,7 +45,7 @@ class Gate : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/logic/Inverter.cpp b/src/objects/logic/Inverter.cpp index 93459777..1ed76d0e 100644 --- a/src/objects/logic/Inverter.cpp +++ b/src/objects/logic/Inverter.cpp @@ -71,7 +71,7 @@ void Inverter::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void Inverter::updateObjectContent(map> &patchObjects){ +void Inverter::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0]){ if(*ofxVP_CAST_PIN_PTR(this->_inletParams[0]) < 1.0f){ diff --git a/src/objects/logic/Inverter.h b/src/objects/logic/Inverter.h index 3dce7f76..24597282 100644 --- a/src/objects/logic/Inverter.h +++ b/src/objects/logic/Inverter.h @@ -45,7 +45,7 @@ class Inverter : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/logic/LoadBang.cpp b/src/objects/logic/LoadBang.cpp index dc366c41..bef0dcdf 100644 --- a/src/objects/logic/LoadBang.cpp +++ b/src/objects/logic/LoadBang.cpp @@ -84,7 +84,7 @@ void LoadBang::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void LoadBang::updateObjectContent(map> &patchObjects){ +void LoadBang::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0] && static_cast(floor(*ofxVP_CAST_PIN_PTR(this->_inletParams[0]))) != wait){ wait = static_cast(floor(*ofxVP_CAST_PIN_PTR(this->_inletParams[0]))); diff --git a/src/objects/logic/LoadBang.h b/src/objects/logic/LoadBang.h index 9b1b5c6b..fcd9278e 100644 --- a/src/objects/logic/LoadBang.h +++ b/src/objects/logic/LoadBang.h @@ -46,7 +46,7 @@ class LoadBang : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/logic/Spigot.cpp b/src/objects/logic/Spigot.cpp index da668bf4..ae8373b8 100644 --- a/src/objects/logic/Spigot.cpp +++ b/src/objects/logic/Spigot.cpp @@ -128,7 +128,7 @@ void Spigot::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void Spigot::updateObjectContent(map> &patchObjects){ +void Spigot::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0] && !ofxVP_CAST_PIN_PTR>(this->_inletParams[0])->empty()){ diff --git a/src/objects/logic/Spigot.h b/src/objects/logic/Spigot.h index 9ad59a53..a7121a1a 100644 --- a/src/objects/logic/Spigot.h +++ b/src/objects/logic/Spigot.h @@ -44,7 +44,7 @@ class Spigot : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/logic/TimedSemaphore.cpp b/src/objects/logic/TimedSemaphore.cpp index 9564b5ed..d2f1133c 100755 --- a/src/objects/logic/TimedSemaphore.cpp +++ b/src/objects/logic/TimedSemaphore.cpp @@ -106,7 +106,7 @@ void TimedSemaphore::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void TimedSemaphore::updateObjectContent(map> &patchObjects){ +void TimedSemaphore::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[1]){ diff --git a/src/objects/logic/TimedSemaphore.h b/src/objects/logic/TimedSemaphore.h index b09a4c87..ae41758d 100755 --- a/src/objects/logic/TimedSemaphore.h +++ b/src/objects/logic/TimedSemaphore.h @@ -47,7 +47,7 @@ class TimedSemaphore : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/math/Clamp.cpp b/src/objects/math/Clamp.cpp index e6841aa7..97c4d035 100755 --- a/src/objects/math/Clamp.cpp +++ b/src/objects/math/Clamp.cpp @@ -80,7 +80,7 @@ void Clamp::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void Clamp::updateObjectContent(map> &patchObjects){ +void Clamp::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0]){ *ofxVP_CAST_PIN_PTR(this->_outletParams[0]) = ofClamp(*ofxVP_CAST_PIN_PTR(this->_inletParams[0]),min,max); }else{ diff --git a/src/objects/math/Clamp.h b/src/objects/math/Clamp.h index fcf7de1c..a0ba6a1a 100755 --- a/src/objects/math/Clamp.h +++ b/src/objects/math/Clamp.h @@ -44,7 +44,7 @@ class Clamp : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/math/Constant.cpp b/src/objects/math/Constant.cpp index e7821dc0..0d8ef103 100755 --- a/src/objects/math/Constant.cpp +++ b/src/objects/math/Constant.cpp @@ -90,7 +90,7 @@ void Constant::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void Constant::updateObjectContent(map> &patchObjects){ +void Constant::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0] && !isON){ diff --git a/src/objects/math/Constant.h b/src/objects/math/Constant.h index c68053f0..aeded517 100755 --- a/src/objects/math/Constant.h +++ b/src/objects/math/Constant.h @@ -42,7 +42,7 @@ class Constant : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/math/CosineGenerator.cpp b/src/objects/math/CosineGenerator.cpp index 956dafc8..af963830 100755 --- a/src/objects/math/CosineGenerator.cpp +++ b/src/objects/math/CosineGenerator.cpp @@ -84,7 +84,7 @@ void CosineGenerator::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void CosineGenerator::updateObjectContent(map> &patchObjects){ +void CosineGenerator::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[1]){ diff --git a/src/objects/math/CosineGenerator.h b/src/objects/math/CosineGenerator.h index 89bc4600..953aec0f 100755 --- a/src/objects/math/CosineGenerator.h +++ b/src/objects/math/CosineGenerator.h @@ -47,7 +47,7 @@ class CosineGenerator : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/math/Map.cpp b/src/objects/math/Map.cpp index 38dedc9e..d1cd92e8 100755 --- a/src/objects/math/Map.cpp +++ b/src/objects/math/Map.cpp @@ -90,7 +90,7 @@ void Map::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void Map::updateObjectContent(map> &patchObjects){ +void Map::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0]){ if(this->inletsConnected[1]){ diff --git a/src/objects/math/Map.h b/src/objects/math/Map.h index fb329017..2d24faf6 100755 --- a/src/objects/math/Map.h +++ b/src/objects/math/Map.h @@ -44,7 +44,7 @@ class Map : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/math/Metronome.cpp b/src/objects/math/Metronome.cpp index cdadbf6f..8bcf7134 100755 --- a/src/objects/math/Metronome.cpp +++ b/src/objects/math/Metronome.cpp @@ -127,7 +127,7 @@ void Metronome::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void Metronome::updateObjectContent(map> &patchObjects){ +void Metronome::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0] && static_cast(floor(*ofxVP_CAST_PIN_PTR(this->_inletParams[0]))) != timeSetting.get()){ diff --git a/src/objects/math/Metronome.h b/src/objects/math/Metronome.h index 5d2b1ec9..8a5ebad7 100755 --- a/src/objects/math/Metronome.h +++ b/src/objects/math/Metronome.h @@ -47,7 +47,7 @@ class Metronome : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/math/NumberOperator.cpp b/src/objects/math/NumberOperator.cpp index c34449df..e4fb472f 100755 --- a/src/objects/math/NumberOperator.cpp +++ b/src/objects/math/NumberOperator.cpp @@ -81,7 +81,7 @@ void NumberOperator::setupObjectContent(shared_ptr &mainWindow) } //-------------------------------------------------------------- -void NumberOperator::updateObjectContent(map> &patchObjects){ +void NumberOperator::updateObjectContent(std::map> &patchObjects){ if(!loaded){ loaded = true; diff --git a/src/objects/math/NumberOperator.h b/src/objects/math/NumberOperator.h index b4eafef9..6e233b1d 100755 --- a/src/objects/math/NumberOperator.h +++ b/src/objects/math/NumberOperator.h @@ -46,7 +46,7 @@ class NumberOperator : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/math/SimpleNoise.cpp b/src/objects/math/SimpleNoise.cpp index ac17b274..a4ca1d73 100644 --- a/src/objects/math/SimpleNoise.cpp +++ b/src/objects/math/SimpleNoise.cpp @@ -74,7 +74,7 @@ void SimpleNoise::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void SimpleNoise::updateObjectContent(map> &patchObjects){ +void SimpleNoise::updateObjectContent(std::map> &patchObjects){ *ofxVP_CAST_PIN_PTR(this->_outletParams[0]) = ofNoise(timePosition); if(this->inletsConnected[0]){ diff --git a/src/objects/math/SimpleNoise.h b/src/objects/math/SimpleNoise.h index 7d6f68f5..e74fbd68 100644 --- a/src/objects/math/SimpleNoise.h +++ b/src/objects/math/SimpleNoise.h @@ -46,7 +46,7 @@ class SimpleNoise : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/math/SimpleRandom.cpp b/src/objects/math/SimpleRandom.cpp index 48018c76..318a12d9 100755 --- a/src/objects/math/SimpleRandom.cpp +++ b/src/objects/math/SimpleRandom.cpp @@ -96,7 +96,7 @@ void SimpleRandom::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void SimpleRandom::updateObjectContent(map> &patchObjects){ +void SimpleRandom::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[1] || this->inletsConnected[2]){ diff --git a/src/objects/math/SimpleRandom.h b/src/objects/math/SimpleRandom.h index 5069d4a7..b00ed6cb 100755 --- a/src/objects/math/SimpleRandom.h +++ b/src/objects/math/SimpleRandom.h @@ -47,7 +47,7 @@ class SimpleRandom : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/math/SineGenerator.cpp b/src/objects/math/SineGenerator.cpp index 4e1da741..5c368edf 100755 --- a/src/objects/math/SineGenerator.cpp +++ b/src/objects/math/SineGenerator.cpp @@ -84,7 +84,7 @@ void SineGenerator::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void SineGenerator::updateObjectContent(map> &patchObjects){ +void SineGenerator::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[1]){ diff --git a/src/objects/math/SineGenerator.h b/src/objects/math/SineGenerator.h index 4f601b36..f1c03005 100755 --- a/src/objects/math/SineGenerator.h +++ b/src/objects/math/SineGenerator.h @@ -47,7 +47,7 @@ class SineGenerator : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/math/Smooth.cpp b/src/objects/math/Smooth.cpp index 870f0fa5..1120e817 100755 --- a/src/objects/math/Smooth.cpp +++ b/src/objects/math/Smooth.cpp @@ -76,7 +76,7 @@ void Smooth::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void Smooth::updateObjectContent(map> &patchObjects){ +void Smooth::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0]){ *ofxVP_CAST_PIN_PTR(this->_outletParams[0]) = *ofxVP_CAST_PIN_PTR(this->_outletParams[0])*(1.0f-smoothing) + *ofxVP_CAST_PIN_PTR(this->_inletParams[0])*smoothing; if(*ofxVP_CAST_PIN_PTR(this->_inletParams[0]) > maxRange){ diff --git a/src/objects/math/Smooth.h b/src/objects/math/Smooth.h index 09024d02..b087c4ff 100755 --- a/src/objects/math/Smooth.h +++ b/src/objects/math/Smooth.h @@ -44,7 +44,7 @@ class Smooth : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/scripting/BashScript.cpp b/src/objects/scripting/BashScript.cpp index c5b88440..367e2ce4 100644 --- a/src/objects/scripting/BashScript.cpp +++ b/src/objects/scripting/BashScript.cpp @@ -121,7 +121,7 @@ void BashScript::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void BashScript::updateObjectContent(map> &patchObjects){ +void BashScript::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); // listen to message control (_inletParams[0]) diff --git a/src/objects/scripting/BashScript.h b/src/objects/scripting/BashScript.h index dd51bd84..9fe919c2 100644 --- a/src/objects/scripting/BashScript.h +++ b/src/objects/scripting/BashScript.h @@ -55,7 +55,7 @@ class BashScript : public ofThread, public PatchObject{ void autoloadFile(string _fp) override; void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/scripting/LuaScript.cpp b/src/objects/scripting/LuaScript.cpp index 2833f936..e6dc7638 100644 --- a/src/objects/scripting/LuaScript.cpp +++ b/src/objects/scripting/LuaScript.cpp @@ -137,7 +137,7 @@ void LuaScript::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void LuaScript::updateObjectContent(map> &patchObjects){ +void LuaScript::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(needToLoadScript && filepath != "none"){ diff --git a/src/objects/scripting/LuaScript.h b/src/objects/scripting/LuaScript.h index f4fada14..1b5c2de3 100644 --- a/src/objects/scripting/LuaScript.h +++ b/src/objects/scripting/LuaScript.h @@ -58,7 +58,7 @@ class LuaScript : public PatchObject, public ofxLuaListener{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/scripting/SchemeScript.cpp b/src/objects/scripting/SchemeScript.cpp index f9af1f55..90b20d3a 100644 --- a/src/objects/scripting/SchemeScript.cpp +++ b/src/objects/scripting/SchemeScript.cpp @@ -187,7 +187,7 @@ void SchemeScript::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void SchemeScript::updateObjectContent(map> &patchObjects){ +void SchemeScript::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); // receive external data diff --git a/src/objects/scripting/SchemeScript.h b/src/objects/scripting/SchemeScript.h index 67d60a86..e787b403 100644 --- a/src/objects/scripting/SchemeScript.h +++ b/src/objects/scripting/SchemeScript.h @@ -78,7 +78,7 @@ class SchemeScript : public PatchObject, public ofxGLEditorListener { // object setup void setupObjectContent(shared_ptr &mainWindow) override; // object update - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; // object draw void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/scripting/ShaderObject.cpp b/src/objects/scripting/ShaderObject.cpp index 29ea00ce..f65f01d2 100644 --- a/src/objects/scripting/ShaderObject.cpp +++ b/src/objects/scripting/ShaderObject.cpp @@ -126,7 +126,7 @@ void ShaderObject::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void ShaderObject::updateObjectContent(map> &patchObjects){ +void ShaderObject::updateObjectContent(std::map> &patchObjects){ /////////////////////////////////////////// // SHADER UPDATE @@ -225,7 +225,7 @@ void ShaderObject::updateObjectContent(map> &patchOb // Recursive reset for shader objects chain if(needReset){ needReset = false; - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ if(patchObjects[it->first] != nullptr && it->first != this->getId() && !patchObjects[it->first]->getWillErase()){ for(int o=0;o(it->second->outPut.size());o++){ diff --git a/src/objects/scripting/ShaderObject.h b/src/objects/scripting/ShaderObject.h index 9e13d4fe..39711081 100644 --- a/src/objects/scripting/ShaderObject.h +++ b/src/objects/scripting/ShaderObject.h @@ -52,7 +52,7 @@ class ShaderObject : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/AudioDevice.cpp b/src/objects/sound/AudioDevice.cpp index 92de9515..ea667e6e 100644 --- a/src/objects/sound/AudioDevice.cpp +++ b/src/objects/sound/AudioDevice.cpp @@ -105,7 +105,7 @@ void AudioDevice::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void AudioDevice::updateObjectContent(map> &patchObjects){ +void AudioDevice::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); } diff --git a/src/objects/sound/AudioDevice.h b/src/objects/sound/AudioDevice.h index 5d2e110d..76715e5b 100644 --- a/src/objects/sound/AudioDevice.h +++ b/src/objects/sound/AudioDevice.h @@ -45,7 +45,7 @@ class AudioDevice : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/AudioExporter.cpp b/src/objects/sound/AudioExporter.cpp index 0c979ad7..b6b181ec 100644 --- a/src/objects/sound/AudioExporter.cpp +++ b/src/objects/sound/AudioExporter.cpp @@ -89,7 +89,7 @@ void AudioExporter::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void AudioExporter::updateObjectContent(map> &patchObjects){ +void AudioExporter::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[1]){ diff --git a/src/objects/sound/AudioExporter.h b/src/objects/sound/AudioExporter.h index 29107193..be4a7449 100644 --- a/src/objects/sound/AudioExporter.h +++ b/src/objects/sound/AudioExporter.h @@ -51,7 +51,7 @@ class AudioExporter : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/AudioGate.cpp b/src/objects/sound/AudioGate.cpp index a581c4fe..502edf96 100644 --- a/src/objects/sound/AudioGate.cpp +++ b/src/objects/sound/AudioGate.cpp @@ -98,7 +98,7 @@ void AudioGate::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void AudioGate::updateObjectContent(map> &patchObjects){ +void AudioGate::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0]){ diff --git a/src/objects/sound/AudioGate.h b/src/objects/sound/AudioGate.h index f48da8d4..9e92628d 100644 --- a/src/objects/sound/AudioGate.h +++ b/src/objects/sound/AudioGate.h @@ -44,7 +44,7 @@ class AudioGate : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/Crossfader.cpp b/src/objects/sound/Crossfader.cpp index 42ce5a1c..6b2435ef 100755 --- a/src/objects/sound/Crossfader.cpp +++ b/src/objects/sound/Crossfader.cpp @@ -98,7 +98,7 @@ void Crossfader::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void Crossfader::updateObjectContent(map> &patchObjects){ +void Crossfader::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[2]){ diff --git a/src/objects/sound/Crossfader.h b/src/objects/sound/Crossfader.h index bdc9e7e8..950dc94a 100755 --- a/src/objects/sound/Crossfader.h +++ b/src/objects/sound/Crossfader.h @@ -45,7 +45,7 @@ class Crossfader : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/FrequencyToNote.cpp b/src/objects/sound/FrequencyToNote.cpp index 9ee8654b..4e6979f9 100755 --- a/src/objects/sound/FrequencyToNote.cpp +++ b/src/objects/sound/FrequencyToNote.cpp @@ -85,7 +85,7 @@ void FrequencyToNote::setupObjectContent(shared_ptr &mainWindow } //-------------------------------------------------------------- -void FrequencyToNote::updateObjectContent(map> &patchObjects){ +void FrequencyToNote::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0]){ diff --git a/src/objects/sound/FrequencyToNote.h b/src/objects/sound/FrequencyToNote.h index 6bab7534..9aaeb970 100755 --- a/src/objects/sound/FrequencyToNote.h +++ b/src/objects/sound/FrequencyToNote.h @@ -48,7 +48,7 @@ class FrequencyToNote : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/Mixer.cpp b/src/objects/sound/Mixer.cpp index 73e11049..4c3cf07d 100755 --- a/src/objects/sound/Mixer.cpp +++ b/src/objects/sound/Mixer.cpp @@ -142,7 +142,7 @@ void Mixer::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void Mixer::updateObjectContent(map> &patchObjects){ +void Mixer::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0] && !ofxVP_CAST_PIN_PTR>(this->_inletParams[0])->empty()){ diff --git a/src/objects/sound/Mixer.h b/src/objects/sound/Mixer.h index 7f38f96b..0b86d03e 100755 --- a/src/objects/sound/Mixer.h +++ b/src/objects/sound/Mixer.h @@ -47,7 +47,7 @@ class Mixer : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/NoteToFrequency.cpp b/src/objects/sound/NoteToFrequency.cpp index 2d542533..c48fd535 100755 --- a/src/objects/sound/NoteToFrequency.cpp +++ b/src/objects/sound/NoteToFrequency.cpp @@ -119,7 +119,7 @@ void NoteToFrequency::setupObjectContent(shared_ptr &mainWindow } //-------------------------------------------------------------- -void NoteToFrequency::updateObjectContent(map> &patchObjects){ +void NoteToFrequency::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0]){ diff --git a/src/objects/sound/NoteToFrequency.h b/src/objects/sound/NoteToFrequency.h index fb55c5d9..6bbbb1ae 100755 --- a/src/objects/sound/NoteToFrequency.h +++ b/src/objects/sound/NoteToFrequency.h @@ -49,7 +49,7 @@ class NoteToFrequency : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/Oscillator.cpp b/src/objects/sound/Oscillator.cpp index 7bb23e44..b402b2f6 100755 --- a/src/objects/sound/Oscillator.cpp +++ b/src/objects/sound/Oscillator.cpp @@ -198,7 +198,7 @@ void Oscillator::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void Oscillator::updateObjectContent(map> &patchObjects){ +void Oscillator::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); // silence pitch 0 diff --git a/src/objects/sound/Oscillator.h b/src/objects/sound/Oscillator.h index 5e54a821..9e61ea3a 100755 --- a/src/objects/sound/Oscillator.h +++ b/src/objects/sound/Oscillator.h @@ -47,7 +47,7 @@ class Oscillator : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/PDPatch.cpp b/src/objects/sound/PDPatch.cpp index 28aba92d..e7d69e87 100644 --- a/src/objects/sound/PDPatch.cpp +++ b/src/objects/sound/PDPatch.cpp @@ -140,7 +140,7 @@ void PDPatch::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void PDPatch::updateObjectContent(map> &patchObjects){ +void PDPatch::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(patchLoaded){ diff --git a/src/objects/sound/PDPatch.h b/src/objects/sound/PDPatch.h index 52b7936e..df78f6b6 100644 --- a/src/objects/sound/PDPatch.h +++ b/src/objects/sound/PDPatch.h @@ -54,7 +54,7 @@ class PDPatch : public PatchObject, public PdReceiver, public PdMidiReceiver{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/Panner.cpp b/src/objects/sound/Panner.cpp index 0727f2c2..6b141885 100755 --- a/src/objects/sound/Panner.cpp +++ b/src/objects/sound/Panner.cpp @@ -98,7 +98,7 @@ void Panner::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void Panner::updateObjectContent(map> &patchObjects){ +void Panner::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[1]){ diff --git a/src/objects/sound/Panner.h b/src/objects/sound/Panner.h index 1a35afab..0697dbf1 100755 --- a/src/objects/sound/Panner.h +++ b/src/objects/sound/Panner.h @@ -47,7 +47,7 @@ class Panner : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/PolyphonicOscillator.cpp b/src/objects/sound/PolyphonicOscillator.cpp index b23a82c8..52479056 100755 --- a/src/objects/sound/PolyphonicOscillator.cpp +++ b/src/objects/sound/PolyphonicOscillator.cpp @@ -241,7 +241,7 @@ void PolyphonicOscillator::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void PolyphonicOscillator::updateObjectContent(map> &patchObjects){ +void PolyphonicOscillator::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0] && ofxVP_CAST_PIN_PTR>(this->_inletParams[0])->size()>0){ diff --git a/src/objects/sound/PolyphonicOscillator.h b/src/objects/sound/PolyphonicOscillator.h index 89d6316c..2a467894 100755 --- a/src/objects/sound/PolyphonicOscillator.h +++ b/src/objects/sound/PolyphonicOscillator.h @@ -49,7 +49,7 @@ class PolyphonicOscillator : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/QuadPanner.cpp b/src/objects/sound/QuadPanner.cpp index 908d7851..55c5982a 100755 --- a/src/objects/sound/QuadPanner.cpp +++ b/src/objects/sound/QuadPanner.cpp @@ -119,7 +119,7 @@ void QuadPanner::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void QuadPanner::updateObjectContent(map> &patchObjects){ +void QuadPanner::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[1]){ padX = ofClamp(*ofxVP_CAST_PIN_PTR(this->_inletParams[1]),0.0f,1.0f); diff --git a/src/objects/sound/QuadPanner.h b/src/objects/sound/QuadPanner.h index 971a62c3..9337a8a8 100755 --- a/src/objects/sound/QuadPanner.h +++ b/src/objects/sound/QuadPanner.h @@ -47,7 +47,7 @@ class QuadPanner : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/Quantizer.cpp b/src/objects/sound/Quantizer.cpp index 757e8234..c0d6627b 100755 --- a/src/objects/sound/Quantizer.cpp +++ b/src/objects/sound/Quantizer.cpp @@ -134,7 +134,7 @@ void Quantizer::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void Quantizer::updateObjectContent(map> &patchObjects){ +void Quantizer::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0]){ diff --git a/src/objects/sound/Quantizer.h b/src/objects/sound/Quantizer.h index 028efaf7..d498acda 100755 --- a/src/objects/sound/Quantizer.h +++ b/src/objects/sound/Quantizer.h @@ -358,7 +358,7 @@ class Quantizer : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/SamplePlayer.cpp b/src/objects/sound/SamplePlayer.cpp index 42cfd6a9..7b2aaa1d 100755 --- a/src/objects/sound/SamplePlayer.cpp +++ b/src/objects/sound/SamplePlayer.cpp @@ -156,7 +156,7 @@ void SamplePlayer::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void SamplePlayer::updateObjectContent(map> &patchObjects){ +void SamplePlayer::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(soundfileLoaded && ofGetElapsedTimeMillis()-startTime > 100){ diff --git a/src/objects/sound/SamplePlayer.h b/src/objects/sound/SamplePlayer.h index ab8dcf5f..96cda241 100755 --- a/src/objects/sound/SamplePlayer.h +++ b/src/objects/sound/SamplePlayer.h @@ -49,7 +49,7 @@ class SamplePlayer : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/SigMult.cpp b/src/objects/sound/SigMult.cpp index 4294e92b..56df2132 100755 --- a/src/objects/sound/SigMult.cpp +++ b/src/objects/sound/SigMult.cpp @@ -89,7 +89,7 @@ void SigMult::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void SigMult::updateObjectContent(map> &patchObjects){ +void SigMult::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[1]){ diff --git a/src/objects/sound/SigMult.h b/src/objects/sound/SigMult.h index 4a877d6e..1ace973a 100755 --- a/src/objects/sound/SigMult.h +++ b/src/objects/sound/SigMult.h @@ -45,7 +45,7 @@ class SigMult : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/SignalOperator.cpp b/src/objects/sound/SignalOperator.cpp index 414993a9..bd1e121d 100755 --- a/src/objects/sound/SignalOperator.cpp +++ b/src/objects/sound/SignalOperator.cpp @@ -92,7 +92,7 @@ void SignalOperator::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void SignalOperator::updateObjectContent(map> &patchObjects){ +void SignalOperator::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(!loaded){ diff --git a/src/objects/sound/SignalOperator.h b/src/objects/sound/SignalOperator.h index 119060d7..eb08c537 100755 --- a/src/objects/sound/SignalOperator.h +++ b/src/objects/sound/SignalOperator.h @@ -47,7 +47,7 @@ class SignalOperator : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/SignalTrigger.cpp b/src/objects/sound/SignalTrigger.cpp index a695bd6d..d796e9c0 100755 --- a/src/objects/sound/SignalTrigger.cpp +++ b/src/objects/sound/SignalTrigger.cpp @@ -97,7 +97,7 @@ void SignalTrigger::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void SignalTrigger::updateObjectContent(map> &patchObjects){ +void SignalTrigger::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[1]){ thresh = ofClamp(*ofxVP_CAST_PIN_PTR(this->_inletParams[1]),0.0f,1.0f); diff --git a/src/objects/sound/SignalTrigger.h b/src/objects/sound/SignalTrigger.h index 93a787a4..94f5e587 100755 --- a/src/objects/sound/SignalTrigger.h +++ b/src/objects/sound/SignalTrigger.h @@ -47,7 +47,7 @@ class SignalTrigger : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/SoundfilePlayer.cpp b/src/objects/sound/SoundfilePlayer.cpp index 44aab2cd..0b072748 100755 --- a/src/objects/sound/SoundfilePlayer.cpp +++ b/src/objects/sound/SoundfilePlayer.cpp @@ -146,7 +146,7 @@ void SoundfilePlayer::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void SoundfilePlayer::updateObjectContent(map> &patchObjects){ +void SoundfilePlayer::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(soundfileLoaded && ofGetElapsedTimeMillis()-startTime > 100){ diff --git a/src/objects/sound/SoundfilePlayer.h b/src/objects/sound/SoundfilePlayer.h index dd50a617..8e1a2377 100755 --- a/src/objects/sound/SoundfilePlayer.h +++ b/src/objects/sound/SoundfilePlayer.h @@ -49,7 +49,7 @@ class SoundfilePlayer : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/SummingMixer.cpp b/src/objects/sound/SummingMixer.cpp index e1692bf3..be010cae 100644 --- a/src/objects/sound/SummingMixer.cpp +++ b/src/objects/sound/SummingMixer.cpp @@ -108,7 +108,7 @@ void SummingMixer::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void SummingMixer::updateObjectContent(map> &patchObjects){ +void SummingMixer::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(needReset){ diff --git a/src/objects/sound/SummingMixer.h b/src/objects/sound/SummingMixer.h index c6edb7f6..4d03eba4 100644 --- a/src/objects/sound/SummingMixer.h +++ b/src/objects/sound/SummingMixer.h @@ -45,7 +45,7 @@ class SummingMixer : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/pdspADSR.cpp b/src/objects/sound/pdspADSR.cpp index 18407b20..94ef0d96 100755 --- a/src/objects/sound/pdspADSR.cpp +++ b/src/objects/sound/pdspADSR.cpp @@ -121,7 +121,7 @@ void pdspADSR::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspADSR::updateObjectContent(map> &patchObjects){ +void pdspADSR::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); // A diff --git a/src/objects/sound/pdspADSR.h b/src/objects/sound/pdspADSR.h index bedfaa28..5c02ef6a 100755 --- a/src/objects/sound/pdspADSR.h +++ b/src/objects/sound/pdspADSR.h @@ -48,7 +48,7 @@ class pdspADSR : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/pdspAHR.cpp b/src/objects/sound/pdspAHR.cpp index 13646682..e03639a0 100755 --- a/src/objects/sound/pdspAHR.cpp +++ b/src/objects/sound/pdspAHR.cpp @@ -115,7 +115,7 @@ void pdspAHR::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspAHR::updateObjectContent(map> &patchObjects){ +void pdspAHR::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); // A diff --git a/src/objects/sound/pdspAHR.h b/src/objects/sound/pdspAHR.h index 10544e00..f73534b5 100755 --- a/src/objects/sound/pdspAHR.h +++ b/src/objects/sound/pdspAHR.h @@ -48,7 +48,7 @@ class pdspAHR : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/pdspAddressSequencer.cpp b/src/objects/sound/pdspAddressSequencer.cpp index 34ce6480..f65a7e73 100755 --- a/src/objects/sound/pdspAddressSequencer.cpp +++ b/src/objects/sound/pdspAddressSequencer.cpp @@ -155,7 +155,7 @@ void pdspAddressSequencer::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspAddressSequencer::updateObjectContent(map> &patchObjects){ +void pdspAddressSequencer::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[1]){ // ratio diff --git a/src/objects/sound/pdspAddressSequencer.h b/src/objects/sound/pdspAddressSequencer.h index 6b6b5330..a1d5e2cf 100755 --- a/src/objects/sound/pdspAddressSequencer.h +++ b/src/objects/sound/pdspAddressSequencer.h @@ -50,7 +50,7 @@ class pdspAddressSequencer : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void updateAudioObjectContent(pdsp::Engine &engine) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; diff --git a/src/objects/sound/pdspBitCruncher.cpp b/src/objects/sound/pdspBitCruncher.cpp index 09c0535b..a32a232e 100755 --- a/src/objects/sound/pdspBitCruncher.cpp +++ b/src/objects/sound/pdspBitCruncher.cpp @@ -92,7 +92,7 @@ void pdspBitCruncher::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspBitCruncher::updateObjectContent(map> &patchObjects){ +void pdspBitCruncher::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[1]){ bits = ofClamp(*ofxVP_CAST_PIN_PTR(this->_inletParams[1]),1.0f,8.0f); diff --git a/src/objects/sound/pdspBitCruncher.h b/src/objects/sound/pdspBitCruncher.h index 47fc8108..f1cd6720 100755 --- a/src/objects/sound/pdspBitCruncher.h +++ b/src/objects/sound/pdspBitCruncher.h @@ -45,7 +45,7 @@ class pdspBitCruncher : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/pdspBitNoise.cpp b/src/objects/sound/pdspBitNoise.cpp index 514db40d..9cc1e2c4 100755 --- a/src/objects/sound/pdspBitNoise.cpp +++ b/src/objects/sound/pdspBitNoise.cpp @@ -113,7 +113,7 @@ void pdspBitNoise::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspBitNoise::updateObjectContent(map> &patchObjects){ +void pdspBitNoise::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0]){ pitch = ofClamp(*ofxVP_CAST_PIN_PTR(this->_inletParams[0]),-100,150); diff --git a/src/objects/sound/pdspBitNoise.h b/src/objects/sound/pdspBitNoise.h index 4caec108..611d75dd 100755 --- a/src/objects/sound/pdspBitNoise.h +++ b/src/objects/sound/pdspBitNoise.h @@ -47,7 +47,7 @@ class pdspBitNoise : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/pdspChorusEffect.cpp b/src/objects/sound/pdspChorusEffect.cpp index b52ad48e..769e6e3f 100755 --- a/src/objects/sound/pdspChorusEffect.cpp +++ b/src/objects/sound/pdspChorusEffect.cpp @@ -114,7 +114,7 @@ void pdspChorusEffect::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspChorusEffect::updateObjectContent(map> &patchObjects){ +void pdspChorusEffect::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[1]){ speed = ofClamp(*ofxVP_CAST_PIN_PTR(this->_inletParams[1]),0.0f,1.0f); diff --git a/src/objects/sound/pdspChorusEffect.h b/src/objects/sound/pdspChorusEffect.h index 220c943f..56e4a0f9 100755 --- a/src/objects/sound/pdspChorusEffect.h +++ b/src/objects/sound/pdspChorusEffect.h @@ -47,7 +47,7 @@ class pdspChorusEffect : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/pdspCombFilter.cpp b/src/objects/sound/pdspCombFilter.cpp index 19c9c4a2..4535645c 100755 --- a/src/objects/sound/pdspCombFilter.cpp +++ b/src/objects/sound/pdspCombFilter.cpp @@ -113,7 +113,7 @@ void pdspCombFilter::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspCombFilter::updateObjectContent(map> &patchObjects){ +void pdspCombFilter::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[1]){ pitch = ofClamp(*ofxVP_CAST_PIN_PTR(this->_inletParams[1]),0.0f,127.0f); diff --git a/src/objects/sound/pdspCombFilter.h b/src/objects/sound/pdspCombFilter.h index 3e934029..cc86b8d5 100755 --- a/src/objects/sound/pdspCombFilter.h +++ b/src/objects/sound/pdspCombFilter.h @@ -46,7 +46,7 @@ class pdspCombFilter : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/pdspCompressor.cpp b/src/objects/sound/pdspCompressor.cpp index da76228a..d8200478 100755 --- a/src/objects/sound/pdspCompressor.cpp +++ b/src/objects/sound/pdspCompressor.cpp @@ -133,7 +133,7 @@ void pdspCompressor::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspCompressor::updateObjectContent(map> &patchObjects){ +void pdspCompressor::updateObjectContent(std::map> &patchObjects){ // attack if(this->inletsConnected[1]){ diff --git a/src/objects/sound/pdspCompressor.h b/src/objects/sound/pdspCompressor.h index 7b14dcbd..076809e2 100755 --- a/src/objects/sound/pdspCompressor.h +++ b/src/objects/sound/pdspCompressor.h @@ -47,7 +47,7 @@ class pdspCompressor : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/pdspDataOscillator.cpp b/src/objects/sound/pdspDataOscillator.cpp index a37c8381..022ec2e1 100755 --- a/src/objects/sound/pdspDataOscillator.cpp +++ b/src/objects/sound/pdspDataOscillator.cpp @@ -101,7 +101,7 @@ void pdspDataOscillator::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspDataOscillator::updateObjectContent(map> &patchObjects){ +void pdspDataOscillator::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); // PITCH diff --git a/src/objects/sound/pdspDataOscillator.h b/src/objects/sound/pdspDataOscillator.h index 6a5c51e8..19f0f989 100755 --- a/src/objects/sound/pdspDataOscillator.h +++ b/src/objects/sound/pdspDataOscillator.h @@ -48,7 +48,7 @@ class pdspDataOscillator : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/pdspDecimator.cpp b/src/objects/sound/pdspDecimator.cpp index e29c3a80..60ca38f8 100755 --- a/src/objects/sound/pdspDecimator.cpp +++ b/src/objects/sound/pdspDecimator.cpp @@ -88,7 +88,7 @@ void pdspDecimator::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspDecimator::updateObjectContent(map> &patchObjects){ +void pdspDecimator::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[1]){ freq = ofClamp(*ofxVP_CAST_PIN_PTR(this->_inletParams[1]),2.0f,1600.0f); diff --git a/src/objects/sound/pdspDecimator.h b/src/objects/sound/pdspDecimator.h index 05ec4610..bb0c5fc4 100755 --- a/src/objects/sound/pdspDecimator.h +++ b/src/objects/sound/pdspDecimator.h @@ -45,7 +45,7 @@ class pdspDecimator : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/pdspDelay.cpp b/src/objects/sound/pdspDelay.cpp index 5ccb5533..d746db06 100755 --- a/src/objects/sound/pdspDelay.cpp +++ b/src/objects/sound/pdspDelay.cpp @@ -118,7 +118,7 @@ void pdspDelay::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspDelay::updateObjectContent(map> &patchObjects){ +void pdspDelay::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[1]){ time = ofClamp(*ofxVP_CAST_PIN_PTR(this->_inletParams[1]),0.0f,DELAY_MAX_TIME); diff --git a/src/objects/sound/pdspDelay.h b/src/objects/sound/pdspDelay.h index 593b2620..62215532 100755 --- a/src/objects/sound/pdspDelay.h +++ b/src/objects/sound/pdspDelay.h @@ -47,7 +47,7 @@ class pdspDelay : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/pdspDucker.cpp b/src/objects/sound/pdspDucker.cpp index 271d2098..a32dbfb7 100755 --- a/src/objects/sound/pdspDucker.cpp +++ b/src/objects/sound/pdspDucker.cpp @@ -133,7 +133,7 @@ void pdspDucker::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspDucker::updateObjectContent(map> &patchObjects){ +void pdspDucker::updateObjectContent(std::map> &patchObjects){ ducker.setAttackCurve(attackHardness); ducker.setReleaseCurve(releaseHardness); diff --git a/src/objects/sound/pdspDucker.h b/src/objects/sound/pdspDucker.h index e6d5839c..14123ab8 100755 --- a/src/objects/sound/pdspDucker.h +++ b/src/objects/sound/pdspDucker.h @@ -48,7 +48,7 @@ class pdspDucker : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/pdspHiCut.cpp b/src/objects/sound/pdspHiCut.cpp index 85c10a4a..f659f49d 100755 --- a/src/objects/sound/pdspHiCut.cpp +++ b/src/objects/sound/pdspHiCut.cpp @@ -99,7 +99,7 @@ void pdspHiCut::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspHiCut::updateObjectContent(map> &patchObjects){ +void pdspHiCut::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[1]){ diff --git a/src/objects/sound/pdspHiCut.h b/src/objects/sound/pdspHiCut.h index de763cb5..993702a3 100755 --- a/src/objects/sound/pdspHiCut.h +++ b/src/objects/sound/pdspHiCut.h @@ -45,7 +45,7 @@ class pdspHiCut : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/pdspKick.cpp b/src/objects/sound/pdspKick.cpp index 2cc62be2..cc9dc97e 100755 --- a/src/objects/sound/pdspKick.cpp +++ b/src/objects/sound/pdspKick.cpp @@ -172,7 +172,7 @@ void pdspKick::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspKick::updateObjectContent(map> &patchObjects){ +void pdspKick::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); ampEnv.set(attackDuration,decayDuration,sustainLevel,releaseDuration); diff --git a/src/objects/sound/pdspKick.h b/src/objects/sound/pdspKick.h index 4aef9439..17bc2489 100755 --- a/src/objects/sound/pdspKick.h +++ b/src/objects/sound/pdspKick.h @@ -47,7 +47,7 @@ class pdspKick : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/pdspLFO.cpp b/src/objects/sound/pdspLFO.cpp index 331d38f1..2b9f483e 100755 --- a/src/objects/sound/pdspLFO.cpp +++ b/src/objects/sound/pdspLFO.cpp @@ -123,7 +123,7 @@ void pdspLFO::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspLFO::updateObjectContent(map> &patchObjects){ +void pdspLFO::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); // retrig if(this->inletsConnected[0]){ diff --git a/src/objects/sound/pdspLFO.h b/src/objects/sound/pdspLFO.h index 4343b361..070478b1 100755 --- a/src/objects/sound/pdspLFO.h +++ b/src/objects/sound/pdspLFO.h @@ -46,7 +46,7 @@ class pdspLFO : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/pdspLowCut.cpp b/src/objects/sound/pdspLowCut.cpp index d809c133..13a3daa0 100755 --- a/src/objects/sound/pdspLowCut.cpp +++ b/src/objects/sound/pdspLowCut.cpp @@ -98,7 +98,7 @@ void pdspLowCut::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspLowCut::updateObjectContent(map> &patchObjects){ +void pdspLowCut::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[1]){ diff --git a/src/objects/sound/pdspLowCut.h b/src/objects/sound/pdspLowCut.h index 0d784ecf..afb2a99e 100755 --- a/src/objects/sound/pdspLowCut.h +++ b/src/objects/sound/pdspLowCut.h @@ -45,7 +45,7 @@ class pdspLowCut : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/pdspParametricEQ.cpp b/src/objects/sound/pdspParametricEQ.cpp index 9c5b5ad5..b033e780 100755 --- a/src/objects/sound/pdspParametricEQ.cpp +++ b/src/objects/sound/pdspParametricEQ.cpp @@ -159,7 +159,7 @@ void pdspParametricEQ::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspParametricEQ::updateObjectContent(map> &patchObjects){ +void pdspParametricEQ::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(!loaded){ diff --git a/src/objects/sound/pdspParametricEQ.h b/src/objects/sound/pdspParametricEQ.h index e928a860..86b179f2 100755 --- a/src/objects/sound/pdspParametricEQ.h +++ b/src/objects/sound/pdspParametricEQ.h @@ -50,7 +50,7 @@ class pdspParametricEQ : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/pdspResonant2PoleFilter.cpp b/src/objects/sound/pdspResonant2PoleFilter.cpp index ae05a4ac..f2e35a7c 100755 --- a/src/objects/sound/pdspResonant2PoleFilter.cpp +++ b/src/objects/sound/pdspResonant2PoleFilter.cpp @@ -124,7 +124,7 @@ void pdspResonant2PoleFilter::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspResonant2PoleFilter::updateObjectContent(map> &patchObjects){ +void pdspResonant2PoleFilter::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[1]){ diff --git a/src/objects/sound/pdspResonant2PoleFilter.h b/src/objects/sound/pdspResonant2PoleFilter.h index 06fe87c4..5eac679f 100755 --- a/src/objects/sound/pdspResonant2PoleFilter.h +++ b/src/objects/sound/pdspResonant2PoleFilter.h @@ -48,7 +48,7 @@ class pdspResonant2PoleFilter : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/pdspReverb.cpp b/src/objects/sound/pdspReverb.cpp index e555687a..daededff 100755 --- a/src/objects/sound/pdspReverb.cpp +++ b/src/objects/sound/pdspReverb.cpp @@ -136,7 +136,7 @@ void pdspReverb::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspReverb::updateObjectContent(map> &patchObjects){ +void pdspReverb::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[1]){ diff --git a/src/objects/sound/pdspReverb.h b/src/objects/sound/pdspReverb.h index d30a87cd..b71aeb7a 100755 --- a/src/objects/sound/pdspReverb.h +++ b/src/objects/sound/pdspReverb.h @@ -47,7 +47,7 @@ class pdspReverb : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/sound/pdspSequencer.cpp b/src/objects/sound/pdspSequencer.cpp index 13c0069a..44127216 100755 --- a/src/objects/sound/pdspSequencer.cpp +++ b/src/objects/sound/pdspSequencer.cpp @@ -250,7 +250,7 @@ void pdspSequencer::setupAudioOutObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspSequencer::updateObjectContent(map> &patchObjects){ +void pdspSequencer::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); // steps diff --git a/src/objects/sound/pdspSequencer.h b/src/objects/sound/pdspSequencer.h index 77ecd6cb..7daafdbf 100755 --- a/src/objects/sound/pdspSequencer.h +++ b/src/objects/sound/pdspSequencer.h @@ -53,7 +53,7 @@ class pdspSequencer : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void updateAudioObjectContent(pdsp::Engine &engine) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; diff --git a/src/objects/string/RandomString.cpp b/src/objects/string/RandomString.cpp index bb223b20..c06e1f4a 100755 --- a/src/objects/string/RandomString.cpp +++ b/src/objects/string/RandomString.cpp @@ -80,7 +80,7 @@ void RandomString::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void RandomString::updateObjectContent(map> &patchObjects){ +void RandomString::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[0]){ if(*ofxVP_CAST_PIN_PTR(this->_inletParams[0]) < 1.0){ bang = false; diff --git a/src/objects/string/RandomString.h b/src/objects/string/RandomString.h index 21240c3c..cd871a71 100755 --- a/src/objects/string/RandomString.h +++ b/src/objects/string/RandomString.h @@ -45,7 +45,7 @@ class RandomString : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/string/StringAt.cpp b/src/objects/string/StringAt.cpp index 33a1b6f0..f76c173d 100755 --- a/src/objects/string/StringAt.cpp +++ b/src/objects/string/StringAt.cpp @@ -73,7 +73,7 @@ void StringAt::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void StringAt::updateObjectContent(map> &patchObjects){ +void StringAt::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[1]){ diff --git a/src/objects/string/StringAt.h b/src/objects/string/StringAt.h index 598e9a35..7e689e15 100755 --- a/src/objects/string/StringAt.h +++ b/src/objects/string/StringAt.h @@ -44,7 +44,7 @@ class StringAt : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/string/StringConcat.cpp b/src/objects/string/StringConcat.cpp index 87e68ed6..881af8b5 100755 --- a/src/objects/string/StringConcat.cpp +++ b/src/objects/string/StringConcat.cpp @@ -88,7 +88,7 @@ void StringConcat::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void StringConcat::updateObjectContent(map> &patchObjects){ +void StringConcat::updateObjectContent(std::map> &patchObjects){ *ofxVP_CAST_PIN_PTR(_outletParams[0]) = ""; for(int i=0;inumInlets;i++){ if(this->inletsConnected[i]){ diff --git a/src/objects/string/StringConcat.h b/src/objects/string/StringConcat.h index 559f5a40..56c271cc 100755 --- a/src/objects/string/StringConcat.h +++ b/src/objects/string/StringConcat.h @@ -44,7 +44,7 @@ class StringConcat : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/string/StringExtract.cpp b/src/objects/string/StringExtract.cpp index fce46db9..903855a4 100755 --- a/src/objects/string/StringExtract.cpp +++ b/src/objects/string/StringExtract.cpp @@ -77,7 +77,7 @@ void StringExtract::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void StringExtract::updateObjectContent(map> &patchObjects){ +void StringExtract::updateObjectContent(std::map> &patchObjects){ *ofxVP_CAST_PIN_PTR(_outletParams[0]) = ""; if(this->inletsConnected[0] && start < end){ diff --git a/src/objects/string/StringExtract.h b/src/objects/string/StringExtract.h index 4b3d8658..548b6c99 100755 --- a/src/objects/string/StringExtract.h +++ b/src/objects/string/StringExtract.h @@ -44,7 +44,7 @@ class StringExtract : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/string/StringGate.cpp b/src/objects/string/StringGate.cpp index b14e2979..2ecbbfe8 100644 --- a/src/objects/string/StringGate.cpp +++ b/src/objects/string/StringGate.cpp @@ -92,7 +92,7 @@ void StringGate::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void StringGate::updateObjectContent(map> &patchObjects){ +void StringGate::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); *ofxVP_CAST_PIN_PTR(_outletParams[0]) = ""; diff --git a/src/objects/string/StringGate.h b/src/objects/string/StringGate.h index 3acf6215..721690bf 100644 --- a/src/objects/string/StringGate.h +++ b/src/objects/string/StringGate.h @@ -44,7 +44,7 @@ class StringGate : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/string/StringMultiplexer.cpp b/src/objects/string/StringMultiplexer.cpp index 97cb66c3..5402976e 100755 --- a/src/objects/string/StringMultiplexer.cpp +++ b/src/objects/string/StringMultiplexer.cpp @@ -90,7 +90,7 @@ void StringMultiplexer::setupObjectContent(shared_ptr &mainWind } //-------------------------------------------------------------- -void StringMultiplexer::updateObjectContent(map> &patchObjects){ +void StringMultiplexer::updateObjectContent(std::map> &patchObjects){ for(int i=0;inumInlets;i++){ if(this->inletsConnected[i]){ if(*ofxVP_CAST_PIN_PTR(_inletParams[i]) != inletsMemory.at(i)){ diff --git a/src/objects/string/StringMultiplexer.h b/src/objects/string/StringMultiplexer.h index 745d5b85..7dec4324 100755 --- a/src/objects/string/StringMultiplexer.h +++ b/src/objects/string/StringMultiplexer.h @@ -44,7 +44,7 @@ class StringMultiplexer : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/surface/FboComposer.cpp b/src/objects/surface/FboComposer.cpp index 3c869191..b30a0e15 100644 --- a/src/objects/surface/FboComposer.cpp +++ b/src/objects/surface/FboComposer.cpp @@ -87,7 +87,7 @@ void FboComposer::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void FboComposer::updateObjectContent(map> &patchObjects){ +void FboComposer::updateObjectContent(std::map> &patchObjects){ if(!loaded){ loaded = true; diff --git a/src/objects/surface/FboComposer.h b/src/objects/surface/FboComposer.h index f3513f1c..92dbf366 100644 --- a/src/objects/surface/FboComposer.h +++ b/src/objects/surface/FboComposer.h @@ -44,7 +44,7 @@ class FboComposer : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/surface/FboEffect.cpp b/src/objects/surface/FboEffect.cpp index 6ae95c67..629b1932 100644 --- a/src/objects/surface/FboEffect.cpp +++ b/src/objects/surface/FboEffect.cpp @@ -90,7 +90,7 @@ void FboEffect::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void FboEffect::updateObjectContent(map> &patchObjects){ +void FboEffect::updateObjectContent(std::map> &patchObjects){ fboW = ofxVP_CAST_PIN_PTR(_outletParams[1])->getWidth(); fboH = ofxVP_CAST_PIN_PTR(_outletParams[1])->getHeight(); diff --git a/src/objects/surface/FboEffect.h b/src/objects/surface/FboEffect.h index 8933c3e1..b5858dd2 100644 --- a/src/objects/surface/FboEffect.h +++ b/src/objects/surface/FboEffect.h @@ -44,7 +44,7 @@ class FboEffect : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/surface/FboParticles.cpp b/src/objects/surface/FboParticles.cpp index fa2edc3b..8c29e937 100644 --- a/src/objects/surface/FboParticles.cpp +++ b/src/objects/surface/FboParticles.cpp @@ -105,7 +105,7 @@ void FboParticles::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void FboParticles::updateObjectContent(map> &patchObjects){ +void FboParticles::updateObjectContent(std::map> &patchObjects){ // particle system origin X if(this->inletsConnected[1]){ diff --git a/src/objects/surface/FboParticles.h b/src/objects/surface/FboParticles.h index 8f5fbddc..5f64e352 100644 --- a/src/objects/surface/FboParticles.h +++ b/src/objects/surface/FboParticles.h @@ -48,7 +48,7 @@ class FboParticles : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/video/KinectGrabber.cpp b/src/objects/video/KinectGrabber.cpp index 4a97f90f..3c8abeea 100644 --- a/src/objects/video/KinectGrabber.cpp +++ b/src/objects/video/KinectGrabber.cpp @@ -106,7 +106,7 @@ void KinectGrabber::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void KinectGrabber::updateObjectContent(map> &patchObjects){ +void KinectGrabber::updateObjectContent(std::map> &patchObjects){ if(needReset){ needReset = false; diff --git a/src/objects/video/KinectGrabber.h b/src/objects/video/KinectGrabber.h index b9e3a838..0b992b7e 100644 --- a/src/objects/video/KinectGrabber.h +++ b/src/objects/video/KinectGrabber.h @@ -50,7 +50,7 @@ class KinectGrabber : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/video/PixelsToTexture.cpp b/src/objects/video/PixelsToTexture.cpp index 2e410165..71613013 100644 --- a/src/objects/video/PixelsToTexture.cpp +++ b/src/objects/video/PixelsToTexture.cpp @@ -65,7 +65,7 @@ void PixelsToTexture::setupObjectContent(shared_ptr &mainWindow } //-------------------------------------------------------------- -void PixelsToTexture::updateObjectContent(map> &patchObjects){ +void PixelsToTexture::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0]){ diff --git a/src/objects/video/PixelsToTexture.h b/src/objects/video/PixelsToTexture.h index 8af5288f..6a13a3ff 100644 --- a/src/objects/video/PixelsToTexture.h +++ b/src/objects/video/PixelsToTexture.h @@ -44,7 +44,7 @@ class PixelsToTexture : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/video/TextureInformation.cpp b/src/objects/video/TextureInformation.cpp index 373336c6..600dc700 100644 --- a/src/objects/video/TextureInformation.cpp +++ b/src/objects/video/TextureInformation.cpp @@ -77,7 +77,7 @@ void TextureInformation::setupObjectContent(shared_ptr &mainWin } //-------------------------------------------------------------- -void TextureInformation::updateObjectContent(map> &patchObjects){ +void TextureInformation::updateObjectContent(std::map> &patchObjects){ if( this->inletsConnected[0] ){ ofTexture* inTex = static_cast< ofTexture* >(_inletParams[0]); if( inTex && inTex->isAllocated() ){ diff --git a/src/objects/video/TextureInformation.h b/src/objects/video/TextureInformation.h index d24bc242..c5df82d7 100644 --- a/src/objects/video/TextureInformation.h +++ b/src/objects/video/TextureInformation.h @@ -46,7 +46,7 @@ class TextureInformation : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/video/TextureToPixels.cpp b/src/objects/video/TextureToPixels.cpp index 2c0d3e40..a58cf3bc 100644 --- a/src/objects/video/TextureToPixels.cpp +++ b/src/objects/video/TextureToPixels.cpp @@ -65,7 +65,7 @@ void TextureToPixels::setupObjectContent(shared_ptr &mainWindow } //-------------------------------------------------------------- -void TextureToPixels::updateObjectContent(map> &patchObjects){ +void TextureToPixels::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0] && ofxVP_CAST_PIN_PTR(_inletParams[0])->isAllocated()){ diff --git a/src/objects/video/TextureToPixels.h b/src/objects/video/TextureToPixels.h index 0cb7a15d..0a0ccbb3 100644 --- a/src/objects/video/TextureToPixels.h +++ b/src/objects/video/TextureToPixels.h @@ -44,7 +44,7 @@ class TextureToPixels : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/video/ToGrayScaleTexture.cpp b/src/objects/video/ToGrayScaleTexture.cpp index dfac1d90..7dd43c5f 100644 --- a/src/objects/video/ToGrayScaleTexture.cpp +++ b/src/objects/video/ToGrayScaleTexture.cpp @@ -83,7 +83,7 @@ void ToGrayScaleTexture::setupObjectContent(shared_ptr &mainWin } //-------------------------------------------------------------- -void ToGrayScaleTexture::updateObjectContent(map> &patchObjects){ +void ToGrayScaleTexture::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); // UPDATE STUFF diff --git a/src/objects/video/ToGrayScaleTexture.h b/src/objects/video/ToGrayScaleTexture.h index 1277617e..8277dd45 100644 --- a/src/objects/video/ToGrayScaleTexture.h +++ b/src/objects/video/ToGrayScaleTexture.h @@ -47,7 +47,7 @@ class ToGrayScaleTexture : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/video/VideoCrop.cpp b/src/objects/video/VideoCrop.cpp index a786884d..5fb32eee 100644 --- a/src/objects/video/VideoCrop.cpp +++ b/src/objects/video/VideoCrop.cpp @@ -105,7 +105,7 @@ void VideoCrop::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void VideoCrop::updateObjectContent(map> &patchObjects){ +void VideoCrop::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[1] && ofxVP_CAST_PIN_PTR(_inletParams[0])->isAllocated()){ diff --git a/src/objects/video/VideoCrop.h b/src/objects/video/VideoCrop.h index 57552850..b8e8d82d 100644 --- a/src/objects/video/VideoCrop.h +++ b/src/objects/video/VideoCrop.h @@ -44,7 +44,7 @@ class VideoCrop : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/video/VideoDelay.cpp b/src/objects/video/VideoDelay.cpp index 3fefff5f..a19cafe8 100644 --- a/src/objects/video/VideoDelay.cpp +++ b/src/objects/video/VideoDelay.cpp @@ -104,7 +104,7 @@ void VideoDelay::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void VideoDelay::updateObjectContent(map> &patchObjects){ +void VideoDelay::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[1] && ofxVP_CAST_PIN_PTR(_inletParams[0])->isAllocated()){ diff --git a/src/objects/video/VideoDelay.h b/src/objects/video/VideoDelay.h index 9c5eff4e..441539f1 100644 --- a/src/objects/video/VideoDelay.h +++ b/src/objects/video/VideoDelay.h @@ -44,7 +44,7 @@ class VideoDelay : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/video/VideoExporter.cpp b/src/objects/video/VideoExporter.cpp index 442862ed..d1d746aa 100644 --- a/src/objects/video/VideoExporter.cpp +++ b/src/objects/video/VideoExporter.cpp @@ -99,7 +99,7 @@ void VideoExporter::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void VideoExporter::updateObjectContent(map> &patchObjects){ +void VideoExporter::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[1]){ diff --git a/src/objects/video/VideoExporter.h b/src/objects/video/VideoExporter.h index 4ffc7556..768e6419 100644 --- a/src/objects/video/VideoExporter.h +++ b/src/objects/video/VideoExporter.h @@ -51,7 +51,7 @@ class VideoExporter : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/video/VideoGate.cpp b/src/objects/video/VideoGate.cpp index b9e1273e..3f77c8e1 100644 --- a/src/objects/video/VideoGate.cpp +++ b/src/objects/video/VideoGate.cpp @@ -109,7 +109,7 @@ void VideoGate::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void VideoGate::updateObjectContent(map> &patchObjects){ +void VideoGate::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[0]){ diff --git a/src/objects/video/VideoGate.h b/src/objects/video/VideoGate.h index 51a328c5..b67c6cdc 100644 --- a/src/objects/video/VideoGate.h +++ b/src/objects/video/VideoGate.h @@ -44,7 +44,7 @@ class VideoGate : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/video/VideoGrabber.cpp b/src/objects/video/VideoGrabber.cpp index 9f684641..2e6bedbe 100644 --- a/src/objects/video/VideoGrabber.cpp +++ b/src/objects/video/VideoGrabber.cpp @@ -114,7 +114,7 @@ void VideoGrabber::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void VideoGrabber::updateObjectContent(map> &patchObjects){ +void VideoGrabber::updateObjectContent(std::map> &patchObjects){ if(needReset && isOneDeviceAvailable){ resetCameraSettings(deviceID); diff --git a/src/objects/video/VideoGrabber.h b/src/objects/video/VideoGrabber.h index cde5534b..a285e298 100644 --- a/src/objects/video/VideoGrabber.h +++ b/src/objects/video/VideoGrabber.h @@ -49,7 +49,7 @@ class VideoGrabber : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/video/VideoMixer.cpp b/src/objects/video/VideoMixer.cpp index 53e944b3..70958148 100644 --- a/src/objects/video/VideoMixer.cpp +++ b/src/objects/video/VideoMixer.cpp @@ -132,7 +132,7 @@ void VideoMixer::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void VideoMixer::updateObjectContent(map> &patchObjects){ +void VideoMixer::updateObjectContent(std::map> &patchObjects){ // mix texture inlets with alpha if(mixFbo->isAllocated()){ diff --git a/src/objects/video/VideoMixer.h b/src/objects/video/VideoMixer.h index 5f81554e..edb374cd 100644 --- a/src/objects/video/VideoMixer.h +++ b/src/objects/video/VideoMixer.h @@ -44,7 +44,7 @@ class VideoMixer : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/video/VideoPlayer.cpp b/src/objects/video/VideoPlayer.cpp index 30636085..66c99a2a 100644 --- a/src/objects/video/VideoPlayer.cpp +++ b/src/objects/video/VideoPlayer.cpp @@ -132,7 +132,7 @@ void VideoPlayer::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void VideoPlayer::updateObjectContent(map> &patchObjects){ +void VideoPlayer::updateObjectContent(std::map> &patchObjects){ if(needToLoadVideo){ needToLoadVideo = false; diff --git a/src/objects/video/VideoPlayer.h b/src/objects/video/VideoPlayer.h index 415f6560..809af9a6 100644 --- a/src/objects/video/VideoPlayer.h +++ b/src/objects/video/VideoPlayer.h @@ -48,7 +48,7 @@ class VideoPlayer : public PatchObject { void autoloadFile(string _fp) override; void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/video/VideoStreaming.cpp b/src/objects/video/VideoStreaming.cpp index a3bafa95..d9c2b169 100644 --- a/src/objects/video/VideoStreaming.cpp +++ b/src/objects/video/VideoStreaming.cpp @@ -93,7 +93,7 @@ void VideoStreaming::setupObjectContent(shared_ptr &mainWindow) } //-------------------------------------------------------------- -void VideoStreaming::updateObjectContent(map> &patchObjects){ +void VideoStreaming::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[1] && *ofxVP_CAST_PIN_PTR(this->_inletParams[1]) == 1.0f){ diff --git a/src/objects/video/VideoStreaming.h b/src/objects/video/VideoStreaming.h index 646296f2..5e861d5f 100644 --- a/src/objects/video/VideoStreaming.h +++ b/src/objects/video/VideoStreaming.h @@ -50,7 +50,7 @@ class VideoStreaming : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/video/VideoTimelapse.cpp b/src/objects/video/VideoTimelapse.cpp index d14b0fc7..b27d0daa 100644 --- a/src/objects/video/VideoTimelapse.cpp +++ b/src/objects/video/VideoTimelapse.cpp @@ -97,7 +97,7 @@ void VideoTimelapse::setupObjectContent(shared_ptr &mainWindow) } //-------------------------------------------------------------- -void VideoTimelapse::updateObjectContent(map> &patchObjects){ +void VideoTimelapse::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(this->inletsConnected[1]){ diff --git a/src/objects/video/VideoTimelapse.h b/src/objects/video/VideoTimelapse.h index 23ae5a57..de6484a8 100644 --- a/src/objects/video/VideoTimelapse.h +++ b/src/objects/video/VideoTimelapse.h @@ -78,7 +78,7 @@ class VideoTimelapse : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/video/VideoTransform.cpp b/src/objects/video/VideoTransform.cpp index 60d0b6da..6f046333 100644 --- a/src/objects/video/VideoTransform.cpp +++ b/src/objects/video/VideoTransform.cpp @@ -124,7 +124,7 @@ void VideoTransform::setupObjectContent(shared_ptr &mainWindow) } //-------------------------------------------------------------- -void VideoTransform::updateObjectContent(map> &patchObjects){ +void VideoTransform::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[1] && ofxVP_CAST_PIN_PTR(_inletParams[0])->isAllocated()){ _x = ofClamp(*ofxVP_CAST_PIN_PTR(this->_inletParams[1]),0.0f,100.0f); diff --git a/src/objects/video/VideoTransform.h b/src/objects/video/VideoTransform.h index ed866f9d..36d78279 100644 --- a/src/objects/video/VideoTransform.h +++ b/src/objects/video/VideoTransform.h @@ -44,7 +44,7 @@ class VideoTransform : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/windowing/LivePatching.cpp b/src/objects/windowing/LivePatching.cpp index 0fce2cd2..244bdcbd 100644 --- a/src/objects/windowing/LivePatching.cpp +++ b/src/objects/windowing/LivePatching.cpp @@ -84,7 +84,7 @@ void LivePatching::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void LivePatching::updateObjectContent(map> &patchObjects){ +void LivePatching::updateObjectContent(std::map> &patchObjects){ if(this->inletsConnected[1]){ alpha = ofClamp(*ofxVP_CAST_PIN_PTR(this->_inletParams[1]),0.0f,255.0f); diff --git a/src/objects/windowing/LivePatching.h b/src/objects/windowing/LivePatching.h index 81373455..99839b73 100644 --- a/src/objects/windowing/LivePatching.h +++ b/src/objects/windowing/LivePatching.h @@ -44,7 +44,7 @@ class LivePatching : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/windowing/OutputWindow.cpp b/src/objects/windowing/OutputWindow.cpp index f0506acc..380f442e 100755 --- a/src/objects/windowing/OutputWindow.cpp +++ b/src/objects/windowing/OutputWindow.cpp @@ -172,7 +172,7 @@ void OutputWindow::setupObjectContent(shared_ptr &mainWindow){ } //-------------------------------------------------------------- -void OutputWindow::updateObjectContent(map> &patchObjects){ +void OutputWindow::updateObjectContent(std::map> &patchObjects){ if(needReset){ needReset = false; @@ -180,7 +180,7 @@ void OutputWindow::updateObjectContent(map> &patchOb int fromOutletID = -1; bool isSpecialLink = false; if(this->inletsConnected[0]){ - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ if(patchObjects[it->first] != nullptr && it->first != this->getId() && !patchObjects[it->first]->getWillErase()){ for(int o=0;o(it->second->outPut.size());o++){ @@ -217,7 +217,7 @@ void OutputWindow::updateObjectContent(map> &patchOb // Manage the different scripts reference available (ofxLua) if(!isNewScriptConnected && this->inletsConnected[1]){ - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ if(patchObjects[it->first] != nullptr && it->first != this->getId() && !patchObjects[it->first]->getWillErase()){ for(int o=0;o(it->second->outPut.size());o++){ diff --git a/src/objects/windowing/OutputWindow.h b/src/objects/windowing/OutputWindow.h index 3842713f..4ed90077 100755 --- a/src/objects/windowing/OutputWindow.h +++ b/src/objects/windowing/OutputWindow.h @@ -48,7 +48,7 @@ class OutputWindow : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/objects/windowing/ProjectionMapping.cpp b/src/objects/windowing/ProjectionMapping.cpp index 6675d980..d154c539 100644 --- a/src/objects/windowing/ProjectionMapping.cpp +++ b/src/objects/windowing/ProjectionMapping.cpp @@ -148,7 +148,7 @@ void ProjectionMapping::setupObjectContent(shared_ptr &mainWind } //-------------------------------------------------------------- -void ProjectionMapping::updateObjectContent(map> &patchObjects){ +void ProjectionMapping::updateObjectContent(std::map> &patchObjects){ unusedArgs(patchObjects); if(warpingConfigLoaded){ diff --git a/src/objects/windowing/ProjectionMapping.h b/src/objects/windowing/ProjectionMapping.h index dace06f0..6e51abb0 100644 --- a/src/objects/windowing/ProjectionMapping.h +++ b/src/objects/windowing/ProjectionMapping.h @@ -49,7 +49,7 @@ class ProjectionMapping : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; - void updateObjectContent(map> &patchObjects) override; + void updateObjectContent(std::map> &patchObjects) override; void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; diff --git a/src/ofxVisualProgramming.cpp b/src/ofxVisualProgramming.cpp index 391e75a6..ad3f3209 100755 --- a/src/ofxVisualProgramming.cpp +++ b/src/ofxVisualProgramming.cpp @@ -136,7 +136,7 @@ void ofxVisualProgramming::setRetina(bool retina, float retinaScale){ } //-------------------------------------------------------------- -void ofxVisualProgramming::setup(ofxImGui::Gui* _guiRef, string release){ +void ofxVisualProgramming::setup(ofxImGui::Gui* _guiRef, std::string release){ // Load resources font->load(MAIN_FONT,fontSize); @@ -147,7 +147,7 @@ void ofxVisualProgramming::setup(ofxImGui::Gui* _guiRef, string release){ if( _guiRef == nullptr ){ ofxVPGui = new ofxImGui::Gui(); ofxVPGui->setup(); - string tmpstr = "Automatically setting up a new ImGui instance. If your app has its own one, pass it's reference in setup();"; + std::string tmpstr = "Automatically setting up a new ImGui instance. If your app has its own one, pass it's reference in setup();"; ofLogNotice("ofxVP","%s",tmpstr.c_str()); } else { @@ -256,7 +256,7 @@ void ofxVisualProgramming::update(){ // left to right computing order leftToRightIndexOrder.clear(); - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ leftToRightIndexOrder.push_back(make_pair(static_cast(floor(it->second->getPos().x)),it->second->getId())); } @@ -267,7 +267,7 @@ void ofxVisualProgramming::update(){ ImGuiEx::ProfilerTask *pt = new ImGuiEx::ProfilerTask[leftToRightIndexOrder.size()]; for(unsigned int i=0;igetName()+ofToString(patchObjects[leftToRightIndexOrder[i].second]->getId())+"_update"; + std::string tmpon = patchObjects[leftToRightIndexOrder[i].second]->getName()+ofToString(patchObjects[leftToRightIndexOrder[i].second]->getId())+"_update"; pt[i].color = profiler.cpuGraph.colors[static_cast(i%16)]; pt[i].startTime = ofGetElapsedTimef(); @@ -282,23 +282,23 @@ void ofxVisualProgramming::update(){ std::ifstream testPath(patchObjects[leftToRightIndexOrder[i].second]->getFilepath()); if(testPath){ // file exists ofFile tempsofp(patchObjects[leftToRightIndexOrder[i].second]->getFilepath()); - string fileExt = ofToUpper(tempsofp.getExtension()); + std::string fileExt = ofToUpper(tempsofp.getExtension()); if(fileExt == "LUA" || fileExt == "SH"){ - map::iterator sofpIT = scriptsObjectsFilesPaths.find(tempsofp.getFileName()); + std::map::iterator sofpIT = scriptsObjectsFilesPaths.find(tempsofp.getFileName()); if (sofpIT == scriptsObjectsFilesPaths.end()){ // not found, insert it - scriptsObjectsFilesPaths.insert( pair(tempsofp.getFileName(),tempsofp.getAbsolutePath()) ); + scriptsObjectsFilesPaths.insert( std::pair(tempsofp.getFileName(),tempsofp.getAbsolutePath()) ); } }else if(fileExt == "FRAG"){ - map::iterator sofpIT = scriptsObjectsFilesPaths.find(tempsofp.getFileName()); + std::map::iterator sofpIT = scriptsObjectsFilesPaths.find(tempsofp.getFileName()); if (sofpIT == scriptsObjectsFilesPaths.end()){ // not found, insert FRAG - scriptsObjectsFilesPaths.insert( pair(tempsofp.getFileName(),tempsofp.getAbsolutePath()) ); + scriptsObjectsFilesPaths.insert( std::pair(tempsofp.getFileName(),tempsofp.getAbsolutePath()) ); // insert VERT - string fsName = tempsofp.getFileName(); - string vsName = tempsofp.getEnclosingDirectory()+tempsofp.getFileName().substr(0,fsName.find_last_of('.'))+".vert"; + std::string fsName = tempsofp.getFileName(); + std::string vsName = tempsofp.getEnclosingDirectory()+tempsofp.getFileName().substr(0,fsName.find_last_of('.'))+".vert"; ofFile newVertGLSLFile (vsName); - scriptsObjectsFilesPaths.insert( pair(newVertGLSLFile.getFileName(),newVertGLSLFile.getAbsolutePath()) ); + scriptsObjectsFilesPaths.insert( std::pair(newVertGLSLFile.getFileName(),newVertGLSLFile.getAbsolutePath()) ); } } } @@ -330,7 +330,7 @@ void ofxVisualProgramming::updateCanvasViewport(){ //-------------------------------------------------------------- void ofxVisualProgramming::updateSubpatchNavigation(){ - for(map>::iterator it = subpatchesMap.begin(); it != subpatchesMap.end(); it++ ){ + for(std::map>::iterator it = subpatchesMap.begin(); it != subpatchesMap.end(); it++ ){ for(int z=0;zsecond.size();z++){ if(it->second.at(z).objID != -1){ it->second.at(z).name = patchObjects[it->second.at(z).objID]->wirelessName; @@ -393,7 +393,7 @@ void ofxVisualProgramming::draw(){ if(patchObjects[leftToRightIndexOrder[i].second]->subpatchName == currentSubpatch){ - string tmpon = patchObjects[leftToRightIndexOrder[i].second]->getName()+ofToString(patchObjects[leftToRightIndexOrder[i].second]->getId())+"_draw"; + std::string tmpon = patchObjects[leftToRightIndexOrder[i].second]->getName()+ofToString(patchObjects[leftToRightIndexOrder[i].second]->getId())+"_draw"; pt[i].color = profiler.gpuGraph.colors[static_cast(i%16)]; pt[i].startTime = ofGetElapsedTimef(); @@ -566,13 +566,13 @@ void ofxVisualProgramming::drawSubpatchNavigation(){ ImGui::Spacing(); ImGui::Spacing(); - for(map>::iterator it = subpatchesMap.begin(); it != subpatchesMap.end(); it++ ){ + for(std::map>::iterator it = subpatchesMap.begin(); it != subpatchesMap.end(); it++ ){ ImGuiTreeNodeFlags node_flags = base_flags; const bool is_selected = (selection_mask & (1 << i)) != 0; if (is_selected) node_flags |= ImGuiTreeNodeFlags_Selected; - string rName = "[ "; + std::string rName = "[ "; rName += it->first; rName += " ]"; bool node_open; @@ -683,24 +683,24 @@ void ofxVisualProgramming::cleanPatchDataFolder(){ for(size_t i = 0; i < dir.size(); i++){ if(dir.getFile(i).exists()){ if(dir.getFile(i).isFile()){ - map::iterator sofpIT = scriptsObjectsFilesPaths.find(dir.getFile(i).getFileName()); + std::map::iterator sofpIT = scriptsObjectsFilesPaths.find(dir.getFile(i).getFileName()); if (sofpIT == scriptsObjectsFilesPaths.end()){ // not found in patch scripts map, remove it from patch data folder //ofLog(OF_LOG_NOTICE,"%s",dir.getFile(i).getAbsolutePath().c_str()); - string fileExt = ofToUpper(dir.getFile(i).getExtension()); + std::string fileExt = ofToUpper(dir.getFile(i).getExtension()); if(fileExt == "SH" || fileExt == "FRAG"){ dir.getFile(i).remove(); } // remove if filename is empty - string tfn = dir.getFile(i).getFileName(); + std::string tfn = dir.getFile(i).getFileName(); if(dir.getFile(i).getFileName().substr(0,tfn.find_last_of('.')) == "empty"){ dir.getFile(i).remove(); } // remove alone .vert files if(fileExt == "VERT"){ - string vsName = dir.getFile(i).getFileName(); - string fsName = dir.getFile(i).getFileName().substr(0,vsName.find_last_of('.'))+".frag"; - map::iterator sofpIT2 = scriptsObjectsFilesPaths.find(fsName); + std::string vsName = dir.getFile(i).getFileName(); + std::string fsName = dir.getFile(i).getFileName().substr(0,vsName.find_last_of('.'))+".frag"; + std::map::iterator sofpIT2 = scriptsObjectsFilesPaths.find(fsName); if (sofpIT2 == scriptsObjectsFilesPaths.end()){ // related fragment shader not found in patch scripts map, remove it from patch data folder dir.getFile(i).remove(); @@ -722,7 +722,7 @@ void ofxVisualProgramming::reloadFont(){ //-------------------------------------------------------------- void ofxVisualProgramming::exit(){ - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ it->second->removeObjectContent(); } @@ -818,7 +818,7 @@ void ofxVisualProgramming::audioProcess(float *input, int bufferSize, int nChann // compute audio input if(!inputBuffer.getBuffer().empty()){ - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ if(!it->second->getWillErase()){ it->second->audioIn(inputBuffer); @@ -832,7 +832,7 @@ void ofxVisualProgramming::audioProcess(float *input, int bufferSize, int nChann } if(audioGUIOUTChannels > 0){ // compute audio output - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ if(!it->second->getWillErase()){ it->second->audioOut(emptyBuffer); @@ -863,7 +863,7 @@ void ofxVisualProgramming::addObject(string name,ofVec2f pos,std::string fp){ bLoadingNewObject = true; - shared_ptr tempObj = selectObject(name); + std::shared_ptr tempObj = selectObject(name); // selectObject can return nullptr ! if( tempObj.get() == nullptr ){ @@ -944,9 +944,9 @@ void ofxVisualProgramming::resetObject(int &id){ ofxVPXml.loadMosaicPatch(currentPatchFile); - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ - vector> tempBuffer; + std::vector> tempBuffer; for(int j=0;j(it->second->outPut.size());j++){ if(it->second->outPut[j]->toObjectID == id){ if(it->second->outPut[j]->toInletID < patchObjects[id]->getNumInlets()){ @@ -973,9 +973,9 @@ void ofxVisualProgramming::resetObject(int &id){ //-------------------------------------------------------------- void ofxVisualProgramming::resetObject(int id){ if ((id != -1) && (patchObjects[id] != nullptr)){ - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ - vector> tempBuffer; + std::vector> tempBuffer; for(int j=0;j(it->second->outPut.size());j++){ if(it->second->outPut[j]->toObjectID != id){ tempBuffer.push_back(it->second->outPut[j]); @@ -1027,7 +1027,7 @@ void ofxVisualProgramming::clearObjectsMap(){ if(ofGetElapsedTimeMillis()-resetTime > wait){ resetTime = ofGetElapsedTimeMillis(); eraseIndexes.clear(); - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ if(it->second->getWillErase()){ eraseIndexes.push_back(it->first); @@ -1046,25 +1046,25 @@ void ofxVisualProgramming::clearObjectsMap(){ std::ifstream testPath(patchObjects.at(eraseIndexes.at(x))->getFilepath()); if(testPath){ // file exists ofFile tempsofp(patchObjects.at(eraseIndexes.at(x))->getFilepath()); - string fileExt = ofToUpper(tempsofp.getExtension()); + std::string fileExt = ofToUpper(tempsofp.getExtension()); if(fileExt == "LUA" || fileExt == "SH"){ - map::iterator sofpIT = scriptsObjectsFilesPaths.find(tempsofp.getFileName()); + std::map::iterator sofpIT = scriptsObjectsFilesPaths.find(tempsofp.getFileName()); if (sofpIT != scriptsObjectsFilesPaths.end()){ // found it, remove it scriptsObjectsFilesPaths.erase(sofpIT); } }else if(fileExt == "FRAG"){ // remove .frag - map::iterator sofpIT = scriptsObjectsFilesPaths.find(tempsofp.getFileName()); + std::map::iterator sofpIT = scriptsObjectsFilesPaths.find(tempsofp.getFileName()); if (sofpIT != scriptsObjectsFilesPaths.end()){ // found it, remove it scriptsObjectsFilesPaths.erase(sofpIT); } // remove .vert - string pf_fsName = tempsofp.getFileName(); - string pf_vsName = tempsofp.getEnclosingDirectory()+tempsofp.getFileName().substr(0,pf_fsName.find_last_of('.'))+".vert"; + std::string pf_fsName = tempsofp.getFileName(); + std::string pf_vsName = tempsofp.getEnclosingDirectory()+tempsofp.getFileName().substr(0,pf_fsName.find_last_of('.'))+".vert"; ofFile tempVert(pf_vsName); - map::iterator sofpITV = scriptsObjectsFilesPaths.find(tempVert.getFileName()); + std::map::iterator sofpITV = scriptsObjectsFilesPaths.find(tempVert.getFileName()); if (sofpITV != scriptsObjectsFilesPaths.end()){ // found it, remove it scriptsObjectsFilesPaths.erase(sofpITV); @@ -1086,7 +1086,7 @@ void ofxVisualProgramming::clearObjectsMap(){ } //-------------------------------------------------------------- -bool ofxVisualProgramming::isObjectInLibrary(string name){ +bool ofxVisualProgramming::isObjectInLibrary(std::string name){ bool exists = false; for(ofxVPObjects::factory::objectRegistry::iterator it = ofxVPObjects::factory::getObjectRegistry().begin(); it != ofxVPObjects::factory::getObjectRegistry().end(); it++ ){ if(it->first == name){ @@ -1102,7 +1102,7 @@ bool ofxVisualProgramming::isObjectInLibrary(string name){ bool ofxVisualProgramming::isObjectIDInPatchMap(int id){ bool exists = false; - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ if(it->first == id){ exists = true; @@ -1116,8 +1116,8 @@ bool ofxVisualProgramming::isObjectIDInPatchMap(int id){ //-------------------------------------------------------------- string ofxVisualProgramming::getObjectNameFromID(int id){ - string name = ""; - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + std::string name = ""; + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ if(it->first == id){ name = it->second->getName(); @@ -1129,9 +1129,9 @@ string ofxVisualProgramming::getObjectNameFromID(int id){ } //-------------------------------------------------------------- -int ofxVisualProgramming::getSubpatchIndex(string name){ +int ofxVisualProgramming::getSubpatchIndex(std::string name){ int ind = 0; - for(map>::iterator it = subpatchesMap.begin(); it != subpatchesMap.end(); it++ ){ + for(std::map>::iterator it = subpatchesMap.begin(); it != subpatchesMap.end(); it++ ){ if(it->first == name){ return ind; } @@ -1159,7 +1159,7 @@ void ofxVisualProgramming::removeObject(int &id){ // remove object ofxVPXml.removeObject(id); - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ vector> tempBuffer; for(int j=0;j(it->second->outPut.size());j++){ @@ -1175,7 +1175,7 @@ void ofxVisualProgramming::removeObject(int &id){ } // check reference from subpatches map ( if the object was a wireless one ,sender or receiver ) - for(map>::iterator it = subpatchesMap.begin(); it != subpatchesMap.end(); it++ ){ + for(std::map>::iterator it = subpatchesMap.begin(); it != subpatchesMap.end(); it++ ){ for(int z=0;zsecond.size();z++){ if(it->second.at(z).objID == id){ it->second.at(z).objID = -1; @@ -1226,9 +1226,9 @@ void ofxVisualProgramming::disconnectObject(int id){ // remove all links to the disconnecting object ofxVPXml.removeAllLinksToObject(id,0); - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ - vector> tempBuffer; + std::vector> tempBuffer; for(int j=0;j(it->second->outPut.size());j++){ if(it->second->outPut[j]->toObjectID != id){ tempBuffer.push_back(it->second->outPut[j]); @@ -1242,7 +1242,7 @@ void ofxVisualProgramming::disconnectObject(int id){ } // check reference from subpatches map ( if the object was a wireless one ,sender or receiver ) - for(map>::iterator it = subpatchesMap.begin(); it != subpatchesMap.end(); it++ ){ + for(std::map>::iterator it = subpatchesMap.begin(); it != subpatchesMap.end(); it++ ){ for(int z=0;zsecond.size();z++){ if(it->second.at(z).objID == id){ it->second.at(z).objID = -1; @@ -1265,9 +1265,9 @@ bool ofxVisualProgramming::connect(int fromID, int fromOutlet, int toID,int toIn //std::cout << "Mosaic :: "<< "Connect object " << patchObjects[fromID]->getName().c_str() << ":" << ofToString(fromID) << " to object " << patchObjects[toID]->getName().c_str() << ":" << ofToString(toID) << std::endl; - shared_ptr tempLink = shared_ptr(new PatchLink()); + std::shared_ptr tempLink = std::shared_ptr(new PatchLink()); - string tmpID = ofToString(fromID)+ofToString(fromOutlet)+ofToString(toID)+ofToString(toInlet); + std::string tmpID = ofToString(fromID)+ofToString(fromOutlet)+ofToString(toID)+ofToString(toInlet); tempLink->id = stoi(tmpID); tempLink->posFrom = patchObjects[fromID]->getOutletPosition(fromOutlet); @@ -1330,7 +1330,7 @@ void ofxVisualProgramming::checkSpecialConnection(int fromID, int toID, int link //-------------------------------------------------------------- void ofxVisualProgramming::resetSystemObjects(){ - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ if(it->second->getIsSystemObject()){ it->second->resetSystemObject(); @@ -1346,8 +1346,8 @@ void ofxVisualProgramming::resetSystemObjects(){ } //-------------------------------------------------------------- -void ofxVisualProgramming::resetSpecificSystemObjects(string name){ - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ +void ofxVisualProgramming::resetSpecificSystemObjects(std::string name){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ if(it->second->getIsSystemObject() && it->second->getName() == name){ it->second->resetSystemObject(); @@ -1361,9 +1361,9 @@ void ofxVisualProgramming::resetSpecificSystemObjects(string name){ } //-------------------------------------------------------------- -bool ofxVisualProgramming::weAlreadyHaveObject(string name){ +bool ofxVisualProgramming::weAlreadyHaveObject(std::string name){ - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ if(it->second->getName() == name){ return true; @@ -1376,22 +1376,22 @@ bool ofxVisualProgramming::weAlreadyHaveObject(string name){ } //-------------------------------------------------------------- -shared_ptr ofxVisualProgramming::selectObject(string objname){ +std::shared_ptr ofxVisualProgramming::selectObject(string objname){ ofxVPObjects::factory::objectRegistry& reg = ofxVPObjects::factory::getObjectRegistry(); ofxVPObjects::factory::objectRegistry::iterator it = reg.find(objname); if (it != reg.end()) { ofxVPObjects::factory::CreateObjectFunc func = it->second; - return shared_ptr( func() ); + return std::shared_ptr( func() ); } ofLogError("ofxVisualProgramming::selectObject") << "Object not found: " << objname << ". Maybe this PatchObject is not available on your platform or there might be a version error."; - return shared_ptr(nullptr); + return std::shared_ptr(nullptr); } //-------------------------------------------------------------- -void ofxVisualProgramming::newPatch(string release){ - string newFileName = "patch_"+ofGetTimestampString("%y%m%d")+alphabet.at(newFileCounter)+".xml"; +void ofxVisualProgramming::newPatch(std::string release){ + std::string newFileName = "patch_"+ofGetTimestampString("%y%m%d")+alphabet.at(newFileCounter)+".xml"; ofFile fileToRead(ofToDataPath("empty_patch.xml",true)); pauseDSP = true; @@ -1411,10 +1411,10 @@ void ofxVisualProgramming::newPatch(string release){ } //-------------------------------------------------------------- -void ofxVisualProgramming::newTempPatchFromFile(string patchFile){ +void ofxVisualProgramming::newTempPatchFromFile(std::string patchFile){ pauseDSP = true; - string newFileName = "patch_"+ofGetTimestampString("%y%m%d")+alphabet.at(newFileCounter)+".xml"; + std::string newFileName = "patch_"+ofGetTimestampString("%y%m%d")+alphabet.at(newFileCounter)+".xml"; ofFile fileToRead(patchFile); ofFile newPatchFile(ofToDataPath("temp/"+newFileName,true)); ofFile::copyFromTo(fileToRead.getAbsolutePath(),newPatchFile.getAbsolutePath(),true,true); @@ -1437,7 +1437,7 @@ void ofxVisualProgramming::newTempPatchFromFile(string patchFile){ #endif } - string oldDataPath = oldData.getAbsolutePath(); + std::string oldDataPath = oldData.getAbsolutePath(); // copy new data content #ifdef OFXVP_DEBUG @@ -1458,14 +1458,14 @@ void ofxVisualProgramming::newTempPatchFromFile(string patchFile){ } //-------------------------------------------------------------- -void ofxVisualProgramming::preloadPatch(string patchFile){ +void ofxVisualProgramming::preloadPatch(std::string patchFile){ pauseDSP = true; currentPatchFile = patchFile; actualObjectID = 0; // clear previous patch - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ if(it->second->getName() != "audio device"){ it->second->setWillErase(true); @@ -1488,7 +1488,7 @@ void ofxVisualProgramming::preloadPatch(string patchFile){ subpatchesMap.clear(); currentSubpatch = "root"; newSubpatchName = ""; - vector rootBranch; + std::vector rootBranch; subpatchesMap[currentSubpatch] = rootBranch; resetTime = ofGetElapsedTimeMillis(); @@ -1496,7 +1496,7 @@ void ofxVisualProgramming::preloadPatch(string patchFile){ } //-------------------------------------------------------------- -void ofxVisualProgramming::openPatch(string patchFile){ +void ofxVisualProgramming::openPatch(std::string patchFile){ bLoadingNewPatch = true; pauseDSP = true; @@ -1520,13 +1520,13 @@ void ofxVisualProgramming::openPatch(string patchFile){ } //-------------------------------------------------------------- -void ofxVisualProgramming::loadPatch(string patchFile){ +void ofxVisualProgramming::loadPatch(std::string patchFile){ loadPatchTime = ofGetElapsedTimeMillis(); ofxVPXml.loadMosaicPatch(patchFile); - string tstr; + std::string tstr; // Load main settings @@ -1573,7 +1573,7 @@ void ofxVisualProgramming::loadPatch(string patchFile){ tstr = "------------------- AUDIO DEVICES"; ofLog(OF_LOG_NOTICE,"%s",tstr.c_str()); for(size_t i=0;i tempObj = selectObject(objname); + std::shared_ptr tempObj = selectObject(objname); if(tempObj != nullptr && !tempObj->getIsSharedContextObject()){ loaded = tempObj->loadConfig(mainWindow,*engine,oi,patchFile); if(loaded){ @@ -1772,7 +1772,7 @@ void ofxVisualProgramming::loadPatch(string patchFile){ if(objSubpatch == "") objSubpatch = "root"; // retro compatibility for pre-subpatch patches tempObj->setSubpatch(objSubpatch); if (subpatchesMap.find(objSubpatch) == subpatchesMap.end()) { - vector _sp; + std::vector _sp; subpatchesMap[objSubpatch] = _sp; } ofAddListener(tempObj->removeEvent ,this,&ofxVisualProgramming::removeObject); @@ -1813,7 +1813,7 @@ void ofxVisualProgramming::loadPatch(string patchFile){ auto o = obj.node(); std::string objname = ofxVPXml.getPatchChildString(o,"name"); if(isObjectInLibrary(objname)){ - shared_ptr tempObj = selectObject(objname); + std::shared_ptr tempObj = selectObject(objname); if(tempObj != nullptr && !tempObj->getIsSharedContextObject()){ int fromID = ofxVPXml.getPatchChildInt(o,"id"); pugi::xpath_node_set objOutlets = ofxVPXml.getObjectOutlets(fromID); @@ -1878,7 +1878,7 @@ void ofxVisualProgramming::loadPatchSharedContextObjects(){ auto o = obj.node(); std::string objname = ofxVPXml.getPatchChildString(o,"name"); if(isObjectInLibrary(objname)){ - shared_ptr tempObj = selectObject(objname); + std::shared_ptr tempObj = selectObject(objname); if(tempObj != nullptr && !tempObj->getIsSharedContextObject()){ int fromID = ofxVPXml.getPatchChildInt(o,"id"); pugi::xpath_node_set objOutlets = ofxVPXml.getObjectOutlets(fromID); @@ -1924,7 +1924,7 @@ void ofxVisualProgramming::loadPatchSharedContextObjects(){ bool loaded = false; if(isObjectInLibrary(objname)){ - shared_ptr tempObj = selectObject(objname); + std::shared_ptr tempObj = selectObject(objname); if(tempObj != nullptr && tempObj->getIsSharedContextObject()){ loaded = tempObj->loadConfig(mainWindow,*engine,oi,currentPatchFile); if(loaded){ @@ -1934,7 +1934,7 @@ void ofxVisualProgramming::loadPatchSharedContextObjects(){ if(objSubpatch == "") objSubpatch = "root"; // retro compatibility for pre-subpatch patches tempObj->setSubpatch(objSubpatch); if (subpatchesMap.find(objSubpatch) == subpatchesMap.end()) { - vector _sp; + std::vector _sp; subpatchesMap[objSubpatch] = _sp; } ofAddListener(tempObj->removeEvent ,this,&ofxVisualProgramming::removeObject); @@ -1976,7 +1976,7 @@ void ofxVisualProgramming::loadPatchSharedContextObjects(){ auto l = link.node(); int toObjectID = ofxVPXml.getPatchChildInt(l,"id"); int toInletID = ofxVPXml.getPatchChildInt(l,"inlet"); - string toObjName = getObjectNameFromID(toObjectID); + std::string toObjName = getObjectNameFromID(toObjectID); if(toObjName != ""){ shared_ptr _tempToObj = selectObject(toObjName); @@ -2010,7 +2010,7 @@ void ofxVisualProgramming::reloadPatch(){ bLoadingNewPatch = true; // clear previous patch - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ it->second->removeObjectContent(); } @@ -2022,7 +2022,7 @@ void ofxVisualProgramming::reloadPatch(){ subpatchesMap.clear(); currentSubpatch = "root"; newSubpatchName = ""; - vector rootBranch; + std::vector rootBranch; subpatchesMap[currentSubpatch] = rootBranch; // load new patch @@ -2030,7 +2030,7 @@ void ofxVisualProgramming::reloadPatch(){ } //-------------------------------------------------------------- -void ofxVisualProgramming::savePatchAs(string patchFile){ +void ofxVisualProgramming::savePatchAs(std::string patchFile){ // Mosaic patch folder structure: // @@ -2041,19 +2041,19 @@ void ofxVisualProgramming::savePatchAs(string patchFile){ // sanitize filename ofFile tempPF(patchFile); - string preSanitizeFN = tempPF.getFileName(); + std::string preSanitizeFN = tempPF.getFileName(); sanitizeFilename(preSanitizeFN); - string sanitizedPatchFile = tempPF.getEnclosingDirectory()+preSanitizeFN; + std::string sanitizedPatchFile = tempPF.getEnclosingDirectory()+preSanitizeFN; //ofLog(OF_LOG_NOTICE,"%s",patchFile.c_str()); //ofLog(OF_LOG_NOTICE,"%s",sanitizedPatchFile.c_str()); // copy patch file & patch data folder ofFile tempFile(sanitizedPatchFile); - string tempFileName = tempFile.getFileName(); - string finalTempFileName = tempFile.getFileName().substr(0,tempFileName.find_last_of('.')); + std::string tempFileName = tempFile.getFileName(); + std::string finalTempFileName = tempFile.getFileName().substr(0,tempFileName.find_last_of('.')); - string newFileName = checkFileExtension(sanitizedPatchFile, ofToUpper(tempFile.getExtension()), "XML"); + std::string newFileName = checkFileExtension(sanitizedPatchFile, ofToUpper(tempFile.getExtension()), "XML"); ofFile fileToRead(currentPatchFile); ofDirectory dataFolderOrigin; dataFolderOrigin.listDir(currentPatchFolderPath+"data/"); @@ -2070,7 +2070,7 @@ void ofxVisualProgramming::savePatchAs(string patchFile){ dataFolderOrigin.copyTo(tp,true,true); - for(map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ + for(std::map>::iterator it = patchObjects.begin(); it != patchObjects.end(); it++ ){ if(it->second != nullptr){ it->second->setPatchfile(currentPatchFile); } @@ -2146,7 +2146,7 @@ void ofxVisualProgramming::setAudioBufferSize(int bs){ //-------------------------------------------------------------- void ofxVisualProgramming::activateDSP(){ - string tstr; + std::string tstr; engine->setChannels(0,0); diff --git a/src/ofxVisualProgramming.h b/src/ofxVisualProgramming.h index 6aceb819..fdf023e8 100755 --- a/src/ofxVisualProgramming.h +++ b/src/ofxVisualProgramming.h @@ -49,10 +49,10 @@ struct SubpatchConnection{ - int objID; - string name; - uint8_t type; // LINK_TYPE - uint8_t inOut; // 0 receive, 1 send + int objID; + std::string name; + uint8_t type; // LINK_TYPE + uint8_t inOut; // 0 receive, 1 send }; class ofxVisualProgramming : public pdsp::Wrapper { @@ -63,7 +63,7 @@ class ofxVisualProgramming : public pdsp::Wrapper { ~ofxVisualProgramming(); void setRetina(bool retina, float retinaScale=1); - void setup(ofxImGui::Gui* guiRef = nullptr, string release=""); + void setup(ofxImGui::Gui* guiRef = nullptr, std::string release=""); void setupFailsafeWindow(); void update(); void updateRetina(float scale); @@ -90,9 +90,9 @@ class ofxVisualProgramming : public pdsp::Wrapper { void activeObject(int oid); - shared_ptr selectObject(string objname); - void addObject(string name, ofVec2f pos,std::string fp="none"); - shared_ptr getLastAddedObject(); + std::shared_ptr selectObject(std::string objname); + void addObject(std::string name, ofVec2f pos,std::string fp="none"); + std::shared_ptr getLastAddedObject(); void resetObject(int &id); void resetObject(int id); @@ -104,23 +104,23 @@ class ofxVisualProgramming : public pdsp::Wrapper { bool connect(int fromID, int fromOutlet, int toID,int toInlet, int linkType); void checkSpecialConnection(int fromID, int toID, int linkType); void resetSystemObjects(); - void resetSpecificSystemObjects(string name); - bool weAlreadyHaveObject(string name); + void resetSpecificSystemObjects(std::string name); + bool weAlreadyHaveObject(std::string name); void clearObjectsMap(); - bool isObjectInLibrary(string name); + bool isObjectInLibrary(std::string name); bool isObjectIDInPatchMap(int id); - string getObjectNameFromID(int id); + std::string getObjectNameFromID(int id); int getSubpatchIndex(string name); - void newPatch(string release); - void newTempPatchFromFile(string patchFile); - void preloadPatch(string patchFile); - void openPatch(string patchFile); - void loadPatch(string patchFile); + void newPatch(std::string release); + void newTempPatchFromFile(std::string patchFile); + void preloadPatch(std::string patchFile); + void openPatch(std::string patchFile); + void loadPatch(std::string patchFile); void loadPatchSharedContextObjects(); void reloadPatch(); - void savePatchAs(string patchFile); - void setPatchVariable(string var, int value); + void savePatchAs(std::string patchFile); + void setPatchVariable(std::string var, int value); void setAudioInDevice(int ind); void setAudioOutDevice(int ind); @@ -156,15 +156,15 @@ class ofxVisualProgramming : public pdsp::Wrapper { pugg::Kernel plugins_kernel; // PATCH OBJECTS - map> patchObjects; - map scriptsObjectsFilesPaths; - vector> leftToRightIndexOrder; - vector eraseIndexes; - ofPoint nextObjectPosition; + std::map> patchObjects; + std::map scriptsObjectsFilesPaths; + std::vector> leftToRightIndexOrder; + std::vector eraseIndexes; + ofPoint nextObjectPosition; - map> subpatchesMap; - string currentSubpatch; - string newSubpatchName; + std::map> subpatchesMap; + std::string currentSubpatch; + std::string newSubpatchName; int selectedObjectID; int actualObjectID; @@ -175,15 +175,15 @@ class ofxVisualProgramming : public pdsp::Wrapper { bool clearingObjectsMap; // LOAD/SAVE - string currentPatchFile; - string currentPatchFolderPath; + std::string currentPatchFile; + std::string currentPatchFolderPath; int output_width; int output_height; - string alphabet; + std::string alphabet; int newFileCounter; // SYSTEM - shared_ptr mainWindow; + std::shared_ptr mainWindow; bool profilerActive; bool inspectorActive; bool navigationActive; @@ -200,13 +200,13 @@ class ofxVisualProgramming : public pdsp::Wrapper { ofSoundBuffer inputBuffer; ofSoundBuffer emptyBuffer; - vector audioDevices; - vector audioDevicesStringIN; - vector audioDevicesStringOUT; - vector audioDevicesID_IN; - vector audioDevicesID_OUT; - vector audioDevicesSR; - vector audioDevicesBS; + std::vector audioDevices; + std::vector audioDevicesStringIN; + std::vector audioDevicesStringOUT; + std::vector audioDevicesID_IN; + std::vector audioDevicesID_OUT; + std::vector audioDevicesSR; + std::vector audioDevicesBS; ofSoundStream soundStreamIN; ofSoundBuffer lastInputBuffer; ofPolyline inputBufferWaveform; @@ -237,8 +237,8 @@ class ofxVisualProgramming : public pdsp::Wrapper { private: void audioProcess(float *input, int bufferSize, int nChannels); - mutable ofMutex vp_mutex; + mutable ofMutex vp_mutex; - shared_ptr failsafeWindow; + std::shared_ptr failsafeWindow; }; diff --git a/src/utils.h b/src/utils.h index 62556e34..70949c5a 100644 --- a/src/utils.h +++ b/src/utils.h @@ -105,8 +105,8 @@ inline std::string random_string( size_t length ){ } //-------------------------------------------------------------- -inline bool containString(string str1, string str2) { - return (str1.find(str2) != string::npos); +inline bool containString(std::string str1, std::string str2) { + return (str1.find(str2) != std::string::npos); } //-------------------------------------------------------------- @@ -404,7 +404,7 @@ inline std::string forceCheckMosaicDataPath(std::string filepath){ if(file.exists()){ return filepath; }else{ - if(filepath.find("Mosaic/data/") != std::string::npos || filepath.find("Mosaic/examples/") != string::npos) { + if(filepath.find("Mosaic/data/") != std::string::npos || filepath.find("Mosaic/examples/") != std::string::npos) { size_t start = filepath.find("Mosaic/"); std::string newPath = filepath.substr(start,filepath.size()-start); From d6d2c6eb031db1e9d370492daf5172968c42431e Mon Sep 17 00:00:00 2001 From: d3cod3 Date: Tue, 22 Apr 2025 18:31:00 +0100 Subject: [PATCH 12/21] fixed/adapted lib to ofxVP --- src/physics/AChaosLib/AChaosBase.h | 18 ++++++-- src/physics/AChaosLib/AChaosLib.h | 2 + src/physics/AChaosLib/AChaosVisualizer.h | 54 ++++++++++++++---------- 3 files changed, 48 insertions(+), 26 deletions(-) diff --git a/src/physics/AChaosLib/AChaosBase.h b/src/physics/AChaosLib/AChaosBase.h index c0b8d465..338029c7 100644 --- a/src/physics/AChaosLib/AChaosBase.h +++ b/src/physics/AChaosLib/AChaosBase.h @@ -7,6 +7,9 @@ */ #pragma once +#include +#include + // comment for 64bits version (not all objects support) #define ACHAOS32 @@ -45,8 +48,8 @@ class AChaosBase { } std::cout << "A-Chaos Lib (c) Richard Dudas 1996, (c) Andre Sier 2004, 2012, 2015 " << __DATE__ << " " __TIME__ << std::endl; } - virtual void reset(){std::cout << "reset base" << std::endl;} - void set(vector ¶ms){ + virtual void reset(){/*std::cout << "reset base" << std::endl;*/} + void set(std::vector ¶ms){ iv.clear(); for(int i=0; i params){ + for(int i=0; i & getVec(){return ov;} + + void restart() { iv.clear(); } }; + diff --git a/src/physics/AChaosLib/AChaosLib.h b/src/physics/AChaosLib/AChaosLib.h index 9c3d42ec..78dc1ef5 100644 --- a/src/physics/AChaosLib/AChaosLib.h +++ b/src/physics/AChaosLib/AChaosLib.h @@ -38,3 +38,5 @@ #include "AChaosStein1.h" #include "AChaosTorus.h" #include "AChaosVerhulst.h" + +#include "AChaosVisualizer.h" diff --git a/src/physics/AChaosLib/AChaosVisualizer.h b/src/physics/AChaosLib/AChaosVisualizer.h index 1ee62738..5584d23a 100644 --- a/src/physics/AChaosLib/AChaosVisualizer.h +++ b/src/physics/AChaosLib/AChaosVisualizer.h @@ -15,13 +15,14 @@ class AChaosChannel { REAL min, max; std::vector mystory; int planets = 512; + AChaosChannel(){ min = 1e10; max = -1e10; mystory.clear(); } - void setPlanets(int p){ - planets = p; + void setup(int pla){ + planets = pla; } void update(REAL val){ if(val < min) min = val; @@ -31,6 +32,7 @@ class AChaosChannel { mystory.erase(mystory.begin()); } } + }; class AChaosVisualizer { @@ -40,11 +42,12 @@ class AChaosVisualizer { std::vector channels; int n; - void setup(AChaosBase *ptr){ + void setup(AChaosBase *ptr,int p=512){ obj = ptr; n=obj->ov.size(); for(int i=0; i= n || channel < 0) return; + + float chh = h; int s = channels[0].mystory.size(); if(s<1){ return; } float xg = w / s; - for(int i=0; i Date: Tue, 22 Apr 2025 18:33:14 +0100 Subject: [PATCH 13/21] added new category GENERATIVE plus added the first object of this category, strange attractors, based on AChaosLib by @s373 --- src/objects/generative/AChaos.cpp | 413 ++++++++++++++++++++++++++++++ src/objects/generative/AChaos.h | 103 ++++++++ 2 files changed, 516 insertions(+) create mode 100644 src/objects/generative/AChaos.cpp create mode 100644 src/objects/generative/AChaos.h diff --git a/src/objects/generative/AChaos.cpp b/src/objects/generative/AChaos.cpp new file mode 100644 index 00000000..8da1d2d6 --- /dev/null +++ b/src/objects/generative/AChaos.cpp @@ -0,0 +1,413 @@ + /*============================================================================== + + ofxVisualProgramming: A visual programming patching environment for OF + + Copyright (c) 2025 Emanuele Mazza aka n3m3da + + ofxVisualProgramming is distributed under the MIT License. + This gives everyone the freedoms to use ofxVisualProgramming in any context: + commercial or non-commercial, public or private, open or closed source. + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + See https://github.com/d3cod3/ofxVisualProgramming for documentation + +==============================================================================*/ + +#ifndef OFXVP_BUILD_WITH_MINIMAL_OBJECTS + +#include "AChaos.h" + +//-------------------------------------------------------------- +AChaos::AChaos() : PatchObject("strange attractors"){ + + this->numInlets = 3; + this->numOutlets = 2; + + _inletParams[0] = new float(); // X + _inletParams[1] = new float(); // Y + _inletParams[2] = new float(); // VOLUME + *ofxVP_CAST_PIN_PTR(this->_inletParams[0]) = 0.0f; + *ofxVP_CAST_PIN_PTR(this->_inletParams[1]) = 0.0f; + *ofxVP_CAST_PIN_PTR(this->_inletParams[2]) = 0.0f; + + _outletParams[0] = new ofSoundBuffer(); + _outletParams[1] = new ofTexture(); // texture + + output = new float[6]; + output[0] = 0.0f; + output[1] = 0.0f; + output[2] = 0.0f; + output[3] = 0.0f; + output[4] = 0.0f; + output[5] = 0.0f; + + chaosFbo = new ofFbo(); + + chaos = new AChaosBase(); + visualizer = new AChaosVisualizer(); + + cNle = 0; + newcNle = 0; + + this->initInletsState(); + + isAudioOUTObject = true; + isPDSPPatchableObject = true; + + this->setIsResizable(true); + this->setIsTextureObj(true); + + volume = 0.57f; + changeNLE = false; + + posX = posY = drawW = drawH = 0.0f; + + prevW = this->width; + prevH = this->height; + + loaded = false; + + _x = 0.5f; + _y = 0.5f; + +} + +//-------------------------------------------------------------- +void AChaos::newObject(){ + PatchObject::setName( this->objectName ); + + this->addInlet(VP_LINK_NUMERIC,"x"); + this->addInlet(VP_LINK_NUMERIC,"y"); + this->addInlet(VP_LINK_NUMERIC,"amp"); + this->addOutlet(VP_LINK_AUDIO,"chaosSignal"); + this->addOutlet(VP_LINK_TEXTURE,"chaosTexture"); + + this->setCustomVar(volume,"VOLUME"); + this->setCustomVar(static_cast(cNle),"CHAOS_NLE"); + + this->setCustomVar(static_cast(prevW),"WIDTH"); + this->setCustomVar(static_cast(prevH),"HEIGHT"); +} + +//-------------------------------------------------------------- +void AChaos::setupObjectContent(shared_ptr &mainWindow){ + unusedArgs(mainWindow); + + loadAudioSettings(); + + cNleVector.push_back("Clifford"); + cNleVector.push_back("Duffing"); + cNleVector.push_back("Ginger"); + cNleVector.push_back("Ikeda"); + cNleVector.push_back("Jong"); + cNleVector.push_back("Lorenz"); + cNleVector.push_back("NavierStokes"); + + ofDisableArbTex(); + chaosFbo = new ofFbo(); + chaosFbo->allocate(STANDARD_TEXTURE_WIDTH, STANDARD_TEXTURE_HEIGHT, GL_RGB, 1); + ofEnableArbTex(); + + p.assign(7,0.0f); + + startTime = ofGetElapsedTimeMillis(); + + loaded = false; + +} + +//-------------------------------------------------------------- +void AChaos::setupAudioOutObjectContent(pdsp::Engine &engine){ + signalOUT.out_signal() >> this->pdspOut[0]; + signalOUT.out_signal() >> scope >> engine.blackhole(); +} + +//-------------------------------------------------------------- +void AChaos::updateObjectContent(std::map> &patchObjects){ + unusedArgs(patchObjects); + + if(this->inletsConnected[0]){ + _x = ofClamp(*ofxVP_CAST_PIN_PTR(this->_inletParams[0]),0.0f,1.0f); + } + + if(this->inletsConnected[1]){ + _y = ofClamp(*ofxVP_CAST_PIN_PTR(this->_inletParams[1]),0.0f,1.0f); + } + + if(this->inletsConnected[2]){ + volume = ofClamp(*ofxVP_CAST_PIN_PTR(this->_inletParams[2]),0.0f,1.0f); + } + + if(!loaded){ + loaded = true; + cNle = newcNle = this->getCustomVar("CHAOS_NLE"); + prevW = this->getCustomVar("WIDTH"); + prevH = this->getCustomVar("HEIGHT"); + this->width = prevW; + this->height = prevH; + + setChaosNLE(); + } + + if(output==NULL) return; + + p.clear(); + switch (cNle) { + case 0: + p = {output[0], output[1],ofMap(_x,0.0,1.0,0.75, 1.1), ofMap(_y,0.0,1.0,0.75, 1.1),0.4,7.7}; // CLIFFORD + break; + case 1: + p = {ofClamp(output[0],-0.7f,0.7f), ofClamp(output[1],-0.7f,0.7f),ofMap(_x,0.0,1.0,0.1, 0.5), ofMap(_y,0.0,1.0,0.1, 0.5),0.4,7.7,0.0}; // DUFFING + break; + case 2: + p = {ofClamp(output[0],-0.7f,0.7f), ofClamp(output[1],-0.7f,0.7f),ofMap(_x,0.0,1.0,0.01, 0.3)}; // GINGER + break; + case 3: + p = {output[0], output[1],ofMap(_x,0.0,1.0,0.75, 1.1), ofMap(_y,0.0,1.0,0.75, 1.1),0.4,7.7}; // IKEDA + break; + case 4: + p = {output[0], output[1],ofMap(_x,0.0,1.0,0.75, 1.1), ofMap(_y,0.0,1.0,0.75, 1.1),0.4,7.7}; // JONG + break; + case 5: + p = {10.0,28.0,ofClamp(output[0],0.01,3.0), ofClamp(output[1],0.01,1.0),0.1,0.1,0.01}; // LORENZ + break; + case 6: + p = {output[0], output[1],_x,_y,1.0,ofMap(_x,0.0,1.0,10.0,28.0),ofMap(_y,0.0,1.0,0.001,0.015)}; // NAVIERSTOKES + break; + default: + break; + + } + chaos->setVector(p); + + if(changeNLE){ + changeNLE = false; + cNle = newcNle; + setChaosNLE(); + this->setCustomVar(static_cast(cNle),"CHAOS_NLE"); + } + +} + +//-------------------------------------------------------------- +void AChaos::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ + unusedArgs(font,glRenderer); + + if(chaosFbo->isAllocated()){ + chaosFbo->begin(); + ofClear(0,0,0,255); + ofSetColor(255); + visualizer->draw(STANDARD_TEXTURE_WIDTH, STANDARD_TEXTURE_HEIGHT); + chaosFbo->end(); + + *ofxVP_CAST_PIN_PTR(_outletParams[1]) = chaosFbo->getTexture(); + } + +} + +//-------------------------------------------------------------- +void AChaos::drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ){ + + // CONFIG GUI inside Menu + if(_nodeCanvas.BeginNodeMenu()){ + ImGui::Separator(); + ImGui::Separator(); + ImGui::Separator(); + + if (ImGui::BeginMenu("CONFIG")) + { + + drawObjectNodeConfig(); this->configMenuWidth = ImGui::GetWindowWidth(); + + ImGui::EndMenu(); + } + _nodeCanvas.EndNodeMenu(); + } + + // Visualize (Object main view) + if( _nodeCanvas.BeginNodeContent(ImGuiExNodeView_Visualise) ){ + + ImVec2 window_pos = ImGui::GetWindowPos()+ImVec2(IMGUI_EX_NODE_PINS_WIDTH_NORMAL, IMGUI_EX_NODE_HEADER_HEIGHT); + _nodeCanvas.getNodeDrawList()->AddRectFilled(window_pos,window_pos+ImVec2(scaledObjW*this->scaleFactor*_nodeCanvas.GetCanvasScale(), scaledObjH*this->scaleFactor*_nodeCanvas.GetCanvasScale()),ImGui::GetColorU32(ImVec4(0.0f, 0.0f, 0.0f, 1.0f))); + if(ofxVP_CAST_PIN_PTR(_outletParams[1])->isAllocated()){ + calcTextureDims(*ofxVP_CAST_PIN_PTR(_outletParams[1]), posX, posY, drawW, drawH, objOriginX, objOriginY, scaledObjW, scaledObjH, canvasZoom, this->scaleFactor); + ImGui::SetCursorPos(ImVec2(posX+(IMGUI_EX_NODE_PINS_WIDTH_NORMAL*this->scaleFactor), posY+(IMGUI_EX_NODE_HEADER_HEIGHT*this->scaleFactor))); + ImGui::Image((ImTextureID)(uintptr_t)ofxVP_CAST_PIN_PTR(_outletParams[1])->getTextureData().textureID, ImVec2(drawW, drawH)); + } + + // get imgui node translated/scaled position/dimension for drawing textures in OF + //objOriginX = (ImGui::GetWindowPos().x + ((IMGUI_EX_NODE_PINS_WIDTH_NORMAL - 1)*this->scaleFactor) - _nodeCanvas.GetCanvasTranslation().x)/_nodeCanvas.GetCanvasScale(); + //objOriginY = (ImGui::GetWindowPos().y - _nodeCanvas.GetCanvasTranslation().y)/_nodeCanvas.GetCanvasScale(); + scaledObjW = this->width - (IMGUI_EX_NODE_PINS_WIDTH_NORMAL+IMGUI_EX_NODE_PINS_WIDTH_SMALL)*this->scaleFactor/_nodeCanvas.GetCanvasScale(); + scaledObjH = this->height - (IMGUI_EX_NODE_HEADER_HEIGHT+IMGUI_EX_NODE_FOOTER_HEIGHT)*this->scaleFactor/_nodeCanvas.GetCanvasScale(); + + if(this->width != prevW){ + prevW = this->width; + this->setCustomVar(static_cast(prevW),"WIDTH"); + } + if(this->height != prevH){ + prevH = this->height; + this->setCustomVar(static_cast(prevH),"HEIGHT"); + } + + _nodeCanvas.EndNodeContent(); + } + + // get imgui canvas zoom + canvasZoom = _nodeCanvas.GetCanvasScale(); + +} + +//-------------------------------------------------------------- +void AChaos::drawObjectNodeConfig(){ + ImGui::Spacing(); + + if(ImGui::BeginCombo("Chaos NLE", cNleVector.at(newcNle).c_str() )){ + for(int i=0; i < cNleVector.size(); ++i){ + bool is_selected = (newcNle == i ); + if (ImGui::Selectable(cNleVector.at(i).c_str(), is_selected)){ + newcNle = i; + } + if (is_selected) ImGui::SetItemDefaultFocus(); + } + + ImGui::EndCombo(); + } + + ImGui::Spacing(); + ImGui::Spacing(); + ImGui::Spacing(); + if(ImGui::Button("APPLY",ImVec2(224*scaleFactor,26*scaleFactor))){ + changeNLE = true; + } + + ImGui::Spacing(); + ImGui::Spacing(); + ImGui::Spacing(); + if(ImGui::SliderFloat("amp",&volume,0.0f,1.0f)){ + this->setCustomVar(volume,"VOLUME"); + } + + ImGuiEx::ObjectInfo( + "A-Chaos Lib is a systematic approach to emulate the use of up-to-date known strange attractors non-linear equations by Andre Sier.\n\nhttp://s373.net/code/A-Chaos-Lib/A-Chaos.html", + "https://mosaic.d3cod3.org/reference.php?r=strange-attractors", scaleFactor); +} + +//-------------------------------------------------------------- +void AChaos::removeObjectContent(bool removeFileFromData){ + unusedArgs(removeFileFromData); + + for(map::iterator it = this->pdspOut.begin(); it != this->pdspOut.end(); it++ ){ + it->second.disconnectAll(); + } +} + +//-------------------------------------------------------------- +void AChaos::audioOutObject(ofSoundBuffer &outputBuffer){ + unusedArgs(outputBuffer); + + if(ofGetElapsedTimeMillis()-startTime > 1000){ + for(size_t i = 0; i < monoBuffer.getNumFrames(); i++) { + + if(chaos != nullptr) output = chaos->update(); + + if(visualizer != nullptr){ + visualizer->update(output); + + monoBuffer.getSample(i,0) = ofMap(output[0], visualizer->channels[0].min, visualizer->channels[0].max, -1, 1) * volume; + monoBuffer.getSample(i,1) = ofMap(output[1], visualizer->channels[1].min, visualizer->channels[1].max, -1, 1) * volume; + } + + } + + lastBuffer = monoBuffer; + + + signalOUT.copyInput(lastBuffer.getBuffer().data(),lastBuffer.getNumFrames()); + *ofxVP_CAST_PIN_PTR(_outletParams[0]) = lastBuffer; + } + +} + +//-------------------------------------------------------------- +void AChaos::loadAudioSettings(){ + ofxVPXml.loadMosaicPatch(this->patchFile); + + sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in"); + bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size"); + + shortBuffer = new short[bufferSize]; + for (int i = 0; i < bufferSize; i++){ + shortBuffer[i] = 0; + } + + ofSoundBuffer tmpBuffer(shortBuffer,static_cast(bufferSize),1,static_cast(sampleRate)); + monoBuffer = tmpBuffer; + +} + +//-------------------------------------------------------------- +void AChaos::setChaosNLE(){ + + output[0] = 0.0f; + output[1] = 0.0f; + output[2] = 0.0f; + output[3] = 0.0f; + output[4] = 0.0f; + output[5] = 0.0f; + + chaos = new AChaosBase(); + visualizer = new AChaosVisualizer(); + + if(cNle == 0){ + AChaosClifford *temp = new AChaosClifford(); + temp->setup(); + chaos = temp; + }else if(cNle == 1){ + AChaosDuffing *temp = new AChaosDuffing(); + temp->setup(); + chaos = temp; + }else if(cNle == 2){ + AChaosGinger *temp = new AChaosGinger(); + temp->setup(); + chaos = temp; + }else if(cNle == 3){ + AChaosIkeda *temp = new AChaosIkeda(); + temp->setup(); + chaos = temp; + }else if(cNle == 4){ + AChaosJong *temp = new AChaosJong(); + temp->setup(); + chaos = temp; + }else if(cNle == 5){ + AChaosLorenz *temp = new AChaosLorenz(); + temp->setup(); + chaos = temp; + }else if(cNle == 6){ + AChaosNavierStokes *temp = new AChaosNavierStokes(); + temp->setup(); + chaos = temp; + } + visualizer->setup(chaos,1024); +} + +OBJECT_REGISTER( AChaos, "strange attractors", OFXVP_OBJECT_CAT_GENERATIVE) + +#endif diff --git a/src/objects/generative/AChaos.h b/src/objects/generative/AChaos.h new file mode 100644 index 00000000..c49c2e60 --- /dev/null +++ b/src/objects/generative/AChaos.h @@ -0,0 +1,103 @@ +/*============================================================================== + + ofxVisualProgramming: A visual programming patching environment for OF + + Copyright (c) 2025 Emanuele Mazza aka n3m3da + + ofxVisualProgramming is distributed under the MIT License. + This gives everyone the freedoms to use ofxVisualProgramming in any context: + commercial or non-commercial, public or private, open or closed source. + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + See https://github.com/d3cod3/ofxVisualProgramming for documentation + +==============================================================================*/ + +#ifndef OFXVP_BUILD_WITH_MINIMAL_OBJECTS + +#pragma once + +#include "PatchObject.h" + +#include "AChaosLib.h" + +class AChaos : public PatchObject { + +public: + + AChaos(); + + void newObject() override; + void setupObjectContent(shared_ptr &mainWindow) override; + void setupAudioOutObjectContent(pdsp::Engine &engine) override; + void updateObjectContent(std::map> &patchObjects) override; + + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; + void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; + void drawObjectNodeConfig() override; + + void removeObjectContent(bool removeFileFromData=false) override; + + void audioOutObject(ofSoundBuffer &outputBuffer) override; + + void loadAudioSettings(); + void setChaosNLE(); + + AChaosVisualizer *visualizer; + AChaosBase *chaos; + REAL *output,volume; + std::vector p; + bool changeNLE; + + ofFbo *chaosFbo; + + pdsp::ExternalInput signalOUT; + pdsp::Scope scope; + ofSoundBuffer lastBuffer; + ofSoundBuffer monoBuffer; + short *shortBuffer; + + vector cNleVector; + int cNle, newcNle; + + size_t startTime; + + float posX, posY, drawW, drawH; + + float prevW, prevH; + + float scaledObjW, scaledObjH; + float objOriginX, objOriginY; + float canvasZoom; + + int bufferSize; + int sampleRate; + + bool loaded; + + float _x,_y; + +private: + + OBJECT_FACTORY_PROPS + +}; + +#endif From 03e216a5dd822fa8b0c8ed6a4fbe2e43275653ca Mon Sep 17 00:00:00 2001 From: d3cod3 Date: Tue, 22 Apr 2025 18:34:48 +0100 Subject: [PATCH 14/21] hardcoding temp fixes for forcing extarnal GL window objects at the end ( patch loading crashes otherwise ) --- src/ofxVisualProgramming.cpp | 196 +++++++++++++++++++---------------- 1 file changed, 105 insertions(+), 91 deletions(-) diff --git a/src/ofxVisualProgramming.cpp b/src/ofxVisualProgramming.cpp index ad3f3209..cc1624fe 100755 --- a/src/ofxVisualProgramming.cpp +++ b/src/ofxVisualProgramming.cpp @@ -1759,51 +1759,56 @@ void ofxVisualProgramming::loadPatch(std::string patchFile){ for(auto & obj: objs){ auto o = obj.node(); std::string objname = ofxVPXml.getPatchChildString(o,"name"); - bool loaded = false; - if(isObjectInLibrary(objname)){ - std::shared_ptr tempObj = selectObject(objname); - if(tempObj != nullptr && !tempObj->getIsSharedContextObject()){ - loaded = tempObj->loadConfig(mainWindow,*engine,oi,patchFile); - if(loaded){ - tempObj->setPatchfile(currentPatchFile); - tempObj->setIsRetina(isRetina,scaleFactor); - std::string objSubpatch = ofxVPXml.getPatchChildString(o,"subpatch"); - if(objSubpatch == "") objSubpatch = "root"; // retro compatibility for pre-subpatch patches - tempObj->setSubpatch(objSubpatch); - if (subpatchesMap.find(objSubpatch) == subpatchesMap.end()) { - std::vector _sp; - subpatchesMap[objSubpatch] = _sp; - } - ofAddListener(tempObj->removeEvent ,this,&ofxVisualProgramming::removeObject); - ofAddListener(tempObj->resetEvent ,this,&ofxVisualProgramming::resetObject); - ofAddListener(tempObj->reconnectOutletsEvent ,this,&ofxVisualProgramming::reconnectObjectOutlets); - ofAddListener(tempObj->duplicateEvent ,this,&ofxVisualProgramming::duplicateObject); - // Insert the new object into the map - patchObjects[tempObj->getId()] = tempObj; - actualObjectID = tempObj->getId(); - lastAddedObjectID = tempObj->getId(); - nodeCanvas.addNodeToMap(tempObj->getId(),tempObj->getName()); - // if wireless object, add reference to subpatch data map - if(objname == "sender"){ - SubpatchConnection _t; - _t.objID = tempObj->getId(); - _t.inOut = 1; - subpatchesMap[objSubpatch].push_back(_t); - }else if(objname == "receiver"){ - SubpatchConnection _t; - _t.objID = tempObj->getId(); - _t.inOut = 0; - subpatchesMap[objSubpatch].push_back(_t); - } -#ifdef OFXVP_DEBUG - std::cout << "Loading "<< tempObj->getName() << std::endl; -#endif + if(objname != "timeline" && objname != "output window" && objname != "projection mapping" && objname != "scheme live coding"){ + bool loaded = false; + + if(isObjectInLibrary(objname)){ + std::shared_ptr tempObj = selectObject(objname); + if(tempObj != nullptr && !tempObj->getIsSharedContextObject()){ + loaded = tempObj->loadConfig(mainWindow,*engine,oi,patchFile); + if(loaded){ + tempObj->setPatchfile(currentPatchFile); + tempObj->setIsRetina(isRetina,scaleFactor); + std::string objSubpatch = ofxVPXml.getPatchChildString(o,"subpatch"); + if(objSubpatch == "") objSubpatch = "root"; // retro compatibility for pre-subpatch patches + tempObj->setSubpatch(objSubpatch); + if (subpatchesMap.find(objSubpatch) == subpatchesMap.end()) { + std::vector _sp; + subpatchesMap[objSubpatch] = _sp; + } + ofAddListener(tempObj->removeEvent ,this,&ofxVisualProgramming::removeObject); + ofAddListener(tempObj->resetEvent ,this,&ofxVisualProgramming::resetObject); + ofAddListener(tempObj->reconnectOutletsEvent ,this,&ofxVisualProgramming::reconnectObjectOutlets); + ofAddListener(tempObj->duplicateEvent ,this,&ofxVisualProgramming::duplicateObject); + // Insert the new object into the map + patchObjects[tempObj->getId()] = tempObj; + actualObjectID = tempObj->getId(); + lastAddedObjectID = tempObj->getId(); + nodeCanvas.addNodeToMap(tempObj->getId(),tempObj->getName()); + // if wireless object, add reference to subpatch data map + if(objname == "sender"){ + SubpatchConnection _t; + _t.objID = tempObj->getId(); + _t.inOut = 1; + subpatchesMap[objSubpatch].push_back(_t); + }else if(objname == "receiver"){ + SubpatchConnection _t; + _t.objID = tempObj->getId(); + _t.inOut = 0; + subpatchesMap[objSubpatch].push_back(_t); + } - std::this_thread::sleep_for(std::chrono::milliseconds(10)); + #ifdef OFXVP_DEBUG + std::cout << "Loading "<< tempObj->getName() << std::endl; + #endif + + std::this_thread::sleep_for(std::chrono::milliseconds(10)); + } } } + } oi++; } @@ -1812,40 +1817,44 @@ void ofxVisualProgramming::loadPatch(std::string patchFile){ for(auto & obj: objs){ auto o = obj.node(); std::string objname = ofxVPXml.getPatchChildString(o,"name"); - if(isObjectInLibrary(objname)){ - std::shared_ptr tempObj = selectObject(objname); - if(tempObj != nullptr && !tempObj->getIsSharedContextObject()){ - int fromID = ofxVPXml.getPatchChildInt(o,"id"); - pugi::xpath_node_set objOutlets = ofxVPXml.getObjectOutlets(fromID); - if(!objOutlets.empty()){ - int oIndex = 0; - for(auto & outlet: objOutlets){ - auto out = outlet.node(); - int linkType = ofxVPXml.getPatchChildInt(out,"type"); - if(linkType != VP_LINK_AUDIO){ - pugi::xpath_node_set outletLinks = ofxVPXml.getObjectLinks(fromID, oIndex); - if(!outletLinks.empty()){ - for(auto & link: outletLinks){ - auto l = link.node(); - int toObjectID = ofxVPXml.getPatchChildInt(l,"id"); - int toInletID = ofxVPXml.getPatchChildInt(l,"inlet"); - - // fix loading patches with non-existent objects (older OFXVP versions) - if(isObjectIDInPatchMap(toObjectID)){ - if(connect(fromID,oIndex,toObjectID,toInletID,linkType)){ - //ofLog(OF_LOG_NOTICE,"Connected object %s, outlet %i TO object %s, inlet %i",patchObjects[fromID]->getName().c_str(),oIndex,patchObjects[toObjectID]->getName().c_str(),toInletID); - std::this_thread::sleep_for(std::chrono::milliseconds(10)); + if(objname != "timeline" && objname != "output window" && objname != "projection mapping" && objname != "scheme live coding"){ + + if(isObjectInLibrary(objname)){ + std::shared_ptr tempObj = selectObject(objname); + if(tempObj != nullptr && !tempObj->getIsSharedContextObject()){ + int fromID = ofxVPXml.getPatchChildInt(o,"id"); + pugi::xpath_node_set objOutlets = ofxVPXml.getObjectOutlets(fromID); + if(!objOutlets.empty()){ + int oIndex = 0; + for(auto & outlet: objOutlets){ + auto out = outlet.node(); + int linkType = ofxVPXml.getPatchChildInt(out,"type"); + if(linkType != VP_LINK_AUDIO){ + pugi::xpath_node_set outletLinks = ofxVPXml.getObjectLinks(fromID, oIndex); + if(!outletLinks.empty()){ + for(auto & link: outletLinks){ + auto l = link.node(); + int toObjectID = ofxVPXml.getPatchChildInt(l,"id"); + int toInletID = ofxVPXml.getPatchChildInt(l,"inlet"); + + // fix loading patches with non-existent objects (older OFXVP versions) + if(isObjectIDInPatchMap(toObjectID)){ + if(connect(fromID,oIndex,toObjectID,toInletID,linkType)){ + //ofLog(OF_LOG_NOTICE,"Connected object %s, outlet %i TO object %s, inlet %i",patchObjects[fromID]->getName().c_str(),oIndex,patchObjects[toObjectID]->getName().c_str(),toInletID); + std::this_thread::sleep_for(std::chrono::milliseconds(10)); + } } } } } - } - oIndex++; + oIndex++; + } } } } } + } } @@ -1877,40 +1886,45 @@ void ofxVisualProgramming::loadPatchSharedContextObjects(){ for(auto & obj: objs){ auto o = obj.node(); std::string objname = ofxVPXml.getPatchChildString(o,"name"); - if(isObjectInLibrary(objname)){ - std::shared_ptr tempObj = selectObject(objname); - if(tempObj != nullptr && !tempObj->getIsSharedContextObject()){ - int fromID = ofxVPXml.getPatchChildInt(o,"id"); - pugi::xpath_node_set objOutlets = ofxVPXml.getObjectOutlets(fromID); - if(!objOutlets.empty()){ - int oIndex = 0; - for(auto & outlet: objOutlets){ - auto out = outlet.node(); - int linkType = ofxVPXml.getPatchChildInt(out,"type"); - if(linkType == VP_LINK_AUDIO){ - pugi::xpath_node_set outletLinks = ofxVPXml.getObjectLinks(fromID, oIndex); - if(!outletLinks.empty()){ - for(auto & link: outletLinks){ - auto l = link.node(); - int toObjectID = ofxVPXml.getPatchChildInt(l,"id"); - int toInletID = ofxVPXml.getPatchChildInt(l,"inlet"); - - // fix loading patches with non-existent objects (older OFXVP versions) - if(isObjectIDInPatchMap(toObjectID)){ - if(connect(fromID,oIndex,toObjectID,toInletID,linkType)){ - //ofLog(OF_LOG_NOTICE,"Connected object %s, outlet %i TO object %s, inlet %i",patchObjects[fromID]->getName().c_str(),oIndex,patchObjects[toObjectID]->getName().c_str(),toInletID); - std::this_thread::sleep_for(std::chrono::milliseconds(10)); + if(objname != "timeline" && objname != "output window" && objname != "projection mapping" && objname != "scheme live coding"){ + + if(isObjectInLibrary(objname)){ + std::shared_ptr tempObj = selectObject(objname); + + if(tempObj != nullptr && !tempObj->getIsSharedContextObject()){ + int fromID = ofxVPXml.getPatchChildInt(o,"id"); + pugi::xpath_node_set objOutlets = ofxVPXml.getObjectOutlets(fromID); + if(!objOutlets.empty()){ + int oIndex = 0; + for(auto & outlet: objOutlets){ + auto out = outlet.node(); + int linkType = ofxVPXml.getPatchChildInt(out,"type"); + if(linkType == VP_LINK_AUDIO){ + pugi::xpath_node_set outletLinks = ofxVPXml.getObjectLinks(fromID, oIndex); + if(!outletLinks.empty()){ + for(auto & link: outletLinks){ + auto l = link.node(); + int toObjectID = ofxVPXml.getPatchChildInt(l,"id"); + int toInletID = ofxVPXml.getPatchChildInt(l,"inlet"); + + // fix loading patches with non-existent objects (older OFXVP versions) + if(isObjectIDInPatchMap(toObjectID)){ + if(connect(fromID,oIndex,toObjectID,toInletID,linkType)){ + //ofLog(OF_LOG_NOTICE,"Connected object %s, outlet %i TO object %s, inlet %i",patchObjects[fromID]->getName().c_str(),oIndex,patchObjects[toObjectID]->getName().c_str(),toInletID); + std::this_thread::sleep_for(std::chrono::milliseconds(10)); + } } } } } - } - oIndex++; + oIndex++; + } } } } } + } } @@ -1979,7 +1993,7 @@ void ofxVisualProgramming::loadPatchSharedContextObjects(){ std::string toObjName = getObjectNameFromID(toObjectID); if(toObjName != ""){ - shared_ptr _tempToObj = selectObject(toObjName); + std::shared_ptr _tempToObj = selectObject(toObjName); if(_tempToObj != nullptr && _tempToObj->getIsSharedContextObject()){ // fix loading patches with non-existent objects (older OFXVP versions) if(isObjectIDInPatchMap(toObjectID)){ From f2ff0fa0a1d8b95ade4eeb689966de80a3cd4438 Mon Sep 17 00:00:00 2001 From: d3cod3 Date: Tue, 22 Apr 2025 18:35:43 +0100 Subject: [PATCH 15/21] standard texture resolution set at HD 1920x1080 ( it was time ) --- src/ofxVPConfig.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ofxVPConfig.h b/src/ofxVPConfig.h index 7e18bf31..bb078941 100644 --- a/src/ofxVPConfig.h +++ b/src/ofxVPConfig.h @@ -55,8 +55,8 @@ #define STANDARD_PROJECTOR_WINDOW_WIDTH 854 #define STANDARD_PROJECTOR_WINDOW_HEIGHT 480 -#define STANDARD_TEXTURE_WIDTH 1280 -#define STANDARD_TEXTURE_HEIGHT 720 +#define STANDARD_TEXTURE_WIDTH 1920 +#define STANDARD_TEXTURE_HEIGHT 1080 #define OBJECT_STANDARD_WIDTH 160 #define OBJECT_STANDARD_HEIGHT 120 @@ -107,6 +107,7 @@ #define OFXVP_OBJECT_CAT_COMMUNICATIONS "communications" #define OFXVP_OBJECT_CAT_CV "computer vision" #define OFXVP_OBJECT_CAT_DATA "data" +#define OFXVP_OBJECT_CAT_GENERATIVE "generative" #define OFXVP_OBJECT_CAT_GRAPHICS "graphics" #define OFXVP_OBJECT_CAT_GUI "gui" #define OFXVP_OBJECT_CAT_LOGIC "logic" From f8a99f91f71bb078f8486314c03bbebf3dcd2b10 Mon Sep 17 00:00:00 2001 From: d3cod3 Date: Tue, 22 Apr 2025 18:36:18 +0100 Subject: [PATCH 16/21] added std:: namespace where needed --- src/PatchObject.h | 2 +- src/objects/audio_analysis/AudioAnalyzer.cpp | 2 +- src/objects/audio_analysis/AudioAnalyzer.h | 2 +- src/objects/audio_analysis/BPMExtractor.cpp | 2 +- src/objects/audio_analysis/BPMExtractor.h | 2 +- src/objects/audio_analysis/FftExtractor.cpp | 2 +- src/objects/audio_analysis/FftExtractor.h | 2 +- src/objects/audio_analysis/MelBandsExtractor.cpp | 2 +- src/objects/audio_analysis/MelBandsExtractor.h | 2 +- src/objects/audio_analysis/PitchExtractor.cpp | 2 +- src/objects/audio_analysis/PitchExtractor.h | 2 +- src/objects/audio_analysis/RMSExtractor.cpp | 2 +- src/objects/audio_analysis/RMSExtractor.h | 2 +- src/objects/communications/ArduinoSerial.cpp | 2 +- src/objects/communications/ArduinoSerial.h | 2 +- src/objects/communications/KeyPressed.cpp | 2 +- src/objects/communications/KeyPressed.h | 2 +- src/objects/communications/KeyReleased.cpp | 2 +- src/objects/communications/KeyReleased.h | 2 +- src/objects/communications/MidiKey.cpp | 2 +- src/objects/communications/MidiKey.h | 2 +- src/objects/communications/MidiKnob.cpp | 2 +- src/objects/communications/MidiKnob.h | 2 +- src/objects/communications/MidiPad.cpp | 2 +- src/objects/communications/MidiPad.h | 2 +- src/objects/communications/MidiReceiver.cpp | 2 +- src/objects/communications/MidiReceiver.h | 2 +- src/objects/communications/MidiSender.cpp | 2 +- src/objects/communications/MidiSender.h | 2 +- src/objects/communications/OscReceiver.cpp | 2 +- src/objects/communications/OscReceiver.h | 2 +- src/objects/communications/OscSender.cpp | 2 +- src/objects/communications/OscSender.h | 2 +- src/objects/computer_vision/BackgroundSubtraction.cpp | 4 +--- src/objects/computer_vision/BackgroundSubtraction.h | 2 +- src/objects/computer_vision/ColorTracking.cpp | 2 +- src/objects/computer_vision/ColorTracking.h | 2 +- src/objects/computer_vision/ContourTracking.cpp | 2 +- src/objects/computer_vision/ContourTracking.h | 2 +- src/objects/computer_vision/HaarTracking.cpp | 2 +- src/objects/computer_vision/HaarTracking.h | 2 +- src/objects/computer_vision/MotionDetection.cpp | 2 +- src/objects/computer_vision/MotionDetection.h | 2 +- src/objects/computer_vision/OpticalFlow.cpp | 2 +- src/objects/computer_vision/OpticalFlow.h | 2 +- src/objects/data/BangMultiplexer.cpp | 2 +- src/objects/data/BangMultiplexer.h | 2 +- src/objects/data/BangToFloat.cpp | 2 +- src/objects/data/BangToFloat.h | 2 +- src/objects/data/DataToFile.cpp | 2 +- src/objects/data/DataToFile.h | 2 +- src/objects/data/DataToTexture.cpp | 2 +- src/objects/data/DataToTexture.h | 2 +- src/objects/data/FileToData.cpp | 2 +- src/objects/data/FileToData.h | 2 +- src/objects/data/FloatMultiplexer.cpp | 2 +- src/objects/data/FloatMultiplexer.h | 2 +- src/objects/data/FloatsToVector.cpp | 2 +- src/objects/data/FloatsToVector.h | 2 +- src/objects/data/Receiver.cpp | 2 +- src/objects/data/Receiver.h | 2 +- src/objects/data/Sender.cpp | 2 +- src/objects/data/Sender.h | 2 +- src/objects/data/TextureToData.cpp | 2 +- src/objects/data/TextureToData.h | 2 +- src/objects/data/VectorAt.cpp | 2 +- src/objects/data/VectorAt.h | 2 +- src/objects/data/VectorConcat.cpp | 2 +- src/objects/data/VectorConcat.h | 2 +- src/objects/data/VectorExtract.cpp | 2 +- src/objects/data/VectorExtract.h | 2 +- src/objects/data/VectorGate.cpp | 2 +- src/objects/data/VectorGate.h | 2 +- src/objects/data/VectorOperator.cpp | 2 +- src/objects/data/VectorOperator.h | 2 +- src/objects/graphics/ColorPalette.cpp | 2 +- src/objects/graphics/ColorPalette.h | 2 +- src/objects/graphics/ImageExporter.cpp | 2 +- src/objects/graphics/ImageExporter.h | 2 +- src/objects/graphics/ImageLoader.cpp | 2 +- src/objects/graphics/ImageLoader.h | 2 +- src/objects/gui/mo2DPad.cpp | 2 +- src/objects/gui/mo2DPad.h | 2 +- src/objects/gui/moBang.cpp | 2 +- src/objects/gui/moBang.h | 2 +- src/objects/gui/moComment.cpp | 2 +- src/objects/gui/moComment.h | 2 +- src/objects/gui/moDataViewer.cpp | 2 +- src/objects/gui/moDataViewer.h | 2 +- src/objects/gui/moMessage.cpp | 2 +- src/objects/gui/moMessage.h | 2 +- src/objects/gui/moMultiSlider.cpp | 2 +- src/objects/gui/moMultiSlider.h | 2 +- src/objects/gui/moMultiToggle.cpp | 2 +- src/objects/gui/moMultiToggle.h | 2 +- src/objects/gui/moPianoKeyboard.cpp | 2 +- src/objects/gui/moPianoKeyboard.h | 2 +- src/objects/gui/moPlayerControls.cpp | 2 +- src/objects/gui/moPlayerControls.h | 2 +- src/objects/gui/moSignalViewer.cpp | 2 +- src/objects/gui/moSignalViewer.h | 2 +- src/objects/gui/moSlider.cpp | 2 +- src/objects/gui/moSlider.h | 2 +- src/objects/gui/moSonogram.cpp | 2 +- src/objects/gui/moSonogram.h | 2 +- src/objects/gui/moTimeline.cpp | 2 +- src/objects/gui/moTimeline.h | 2 +- src/objects/gui/moTrigger.cpp | 2 +- src/objects/gui/moTrigger.h | 2 +- src/objects/gui/moVUMeter.cpp | 2 +- src/objects/gui/moVUMeter.h | 2 +- src/objects/gui/moValuePlotter.cpp | 2 +- src/objects/gui/moValuePlotter.h | 2 +- src/objects/gui/moVideoViewer.cpp | 2 +- src/objects/gui/moVideoViewer.h | 2 +- src/objects/logic/BooleanOperator.cpp | 2 +- src/objects/logic/BooleanOperator.h | 2 +- src/objects/logic/Conditional.cpp | 2 +- src/objects/logic/Conditional.h | 2 +- src/objects/logic/Counter.cpp | 2 +- src/objects/logic/Counter.h | 2 +- src/objects/logic/DelayBang.cpp | 2 +- src/objects/logic/DelayBang.h | 2 +- src/objects/logic/DelayFloat.cpp | 2 +- src/objects/logic/DelayFloat.h | 2 +- src/objects/logic/Gate.cpp | 2 +- src/objects/logic/Gate.h | 2 +- src/objects/logic/Inverter.cpp | 2 +- src/objects/logic/Inverter.h | 2 +- src/objects/logic/LoadBang.cpp | 2 +- src/objects/logic/LoadBang.h | 2 +- src/objects/logic/Spigot.cpp | 2 +- src/objects/logic/Spigot.h | 2 +- src/objects/logic/TimedSemaphore.cpp | 2 +- src/objects/logic/TimedSemaphore.h | 2 +- src/objects/math/Clamp.cpp | 2 +- src/objects/math/Clamp.h | 2 +- src/objects/math/Constant.cpp | 2 +- src/objects/math/Constant.h | 2 +- src/objects/math/CosineGenerator.cpp | 2 +- src/objects/math/CosineGenerator.h | 2 +- src/objects/math/Map.cpp | 2 +- src/objects/math/Map.h | 2 +- src/objects/math/Metronome.cpp | 2 +- src/objects/math/Metronome.h | 2 +- src/objects/math/NumberOperator.cpp | 2 +- src/objects/math/NumberOperator.h | 2 +- src/objects/math/SimpleNoise.cpp | 2 +- src/objects/math/SimpleNoise.h | 2 +- src/objects/math/SimpleRandom.cpp | 2 +- src/objects/math/SimpleRandom.h | 2 +- src/objects/math/SineGenerator.cpp | 2 +- src/objects/math/SineGenerator.h | 2 +- src/objects/math/Smooth.cpp | 2 +- src/objects/math/Smooth.h | 2 +- src/objects/scripting/BashScript.cpp | 2 +- src/objects/scripting/BashScript.h | 2 +- src/objects/scripting/LuaScript.cpp | 2 +- src/objects/scripting/LuaScript.h | 2 +- src/objects/scripting/SchemeScript.cpp | 2 +- src/objects/scripting/SchemeScript.h | 2 +- src/objects/scripting/ShaderObject.cpp | 2 +- src/objects/scripting/ShaderObject.h | 2 +- src/objects/sound/AudioDevice.cpp | 2 +- src/objects/sound/AudioDevice.h | 2 +- src/objects/sound/AudioExporter.cpp | 2 +- src/objects/sound/AudioExporter.h | 2 +- src/objects/sound/AudioGate.cpp | 2 +- src/objects/sound/AudioGate.h | 2 +- src/objects/sound/Crossfader.cpp | 2 +- src/objects/sound/Crossfader.h | 2 +- src/objects/sound/FrequencyToNote.cpp | 2 +- src/objects/sound/FrequencyToNote.h | 2 +- src/objects/sound/Mixer.cpp | 2 +- src/objects/sound/Mixer.h | 2 +- src/objects/sound/NoteToFrequency.cpp | 2 +- src/objects/sound/NoteToFrequency.h | 2 +- src/objects/sound/Oscillator.cpp | 4 +--- src/objects/sound/Oscillator.h | 2 +- src/objects/sound/PDPatch.cpp | 2 +- src/objects/sound/PDPatch.h | 2 +- src/objects/sound/Panner.cpp | 2 +- src/objects/sound/Panner.h | 2 +- src/objects/sound/PolyphonicOscillator.cpp | 2 +- src/objects/sound/PolyphonicOscillator.h | 2 +- src/objects/sound/QuadPanner.cpp | 2 +- src/objects/sound/QuadPanner.h | 2 +- src/objects/sound/Quantizer.cpp | 2 +- src/objects/sound/Quantizer.h | 2 +- src/objects/sound/SamplePlayer.cpp | 2 +- src/objects/sound/SamplePlayer.h | 2 +- src/objects/sound/SigMult.cpp | 2 +- src/objects/sound/SigMult.h | 2 +- src/objects/sound/SignalOperator.cpp | 2 +- src/objects/sound/SignalOperator.h | 2 +- src/objects/sound/SignalTrigger.cpp | 2 +- src/objects/sound/SignalTrigger.h | 2 +- src/objects/sound/SoundfilePlayer.cpp | 2 +- src/objects/sound/SoundfilePlayer.h | 2 +- src/objects/sound/SummingMixer.cpp | 2 +- src/objects/sound/SummingMixer.h | 2 +- src/objects/sound/pdspADSR.cpp | 2 +- src/objects/sound/pdspADSR.h | 2 +- src/objects/sound/pdspAHR.cpp | 2 +- src/objects/sound/pdspAHR.h | 2 +- src/objects/sound/pdspAddressSequencer.cpp | 2 +- src/objects/sound/pdspAddressSequencer.h | 2 +- src/objects/sound/pdspBitCruncher.cpp | 2 +- src/objects/sound/pdspBitCruncher.h | 2 +- src/objects/sound/pdspBitNoise.cpp | 2 +- src/objects/sound/pdspBitNoise.h | 2 +- src/objects/sound/pdspChorusEffect.cpp | 2 +- src/objects/sound/pdspChorusEffect.h | 2 +- src/objects/sound/pdspCombFilter.cpp | 2 +- src/objects/sound/pdspCombFilter.h | 2 +- src/objects/sound/pdspCompressor.cpp | 2 +- src/objects/sound/pdspCompressor.h | 2 +- src/objects/sound/pdspDataOscillator.cpp | 2 +- src/objects/sound/pdspDataOscillator.h | 2 +- src/objects/sound/pdspDecimator.cpp | 2 +- src/objects/sound/pdspDecimator.h | 2 +- src/objects/sound/pdspDelay.cpp | 2 +- src/objects/sound/pdspDelay.h | 2 +- src/objects/sound/pdspDucker.cpp | 2 +- src/objects/sound/pdspDucker.h | 2 +- src/objects/sound/pdspHiCut.cpp | 2 +- src/objects/sound/pdspHiCut.h | 2 +- src/objects/sound/pdspKick.cpp | 2 +- src/objects/sound/pdspKick.h | 2 +- src/objects/sound/pdspLFO.cpp | 2 +- src/objects/sound/pdspLFO.h | 2 +- src/objects/sound/pdspLowCut.cpp | 2 +- src/objects/sound/pdspLowCut.h | 2 +- src/objects/sound/pdspParametricEQ.cpp | 2 +- src/objects/sound/pdspParametricEQ.h | 2 +- src/objects/sound/pdspResonant2PoleFilter.cpp | 2 +- src/objects/sound/pdspResonant2PoleFilter.h | 2 +- src/objects/sound/pdspReverb.cpp | 2 +- src/objects/sound/pdspReverb.h | 2 +- src/objects/sound/pdspSequencer.cpp | 2 +- src/objects/sound/pdspSequencer.h | 2 +- src/objects/string/RandomString.cpp | 2 +- src/objects/string/RandomString.h | 2 +- src/objects/string/StringAt.cpp | 2 +- src/objects/string/StringAt.h | 2 +- src/objects/string/StringConcat.cpp | 2 +- src/objects/string/StringConcat.h | 2 +- src/objects/string/StringExtract.cpp | 2 +- src/objects/string/StringExtract.h | 2 +- src/objects/string/StringGate.cpp | 2 +- src/objects/string/StringGate.h | 2 +- src/objects/string/StringMultiplexer.cpp | 2 +- src/objects/string/StringMultiplexer.h | 2 +- src/objects/surface/FboComposer.cpp | 2 +- src/objects/surface/FboComposer.h | 2 +- src/objects/surface/FboEffect.cpp | 2 +- src/objects/surface/FboEffect.h | 2 +- src/objects/surface/FboParticles.cpp | 2 +- src/objects/surface/FboParticles.h | 2 +- src/objects/video/KinectGrabber.cpp | 2 +- src/objects/video/KinectGrabber.h | 2 +- src/objects/video/PixelsToTexture.cpp | 2 +- src/objects/video/PixelsToTexture.h | 2 +- src/objects/video/TextureInformation.cpp | 2 +- src/objects/video/TextureInformation.h | 2 +- src/objects/video/TextureToPixels.cpp | 2 +- src/objects/video/TextureToPixels.h | 2 +- src/objects/video/ToGrayScaleTexture.cpp | 2 +- src/objects/video/ToGrayScaleTexture.h | 2 +- src/objects/video/VideoCrop.cpp | 2 +- src/objects/video/VideoCrop.h | 2 +- src/objects/video/VideoDelay.cpp | 2 +- src/objects/video/VideoDelay.h | 2 +- src/objects/video/VideoExporter.cpp | 2 +- src/objects/video/VideoExporter.h | 2 +- src/objects/video/VideoGate.cpp | 2 +- src/objects/video/VideoGate.h | 2 +- src/objects/video/VideoGrabber.cpp | 2 +- src/objects/video/VideoGrabber.h | 2 +- src/objects/video/VideoMixer.cpp | 2 +- src/objects/video/VideoMixer.h | 2 +- src/objects/video/VideoPlayer.cpp | 2 +- src/objects/video/VideoPlayer.h | 2 +- src/objects/video/VideoStreaming.cpp | 2 +- src/objects/video/VideoStreaming.h | 2 +- src/objects/video/VideoTimelapse.cpp | 2 +- src/objects/video/VideoTimelapse.h | 2 +- src/objects/video/VideoTransform.cpp | 2 +- src/objects/video/VideoTransform.h | 2 +- src/objects/windowing/LivePatching.cpp | 2 +- src/objects/windowing/LivePatching.h | 2 +- src/objects/windowing/OutputWindow.cpp | 2 +- src/objects/windowing/OutputWindow.h | 2 +- src/objects/windowing/ProjectionMapping.cpp | 2 +- src/objects/windowing/ProjectionMapping.h | 2 +- src/utils.h | 1 + 296 files changed, 296 insertions(+), 299 deletions(-) diff --git a/src/PatchObject.h b/src/PatchObject.h index 099d253e..d665f209 100644 --- a/src/PatchObject.h +++ b/src/PatchObject.h @@ -99,7 +99,7 @@ class PatchObject : public ofxVPHasUID { virtual void setupAudioOutObjectContent(pdsp::Engine &engine) { unusedArgs(engine); } virtual void updateObjectContent(std::map> &patchObjects) { unusedArgs(patchObjects); } virtual void updateAudioObjectContent(pdsp::Engine &engine) { unusedArgs(engine); } - virtual void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) { unusedArgs(font,glRenderer); } + virtual void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) { unusedArgs(font,glRenderer); } virtual void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) { unusedArgs(_nodeCanvas); } virtual void drawObjectNodeConfig() {} virtual void removeObjectContent(bool removeFileFromData=false) { unusedArgs(removeFileFromData); } diff --git a/src/objects/audio_analysis/AudioAnalyzer.cpp b/src/objects/audio_analysis/AudioAnalyzer.cpp index b880aa30..23445761 100644 --- a/src/objects/audio_analysis/AudioAnalyzer.cpp +++ b/src/objects/audio_analysis/AudioAnalyzer.cpp @@ -163,7 +163,7 @@ void AudioAnalyzer::updateObjectContent(std::map& glRenderer){ +void AudioAnalyzer::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/audio_analysis/AudioAnalyzer.h b/src/objects/audio_analysis/AudioAnalyzer.h index c370e218..ec02312d 100644 --- a/src/objects/audio_analysis/AudioAnalyzer.h +++ b/src/objects/audio_analysis/AudioAnalyzer.h @@ -53,7 +53,7 @@ class AudioAnalyzer : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/audio_analysis/BPMExtractor.cpp b/src/objects/audio_analysis/BPMExtractor.cpp index a8a94474..7aaa1391 100755 --- a/src/objects/audio_analysis/BPMExtractor.cpp +++ b/src/objects/audio_analysis/BPMExtractor.cpp @@ -119,7 +119,7 @@ void BPMExtractor::updateObjectContent(std::map } //-------------------------------------------------------------- -void BPMExtractor::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void BPMExtractor::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/audio_analysis/BPMExtractor.h b/src/objects/audio_analysis/BPMExtractor.h index a1aa4e27..dcdc7929 100755 --- a/src/objects/audio_analysis/BPMExtractor.h +++ b/src/objects/audio_analysis/BPMExtractor.h @@ -46,7 +46,7 @@ class BPMExtractor : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/audio_analysis/FftExtractor.cpp b/src/objects/audio_analysis/FftExtractor.cpp index c6eb1da2..42940604 100755 --- a/src/objects/audio_analysis/FftExtractor.cpp +++ b/src/objects/audio_analysis/FftExtractor.cpp @@ -128,7 +128,7 @@ void FftExtractor::updateObjectContent(std::map } //-------------------------------------------------------------- -void FftExtractor::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void FftExtractor::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/audio_analysis/FftExtractor.h b/src/objects/audio_analysis/FftExtractor.h index e5440c31..00c65bd1 100755 --- a/src/objects/audio_analysis/FftExtractor.h +++ b/src/objects/audio_analysis/FftExtractor.h @@ -48,7 +48,7 @@ class FftExtractor : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/audio_analysis/MelBandsExtractor.cpp b/src/objects/audio_analysis/MelBandsExtractor.cpp index e17c2cb7..e1766b5b 100755 --- a/src/objects/audio_analysis/MelBandsExtractor.cpp +++ b/src/objects/audio_analysis/MelBandsExtractor.cpp @@ -114,7 +114,7 @@ void MelBandsExtractor::updateObjectContent(std::map& glRenderer){ +void MelBandsExtractor::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/audio_analysis/MelBandsExtractor.h b/src/objects/audio_analysis/MelBandsExtractor.h index e2ff6c30..cc6b3ffb 100755 --- a/src/objects/audio_analysis/MelBandsExtractor.h +++ b/src/objects/audio_analysis/MelBandsExtractor.h @@ -47,7 +47,7 @@ class MelBandsExtractor : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/audio_analysis/PitchExtractor.cpp b/src/objects/audio_analysis/PitchExtractor.cpp index f941a52d..add49ff6 100755 --- a/src/objects/audio_analysis/PitchExtractor.cpp +++ b/src/objects/audio_analysis/PitchExtractor.cpp @@ -106,7 +106,7 @@ void PitchExtractor::updateObjectContent(std::map& glRenderer){ +void PitchExtractor::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/audio_analysis/PitchExtractor.h b/src/objects/audio_analysis/PitchExtractor.h index 4e6ec9b0..9bc6c5f3 100755 --- a/src/objects/audio_analysis/PitchExtractor.h +++ b/src/objects/audio_analysis/PitchExtractor.h @@ -46,7 +46,7 @@ class PitchExtractor : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/audio_analysis/RMSExtractor.cpp b/src/objects/audio_analysis/RMSExtractor.cpp index e0e23b39..2932d75d 100755 --- a/src/objects/audio_analysis/RMSExtractor.cpp +++ b/src/objects/audio_analysis/RMSExtractor.cpp @@ -106,7 +106,7 @@ void RMSExtractor::updateObjectContent(std::map } //-------------------------------------------------------------- -void RMSExtractor::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void RMSExtractor::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/audio_analysis/RMSExtractor.h b/src/objects/audio_analysis/RMSExtractor.h index 7a70b2b2..e18e8dda 100755 --- a/src/objects/audio_analysis/RMSExtractor.h +++ b/src/objects/audio_analysis/RMSExtractor.h @@ -46,7 +46,7 @@ class RMSExtractor : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/communications/ArduinoSerial.cpp b/src/objects/communications/ArduinoSerial.cpp index f46f9bbf..f39e6b13 100644 --- a/src/objects/communications/ArduinoSerial.cpp +++ b/src/objects/communications/ArduinoSerial.cpp @@ -173,7 +173,7 @@ void ArduinoSerial::updateObjectContent(std::map& glRenderer){ +void ArduinoSerial::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/communications/ArduinoSerial.h b/src/objects/communications/ArduinoSerial.h index c2e697e9..4eed7279 100644 --- a/src/objects/communications/ArduinoSerial.h +++ b/src/objects/communications/ArduinoSerial.h @@ -49,7 +49,7 @@ class ArduinoSerial : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/communications/KeyPressed.cpp b/src/objects/communications/KeyPressed.cpp index 4c9edf44..9e46e046 100755 --- a/src/objects/communications/KeyPressed.cpp +++ b/src/objects/communications/KeyPressed.cpp @@ -86,7 +86,7 @@ void KeyPressed::updateObjectContent(std::map> } //-------------------------------------------------------------- -void KeyPressed::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void KeyPressed::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/communications/KeyPressed.h b/src/objects/communications/KeyPressed.h index 076913a8..9fc8445f 100755 --- a/src/objects/communications/KeyPressed.h +++ b/src/objects/communications/KeyPressed.h @@ -46,7 +46,7 @@ class KeyPressed : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/communications/KeyReleased.cpp b/src/objects/communications/KeyReleased.cpp index 6dcec686..e1cf4cd4 100755 --- a/src/objects/communications/KeyReleased.cpp +++ b/src/objects/communications/KeyReleased.cpp @@ -86,7 +86,7 @@ void KeyReleased::updateObjectContent(std::map> } //-------------------------------------------------------------- -void KeyReleased::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void KeyReleased::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/communications/KeyReleased.h b/src/objects/communications/KeyReleased.h index be33e913..8d83f7a1 100755 --- a/src/objects/communications/KeyReleased.h +++ b/src/objects/communications/KeyReleased.h @@ -46,7 +46,7 @@ class KeyReleased : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/communications/MidiKey.cpp b/src/objects/communications/MidiKey.cpp index 6c40c0b4..47852d19 100755 --- a/src/objects/communications/MidiKey.cpp +++ b/src/objects/communications/MidiKey.cpp @@ -123,7 +123,7 @@ void MidiKey::updateObjectContent(std::map> &pa } //-------------------------------------------------------------- -void MidiKey::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void MidiKey::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ } diff --git a/src/objects/communications/MidiKey.h b/src/objects/communications/MidiKey.h index 88929a34..7c826043 100755 --- a/src/objects/communications/MidiKey.h +++ b/src/objects/communications/MidiKey.h @@ -46,7 +46,7 @@ class MidiKey : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/communications/MidiKnob.cpp b/src/objects/communications/MidiKnob.cpp index ef5587d6..0af36552 100755 --- a/src/objects/communications/MidiKnob.cpp +++ b/src/objects/communications/MidiKnob.cpp @@ -99,7 +99,7 @@ void MidiKnob::updateObjectContent(std::map> &p } //-------------------------------------------------------------- -void MidiKnob::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void MidiKnob::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ } diff --git a/src/objects/communications/MidiKnob.h b/src/objects/communications/MidiKnob.h index 57e9be03..87cff062 100755 --- a/src/objects/communications/MidiKnob.h +++ b/src/objects/communications/MidiKnob.h @@ -48,7 +48,7 @@ class MidiKnob : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/communications/MidiPad.cpp b/src/objects/communications/MidiPad.cpp index ea16c720..2b47469c 100755 --- a/src/objects/communications/MidiPad.cpp +++ b/src/objects/communications/MidiPad.cpp @@ -137,7 +137,7 @@ void MidiPad::updateObjectContent(std::map> &pa } //-------------------------------------------------------------- -void MidiPad::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void MidiPad::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ } diff --git a/src/objects/communications/MidiPad.h b/src/objects/communications/MidiPad.h index 14701c2b..6b030d9c 100755 --- a/src/objects/communications/MidiPad.h +++ b/src/objects/communications/MidiPad.h @@ -46,7 +46,7 @@ class MidiPad : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/communications/MidiReceiver.cpp b/src/objects/communications/MidiReceiver.cpp index eaefeb5f..55c0cca6 100644 --- a/src/objects/communications/MidiReceiver.cpp +++ b/src/objects/communications/MidiReceiver.cpp @@ -173,7 +173,7 @@ void MidiReceiver::updateObjectContent(std::map } //-------------------------------------------------------------- -void MidiReceiver::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void MidiReceiver::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ } diff --git a/src/objects/communications/MidiReceiver.h b/src/objects/communications/MidiReceiver.h index dbc5bca0..7fcf03e5 100644 --- a/src/objects/communications/MidiReceiver.h +++ b/src/objects/communications/MidiReceiver.h @@ -48,7 +48,7 @@ class MidiReceiver : public PatchObject, public ofxMidiListener { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/communications/MidiSender.cpp b/src/objects/communications/MidiSender.cpp index d6333d97..0ca68222 100644 --- a/src/objects/communications/MidiSender.cpp +++ b/src/objects/communications/MidiSender.cpp @@ -132,7 +132,7 @@ void MidiSender::updateObjectContent(std::map> } //-------------------------------------------------------------- -void MidiSender::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void MidiSender::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/communications/MidiSender.h b/src/objects/communications/MidiSender.h index 8b756913..f2632cf3 100644 --- a/src/objects/communications/MidiSender.h +++ b/src/objects/communications/MidiSender.h @@ -48,7 +48,7 @@ class MidiSender : public PatchObject{ void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/communications/OscReceiver.cpp b/src/objects/communications/OscReceiver.cpp index 7ae37197..554252b6 100644 --- a/src/objects/communications/OscReceiver.cpp +++ b/src/objects/communications/OscReceiver.cpp @@ -129,7 +129,7 @@ void OscReceiver::updateObjectContent(std::map> } //-------------------------------------------------------------- -void OscReceiver::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void OscReceiver::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/communications/OscReceiver.h b/src/objects/communications/OscReceiver.h index 0ac4531d..3beaecc2 100644 --- a/src/objects/communications/OscReceiver.h +++ b/src/objects/communications/OscReceiver.h @@ -48,7 +48,7 @@ class OscReceiver : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/communications/OscSender.cpp b/src/objects/communications/OscSender.cpp index 62991a7e..66945c07 100644 --- a/src/objects/communications/OscSender.cpp +++ b/src/objects/communications/OscSender.cpp @@ -145,7 +145,7 @@ void OscSender::updateObjectContent(std::map> & } //-------------------------------------------------------------- -void OscSender::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void OscSender::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/communications/OscSender.h b/src/objects/communications/OscSender.h index 52df4084..450daa11 100644 --- a/src/objects/communications/OscSender.h +++ b/src/objects/communications/OscSender.h @@ -48,7 +48,7 @@ class OscSender : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/computer_vision/BackgroundSubtraction.cpp b/src/objects/computer_vision/BackgroundSubtraction.cpp index c558ebba..ceeca92a 100644 --- a/src/objects/computer_vision/BackgroundSubtraction.cpp +++ b/src/objects/computer_vision/BackgroundSubtraction.cpp @@ -58,8 +58,6 @@ BackgroundSubtraction::BackgroundSubtraction() : PatchObject("background subtrac newConnection = false; bLearnBackground = false; - bgSubTech = 0; - threshold = 80.0f; brightness = 0.0f; contrast = 0.0f; @@ -211,7 +209,7 @@ void BackgroundSubtraction::updateObjectContent(std::map& glRenderer){ +void BackgroundSubtraction::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/computer_vision/BackgroundSubtraction.h b/src/objects/computer_vision/BackgroundSubtraction.h index 2f7376da..ef53f3ae 100644 --- a/src/objects/computer_vision/BackgroundSubtraction.h +++ b/src/objects/computer_vision/BackgroundSubtraction.h @@ -49,7 +49,7 @@ class BackgroundSubtraction : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/computer_vision/ColorTracking.cpp b/src/objects/computer_vision/ColorTracking.cpp index 6d77f5dd..ca7c5898 100644 --- a/src/objects/computer_vision/ColorTracking.cpp +++ b/src/objects/computer_vision/ColorTracking.cpp @@ -249,7 +249,7 @@ void ColorTracking::updateObjectContent(std::map& glRenderer){ +void ColorTracking::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(glRenderer); if(this->inletsConnected[0] && ofxVP_CAST_PIN_PTR(_inletParams[0])->isAllocated()){ diff --git a/src/objects/computer_vision/ColorTracking.h b/src/objects/computer_vision/ColorTracking.h index d2d2565c..e8adbf82 100644 --- a/src/objects/computer_vision/ColorTracking.h +++ b/src/objects/computer_vision/ColorTracking.h @@ -48,7 +48,7 @@ class ColorTracking : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/computer_vision/ContourTracking.cpp b/src/objects/computer_vision/ContourTracking.cpp index ce269da9..15b23df8 100644 --- a/src/objects/computer_vision/ContourTracking.cpp +++ b/src/objects/computer_vision/ContourTracking.cpp @@ -251,7 +251,7 @@ void ContourTracking::updateObjectContent(std::map& glRenderer){ +void ContourTracking::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(glRenderer); if(this->inletsConnected[0] && ofxVP_CAST_PIN_PTR(_inletParams[0])->isAllocated()){ diff --git a/src/objects/computer_vision/ContourTracking.h b/src/objects/computer_vision/ContourTracking.h index d60e463e..0807fae7 100644 --- a/src/objects/computer_vision/ContourTracking.h +++ b/src/objects/computer_vision/ContourTracking.h @@ -48,7 +48,7 @@ class ContourTracking : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/computer_vision/HaarTracking.cpp b/src/objects/computer_vision/HaarTracking.cpp index 4a8e10c1..36f3adc3 100644 --- a/src/objects/computer_vision/HaarTracking.cpp +++ b/src/objects/computer_vision/HaarTracking.cpp @@ -170,7 +170,7 @@ void HaarTracking::updateObjectContent(std::map } //-------------------------------------------------------------- -void HaarTracking::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void HaarTracking::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ // HAAR Tracking DRAW if(this->inletsConnected[0] && outputFBO->isAllocated() && ofxVP_CAST_PIN_PTR(_outletParams[0])->isAllocated()){ diff --git a/src/objects/computer_vision/HaarTracking.h b/src/objects/computer_vision/HaarTracking.h index 43dc560f..91416cdd 100644 --- a/src/objects/computer_vision/HaarTracking.h +++ b/src/objects/computer_vision/HaarTracking.h @@ -50,7 +50,7 @@ class HaarTracking : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/computer_vision/MotionDetection.cpp b/src/objects/computer_vision/MotionDetection.cpp index ea666bbb..75e79590 100644 --- a/src/objects/computer_vision/MotionDetection.cpp +++ b/src/objects/computer_vision/MotionDetection.cpp @@ -136,7 +136,7 @@ void MotionDetection::updateObjectContent(std::map& glRenderer){ +void MotionDetection::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/computer_vision/MotionDetection.h b/src/objects/computer_vision/MotionDetection.h index dd698c61..abe12d2e 100644 --- a/src/objects/computer_vision/MotionDetection.h +++ b/src/objects/computer_vision/MotionDetection.h @@ -50,7 +50,7 @@ class MotionDetection : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/computer_vision/OpticalFlow.cpp b/src/objects/computer_vision/OpticalFlow.cpp index 076280ee..5abb9caf 100644 --- a/src/objects/computer_vision/OpticalFlow.cpp +++ b/src/objects/computer_vision/OpticalFlow.cpp @@ -175,7 +175,7 @@ void OpticalFlow::updateObjectContent(std::map> } //-------------------------------------------------------------- -void OpticalFlow::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void OpticalFlow::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); // OPTICAL FLOW DRAW diff --git a/src/objects/computer_vision/OpticalFlow.h b/src/objects/computer_vision/OpticalFlow.h index d69241af..0703fc28 100644 --- a/src/objects/computer_vision/OpticalFlow.h +++ b/src/objects/computer_vision/OpticalFlow.h @@ -49,7 +49,7 @@ class OpticalFlow : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/data/BangMultiplexer.cpp b/src/objects/data/BangMultiplexer.cpp index 47367b43..4dc5983c 100755 --- a/src/objects/data/BangMultiplexer.cpp +++ b/src/objects/data/BangMultiplexer.cpp @@ -115,7 +115,7 @@ void BangMultiplexer::updateObjectContent(std::map& glRenderer){ +void BangMultiplexer::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/data/BangMultiplexer.h b/src/objects/data/BangMultiplexer.h index 2d34314c..bab37aa1 100755 --- a/src/objects/data/BangMultiplexer.h +++ b/src/objects/data/BangMultiplexer.h @@ -46,7 +46,7 @@ class BangMultiplexer : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/data/BangToFloat.cpp b/src/objects/data/BangToFloat.cpp index 9b20c507..f6caaa1c 100644 --- a/src/objects/data/BangToFloat.cpp +++ b/src/objects/data/BangToFloat.cpp @@ -107,7 +107,7 @@ void BangToFloat::updateObjectContent(std::map> } //-------------------------------------------------------------- -void BangToFloat::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void BangToFloat::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/data/BangToFloat.h b/src/objects/data/BangToFloat.h index bf28855c..86d0309b 100644 --- a/src/objects/data/BangToFloat.h +++ b/src/objects/data/BangToFloat.h @@ -46,7 +46,7 @@ class BangToFloat : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/data/DataToFile.cpp b/src/objects/data/DataToFile.cpp index ff7dca7a..534feb84 100755 --- a/src/objects/data/DataToFile.cpp +++ b/src/objects/data/DataToFile.cpp @@ -110,7 +110,7 @@ void DataToFile::updateObjectContent(std::map> } //-------------------------------------------------------------- -void DataToFile::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void DataToFile::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/data/DataToFile.h b/src/objects/data/DataToFile.h index 3e6c54d4..8c09ab0f 100755 --- a/src/objects/data/DataToFile.h +++ b/src/objects/data/DataToFile.h @@ -50,7 +50,7 @@ class DataToFile : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/data/DataToTexture.cpp b/src/objects/data/DataToTexture.cpp index 1b142f75..790d6656 100644 --- a/src/objects/data/DataToTexture.cpp +++ b/src/objects/data/DataToTexture.cpp @@ -180,7 +180,7 @@ void DataToTexture::updateObjectContent(std::map& glRenderer){ +void DataToTexture::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/data/DataToTexture.h b/src/objects/data/DataToTexture.h index 0b7c5b46..6a323a57 100644 --- a/src/objects/data/DataToTexture.h +++ b/src/objects/data/DataToTexture.h @@ -46,7 +46,7 @@ class DataToTexture : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/data/FileToData.cpp b/src/objects/data/FileToData.cpp index 87fa5ab7..cf346f7d 100644 --- a/src/objects/data/FileToData.cpp +++ b/src/objects/data/FileToData.cpp @@ -104,7 +104,7 @@ void FileToData::updateObjectContent(std::map> } //-------------------------------------------------------------- -void FileToData::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void FileToData::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/data/FileToData.h b/src/objects/data/FileToData.h index e5e92085..d30bd869 100644 --- a/src/objects/data/FileToData.h +++ b/src/objects/data/FileToData.h @@ -50,7 +50,7 @@ class FileToData : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/data/FloatMultiplexer.cpp b/src/objects/data/FloatMultiplexer.cpp index 4879a022..fca99725 100755 --- a/src/objects/data/FloatMultiplexer.cpp +++ b/src/objects/data/FloatMultiplexer.cpp @@ -115,7 +115,7 @@ void FloatMultiplexer::updateObjectContent(std::map& glRenderer){ +void FloatMultiplexer::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/data/FloatMultiplexer.h b/src/objects/data/FloatMultiplexer.h index 815f4036..9a4df12b 100755 --- a/src/objects/data/FloatMultiplexer.h +++ b/src/objects/data/FloatMultiplexer.h @@ -46,7 +46,7 @@ class FloatMultiplexer : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/data/FloatsToVector.cpp b/src/objects/data/FloatsToVector.cpp index 49ce5b26..0a5d53a8 100755 --- a/src/objects/data/FloatsToVector.cpp +++ b/src/objects/data/FloatsToVector.cpp @@ -113,7 +113,7 @@ void FloatsToVector::updateObjectContent(std::map& glRenderer){ +void FloatsToVector::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/data/FloatsToVector.h b/src/objects/data/FloatsToVector.h index d0b6763e..838650c7 100755 --- a/src/objects/data/FloatsToVector.h +++ b/src/objects/data/FloatsToVector.h @@ -46,7 +46,7 @@ class FloatsToVector : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/data/Receiver.cpp b/src/objects/data/Receiver.cpp index 7120f634..7dfb44b1 100644 --- a/src/objects/data/Receiver.cpp +++ b/src/objects/data/Receiver.cpp @@ -159,7 +159,7 @@ void vpReceiver::updateObjectContent(std::map> } //-------------------------------------------------------------- -void vpReceiver::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void vpReceiver::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/data/Receiver.h b/src/objects/data/Receiver.h index 27b122c5..e6b5b2ae 100644 --- a/src/objects/data/Receiver.h +++ b/src/objects/data/Receiver.h @@ -47,7 +47,7 @@ class vpReceiver : public PatchObject { void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/data/Sender.cpp b/src/objects/data/Sender.cpp index 81a7b412..e5d8e977 100644 --- a/src/objects/data/Sender.cpp +++ b/src/objects/data/Sender.cpp @@ -150,7 +150,7 @@ void vpSender::updateObjectContent(std::map> &p } //-------------------------------------------------------------- -void vpSender::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void vpSender::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/data/Sender.h b/src/objects/data/Sender.h index 6be777ab..63006f42 100644 --- a/src/objects/data/Sender.h +++ b/src/objects/data/Sender.h @@ -47,7 +47,7 @@ class vpSender : public PatchObject { void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/data/TextureToData.cpp b/src/objects/data/TextureToData.cpp index c196fe7d..07c14f2b 100644 --- a/src/objects/data/TextureToData.cpp +++ b/src/objects/data/TextureToData.cpp @@ -107,7 +107,7 @@ void TextureToData::updateObjectContent(std::map& glRenderer){ +void TextureToData::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/data/TextureToData.h b/src/objects/data/TextureToData.h index b70ce123..e1c7aef0 100644 --- a/src/objects/data/TextureToData.h +++ b/src/objects/data/TextureToData.h @@ -46,7 +46,7 @@ class TextureToData : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/data/VectorAt.cpp b/src/objects/data/VectorAt.cpp index 5e68948b..709410cd 100755 --- a/src/objects/data/VectorAt.cpp +++ b/src/objects/data/VectorAt.cpp @@ -102,7 +102,7 @@ void VectorAt::updateObjectContent(std::map> &p } //-------------------------------------------------------------- -void VectorAt::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void VectorAt::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/data/VectorAt.h b/src/objects/data/VectorAt.h index 94459ec2..f4a3c2c3 100755 --- a/src/objects/data/VectorAt.h +++ b/src/objects/data/VectorAt.h @@ -46,7 +46,7 @@ class VectorAt : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/data/VectorConcat.cpp b/src/objects/data/VectorConcat.cpp index 061667ee..4a4d7490 100755 --- a/src/objects/data/VectorConcat.cpp +++ b/src/objects/data/VectorConcat.cpp @@ -112,7 +112,7 @@ void VectorConcat::updateObjectContent(std::map } //-------------------------------------------------------------- -void VectorConcat::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void VectorConcat::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/data/VectorConcat.h b/src/objects/data/VectorConcat.h index 4d5d8473..b45bb513 100755 --- a/src/objects/data/VectorConcat.h +++ b/src/objects/data/VectorConcat.h @@ -46,7 +46,7 @@ class VectorConcat : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/data/VectorExtract.cpp b/src/objects/data/VectorExtract.cpp index 24260b04..d2da2cc8 100755 --- a/src/objects/data/VectorExtract.cpp +++ b/src/objects/data/VectorExtract.cpp @@ -103,7 +103,7 @@ void VectorExtract::updateObjectContent(std::map& glRenderer){ +void VectorExtract::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/data/VectorExtract.h b/src/objects/data/VectorExtract.h index 209a8dc0..e00f56e4 100755 --- a/src/objects/data/VectorExtract.h +++ b/src/objects/data/VectorExtract.h @@ -46,7 +46,7 @@ class VectorExtract : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/data/VectorGate.cpp b/src/objects/data/VectorGate.cpp index 8304a4a3..7b646ff4 100644 --- a/src/objects/data/VectorGate.cpp +++ b/src/objects/data/VectorGate.cpp @@ -121,7 +121,7 @@ void VectorGate::updateObjectContent(std::map> } //-------------------------------------------------------------- -void VectorGate::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void VectorGate::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/data/VectorGate.h b/src/objects/data/VectorGate.h index 246882de..b62ae285 100644 --- a/src/objects/data/VectorGate.h +++ b/src/objects/data/VectorGate.h @@ -47,7 +47,7 @@ class VectorGate : public PatchObject { void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/data/VectorOperator.cpp b/src/objects/data/VectorOperator.cpp index 1a40c5da..4359d3c9 100755 --- a/src/objects/data/VectorOperator.cpp +++ b/src/objects/data/VectorOperator.cpp @@ -108,7 +108,7 @@ void VectorOperator::updateObjectContent(std::map& glRenderer){ +void VectorOperator::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/data/VectorOperator.h b/src/objects/data/VectorOperator.h index 895e71ef..cdcc2711 100755 --- a/src/objects/data/VectorOperator.h +++ b/src/objects/data/VectorOperator.h @@ -48,7 +48,7 @@ class VectorOperator : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/graphics/ColorPalette.cpp b/src/objects/graphics/ColorPalette.cpp index cab284ef..9e05e63f 100644 --- a/src/objects/graphics/ColorPalette.cpp +++ b/src/objects/graphics/ColorPalette.cpp @@ -147,7 +147,7 @@ void ColorPalette::updateObjectContent(std::map } //-------------------------------------------------------------- -void ColorPalette::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void ColorPalette::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/graphics/ColorPalette.h b/src/objects/graphics/ColorPalette.h index b9e0c787..60d259be 100644 --- a/src/objects/graphics/ColorPalette.h +++ b/src/objects/graphics/ColorPalette.h @@ -51,7 +51,7 @@ class ColorPalette : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/graphics/ImageExporter.cpp b/src/objects/graphics/ImageExporter.cpp index 7287d610..a710d263 100644 --- a/src/objects/graphics/ImageExporter.cpp +++ b/src/objects/graphics/ImageExporter.cpp @@ -120,7 +120,7 @@ void ImageExporter::updateObjectContent(std::map& glRenderer){ +void ImageExporter::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/graphics/ImageExporter.h b/src/objects/graphics/ImageExporter.h index 2eba6cd2..905bed7b 100644 --- a/src/objects/graphics/ImageExporter.h +++ b/src/objects/graphics/ImageExporter.h @@ -49,7 +49,7 @@ class ImageExporter : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/graphics/ImageLoader.cpp b/src/objects/graphics/ImageLoader.cpp index 80d7dce4..201674bd 100644 --- a/src/objects/graphics/ImageLoader.cpp +++ b/src/objects/graphics/ImageLoader.cpp @@ -129,7 +129,7 @@ void ImageLoader::updateObjectContent(std::map> } //-------------------------------------------------------------- -void ImageLoader::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void ImageLoader::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/graphics/ImageLoader.h b/src/objects/graphics/ImageLoader.h index d73720ae..c3f88a2b 100644 --- a/src/objects/graphics/ImageLoader.h +++ b/src/objects/graphics/ImageLoader.h @@ -50,7 +50,7 @@ class ImageLoader : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/gui/mo2DPad.cpp b/src/objects/gui/mo2DPad.cpp index fb24e965..cd135658 100644 --- a/src/objects/gui/mo2DPad.cpp +++ b/src/objects/gui/mo2DPad.cpp @@ -101,7 +101,7 @@ void mo2DPad::updateObjectContent(std::map> &pa } //-------------------------------------------------------------- -void mo2DPad::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void mo2DPad::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/gui/mo2DPad.h b/src/objects/gui/mo2DPad.h index 4f223b7d..927c42ab 100644 --- a/src/objects/gui/mo2DPad.h +++ b/src/objects/gui/mo2DPad.h @@ -48,7 +48,7 @@ class mo2DPad : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/gui/moBang.cpp b/src/objects/gui/moBang.cpp index 9aa0e544..9ce407db 100644 --- a/src/objects/gui/moBang.cpp +++ b/src/objects/gui/moBang.cpp @@ -121,7 +121,7 @@ void moBang::updateObjectContent(std::map> &pat } //-------------------------------------------------------------- -void moBang::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void moBang::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/gui/moBang.h b/src/objects/gui/moBang.h index 76c40ec6..cad2c9b9 100644 --- a/src/objects/gui/moBang.h +++ b/src/objects/gui/moBang.h @@ -48,7 +48,7 @@ class moBang : public PatchObject { void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/gui/moComment.cpp b/src/objects/gui/moComment.cpp index 71c77221..673941d8 100644 --- a/src/objects/gui/moComment.cpp +++ b/src/objects/gui/moComment.cpp @@ -122,7 +122,7 @@ void moComment::updateObjectContent(std::map> & } //-------------------------------------------------------------- -void moComment::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void moComment::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/gui/moComment.h b/src/objects/gui/moComment.h index a2c2455f..64039c8a 100644 --- a/src/objects/gui/moComment.h +++ b/src/objects/gui/moComment.h @@ -48,7 +48,7 @@ class moComment : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/gui/moDataViewer.cpp b/src/objects/gui/moDataViewer.cpp index 20919176..22e5f89c 100755 --- a/src/objects/gui/moDataViewer.cpp +++ b/src/objects/gui/moDataViewer.cpp @@ -95,7 +95,7 @@ void moDataViewer::updateObjectContent(std::map } //-------------------------------------------------------------- -void moDataViewer::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void moDataViewer::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/gui/moDataViewer.h b/src/objects/gui/moDataViewer.h index 2c7f3406..0fde9d1c 100755 --- a/src/objects/gui/moDataViewer.h +++ b/src/objects/gui/moDataViewer.h @@ -48,7 +48,7 @@ class moDataViewer : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/gui/moMessage.cpp b/src/objects/gui/moMessage.cpp index eac9078b..ea2b2ed7 100644 --- a/src/objects/gui/moMessage.cpp +++ b/src/objects/gui/moMessage.cpp @@ -90,7 +90,7 @@ void moMessage::updateObjectContent(std::map> & } //-------------------------------------------------------------- -void moMessage::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void moMessage::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/gui/moMessage.h b/src/objects/gui/moMessage.h index 4a2d8db6..e7a9d0ea 100644 --- a/src/objects/gui/moMessage.h +++ b/src/objects/gui/moMessage.h @@ -48,7 +48,7 @@ class moMessage : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/gui/moMultiSlider.cpp b/src/objects/gui/moMultiSlider.cpp index b0346f9f..a6177556 100644 --- a/src/objects/gui/moMultiSlider.cpp +++ b/src/objects/gui/moMultiSlider.cpp @@ -154,7 +154,7 @@ void moMultiSlider::updateObjectContent(std::map& glRenderer){ +void moMultiSlider::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/gui/moMultiSlider.h b/src/objects/gui/moMultiSlider.h index 96844468..7dac9c7c 100644 --- a/src/objects/gui/moMultiSlider.h +++ b/src/objects/gui/moMultiSlider.h @@ -46,7 +46,7 @@ class moMultiSlider : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/gui/moMultiToggle.cpp b/src/objects/gui/moMultiToggle.cpp index 20ef1ae1..c2c5d4f4 100644 --- a/src/objects/gui/moMultiToggle.cpp +++ b/src/objects/gui/moMultiToggle.cpp @@ -173,7 +173,7 @@ void moMultiToggle::updateObjectContent(std::map& glRenderer){ +void moMultiToggle::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/gui/moMultiToggle.h b/src/objects/gui/moMultiToggle.h index ec254ae6..ef378543 100644 --- a/src/objects/gui/moMultiToggle.h +++ b/src/objects/gui/moMultiToggle.h @@ -46,7 +46,7 @@ class moMultiToggle : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/gui/moPianoKeyboard.cpp b/src/objects/gui/moPianoKeyboard.cpp index e6b18346..43965c5c 100755 --- a/src/objects/gui/moPianoKeyboard.cpp +++ b/src/objects/gui/moPianoKeyboard.cpp @@ -116,7 +116,7 @@ void moPianoKeyboard::updateObjectContent(std::map& glRenderer){ +void moPianoKeyboard::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/gui/moPianoKeyboard.h b/src/objects/gui/moPianoKeyboard.h index d6e84fcd..c06e371a 100755 --- a/src/objects/gui/moPianoKeyboard.h +++ b/src/objects/gui/moPianoKeyboard.h @@ -46,7 +46,7 @@ class moPianoKeyboard : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/gui/moPlayerControls.cpp b/src/objects/gui/moPlayerControls.cpp index 0938d523..48c4a952 100644 --- a/src/objects/gui/moPlayerControls.cpp +++ b/src/objects/gui/moPlayerControls.cpp @@ -116,7 +116,7 @@ void moPlayerControls::updateObjectContent(std::map& glRenderer){ +void moPlayerControls::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/gui/moPlayerControls.h b/src/objects/gui/moPlayerControls.h index 94ad013f..fd3297a9 100644 --- a/src/objects/gui/moPlayerControls.h +++ b/src/objects/gui/moPlayerControls.h @@ -47,7 +47,7 @@ class moPlayerControls : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/gui/moSignalViewer.cpp b/src/objects/gui/moSignalViewer.cpp index cbce5457..03bcd2ed 100644 --- a/src/objects/gui/moSignalViewer.cpp +++ b/src/objects/gui/moSignalViewer.cpp @@ -98,7 +98,7 @@ void moSignalViewer::updateObjectContent(std::map& glRenderer){ +void moSignalViewer::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/gui/moSignalViewer.h b/src/objects/gui/moSignalViewer.h index e438e495..2d7b4da5 100644 --- a/src/objects/gui/moSignalViewer.h +++ b/src/objects/gui/moSignalViewer.h @@ -48,7 +48,7 @@ class moSignalViewer : public PatchObject { void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/gui/moSlider.cpp b/src/objects/gui/moSlider.cpp index a4520005..6c87846c 100644 --- a/src/objects/gui/moSlider.cpp +++ b/src/objects/gui/moSlider.cpp @@ -96,7 +96,7 @@ void moSlider::updateObjectContent(std::map> &p } //-------------------------------------------------------------- -void moSlider::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void moSlider::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/gui/moSlider.h b/src/objects/gui/moSlider.h index afa6eff3..54af792a 100644 --- a/src/objects/gui/moSlider.h +++ b/src/objects/gui/moSlider.h @@ -46,7 +46,7 @@ class moSlider : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/gui/moSonogram.cpp b/src/objects/gui/moSonogram.cpp index 97e698cb..64ce73a6 100644 --- a/src/objects/gui/moSonogram.cpp +++ b/src/objects/gui/moSonogram.cpp @@ -128,7 +128,7 @@ void moSonogram::updateObjectContent(std::map> } //-------------------------------------------------------------- -void moSonogram::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void moSonogram::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); if(this->inletsConnected[0] && !ofxVP_CAST_PIN_PTR>(this->_inletParams[0])->empty()){ diff --git a/src/objects/gui/moSonogram.h b/src/objects/gui/moSonogram.h index 4999ae0d..3e1306f7 100644 --- a/src/objects/gui/moSonogram.h +++ b/src/objects/gui/moSonogram.h @@ -47,7 +47,7 @@ class moSonogram : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/gui/moTimeline.cpp b/src/objects/gui/moTimeline.cpp index 1a2a906c..8a3e33cc 100755 --- a/src/objects/gui/moTimeline.cpp +++ b/src/objects/gui/moTimeline.cpp @@ -279,7 +279,7 @@ void moTimeline::updateObjectContent(std::map> } //-------------------------------------------------------------- -void moTimeline::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void moTimeline::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(glRenderer); localFont = font; diff --git a/src/objects/gui/moTimeline.h b/src/objects/gui/moTimeline.h index 42ac003c..6fefa41e 100755 --- a/src/objects/gui/moTimeline.h +++ b/src/objects/gui/moTimeline.h @@ -56,7 +56,7 @@ class moTimeline : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/gui/moTrigger.cpp b/src/objects/gui/moTrigger.cpp index d9b928b9..d107cdfa 100644 --- a/src/objects/gui/moTrigger.cpp +++ b/src/objects/gui/moTrigger.cpp @@ -104,7 +104,7 @@ void moTrigger::updateObjectContent(std::map> & } //-------------------------------------------------------------- -void moTrigger::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void moTrigger::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/gui/moTrigger.h b/src/objects/gui/moTrigger.h index 391a2ab9..033594e7 100644 --- a/src/objects/gui/moTrigger.h +++ b/src/objects/gui/moTrigger.h @@ -47,7 +47,7 @@ class moTrigger : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/gui/moVUMeter.cpp b/src/objects/gui/moVUMeter.cpp index 5766b8ec..62018470 100644 --- a/src/objects/gui/moVUMeter.cpp +++ b/src/objects/gui/moVUMeter.cpp @@ -79,7 +79,7 @@ void moVUMeter::updateObjectContent(std::map> & } //-------------------------------------------------------------- -void moVUMeter::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void moVUMeter::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/gui/moVUMeter.h b/src/objects/gui/moVUMeter.h index f47c19a7..b97a16b6 100644 --- a/src/objects/gui/moVUMeter.h +++ b/src/objects/gui/moVUMeter.h @@ -48,7 +48,7 @@ class moVUMeter : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/gui/moValuePlotter.cpp b/src/objects/gui/moValuePlotter.cpp index 551ef45c..2b1ae492 100644 --- a/src/objects/gui/moValuePlotter.cpp +++ b/src/objects/gui/moValuePlotter.cpp @@ -126,7 +126,7 @@ void moValuePlotter::updateObjectContent(std::map& glRenderer){ +void moValuePlotter::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/gui/moValuePlotter.h b/src/objects/gui/moValuePlotter.h index 77264d49..c2a898d3 100644 --- a/src/objects/gui/moValuePlotter.h +++ b/src/objects/gui/moValuePlotter.h @@ -48,7 +48,7 @@ class moValuePlotter : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/gui/moVideoViewer.cpp b/src/objects/gui/moVideoViewer.cpp index 5a6d2e03..e3505f4e 100644 --- a/src/objects/gui/moVideoViewer.cpp +++ b/src/objects/gui/moVideoViewer.cpp @@ -98,7 +98,7 @@ void moVideoViewer::updateObjectContent(std::map& glRenderer){ +void moVideoViewer::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/gui/moVideoViewer.h b/src/objects/gui/moVideoViewer.h index c2d06aae..8552c123 100644 --- a/src/objects/gui/moVideoViewer.h +++ b/src/objects/gui/moVideoViewer.h @@ -46,7 +46,7 @@ class moVideoViewer : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/logic/BooleanOperator.cpp b/src/objects/logic/BooleanOperator.cpp index 796fbd34..8edbf1b6 100755 --- a/src/objects/logic/BooleanOperator.cpp +++ b/src/objects/logic/BooleanOperator.cpp @@ -110,7 +110,7 @@ void BooleanOperator::updateObjectContent(std::map& glRenderer){ +void BooleanOperator::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/logic/BooleanOperator.h b/src/objects/logic/BooleanOperator.h index 2b686ae4..b72bc5d8 100755 --- a/src/objects/logic/BooleanOperator.h +++ b/src/objects/logic/BooleanOperator.h @@ -48,7 +48,7 @@ class BooleanOperator : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/logic/Conditional.cpp b/src/objects/logic/Conditional.cpp index 4af11b5c..471e31cd 100755 --- a/src/objects/logic/Conditional.cpp +++ b/src/objects/logic/Conditional.cpp @@ -126,7 +126,7 @@ void Conditional::updateObjectContent(std::map> } //-------------------------------------------------------------- -void Conditional::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void Conditional::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/logic/Conditional.h b/src/objects/logic/Conditional.h index 71dc29fd..d0d639b7 100755 --- a/src/objects/logic/Conditional.h +++ b/src/objects/logic/Conditional.h @@ -48,7 +48,7 @@ class Conditional : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/logic/Counter.cpp b/src/objects/logic/Counter.cpp index 91af9bfc..38c12a3b 100755 --- a/src/objects/logic/Counter.cpp +++ b/src/objects/logic/Counter.cpp @@ -124,7 +124,7 @@ void Counter::updateObjectContent(std::map> &pa } //-------------------------------------------------------------- -void Counter::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void Counter::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/logic/Counter.h b/src/objects/logic/Counter.h index 15fe4e31..5c792a0b 100755 --- a/src/objects/logic/Counter.h +++ b/src/objects/logic/Counter.h @@ -46,7 +46,7 @@ class Counter : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/logic/DelayBang.cpp b/src/objects/logic/DelayBang.cpp index ad784616..b3f35c41 100755 --- a/src/objects/logic/DelayBang.cpp +++ b/src/objects/logic/DelayBang.cpp @@ -127,7 +127,7 @@ void DelayBang::updateObjectContent(std::map> & } //-------------------------------------------------------------- -void DelayBang::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void DelayBang::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/logic/DelayBang.h b/src/objects/logic/DelayBang.h index 0e44597c..0a7ebd9f 100755 --- a/src/objects/logic/DelayBang.h +++ b/src/objects/logic/DelayBang.h @@ -48,7 +48,7 @@ class DelayBang : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/logic/DelayFloat.cpp b/src/objects/logic/DelayFloat.cpp index 2cef2a0a..d02de429 100755 --- a/src/objects/logic/DelayFloat.cpp +++ b/src/objects/logic/DelayFloat.cpp @@ -125,7 +125,7 @@ void DelayFloat::updateObjectContent(std::map> } //-------------------------------------------------------------- -void DelayFloat::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void DelayFloat::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/logic/DelayFloat.h b/src/objects/logic/DelayFloat.h index 11808070..0be125c4 100755 --- a/src/objects/logic/DelayFloat.h +++ b/src/objects/logic/DelayFloat.h @@ -46,7 +46,7 @@ class DelayFloat : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/logic/Gate.cpp b/src/objects/logic/Gate.cpp index 6ce5ba8f..b41ff3e6 100644 --- a/src/objects/logic/Gate.cpp +++ b/src/objects/logic/Gate.cpp @@ -124,7 +124,7 @@ void Gate::updateObjectContent(std::map> &patch } //-------------------------------------------------------------- -void Gate::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void Gate::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/logic/Gate.h b/src/objects/logic/Gate.h index c2fbe448..0a191380 100644 --- a/src/objects/logic/Gate.h +++ b/src/objects/logic/Gate.h @@ -47,7 +47,7 @@ class Gate : public PatchObject { void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/logic/Inverter.cpp b/src/objects/logic/Inverter.cpp index 1ed76d0e..79926abd 100644 --- a/src/objects/logic/Inverter.cpp +++ b/src/objects/logic/Inverter.cpp @@ -84,7 +84,7 @@ void Inverter::updateObjectContent(std::map> &p } //-------------------------------------------------------------- -void Inverter::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void Inverter::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/logic/Inverter.h b/src/objects/logic/Inverter.h index 24597282..8bccd865 100644 --- a/src/objects/logic/Inverter.h +++ b/src/objects/logic/Inverter.h @@ -47,7 +47,7 @@ class Inverter : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/logic/LoadBang.cpp b/src/objects/logic/LoadBang.cpp index bef0dcdf..9fef1336 100644 --- a/src/objects/logic/LoadBang.cpp +++ b/src/objects/logic/LoadBang.cpp @@ -115,7 +115,7 @@ void LoadBang::updateObjectContent(std::map> &p } //-------------------------------------------------------------- -void LoadBang::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void LoadBang::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/logic/LoadBang.h b/src/objects/logic/LoadBang.h index fcd9278e..d4acf9f9 100644 --- a/src/objects/logic/LoadBang.h +++ b/src/objects/logic/LoadBang.h @@ -48,7 +48,7 @@ class LoadBang : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/logic/Spigot.cpp b/src/objects/logic/Spigot.cpp index ae8373b8..ca4c9750 100644 --- a/src/objects/logic/Spigot.cpp +++ b/src/objects/logic/Spigot.cpp @@ -182,7 +182,7 @@ void Spigot::updateObjectContent(std::map> &pat } //-------------------------------------------------------------- -void Spigot::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void Spigot::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/logic/Spigot.h b/src/objects/logic/Spigot.h index a7121a1a..f8654d04 100644 --- a/src/objects/logic/Spigot.h +++ b/src/objects/logic/Spigot.h @@ -46,7 +46,7 @@ class Spigot : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/logic/TimedSemaphore.cpp b/src/objects/logic/TimedSemaphore.cpp index d2f1133c..c2d15a9b 100755 --- a/src/objects/logic/TimedSemaphore.cpp +++ b/src/objects/logic/TimedSemaphore.cpp @@ -125,7 +125,7 @@ void TimedSemaphore::updateObjectContent(std::map& glRenderer){ +void TimedSemaphore::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/logic/TimedSemaphore.h b/src/objects/logic/TimedSemaphore.h index ae41758d..300a6803 100755 --- a/src/objects/logic/TimedSemaphore.h +++ b/src/objects/logic/TimedSemaphore.h @@ -49,7 +49,7 @@ class TimedSemaphore : public PatchObject { void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/math/Clamp.cpp b/src/objects/math/Clamp.cpp index 97c4d035..7769d68b 100755 --- a/src/objects/math/Clamp.cpp +++ b/src/objects/math/Clamp.cpp @@ -102,7 +102,7 @@ void Clamp::updateObjectContent(std::map> &patc } //-------------------------------------------------------------- -void Clamp::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void Clamp::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/math/Clamp.h b/src/objects/math/Clamp.h index a0ba6a1a..235df0fe 100755 --- a/src/objects/math/Clamp.h +++ b/src/objects/math/Clamp.h @@ -45,7 +45,7 @@ class Clamp : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/math/Constant.cpp b/src/objects/math/Constant.cpp index 0d8ef103..dc2f368b 100755 --- a/src/objects/math/Constant.cpp +++ b/src/objects/math/Constant.cpp @@ -130,7 +130,7 @@ void Constant::updateObjectContent(std::map> &p } //-------------------------------------------------------------- -void Constant::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void Constant::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/math/Constant.h b/src/objects/math/Constant.h index aeded517..4064c386 100755 --- a/src/objects/math/Constant.h +++ b/src/objects/math/Constant.h @@ -43,7 +43,7 @@ class Constant : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/math/CosineGenerator.cpp b/src/objects/math/CosineGenerator.cpp index af963830..d45ff154 100755 --- a/src/objects/math/CosineGenerator.cpp +++ b/src/objects/math/CosineGenerator.cpp @@ -98,7 +98,7 @@ void CosineGenerator::updateObjectContent(std::map& glRenderer){ +void CosineGenerator::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/math/CosineGenerator.h b/src/objects/math/CosineGenerator.h index 953aec0f..d5a705da 100755 --- a/src/objects/math/CosineGenerator.h +++ b/src/objects/math/CosineGenerator.h @@ -49,7 +49,7 @@ class CosineGenerator : public PatchObject { void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/math/Map.cpp b/src/objects/math/Map.cpp index d1cd92e8..6adaf8e6 100755 --- a/src/objects/math/Map.cpp +++ b/src/objects/math/Map.cpp @@ -121,7 +121,7 @@ void Map::updateObjectContent(std::map> &patchO } //-------------------------------------------------------------- -void Map::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void Map::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/math/Map.h b/src/objects/math/Map.h index 2d24faf6..74b85605 100755 --- a/src/objects/math/Map.h +++ b/src/objects/math/Map.h @@ -45,7 +45,7 @@ class Map : public PatchObject { void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/math/Metronome.cpp b/src/objects/math/Metronome.cpp index 8bcf7134..77cac7ad 100755 --- a/src/objects/math/Metronome.cpp +++ b/src/objects/math/Metronome.cpp @@ -143,7 +143,7 @@ void Metronome::updateObjectContent(std::map> & } //-------------------------------------------------------------- -void Metronome::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void Metronome::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/math/Metronome.h b/src/objects/math/Metronome.h index 8a5ebad7..e6922901 100755 --- a/src/objects/math/Metronome.h +++ b/src/objects/math/Metronome.h @@ -49,7 +49,7 @@ class Metronome : public PatchObject { void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/math/NumberOperator.cpp b/src/objects/math/NumberOperator.cpp index e4fb472f..4de07bb6 100755 --- a/src/objects/math/NumberOperator.cpp +++ b/src/objects/math/NumberOperator.cpp @@ -118,7 +118,7 @@ void NumberOperator::updateObjectContent(std::map& glRenderer){ +void NumberOperator::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/math/NumberOperator.h b/src/objects/math/NumberOperator.h index 6e233b1d..cfab05b3 100755 --- a/src/objects/math/NumberOperator.h +++ b/src/objects/math/NumberOperator.h @@ -48,7 +48,7 @@ class NumberOperator : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/math/SimpleNoise.cpp b/src/objects/math/SimpleNoise.cpp index a4ca1d73..0c922bbd 100644 --- a/src/objects/math/SimpleNoise.cpp +++ b/src/objects/math/SimpleNoise.cpp @@ -90,7 +90,7 @@ void SimpleNoise::updateObjectContent(std::map> } //-------------------------------------------------------------- -void SimpleNoise::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void SimpleNoise::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/math/SimpleNoise.h b/src/objects/math/SimpleNoise.h index e74fbd68..d77ac413 100644 --- a/src/objects/math/SimpleNoise.h +++ b/src/objects/math/SimpleNoise.h @@ -48,7 +48,7 @@ class SimpleNoise : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/math/SimpleRandom.cpp b/src/objects/math/SimpleRandom.cpp index 318a12d9..2e90883a 100755 --- a/src/objects/math/SimpleRandom.cpp +++ b/src/objects/math/SimpleRandom.cpp @@ -116,7 +116,7 @@ void SimpleRandom::updateObjectContent(std::map } //-------------------------------------------------------------- -void SimpleRandom::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void SimpleRandom::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/math/SimpleRandom.h b/src/objects/math/SimpleRandom.h index b00ed6cb..0c4b6fc5 100755 --- a/src/objects/math/SimpleRandom.h +++ b/src/objects/math/SimpleRandom.h @@ -49,7 +49,7 @@ class SimpleRandom : public PatchObject { void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/math/SineGenerator.cpp b/src/objects/math/SineGenerator.cpp index 5c368edf..278050f5 100755 --- a/src/objects/math/SineGenerator.cpp +++ b/src/objects/math/SineGenerator.cpp @@ -98,7 +98,7 @@ void SineGenerator::updateObjectContent(std::map& glRenderer){ +void SineGenerator::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/math/SineGenerator.h b/src/objects/math/SineGenerator.h index f1c03005..d91e9d94 100755 --- a/src/objects/math/SineGenerator.h +++ b/src/objects/math/SineGenerator.h @@ -49,7 +49,7 @@ class SineGenerator : public PatchObject { void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/math/Smooth.cpp b/src/objects/math/Smooth.cpp index 1120e817..e23a7681 100755 --- a/src/objects/math/Smooth.cpp +++ b/src/objects/math/Smooth.cpp @@ -102,7 +102,7 @@ void Smooth::updateObjectContent(std::map> &pat } //-------------------------------------------------------------- -void Smooth::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void Smooth::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/math/Smooth.h b/src/objects/math/Smooth.h index b087c4ff..54cdfbb2 100755 --- a/src/objects/math/Smooth.h +++ b/src/objects/math/Smooth.h @@ -46,7 +46,7 @@ class Smooth : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/scripting/BashScript.cpp b/src/objects/scripting/BashScript.cpp index 367e2ce4..3f7d162d 100644 --- a/src/objects/scripting/BashScript.cpp +++ b/src/objects/scripting/BashScript.cpp @@ -145,7 +145,7 @@ void BashScript::updateObjectContent(std::map> } //-------------------------------------------------------------- -void BashScript::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void BashScript::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/scripting/BashScript.h b/src/objects/scripting/BashScript.h index 9fe919c2..41b2f3f0 100644 --- a/src/objects/scripting/BashScript.h +++ b/src/objects/scripting/BashScript.h @@ -56,7 +56,7 @@ class BashScript : public ofThread, public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/scripting/LuaScript.cpp b/src/objects/scripting/LuaScript.cpp index e6dc7638..63e307fd 100644 --- a/src/objects/scripting/LuaScript.cpp +++ b/src/objects/scripting/LuaScript.cpp @@ -258,7 +258,7 @@ void LuaScript::updateObjectContent(std::map> & } //-------------------------------------------------------------- -void LuaScript::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void LuaScript::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); diff --git a/src/objects/scripting/LuaScript.h b/src/objects/scripting/LuaScript.h index 1b5c2de3..933266b5 100644 --- a/src/objects/scripting/LuaScript.h +++ b/src/objects/scripting/LuaScript.h @@ -59,7 +59,7 @@ class LuaScript : public PatchObject, public ofxLuaListener{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/scripting/SchemeScript.cpp b/src/objects/scripting/SchemeScript.cpp index 90b20d3a..00225f88 100644 --- a/src/objects/scripting/SchemeScript.cpp +++ b/src/objects/scripting/SchemeScript.cpp @@ -262,7 +262,7 @@ void SchemeScript::updateObjectContent(std::map } //-------------------------------------------------------------- -void SchemeScript::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void SchemeScript::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/scripting/SchemeScript.h b/src/objects/scripting/SchemeScript.h index e787b403..c111eb58 100644 --- a/src/objects/scripting/SchemeScript.h +++ b/src/objects/scripting/SchemeScript.h @@ -80,7 +80,7 @@ class SchemeScript : public PatchObject, public ofxGLEditorListener { // object update void updateObjectContent(std::map> &patchObjects) override; // object draw - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; // call on remove object diff --git a/src/objects/scripting/ShaderObject.cpp b/src/objects/scripting/ShaderObject.cpp index f65f01d2..def2ffa1 100644 --- a/src/objects/scripting/ShaderObject.cpp +++ b/src/objects/scripting/ShaderObject.cpp @@ -345,7 +345,7 @@ void ShaderObject::updateObjectContent(std::map } //-------------------------------------------------------------- -void ShaderObject::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void ShaderObject::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/scripting/ShaderObject.h b/src/objects/scripting/ShaderObject.h index 39711081..61097ae5 100644 --- a/src/objects/scripting/ShaderObject.h +++ b/src/objects/scripting/ShaderObject.h @@ -53,7 +53,7 @@ class ShaderObject : public PatchObject{ void newObject() override; void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/AudioDevice.cpp b/src/objects/sound/AudioDevice.cpp index ea667e6e..cd28e5d4 100644 --- a/src/objects/sound/AudioDevice.cpp +++ b/src/objects/sound/AudioDevice.cpp @@ -110,7 +110,7 @@ void AudioDevice::updateObjectContent(std::map> } //-------------------------------------------------------------- -void AudioDevice::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void AudioDevice::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); if(this->height < OBJECT_HEIGHT*scaleFactor){ diff --git a/src/objects/sound/AudioDevice.h b/src/objects/sound/AudioDevice.h index 76715e5b..41670874 100644 --- a/src/objects/sound/AudioDevice.h +++ b/src/objects/sound/AudioDevice.h @@ -47,7 +47,7 @@ class AudioDevice : public PatchObject { void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/AudioExporter.cpp b/src/objects/sound/AudioExporter.cpp index b6b181ec..193390c0 100644 --- a/src/objects/sound/AudioExporter.cpp +++ b/src/objects/sound/AudioExporter.cpp @@ -117,7 +117,7 @@ void AudioExporter::updateObjectContent(std::map& glRenderer){ +void AudioExporter::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/sound/AudioExporter.h b/src/objects/sound/AudioExporter.h index be4a7449..8a8ae4f7 100644 --- a/src/objects/sound/AudioExporter.h +++ b/src/objects/sound/AudioExporter.h @@ -53,7 +53,7 @@ class AudioExporter : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/AudioGate.cpp b/src/objects/sound/AudioGate.cpp index 502edf96..df7d5666 100644 --- a/src/objects/sound/AudioGate.cpp +++ b/src/objects/sound/AudioGate.cpp @@ -126,7 +126,7 @@ void AudioGate::updateObjectContent(std::map> & } //-------------------------------------------------------------- -void AudioGate::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void AudioGate::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/sound/AudioGate.h b/src/objects/sound/AudioGate.h index 9e92628d..3e6ab2fd 100644 --- a/src/objects/sound/AudioGate.h +++ b/src/objects/sound/AudioGate.h @@ -46,7 +46,7 @@ class AudioGate : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/Crossfader.cpp b/src/objects/sound/Crossfader.cpp index 6b2435ef..6ae57401 100755 --- a/src/objects/sound/Crossfader.cpp +++ b/src/objects/sound/Crossfader.cpp @@ -115,7 +115,7 @@ void Crossfader::updateObjectContent(std::map> } //-------------------------------------------------------------- -void Crossfader::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void Crossfader::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/sound/Crossfader.h b/src/objects/sound/Crossfader.h index 950dc94a..ef6c1efd 100755 --- a/src/objects/sound/Crossfader.h +++ b/src/objects/sound/Crossfader.h @@ -47,7 +47,7 @@ class Crossfader : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/FrequencyToNote.cpp b/src/objects/sound/FrequencyToNote.cpp index 4e6979f9..9da56e3c 100755 --- a/src/objects/sound/FrequencyToNote.cpp +++ b/src/objects/sound/FrequencyToNote.cpp @@ -103,7 +103,7 @@ void FrequencyToNote::updateObjectContent(std::map& glRenderer){ +void FrequencyToNote::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/sound/FrequencyToNote.h b/src/objects/sound/FrequencyToNote.h index 9aaeb970..075872c6 100755 --- a/src/objects/sound/FrequencyToNote.h +++ b/src/objects/sound/FrequencyToNote.h @@ -50,7 +50,7 @@ class FrequencyToNote : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/Mixer.cpp b/src/objects/sound/Mixer.cpp index 4c3cf07d..c1bd7afe 100755 --- a/src/objects/sound/Mixer.cpp +++ b/src/objects/sound/Mixer.cpp @@ -171,7 +171,7 @@ void Mixer::updateObjectContent(std::map> &patc } //-------------------------------------------------------------- -void Mixer::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void Mixer::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/sound/Mixer.h b/src/objects/sound/Mixer.h index 0b86d03e..6751a536 100755 --- a/src/objects/sound/Mixer.h +++ b/src/objects/sound/Mixer.h @@ -49,7 +49,7 @@ class Mixer : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/NoteToFrequency.cpp b/src/objects/sound/NoteToFrequency.cpp index c48fd535..98a1b209 100755 --- a/src/objects/sound/NoteToFrequency.cpp +++ b/src/objects/sound/NoteToFrequency.cpp @@ -136,7 +136,7 @@ void NoteToFrequency::updateObjectContent(std::map& glRenderer){ +void NoteToFrequency::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/sound/NoteToFrequency.h b/src/objects/sound/NoteToFrequency.h index 6bbbb1ae..0480e5a8 100755 --- a/src/objects/sound/NoteToFrequency.h +++ b/src/objects/sound/NoteToFrequency.h @@ -51,7 +51,7 @@ class NoteToFrequency : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/Oscillator.cpp b/src/objects/sound/Oscillator.cpp index b402b2f6..64a2775c 100755 --- a/src/objects/sound/Oscillator.cpp +++ b/src/objects/sound/Oscillator.cpp @@ -274,11 +274,9 @@ void Oscillator::updateObjectContent(std::map> } //-------------------------------------------------------------- -void Oscillator::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void Oscillator::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); - ofSetColor(0); - } //-------------------------------------------------------------- diff --git a/src/objects/sound/Oscillator.h b/src/objects/sound/Oscillator.h index 9e61ea3a..8af20758 100755 --- a/src/objects/sound/Oscillator.h +++ b/src/objects/sound/Oscillator.h @@ -49,7 +49,7 @@ class Oscillator : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/PDPatch.cpp b/src/objects/sound/PDPatch.cpp index e7d69e87..51b74fef 100644 --- a/src/objects/sound/PDPatch.cpp +++ b/src/objects/sound/PDPatch.cpp @@ -180,7 +180,7 @@ void PDPatch::updateObjectContent(std::map> &pa } //-------------------------------------------------------------- -void PDPatch::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void PDPatch::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/sound/PDPatch.h b/src/objects/sound/PDPatch.h index df78f6b6..007f7a52 100644 --- a/src/objects/sound/PDPatch.h +++ b/src/objects/sound/PDPatch.h @@ -56,7 +56,7 @@ class PDPatch : public PatchObject, public PdReceiver, public PdMidiReceiver{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/Panner.cpp b/src/objects/sound/Panner.cpp index 6b141885..9a3c9636 100755 --- a/src/objects/sound/Panner.cpp +++ b/src/objects/sound/Panner.cpp @@ -115,7 +115,7 @@ void Panner::updateObjectContent(std::map> &pat } //-------------------------------------------------------------- -void Panner::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void Panner::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/sound/Panner.h b/src/objects/sound/Panner.h index 0697dbf1..234f2cce 100755 --- a/src/objects/sound/Panner.h +++ b/src/objects/sound/Panner.h @@ -49,7 +49,7 @@ class Panner : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/PolyphonicOscillator.cpp b/src/objects/sound/PolyphonicOscillator.cpp index 52479056..9a719653 100755 --- a/src/objects/sound/PolyphonicOscillator.cpp +++ b/src/objects/sound/PolyphonicOscillator.cpp @@ -347,7 +347,7 @@ void PolyphonicOscillator::updateObjectContent(std::map& glRenderer){ +void PolyphonicOscillator::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(0); diff --git a/src/objects/sound/PolyphonicOscillator.h b/src/objects/sound/PolyphonicOscillator.h index 2a467894..45c4bd39 100755 --- a/src/objects/sound/PolyphonicOscillator.h +++ b/src/objects/sound/PolyphonicOscillator.h @@ -51,7 +51,7 @@ class PolyphonicOscillator : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/QuadPanner.cpp b/src/objects/sound/QuadPanner.cpp index 55c5982a..31b49d57 100755 --- a/src/objects/sound/QuadPanner.cpp +++ b/src/objects/sound/QuadPanner.cpp @@ -146,7 +146,7 @@ void QuadPanner::updateObjectContent(std::map> } //-------------------------------------------------------------- -void QuadPanner::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void QuadPanner::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/sound/QuadPanner.h b/src/objects/sound/QuadPanner.h index 9337a8a8..689c3b49 100755 --- a/src/objects/sound/QuadPanner.h +++ b/src/objects/sound/QuadPanner.h @@ -49,7 +49,7 @@ class QuadPanner : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/Quantizer.cpp b/src/objects/sound/Quantizer.cpp index c0d6627b..3962e8bb 100755 --- a/src/objects/sound/Quantizer.cpp +++ b/src/objects/sound/Quantizer.cpp @@ -164,7 +164,7 @@ void Quantizer::updateObjectContent(std::map> & } //-------------------------------------------------------------- -void Quantizer::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void Quantizer::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/sound/Quantizer.h b/src/objects/sound/Quantizer.h index d498acda..4e8be862 100755 --- a/src/objects/sound/Quantizer.h +++ b/src/objects/sound/Quantizer.h @@ -360,7 +360,7 @@ class Quantizer : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/SamplePlayer.cpp b/src/objects/sound/SamplePlayer.cpp index 7b2aaa1d..fac8f871 100755 --- a/src/objects/sound/SamplePlayer.cpp +++ b/src/objects/sound/SamplePlayer.cpp @@ -232,7 +232,7 @@ void SamplePlayer::updateObjectContent(std::map } //-------------------------------------------------------------- -void SamplePlayer::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void SamplePlayer::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/sound/SamplePlayer.h b/src/objects/sound/SamplePlayer.h index 96cda241..7d044e53 100755 --- a/src/objects/sound/SamplePlayer.h +++ b/src/objects/sound/SamplePlayer.h @@ -51,7 +51,7 @@ class SamplePlayer : public PatchObject { void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/SigMult.cpp b/src/objects/sound/SigMult.cpp index 56df2132..6b6a5882 100755 --- a/src/objects/sound/SigMult.cpp +++ b/src/objects/sound/SigMult.cpp @@ -107,7 +107,7 @@ void SigMult::updateObjectContent(std::map> &pa } //-------------------------------------------------------------- -void SigMult::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void SigMult::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/sound/SigMult.h b/src/objects/sound/SigMult.h index 1ace973a..b355cca9 100755 --- a/src/objects/sound/SigMult.h +++ b/src/objects/sound/SigMult.h @@ -47,7 +47,7 @@ class SigMult : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/SignalOperator.cpp b/src/objects/sound/SignalOperator.cpp index bd1e121d..8326a76f 100755 --- a/src/objects/sound/SignalOperator.cpp +++ b/src/objects/sound/SignalOperator.cpp @@ -103,7 +103,7 @@ void SignalOperator::updateObjectContent(std::map& glRenderer){ +void SignalOperator::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/sound/SignalOperator.h b/src/objects/sound/SignalOperator.h index eb08c537..e89a3432 100755 --- a/src/objects/sound/SignalOperator.h +++ b/src/objects/sound/SignalOperator.h @@ -49,7 +49,7 @@ class SignalOperator : public PatchObject { void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/SignalTrigger.cpp b/src/objects/sound/SignalTrigger.cpp index d796e9c0..7b684a7b 100755 --- a/src/objects/sound/SignalTrigger.cpp +++ b/src/objects/sound/SignalTrigger.cpp @@ -123,7 +123,7 @@ void SignalTrigger::updateObjectContent(std::map& glRenderer){ +void SignalTrigger::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/sound/SignalTrigger.h b/src/objects/sound/SignalTrigger.h index 94f5e587..3dc37c46 100755 --- a/src/objects/sound/SignalTrigger.h +++ b/src/objects/sound/SignalTrigger.h @@ -49,7 +49,7 @@ class SignalTrigger : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/SoundfilePlayer.cpp b/src/objects/sound/SoundfilePlayer.cpp index 0b072748..d71d1220 100755 --- a/src/objects/sound/SoundfilePlayer.cpp +++ b/src/objects/sound/SoundfilePlayer.cpp @@ -258,7 +258,7 @@ void SoundfilePlayer::updateObjectContent(std::map& glRenderer){ +void SoundfilePlayer::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/sound/SoundfilePlayer.h b/src/objects/sound/SoundfilePlayer.h index 8e1a2377..e22053bb 100755 --- a/src/objects/sound/SoundfilePlayer.h +++ b/src/objects/sound/SoundfilePlayer.h @@ -51,7 +51,7 @@ class SoundfilePlayer : public PatchObject { void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/SummingMixer.cpp b/src/objects/sound/SummingMixer.cpp index be010cae..96617745 100644 --- a/src/objects/sound/SummingMixer.cpp +++ b/src/objects/sound/SummingMixer.cpp @@ -128,7 +128,7 @@ void SummingMixer::updateObjectContent(std::map } //-------------------------------------------------------------- -void SummingMixer::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void SummingMixer::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/sound/SummingMixer.h b/src/objects/sound/SummingMixer.h index 4d03eba4..86771126 100644 --- a/src/objects/sound/SummingMixer.h +++ b/src/objects/sound/SummingMixer.h @@ -47,7 +47,7 @@ class SummingMixer : public PatchObject { void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspADSR.cpp b/src/objects/sound/pdspADSR.cpp index 94ef0d96..cbeb3894 100755 --- a/src/objects/sound/pdspADSR.cpp +++ b/src/objects/sound/pdspADSR.cpp @@ -160,7 +160,7 @@ void pdspADSR::updateObjectContent(std::map> &p } //-------------------------------------------------------------- -void pdspADSR::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void pdspADSR::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/sound/pdspADSR.h b/src/objects/sound/pdspADSR.h index 5c02ef6a..3b7afa6e 100755 --- a/src/objects/sound/pdspADSR.h +++ b/src/objects/sound/pdspADSR.h @@ -50,7 +50,7 @@ class pdspADSR : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspAHR.cpp b/src/objects/sound/pdspAHR.cpp index e03639a0..68650511 100755 --- a/src/objects/sound/pdspAHR.cpp +++ b/src/objects/sound/pdspAHR.cpp @@ -148,7 +148,7 @@ void pdspAHR::updateObjectContent(std::map> &pa } //-------------------------------------------------------------- -void pdspAHR::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void pdspAHR::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/sound/pdspAHR.h b/src/objects/sound/pdspAHR.h index f73534b5..80f216bd 100755 --- a/src/objects/sound/pdspAHR.h +++ b/src/objects/sound/pdspAHR.h @@ -50,7 +50,7 @@ class pdspAHR : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspAddressSequencer.cpp b/src/objects/sound/pdspAddressSequencer.cpp index f65a7e73..0f7dd532 100755 --- a/src/objects/sound/pdspAddressSequencer.cpp +++ b/src/objects/sound/pdspAddressSequencer.cpp @@ -222,7 +222,7 @@ void pdspAddressSequencer::updateAudioObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspAddressSequencer::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void pdspAddressSequencer::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/sound/pdspAddressSequencer.h b/src/objects/sound/pdspAddressSequencer.h index a1d5e2cf..a850e4b3 100755 --- a/src/objects/sound/pdspAddressSequencer.h +++ b/src/objects/sound/pdspAddressSequencer.h @@ -53,7 +53,7 @@ class pdspAddressSequencer : public PatchObject{ void updateObjectContent(std::map> &patchObjects) override; void updateAudioObjectContent(pdsp::Engine &engine) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspBitCruncher.cpp b/src/objects/sound/pdspBitCruncher.cpp index a32a232e..0d7a6b63 100755 --- a/src/objects/sound/pdspBitCruncher.cpp +++ b/src/objects/sound/pdspBitCruncher.cpp @@ -107,7 +107,7 @@ void pdspBitCruncher::updateObjectContent(std::map& glRenderer){ +void pdspBitCruncher::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/sound/pdspBitCruncher.h b/src/objects/sound/pdspBitCruncher.h index f1cd6720..be118afa 100755 --- a/src/objects/sound/pdspBitCruncher.h +++ b/src/objects/sound/pdspBitCruncher.h @@ -47,7 +47,7 @@ class pdspBitCruncher : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspBitNoise.cpp b/src/objects/sound/pdspBitNoise.cpp index 9cc1e2c4..785680b3 100755 --- a/src/objects/sound/pdspBitNoise.cpp +++ b/src/objects/sound/pdspBitNoise.cpp @@ -143,7 +143,7 @@ void pdspBitNoise::updateObjectContent(std::map } //-------------------------------------------------------------- -void pdspBitNoise::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void pdspBitNoise::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(0); } diff --git a/src/objects/sound/pdspBitNoise.h b/src/objects/sound/pdspBitNoise.h index 611d75dd..6ff30553 100755 --- a/src/objects/sound/pdspBitNoise.h +++ b/src/objects/sound/pdspBitNoise.h @@ -49,7 +49,7 @@ class pdspBitNoise : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspChorusEffect.cpp b/src/objects/sound/pdspChorusEffect.cpp index 769e6e3f..85e36d87 100755 --- a/src/objects/sound/pdspChorusEffect.cpp +++ b/src/objects/sound/pdspChorusEffect.cpp @@ -144,7 +144,7 @@ void pdspChorusEffect::updateObjectContent(std::map& glRenderer){ +void pdspChorusEffect::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/sound/pdspChorusEffect.h b/src/objects/sound/pdspChorusEffect.h index 56e4a0f9..9557c53c 100755 --- a/src/objects/sound/pdspChorusEffect.h +++ b/src/objects/sound/pdspChorusEffect.h @@ -49,7 +49,7 @@ class pdspChorusEffect : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspCombFilter.cpp b/src/objects/sound/pdspCombFilter.cpp index 4535645c..1b300cc2 100755 --- a/src/objects/sound/pdspCombFilter.cpp +++ b/src/objects/sound/pdspCombFilter.cpp @@ -143,7 +143,7 @@ void pdspCombFilter::updateObjectContent(std::map& glRenderer){ +void pdspCombFilter::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/sound/pdspCombFilter.h b/src/objects/sound/pdspCombFilter.h index cc86b8d5..fa91e36a 100755 --- a/src/objects/sound/pdspCombFilter.h +++ b/src/objects/sound/pdspCombFilter.h @@ -48,7 +48,7 @@ class pdspCombFilter : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspCompressor.cpp b/src/objects/sound/pdspCompressor.cpp index d8200478..aadb6fe9 100755 --- a/src/objects/sound/pdspCompressor.cpp +++ b/src/objects/sound/pdspCompressor.cpp @@ -191,7 +191,7 @@ void pdspCompressor::updateObjectContent(std::map& glRenderer){ +void pdspCompressor::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/sound/pdspCompressor.h b/src/objects/sound/pdspCompressor.h index 076809e2..ffd797a1 100755 --- a/src/objects/sound/pdspCompressor.h +++ b/src/objects/sound/pdspCompressor.h @@ -49,7 +49,7 @@ class pdspCompressor : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspDataOscillator.cpp b/src/objects/sound/pdspDataOscillator.cpp index 022ec2e1..03dd404b 100755 --- a/src/objects/sound/pdspDataOscillator.cpp +++ b/src/objects/sound/pdspDataOscillator.cpp @@ -154,7 +154,7 @@ void pdspDataOscillator::updateObjectContent(std::map& glRenderer){ +void pdspDataOscillator::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/sound/pdspDataOscillator.h b/src/objects/sound/pdspDataOscillator.h index 19f0f989..7cadf41d 100755 --- a/src/objects/sound/pdspDataOscillator.h +++ b/src/objects/sound/pdspDataOscillator.h @@ -50,7 +50,7 @@ class pdspDataOscillator : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspDecimator.cpp b/src/objects/sound/pdspDecimator.cpp index 60ca38f8..70284dab 100755 --- a/src/objects/sound/pdspDecimator.cpp +++ b/src/objects/sound/pdspDecimator.cpp @@ -104,7 +104,7 @@ void pdspDecimator::updateObjectContent(std::map& glRenderer){ +void pdspDecimator::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/sound/pdspDecimator.h b/src/objects/sound/pdspDecimator.h index bb0c5fc4..b62c7a65 100755 --- a/src/objects/sound/pdspDecimator.h +++ b/src/objects/sound/pdspDecimator.h @@ -47,7 +47,7 @@ class pdspDecimator : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspDelay.cpp b/src/objects/sound/pdspDelay.cpp index d746db06..6617e73c 100755 --- a/src/objects/sound/pdspDelay.cpp +++ b/src/objects/sound/pdspDelay.cpp @@ -146,7 +146,7 @@ void pdspDelay::updateObjectContent(std::map> & } //-------------------------------------------------------------- -void pdspDelay::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void pdspDelay::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/sound/pdspDelay.h b/src/objects/sound/pdspDelay.h index 62215532..89a3ab5e 100755 --- a/src/objects/sound/pdspDelay.h +++ b/src/objects/sound/pdspDelay.h @@ -49,7 +49,7 @@ class pdspDelay : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspDucker.cpp b/src/objects/sound/pdspDucker.cpp index a32dbfb7..5245d67c 100755 --- a/src/objects/sound/pdspDucker.cpp +++ b/src/objects/sound/pdspDucker.cpp @@ -185,7 +185,7 @@ void pdspDucker::updateObjectContent(std::map> } //-------------------------------------------------------------- -void pdspDucker::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void pdspDucker::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/sound/pdspDucker.h b/src/objects/sound/pdspDucker.h index 14123ab8..1811c86a 100755 --- a/src/objects/sound/pdspDucker.h +++ b/src/objects/sound/pdspDucker.h @@ -50,7 +50,7 @@ class pdspDucker : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspHiCut.cpp b/src/objects/sound/pdspHiCut.cpp index f659f49d..eaa8dbc6 100755 --- a/src/objects/sound/pdspHiCut.cpp +++ b/src/objects/sound/pdspHiCut.cpp @@ -116,7 +116,7 @@ void pdspHiCut::updateObjectContent(std::map> & } //-------------------------------------------------------------- -void pdspHiCut::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void pdspHiCut::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/sound/pdspHiCut.h b/src/objects/sound/pdspHiCut.h index 993702a3..6fb31cc3 100755 --- a/src/objects/sound/pdspHiCut.h +++ b/src/objects/sound/pdspHiCut.h @@ -47,7 +47,7 @@ class pdspHiCut : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspKick.cpp b/src/objects/sound/pdspKick.cpp index cc9dc97e..b07ca931 100755 --- a/src/objects/sound/pdspKick.cpp +++ b/src/objects/sound/pdspKick.cpp @@ -215,7 +215,7 @@ void pdspKick::updateObjectContent(std::map> &p } //-------------------------------------------------------------- -void pdspKick::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void pdspKick::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/sound/pdspKick.h b/src/objects/sound/pdspKick.h index 17bc2489..eee335eb 100755 --- a/src/objects/sound/pdspKick.h +++ b/src/objects/sound/pdspKick.h @@ -49,7 +49,7 @@ class pdspKick : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspLFO.cpp b/src/objects/sound/pdspLFO.cpp index 2b9f483e..94385a9e 100755 --- a/src/objects/sound/pdspLFO.cpp +++ b/src/objects/sound/pdspLFO.cpp @@ -155,7 +155,7 @@ void pdspLFO::updateObjectContent(std::map> &pa } //-------------------------------------------------------------- -void pdspLFO::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void pdspLFO::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(0); } diff --git a/src/objects/sound/pdspLFO.h b/src/objects/sound/pdspLFO.h index 070478b1..33ce17e2 100755 --- a/src/objects/sound/pdspLFO.h +++ b/src/objects/sound/pdspLFO.h @@ -48,7 +48,7 @@ class pdspLFO : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspLowCut.cpp b/src/objects/sound/pdspLowCut.cpp index 13a3daa0..92ec5874 100755 --- a/src/objects/sound/pdspLowCut.cpp +++ b/src/objects/sound/pdspLowCut.cpp @@ -115,7 +115,7 @@ void pdspLowCut::updateObjectContent(std::map> } //-------------------------------------------------------------- -void pdspLowCut::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void pdspLowCut::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/sound/pdspLowCut.h b/src/objects/sound/pdspLowCut.h index afb2a99e..2f512c4d 100755 --- a/src/objects/sound/pdspLowCut.h +++ b/src/objects/sound/pdspLowCut.h @@ -47,7 +47,7 @@ class pdspLowCut : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspParametricEQ.cpp b/src/objects/sound/pdspParametricEQ.cpp index b033e780..ea069d02 100755 --- a/src/objects/sound/pdspParametricEQ.cpp +++ b/src/objects/sound/pdspParametricEQ.cpp @@ -197,7 +197,7 @@ void pdspParametricEQ::updateObjectContent(std::map& glRenderer){ +void pdspParametricEQ::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/sound/pdspParametricEQ.h b/src/objects/sound/pdspParametricEQ.h index 86b179f2..24a09153 100755 --- a/src/objects/sound/pdspParametricEQ.h +++ b/src/objects/sound/pdspParametricEQ.h @@ -52,7 +52,7 @@ class pdspParametricEQ : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspResonant2PoleFilter.cpp b/src/objects/sound/pdspResonant2PoleFilter.cpp index f2e35a7c..f0aef50a 100755 --- a/src/objects/sound/pdspResonant2PoleFilter.cpp +++ b/src/objects/sound/pdspResonant2PoleFilter.cpp @@ -156,7 +156,7 @@ void pdspResonant2PoleFilter::updateObjectContent(std::map& glRenderer){ +void pdspResonant2PoleFilter::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); } diff --git a/src/objects/sound/pdspResonant2PoleFilter.h b/src/objects/sound/pdspResonant2PoleFilter.h index 5eac679f..f36ffc59 100755 --- a/src/objects/sound/pdspResonant2PoleFilter.h +++ b/src/objects/sound/pdspResonant2PoleFilter.h @@ -50,7 +50,7 @@ class pdspResonant2PoleFilter : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspReverb.cpp b/src/objects/sound/pdspReverb.cpp index daededff..b91d2c4d 100755 --- a/src/objects/sound/pdspReverb.cpp +++ b/src/objects/sound/pdspReverb.cpp @@ -177,7 +177,7 @@ void pdspReverb::updateObjectContent(std::map> } //-------------------------------------------------------------- -void pdspReverb::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void pdspReverb::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/sound/pdspReverb.h b/src/objects/sound/pdspReverb.h index b71aeb7a..27878e18 100755 --- a/src/objects/sound/pdspReverb.h +++ b/src/objects/sound/pdspReverb.h @@ -49,7 +49,7 @@ class pdspReverb : public PatchObject{ void setupAudioOutObjectContent(pdsp::Engine &engine) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/sound/pdspSequencer.cpp b/src/objects/sound/pdspSequencer.cpp index 44127216..474e8b66 100755 --- a/src/objects/sound/pdspSequencer.cpp +++ b/src/objects/sound/pdspSequencer.cpp @@ -297,7 +297,7 @@ void pdspSequencer::updateAudioObjectContent(pdsp::Engine &engine){ } //-------------------------------------------------------------- -void pdspSequencer::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void pdspSequencer::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); ofSetColor(255); diff --git a/src/objects/sound/pdspSequencer.h b/src/objects/sound/pdspSequencer.h index 7daafdbf..543234a6 100755 --- a/src/objects/sound/pdspSequencer.h +++ b/src/objects/sound/pdspSequencer.h @@ -56,7 +56,7 @@ class pdspSequencer : public PatchObject{ void updateObjectContent(std::map> &patchObjects) override; void updateAudioObjectContent(pdsp::Engine &engine) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/string/RandomString.cpp b/src/objects/string/RandomString.cpp index c06e1f4a..0614d1b4 100755 --- a/src/objects/string/RandomString.cpp +++ b/src/objects/string/RandomString.cpp @@ -103,7 +103,7 @@ void RandomString::updateObjectContent(std::map } //-------------------------------------------------------------- -void RandomString::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void RandomString::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/string/RandomString.h b/src/objects/string/RandomString.h index cd871a71..54239733 100755 --- a/src/objects/string/RandomString.h +++ b/src/objects/string/RandomString.h @@ -47,7 +47,7 @@ class RandomString : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/string/StringAt.cpp b/src/objects/string/StringAt.cpp index f76c173d..447de0ca 100755 --- a/src/objects/string/StringAt.cpp +++ b/src/objects/string/StringAt.cpp @@ -99,7 +99,7 @@ void StringAt::updateObjectContent(std::map> &p } //-------------------------------------------------------------- -void StringAt::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void StringAt::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/string/StringAt.h b/src/objects/string/StringAt.h index 7e689e15..e922d8d3 100755 --- a/src/objects/string/StringAt.h +++ b/src/objects/string/StringAt.h @@ -46,7 +46,7 @@ class StringAt : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/string/StringConcat.cpp b/src/objects/string/StringConcat.cpp index 881af8b5..30f13886 100755 --- a/src/objects/string/StringConcat.cpp +++ b/src/objects/string/StringConcat.cpp @@ -112,7 +112,7 @@ void StringConcat::updateObjectContent(std::map } //-------------------------------------------------------------- -void StringConcat::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void StringConcat::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/string/StringConcat.h b/src/objects/string/StringConcat.h index 56c271cc..85c0f523 100755 --- a/src/objects/string/StringConcat.h +++ b/src/objects/string/StringConcat.h @@ -46,7 +46,7 @@ class StringConcat : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/string/StringExtract.cpp b/src/objects/string/StringExtract.cpp index 903855a4..e51977d9 100755 --- a/src/objects/string/StringExtract.cpp +++ b/src/objects/string/StringExtract.cpp @@ -99,7 +99,7 @@ void StringExtract::updateObjectContent(std::map& glRenderer){ +void StringExtract::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/string/StringExtract.h b/src/objects/string/StringExtract.h index 548b6c99..0c6ad4cf 100755 --- a/src/objects/string/StringExtract.h +++ b/src/objects/string/StringExtract.h @@ -46,7 +46,7 @@ class StringExtract : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/string/StringGate.cpp b/src/objects/string/StringGate.cpp index 2ecbbfe8..4061818b 100644 --- a/src/objects/string/StringGate.cpp +++ b/src/objects/string/StringGate.cpp @@ -123,7 +123,7 @@ void StringGate::updateObjectContent(std::map> } //-------------------------------------------------------------- -void StringGate::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void StringGate::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/string/StringGate.h b/src/objects/string/StringGate.h index 721690bf..4ec1f1fe 100644 --- a/src/objects/string/StringGate.h +++ b/src/objects/string/StringGate.h @@ -46,7 +46,7 @@ class StringGate : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/string/StringMultiplexer.cpp b/src/objects/string/StringMultiplexer.cpp index 5402976e..3d482fed 100755 --- a/src/objects/string/StringMultiplexer.cpp +++ b/src/objects/string/StringMultiplexer.cpp @@ -117,7 +117,7 @@ void StringMultiplexer::updateObjectContent(std::map& glRenderer){ +void StringMultiplexer::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ ofSetColor(255); } diff --git a/src/objects/string/StringMultiplexer.h b/src/objects/string/StringMultiplexer.h index 7dec4324..10def539 100755 --- a/src/objects/string/StringMultiplexer.h +++ b/src/objects/string/StringMultiplexer.h @@ -46,7 +46,7 @@ class StringMultiplexer : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/surface/FboComposer.cpp b/src/objects/surface/FboComposer.cpp index b30a0e15..d02dda19 100644 --- a/src/objects/surface/FboComposer.cpp +++ b/src/objects/surface/FboComposer.cpp @@ -99,7 +99,7 @@ void FboComposer::updateObjectContent(std::map> } //-------------------------------------------------------------- -void FboComposer::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void FboComposer::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ static_cast(_outletParams[0])->src->begin(); ofPushView(); diff --git a/src/objects/surface/FboComposer.h b/src/objects/surface/FboComposer.h index 92dbf366..988e6994 100644 --- a/src/objects/surface/FboComposer.h +++ b/src/objects/surface/FboComposer.h @@ -46,7 +46,7 @@ class FboComposer : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; void removeObjectContent(bool removeFileFromData=false) override; diff --git a/src/objects/surface/FboEffect.cpp b/src/objects/surface/FboEffect.cpp index 629b1932..88d98319 100644 --- a/src/objects/surface/FboEffect.cpp +++ b/src/objects/surface/FboEffect.cpp @@ -105,7 +105,7 @@ void FboEffect::updateObjectContent(std::map> & } //-------------------------------------------------------------- -void FboEffect::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void FboEffect::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ /////////////////////////////////////////// // FBO DRAW diff --git a/src/objects/surface/FboEffect.h b/src/objects/surface/FboEffect.h index b5858dd2..22970f6a 100644 --- a/src/objects/surface/FboEffect.h +++ b/src/objects/surface/FboEffect.h @@ -46,7 +46,7 @@ class FboEffect : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; void removeObjectContent(bool removeFileFromData=false) override; diff --git a/src/objects/surface/FboParticles.cpp b/src/objects/surface/FboParticles.cpp index 8c29e937..fd7362ad 100644 --- a/src/objects/surface/FboParticles.cpp +++ b/src/objects/surface/FboParticles.cpp @@ -135,7 +135,7 @@ void FboParticles::updateObjectContent(std::map } //-------------------------------------------------------------- -void FboParticles::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void FboParticles::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ /////////////////////////////////////////// // FBO DRAW diff --git a/src/objects/surface/FboParticles.h b/src/objects/surface/FboParticles.h index 5f64e352..2813f3a0 100644 --- a/src/objects/surface/FboParticles.h +++ b/src/objects/surface/FboParticles.h @@ -50,7 +50,7 @@ class FboParticles : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; void removeObjectContent(bool removeFileFromData=false) override; diff --git a/src/objects/video/KinectGrabber.cpp b/src/objects/video/KinectGrabber.cpp index 3c8abeea..9b423a9c 100644 --- a/src/objects/video/KinectGrabber.cpp +++ b/src/objects/video/KinectGrabber.cpp @@ -174,7 +174,7 @@ void KinectGrabber::updateObjectContent(std::map& glRenderer){ +void KinectGrabber::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ } diff --git a/src/objects/video/KinectGrabber.h b/src/objects/video/KinectGrabber.h index 0b992b7e..80f6d236 100644 --- a/src/objects/video/KinectGrabber.h +++ b/src/objects/video/KinectGrabber.h @@ -52,7 +52,7 @@ class KinectGrabber : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; void removeObjectContent(bool removeFileFromData=false) override; diff --git a/src/objects/video/PixelsToTexture.cpp b/src/objects/video/PixelsToTexture.cpp index 71613013..20dd93a3 100644 --- a/src/objects/video/PixelsToTexture.cpp +++ b/src/objects/video/PixelsToTexture.cpp @@ -76,7 +76,7 @@ void PixelsToTexture::updateObjectContent(std::map& glRenderer){ +void PixelsToTexture::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/video/PixelsToTexture.h b/src/objects/video/PixelsToTexture.h index 6a13a3ff..26f972c8 100644 --- a/src/objects/video/PixelsToTexture.h +++ b/src/objects/video/PixelsToTexture.h @@ -46,7 +46,7 @@ class PixelsToTexture : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; void removeObjectContent(bool removeFileFromData=false) override; diff --git a/src/objects/video/TextureInformation.cpp b/src/objects/video/TextureInformation.cpp index 600dc700..bd678f3d 100644 --- a/src/objects/video/TextureInformation.cpp +++ b/src/objects/video/TextureInformation.cpp @@ -108,7 +108,7 @@ void TextureInformation::updateObjectContent(std::map& glRenderer){ +void TextureInformation::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/video/TextureInformation.h b/src/objects/video/TextureInformation.h index c5df82d7..27926d71 100644 --- a/src/objects/video/TextureInformation.h +++ b/src/objects/video/TextureInformation.h @@ -48,7 +48,7 @@ class TextureInformation : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/video/TextureToPixels.cpp b/src/objects/video/TextureToPixels.cpp index a58cf3bc..e1fcba2e 100644 --- a/src/objects/video/TextureToPixels.cpp +++ b/src/objects/video/TextureToPixels.cpp @@ -74,7 +74,7 @@ void TextureToPixels::updateObjectContent(std::map& glRenderer){ +void TextureToPixels::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/video/TextureToPixels.h b/src/objects/video/TextureToPixels.h index 0a0ccbb3..4033b1fd 100644 --- a/src/objects/video/TextureToPixels.h +++ b/src/objects/video/TextureToPixels.h @@ -46,7 +46,7 @@ class TextureToPixels : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; void removeObjectContent(bool removeFileFromData=false) override; diff --git a/src/objects/video/ToGrayScaleTexture.cpp b/src/objects/video/ToGrayScaleTexture.cpp index 7dd43c5f..c10f7a31 100644 --- a/src/objects/video/ToGrayScaleTexture.cpp +++ b/src/objects/video/ToGrayScaleTexture.cpp @@ -118,7 +118,7 @@ void ToGrayScaleTexture::updateObjectContent(std::map& glRenderer){ +void ToGrayScaleTexture::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/video/ToGrayScaleTexture.h b/src/objects/video/ToGrayScaleTexture.h index 8277dd45..27b8755f 100644 --- a/src/objects/video/ToGrayScaleTexture.h +++ b/src/objects/video/ToGrayScaleTexture.h @@ -49,7 +49,7 @@ class ToGrayScaleTexture : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/video/VideoCrop.cpp b/src/objects/video/VideoCrop.cpp index 5fb32eee..b12aca00 100644 --- a/src/objects/video/VideoCrop.cpp +++ b/src/objects/video/VideoCrop.cpp @@ -164,7 +164,7 @@ void VideoCrop::updateObjectContent(std::map> & } //-------------------------------------------------------------- -void VideoCrop::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void VideoCrop::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/video/VideoCrop.h b/src/objects/video/VideoCrop.h index b8e8d82d..20de40d5 100644 --- a/src/objects/video/VideoCrop.h +++ b/src/objects/video/VideoCrop.h @@ -46,7 +46,7 @@ class VideoCrop : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/video/VideoDelay.cpp b/src/objects/video/VideoDelay.cpp index a19cafe8..964ecaa6 100644 --- a/src/objects/video/VideoDelay.cpp +++ b/src/objects/video/VideoDelay.cpp @@ -177,7 +177,7 @@ void VideoDelay::updateObjectContent(std::map> } //-------------------------------------------------------------- -void VideoDelay::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void VideoDelay::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/video/VideoDelay.h b/src/objects/video/VideoDelay.h index 441539f1..312808ac 100644 --- a/src/objects/video/VideoDelay.h +++ b/src/objects/video/VideoDelay.h @@ -46,7 +46,7 @@ class VideoDelay : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/video/VideoExporter.cpp b/src/objects/video/VideoExporter.cpp index d1d746aa..28430417 100644 --- a/src/objects/video/VideoExporter.cpp +++ b/src/objects/video/VideoExporter.cpp @@ -169,7 +169,7 @@ void VideoExporter::updateObjectContent(std::map& glRenderer){ +void VideoExporter::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/video/VideoExporter.h b/src/objects/video/VideoExporter.h index 768e6419..d4097698 100644 --- a/src/objects/video/VideoExporter.h +++ b/src/objects/video/VideoExporter.h @@ -53,7 +53,7 @@ class VideoExporter : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/video/VideoGate.cpp b/src/objects/video/VideoGate.cpp index 3f77c8e1..bede6c2e 100644 --- a/src/objects/video/VideoGate.cpp +++ b/src/objects/video/VideoGate.cpp @@ -139,7 +139,7 @@ void VideoGate::updateObjectContent(std::map> & } //-------------------------------------------------------------- -void VideoGate::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void VideoGate::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/video/VideoGate.h b/src/objects/video/VideoGate.h index b67c6cdc..7d822795 100644 --- a/src/objects/video/VideoGate.h +++ b/src/objects/video/VideoGate.h @@ -46,7 +46,7 @@ class VideoGate : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/video/VideoGrabber.cpp b/src/objects/video/VideoGrabber.cpp index 2e6bedbe..41303f31 100644 --- a/src/objects/video/VideoGrabber.cpp +++ b/src/objects/video/VideoGrabber.cpp @@ -156,7 +156,7 @@ void VideoGrabber::updateObjectContent(std::map } //-------------------------------------------------------------- -void VideoGrabber::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void VideoGrabber::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/video/VideoGrabber.h b/src/objects/video/VideoGrabber.h index a285e298..7a7e418a 100644 --- a/src/objects/video/VideoGrabber.h +++ b/src/objects/video/VideoGrabber.h @@ -51,7 +51,7 @@ class VideoGrabber : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; void removeObjectContent(bool removeFileFromData=false) override; diff --git a/src/objects/video/VideoMixer.cpp b/src/objects/video/VideoMixer.cpp index 70958148..8f39606e 100644 --- a/src/objects/video/VideoMixer.cpp +++ b/src/objects/video/VideoMixer.cpp @@ -188,7 +188,7 @@ void VideoMixer::updateObjectContent(std::map> } //-------------------------------------------------------------- -void VideoMixer::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void VideoMixer::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/video/VideoMixer.h b/src/objects/video/VideoMixer.h index edb374cd..949c8c76 100644 --- a/src/objects/video/VideoMixer.h +++ b/src/objects/video/VideoMixer.h @@ -46,7 +46,7 @@ class VideoMixer : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/video/VideoPlayer.cpp b/src/objects/video/VideoPlayer.cpp index 66c99a2a..6a0c2184 100644 --- a/src/objects/video/VideoPlayer.cpp +++ b/src/objects/video/VideoPlayer.cpp @@ -281,7 +281,7 @@ void VideoPlayer::updateObjectContent(std::map> } //-------------------------------------------------------------- -void VideoPlayer::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void VideoPlayer::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/video/VideoPlayer.h b/src/objects/video/VideoPlayer.h index 809af9a6..e4e46b45 100644 --- a/src/objects/video/VideoPlayer.h +++ b/src/objects/video/VideoPlayer.h @@ -50,7 +50,7 @@ class VideoPlayer : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/video/VideoStreaming.cpp b/src/objects/video/VideoStreaming.cpp index d9c2b169..e30b30fc 100644 --- a/src/objects/video/VideoStreaming.cpp +++ b/src/objects/video/VideoStreaming.cpp @@ -160,7 +160,7 @@ void VideoStreaming::updateObjectContent(std::map& glRenderer){ +void VideoStreaming::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/video/VideoStreaming.h b/src/objects/video/VideoStreaming.h index 5e861d5f..e4ea9576 100644 --- a/src/objects/video/VideoStreaming.h +++ b/src/objects/video/VideoStreaming.h @@ -52,7 +52,7 @@ class VideoStreaming : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/video/VideoTimelapse.cpp b/src/objects/video/VideoTimelapse.cpp index b27d0daa..7bd121fe 100644 --- a/src/objects/video/VideoTimelapse.cpp +++ b/src/objects/video/VideoTimelapse.cpp @@ -160,7 +160,7 @@ void VideoTimelapse::updateObjectContent(std::map& glRenderer){ +void VideoTimelapse::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); diff --git a/src/objects/video/VideoTimelapse.h b/src/objects/video/VideoTimelapse.h index de6484a8..7823954e 100644 --- a/src/objects/video/VideoTimelapse.h +++ b/src/objects/video/VideoTimelapse.h @@ -80,7 +80,7 @@ class VideoTimelapse : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/video/VideoTransform.cpp b/src/objects/video/VideoTransform.cpp index 6f046333..f154f5e3 100644 --- a/src/objects/video/VideoTransform.cpp +++ b/src/objects/video/VideoTransform.cpp @@ -204,7 +204,7 @@ void VideoTransform::updateObjectContent(std::map& glRenderer){ +void VideoTransform::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ diff --git a/src/objects/video/VideoTransform.h b/src/objects/video/VideoTransform.h index 36d78279..b87b45cd 100644 --- a/src/objects/video/VideoTransform.h +++ b/src/objects/video/VideoTransform.h @@ -46,7 +46,7 @@ class VideoTransform : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/windowing/LivePatching.cpp b/src/objects/windowing/LivePatching.cpp index 244bdcbd..5457d7c1 100644 --- a/src/objects/windowing/LivePatching.cpp +++ b/src/objects/windowing/LivePatching.cpp @@ -103,7 +103,7 @@ void LivePatching::updateObjectContent(std::map } //-------------------------------------------------------------- -void LivePatching::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void LivePatching::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/windowing/LivePatching.h b/src/objects/windowing/LivePatching.h index 99839b73..b5b62e44 100644 --- a/src/objects/windowing/LivePatching.h +++ b/src/objects/windowing/LivePatching.h @@ -46,7 +46,7 @@ class LivePatching : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/windowing/OutputWindow.cpp b/src/objects/windowing/OutputWindow.cpp index 380f442e..367ef896 100755 --- a/src/objects/windowing/OutputWindow.cpp +++ b/src/objects/windowing/OutputWindow.cpp @@ -297,7 +297,7 @@ void OutputWindow::updateObjectContent(std::map } //-------------------------------------------------------------- -void OutputWindow::drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer){ +void OutputWindow::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); diff --git a/src/objects/windowing/OutputWindow.h b/src/objects/windowing/OutputWindow.h index 4ed90077..623c0a71 100755 --- a/src/objects/windowing/OutputWindow.h +++ b/src/objects/windowing/OutputWindow.h @@ -50,7 +50,7 @@ class OutputWindow : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/objects/windowing/ProjectionMapping.cpp b/src/objects/windowing/ProjectionMapping.cpp index d154c539..effdce81 100644 --- a/src/objects/windowing/ProjectionMapping.cpp +++ b/src/objects/windowing/ProjectionMapping.cpp @@ -196,7 +196,7 @@ void ProjectionMapping::updateObjectContent(std::map& glRenderer){ +void ProjectionMapping::drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer){ unusedArgs(font,glRenderer); } diff --git a/src/objects/windowing/ProjectionMapping.h b/src/objects/windowing/ProjectionMapping.h index 6e51abb0..28ad4687 100644 --- a/src/objects/windowing/ProjectionMapping.h +++ b/src/objects/windowing/ProjectionMapping.h @@ -51,7 +51,7 @@ class ProjectionMapping : public PatchObject { void setupObjectContent(shared_ptr &mainWindow) override; void updateObjectContent(std::map> &patchObjects) override; - void drawObjectContent(ofTrueTypeFont *font, shared_ptr& glRenderer) override; + void drawObjectContent(ofTrueTypeFont *font, std::shared_ptr& glRenderer) override; void drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ) override; void drawObjectNodeConfig() override; diff --git a/src/utils.h b/src/utils.h index 70949c5a..8973fa6f 100644 --- a/src/utils.h +++ b/src/utils.h @@ -43,6 +43,7 @@ #endif #include +#include #include #include #include From e58e0360dbdee108316aaac92c1113f520e49d90 Mon Sep 17 00:00:00 2001 From: d3cod3 Date: Thu, 1 May 2025 17:19:23 +0100 Subject: [PATCH 17/21] updated README for 0.7.3 release --- README.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/README.md b/README.md index 8edcf8dd..aa912140 100644 --- a/README.md +++ b/README.md @@ -203,6 +203,16 @@ vector extract | X | vector gate | X | vector operator | X | +Generative | Ready +---------- | ---------- +strange attractors | X | + +Graphics | Ready +---------- | ---------- +image loader | X | +image exporter | X | +color palette | X | + GUI | Ready ---------- | ---------- 2D pad | X | @@ -300,6 +310,21 @@ signal trigger | X | soundfile player | X | summing mixer | X | +String | Ready +---------- | ---------- +random string | X | +string at | X | +string concat | X | +string extract | X | +string gate | X | +string multiplexer | X | + +Surface | In process +---------- | ---------- +fbo composer | | +fbo effect | | +fbo particle | | + Texture | Ready ---------- | ---------- image exporter | X | From 7954bfcc2315433dbd1aad46535be314780a048d Mon Sep 17 00:00:00 2001 From: d3cod3 Date: Tue, 21 Oct 2025 23:28:07 +0100 Subject: [PATCH 18/21] updated strange attractors generative object --- src/objects/generative/AChaos.cpp | 3 +++ src/objects/generative/AChaos.h | 1 + 2 files changed, 4 insertions(+) diff --git a/src/objects/generative/AChaos.cpp b/src/objects/generative/AChaos.cpp index 8da1d2d6..0182b188 100644 --- a/src/objects/generative/AChaos.cpp +++ b/src/objects/generative/AChaos.cpp @@ -300,6 +300,9 @@ void AChaos::drawObjectNodeConfig(){ ImGui::Spacing(); ImGui::Spacing(); + ImGui::Spacing(); + ImGuiEx::Pad2D(0, 180*this->scaleFactor,&_x,&_y); + ImGui::Spacing(); if(ImGui::SliderFloat("amp",&volume,0.0f,1.0f)){ this->setCustomVar(volume,"VOLUME"); diff --git a/src/objects/generative/AChaos.h b/src/objects/generative/AChaos.h index c49c2e60..c01fef89 100644 --- a/src/objects/generative/AChaos.h +++ b/src/objects/generative/AChaos.h @@ -35,6 +35,7 @@ #pragma once #include "PatchObject.h" +#include "imgui_controls.h" #include "AChaosLib.h" From d349c25256b59f6382208039bd23c0ae0302b299 Mon Sep 17 00:00:00 2001 From: d3cod3 Date: Wed, 22 Oct 2025 11:28:37 +0100 Subject: [PATCH 19/21] 2d pad made resizable --- src/objects/gui/mo2DPad.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/objects/gui/mo2DPad.cpp b/src/objects/gui/mo2DPad.cpp index cd135658..d66643b0 100644 --- a/src/objects/gui/mo2DPad.cpp +++ b/src/objects/gui/mo2DPad.cpp @@ -51,6 +51,7 @@ mo2DPad::mo2DPad() : PatchObject("2d pad"){ *ofxVP_CAST_PIN_PTR(this->_outletParams[1]) = 0.0f; this->initInletsState(); + this->setIsResizable(true); loaded = false; From 11c7bb29a4d0e23558e1808f3ca4de54f2951d51 Mon Sep 17 00:00:00 2001 From: d3cod3 Date: Wed, 22 Oct 2025 16:21:13 +0100 Subject: [PATCH 20/21] comment object fixes --- src/objects/gui/moComment.cpp | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/objects/gui/moComment.cpp b/src/objects/gui/moComment.cpp index 673941d8..1400fef3 100644 --- a/src/objects/gui/moComment.cpp +++ b/src/objects/gui/moComment.cpp @@ -53,7 +53,7 @@ moComment::moComment() : PatchObject("comment"){ bang = false; nextFrame = true; - this->width *= 2; + this->width *= 2.2; this->setIsResizable(true); @@ -79,7 +79,7 @@ void moComment::newObject(){ void moComment::setupObjectContent(shared_ptr &mainWindow){ unusedArgs(mainWindow); - actualComment = "Comment your patches and share!"; + actualComment = "Comment your patches and share your knowledge!"; loadCommentSetting(); } @@ -151,10 +151,10 @@ void moComment::drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ){ // Visualize (Object main view) if( _nodeCanvas.BeginNodeContent(ImGuiExNodeView_Visualise) ){ - if(ImGui::InputTextMultiline("##source", &actualComment, ImVec2(ImGui::GetWindowSize().x-30, ImGui::GetWindowSize().y-24), ImGuiInputTextFlags_AllowTabInput)){ + if(ImGui::InputTextMultiline("##source", &actualComment, ImVec2(ImGui::GetWindowSize().x-30, ImGui::GetWindowSize().y-24), ImGuiInputTextFlags_AllowTabInput|ImGuiInputTextFlags_Multiline)){ saveCommentSetting(); - } + } if(this->width != prevW){ prevW = this->width; @@ -172,8 +172,16 @@ void moComment::drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ){ //-------------------------------------------------------------- void moComment::drawObjectNodeConfig(){ + + ImGui::Spacing(); + if(ImGui::MenuItem("Copy")) ImGui::SetClipboardText(actualComment.c_str()); + ImGui::Spacing(); + ImGui::Spacing(); + if(ImGui::MenuItem("Paste")) actualComment = ImGui::GetClipboardText(); + ImGui::Spacing(); + ImGuiEx::ObjectInfo( - "A simple comment object.", + "A simple comment object. You can copy/paste from the object config.", "https://mosaic.d3cod3.org/reference.php?r=comment", scaleFactor); } @@ -188,7 +196,10 @@ void moComment::loadCommentSetting(){ ofxVPXml.loadMosaicPatch(this->patchFile); pugi::xml_node obj = this->ofxVPXml.getObjectNode(this->nId); - actualComment = this->ofxVPXml.getPatchChildString(obj,"text"); + string tempC = this->ofxVPXml.getPatchChildString(obj,"text"); + if(tempC != ""){ + actualComment = tempC; + } } From 8f98c4dd1a5001c356824ad538400c530c179f9a Mon Sep 17 00:00:00 2001 From: d3cod3 Date: Wed, 22 Oct 2025 16:23:56 +0100 Subject: [PATCH 21/21] added save custom object dimensions to 2D pad object --- src/objects/gui/mo2DPad.cpp | 20 ++++++++++++++++++++ src/objects/gui/mo2DPad.h | 2 ++ 2 files changed, 22 insertions(+) diff --git a/src/objects/gui/mo2DPad.cpp b/src/objects/gui/mo2DPad.cpp index d66643b0..3a087581 100644 --- a/src/objects/gui/mo2DPad.cpp +++ b/src/objects/gui/mo2DPad.cpp @@ -58,6 +58,9 @@ mo2DPad::mo2DPad() : PatchObject("2d pad"){ _x = 0.5f; _y = 0.5f; + prevW = this->width; + prevH = this->height; + } //-------------------------------------------------------------- @@ -71,6 +74,9 @@ void mo2DPad::newObject(){ this->setCustomVar(static_cast(_x),"XPOS"); this->setCustomVar(static_cast(_y),"YPOS"); + + this->setCustomVar(static_cast(prevW),"WIDTH"); + this->setCustomVar(static_cast(prevH),"HEIGHT"); } //-------------------------------------------------------------- @@ -94,6 +100,10 @@ void mo2DPad::updateObjectContent(std::map> &pa loaded = true; _x = this->getCustomVar("XPOS"); _y = this->getCustomVar("YPOS"); + prevW = this->getCustomVar("WIDTH"); + prevH = this->getCustomVar("HEIGHT"); + this->width = prevW; + this->height = prevH; } *ofxVP_CAST_PIN_PTR(this->_outletParams[0]) = _x; @@ -136,6 +146,16 @@ void mo2DPad::drawObjectNodeGui( ImGuiEx::NodeCanvas& _nodeCanvas ){ this->setCustomVar(static_cast(_y),"YPOS"); } + if(this->width != prevW){ + prevW = this->width; + this->setCustomVar(static_cast(prevW),"WIDTH"); + } + if(this->height != prevH){ + prevH = this->height; + this->setCustomVar(static_cast(prevH),"HEIGHT"); + } + + _nodeCanvas.EndNodeContent(); } diff --git a/src/objects/gui/mo2DPad.h b/src/objects/gui/mo2DPad.h index 927c42ab..aa62cd59 100644 --- a/src/objects/gui/mo2DPad.h +++ b/src/objects/gui/mo2DPad.h @@ -59,6 +59,8 @@ class mo2DPad : public PatchObject { float _x,_y; + float prevW, prevH; + private: