signal test semi fixed

3 files changed, 11 insertions, 10 deletions

diff --git a/rotord/graph.cpp b/rotord/graph.cpp
index 74fadb8..59f7361 100644
--- a/rotord/graph.cpp
+++ b/rotord/graph.cpp
@@ -29,7 +29,7 @@ bool Graph::signal_render(string &signal_xml,const float framerate) {
 	}
 	cerr<<"Rotor: signal output node not found"<<endl;
 
-	 return false;
+	return false;
 }
 bool Graph::video_render(const string &output_filename,const string &audio_filename,const float framerate,float& progress) {
 	vector<Node*> loaders=find_nodes("video_loader");
diff --git a/rotord/rendercontext.cpp b/rotord/rendercontext.cpp
index fc410b2..776e842 100644
--- a/rotord/rendercontext.cpp
+++ b/rotord/rendercontext.cpp
@@ -197,29 +197,29 @@ void Render_context::session_command(const std::vector<std::string>& command,xml
 			if (state==IDLE) {
 				//direct call for testing
 					float framerate=25.0f;
-					if (command.size()>2) {
-						framerate=ofToFloat(command[3]);
-					}
+					//if (command.size()>2) {
+					//	framerate=ofToFloat(command[3]);
+					//}
 					string signal_xml;
 					if (graph.signal_render(signal_xml,framerate)){
 						status=HTTPResponse::HTTP_OK;
-						XML.addValue("signal",signal_xml);
+						XML.addValue("signal",signal_xml); //this doesn't work
 					}
 					else {
 						status=HTTPResponse::HTTP_INTERNAL_SERVER_ERROR;
 						XML.addValue("error","could not render output signal");
 					}
-				}
-				else {
-					status=HTTPResponse::HTTP_NOT_FOUND;
-					XML.addValue("error","Signal output not found in graph");
-				}
+					//else {
+					//	status=HTTPResponse::HTTP_NOT_FOUND;
+					//	XML.addValue("error","Signal output not found in graph");
+					//}
 			}
 			else {
 				status=HTTPResponse::HTTP_SERVICE_UNAVAILABLE;
 				XML.addValue("error","Context busy");
 			}
 		}
+	}
 	if (command[2]=="video") {
 		if (command[0]=="PUT") {                                    //get vide file location and initiate analysis
 			if (command.size()>4) { 								//there should be a filename + a destination node
diff --git a/rotord/rotord.h b/rotord/rotord.h
index 2fb7808..da987b0 100755
--- a/rotord/rotord.h
+++ b/rotord/rotord.h
@@ -26,6 +26,7 @@
 #include <sstream>
 #include "Poco/URI.h"
 #include "Poco/Channel.h"
+#include "Poco/Logger.h"
 #include "Poco/SplitterChannel.h"
 #include "Poco/ConsoleChannel.h"
 #include "Poco/FormattingChannel.h"