Changeset a9fd272

Timestamp:

Jan 26, 2014, 8:16:59 PM (10 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:

422452b

Parents:

082c88b

Message:

src/io/sink*: add _close function, improve error messages

Location:

src/io

Files:

• sink.c (modified) (6 diffs)
• sink.h (modified) (1 diff)
• sink_apple_audio.c (modified) (2 diffs)
• sink_apple_audio.h (modified) (1 diff)
• sink_sndfile.c (modified) (1 diff)
• sink_sndfile.h (modified) (1 diff)
• sink_wavwrite.c (modified) (3 diffs)
• sink_wavwrite.h (modified) (1 diff)

src/io/sink.c

@@ -39 +39 @@
 typedef uint_t (*aubio_sink_get_channels_t)(aubio_sink_t * s);
 #endif
+typedef uint_t (*aubio_sink_close_t)(aubio_sink_t * s);
 typedef void (*del_aubio_sink_t)(aubio_sink_t * s);
 
@@ -49 +50 @@
   aubio_sink_get_channels_t s_get_channels;
 #endif
+  aubio_sink_close_t s_close;
   del_aubio_sink_t s_del;
 };
@@ -58 +60 @@
   if (s->sink) {
     s->s_do = (aubio_sink_do_t)(aubio_sink_apple_audio_do);
+    s->s_close = (aubio_sink_close_t)(aubio_sink_apple_audio_close);
     s->s_del = (del_aubio_sink_t)(del_aubio_sink_apple_audio);
     return s;
@@ -66 +69 @@
   if (s->sink) {
     s->s_do = (aubio_sink_do_t)(aubio_sink_sndfile_do);
+    s->s_close = (aubio_sink_close_t)(aubio_sink_sndfile_close);
     s->s_del = (del_aubio_sink_t)(del_aubio_sink_sndfile);
     return s;
@@ -74 +78 @@
   if (s->sink) {
     s->s_do = (aubio_sink_do_t)(aubio_sink_wavwrite_do);
+    s->s_close = (aubio_sink_close_t)(aubio_sink_wavwrite_close);
     s->s_del = (del_aubio_sink_t)(del_aubio_sink_wavwrite);
     return s;
   }
 #endif /* HAVE_WAVWRITE */
-  AUBIO_ERROR("sink: failed creating aubio sink with %s\n", uri);
+  AUBIO_ERROR("sink: failed creating %s with samplerate %dHz\n",
+      uri, samplerate);
   AUBIO_FREE(s);
   return NULL;
@@ -87 +93 @@
 }
 
+uint_t aubio_sink_close(aubio_sink_t *s) {
+  return s->s_close((void *)s->sink);
+}
+
 void del_aubio_sink(aubio_sink_t * s) {
   if (!s) return;

src/io/sink.h

@@ -64 +64 @@
 /**
 
+  close sink
+
+  \param s sink object, created with ::new_aubio_sink
+
+  \return 0 on success, non-zero on failure
+
+*/
+uint_t aubio_sink_close(aubio_sink_t * s);
+
+/**
+
   close sink and cleanup memory
 
-  \param s source object, created with ::new_aubio_source
+  \param s sink object, created with ::new_aubio_sink
 
 */

src/io/sink_apple_audio.c

@@ -142 +142 @@
 }
 
-void del_aubio_sink_apple_audio(aubio_sink_apple_audio_t * s) {
+uint_t aubio_sink_apple_audio_close(aubio_sink_apple_audio_t * s) {
   OSStatus err = noErr;
-  if (!s || !s->audioFile) {
-    AUBIO_ERR("sink_apple_audio: failed erasing\n");
-    return;
+  if (!s->audioFile) {
+    return AUBIO_FAIL;
   }
   err = ExtAudioFileDispose(s->audioFile);
@@ -156 +155 @@
   }
   s->audioFile = NULL;
+  return err;
+}
+
+void del_aubio_sink_apple_audio(aubio_sink_apple_audio_t * s) {
+  if (s->audioFile) aubio_sink_apple_audio_close (s);
   freeAudioBufferList(&s->bufferList);
   AUBIO_FREE(s);

src/io/sink_apple_audio.h

@@ -69 +69 @@
 /**
 
+  close sink
+
+  \param s sink_apple_audio object, created with ::new_aubio_sink_apple_audio
+
+  \return 0 on success, non-zero on failure
+
+*/
+uint_t aubio_sink_apple_audio_close(aubio_sink_apple_audio_t * s);
+
+/**
+
   close sink and cleanup memory
 

src/io/sink_sndfile.c

@@ -116 +116 @@
 }
 
+uint_t aubio_sink_sndfile_close (aubio_sink_sndfile_t *s) {
+  if (!s->handle) {
+    return AUBIO_FAIL;
+  }
+  if (sf_close(s->handle)) {
+    AUBIO_ERR("Error closing file %s: %s", s->path, sf_strerror (NULL));
+    return AUBIO_FAIL;
+  }
+  s->handle = NULL;
+  return AUBIO_OK;
+}
+
 void del_aubio_sink_sndfile(aubio_sink_sndfile_t * s){
   if (!s) return;
-  if (sf_close(s->handle)) {
-    AUBIO_ERR("Error closing file %s: %s", s->path, sf_strerror (NULL));
-  }
+  aubio_sink_sndfile_close(s);
   AUBIO_FREE(s->scratch_data);
   AUBIO_FREE(s);

src/io/sink_sndfile.h

@@ -68 +68 @@
 /**
 
+  close sink
+
+  \param s sink_sndfile object, created with ::new_aubio_sink_sndfile
+
+  \return 0 on success, non-zero on failure
+
+*/
+uint_t aubio_sink_sndfile_close(aubio_sink_sndfile_t * s);
+
+/**
+
   close sink and cleanup memory
 

src/io/sink_wavwrite.c

@@ -153 +153 @@
 
 beach:
-  AUBIO_ERR("sink_wavwrite: can not write %s at samplerate %dHz\n",
-      s->path, s->samplerate);
+  //AUBIO_ERR("sink_wavwrite: failed creating %s with samplerate %dHz\n",
+  //    s->path, s->samplerate);
   del_aubio_sink_wavwrite(s);
   return NULL;
@@ -182 +182 @@
 }
 
-void aubio_sink_wavwrite_close(aubio_sink_wavwrite_t * s) {
+uint_t aubio_sink_wavwrite_close(aubio_sink_wavwrite_t * s) {
   uint_t data_size = s->total_frames_written * s->bitspersample * s->channels / 8;
   unsigned char buf[5];
-  if (!s->fid) return;
+  if (!s->fid) return AUBIO_FAIL;
   // ChunkSize
   fseek(s->fid, 4, SEEK_SET);
@@ -197 +197 @@
   }
   s->fid = NULL;
+  return AUBIO_OK;
 }
 

src/io/sink_wavwrite.h

@@ -68 +68 @@
 /**
 
+  close sink
+
+  \param s sink_wavwrite object, create with ::new_aubio_sink_wavwrite
+
+  \return 0 on success, non-zero on failure
+
+*/
+uint_t aubio_sink_wavwrite_close(aubio_sink_wavwrite_t * s);
+
+/**
+
   close sink and cleanup memory