diff options
| author | Tim Redfern <tim@eclectronics.org> | 2013-09-07 14:25:41 +0100 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2013-09-07 14:25:41 +0100 |
| commit | fea5bf3ffeac6f7a4c5cccb69c5ce51e4a42dbaf (patch) | |
| tree | 7b358210b01279ed04e083fd5410d9f508590f88 /rotord/src/rotor.h | |
| parent | 37ca0efe3a3e50c2e7debff5f3f1779377e22ab3 (diff) | |
render cancelling
Diffstat (limited to 'rotord/src/rotor.h')
| -rwxr-xr-x | rotord/src/rotor.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h index 6c030ec..dea3fa0 100755 --- a/rotord/src/rotor.h +++ b/rotord/src/rotor.h @@ -893,7 +893,7 @@ namespace Rotor { Video_output(){ create_image_input("image to output","Image input"); title="Video output"; - description="Outputs to video from here"; + description="Output to video"; }; Video_output(map<string,string> &settings):Video_output() { base_settings(settings); @@ -910,8 +910,7 @@ namespace Rotor { 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,int w,int h); - + private: }; @@ -1124,6 +1123,7 @@ namespace Rotor { description=_desc; duration=20.0f; framerate=25.0f; + cancelled=false; }; string uid; //every version of a graph has a UUID, no particular need to actually read its data(?) //?? is it faster than using strings?? @@ -1148,6 +1148,7 @@ namespace Rotor { xmlIO xml; bool audio_loaded; string audio_filename; + bool cancelled; private: Node_factory factory; int outW,outH; |
