Changeset fc117d0 for src/io/source_sndfile.c

Timestamp:

Feb 11, 2013, 11:06:28 AM (11 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

050a8f3

Parents:

5314432 (diff), 88fc249 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from develop

File:

• src/io/source_sndfile.c (modified) (3 diffs)

src/io/source_sndfile.c

@@ -70 +70 @@
 
   s->hop_size = hop_size;
-  s->samplerate = samplerate;
   s->channels = 1;
   s->path = path;
@@ -90 +89 @@
   s->input_format     = sfinfo.format;
 
-  if (s->samplerate == 1) s->samplerate = s->input_samplerate;
-
+  if (samplerate == 0) {
+    samplerate = s->input_samplerate;
+    //AUBIO_DBG("sampling rate set to 0, automagically adjusting to %d\n", samplerate);
+  }
+  s->samplerate = samplerate;
   /* compute input block size required before resampling */
   s->ratio = s->samplerate/(float)s->input_samplerate;
@@ -192 +194 @@
 }
 
+uint_t aubio_source_sndfile_get_samplerate(aubio_source_sndfile_t * s) {
+  return s->samplerate;
+}
+
 #endif /* HAVE_SNDFILE */