Changeset 1c565c0 for src/io/source_sndfile.c

Timestamp:

Dec 21, 2018, 8:06:24 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

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

Children:

4cb2d54, 6245b52

Parents:

cf4bc9f (diff), 131d1eb (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_vorbis' into feature/sink_flac

File:

• src/io/source_sndfile.c (modified) (2 diffs)

src/io/source_sndfile.c

@@ -175 +175 @@
   sf_count_t read_samples = aubio_sf_read_smpl (s->handle, s->scratch_data,
       s->scratch_size);
+  if (!s->handle) {
+    AUBIO_ERR("source_sndfile: could not read from %s (file was closed)\n",
+        s->path);
+    *read = 0;
+    return;
+  }
 
   uint_t read_length = read_samples / s->input_channels;
@@ -220 +226 @@
   sf_count_t read_samples = aubio_sf_read_smpl (s->handle, s->scratch_data,
       s->scratch_size);
+  if (!s->handle) {
+    AUBIO_ERR("source_sndfile: could not read from %s (file was closed)\n",
+        s->path);
+    *read = 0;
+    return;
+  }
 
   uint_t read_length = read_samples / s->input_channels;