diff options
Diffstat (limited to 'rotord')
| -rw-r--r-- | rotord/src/graph.cpp | 4 | ||||
| -rw-r--r-- | rotord/src/graph.h | 3 | ||||
| -rw-r--r-- | rotord/src/rendercontext.cpp | 10 | ||||
| -rw-r--r-- | rotord/src/rendercontext.h | 6 |
4 files changed, 11 insertions, 12 deletions
diff --git a/rotord/src/graph.cpp b/rotord/src/graph.cpp index b70684f..77912e6 100644 --- a/rotord/src/graph.cpp +++ b/rotord/src/graph.cpp @@ -211,9 +211,9 @@ bool Graph::video_render(const string &output_filename,const float framerate,int exporter.encodeFrame(i->RGBdata); } vf+=vstep; - mutex.lock(); + //mutex.lock(); progress=vf/duration; - mutex.unlock(); + //mutex.unlock(); if (usingaudio) {delete a;}; } diff --git a/rotord/src/graph.h b/rotord/src/graph.h index b775c5a..7ab7962 100644 --- a/rotord/src/graph.h +++ b/rotord/src/graph.h @@ -77,8 +77,7 @@ namespace Rotor { float progress; int bitRate; - Poco::Mutex mutex; //lock for access from parent thread - + //Poco::Mutex mutex; //lock for access from parent thread Audio_thumbnailer *audio_thumb; private: diff --git a/rotord/src/rendercontext.cpp b/rotord/src/rendercontext.cpp index 2a9dd62..b04f3c4 100644 --- a/rotord/src/rendercontext.cpp +++ b/rotord/src/rendercontext.cpp @@ -490,11 +490,11 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H if (command.commands[1]=="render") { if (command.method=="GET") { if(state==RENDERING){ - graph.mutex.lock(); - status=HTTPResponse::HTTP_OK; - XML.addValue("status","Rendering video"); - XML.addValue("progress",toString(graph.progress)); - graph.mutex.unlock(); + //graph.mutex.lock(); + status=HTTPResponse::HTTP_OK; + XML.addValue("status","Rendering video"); + XML.addValue("progress",toString(graph.progress)); + //graph.mutex.unlock(); } else { logger.error("ERROR: Render progress requested but not rendering"); diff --git a/rotord/src/rendercontext.h b/rotord/src/rendercontext.h index 0cecf49..b0f8649 100644 --- a/rotord/src/rendercontext.h +++ b/rotord/src/rendercontext.h @@ -82,17 +82,17 @@ namespace Rotor { } //interrupt locking process Render_status get_render_status(const string &uid){ - graph.mutex.lock(); + //graph.mutex.lock(); //cerr<<"render status requested: "<<uid<<" status: "<<renders[uid].status<<endl; if (renders.find(uid)!=renders.end()){ if (renders[uid].status==RENDERING){ renders[uid].progress=graph.progress; } - graph.mutex.unlock(); + //graph.mutex.unlock(); return renders[uid]; } - graph.mutex.unlock(); + //graph.mutex.unlock(); return Render_status(NOT_FOUND); }; |