summaryrefslogtreecommitdiff
path: root/rotord/src/rendercontext.cpp
diff options
context:
space:
mode:
authorComment <tim@gray.(none)>2013-12-05 01:36:58 +0000
committerComment <tim@gray.(none)>2013-12-05 01:36:58 +0000
commit674173fb17ca25b1b35d6482de6f603cc3d8209c (patch)
treefb651966aa14b4acc92d1355938575c10e2090f0 /rotord/src/rendercontext.cpp
parent8cfc0a3581cad5da07da69b70c71e67256739166 (diff)
signal output
Diffstat (limited to 'rotord/src/rendercontext.cpp')
-rw-r--r--rotord/src/rendercontext.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/rotord/src/rendercontext.cpp b/rotord/src/rendercontext.cpp
index 2f07c89..e73f0d3 100644
--- a/rotord/src/rendercontext.cpp
+++ b/rotord/src/rendercontext.cpp
@@ -296,13 +296,11 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H
if (command.commands[1]=="signal") {
if (command.method=="GET") { //generate xml from 1st signal output
if (state==IDLE) {
- //direct call for testing
- float framerate=25.0f;
- //if (command.size()>2) {
- // framerate=toFloat(command.id);
- //}
- //string signal_xml;
- if (graph.signal_render(XML,framerate)){
+ if (command.commands.size()>2) {
+ float framerate;
+ framerate=toFloat(command.body);
+ if (framerate==0.0f) framerate=graph.framerate;
+ if (graph.signal_render(XML,command.commands[2],framerate)){
status=HTTPResponse::HTTP_OK;
logger.information("rendering signal to xml");
//XML.addValue("signal",signal_xml); //this doesn't work >> pseudo xml
@@ -316,6 +314,7 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H
// status=HTTPResponse::HTTP_NOT_FOUND;
// XML.addValue("error","Signal output not found in graph");
//}
+ }
}
else {
status=HTTPResponse::HTTP_SERVICE_UNAVAILABLE;