diff options
| author | Comment <tim@gray.(none)> | 2013-11-26 00:57:58 +0000 |
|---|---|---|
| committer | Comment <tim@gray.(none)> | 2013-11-26 00:57:58 +0000 |
| commit | 9e5244e5c3e190cc0b03c24b1f63b49e8d52653e (patch) | |
| tree | f76f4bc8b4fd2adbbf884d5d7a485c29e9e9e5e3 /rotord/src/rotor.h | |
| parent | 81d0a2a1447724d81022b29c2c6c348dad032d83 (diff) | |
| parent | 5d8f8a40b50aa9e7237d972fe6fbf30279acf518 (diff) | |
Merge branch 'master' of eclectronics.org@eclectronics.org:rotor
Diffstat (limited to 'rotord/src/rotor.h')
| -rw-r--r-- | rotord/src/rotor.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h index bebb0e2..75e7914 100644 --- a/rotord/src/rotor.h +++ b/rotord/src/rotor.h @@ -295,7 +295,7 @@ namespace Rotor { }; class Node{ public: - Node(){duplicate_inputs=false;}; + Node(){duplicate_inputs=false;UItype="";}; virtual Node* clone(map<string,string> &_settings)=0; //pure virtual virtual ~Node(){ for (auto a: attributes) delete a.second; @@ -335,6 +335,7 @@ namespace Rotor { string ID; string NODEID; string title; + string UItype; bool duplicate_inputs; string find_setting(map<string,string> &settings,string key,string def=""){ if (settings.find(key)!=settings.end()) return settings[key]; else return def;}; float find_setting(map<string,string> &settings,string key,float def){ if (settings.find(key)!=settings.end()) return toFloat(settings[key]); else return def;}; @@ -628,11 +629,11 @@ namespace Rotor { return nullptr; } //cut mode - for (uint32_t i=0;i<image_inputs.size();i++){ - int whichinput=((int)inputs[0]->get((Time_spec)frame)+i)%image_inputs.size(); + //for (uint32_t i=0;i<image_inputs.size();i++){ //this skipped a beat for some reason + int whichinput=(((int)inputs[0]->get((Time_spec)frame)))%image_inputs.size(); //+i Image *in=image_inputs[whichinput]->get(inframe); if (in) return in; - } + //} return nullptr; } Video_cycler* clone(map<string,string> &_settings) { return new Video_cycler(_settings);}; |