tests/src: switch to mono

diff --git a/tests/src/temporal/test-aweighting.c b/tests/src/temporal/test-aweighting.c
index 62075b76326acc1f9dbe12059bc74311024648f8..64915b2564fa58b57305dcedaae75706958ef458 100644 (file)
--- a/tests/src/temporal/test-aweighting.c
+++ b/tests/src/temporal/test-aweighting.c
@@ -7,28 +7,27 @@ int main(){
   uint_t rates[] = { 8000, 16000, 22050, 44100, 96000, 192000};
   uint_t nrates = 6;
   uint_t samplerate, i = 0;
-  uint_t channels = 2;
 
   for ( samplerate = rates[i]; i < nrates ; i++ ) {
-    f = new_aubio_filter_a_weighting (channels, samplerate);
+    f = new_aubio_filter_a_weighting (samplerate);
     del_aubio_filter (f);
 
-    f = new_aubio_filter (7, channels*2);
+    f = new_aubio_filter (7);
     aubio_filter_set_a_weighting (f, samplerate);
     del_aubio_filter (f);
   }
 
   // samplerate unknown
-  f = new_aubio_filter_a_weighting (channels, 4200);
+  f = new_aubio_filter_a_weighting (4200);
   del_aubio_filter (f);
 
   // order to small
-  f = new_aubio_filter (2, channels*2);
+  f = new_aubio_filter (2);
   aubio_filter_set_a_weighting (f, samplerate);
   del_aubio_filter (f);
 
   // order to big
-  f = new_aubio_filter (12, channels*2);
+  f = new_aubio_filter (12);
   aubio_filter_set_a_weighting (f, samplerate);
   del_aubio_filter (f);
 

diff --git a/tests/src/temporal/test-cweighting.c b/tests/src/temporal/test-cweighting.c
index 91770fec389754d11cdcdfff2ad2f11e18f7d753..d5283fc30a132e0746b72eb2a7e3ed783fbef7bf 100644 (file)
--- a/tests/src/temporal/test-cweighting.c
+++ b/tests/src/temporal/test-cweighting.c
@@ -7,28 +7,27 @@ int main(){
   uint_t rates[] = { 8000, 16000, 22050, 44100, 96000, 192000};
   uint_t nrates = 6;
   uint_t samplerate, i = 0;
-  uint_t channels = 2;
 
   for ( samplerate = rates[i]; i < nrates ; i++ ) {
-    f = new_aubio_filter_c_weighting (channels, samplerate);
+    f = new_aubio_filter_c_weighting (samplerate);
     del_aubio_filter (f);
 
-    f = new_aubio_filter (5, channels*2);
+    f = new_aubio_filter (5);
     aubio_filter_set_c_weighting (f, samplerate);
     del_aubio_filter (f);
   }
 
   // samplerate unknown
-  f = new_aubio_filter_c_weighting (channels, 4200);
+  f = new_aubio_filter_c_weighting (4200);
   del_aubio_filter (f);
 
   // order to small
-  f = new_aubio_filter (2, channels*2);
+  f = new_aubio_filter (2);
   aubio_filter_set_c_weighting (f, samplerate);
   del_aubio_filter (f);
 
   // order to big
-  f = new_aubio_filter (12, channels*2);
+  f = new_aubio_filter (12);
   aubio_filter_set_c_weighting (f, samplerate);
   del_aubio_filter (f);
 

diff --git a/tests/src/test-beattracking.c b/tests/src/test-beattracking.c
index 63794feff679bcad20ef845bd1f504410060547d..e4ac6dc7d15dd6b25c00b86cbc2debc05f4647a7 100644 (file)
--- a/tests/src/test-beattracking.c
+++ b/tests/src/test-beattracking.c
@@ -6,12 +6,11 @@
 int main(){
         /* allocate some memory */
         uint_t win_s      = 1024;                       /* window size */
-        uint_t channels   = 1;                          /* number of channel */
-        fvec_t * in       = new_fvec (win_s, channels); /* input buffer */
-        fvec_t * out      = new_fvec (win_s/4, channels);     /* input buffer */
+        fvec_t * in       = new_fvec (win_s); /* input buffer */
+        fvec_t * out      = new_fvec (win_s/4);     /* input buffer */
   
         /* allocate fft and other memory space */
-        aubio_beattracking_t * tempo  = new_aubio_beattracking(win_s, channels);
+        aubio_beattracking_t * tempo  = new_aubio_beattracking(win_s);
 
         uint_t i = 0;
 

diff --git a/tests/src/test-biquad.c b/tests/src/test-biquad.c
index 78d73188f9a16067cc59ca024d43a3b71d54c627..6555cae32ae44778a795fce96aee60ee6b457390 100644 (file)
--- a/tests/src/test-biquad.c
+++ b/tests/src/test-biquad.c
@@ -3,9 +3,8 @@
 int main(){
         /* allocate some memory */
         uint_t win_s      = 1024;                       /* window size */
-        uint_t channels   = 1;                          /* number of channel */
-        fvec_t * in       = new_fvec (win_s, channels); /* input buffer */
-        aubio_filter_t * o = new_aubio_filter_biquad(0.3,0.2,0.1,0.2,0.3, channels);
+        fvec_t * in       = new_fvec (win_s); /* input buffer */
+        aubio_filter_t * o = new_aubio_filter_biquad(0.3,0.2,0.1,0.2,0.3);
 
         aubio_filter_do_filtfilt(o,in,in);
         aubio_filter_do(o,in);

diff --git a/tests/src/test-cvec.c b/tests/src/test-cvec.c
index e76471d1290c762ee6b177a2f1443a21229846ab..f2e5cf0510492cf9f51c826387a47113e29c49db 100644 (file)
--- a/tests/src/test-cvec.c
+++ b/tests/src/test-cvec.c
@@ -3,8 +3,7 @@
 int main(){
         /* allocate some memory */
         uint_t win_s      = 1024;                       /* window size */
-        uint_t channels   = 1;                          /* number of channel */
-        cvec_t * sp       = new_cvec (win_s, channels); /* input buffer */
+        cvec_t * sp       = new_cvec (win_s); /* input buffer */
         del_cvec(sp);
 
         return 0;

diff --git a/tests/src/test-fft.c b/tests/src/test-fft.c
index e43efa20e12bdaef3b51c7748f38e636cc66e55c..a17b977863a68be738469b8d78ddb3e1bbf0b404 100644 (file)
--- a/tests/src/test-fft.c
+++ b/tests/src/test-fft.c
@@ -4,20 +4,19 @@
 int main(){
         /* allocate some memory */
         uint_t win_s      = 8;                       /* window size        */
-        uint_t channels   = 1;                        /* number of channels */
-        fvec_t * in       = new_fvec (win_s, channels); /* input buffer       */
-        cvec_t * fftgrain = new_cvec (win_s, channels); /* fft norm and phase */
-        fvec_t * out      = new_fvec (win_s, channels); /* output buffer      */
-        in->data[0][0] = 1;
-        in->data[0][1] = 2;
-        in->data[0][2] = 3;
-        in->data[0][3] = 4;
-        in->data[0][4] = 5;
-        in->data[0][5] = 6;
-        in->data[0][6] = 5;
-        in->data[0][7] = 6;
+        fvec_t * in       = new_fvec (win_s); /* input buffer       */
+        cvec_t * fftgrain = new_cvec (win_s); /* fft norm and phase */
+        fvec_t * out      = new_fvec (win_s); /* output buffer      */
+        in->data[0] = 1;
+        in->data[1] = 2;
+        in->data[2] = 3;
+        in->data[3] = 4;
+        in->data[4] = 5;
+        in->data[5] = 6;
+        in->data[6] = 5;
+        in->data[7] = 6;
         /* allocate fft and other memory space */
-        aubio_fft_t * fft = new_aubio_fft(win_s,channels);
+        aubio_fft_t * fft = new_aubio_fft(win_s);
         /* fill input with some data */
         fvec_print(in);
         /* execute stft */

diff --git a/tests/src/test-filter.c b/tests/src/test-filter.c
index 3ab11b73a8b1e1c7d30b4bfeda3cb57940282bd5..84409d059e2975e08834434878419d8984483568 100644 (file)
--- a/tests/src/test-filter.c
+++ b/tests/src/test-filter.c
@@ -5,27 +5,26 @@ main (void)
 {
   /* allocate some memory */
   uint_t win_s = 32;            /* window size */
-  uint_t channels = 1;          /* number of channel */
-  fvec_t *in = new_fvec (win_s, channels);      /* input buffer */
-  fvec_t *out = new_fvec (win_s, channels);     /* input buffer */
+  fvec_t *in = new_fvec (win_s);      /* input buffer */
+  fvec_t *out = new_fvec (win_s);     /* input buffer */
 
 
-  aubio_filter_t *o = new_aubio_filter_c_weighting (channels, 44100);
-  in->data[0][12] = 0.5;
+  aubio_filter_t *o = new_aubio_filter_c_weighting (44100);
+  in->data[12] = 0.5;
   fvec_print (in);
   aubio_filter_do (o, in);
   fvec_print (in);
   del_aubio_filter (o);
 
-  o = new_aubio_filter_c_weighting (channels, 44100);
-  in->data[0][12] = 0.5;
+  o = new_aubio_filter_c_weighting (44100);
+  in->data[12] = 0.5;
   fvec_print (in);
   aubio_filter_do_outplace (o, in, out);
   fvec_print (out);
   del_aubio_filter (o);
 
-  o = new_aubio_filter_c_weighting (channels, 44100);
-  in->data[0][12] = 0.5;
+  o = new_aubio_filter_c_weighting (44100);
+  in->data[12] = 0.5;
   fvec_print (in);
   aubio_filter_do_filtfilt (o, in, out);
   fvec_print (out);

diff --git a/tests/src/test-filterbank.c b/tests/src/test-filterbank.c
index 5a1d0965f9a97272f0aa5628ca1d2c28cbfc30a1..4ab3fcf7a534cee0fb84dafd619e72b2dacf95d9 100644 (file)
--- a/tests/src/test-filterbank.c
+++ b/tests/src/test-filterbank.c
@@ -8,11 +8,10 @@ main (void)
 {
   /* allocate some memory */
   uint_t win_s = 1024;          /* window size */
-  uint_t channels = 2;          /* number of channel */
   uint_t n_filters = 13;        /* number of filters */
-  cvec_t *in = new_cvec (win_s, channels);      /* input buffer */
-  fvec_t *out = new_fvec (win_s, channels);     /* input buffer */
-  fvec_t *coeffs = NULL;
+  cvec_t *in = new_cvec (win_s);      /* input buffer */
+  fvec_t *out = new_fvec (win_s);     /* input buffer */
+  fmat_t *coeffs = NULL;
 
   /* allocate fft and other memory space */
   aubio_filterbank_t *o = new_aubio_filterbank (n_filters, win_s);
@@ -22,6 +21,7 @@ main (void)
     return -1;
   }
 
+  /*
   if (fvec_max (coeffs) != 0.) {
     return -1;
   }
@@ -29,8 +29,9 @@ main (void)
   if (fvec_min (coeffs) != 0.) {
     return -1;
   }
+  */
 
-  fvec_print (coeffs);
+  fmat_print (coeffs);
 
   aubio_filterbank_do (o, in, out);
 

diff --git a/tests/src/test-filterbank_mel.c b/tests/src/test-filterbank_mel.c
index 3e417f9e6d9665dc377a23ff377b319261e16881..79001dfdf2b052ea4d740ec14a18099ae595bc60 100644 (file)
--- a/tests/src/test-filterbank_mel.c
+++ b/tests/src/test-filterbank_mel.c
@@ -8,11 +8,10 @@ main (void)
 {
   /* allocate some memory */
   uint_t win_s = 512;           /* fft size */
-  uint_t channels = 2;          /* number of channel */
   uint_t n_filters = 40;        /* number of filters */
-  cvec_t *in = new_cvec (win_s, channels);      /* input buffer */
-  fvec_t *out = new_fvec (win_s, channels);     /* input buffer */
-  fvec_t *coeffs = NULL;
+  cvec_t *in = new_cvec (win_s);      /* input buffer */
+  fvec_t *out = new_fvec (win_s);     /* input buffer */
+  fmat_t *coeffs = NULL;
   smpl_t samplerate = 16000.;
 
   /* allocate fft and other memory space */
@@ -26,7 +25,7 @@ main (void)
     return -1;
   }
 
-  //fvec_print (coeffs);
+  //fmat_print (coeffs);
 
   //fprintf(stderr, "%f\n", fvec_sum(coeffs));
 

diff --git a/tests/src/test-fvec.c b/tests/src/test-fvec.c
index 8fa1f7c6c5519da08fb8319b4ca8409cd5ea4616..d51feeceb41c44eed60875e977216790384151c8 100644 (file)
--- a/tests/src/test-fvec.c
+++ b/tests/src/test-fvec.c
@@ -3,8 +3,7 @@
 int main(){
         /* allocate some memory */
         uint_t win_s      = 1024;                       /* window size */
-        uint_t channels   = 1;                          /* number of channel */
-        fvec_t * in       = new_fvec (win_s, channels); /* input buffer */
+        fvec_t * in       = new_fvec (win_s); /* input buffer */
         del_fvec(in);
 
         return 0;

diff --git a/tests/src/test-hist.c b/tests/src/test-hist.c
index 5c87b50142eb6130592835e89169641873a59d35..9cd39e58ca9a2166f5c7697d2b6f13819f891062 100644 (file)
--- a/tests/src/test-hist.c
+++ b/tests/src/test-hist.c
@@ -7,7 +7,7 @@ int main( )
 {
   uint_t length;
   for (length = 1; length < 10; length ++ ) {
-    aubio_hist_t *o = new_aubio_hist(0, 1, length, 5);
+    aubio_hist_t *o = new_aubio_hist(0, 1, length);
     fvec_t *t = new_aubio_window("hanning", length);
     aubio_hist_do(o,t);
     fvec_print(t);

diff --git a/tests/src/test-mfcc.c b/tests/src/test-mfcc.c
index a41f64bd1d4a4db61b9323369cdf260bd591dd23..c724d1049878c3cf9e0fe5ad2e1da46bd36a079d 100644 (file)
--- a/tests/src/test-mfcc.c
+++ b/tests/src/test-mfcc.c
@@ -5,11 +5,10 @@ main (void)
 {
   /* allocate some memory */
   uint_t win_s = 512;           /* fft size */
-  uint_t channels = 1;          /* number of channel */
   uint_t n_filters = 40;        /* number of filters */
   uint_t n_coefs = 13;          /* number of coefficients */
-  cvec_t *in = new_cvec (win_s, channels);      /* input buffer */
-  fvec_t *out = new_fvec (n_coefs, channels);     /* input buffer */
+  cvec_t *in = new_cvec (win_s);      /* input buffer */
+  fvec_t *out = new_fvec (n_coefs);     /* input buffer */
   smpl_t samplerate = 16000.;
 
   /* allocate fft and other memory space */

diff --git a/tests/src/test-onset.c b/tests/src/test-onset.c
index db94669a23f031b06695f014d6030be144f65a4b..fd2ab2e4f78056f6d3923eda93235633e6148fa6 100644 (file)
--- a/tests/src/test-onset.c
+++ b/tests/src/test-onset.c
@@ -3,10 +3,9 @@
 int main(){
         /* allocate some memory */
         uint_t win_s      = 1024;                       /* window size */
-        uint_t channels   = 1;                          /* number of channel */
-        fvec_t * in       = new_fvec (win_s/4, channels); /* input buffer */
-        fvec_t * out      = new_fvec (2, channels);     /* input buffer */
-        aubio_onset_t * onset  = new_aubio_onset("complex", win_s, win_s/4, channels, 44100.);
+        fvec_t * in       = new_fvec (win_s/4); /* input buffer */
+        fvec_t * out      = new_fvec (2);     /* input buffer */
+        aubio_onset_t * onset  = new_aubio_onset("complex", win_s, win_s/4, 44100.);
         uint_t i = 0;
 
         while (i < 10) {

diff --git a/tests/src/test-onsetdetection.c b/tests/src/test-onsetdetection.c
index 8234d98c422629ed435fb2bdf85917e9d646ca3a..fe1b71b76a8effd658d3f4d2cf17c8bd96ebf2ab 100644 (file)
--- a/tests/src/test-onsetdetection.c
+++ b/tests/src/test-onsetdetection.c
@@ -7,37 +7,36 @@ int
 main ()
 {
   uint_t win_s = 1024;          /* window size */
-  uint_t channels = 1;          /* number of channel */
-  cvec_t *in = new_cvec (win_s, channels);      /* input buffer */
-  fvec_t *out = new_fvec (1, channels); /* input buffer */
+  cvec_t *in = new_cvec (win_s);      /* input buffer */
+  fvec_t *out = new_fvec (1); /* input buffer */
 
   aubio_specdesc_t *o;
   
-  o = new_aubio_specdesc ("energy", win_s, channels);
+  o = new_aubio_specdesc ("energy", win_s);
   aubio_specdesc_do (o, in, out);
   del_aubio_specdesc (o);
 
-  o = new_aubio_specdesc ("energy", win_s, channels);
+  o = new_aubio_specdesc ("energy", win_s);
   aubio_specdesc_do (o, in, out);
   del_aubio_specdesc (o);
 
-  o = new_aubio_specdesc ("hfc", win_s, channels);
+  o = new_aubio_specdesc ("hfc", win_s);
   aubio_specdesc_do (o, in, out);
   del_aubio_specdesc (o);
 
-  o = new_aubio_specdesc ("complex", win_s, channels);
+  o = new_aubio_specdesc ("complex", win_s);
   aubio_specdesc_do (o, in, out);
   del_aubio_specdesc (o);
 
-  o = new_aubio_specdesc ("phase", win_s, channels);
+  o = new_aubio_specdesc ("phase", win_s);
   aubio_specdesc_do (o, in, out);
   del_aubio_specdesc (o);
 
-  o = new_aubio_specdesc ("kl", win_s, channels);
+  o = new_aubio_specdesc ("kl", win_s);
   aubio_specdesc_do (o, in, out);
   del_aubio_specdesc (o);
 
-  o = new_aubio_specdesc ("mkl", win_s, channels);
+  o = new_aubio_specdesc ("mkl", win_s);
   aubio_specdesc_do (o, in, out);
   del_aubio_specdesc (o);
 

diff --git a/tests/src/test-peakpick.c b/tests/src/test-peakpick.c
index 1e443181e0d5b457fb2e1aa6a3ad31b1eb353bba..42aff7dc7510620adca494d846258ccdea8fe176 100644 (file)
--- a/tests/src/test-peakpick.c
+++ b/tests/src/test-peakpick.c
@@ -5,9 +5,8 @@
 int main(){
         /* allocate some memory */
         uint_t win_s      = 1024;                       /* window size */
-        uint_t channels   = 1;                          /* number of channel */
-        fvec_t * in       = new_fvec (win_s, channels); /* input buffer */
-        fvec_t * out      = new_fvec (1, channels); /* input buffer */
+        fvec_t * in       = new_fvec (win_s); /* input buffer */
+        fvec_t * out      = new_fvec (1); /* input buffer */
         aubio_peakpicker_t * o = new_aubio_peakpicker(1);
         aubio_peakpicker_set_threshold (o, 0.3);
 

diff --git a/tests/src/test-phasevoc-jack.c b/tests/src/test-phasevoc-jack.c
index cd5753a13f8dd7798f5bb9ac493bca681833ab72..d42bdd3c7b9543ec49c22e19a8016a665fc61509 100644 (file)
--- a/tests/src/test-phasevoc-jack.c
+++ b/tests/src/test-phasevoc-jack.c
@@ -21,21 +21,24 @@ uint_t midiin   = 4;  /* number of midi input channels     */
 uint_t midiout  = 2;  /* number of midi output channels    */
 uint_t pos      = 0;  /* frames%dspblocksize for jack loop */
 
-fvec_t * in;
-cvec_t * fftgrain;
-fvec_t * out;
+fvec_t * in[2];
+cvec_t * fftgrain[2];
+fvec_t * out[2];
 
-aubio_pvoc_t * pv;
+aubio_pvoc_t * pv[2];
 
 int aubio_process(float **input, float **output, int nframes);
 
 int main(){
         /* allocate some memory */
-        in       = new_fvec (hop_s, channels); /* input buffer       */
-        fftgrain = new_cvec (win_s, channels); /* fft norm and phase */
-        out      = new_fvec (hop_s, channels); /* output buffer      */
+  uint_t i;
+    for (i=0;i<channels;i++) {
+        in[i]       = new_fvec (hop_s); /* input buffer       */
+        fftgrain[i] = new_cvec (win_s); /* fft norm and phase */
+        out[i]      = new_fvec (hop_s); /* output buffer      */
         /* allocate fft and other memory space */
-        pv = new_aubio_pvoc(win_s,hop_s,channels);
+        pv[i] = new_aubio_pvoc(win_s,hop_s);
+    }
 
 #ifdef HAVE_JACK
         aubio_jack_t * jack_setup;
@@ -52,10 +55,12 @@ int main(){
         fprintf(stderr, "WARNING: no jack support\n");
 #endif
         
-        del_aubio_pvoc(pv);
-        del_cvec(fftgrain);
-        del_fvec(in);
-        del_fvec(out);
+    for (i=0;i<channels;i++) {
+        del_aubio_pvoc(pv[i]);
+        del_cvec(fftgrain[i]);
+        del_fvec(in[i]);
+        del_fvec(out[i]);
+    }
         aubio_cleanup();
         return 0;
 }
@@ -66,25 +71,27 @@ int aubio_process(float **input, float **output, int nframes) {
   for (j=0;j<(unsigned)nframes;j++) {
     for (i=0;i<channels;i++) {
       /* write input to datanew */
-      fvec_write_sample(in, input[i][j], i, pos);
+      fvec_write_sample(in[i], input[i][j], pos);
       /* put synthnew in output */
-      output[i][j] = fvec_read_sample(out, i, pos);
+      output[i][j] = fvec_read_sample(out[i], pos);
     }
     /*time for fft*/
     if (pos == hop_s-1) {
       /* block loop */
-      aubio_pvoc_do (pv,in, fftgrain);
+    for (i=0;i<channels;i++) {
+      aubio_pvoc_do (pv[i], in[i], fftgrain[i]);
       // zero phases of first channel
-      for (i=0;i<fftgrain->length;i++) fftgrain->phas[0][i] = 0.; 
+      for (i=0;i<fftgrain[i]->length;i++) fftgrain[0]->phas[i] = 0.; 
       // double phases of second channel
-      for (i=0;i<fftgrain->length;i++) {
-        fftgrain->phas[1][i] = 
-          aubio_unwrap2pi (fftgrain->phas[1][i] * 2.); 
+      for (i=0;i<fftgrain[i]->length;i++) {
+        fftgrain[1]->phas[i] = 
+          aubio_unwrap2pi (fftgrain[1]->phas[i] * 2.); 
       }
       // copy second channel to third one
-      aubio_pvoc_rdo(pv,fftgrain,out);
+      aubio_pvoc_rdo(pv[i], fftgrain[i], out[i]);
       pos = -1;
     }
+    }
     pos++;
   }
   return 0;

diff --git a/tests/src/test-phasevoc.c b/tests/src/test-phasevoc.c
index e8352abf804cc9aeeed47a4bd807f512b55ed75c..6bea4c39c879f1fa6450b4d40917695ee0870ce5 100644 (file)
--- a/tests/src/test-phasevoc.c
+++ b/tests/src/test-phasevoc.c
@@ -6,13 +6,12 @@
 int main(){
         uint_t win_s    = 1024; /* window size                       */
         uint_t hop_s    = 256;  /* hop size                          */
-        uint_t channels = 4;  /* number of channels                */
         /* allocate some memory */
-        fvec_t * in       = new_fvec (hop_s, channels); /* input buffer       */
-        cvec_t * fftgrain = new_cvec (win_s, channels); /* fft norm and phase */
-        fvec_t * out      = new_fvec (hop_s, channels); /* output buffer      */
+        fvec_t * in       = new_fvec (hop_s); /* input buffer       */
+        cvec_t * fftgrain = new_cvec (win_s); /* fft norm and phase */
+        fvec_t * out      = new_fvec (hop_s); /* output buffer      */
         /* allocate fft and other memory space */
-        aubio_pvoc_t * pv = new_aubio_pvoc(win_s,hop_s,channels);
+        aubio_pvoc_t * pv = new_aubio_pvoc(win_s,hop_s);
         /* fill input with some data */
         printf("initialised\n");
         /* execute stft */

diff --git a/tests/src/test-pitchdetection.c b/tests/src/test-pitchdetection.c
index 7872b86f7d6100f173adf2ed10a998f6939072fc..ac884c69dc27a6fa2a8629406d8047a71c0b8222 100644 (file)
--- a/tests/src/test-pitchdetection.c
+++ b/tests/src/test-pitchdetection.c
@@ -7,11 +7,10 @@ main ()
   uint_t win_s = 1024;          /* window size */
   uint_t hop_s = win_s / 4;     /* hop size */
   uint_t samplerate = 44100;    /* samplerate */
-  uint_t channels = 1;          /* number of channel */
-  fvec_t *in = new_fvec (hop_s, channels);      /* input buffer */
-  fvec_t *out = new_fvec (1, channels); /* input buffer */
+  fvec_t *in = new_fvec (hop_s);      /* input buffer */
+  fvec_t *out = new_fvec (1); /* input buffer */
   aubio_pitch_t *o =
-      new_aubio_pitch ("default", win_s, hop_s, channels, samplerate);
+      new_aubio_pitch ("default", win_s, hop_s, samplerate);
   uint_t i = 0;
 
   while (i < 100) {

diff --git a/tests/src/test-pitchfcomb.c b/tests/src/test-pitchfcomb.c
index a6fb74a4ba14110044fa2b1d7ab7a84f3a7b0e78..dda60995738d3b3248279f6f99a2d9e75fb49a4c 100644 (file)
--- a/tests/src/test-pitchfcomb.c
+++ b/tests/src/test-pitchfcomb.c
@@ -6,11 +6,10 @@ int main(){
         /* allocate some memory */
         uint_t win_s      = 1024;                       /* window size */
         uint_t hop_s      = win_s/4;                    /* hop size */
-        uint_t channels   = 3;                          /* number of channel */
-        fvec_t * in       = new_fvec (hop_s, channels); /* input buffer */
-        fvec_t * out      = new_fvec (1, channels);
+        fvec_t * in       = new_fvec (hop_s); /* input buffer */
+        fvec_t * out      = new_fvec (1);
         aubio_pitchfcomb_t * o  = new_aubio_pitchfcomb (
-          win_s, hop_s, channels);
+          win_s, hop_s);
         uint_t i = 0;
 
         while (i < 2) {

diff --git a/tests/src/test-pitchmcomb.c b/tests/src/test-pitchmcomb.c
index aaecc3d34dc5d8beb17dbcfe5006b91f4b3d5cb9..7d3cb16bb9d29c353c010d49da7535df1c97b72e 100644 (file)
--- a/tests/src/test-pitchmcomb.c
+++ b/tests/src/test-pitchmcomb.c
@@ -6,11 +6,10 @@ int main(){
         /* allocate some memory */
         uint_t win_s      = 1024;                       /* window size */
         uint_t hop_s      = win_s/4;                    /* hop size */
-        uint_t channels   = 1;                          /* number of channel */
-        cvec_t * in       = new_cvec (win_s, channels); /* input buffer */
-        fvec_t * out      = new_fvec (1, channels); /* input buffer */
+        cvec_t * in       = new_cvec (win_s); /* input buffer */
+        fvec_t * out      = new_fvec (1); /* input buffer */
 
-        aubio_pitchmcomb_t * o  = new_aubio_pitchmcomb(win_s, hop_s, channels);
+        aubio_pitchmcomb_t * o  = new_aubio_pitchmcomb(win_s, hop_s);
         uint_t i = 0;
 
         while (i < 1000) {

diff --git a/tests/src/test-pitchschmitt.c b/tests/src/test-pitchschmitt.c
index 08500a7222ac8b324af1d1a054a1ed12cf517cec..745feca8113bf8029a86f98c24f2d4d9232150c6 100644 (file)
--- a/tests/src/test-pitchschmitt.c
+++ b/tests/src/test-pitchschmitt.c
@@ -5,8 +5,8 @@
 int main(){
         /* allocate some memory */
         uint_t win_s      = 1024;                       /* window size */
-        fvec_t * in       = new_fvec (win_s, 1); /* input buffer */
-        fvec_t * out = new_fvec (1, 1); /* input buffer */
+        fvec_t * in       = new_fvec (win_s); /* input buffer */
+        fvec_t * out = new_fvec (1); /* input buffer */
         aubio_pitchschmitt_t * o  = new_aubio_pitchschmitt(win_s);
         uint_t i = 0;
 

diff --git a/tests/src/test-pitchyin.c b/tests/src/test-pitchyin.c
index 719c30ffc5554a62f6152dc499ffa4e02f2f3403..1e256e867a18c05e6e692ece4d50a0b090a61330 100644 (file)
--- a/tests/src/test-pitchyin.c
+++ b/tests/src/test-pitchyin.c
@@ -5,9 +5,8 @@
 int main(){
         /* allocate some memory */
         uint_t win_s      = 1024;                       /* window size */
-        uint_t channels   = 1;                          /* number of channel */
-        fvec_t * in       = new_fvec (win_s, channels); /* input buffer */
-        fvec_t * out      = new_fvec (win_s/2, channels); /* input buffer */
+        fvec_t * in       = new_fvec (win_s); /* input buffer */
+        fvec_t * out      = new_fvec (win_s/2); /* input buffer */
         aubio_pitchyin_t *p = new_aubio_pitchyin (win_s);
         uint_t i = 0;
 

diff --git a/tests/src/test-pitchyinfft.c b/tests/src/test-pitchyinfft.c
index 93bb0ce5cd56f91f7df0aabe69b5f42518a1b518..96939ce8dfaf69a27bcae1d72d3ca5984acd8638 100644 (file)
--- a/tests/src/test-pitchyinfft.c
+++ b/tests/src/test-pitchyinfft.c
@@ -5,9 +5,8 @@
 int main(){
         /* allocate some memory */
         uint_t win_s      = 1024;                       /* window size */
-        uint_t channels   = 1;                          /* number of channel */
-        fvec_t * in       = new_fvec (win_s, channels); /* input buffer */
-        fvec_t * out      = new_fvec (1, channels); /* output pitch periods */
+        fvec_t * in       = new_fvec (win_s); /* input buffer */
+        fvec_t * out      = new_fvec (1); /* output pitch periods */
         aubio_pitchyinfft_t * o  = new_aubio_pitchyinfft(win_s);
         aubio_pitchyinfft_set_tolerance (o, 0.2);
         uint_t i = 0;

diff --git a/tests/src/test-resample.c b/tests/src/test-resample.c
index c8d08c85a191cb98afb109ec9cc4390071c332c2..b28bf9a933796f10041e7d3a1b19a9746ea6301e 100644 (file)
--- a/tests/src/test-resample.c
+++ b/tests/src/test-resample.c
@@ -6,10 +6,9 @@ main ()
 {
   /* allocate some memory */
   uint_t win_s = 1024;          /* window size */
-  uint_t channels = 1;          /* number of channel */
   smpl_t ratio = 0.5;
-  fvec_t *in = new_fvec (win_s, channels);      /* input buffer */
-  fvec_t *out = new_fvec ((uint_t) (win_s * ratio), channels);  /* input buffer */
+  fvec_t *in = new_fvec (win_s);      /* input buffer */
+  fvec_t *out = new_fvec ((uint_t) (win_s * ratio));  /* input buffer */
   aubio_resampler_t *o = new_aubio_resampler (0.5, 0);
   uint_t i = 0;
 

diff --git a/tests/src/test-scale.c b/tests/src/test-scale.c
index 3fc72025e2c554065b7d0a58bfadfdf625c0fa24..3f94eb2b2fc07503d3d1d6efe88259d20627921d 100644 (file)
--- a/tests/src/test-scale.c
+++ b/tests/src/test-scale.c
@@ -5,8 +5,7 @@
 int main(){
         /* allocate some memory */
         uint_t win_s      = 1024;                       /* window size */
-        uint_t channels   = 1;                          /* number of channel */
-        fvec_t * in       = new_fvec (win_s, channels); /* input buffer */
+        fvec_t * in       = new_fvec (win_s); /* input buffer */
         aubio_scale_t * o = new_aubio_scale(0,1,2,3);
         aubio_scale_set_limits (o,0,1,2,3);
         uint_t i = 0;

diff --git a/tests/src/test-tempo.c b/tests/src/test-tempo.c
index b2d636acf260b172bf4b6ee36b0f30792ffd5498..3a6c28312d8f1d579e9bfcf07401ae027bbaf3bd 100644 (file)
--- a/tests/src/test-tempo.c
+++ b/tests/src/test-tempo.c
@@ -4,10 +4,9 @@
 int main(){
         /* allocate some memory */
         uint_t win_s      = 1024;                       /* window size */
-        uint_t channels   = 1;                          /* number of channel */
-        fvec_t * in       = new_fvec (win_s, channels); /* input buffer */
-        fvec_t * out      = new_fvec (2, channels);     /* input buffer */
-        aubio_tempo_t * o  = new_aubio_tempo("complex", win_s, win_s/4, channels, 44100.);
+        fvec_t * in       = new_fvec (win_s); /* input buffer */
+        fvec_t * out      = new_fvec (2);     /* input buffer */
+        aubio_tempo_t * o  = new_aubio_tempo("complex", win_s, win_s/4, 44100.);
         uint_t i = 0;
 
         smpl_t curtempo, curtempoconf;

diff --git a/tests/src/test-tss.c b/tests/src/test-tss.c
index b8ac41cd444e9f6d82400bb6ce55a13d6bf1e711..00401687d883f4fdbf81a098ed460a5423f8fa5b 100644 (file)
--- a/tests/src/test-tss.c
+++ b/tests/src/test-tss.c
@@ -13,20 +13,19 @@ int main(){
        int i;
         uint_t win_s    = 1024; /* window size                       */
         uint_t hop_s    = 256;  /* hop size                          */
-        uint_t channels = 4;  /* number of channels                */
         /* allocate some memory */
-        fvec_t * in       = new_fvec (hop_s, channels); /* input buffer       */
-        cvec_t * fftgrain = new_cvec (win_s, channels); /* fft norm and phase */
-        cvec_t * cstead   = new_cvec (win_s, channels); /* fft norm and phase */
-        cvec_t * ctrans   = new_cvec (win_s, channels); /* fft norm and phase */
-        fvec_t * stead    = new_fvec (hop_s, channels); /* output buffer      */
-        fvec_t * trans    = new_fvec (hop_s, channels); /* output buffer      */
+        fvec_t * in       = new_fvec (hop_s); /* input buffer       */
+        cvec_t * fftgrain = new_cvec (win_s); /* fft norm and phase */
+        cvec_t * cstead   = new_cvec (win_s); /* fft norm and phase */
+        cvec_t * ctrans   = new_cvec (win_s); /* fft norm and phase */
+        fvec_t * stead    = new_fvec (hop_s); /* output buffer      */
+        fvec_t * trans    = new_fvec (hop_s); /* output buffer      */
         /* allocate fft and other memory space */
-        aubio_pvoc_t * pv = new_aubio_pvoc (win_s,hop_s,channels);
-        aubio_pvoc_t * pvt = new_aubio_pvoc(win_s,hop_s,channels);
-        aubio_pvoc_t * pvs = new_aubio_pvoc(win_s,hop_s,channels);
+        aubio_pvoc_t * pv = new_aubio_pvoc (win_s,hop_s);
+        aubio_pvoc_t * pvt = new_aubio_pvoc(win_s,hop_s);
+        aubio_pvoc_t * pvs = new_aubio_pvoc(win_s,hop_s);
 
-       aubio_tss_t *  tss = new_aubio_tss(win_s,hop_s,channels);
+       aubio_tss_t *  tss = new_aubio_tss(win_s,hop_s);
         /* fill input with some data */
         printf("initialised\n");
         /* execute stft */