Changeset 1e4b7f6 for src

Timestamp:

Sep 29, 2016, 4:21:50 PM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler, timestretch

Children:

30efdd0

Parents:

b4ad853

Message:

src/effects/timestretch_rubberband.c: split into functions

File:

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

src/effects/timestretch_rubberband.c

@@ -52 +52 @@
 extern RubberBandOptions aubio_get_rubberband_opts(const char_t *mode);
 
+static void aubio_timestretch_warmup (aubio_timestretch_t * p);
+static sint_t aubio_timestretch_fetch(aubio_timestretch_t *p);
+
 aubio_timestretch_t *
 new_aubio_timestretch (const char_t * uri, const char_t * mode,
@@ -86 +89 @@
   //rubberband_set_debug_level(p->rb, 10);
 
-#if 1
+  aubio_timestretch_warmup(p);
+
+  return p;
+
+beach:
+  del_aubio_timestretch(p);
+  return NULL;
+}
+
+static void
+aubio_timestretch_warmup (aubio_timestretch_t * p)
+{
   // warm up rubber band
   uint_t source_read = 0;
@@ -98 +112 @@
     available = rubberband_available(p->rb);
   }
-#endif
-
-  return p;
-
-beach:
-  del_aubio_timestretch(p);
-  return NULL;
 }
 
@@ -184 +191 @@
 }
 
-void
-aubio_timestretch_do (aubio_timestretch_t * p, fvec_t * out, uint_t * read)
+sint_t
+aubio_timestretch_fetch(aubio_timestretch_t *p)
 {
   uint_t source_read = p->hopsize;
@@ -198 +205 @@
     available = rubberband_available(p->rb);
   }
+  return source_read;
+}
+
+void
+aubio_timestretch_do (aubio_timestretch_t * p, fvec_t * out, uint_t * read)
+{
+  int available = aubio_timestretch_fetch(p);
   // now retrieve the samples and write them into out->data
   if (available >= (int)p->hopsize) {