X-Git-Url: https://git.aubio.org/?p=aubio.git;a=blobdiff_plain;f=src%2Fio%2Fsink_apple_audio.c;h=910d171a81b44d74ffea605a11d51a95e5edbb05;hp=32fbbf45946b545332c6ecc713413dab88b4077c;hb=4eb48e69f34d56f4a72e454c5927a6fe8781bb66;hpb=b5de3a95bcf4d0668cd4da6923865b861f0c3188

diff --git a/src/io/sink_apple_audio.c b/src/io/sink_apple_audio.c
index 32fbbf45..910d171a 100644
--- a/src/io/sink_apple_audio.c
+++ b/src/io/sink_apple_audio.c
@@ -175,41 +175,33 @@ beach:
 void aubio_sink_apple_audio_do(aubio_sink_apple_audio_t * s, fvec_t * write_data, uint_t write) {
   UInt32 c, v;
   short *data = (short*)s->bufferList.mBuffers[0].mData;
-  if (write > s->max_frames) {
-    AUBIO_WRN("sink_apple_audio: trying to write %d frames, max %d\n", write, s->max_frames);
-    write = s->max_frames;
-  }
-  smpl_t *buf = write_data->data;
-
-  if (buf) {
-      for (c = 0; c < s->channels; c++) {
-          for (v = 0; v < write; v++) {
-              data[v * s->channels + c] =
-                  FLOAT_TO_SHORT(buf[ v * s->channels + c]);
-          }
-      }
+  uint_t length = aubio_sink_validate_input_length("sink_apple_audio", s->path,
+      s->max_frames, write_data->length, write);
+
+  for (c = 0; c < s->channels; c++) {
+    for (v = 0; v < length; v++) {
+      data[v * s->channels + c] = FLOAT_TO_SHORT(write_data->data[v]);
+    }
   }
-  aubio_sink_apple_audio_write(s, write);
+
+  aubio_sink_apple_audio_write(s, length);
 }
 
 void aubio_sink_apple_audio_do_multi(aubio_sink_apple_audio_t * s, fmat_t * write_data, uint_t write) {
   UInt32 c, v;
   short *data = (short*)s->bufferList.mBuffers[0].mData;
-  if (write > s->max_frames) {
-    AUBIO_WRN("sink_apple_audio: trying to write %d frames, max %d\n", write, s->max_frames);
-    write = s->max_frames;
-  }
-  smpl_t **buf = write_data->data;
-
-  if (buf) {
-      for (c = 0; c < s->channels; c++) {
-          for (v = 0; v < write; v++) {
-              data[v * s->channels + c] =
-                  FLOAT_TO_SHORT(buf[c][v]);
-          }
-      }
+  uint_t channels = aubio_sink_validate_input_channels("sink_apple_audio",
+      s->path, s->channels, write_data->height);
+  uint_t length = aubio_sink_validate_input_length("sink_apple_audio", s->path,
+      s->max_frames, write_data->length, write);
+
+  for (c = 0; c < channels; c++) {
+    for (v = 0; v < length; v++) {
+      data[v * s->channels + c] = FLOAT_TO_SHORT(write_data->data[c][v]);
+    }
   }
-  aubio_sink_apple_audio_write(s, write);
+
+  aubio_sink_apple_audio_write(s, length);
 }
 
 void aubio_sink_apple_audio_write(aubio_sink_apple_audio_t *s, uint_t write) {