Changes in src/io/sink_wavwrite.c [65a4fb4:3e1c482]

File:

• src/io/sink_wavwrite.c (modified) (6 diffs)

src/io/sink_wavwrite.c

@@ -28 +28 @@
 #include "io/sink_wavwrite.h"
 #include "io/ioutils.h"
+
+#include <errno.h>
 
 #define MAX_SIZE 4096
@@ -161 +163 @@
   unsigned char buf[5];
   uint_t byterate, blockalign;
-  size_t written = 0;
 
   /* open output file */
   s->fid = fopen((const char *)s->path, "wb");
   if (!s->fid) {
-    AUBIO_STRERR("sink_wavwrite: could not open %s (%s)\n", s->path, errorstr);
+    AUBIO_ERR("sink_wavwrite: could not open %s (%s)\n", s->path, strerror(errno));
     goto beach;
   }
 
   // ChunkID
-  written += fwrite("RIFF", 4, 1, s->fid);
+  fwrite("RIFF", 4, 1, s->fid);
 
   // ChunkSize (0 for now, actual size will be written in _close)
-  written += fwrite(write_little_endian(0, buf, 4), 4, 1, s->fid);
+  fwrite(write_little_endian(0, buf, 4), 4, 1, s->fid);
 
   // Format
-  written += fwrite("WAVE", 4, 1, s->fid);
+  fwrite("WAVE", 4, 1, s->fid);
 
   // Subchunk1ID
-  written += fwrite("fmt ", 4, 1, s->fid);
+  fwrite("fmt ", 4, 1, s->fid);
 
   // Subchunk1Size
-  written += fwrite(write_little_endian(16, buf, 4), 4, 1, s->fid);
+  fwrite(write_little_endian(16, buf, 4), 4, 1, s->fid);
 
   // AudioFormat
-  written += fwrite(write_little_endian(1, buf, 2), 2, 1, s->fid);
+  fwrite(write_little_endian(1, buf, 2), 2, 1, s->fid);
 
   // NumChannels
-  written += fwrite(write_little_endian(s->channels, buf, 2), 2, 1, s->fid);
+  fwrite(write_little_endian(s->channels, buf, 2), 2, 1, s->fid);
 
   // SampleRate
-  written += fwrite(write_little_endian(s->samplerate, buf, 4), 4, 1, s->fid);
+  fwrite(write_little_endian(s->samplerate, buf, 4), 4, 1, s->fid);
 
   // ByteRate
   byterate = s->samplerate * s->channels * s->bitspersample / 8;
-  written += fwrite(write_little_endian(byterate, buf, 4), 4, 1, s->fid);
+  fwrite(write_little_endian(byterate, buf, 4), 4, 1, s->fid);
 
   // BlockAlign
   blockalign = s->channels * s->bitspersample / 8;
-  written += fwrite(write_little_endian(blockalign, buf, 2), 2, 1, s->fid);
+  fwrite(write_little_endian(blockalign, buf, 2), 2, 1, s->fid);
 
   // BitsPerSample
-  written += fwrite(write_little_endian(s->bitspersample, buf, 2), 2, 1, s->fid);
+  fwrite(write_little_endian(s->bitspersample, buf, 2), 2, 1, s->fid);
 
   // Subchunk2ID
-  written += fwrite("data", 4, 1, s->fid);
+  fwrite("data", 4, 1, s->fid);
 
   // Subchunk1Size (0 for now, actual size will be written in _close)
-  written += fwrite(write_little_endian(0, buf, 4), 4, 1, s->fid);
-
-  // fwrite(*, *, 1, s->fid) was called 13 times, check success
-  if (written != 13 || fflush(s->fid)) {
-    AUBIO_STRERR("sink_wavwrite: writing header to %s failed"
-        " (wrote %d/%d, %s)\n", s->path, written, 13, errorstr);
-    fclose(s->fid);
-    s->fid = NULL;
-    return AUBIO_FAIL;
-  }
+  fwrite(write_little_endian(0, buf, 4), 4, 1, s->fid);
 
   s->scratch_size = s->max_size * s->channels;
