diff options
| author | Tim Redfern <tim@eclectronics.org> | 2013-09-03 17:04:32 +0100 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2013-09-03 17:04:32 +0100 |
| commit | f316c9f73a63df12def9a640038bd526c470f5fd (patch) | |
| tree | 2f91117b623fc7d3dd0db3be3ce25462242559f6 /rotord/src/rendercontext.cpp | |
| parent | 2469ddabe2b6e7746984339db84dbe0e7b069255 (diff) | |
stop blocking on audio analysis
Diffstat (limited to 'rotord/src/rendercontext.cpp')
| -rw-r--r-- | rotord/src/rendercontext.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/rotord/src/rendercontext.cpp b/rotord/src/rendercontext.cpp index 679cea1..63e6f4c 100644 --- a/rotord/src/rendercontext.cpp +++ b/rotord/src/rendercontext.cpp @@ -102,7 +102,7 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H //pass to worker thread ??if engine is ready?? ??what if engine has finished but results aren't read?? add_queue(Session_task(command.uid,ANALYSE_AUDIO)); status=HTTPResponse::HTTP_OK; - logger.information("Starting audio analysis: "+command.body); + logger.information("Audio analysis: "+command.body); XML.addValue("status","Starting audio analysis: "+command.body); } else { @@ -260,7 +260,7 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H if (command.commands[1]=="video") { if (command.method=="PUT") { //get vide file location and initiate analysis if (command.body!="") { //there should be a filename + a destination node - if (state==IDLE) { + //if (state==IDLE) { string video_filename=media_dir+command.body; //check file exists Poco::File f=Poco::File(video_filename); @@ -283,12 +283,12 @@ void Render_context::session_command(const Session_command& command,xmlIO& XML,H logger.error("ERROR: "+command.body+" not found"); XML.addValue("error",command.body+" not found"); } - } - else { - status=HTTPResponse::HTTP_BAD_REQUEST; - logger.error("ERROR: Session busy"); - XML.addValue("error","Session busy"); - } + //} + //else { + // status=HTTPResponse::HTTP_BAD_REQUEST; + // logger.error("ERROR: Session busy"); + // XML.addValue("error","Session busy"); + //} } else { status=HTTPResponse::HTTP_BAD_REQUEST; |