From ee687726561e2520459c4cb4876700db2de5096f Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Thu, 12 Dec 2013 13:01:58 +0000
Subject: fix for audio viz fill

---
 rotord/src/nodes_audio_analysis.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'rotord/src/nodes_audio_analysis.cpp')

diff --git a/rotord/src/nodes_audio_analysis.cpp b/rotord/src/nodes_audio_analysis.cpp
index 96244d0..eff7a37 100644
--- a/rotord/src/nodes_audio_analysis.cpp
+++ b/rotord/src/nodes_audio_analysis.cpp
@@ -330,6 +330,7 @@ nned to retrieve total intensity by segment
 					for (int j=1;j<diffs.size();j++) if (diffs[j]<diffs[smallest]) smallest=j;
 					for (int j=0;j<seggrps[smallest].second.size();j++) {
 						seggrps[smallest+1].second.push_back(seggrps[smallest].second[j]);
+						cerr<<"copied segment "<<(seggrps[smallest].second[j].second)<<" from group "<<smallest<<" to group "<<(smallest+1)<<endl;
 					}
 					//recalculate intensity average
 					double avg=0.0f;
@@ -338,9 +339,11 @@ nned to retrieve total intensity by segment
 					seggrps[smallest+1].first=avg;
 
 					seggrps.erase(seggrps.begin()+smallest);
+					cerr<<"removed group "<<smallest<<endl;
 				}
 				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())) {
 					//split groups
@@ -386,12 +389,12 @@ nned to retrieve total intensity by segment
 					//add the new group
 					seggrps.push_back(newgroup);
 				}
-				
+				cerr<<"similaritity groups split, "<<seggrps.size()<<" levels total"<<endl;
+				//seggrps are now out of order
+				std::sort(seggrps.begin(),seggrps.end(),sortseggrps);
 
 			}
-			cerr<<"similaritity groups split, "<<seggrps.size()<<" levels total"<<endl;
-			//seggrps are now out of order
-			std::sort(seggrps.begin(),seggrps.end(),sortseggrps);
+			
 		}
 
 		map<int,int> outputvalues;
-- 
cgit v1.2.3