Changeset c0a1906

Timestamp:

Dec 17, 2018, 2:01:06 AM (6 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/timestretch, fix/ffmpeg5, master

Children:

0512fca

Parents:

d16fbba

Message:

[source] simplify and avoid unrequired checks

Location:

src/io

Files:

• source.c (modified) (1 diff)
• source_apple_audio.c (modified) (2 diffs)
• source_avcodec.c (modified) (2 diffs)
• source_sndfile.c (modified) (1 diff)
• source_wavread.c (modified) (2 diffs)

src/io/source.c

@@ -139 +139 @@
 
 void del_aubio_source(aubio_source_t * s) {
+  AUBIO_ASSERT(s);
   if (s->s_del && s->source)
     s->s_del((void *)s->source);

src/io/source_apple_audio.c

@@ -95 +95 @@
   UInt32 propSize;
 
-  if (s->path) AUBIO_FREE(s->path);
   s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX) + 1);
   strncpy(s->path, path, strnlen(path, PATH_MAX) + 1);
@@ -294 +293 @@
 
 void del_aubio_source_apple_audio(aubio_source_apple_audio_t * s){
+  AUBIO_ASSERT(s);
   aubio_source_apple_audio_close (s);
   if (s->path) AUBIO_FREE(s->path);
   freeAudioBufferList(&s->bufferList);
   AUBIO_FREE(s);
-  return;
 }
 

src/io/source_avcodec.c

@@ -148 +148 @@
   s->channels = 1;
 
-  if (s->path) AUBIO_FREE(s->path);
   s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX) + 1);
   strncpy(s->path, path, strnlen(path, PATH_MAX) + 1);
@@ -640 +639 @@
 
 void del_aubio_source_avcodec(aubio_source_avcodec_t * s){
-  if (!s) return;
+  AUBIO_ASSERT(s);
   aubio_source_avcodec_close(s);
   if (s->output != NULL) {

src/io/source_sndfile.c

@@ -331 +331 @@
 
 void del_aubio_source_sndfile(aubio_source_sndfile_t * s){
-  if (!s) return;
+  AUBIO_ASSERT(s);
   aubio_source_sndfile_close(s);
 #ifdef HAVE_SAMPLERATE

src/io/source_wavread.c

@@ -92 +92 @@
   }
 
-  if (s->path) AUBIO_FREE(s->path);
   s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX) + 1);
   strncpy(s->path, path, strnlen(path, PATH_MAX) + 1);
@@ -472 +471 @@
 
 void del_aubio_source_wavread(aubio_source_wavread_t * s) {
-  if (!s) return;
+  AUBIO_ASSERT(s);
   aubio_source_wavread_close(s);
   if (s->short_output) AUBIO_FREE(s->short_output);