summaryrefslogtreecommitdiff
path: root/rotord/rotor.h
diff options
context:
space:
mode:
authorTim Redfern <tim@herge.(none)>2013-07-01 16:04:34 +0100
committerTim Redfern <tim@herge.(none)>2013-07-01 16:04:34 +0100
commit0d867b8b615add6e1a5aaa300c5a39b87614d906 (patch)
tree27134dc08b34782a4d62da8671cfa181eecdeca9 /rotord/rotor.h
parent3710ee5ea32841d3f62e52834aa2a55f026c6620 (diff)
generating output xml
Diffstat (limited to 'rotord/rotor.h')
-rwxr-xr-xrotord/rotor.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/rotord/rotor.h b/rotord/rotor.h
index 8720983..e2a26d9 100755
--- a/rotord/rotor.h
+++ b/rotord/rotor.h
@@ -31,6 +31,7 @@ TODO - put the boilerplate code for checking inputs into the base class, finally
#include "Poco/File.h"
#include "Poco/Base64Encoder.h"
#include "Poco/Path.h"
+#include "Poco/StringTokenizer.h"
#include <iostream>
@@ -815,7 +816,7 @@ namespace Rotor {
else return nullptr;
};
Video_output* clone(map<string,string> &_settings) { return new Video_output(_settings);};
- bool render(const float duration, const float framerate,const string &output_filename,const string &audio_filename,float& progress);
+ bool render(const float duration, const float framerate,const string &output_filename,const string &audio_filename,float& progress,int w,int h);
private:
@@ -1339,7 +1340,7 @@ namespace Rotor {
};
class Graph{
public:
- Graph(){duration=10.0f;loaded = false;};
+ Graph(){duration=10.0f;loaded = false;outW=640;outH=360;};
Graph(const string& _uid,const string& _desc){init(_uid,_desc);};
void init(const string& _uid,const string& _desc){ uid=_uid;description=_desc;duration=10.0f;};
string uid; //every version of a graph has a UUID, no particular need to actually read its data(?)
@@ -1352,6 +1353,7 @@ namespace Rotor {
bool video_render(const string &output_filename,const string &audio_filename,const float framerate,float& progress);
int load(Poco::UUID uid);
bool load(string &graph_filename);
+ bool set_resolution(int w,int h);
UUID save(); //save to DB, returns UUID of saved graph
bool loaded;
float duration;
@@ -1359,6 +1361,7 @@ namespace Rotor {
private:
Node_factory factory;
xmlIO xml;
+ int outW,outH;
};
class Audio_thumbnailer: public Base_audio_processor {
public:
@@ -1405,6 +1408,7 @@ namespace Rotor {
void runTask();
void add_queue(int item);
Command_response session_command(const std::vector<std::string>& command);
+ void session_command(const std::vector<std::string>& command,xmlIO& XML,HTTPResponse::HTTPStatus& status);
Render_status get_status();
void cancel(); //interrupt locking process
int make_preview(int nodeID, float time); //starts a frame preview - returns status code - how to retrieve?