variable type getter/setter

1 files changed, 4 insertions, 13 deletions

diff --git a/NT/src/nodes.h b/NT/src/nodes.h
index f6a8a0d..eaf857b 100644
--- a/NT/src/nodes.h
+++ b/NT/src/nodes.h
@@ -3,21 +3,12 @@
 
 #include "rotor.h"
 #include "nodes_audio_analysis.h"
+#include "nodes_source.h"
 
 using namespace std;
 
 namespace Rotor{
-	typedef Node_type<double> Number_node;
-	typedef Node_type<string> String_node;
-	typedef Node_type<Image> Image_node;
 	
-	typedef Variable_type<double> Number_inlet;
-	typedef Variable_type<string> String_inlet;
-	typedef Variable_type<Image> Image_inlet;
-
-	typedef Variable_array_type<double> Number_array;
-	typedef Variable_array_type<string> String_array;
-	typedef Variable_array_type<Image> Image_array;
 
 
 	//colour node could be an alias of vec3f node and they could be interchangeable?
@@ -46,7 +37,7 @@ namespace Rotor{
 			Time* clone(Json::Value &_settings) { return new Time(_settings);};
 		private:
 	};
-	class Multiply: public Double_node {
+	class Multiply: public Number_node {
 		public:
 			Multiply(){
 				factors=create_array<double>("factors","Factors to multiply","Factors");
@@ -73,7 +64,7 @@ namespace Rotor{
 			}
 			Multiply* clone(Json::Value &_settings) { return new Multiply(_settings);};
 		private:
-			Double_array *factors;
+			Number_array *factors;
 	};
 	class Print: public String_node {
 		public:
@@ -96,7 +87,7 @@ namespace Rotor{
 			}
 			Print* clone(Json::Value &_settings) { return new Print(_settings);};
 		private:
-			Double_inlet *inlet;
+			Number_inlet *inlet;
 	};
 }