From ea30d63f0f999bde01df1904df1d5ddf22deea65 Mon Sep 17 00:00:00 2001
From: Comment <tim@gray.(none)>
Date: Wed, 16 Oct 2013 20:09:25 -0700
Subject: fix paths regression

---
 rotord/bin/settings_default.xml | 7 -------
 rotord/src/graph.cpp            | 1 +
 rotord/src/rendercontext.h      | 6 +++---
 rotord/src/rotor.h              | 6 +-----
 4 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 rotord/bin/settings_default.xml

diff --git a/rotord/bin/settings_default.xml b/rotord/bin/settings_default.xml
deleted file mode 100644
index 1db0d48..0000000
--- a/rotord/bin/settings_default.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Rotor port="9000" 
-	graph_dir="/mnt/rotor/graphs/" 
-	media_dir="/mnt/rotor/media/" 
-	output_dir="/mnt/rotor/output/" 
-	thumbnail_dir="/mnt/rotor/thumbnails/" 
-/>
-
diff --git a/rotord/src/graph.cpp b/rotord/src/graph.cpp
index 0c47c78..e6443d3 100644
--- a/rotord/src/graph.cpp
+++ b/rotord/src/graph.cpp
@@ -401,6 +401,7 @@ bool Graph::parseJson(string &data,string &media_path){
 
 				}
 				//attributes
+				nodes[nodeID]->create_attribute("media_path","","",media_path);
 				for (int m=0;m<jnodes[i]["attributes"].size();m++){
 					string attribute=jnodes[i]["attributes"][m]["name"].asString();
 					if (nodes[nodeID]->attributes.find(attribute)!=nodes[nodeID]->attributes.end()) {
diff --git a/rotord/src/rendercontext.h b/rotord/src/rendercontext.h
index cb02e31..b0f8649 100644
--- a/rotord/src/rendercontext.h
+++ b/rotord/src/rendercontext.h
@@ -102,9 +102,9 @@ namespace Rotor {
 			std::deque<Session_task> work_queue;
 			std::unordered_map<string,Render_status> renders;
 			std::string output_filename;
-			//std::string graph_dir;
-			//std::string media_dir;
-			//std::string output_dir;
+			std::string graph_dir;
+			std::string media_dir;
+			std::string output_dir;
 			std::string graph_filename;
 			std::string graph_body;
 
diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h
index 82d7f37..cfdf80f 100644
--- a/rotord/src/rotor.h
+++ b/rotord/src/rotor.h
@@ -90,10 +90,6 @@ Requirements
 #include "cvimage.h"
 #include "libavwrapper.h"
 
-static std::string media_dir;
-static std::string graph_dir;
-static std::string output_dir;
-
 //using namespace cv;
 namespace Rotor {
 	//forward declarations
@@ -499,7 +495,7 @@ namespace Rotor {
 			}
 			void init_attribute(const string &attr){
 				if (attr=="filename") {
-					load(media_dir+attributes[attr]->value);
+					load(attributes["media_path"]->value+attributes[attr]->value);
 				}
 			};
 			Image *output(const Frame_spec &frame){
-- 
cgit v1.2.3