summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorComment <tim@gray.(none)>2014-02-18 11:40:26 +0000
committerComment <tim@gray.(none)>2014-02-18 11:40:26 +0000
commit5c11c21656b0c0ee6f1bb6eec1dfa3ff6f602d87 (patch)
tree37615095823b5ce4ae7632c326addaff7b3700f0
parent51607ddc4537f8c5736765553cb3403951009f36 (diff)
ffms2 hack for short files
m---------ffms20
-rw-r--r--rotord/src/rotor.h5
2 files changed, 3 insertions, 2 deletions
diff --git a/ffms2 b/ffms2
new file mode 160000
+Subproject ec0ef9c1d1dd6521dce5f3c02ce291cdf89aa98
diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h
index 08d8734..009348a 100644
--- a/rotord/src/rotor.h
+++ b/rotord/src/rotor.h
@@ -787,9 +787,11 @@ namespace Rotor {
create_attribute("time_mode","time mode","Time mode","play",{"play","stretch"});
create_attribute("media_id","media_id","media_id","media_id"); //for rotorW
NODEID="e92255a0-447a-11e3-b0ce-3fc7ff4bdac9";
+ };
+ void init(){
isLoaded=false;
isLoadable=true;
- };
+ }
bool load(const string &filename,const int h=0){
Poco::Logger& logger = Poco::Logger::get(Log_name);
std::string file_use;
@@ -938,7 +940,6 @@ namespace Rotor {
// }
//};
Video_loader* clone(map<string,string> &_settings) { return new Video_loader(_settings);};
- bool isLoaded;
private:
string *filename;
};