Changeset f8bdcb2 for src/synth/sampler.c

Timestamp:

Mar 17, 2017, 6:23:17 PM (7 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler

Children:

f651625

Parents:

bad88364

Message:

src/synth/sampler.c: also compile without pthread

File:

• src/synth/sampler.c (modified) (9 diffs)

src/synth/sampler.c

@@ -77 +77 @@
   // time stretching
   aubio_timestretch_t *ts;
+  sint_t available;             // number of samples currently available
+  uint_t started;               // source warmed up
+  // source
+  uint_t source_blocksize;
+  uint_t channels;
+  fvec_t *source_output;
+  fmat_t *source_moutput;
+  //fvec_t *source_output_tmp;
+  //uint_t last_read;
+  uint_t threaded_read;         // use reading thread?
 #ifdef HAVE_THREADS
   // file reading thread
   pthread_t read_thread;
-  uint_t threaded_read;         // use reading thread?
   pthread_mutex_t read_mutex;
   pthread_cond_t read_avail;
   pthread_cond_t read_request;
-  uint_t source_blocksize;
-  fvec_t *source_output;
-  fvec_t *source_output_tmp;
-  uint_t last_read;
-  fmat_t *source_moutput;
-  uint_t channels;
   // file opening thread
   pthread_t open_thread;
@@ -96 +99 @@
   char_t *next_uri;
   uint_t open_thread_running;
-  sint_t available;             // number of samples currently available
-  uint_t started;               // source warmed up
   uint_t read_thread_finish;    // flag to tell reading thread to exit
 #endif
@@ -137 +138 @@
   s->available = 0;
 
-  s->threaded_read = 0;
   s->perfectloop = 0;
 #if 0 // naive mode
@@ -150 +150 @@
   s->source_blocksize = 2048; //32 * s->blocksize;
   s->perfectloop = 1;
+#endif
+
+#ifdef HAVE_THREADS
+  // disabled for now
   s->threaded_read = 0;
-#endif
+#else
+  s->threaded_read = 0;
+#endif
+
+  s->perfectloop = 1;
 
   if (s->source_blocksize < s->blocksize) {
@@ -186 +194 @@
 
   s->ts = new_aubio_timestretch("default", 1., s->blocksize, s->samplerate);
-  s->source_output_tmp = new_fvec(s->source_blocksize);
-  s->last_read = 0;
+  //s->source_output_tmp = new_fvec(s->source_blocksize);
+  //s->last_read = 0;
 
   return s;
@@ -272 +280 @@
     ret = AUBIO_OK;
     AUBIO_MSG("sampler: loaded %s\n", uri);
+#ifdef HAVE_THREADS
     if (o->waited) {
       AUBIO_WRN("sampler: %.2fms (%d samples) taken to load %s\n", 1000. *
           o->waited / (smpl_t)o->samplerate, o->waited, o->uri);
     }
+#endif
   } else {
     o->source = NULL;
@@ -819 +829 @@
 
 uint_t
+#ifdef HAVE_THREADS
 aubio_sampler_get_waited_opening (aubio_sampler_t *o, uint_t waited) {
-#ifdef HAVE_THREADS
   if (o->playing) {
     if (!o->opened) {
@@ -832 +842 @@
     }
   }
+#else
+aubio_sampler_get_waited_opening (aubio_sampler_t *o UNUSED, uint_t waited UNUSED) {
 #endif
   return 0;
@@ -849 +861 @@
     ret = AUBIO_OK;
   }
-  o->last_read = 0;
+  //o->last_read = 0;
   return ret;
 }