diff options
Diffstat (limited to 'rotord/src/rendercontext.cpp')
| -rw-r--r-- | rotord/src/rendercontext.cpp | 45 |
1 files changed, 1 insertions, 44 deletions
diff --git a/rotord/src/rendercontext.cpp b/rotord/src/rendercontext.cpp index 47fa498..86331b4 100644 --- a/rotord/src/rendercontext.cpp +++ b/rotord/src/rendercontext.cpp @@ -240,49 +240,6 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H //should interrupt whatever is happening? //before begining to load from xml if (state==IDLE) { //eventually not like this - /* - if (Poco::File(graph_dir+command.body).exists()) { - string graph_filename=graph_dir+command.body; - if (graph.loadFile(graph_filename,media_dir)) { - status=HTTPResponse::HTTP_OK; - //XML.addValue("patchbay",graph.toString()); - //XML.loadFromBuffer(graph.toString()); - XML=graph.xml; - //the graph could actually contain an xml object and we could just print it here? - //or could our nodes even be subclassed from xml nodes? - //the graph or the audio could load first- have to analyse the audio with vamp after the graph is loaded - //for now the graph must load 1st - if (graph.audio_loaded) { - add_queue(Session_task(command.uid,ANALYSE_AUDIO)); - status=HTTPResponse::HTTP_OK; - logger.information("Starting audio analysis for graph: "+command.commands[0]); - XML.addValue("status","Starting audio analysis for graph: "+command.commands[0]); - } - } - else { - status=HTTPResponse::HTTP_INTERNAL_SERVER_ERROR; //~/sources/poco-1.4.6-all/Net/include/Poco/Net/HTTPResponse.h - logger.error("ERROR: graph not loaded: check file"); - XML.addValue("error","graph not loaded: check file"); - } - } - else if (graph.load(command.body,media_dir)) { - status=HTTPResponse::HTTP_OK; - logger.information("Loaded graph from http PUT body"); - XML.addValue("status","Loaded graph from PUT body"); - if (graph.audio_loaded) { - add_queue(Session_task(command.uid,ANALYSE_AUDIO)); - status=HTTPResponse::HTTP_OK; - logger.information("Starting audio analysis for graph: "+command.commands[0]); - XML.addValue("status","Starting audio analysis for graph: "+command.commands[0]); - } - } - else { - status=HTTPResponse::HTTP_INTERNAL_SERVER_ERROR; //~/sources/poco-1.4.6-all/Net/include/Poco/Net/HTTPResponse.h - logger.error("ERROR: graph unreadable"); - XML.addValue("error","graph unreadable"); - } - */ - if (command.body!="") { graph_filename=""; graph_body=""; @@ -346,7 +303,7 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H // framerate=toFloat(command.id); //} string signal_xml; - if (false) { //graph.signal_render(signal_xml,framerate)){ + if (graph.signal_render(signal_xml,framerate)){ status=HTTPResponse::HTTP_OK; logger.information("rendering signal to xml"); XML.addValue("signal",signal_xml); //this doesn't work >> pseudo xml |