Changeset 20ce2ad

Timestamp:

Dec 18, 2018, 1:07:13 AM (5 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

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

Children:

0da5208

Parents:

d286fe4

Message:

[utils] move string routines to strutils.c

Location:

src

Files:

• io/sink.c (modified) (3 diffs)
• utils/strutils.c (added)

src/io/sink.c

@@ -54 +54 @@
 };
 
+extern uint_t aubio_str_path_has_extension(const char_t *filename,
+    const char_t *pattern);
+
 #ifdef HAVE_VORBISENC
 typedef struct _aubio_sink_vorbis_t aubio_sink_vorbis_t;
@@ -92 +95 @@
 #endif /* HAVE_FLAC */
 
-static const char_t *aubio_get_extension(const char_t *filename)
-{
-  if (!filename) return NULL;
-  // find last occurence of dot character
-  const char_t *ext = strrchr(filename, '.');
-  if (!ext || ext == filename) return "";
-  else return ext + 1;
-}
-
 aubio_sink_t * new_aubio_sink(const char_t * uri, uint_t samplerate) {
   aubio_sink_t * s = AUBIO_NEW(aubio_sink_t);
-#if defined(HAVE_VORBISENC) || defined(HAVE_FLAC)
-  const char_t * uri_ext = aubio_get_extension(uri);
-#endif /* defined(HAVE_VORBISENC) || defined(HAVE_FLAC) */
 
 #ifdef HAVE_VORBISENC
   // check if this uri could be for us
-  uint_t match_oggstream = 0;
-  if (uri_ext && strcmp (uri_ext, "ogg") == 0) match_oggstream = 1;
-  if (match_oggstream) {
+  if (aubio_str_path_has_extension(uri, "ogg")) {
     s->sink = (void *)new_aubio_sink_vorbis(uri, samplerate);
     if (s->sink) {
@@ -129 +118 @@
 #ifdef HAVE_FLAC
   // check if this uri could be for us
-  uint_t match_flacstream = 0;
-  if (uri_ext && strcmp (uri_ext, "flac") == 0) match_flacstream = 1;
-  if (match_flacstream) {
+  if (aubio_str_path_has_extension(uri, "flac")) {
     s->sink = (void *)new_aubio_sink_flac(uri, samplerate);
     if (s->sink) {