Changeset ebed7e6 for src

Timestamp:

Mar 15, 2017, 7:07:06 PM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler

Children:

bff692e

Parents:

388c2e7

Message:

src/synt/sampler.c: take a copy of uri

File:

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

src/synth/sampler.c

@@ -69 +69 @@
   // reading from a source
   aubio_source_t *source;
-  const char_t *uri;
+  char_t *uri;
   uint_t playing;
   uint_t opened;
@@ -94 +94 @@
   pthread_mutex_t open_mutex;
   uint_t waited;                // number of frames skipped while opening
-  const char_t *next_uri;
+  char_t *next_uri;
   uint_t open_thread_running;
   sint_t available;             // number of samples currently available
@@ -263 +263 @@
       o->samplerate = aubio_source_get_samplerate(o->source);
     }
-    o->uri = uri;
+    if (o->uri) AUBIO_FREE(o->uri);
+    o->uri = AUBIO_ARRAY(char_t, strnlen(uri, PATH_MAX) + 1);
+    strncpy(o->uri, uri, strnlen(uri, PATH_MAX) + 1);
     o->finished = 0;
     o->eof = 0;
@@ -344 +346 @@
   o->started = 0;
   o->available = 0;
-  o->next_uri = uri;
+  if (o->next_uri) AUBIO_FREE(o->next_uri);
+  o->next_uri = AUBIO_ARRAY(char_t, strnlen(uri, PATH_MAX) + 1);
+  strncpy(o->next_uri, uri, strnlen(uri, PATH_MAX) + 1);
   o->waited = 0;
   if (pthread_create(&o->open_thread, 0, aubio_sampler_openfn, o) != 0) {