summaryrefslogtreecommitdiff
path: root/rotord/src/rotor.h
diff options
context:
space:
mode:
authorComment <tim@gray.(none)>2013-08-22 09:51:50 +0100
committerComment <tim@gray.(none)>2013-08-22 09:51:50 +0100
commit3ca766e0a5a9472000d463ce9edbb6c5abcc8565 (patch)
tree94e3cfaf308c1eab25e4eb3275b2dab253f37cf2 /rotord/src/rotor.h
parent2abcafea32611988168f119bd7687dca5278dd9b (diff)
working on json loader
Diffstat (limited to 'rotord/src/rotor.h')
-rwxr-xr-xrotord/src/rotor.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h
index 9427d83..cd4edb0 100755
--- a/rotord/src/rotor.h
+++ b/rotord/src/rotor.h
@@ -16,6 +16,7 @@
#include "Poco/Logger.h"
#include "Poco/Path.h"
#include "Poco/Base64Encoder.h"
+#include "Poco/FileStream.h"
#include "xmlIO.h"
#include "utils.h"
@@ -1050,6 +1051,7 @@ namespace Rotor {
bool load(string data,string media_path);
bool loadFile(string &filename,string media_path);
bool parseXml(string media_path);
+ bool parseJson(string &data,string &media_path);
bool set_resolution(int w,int h);
bool loaded;
float duration;