From 394e3be482ed492e5d90222dab828c2448fbccce Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 26 Oct 2014 08:14:16 +0100 Subject: playlist/m3u: recognize the file suffix ".m3u8" --- src/playlist/plugins/ExtM3uPlaylistPlugin.cxx | 1 + src/playlist/plugins/M3uPlaylistPlugin.cxx | 1 + 2 files changed, 2 insertions(+) (limited to 'src/playlist') diff --git a/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx b/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx index fdd4357ca..93316ca6c 100644 --- a/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx +++ b/src/playlist/plugins/ExtM3uPlaylistPlugin.cxx @@ -130,6 +130,7 @@ ExtM3uPlaylist::NextSong() static const char *const extm3u_suffixes[] = { "m3u", + "m3u8", nullptr }; diff --git a/src/playlist/plugins/M3uPlaylistPlugin.cxx b/src/playlist/plugins/M3uPlaylistPlugin.cxx index a4125bc70..0428d291a 100644 --- a/src/playlist/plugins/M3uPlaylistPlugin.cxx +++ b/src/playlist/plugins/M3uPlaylistPlugin.cxx @@ -60,6 +60,7 @@ M3uPlaylist::NextSong() static const char *const m3u_suffixes[] = { "m3u", + "m3u8", nullptr }; -- cgit v1.2.3 From 7d5442e1039869d659533eafcf15d8157bf4c465 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 1 Nov 2014 13:20:39 +0100 Subject: Decoder, Playlist: ignore URI query string for plugin detection Use the new uri_get_suffix() overload that removes the query string. --- src/playlist/PlaylistRegistry.cxx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/playlist') diff --git a/src/playlist/PlaylistRegistry.cxx b/src/playlist/PlaylistRegistry.cxx index bc5932de3..4e9ef890e 100644 --- a/src/playlist/PlaylistRegistry.cxx +++ b/src/playlist/PlaylistRegistry.cxx @@ -139,12 +139,12 @@ static SongEnumerator * playlist_list_open_uri_suffix(const char *uri, Mutex &mutex, Cond &cond, const bool *tried) { - const char *suffix; SongEnumerator *playlist = nullptr; assert(uri != nullptr); - suffix = uri_get_suffix(uri); + UriSuffixBuffer suffix_buffer; + const char *const suffix = uri_get_suffix(uri, suffix_buffer); if (suffix == nullptr) return nullptr; @@ -257,7 +257,10 @@ playlist_list_open_stream(InputStream &is, const char *uri) return playlist; } - const char *suffix = uri != nullptr ? uri_get_suffix(uri) : nullptr; + UriSuffixBuffer suffix_buffer; + const char *suffix = uri != nullptr + ? uri_get_suffix(uri, suffix_buffer) + : nullptr; if (suffix != nullptr) { auto playlist = playlist_list_open_stream_suffix(is, suffix); if (playlist != nullptr) -- cgit v1.2.3