Changeset 135bc14 for src

Timestamp:

Mar 31, 2019, 11:12:25 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/crepe, fix/ffmpeg5, master

Children:

08246ee

Parents:

8fe522d (diff), 07c76d00 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'feature/sink_flac' into feature/autosink

File:

• src/io/sink_flac.c (modified) (5 diffs)

src/io/sink_flac.c

@@ -34 +34 @@
 #include <FLAC/metadata.h>
 #include <FLAC/stream_encoder.h>
-
-#include <string.h> // strerror
-#include <errno.h> // errno
 
 #define MAX_WRITE_SIZE 4096
@@ -133 +130 @@
   FLAC__bool ok = true;
   FLAC__StreamEncoderInitStatus init_status;
+  FLAC__StreamMetadata_VorbisComment_Entry entry;
   const unsigned comp_level = 5;
   const unsigned bps = 16;
@@ -146 +144 @@
   s->fid = fopen((const char *)s->path, "wb");
   if (!s->fid) {
-    AUBIO_ERR("sink_flac: failed opening %s, %s\n", s->path, strerror(errno));
+    AUBIO_STRERR("sink_flac: Failed opening %s (%s)\n", s->path, errorstr);
     return AUBIO_FAIL;
   }
@@ -186 +184 @@
   }
 
-  FLAC__StreamMetadata_VorbisComment_Entry entry;
   ok = FLAC__metadata_object_vorbiscomment_entry_from_name_value_pair(&entry,
       "encoder", "aubio");
@@ -348 +345 @@
 
   if (s->fid && fclose(s->fid)) {
-    AUBIO_ERR("sink_flac: Error closing file %s (%s)\n",
-        s->path, strerror(errno));
+    AUBIO_STRERR("sink_flac: Error closing file %s (%s)\n", s->path, errorstr);
     ret &= AUBIO_FAIL;
   }