From 5eb823abb8ba91dbab098d7195094d0f76e4f332 Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Thu, 21 Nov 2013 12:36:36 +0000
Subject: UI text node outline

---
 rotord/src/rotor.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h
index 0833096..3874df6 100644
--- a/rotord/src/rotor.h
+++ b/rotord/src/rotor.h
@@ -280,7 +280,7 @@ namespace Rotor {
 	};
 	class Node{
 		public:
-			Node(){duplicate_inputs=false;};
+			Node(){duplicate_inputs=false;UItype="";};
 			virtual Node* clone(map<string,string> &_settings)=0; //pure virtual
 			virtual ~Node(){
 				for (auto a: attributes) delete a.second;
@@ -320,6 +320,7 @@ namespace Rotor {
 			string ID;
 			string NODEID;
 			string title;
+			string UItype;
 			bool duplicate_inputs;
 			string find_setting(map<string,string> &settings,string key,string def=""){ if (settings.find(key)!=settings.end()) return settings[key]; else return def;};
 			float find_setting(map<string,string> &settings,string key,float def){ if (settings.find(key)!=settings.end()) return toFloat(settings[key]); else return def;};
-- 
cgit v1.2.3


From f884e52ba3e454cbe0f1ac5bfd288083b47a237c Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Thu, 21 Nov 2013 13:40:05 +0000
Subject: fix mix mode cycler skip

---
 rotord/src/rotor.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h
index 3874df6..624e0f0 100644
--- a/rotord/src/rotor.h
+++ b/rotord/src/rotor.h
@@ -584,11 +584,11 @@ namespace Rotor {
 					return nullptr;
 				}
 				//cut mode
-				for (uint32_t i=0;i<image_inputs.size();i++){
-					int whichinput=((int)inputs[0]->get((Time_spec)frame)+i)%image_inputs.size();
+				//for (uint32_t i=0;i<image_inputs.size();i++){
+					int whichinput=(((int)inputs[0]->get((Time_spec)frame)))%image_inputs.size(); //+i
 					Image *in=image_inputs[whichinput]->get(inframe);
 					if (in) return in;
-				}
+				//}
 				return nullptr;
 			}
 			Video_cycler* clone(map<string,string> &_settings) { return new Video_cycler(_settings);};
-- 
cgit v1.2.3


From 6a9e9a8f44ca5b9996acd239ddb16ee4f00f00d5 Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Thu, 21 Nov 2013 16:10:21 +0000
Subject: intensity segmenter level redistribution

---
 rotord/src/nodes_audio_analysis.cpp | 22 +++++++++++++++++++++-
 rotord/src/nodes_audio_analysis.h   |  1 +
 rotord/src/rotor.h                  |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

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

diff --git a/rotord/src/nodes_audio_analysis.cpp b/rotord/src/nodes_audio_analysis.cpp
index 6ec1188..ad6f5ad 100644
--- a/rotord/src/nodes_audio_analysis.cpp
+++ b/rotord/src/nodes_audio_analysis.cpp
@@ -178,9 +178,29 @@ namespace Rotor{
 		}
 		//sort and convert to features
 		std::sort(totals.begin(),totals.end(),sortsegments);
+		vector<float> bucketoffsets;
+		for (auto t:totals) bucketoffsets.push_back(0.0f);
+		if (parameters["levels"]->value>0.0f&&parameters["levels"]->value<totals.size()){
+			//use bucketoffsets to redistribute into smaller number of buckets
+			int numbertoredistribute=totals.size()-((int)parameters["levels"]->value);
+			int numberperbin=ceil((float)numbertoredistribute/totals.size());
+			int added=0;
+			for (int j=0;j<numbertoredistribute-numberperbin;j+=numberperbin){
+				int numbertoadd=min(numbertoredistribute-added,numberperbin);
+				bucketoffsets[j]=numbertoadd;
+				added+=numbertoadd;
+			}
+			if (numbertoredistribute>0) {
+				cerr<<"reducing number of levels by "<<numbertoredistribute<<", offsets:"<<endl;
+				for (auto o:bucketoffsets) {
+					cerr<<o<<":";
+				}
+				cerr<<endl;
+			}
+		}
 		for (i=0;i<totals.size();i++){
 			vampHost::feature f;
-			f.values.push_back((float)i);
+			f.values.push_back((float)i+bucketoffsets[i]);
 			features[times[totals[i].first]]=f;
 		}			
 	}
diff --git a/rotord/src/nodes_audio_analysis.h b/rotord/src/nodes_audio_analysis.h
index 5b0a9c8..21da1cc 100644
--- a/rotord/src/nodes_audio_analysis.h
+++ b/rotord/src/nodes_audio_analysis.h
@@ -288,6 +288,7 @@ namespace Rotor {
 				analysers["intensity"]=vampHost::Analyser();
 				create_parameter("intensity_weight","number","intensity weight","Intensity weighting",1.0f);
 				create_parameter("tempo_weight","number","tempo weight","Tempo weighting",1.0f);
+				create_parameter("levels","number","levels","Number of intensity levels",0.0f);
 			};
 			Intensity_segmenter(map<string,string> &settings):Intensity_segmenter() {
 				base_settings(settings);
diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h
index 624e0f0..e882c05 100644
--- a/rotord/src/rotor.h
+++ b/rotord/src/rotor.h
@@ -584,7 +584,7 @@ namespace Rotor {
 					return nullptr;
 				}
 				//cut mode
-				//for (uint32_t i=0;i<image_inputs.size();i++){
+				//for (uint32_t i=0;i<image_inputs.size();i++){ //this skipped a beat for some reason
 					int whichinput=(((int)inputs[0]->get((Time_spec)frame)))%image_inputs.size(); //+i
 					Image *in=image_inputs[whichinput]->get(inframe);
 					if (in) return in;
-- 
cgit v1.2.3