oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Decoder, Playlist: ignore URI query string for plugin detection

Browse Source 
Use the new uri_get_suffix() overload that removes the query string.
This commit is contained in:
Max Kellermann 2014-11-01 13:20:39 +01:00
parent eab32f2e5d
commit 7d5442e103
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -4,6 +4,7 @@ ver 0.19.2 (not yet released)
- m3u: don't ignore unterminated last line - m3u: don't ignore unterminated last line
- m3u: recognize the file suffix ".m3u8" - m3u: recognize the file suffix ".m3u8"
* decoder * decoder
- ignore URI query string for plugin detection
- faad: remove workaround for ancient libfaad2 ABI bug - faad: remove workaround for ancient libfaad2 ABI bug
- ffmpeg: recognize MIME type audio/aacp - ffmpeg: recognize MIME type audio/aacp
- mad: fix negative replay gain values - mad: fix negative replay gain values

3
src/TagStream.cxx
View File

@ -46,7 +46,8 @@ tag_stream_scan(InputStream &is, const tag_handler &handler, void *ctx)
{ {
assert(is.IsReady()); assert(is.IsReady());
const char *const suffix = uri_get_suffix(is.GetURI()); UriSuffixBuffer suffix_buffer;
const char *const suffix = uri_get_suffix(is.GetURI(), suffix_buffer);
const char *const mime = is.GetMimeType(); const char *const mime = is.GetMimeType();
if (suffix == nullptr && mime == nullptr) if (suffix == nullptr && mime == nullptr)

3
src/decoder/DecoderThread.cxx
View File

@ -237,7 +237,8 @@ static bool
decoder_run_stream_locked(Decoder &decoder, InputStream &is, decoder_run_stream_locked(Decoder &decoder, InputStream &is,
const char *uri, bool &tried_r) const char *uri, bool &tried_r)
{ {
const char *const suffix = uri_get_suffix(uri); UriSuffixBuffer suffix_buffer;
const char *const suffix = uri_get_suffix(uri, suffix_buffer);
using namespace std::placeholders; using namespace std::placeholders;
const auto f = std::bind(decoder_run_stream_plugin, const auto f = std::bind(decoder_run_stream_plugin,

9
src/playlist/PlaylistRegistry.cxx
View File

@ -139,12 +139,12 @@ static SongEnumerator *
playlist_list_open_uri_suffix(const char *uri, Mutex &mutex, Cond &cond, playlist_list_open_uri_suffix(const char *uri, Mutex &mutex, Cond &cond,
const bool *tried) const bool *tried)
{ {
const char *suffix;
SongEnumerator *playlist = nullptr; SongEnumerator *playlist = nullptr;
assert(uri != 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) if (suffix == nullptr)
return nullptr; return nullptr;
@ -257,7 +257,10 @@ playlist_list_open_stream(InputStream &is, const char *uri)
return playlist; 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) { if (suffix != nullptr) {
auto playlist = playlist_list_open_stream_suffix(is, suffix); auto playlist = playlist_list_open_stream_suffix(is, suffix);
if (playlist != nullptr) if (playlist != nullptr)