From a879f37ff944cd7bf502f4e3520b7da3d8faf39b Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Wed, 22 Jan 2014 14:28:34 +0000
Subject: variable arrays working correctly

---
 NT/src/rotor.h | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'NT/src/rotor.h')

diff --git a/NT/src/rotor.h b/NT/src/rotor.h
index 96a89ef..68473af 100644
--- a/NT/src/rotor.h
+++ b/NT/src/rotor.h
@@ -126,9 +126,10 @@ namespace Rotor {
 				for (auto node:nodes){
 					if (node.first==input){
 						if (connect(node.second)) {
-							std::cerr<<"connecting '"<<TypeName<T>::Get()<<"' input to '"<<input<<"'"<<std::endl;
+							if (connection) std::cerr<<"connected '"<<TypeName<T>::Get()<<"' input to '"<<(dynamic_cast<Node_type<T>*>(connection))->get_type()<<"' "<<input<<std::endl;
+							//else std::cerr<<"connection disappeared"<<std::endl;
 						}
-						else std::cerr<<"could not connect '"<<TypeName<T>::Get()<<"'' input to '"<<input<<"'"<<std::endl;
+						//else std::cerr<<"could not connect '"<<TypeName<T>::Get()<<"'' input to '"<<input<<"'"<<std::endl;
 					}
 				}
 			}
@@ -147,9 +148,13 @@ namespace Rotor {
 				return false;
 			}
 			const T& get(const Frame_parameters &frame){
+				//if (connection) std::cerr<<"still connected to '"<<(dynamic_cast<Node_type<T>*>(connection))->get_type()<<"'"<<std::endl;
+				//else std::cerr<<"connection disappeared"<<std::endl;
 				if (connection){
+					//std::cerr<<"retreiving value from '"<<(dynamic_cast<Node_type<T>*>(connection))->get_type()<<"' node ("<<get_type()<<"):"<<(dynamic_cast<Node_type<T>*>(connection))->get_output(frame)<<std::endl;
 					return (dynamic_cast<Node_type<T>*>(connection))->get_output(frame);
 				}
+				//else std::cerr<<"variable: returning default"<<std::endl;
 				return value;
 			}
 		protected:
@@ -173,9 +178,10 @@ namespace Rotor {
 				}
 			}
 			void create_connection(std::unordered_map<std::string,Node*> &nodes){
-				for (auto v:values){
-					v.create_connection(nodes);
-				}
+				//for (auto v:values){ //weirdly does not work even though it seems to! maybe it returns a copy of of the object?
+				//	v.create_connection(nodes); 
+				//}
+				for (uint32_t i=0;i<values.size();i++) values[i].create_connection(nodes);
 			}
 			Json::Value to_json();
 	    		std::string get_type(){
@@ -199,11 +205,14 @@ namespace Rotor {
 			}
 			const T& get(uint32_t which,const Frame_parameters &frame){
 				if (values.size()>which){
+					//std::cerr<<"array: requested value "<<which<<":"<<values[which].get(frame)<<std::endl;
 					return values[which].get(frame);
 				}
+				//else std::cerr<<"array: returning default"<<std::endl;
 				return value;
 			}
 			const std::vector<Variable_type<T>>& get_values(){return values;};
+			uint32_t get_number(){return values.size();};
 		protected:
 			std::vector<Variable_type<T>> values;
 			T value;
-- 
cgit v1.2.3