Changeset c059581 for src

Timestamp:

Mar 23, 2013, 1:55:50 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:

ef47246

Parents:

c19f9e5 (diff), b8389de (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 /Users/piem/projects/aubio/aubio into device

File:

• src/io/source_apple_audio.c (modified) (1 diff)

src/io/source_apple_audio.c

@@ -205 +205 @@
     }
   }
+  // if read_data has more channels than the file
+  if (read_to->height > s->channels) {
+    // copy last channel to all additional channels
+    for (v = 0; v < loadedPackets; v++) {
+      for (c = s->channels; c < read_to->height; c++) {
+        buf[c][v] = SHORT_TO_FLOAT(data[ v * s->channels + (s->channels - 1)]);
+      }
+    }
+  }
   // short read, fill with zeros
   if (loadedPackets < s->block_size) {
     for (v = loadedPackets; v < s->block_size; v++) {
-      for (c = 0; c < s->channels; c++) {
+      for (c = 0; c < read_to->height; c++) {
         buf[c][v] = 0.;
       }