diff options
Diffstat (limited to 'rotord/src/graph.cpp')
| -rw-r--r-- | rotord/src/graph.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/rotord/src/graph.cpp b/rotord/src/graph.cpp index f54b18c..313df2a 100644 --- a/rotord/src/graph.cpp +++ b/rotord/src/graph.cpp @@ -3,7 +3,7 @@ using namespace Rotor; using Poco::Logger; -const string Graph::toString(){ +const string Graph::graphToString(){ string xmlgraph; if (loaded) { xml.copyXmlToString(xmlgraph); @@ -51,7 +51,7 @@ bool Graph::preview(xmlIO &XML,string &node,string &_format,int frame,int w,int if (nodes.find(node)!=nodes.end()){ float t=frame/framerate; XML.addTag("preview"); - XML.addAttribute("preview","frame",ofToString(frame),0); + XML.addAttribute("preview","frame",toString(frame),0); XML.addAttribute("preview","nodeID",node,0); XML.pushTag("preview"); if (dynamic_cast<Signal_node*>(nodes[node])){ @@ -113,7 +113,7 @@ bool Graph::video_render(const string &output_filename,const float framerate) { Logger& logger = Logger::get("Rotor"); - logger.information("Video_output rendering "+output_filename+": "+ofToString(duration)+" seconds at "+ofToString(framerate)+" fps, audio frame size: "+ofToString(exporter.get_audio_framesize())); + logger.information("Video_output rendering "+output_filename+": "+toString(duration)+" seconds at "+toString(framerate)+" fps, audio frame size: "+toString(exporter.get_audio_framesize())); //25fps video and 43.06640625fps audio? hmm //how to get the timecodes correct for the interleaved files @@ -128,7 +128,7 @@ bool Graph::video_render(const string &output_filename,const float framerate) { //does audioloader output interleaved samples? samples_in_frame=(audioloader.codecContext->sample_rate)/framerate; string whether=usingaudio?"Loading":"Cannot load"; - logger.information(whether+" audio file: "+audio_filename+", each frame contains "+ofToString(samples_in_frame)+" samples at "+ofToString(audioloader.codecContext->sample_rate)+" hz"); + logger.information(whether+" audio file: "+audio_filename+", each frame contains "+toString(samples_in_frame)+" samples at "+toString(audioloader.codecContext->sample_rate)+" hz"); audioframe=new uint16_t[(samples_in_frame+exporter.get_audio_framesize())*audioloader.codecContext->channels]; } @@ -203,7 +203,7 @@ bool Graph::video_render(const string &output_filename,const float framerate) { float mtime = ((end.tv_sec-start.tv_sec) + (end.tv_usec-start.tv_usec)/1000000.0) + 0.5; - logger.information("Video_output: rendered "+output_filename+": in "+ofToString(mtime)+" seconds"); + logger.information("Video_output: rendered "+output_filename+": in "+toString(mtime)+" seconds"); if (usingaudio) { audioloader.close(); @@ -454,7 +454,7 @@ bool Graph::parseXml(string media_path){ string parameter=xml.getAttribute("parameter","name","",i4); if (nodes[nodeID]->parameters.find(parameter)!=nodes[nodeID]->parameters.end()) { string val=xml.getAttribute("parameter","value","",i4); - if (val!="") nodes[nodeID]->parameters.find(parameter)->second->value=ofToFloat(val); + if (val!="") nodes[nodeID]->parameters.find(parameter)->second->value=toFloat(val); string fromID=xml.getAttribute("parameter","from","",i4); if (nodes.find(fromID)!=nodes.end()) { if (!nodes[nodeID]->parameters[parameter]->connect(nodes[fromID])){ @@ -473,7 +473,7 @@ bool Graph::parseXml(string media_path){ string parameter=xml.getAttribute("parameter_input","name","",i4); if (nodes[nodeID]->parameters.find(parameter)!=nodes[nodeID]->parameters.end()) { string val=xml.getAttribute("parameter_input","value","",i4); - if (val!="") nodes[nodeID]->parameters.find(parameter)->second->value=ofToFloat(val); + if (val!="") nodes[nodeID]->parameters.find(parameter)->second->value=toFloat(val); string fromID=xml.getAttribute("parameter_input","from","",i4); if (nodes.find(fromID)!=nodes.end()) { if (!nodes[nodeID]->parameters[parameter]->connect(nodes[fromID])){ |