From: Paul Brossier <piem@piem.org>
Date: Fri, 22 Mar 2013 01:36:30 +0000 (-0500)
Subject: src/io/source_sndfile.{c,h}: fix include and prototype, bypass resampler for now
X-Git-Url: http://git.tremily.us/?p=aubio.git;a=commitdiff_plain;h=3d2fe263adc0b0308acdc8c2ba5fdbc646c953a6

src/io/source_sndfile.{c,h}: fix include and prototype, bypass resampler for now
---

diff --git a/src/io/source_sndfile.c b/src/io/source_sndfile.c
index cbd682b2..57a069ee 100644
--- a/src/io/source_sndfile.c
+++ b/src/io/source_sndfile.c
@@ -26,8 +26,9 @@
 #include <sndfile.h>
 
 #include "aubio_priv.h"
-#include "source_sndfile.h"
 #include "fvec.h"
+#include "fmat.h"
+#include "source_sndfile.h"
 
 #include "temporal/resampler.h"
 
@@ -183,7 +184,7 @@ void aubio_source_sndfile_do_multi(aubio_source_sndfile_t * s, fmat_t * read_dat
   if (s->ratio != 1) {
     AUBIO_ERR("source_sndfile: no multi channel resampling yet");
     return;
-    data = s->input_data->data;
+    //data = s->input_data->data;
   } else
 #endif /* HAVE_SAMPLERATE */
   {
@@ -199,7 +200,7 @@ void aubio_source_sndfile_do_multi(aubio_source_sndfile_t * s, fmat_t * read_dat
 
 #ifdef HAVE_SAMPLERATE
   if (s->resampler) {
-    aubio_resampler_do(s->resampler, s->input_data, read_data);
+    //aubio_resampler_do(s->resampler, s->input_data, read_data);
   }
 #endif /* HAVE_SAMPLERATE */
 
diff --git a/src/io/source_sndfile.h b/src/io/source_sndfile.h
index dbdb3315..d67269ae 100644
--- a/src/io/source_sndfile.h
+++ b/src/io/source_sndfile.h
@@ -84,7 +84,7 @@ void aubio_source_sndfile_do(aubio_source_sndfile_t * s, fvec_t * read_to, uint_
   source. `hop_size` if enough frames could be read, less otherwise.
 
 */
-void aubio_source_sndfile_do(aubio_source_sndfile_t * s, fmat_t * read_to, uint_t * read);
+void aubio_source_sndfile_do_multi(aubio_source_sndfile_t * s, fmat_t * read_to, uint_t * read);
 
 /**