@@ -235 +227 @@
 }
 
-static
-void aubio_sink_wavwrite_write_frames(aubio_sink_wavwrite_t *s, uint_t write)
-{
-  uint_t written_frames = 0;
-
-  written_frames = fwrite(s->scratch_data, 2 * s->channels, write, s->fid);
-
-  if (written_frames != write) {
-    AUBIO_STRERR("sink_wavwrite: trying to write %d frames to %s, but only %d"
-        " could be written (%s)\n", write, s->path, written_frames, errorstr);
-  }
-  s->total_frames_written += written_frames;
-}
 
 void aubio_sink_wavwrite_do(aubio_sink_wavwrite_t *s, fvec_t * write_data, uint_t write){
-  uint_t c = 0, i = 0;
+  uint_t c = 0, i = 0, written_frames = 0;
   uint_t length = aubio_sink_validate_input_length("sink_wavwrite", s->path,
       s->max_size, write_data->length, write);
@@ -259 +238 @@
     }
   }
-
-  aubio_sink_wavwrite_write_frames(s, length);
+  written_frames = fwrite(s->scratch_data, 2, length * s->channels, s->fid);
+
+  if (written_frames != write) {
+    AUBIO_WRN("sink_wavwrite: trying to write %d frames to %s, "
+        "but only %d could be written\n", write, s->path, written_frames);
+  }
+  s->total_frames_written += written_frames;
+  return;
 }
 
 void aubio_sink_wavwrite_do_multi(aubio_sink_wavwrite_t *s, fmat_t * write_data, uint_t write){
-  uint_t c = 0, i = 0;
+  uint_t c = 0, i = 0, written_frames = 0;
 
   uint_t channels = aubio_sink_validate_input_channels("sink_wavwrite", s->path,
@@ -276 +261 @@
     }
   }
-
-  aubio_sink_wavwrite_write_frames(s, length);
+  written_frames = fwrite(s->scratch_data, 2, length * s->channels, s->fid);
+
+  if (written_frames != write * s->channels) {
+    AUBIO_WRN("sink_wavwrite: trying to write %d frames to %s, "
+        "but only %d could be written\n", write, s->path, written_frames / s->channels);
+  }
+  s->total_frames_written += written_frames;
+  return;
 }
 
@@ -283 +274 @@
   uint_t data_size = s->total_frames_written * s->bitspersample * s->channels / 8;
   unsigned char buf[5];
-  size_t written = 0, err = 0;
   if (!s->fid) return AUBIO_FAIL;
   // ChunkSize
-  err += fseek(s->fid, 4, SEEK_SET);
-  written += fwrite(write_little_endian(data_size + 36, buf, 4), 4, 1, s->fid);
+  fseek(s->fid, 4, SEEK_SET);
+  fwrite(write_little_endian(data_size + 36, buf, 4), 4, 1, s->fid);
   // Subchunk2Size
-  err += fseek(s->fid, 40, SEEK_SET);
-  written += fwrite(write_little_endian(data_size, buf, 4), 4, 1, s->fid);
-  if (written != 2 || err != 0) {
-    AUBIO_STRERR("sink_wavwrite: updating header of %s failed, expected %d"
-        " write but got only %d (%s)\n", s->path, 2, written, errorstr);
-  }
+  fseek(s->fid, 40, SEEK_SET);
+  fwrite(write_little_endian(data_size, buf, 4), 4, 1, s->fid);
   // close file
   if (fclose(s->fid)) {
-    AUBIO_STRERR("sink_wavwrite: Error closing file %s (%s)\n", s->path, errorstr);
+    AUBIO_ERR("sink_wavwrite: Error closing file %s (%s)\n", s->path, strerror(errno));
   }
   s->fid = NULL;