Changeset 155cc10 for src/io/source.c

Timestamp:

Mar 10, 2017, 2:26:32 PM (8 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/applefworks, fix/ffmpeg5, master, sampler

Children:

ee8a57c

Parents:

00d0275 (diff), 67b6618 (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 branch 'master' into awhitening

File:

• src/io/source.c (modified) (12 diffs)

src/io/source.c

@@ -19 +19 @@
 */
 
-#include "config.h"
 #include "aubio_priv.h"
 #include "fvec.h"
@@ -41 +40 @@
 typedef uint_t (*aubio_source_get_samplerate_t)(aubio_source_t * s);
 typedef uint_t (*aubio_source_get_channels_t)(aubio_source_t * s);
+typedef uint_t (*aubio_source_get_duration_t)(aubio_source_t * s);
 typedef uint_t (*aubio_source_seek_t)(aubio_source_t * s, uint_t seek);
 typedef uint_t (*aubio_source_close_t)(aubio_source_t * s);
@@ -51 +51 @@
   aubio_source_get_samplerate_t s_get_samplerate;
   aubio_source_get_channels_t s_get_channels;
+  aubio_source_get_duration_t s_get_duration;
   aubio_source_seek_t s_seek;
   aubio_source_close_t s_close;
@@ -56 +57 @@
 };
 
-aubio_source_t * new_aubio_source(char_t * uri, uint_t samplerate, uint_t hop_size) {
+aubio_source_t * new_aubio_source(const char_t * uri, uint_t samplerate, uint_t hop_size) {
   aubio_source_t * s = AUBIO_NEW(aubio_source_t);
-#if HAVE_LIBAV
+#ifdef HAVE_LIBAV
   s->source = (void *)new_aubio_source_avcodec(uri, samplerate, hop_size);
   if (s->source) {
@@ -65 +66 @@
     s->s_get_channels = (aubio_source_get_channels_t)(aubio_source_avcodec_get_channels);
     s->s_get_samplerate = (aubio_source_get_samplerate_t)(aubio_source_avcodec_get_samplerate);
+    s->s_get_duration = (aubio_source_get_duration_t)(aubio_source_avcodec_get_duration);
     s->s_seek = (aubio_source_seek_t)(aubio_source_avcodec_seek);
     s->s_close = (aubio_source_close_t)(aubio_source_avcodec_close);
@@ -78 +80 @@
     s->s_get_channels = (aubio_source_get_channels_t)(aubio_source_apple_audio_get_channels);
     s->s_get_samplerate = (aubio_source_get_samplerate_t)(aubio_source_apple_audio_get_samplerate);
+    s->s_get_duration = (aubio_source_get_duration_t)(aubio_source_apple_audio_get_duration);
     s->s_seek = (aubio_source_seek_t)(aubio_source_apple_audio_seek);
     s->s_close = (aubio_source_close_t)(aubio_source_apple_audio_close);
@@ -84 +87 @@
   }
 #endif /* HAVE_SOURCE_APPLE_AUDIO */
-#if HAVE_SNDFILE
+#ifdef HAVE_SNDFILE
   s->source = (void *)new_aubio_source_sndfile(uri, samplerate, hop_size);
   if (s->source) {
@@ -91 +94 @@
     s->s_get_channels = (aubio_source_get_channels_t)(aubio_source_sndfile_get_channels);
     s->s_get_samplerate = (aubio_source_get_samplerate_t)(aubio_source_sndfile_get_samplerate);
+    s->s_get_duration = (aubio_source_get_duration_t)(aubio_source_sndfile_get_duration);
     s->s_seek = (aubio_source_seek_t)(aubio_source_sndfile_seek);
     s->s_close = (aubio_source_close_t)(aubio_source_sndfile_close);
@@ -97 +101 @@
   }
 #endif /* HAVE_SNDFILE */
-#if HAVE_WAVREAD
+#ifdef HAVE_WAVREAD
   s->source = (void *)new_aubio_source_wavread(uri, samplerate, hop_size);
   if (s->source) {
@@ -104 +108 @@
     s->s_get_channels = (aubio_source_get_channels_t)(aubio_source_wavread_get_channels);
     s->s_get_samplerate = (aubio_source_get_samplerate_t)(aubio_source_wavread_get_samplerate);
+    s->s_get_duration = (aubio_source_get_duration_t)(aubio_source_wavread_get_duration);
     s->s_seek = (aubio_source_seek_t)(aubio_source_wavread_seek);
     s->s_close = (aubio_source_close_t)(aubio_source_wavread_close);
@@ -110 +115 @@
   }
 #endif /* HAVE_WAVREAD */
-  AUBIO_ERROR("source: failed creating aubio source with %s"
-     " at samplerate %d with hop_size %d\n", uri, samplerate, hop_size);
+#if !defined(HAVE_WAVREAD) && \
+  !defined(HAVE_LIBAV) && \
+  !defined(HAVE_SOURCE_APPLE_AUDIO) && \
+  !defined(HAVE_SNDFILE)
+  AUBIO_ERROR("source: failed creating with %s at %dHz with hop size %d"
+     " (no source built-in)\n", uri, samplerate, hop_size);
+#endif
   AUBIO_FREE(s);
   return NULL;
@@ -142 +152 @@
 }
 
+uint_t aubio_source_get_duration(aubio_source_t *s) {
+  return s->s_get_duration((void *)s->source);
+}
+
 uint_t aubio_source_seek (aubio_source_t * s, uint_t seek ) {
   return s->s_seek((void *)s->source, seek);