Changes in tests/src/spectral/test-phasevoc-jack.c [9d6001cb:6938a20]

File:

• tests/src/spectral/test-phasevoc-jack.c (modified) (3 diffs)

tests/src/spectral/test-phasevoc-jack.c

@@ -15 +15 @@
 #endif /* HAVE_JACK */
 
-uint_t testing  = 0;  /* change this to 1 to listen        */
+uint_t testing  = 0;  // change this to 1 to listen
 
-uint_t win_s    = 512;/* window size                       */
-uint_t hop_s    = 128;/* hop size                          */
-uint_t channels = 2;  /* number of audio channels          */
-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 */
+uint_t win_s    = 512; // window size
+uint_t hop_s    = 128; // hop size
+uint_t channels = 2; // number of audio channels
+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[2];
@@ -32 +32 @@
 int aubio_process(float **input, float **output, int nframes);
 
-int main(){
-        /* allocate some memory */
+int main ()
+{
+  /* allocate some memory */
   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[i] = new_aubio_pvoc(win_s,hop_s);
-    }
+  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[i] = new_aubio_pvoc(win_s,hop_s);
+  }
 
 #ifdef HAVE_JACK
-        aubio_jack_t * jack_setup;
-        jack_setup  = new_aubio_jack(channels, channels, 
-            midiin, midiout,
-            (aubio_process_func_t)aubio_process);
-        aubio_jack_activate(jack_setup);
-        /* stay in main jack loop for 1 seconds only */
-        do {
-          sleep(1);
-        } while(testing);
-        aubio_jack_close(jack_setup);
+  aubio_jack_t * jack_setup;
+  jack_setup  = new_aubio_jack(channels, channels, 
+      midiin, midiout,
+      (aubio_process_func_t)aubio_process);
+  aubio_jack_activate(jack_setup);
+  /* stay in main jack loop for 1 seconds only */
+  do {
+    sleep(1);
+  } while(testing);
+  aubio_jack_close(jack_setup);
 #else
-        fprintf(stderr, "WARNING: no jack support\n");
+  fprintf(stderr, "WARNING: no jack support\n");
 #endif
-        
-    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;
+
+  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;
 }
 
@@ -81 +82 @@
     if (pos == hop_s-1) {
       /* block loop */
-    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[i]->length;i++) fftgrain[0]->phas[i] = 0.; 
-      // double phases of second channel
-      for (i=0;i<fftgrain[i]->length;i++) {
-        fftgrain[1]->phas[i] = 
-          aubio_unwrap2pi (fftgrain[1]->phas[i] * 2.); 
+      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[i]->length;i++) fftgrain[0]->phas[i] = 0.; 
+        // double phases of second channel
+        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[i], fftgrain[i], out[i]);
+        pos = -1;
       }
-      // copy second channel to third one
-      aubio_pvoc_rdo(pv[i], fftgrain[i], out[i]);
-      pos = -1;
-    }
     }
     pos++;