summaryrefslogtreecommitdiff
path: root/rotord/src/rendercontext.cpp
diff options
context:
space:
mode:
authorTim Redfern <tim@eclectronics.org>2013-09-07 15:05:08 +0100
committerTim Redfern <tim@eclectronics.org>2013-09-07 15:05:08 +0100
commitc82fb2010c8ce4741f30f91816fca76d6de98dbf (patch)
tree867ff492cb4cdbe084175eae7c1b9d27f7a04751 /rotord/src/rendercontext.cpp
parent6f0f7600e22590b28fc6b0d11a28fa7a42931e20 (diff)
refactored progress indicator
Diffstat (limited to 'rotord/src/rendercontext.cpp')
-rw-r--r--rotord/src/rendercontext.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/rotord/src/rendercontext.cpp b/rotord/src/rendercontext.cpp
index 1cc440a..b40b385 100644
--- a/rotord/src/rendercontext.cpp
+++ b/rotord/src/rendercontext.cpp
@@ -36,7 +36,7 @@ void Render_context::runTask() {
if(cmd.task==RENDER) {
state=RENDERING;
renders[cmd.uid]=Render_status(RENDERING);
- if(graph.video_render(output_filename,output_framerate,progress)){
+ if(graph.video_render(output_filename,output_framerate)){
state=IDLE;
if (graph.cancelled) renders[cmd.uid].status=CANCELLED;
else renders[cmd.uid].status=RENDER_READY;
@@ -126,7 +126,7 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H
status=HTTPResponse::HTTP_OK;
XML.addValue("status","Analysing audio");
char c[20];
- sprintf(c,"%02f",progress);
+ sprintf(c,"%02f",graph.progress);
XML.addValue("progress",string(c));
}
else if (graph.audio_loaded) {
@@ -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(progress));
+ XML.addValue("progress",ofToString(graph.progress));
}
else {
logger.error("ERROR: Render progress requested but not rendering");