NT refactoring audio analysis

3 files changed, 27 insertions, 31 deletions

diff --git a/NT/src/graph.cpp b/NT/src/graph.cpp
index ad89061..f108f55 100644
--- a/NT/src/graph.cpp
+++ b/NT/src/graph.cpp
@@ -46,7 +46,7 @@ bool Graph::load_audio(const std::string &filename) {
 		}
 	}
 	for (auto p: processors) {
-		if(!p->init(channels,bits,samples,rate) ){
+		if(!p->init_vamp(channels,bits,samples,rate) ){
 			logger.error("ERROR: Audio plugin failed to initialse");
 			return false;
 		}
diff --git a/NT/src/nodes_audio_analysis.cpp b/NT/src/nodes_audio_analysis.cpp
index 34ad325..2a3793d 100644
--- a/NT/src/nodes_audio_analysis.cpp
+++ b/NT/src/nodes_audio_analysis.cpp
@@ -219,7 +219,7 @@ namespace Rotor{
 			if (intensity<min_intensity) min_intensity=intensity;
 			intensities.push_back(intensity);
 
-			//cerr<<"segment "<<i<<": "<<f->first<<" to "<<g->first<<" average tempo: "<<tempo<<" ,intensity: "<<intensity<<" ,weighted: "<<(tempo*parameters["tempo_weight"]->value)+(intensity*parameters["intensity_weight"]->value)<<endl;
+			//cerr<<"segment "<<i<<": "<<f->first<<" to "<<g->first<<" average tempo: "<<tempo<<" ,intensity: "<<intensity<<" ,weighted: "<<(tempo*tempo_weight->get())+(intensity*intensity_weight->get())<<endl;
 		}
 		//
 		//
@@ -239,8 +239,8 @@ namespace Rotor{
 		for (i=0;i<tempos.size();i++){
 			tempos[i]=(tempos[i]-min_tempo)/(max_tempo-min_tempo);
 			intensities[i]=(intensities[i]-min_intensity)/(max_intensity-min_intensity);
-			totals.push_back(make_pair(i,(tempos[i]*parameters["tempo_weight"]->value)+(intensities[i]*parameters["intensity_weight"]->value)));
-			totalsmap.push_back((tempos[i]*parameters["tempo_weight"]->value)+(intensities[i]*parameters["intensity_weight"]->value));
+			totals.push_back(make_pair(i,(tempos[i]*tempo_weight->get())+(intensities[i]*intensity_weight->get())));
+			totalsmap.push_back((tempos[i]*tempo_weight->get())+(intensities[i]*intensity_weight->get()));
 		}
 
 		/*
@@ -253,7 +253,7 @@ namespace Rotor{
 		for (auto t:totals) bucketoffsets.push_back(0.0);
 		if (parameters["levels"]->value>0.0&&parameters["levels"]->value<totals.size()){
 			//use bucketoffsets to redistribute into smaller number of buckets
-			int numbertoredistribute=totals.size()-((int)parameters["levels"]->value);
+			int numbertoredistribute=totals.size()-(levels->get());
 			double numberperbin=((double)numbertoredistribute/totals.size());
 			double toadd=0.5f;
 			int added=0;
@@ -359,9 +359,9 @@ nned to retrieve total intensity by segment
 		}
 		*/
 
-		if (((int)parameters["levels"]->value)>0) {
-			if (seggrps.size()>(int)parameters["levels"]->value){
-				while (seggrps.size()>(int)parameters["levels"]->value){
+		if ((levels->get())>0) {
+			if (seggrps.size()>levels->get()){
+				while (seggrps.size()>levels->get()){
 					//reduce similarity groups
 					//decide the best 2 to merge
 					vector<double> diffs;
@@ -383,9 +383,9 @@ nned to retrieve total intensity by segment
 				}
 				cerr<<"intensities merged, "<<seggrps.size()<<" levels remain"<<endl;
 			}
-			//cerr<<seggrps.size()<<" groups, "<<(int)parameters["levels"]->value<<" levels requested, "<<(int)totalsmap.size()<<" original segments"<<endl;
-			if  (seggrps.size()<min((int)parameters["levels"]->value,(int)totalsmap.size())){
-				while (seggrps.size()<min((int)parameters["levels"]->value,(int)totalsmap.size())) {
+			//cerr<<seggrps.size()<<" groups, "<<levels->get()<<" levels requested, "<<(int)totalsmap.size()<<" original segments"<<endl;
+			if  (seggrps.size()<min(levels->get(),(int)totalsmap.size())){
+				while (seggrps.size()<min(levels->get(),(int)totalsmap.size())) {
 					//split groups
 					//calculate standard deviation of intensity variation
 					vector<double> devs;
diff --git a/NT/src/rotor.h b/NT/src/rotor.h
index f2e19b5..038334b 100644
--- a/NT/src/rotor.h
+++ b/NT/src/rotor.h
@@ -90,14 +90,21 @@ namespace Rotor {
 		public:
 			Enum(std::initializer_list<std::string> init={},int def=0) : labels(init), value(def){};
 			int get_value(){return value;};
-			operator int () const {
+			operator int () const { //overload C style cast to int
 				return value;
 			}
+			friend istream& operator>> (istream &in, Enum &en);
 		private:
     		std::vector<std::string> labels;
     		int value;
 	};
-	
+
+	istream& operator>> (istream &in, Enum &en)
+	{
+	    in >> en.value;
+	    return in;
+	}
+		
 	class Audio_frame{
 		public:
 			Audio_frame(uint16_t *_samples,int _channels,int _numsamples){
@@ -212,9 +219,7 @@ namespace Rotor {
 			void init(Json::Value s){
 				name=s["name"].asString();
 				if (!s["input"].empty()){
-					for (uint32_t i=0;i<s["input"].size();i++){
-						add("",s["input"][i].asString());
-					}
+					add(s["input"].size());
 				}
 			}
 			bool create_connection(std::unordered_map<std::string,Node*> &nodes){
@@ -229,17 +234,17 @@ namespace Rotor {
 			}
 			Json::Value to_json();
 	    		std::string get_type(){
-	    	    		return TypeName<T>::Get();
+	    	    	return TypeName<T>::Get();
 	    		}
 	    	bool connect(Node* target){
 				//array does not connect this way
 				return false;
 			}
-			void add(std::string _name,std::string _input,bool _connectable=true){
-				values.push_back(Variable_type<T>(_name,_input,_connectable));
+			void add(std::string _name="",std::string _description="",std::string _title="",bool _connectable=true){
+				values.push_back(Variable_type<T>(_name,_description,_title,_connectable));
 			}
-	    	void add(std::string _name="",bool _connectable=true,int num=1){
-				for (int i=0;i<num;i++) values.push_back(Variable_type<T>(_name,"",_connectable));
+	    	void add(int num,std::string _name="",std::string _description="",std::string _title="",bool _connectable=true){
+				for (int i=0;i<num;i++) values.push_back(Variable_type<T>(_name,_description,_title,_connectable));
 			}
 	    	bool connect(uint32_t which,Node* target){
 				if (values.size()>which){
@@ -261,16 +266,7 @@ namespace Rotor {
 			std::vector<Variable_type<T>> values;
 			T value;
 	};
-	//don't forget the dupliicate inlets
-	//it needs to be a property of a var
-	//vars need to be:
-	//std::unordered_map<std::string,std::pair<bool,std::vector<Variable*>>>
-	//??
-	//or could it be that a var has properties
-	//var needs to be a class?
-	//or multi var could be a subclass of var?
-	//with an extra accessor const T& get(int which,const Frame_parameters &frame)
-	//in Node we could have create_multi_inlet() and add_multi_inlet()
+	//could specialise a variable type operator double() etc to allow direct cast
 	class Node { //base type for node pointers
 		public:
 			Node(){type="";type_id="";id="";description="";};