Changeset 4ed4b1f for src/io/sink.c

Timestamp:

Feb 23, 2014, 5:07:57 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:

2eccf22

Parents:

c21553d

Message:

src/io/sink.h: add do_multi, preset_samplerate, preset_channels, get_samplerate, and get_channels

File:

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

src/io/sink.c

@@ -1 +1 @@
 /*
-  Copyright (C) 2012 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2012-2014 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
@@ -22 +22 @@
 #include "aubio_priv.h"
 #include "fvec.h"
+#include "fmat.h"
 #include "io/sink.h"
 #ifdef __APPLE__
@@ -34 +35 @@
 
 typedef void (*aubio_sink_do_t)(aubio_sink_t * s, fvec_t * data, uint_t write);
-#if 0
-typedef void (*aubio_sink_do_multi_t)(aubio_sink_t * s, fmat_t * data, uint_t * read);
+typedef void (*aubio_sink_do_multi_t)(aubio_sink_t * s, fmat_t * data, uint_t write);
+typedef uint_t (*aubio_sink_preset_samplerate_t)(aubio_sink_t * s, uint_t samplerate);
+typedef uint_t (*aubio_sink_preset_channels_t)(aubio_sink_t * s, uint_t channels);
 typedef uint_t (*aubio_sink_get_samplerate_t)(aubio_sink_t * s);
 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);
@@ -45 +46 @@
   void *sink;
   aubio_sink_do_t s_do;
-#if 0
   aubio_sink_do_multi_t s_do_multi;
+  aubio_sink_preset_samplerate_t s_preset_samplerate;
+  aubio_sink_preset_channels_t s_preset_channels;
   aubio_sink_get_samplerate_t s_get_samplerate;
   aubio_sink_get_channels_t s_get_channels;
-#endif
   aubio_sink_close_t s_close;
   del_aubio_sink_t s_del;
@@ -60 +61 @@
   if (s->sink) {
     s->s_do = (aubio_sink_do_t)(aubio_sink_apple_audio_do);
+    s->s_do_multi = (aubio_sink_do_multi_t)(aubio_sink_apple_audio_do_multi);
+    s->s_preset_samplerate = (aubio_sink_preset_samplerate_t)(aubio_sink_apple_audio_preset_samplerate);
+    s->s_preset_channels = (aubio_sink_preset_channels_t)(aubio_sink_apple_audio_preset_channels);
+    s->s_get_samplerate = (aubio_sink_get_samplerate_t)(aubio_sink_apple_audio_get_samplerate);
+    s->s_get_channels = (aubio_sink_get_channels_t)(aubio_sink_apple_audio_get_channels);
     s->s_close = (aubio_sink_close_t)(aubio_sink_apple_audio_close);
     s->s_del = (del_aubio_sink_t)(del_aubio_sink_apple_audio);
@@ -69 +75 @@
   if (s->sink) {
     s->s_do = (aubio_sink_do_t)(aubio_sink_sndfile_do);
+    s->s_do_multi = (aubio_sink_do_multi_t)(aubio_sink_sndfile_do_multi);
+    s->s_preset_samplerate = (aubio_sink_preset_samplerate_t)(aubio_sink_sndfile_preset_samplerate);
+    s->s_preset_channels = (aubio_sink_preset_channels_t)(aubio_sink_sndfile_preset_channels);
+    s->s_get_samplerate = (aubio_sink_get_samplerate_t)(aubio_sink_sndfile_get_samplerate);
+    s->s_get_channels = (aubio_sink_get_channels_t)(aubio_sink_sndfile_get_channels);
     s->s_close = (aubio_sink_close_t)(aubio_sink_sndfile_close);
     s->s_del = (del_aubio_sink_t)(del_aubio_sink_sndfile);
@@ -78 +89 @@
   if (s->sink) {
     s->s_do = (aubio_sink_do_t)(aubio_sink_wavwrite_do);
+    s->s_do_multi = (aubio_sink_do_multi_t)(aubio_sink_wavwrite_do_multi);
+    s->s_preset_samplerate = (aubio_sink_preset_samplerate_t)(aubio_sink_wavwrite_preset_samplerate);
+    s->s_preset_channels = (aubio_sink_preset_channels_t)(aubio_sink_wavwrite_preset_channels);
+    s->s_get_samplerate = (aubio_sink_get_samplerate_t)(aubio_sink_wavwrite_get_samplerate);
+    s->s_get_channels = (aubio_sink_get_channels_t)(aubio_sink_wavwrite_get_channels);
     s->s_close = (aubio_sink_close_t)(aubio_sink_wavwrite_close);
     s->s_del = (del_aubio_sink_t)(del_aubio_sink_wavwrite);
@@ -93 +109 @@
 }
 
+void aubio_sink_do_multi(aubio_sink_t * s, fmat_t * write_data, uint_t write) {
+  s->s_do_multi((void *)s->sink, write_data, write);
+}
+
+uint_t aubio_sink_preset_samplerate(aubio_sink_t * s, uint_t samplerate) {
+  return s->s_preset_samplerate((void *)s->sink, samplerate);
+}
+
+uint_t aubio_sink_preset_channels(aubio_sink_t * s, uint_t channels) {
+  return s->s_preset_channels((void *)s->sink, channels);
+}
+
+uint_t aubio_sink_get_samplerate(aubio_sink_t * s) {
+  return s->s_get_samplerate((void *)s->sink);
+}
+
+uint_t aubio_sink_get_channels(aubio_sink_t * s) {
+  return s->s_get_channels((void *)s->sink);
+}
+
 uint_t aubio_sink_close(aubio_sink_t *s) {
   return s->s_close((void *)s->sink);