From aab0afaa827ebe84fa014cb53ce4c36c455dcad9 Mon Sep 17 00:00:00 2001 From: Moritz Grimm Date: Wed, 27 May 2015 00:21:44 +0200 Subject: [PATCH] Fix media type handing wrt playlists This was a regression introduced by the cfg refactor --- src/ezstream.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ezstream.c b/src/ezstream.c index bc1a3a6..674ac63 100644 --- a/src/ezstream.c +++ b/src/ezstream.c @@ -935,15 +935,22 @@ streamPlaylist(shout_t *shout) char lastSong[PATH_MAX]; if (playlist == NULL) { - if (CFG_MEDIA_PROGRAM == cfg_get_media_type()) { + switch (cfg_get_media_type()) { + case CFG_MEDIA_PROGRAM: if ((playlist = playlist_program(cfg_get_media_filename())) == NULL) return (0); - } else { + break; + case CFG_MEDIA_STDIN: + if ((playlist = playlist_read(NULL)) == NULL) + return (0); + break; + default: if ((playlist = playlist_read(cfg_get_media_filename())) == NULL) return (0); if (playlist_get_num_items(playlist) == 0) - log_notice("%s: playlist empty", + log_warning("%s: playlist empty", cfg_get_media_filename()); + break; } } else { /*