Changeset a9fd272 for src/io/sink.c

Timestamp:

Jan 26, 2014, 8:16:59 PM (10 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:

422452b

Parents:

082c88b

Message:

src/io/sink*: add _close function, improve error messages

File:

• src/io/sink.c (modified) (6 diffs)

src/io/sink.c

@@ -39 +39 @@
 typedef uint_t (*aubio_sink_get_channels_t)(aubio_sink_t * s);
 #endif
+typedef uint_t (*aubio_sink_close_t)(aubio_sink_t * s);
 typedef void (*del_aubio_sink_t)(aubio_sink_t * s);
 
@@ -49 +50 @@
   aubio_sink_get_channels_t s_get_channels;
 #endif
+  aubio_sink_close_t s_close;
   del_aubio_sink_t s_del;
 };
@@ -58 +60 @@
   if (s->sink) {
     s->s_do = (aubio_sink_do_t)(aubio_sink_apple_audio_do);
+    s->s_close = (aubio_sink_close_t)(aubio_sink_apple_audio_close);
     s->s_del = (del_aubio_sink_t)(del_aubio_sink_apple_audio);
     return s;
@@ -66 +69 @@
   if (s->sink) {
     s->s_do = (aubio_sink_do_t)(aubio_sink_sndfile_do);
+    s->s_close = (aubio_sink_close_t)(aubio_sink_sndfile_close);
     s->s_del = (del_aubio_sink_t)(del_aubio_sink_sndfile);
     return s;
@@ -74 +78 @@
   if (s->sink) {
     s->s_do = (aubio_sink_do_t)(aubio_sink_wavwrite_do);
+    s->s_close = (aubio_sink_close_t)(aubio_sink_wavwrite_close);
     s->s_del = (del_aubio_sink_t)(del_aubio_sink_wavwrite);
     return s;
   }
 #endif /* HAVE_WAVWRITE */
-  AUBIO_ERROR("sink: failed creating aubio sink with %s\n", uri);
+  AUBIO_ERROR("sink: failed creating %s with samplerate %dHz\n",
+      uri, samplerate);
   AUBIO_FREE(s);
   return NULL;
@@ -87 +93 @@
 }
 
+uint_t aubio_sink_close(aubio_sink_t *s) {
+  return s->s_close((void *)s->sink);
+}
+
 void del_aubio_sink(aubio_sink_t * s) {
   if (!s) return;