From 55513473ca37841b40662e1a0221d7dd260a59b7 Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Wed, 22 May 2013 19:39:11 +0100
Subject: baffled by audio analysis

---
 rotord/vampHost.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'rotord/vampHost.cpp')

diff --git a/rotord/vampHost.cpp b/rotord/vampHost.cpp
index 56d57db..14a9b35 100644
--- a/rotord/vampHost.cpp
+++ b/rotord/vampHost.cpp
@@ -588,7 +588,7 @@ float vampHost::QMAnalyser::get_progress(){
 	mutex.unlock();
 	return p;
 }
-bool vampHost::Analyser::init(const string &soname,const string &id,const int &_channels,const int &_bits,const int &_samples,const int &_rate,const int &_outputNo,const string &_output){
+bool vampHost::Analyser::init(const string &soname,const string &id,const int &_channels,const int &_bits,const int &_samples,const int &_rate,int _outputNo,const map<string,float> &params){
 
 	//stuff that only happens once
 	channels =_channels;
@@ -596,7 +596,7 @@ bool vampHost::Analyser::init(const string &soname,const string &id,const int &_
 	rate=_rate;
 	bits=_bits;
 	outputNo=_outputNo;
-	output=_output;
+	//output=_output;
 
 	//http://www.mega-nerd.com/libsndfile/api.html#note1
 	//libsndfile returns -1..1 for fp data
@@ -692,7 +692,7 @@ bool vampHost::Analyser::init(const string &soname,const string &id,const int &_
 		}
 	}
 	od = outputs[outputNo];
-	cerr << "Output is: \"" << od.identifier << "\"" << endl;
+	cerr << "Output number "<<outputNo<<": \"" << od.identifier << "\"" << endl;
 
 	if (!plugin->initialise(channels, stepSize, blockSize)) {
 		cerr << "ERROR: Plugin initialise (channels = " << channels
@@ -741,7 +741,7 @@ void vampHost::Analyser::process_frame(uint8_t *data,int samples_in_frame){
 			//cerr<<plugin->getIdentifier()<<" processed block "<<blocks_processed<<endl;
 
 			//I /think/ that the vamp plugin keeps processing through the plugbuf until it encounters 0s
-			rt = RealTime::frame2RealTime(currentStep * stepSize, rate);
+			rt = RealTime::frame2RealTime(currentStep * stepSize, rate); //48000); //setting different rate doesn't affect it
 
 			Plugin::FeatureSet feat=plugin->process(plugbuf, rt);
 
@@ -772,7 +772,7 @@ void vampHost::Analyser::cleanup(){
         in_block++;
     }
 
-    rt = RealTime::frame2RealTime(currentStep * stepSize, rate);
+    rt = RealTime::frame2RealTime(currentStep * stepSize, rate); // //setting different
 
     Plugin::FeatureSet feat=plugin->process(plugbuf, rt);
 
@@ -788,7 +788,7 @@ void vampHost::Analyser::cleanup(){
         featureNo++;
     }
 
-	cerr<<plugin->getIdentifier()<<" found "<<(features.size()-1)<<" features"<<endl;
+	//cerr<<plugin->getIdentifier()<<" found "<<(features.size()-1)<<" features"<<endl;
 	//deal with left over data?
 	for (int c = 0; c < channels; ++c) {
 		delete[] plugbuf[c];
-- 
cgit v1.2.3