summaryrefslogtreecommitdiff
path: root/rotord/src/rendercontext.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rotord/src/rendercontext.cpp')
-rw-r--r--rotord/src/rendercontext.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/rotord/src/rendercontext.cpp b/rotord/src/rendercontext.cpp
index d88bd68..8b4053f 100644
--- a/rotord/src/rendercontext.cpp
+++ b/rotord/src/rendercontext.cpp
@@ -76,8 +76,8 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H
if (state!=RENDERING) {
Poco::StringTokenizer t1(command.body,",");
if (t1.count()>1){
- int w=ofToInt(t1[0]);
- int h=ofToInt(t1[1]);
+ int w=toInt(t1[0]);
+ int h=toInt(t1[1]);
if (graph.set_resolution(w,h)){
logger.information("resolution set to "+t1[0]+"x"+t1[1]);
XML.addValue("status","resolution set to "+t1[0]+"x"+t1[1]);
@@ -163,7 +163,7 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H
status=HTTPResponse::HTTP_OK;
//XML.addValue("patchbay",graph.toString());
logger.information("Requested graph");
- XML.loadFromBuffer(graph.toString());
+ XML.loadFromBuffer(graph.graphToString());
}
else {
logger.error("ERROR: graph not loaded: check XML");
@@ -239,7 +239,7 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H
//direct call for testing
float framerate=25.0f;
//if (command.size()>2) {
- // framerate=ofToFloat(command.id);
+ // framerate=toFloat(command.id);
//}
string signal_xml;
if (false) { //graph.signal_render(signal_xml,framerate)){
@@ -327,7 +327,7 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H
else {
status=HTTPResponse::HTTP_BAD_REQUEST;
logger.error("ERROR: Could not create preview");
- XML.addValue("error","Could not preview node '"+preview_node+"', frame "+ofToString(frame)+" at "+ofToString(width)+"x"+ofToString(height));
+ XML.addValue("error","Could not preview node '"+preview_node+"', frame "+toString(frame)+" at "+toString(width)+"x"+toString(height));
}
}
else {
@@ -380,7 +380,7 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H
if(state==RENDERING){
status=HTTPResponse::HTTP_OK;
XML.addValue("status","Rendering video");
- XML.addValue("progress",ofToString(graph.progress));
+ XML.addValue("progress",toString(graph.progress));
}
else {
logger.error("ERROR: Render progress requested but not rendering");
@@ -392,7 +392,7 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H
if (state==IDLE) {
output_filename=output_dir+command.body;
if (command.body!="") {
-// output_framerate=ofToFloat(command.body);
+// output_framerate=toFloat(command.body);
}
add_queue(Session_task(command.uid,RENDER));
status=HTTPResponse::HTTP_OK;