summaryrefslogtreecommitdiff
path: root/rotord/src/rendercontext.cpp
diff options
context:
space:
mode:
authorTim Redfern <tim@herge.(none)>2013-08-15 17:48:41 +0100
committerTim Redfern <tim@herge.(none)>2013-08-15 17:48:41 +0100
commitae77e77ac1524121580281126a4ae85b70b5abae (patch)
tree8155476ceaf65a0f1b9d4fda9714f32fb23993c3 /rotord/src/rendercontext.cpp
parent15d7e3dadff62b20173fb2b5b354e72d3c916c9a (diff)
new class structure to support listnodes
Diffstat (limited to 'rotord/src/rendercontext.cpp')
-rw-r--r--rotord/src/rendercontext.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/rotord/src/rendercontext.cpp b/rotord/src/rendercontext.cpp
index 6ef0420..e582dce 100644
--- a/rotord/src/rendercontext.cpp
+++ b/rotord/src/rendercontext.cpp
@@ -1,7 +1,9 @@
-#include "rotor.h"
-
+#include "rendercontext.h"
using namespace Rotor;
+using Poco::Net::HTTPResponse;
+using Poco::Logger;
+
void Render_context::runTask() {
while (!isCancelled()) {
int cmd=0;
@@ -13,11 +15,11 @@ void Render_context::runTask() {
mutex.unlock();
if(cmd==ANALYSE_AUDIO) {
state=ANALYSING_AUDIO;
- vector<Base_audio_processor*> processors;
+ vector<Audio_processor*> processors;
processors.push_back(audio_thumb);
vector<Node*> analysers=graph.find_nodes("audio_analysis");
for (auto a: analysers) {
- processors.push_back(dynamic_cast<Base_audio_processor*>(a));
+ processors.push_back(dynamic_cast<Audio_processor*>(a));
}
if (load_audio(audio_filename,processors)) {
audio_loaded=true;
@@ -218,7 +220,7 @@ void Render_context::session_command(const std::vector<std::string>& command,xml
// framerate=ofToFloat(command[3]);
//}
string signal_xml;
- if (graph.signal_render(signal_xml,framerate)){
+ if (false) { //graph.signal_render(signal_xml,framerate)){
status=HTTPResponse::HTTP_OK;
logger.information("rendering signal to xml");
XML.addValue("signal",signal_xml); //this doesn't work >> pseudo xml
@@ -288,7 +290,6 @@ void Render_context::session_command(const std::vector<std::string>& command,xml
XML.addValue("progress",ofToString(progress));
}
else {
- status=HTTPResponse::HTTP_BAD_REQUEST;
logger.error("ERROR: Render progress requested but not rendering");
XML.addValue("error","Not rendering");
}
@@ -325,7 +326,7 @@ void Render_context::session_command(const std::vector<std::string>& command,xml
}
}
-bool Render_context::load_audio(const string &filename,vector<Base_audio_processor*> processors){
+bool Render_context::load_audio(const string &filename,vector<Audio_processor*> processors){
Logger& logger = Logger::get("Rotor");
logger.information("Starting audio analysis");