Changeset 4acee97

Timestamp:

Sep 29, 2016, 11:07:19 PM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler, timestretch

Children:

0202028

Parents:

30efdd0

Message:

src/effects/timestretch_rubberband.c: fix eof when last available == hopsize, change _set messages to warnings

File:

• src/effects/timestretch_rubberband.c (modified) (4 diffs)

src/effects/timestretch_rubberband.c

@@ -137 +137 @@
     return AUBIO_OK;
   } else {
-    AUBIO_ERR("timestretch: could not set stretch ratio to %.2f\n", stretch);
+    AUBIO_WRN("timestretch: could not set stretch ratio to %.2f\n", stretch);
     return AUBIO_FAIL;
   }
@@ -156 +156 @@
     return AUBIO_OK;
   } else {
-    AUBIO_ERR("timestretch: could not set pitchscale to %.2f\n", pitchscale);
+    AUBIO_WRN("timestretch: could not set pitchscale to %.2f\n", pitchscale);
     return AUBIO_FAIL;
   }
@@ -174 +174 @@
     return aubio_timestretch_set_pitchscale(p, pitchscale);
   } else {
-    AUBIO_ERR("timestretch: could not set transpose to %.2f\n", transpose);
+    AUBIO_WRN("timestretch: could not set transpose to %.2f\n", transpose);
     return AUBIO_FAIL;
   }
@@ -210 +210 @@
     rubberband_retrieve(p->rb, (float* const*)&(out->data), p->hopsize);
     *read = p->hopsize;
-  } else {
+  } else if (available > 0) {
     rubberband_retrieve(p->rb, (float* const*)&(out->data), available);
     *read = available;
+  } else {
+    fvec_zeros(out);
+    *read = 0;
   }
 }