diff options
| author | Tim Redfern <tim@herge.(none)> | 2013-07-03 18:01:07 +0100 |
|---|---|---|
| committer | Tim Redfern <tim@herge.(none)> | 2013-07-03 18:01:07 +0100 |
| commit | 729e602bbf825f909193fd130d68ee9eeafb0eae (patch) | |
| tree | 1d31975b34da034d65c867c2751decb262b6b0d2 | |
| parent | f85ec9a68e6fab7265c3c2b78ab0fabf8310dacd (diff) | |
fix scho trails bug
| -rw-r--r-- | rotord/rendercontext.cpp | 2 | ||||
| -rwxr-xr-x | rotord/rotor.h | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/rotord/rendercontext.cpp b/rotord/rendercontext.cpp index e31a161..935ec08 100644 --- a/rotord/rendercontext.cpp +++ b/rotord/rendercontext.cpp @@ -211,7 +211,7 @@ void Render_context::session_command(const std::vector<std::string>& command,xml //pass to worker thread ??if engine is ready?? ??what if engine has finished but results aren't read?? //DUMMY RESPONSE status=HTTPResponse::HTTP_OK; - XML.addValue("status","succesfully loaded "+command[4]+" into video node "+command[3]); + XML.addValue("status","Succesfully loaded "+command[4]+" into video node "+command[3]); } else { status=HTTPResponse::HTTP_INTERNAL_SERVER_ERROR; diff --git a/rotord/rotor.h b/rotord/rotor.h index b24ae51..9d4f625 100755 --- a/rotord/rotor.h +++ b/rotord/rotor.h @@ -162,7 +162,7 @@ namespace Rotor { } uint8_t r,g,b; }; - + class Render_status{ public: int id; @@ -919,13 +919,15 @@ namespace Rotor { }; Image *output(const Frame_spec &frame){ //check if cache is valid - if (frame.w!=image->w||frame.h!=image->h){ //or framerate changed? + if (images.size()){ + if (frame.w!=image->w||frame.h!=image->h){ //or framerate changed? //clear cache and start over images.clear(); lastframe=-1; //calculate frame interval //interval=(int)(((duration/number)*frame.framerate)+0.5); //total=interval*number; + } } int thisframe=frame.frame(); //iterate cache and throw out any obsolete frames @@ -1130,9 +1132,9 @@ namespace Rotor { public: Monochrome(){}; Monochrome(map<string,string> &settings) { - base_settings(settings); + base_settings(settings); }; - ~Monochrome(){ + ~Monochrome(){ }; Monochrome* clone(map<string,string> &_settings) { return new Monochrome(_settings);}; Image *output(const Frame_spec &frame){ |
