diff options
Diffstat (limited to 'rotord/src/rotor.h')
| -rwxr-xr-x | rotord/src/rotor.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h index c42460c..f704a1d 100755 --- a/rotord/src/rotor.h +++ b/rotord/src/rotor.h @@ -1258,6 +1258,10 @@ namespace Rotor { Video_loader(map<string,string> &settings) { base_settings(settings); isLoaded=false; + string filename=find_setting(settings,"filename",""); + if (filename!="") { + load(find_setting(settings,"media_path","")+filename); + } }; ~Video_loader(){}; bool load(const string &filename); @@ -1341,8 +1345,14 @@ namespace Rotor { class Graph{ public: Graph(){duration=20.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=20.0f;}; + Graph(const string& _uid,const string& _desc){ + init(_uid,_desc); + }; + void init(const string& _uid,const string& _desc){ + uid=_uid; + description=_desc; + duration=20.0f; + }; string uid; //every version of a graph has a UUID, no particular need to actually read its data(?) //?? is it faster than using strings?? string description; @@ -1352,9 +1362,9 @@ namespace Rotor { bool signal_render(string &signal_xml,const float framerate); bool video_render(const string &output_filename,const string &audio_filename,const float framerate,float& progress); int load(Poco::UUID uid); - bool load(string data); - bool loadFile(string &filename); - bool parseXml(); + bool load(string data,string media_path); + bool loadFile(string &filename,string media_path); + bool parseXml(string media_path); bool set_resolution(int w,int h); UUID save(); //save to DB, returns UUID of saved graph bool loaded; |