Changeset ad1ba08 for src/io

Timestamp:

Sep 20, 2014, 3:26:13 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:

ffc1f79

Parents:

9657163

Message:

src/io/sink_sndfile.c: improve error messages, set nsamples after write

File:

• src/io/sink_sndfile.c (modified) (4 diffs)

src/io/sink_sndfile.c

@@ -142 +142 @@
 void aubio_sink_sndfile_do(aubio_sink_sndfile_t *s, fvec_t * write_data, uint_t write){
   uint_t i, j,  channels = s->channels;
-  int nsamples = channels*write;
+  int nsamples = 0;
   smpl_t *pwrite;
   sf_count_t written_frames;
 
   if (write > s->max_size) {
-    AUBIO_WRN("trying to write %d frames, but only %d can be written at a time",
+    AUBIO_WRN("sink_sndfile: trying to write %d frames, but only %d can be written at a time\n",
       write, s->max_size);
     write = s->max_size;
   }
+
+  nsamples = channels * write;
 
   /* interleaving data  */
@@ -162 +164 @@
   written_frames = sf_write_float (s->handle, s->scratch_data, nsamples);
   if (written_frames/channels != write) {
-    AUBIO_WRN("sink_sndfile: trying to write %d frames to %s, but only %d could be written",
+    AUBIO_WRN("sink_sndfile: trying to write %d frames to %s, but only %d could be written\n",
       write, s->path, (uint_t)written_frames);
   }
@@ -170 +172 @@
 void aubio_sink_sndfile_do_multi(aubio_sink_sndfile_t *s, fmat_t * write_data, uint_t write){
   uint_t i, j,  channels = s->channels;
-  int nsamples = channels*write;
+  int nsamples = 0;
   smpl_t *pwrite;
   sf_count_t written_frames;
 
   if (write > s->max_size) {
-    AUBIO_WRN("trying to write %d frames, but only %d can be written at a time",
+    AUBIO_WRN("sink_sndfile: trying to write %d frames, but only %d can be written at a time\n",
       write, s->max_size);
     write = s->max_size;
   }
+
+  nsamples = channels * write;
 
   /* interleaving data  */
@@ -190 +194 @@
   written_frames = sf_write_float (s->handle, s->scratch_data, nsamples);
   if (written_frames/channels != write) {
-    AUBIO_WRN("sink_sndfile: trying to write %d frames to %s, but only %d could be written",
+    AUBIO_WRN("sink_sndfile: trying to write %d frames to %s, but only %d could be written\n",
       write, s->path, (uint_t)written_frames);
   }