baffled by audio analysis

1 files changed, 6 insertions, 5 deletions

diff --git a/rotord/rotor.cpp b/rotord/rotor.cpp
index 18988ed..3450607 100755
--- a/rotord/rotor.cpp
+++ b/rotord/rotor.cpp
@@ -65,7 +65,7 @@ bool Signal_output::render(const float duration, const float framerate,string &x
 	return true;
 }
 
-bool Audio_thumbnailer::init(int _channels,int _bits,int _samples,int _rate) {
+bool Audio_thumbnailer::init(int _channels,int _bits,int _samples,int _rate,const map<string,float> &params) {
 	//base_audio_processor::init(_channels,_bits,_samples);
 	channels=_channels;
 	bits=_bits;
@@ -145,13 +145,13 @@ string Audio_thumbnailer::print(){
 	delete enc;
 	return output.str();
 }
-bool Audio_analysis::init(int _channels,int _bits,int _samples, int _rate) {
+bool Audio_analysis::init(int _channels,int _bits,int _samples, int _rate, const map<string,float> &params) {
 	//need these to make sense of data
 	channels=_channels;
 	bits=_bits;
 	samples=_samples;
 
-	return analyser.init(soname,id,_channels,_bits,_samples,_rate);
+	return analyser.init(soname,id,_channels,_bits,_samples,_rate,outputNo,params);
 
 	//attempt to load vamp plugin and prepare to receive frames of data
 	//should the audio analysis contain a vamphost or should it inherit?
@@ -164,12 +164,13 @@ int Audio_analysis::process_frame(uint8_t *data,int samples_in_frame) {
 }
 void Audio_analysis::cleanup() {
 	analyser.cleanup();
-	//print_features();
+	print_features();
 }
 void Audio_analysis::print_features(){
 	for (auto i: analyser.features) {
-		cerr<<i.second<<" "<<i.first<<endl;
+		cerr<<" ["<<i.second<<":"<<i.first<<"]";
 	}
+	cerr<<endl;
 }
 
 bool Video_output::render(const float duration, const float framerate,const string &output_filename,const string &audio_filename,float& progress){