1 files changed, 30 insertions, 49 deletions

diff --git a/NT/src/graph.h b/NT/src/graph.h
index 0a20ffe..c61d385 100644
--- a/NT/src/graph.h
+++ b/NT/src/graph.h
@@ -9,24 +9,27 @@ Graph object manages a collection of nodes and provides the interface for render
 
 #include "rotor.h"
 
-/*
+
 namespace Rotor {
 	class Graph{
 		public:
-			Graph(){duration=20.0;loaded = false;audio_loaded=false;bitRate=0;outW=640;outH=360;audio_thumb=new Audio_thumbnailer();use_fragmentation=false;analysis_seed=0;Log_name="";};
-			Graph(const string& _uid,const string& _desc){
-				Graph();
+			Graph(){init();};
+			Graph(const std::string& _uid,const std::string& _desc){
 				init(_uid,_desc);
 			};
-			void init(const string& _uid,const string& _desc){
+			void init(const std::string& _uid="",const std::string& _desc=""){
 				uid=_uid;
 				description=_desc;
-				duration=20.0;
-				framerate=25.0;
 				loaded=false;
+				audio_loaded=false;
 				cancelled=false;
+				//audio_thumb=new Audio_thumbnailer();
+				Log_name="";
+			};
+			~Graph(){ 
+				clear();
+				//delete audio_thumb;
 			};
-			~Graph(){ clear(); delete audio_thumb;};
 			void clear(){
 				for (auto n: nodes) {
 					delete n.second;
@@ -34,58 +37,36 @@ namespace Rotor {
 				nodes.clear();
 				loaded=false;
 			}
-			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;
-			std::unordered_map<string,Node*> nodes;
-			vector<Node*> find_nodes(const string &type); //could be a way of finding a set based on capabilities?
-			Node* find_node(const string &type);
-			bool signal_render(xmlIO &XML,const string &node,const double framerate);
-			bool video_render(const string &output_filename,const double framerate,int start, int end);
-			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 preview(xmlIO &XML,string &node,string &format,int frame,int w,int h);
-			bool check_audio(string audio,string path);
-			bool print_features(xmlIO &XML,string &node);
-			bool load_audio(const string &filename,vector<Audio_processor*> processors);
-			bool load_video(const string &nodeID,const string &filename);//can be performance or clip
-			bool set_bitrate(int b){
-				if (b>1000){
-					bitRate=b;
-					return true;
-				}
-				else return false;
-			}
-			bool set_fragmentation(bool f){
-				use_fragmentation=f;
-				return true;
-			}
+			std::string uid;
+			std::string description;
+			std::unordered_map<std::string,Node*> nodes;
+			std::vector<Node*> find_nodes(const std::string &type);
+			Node* find_node(const std::string &type);
+			Json::Value signal_render(const std::string &node,const double framerate);
+			bool video_render(const std::string &output_filename,const double framerate,int start, int end);
+			bool load(std::string data ,std::string media_path);
+			bool loadFile(std::string &filename,std::string media_path);
+			bool parseJson(std::string &data,std::string &media_path);
+			Json::Value preview(std::string &node ,std::string &format,int frame,int w,int h);
+			bool check_audio (std::string audio ,std::string path);
+			Json::Value print_features (std::string &node);
+			//bool load_audio(const std::string &filename, std::vector<Audio_processor*> processors);
+			bool load_video(const std::string &node_id,const std::string &filename);
 			bool loaded;
-			double duration;
-			double framerate;
-			const string graphToString();
-			xmlIO xml;
 			bool audio_loaded;
-			string audio_filename;
+			std::string audio_filename;
 			bool cancelled;
 			double progress;
-			int bitRate;
-			void set_log_name(string _Log_name){
+			void set_log_name (std::string _Log_name){
 				Log_name=_Log_name;
 			}
 
-			Audio_thumbnailer *audio_thumb;
+			//Audio_thumbnailer *audio_thumb;
 		private:
-			int outW,outH;
-			bool use_fragmentation;
 			int analysis_seed;
-			string Log_name;
+			std::string Log_name;
 
 	};
 }
-*/
 
 #endif //GRAPH_H