Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
7d5442e1
Commit
7d5442e1
authored
Nov 01, 2014
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Decoder, Playlist: ignore URI query string for plugin detection
Use the new uri_get_suffix() overload that removes the query string.
parent
eab32f2e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
5 deletions
+11
-5
NEWS
NEWS
+1
-0
TagStream.cxx
src/TagStream.cxx
+2
-1
DecoderThread.cxx
src/decoder/DecoderThread.cxx
+2
-1
PlaylistRegistry.cxx
src/playlist/PlaylistRegistry.cxx
+6
-3
No files found.
NEWS
View file @
7d5442e1
...
...
@@ -4,6 +4,7 @@ ver 0.19.2 (not yet released)
- m3u: don't ignore unterminated last line
- m3u: recognize the file suffix ".m3u8"
* decoder
- ignore URI query string for plugin detection
- faad: remove workaround for ancient libfaad2 ABI bug
- ffmpeg: recognize MIME type audio/aacp
- mad: fix negative replay gain values
...
...
src/TagStream.cxx
View file @
7d5442e1
...
...
@@ -46,7 +46,8 @@ tag_stream_scan(InputStream &is, const tag_handler &handler, void *ctx)
{
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
();
if
(
suffix
==
nullptr
&&
mime
==
nullptr
)
...
...
src/decoder/DecoderThread.cxx
View file @
7d5442e1
...
...
@@ -237,7 +237,8 @@ static bool
decoder_run_stream_locked
(
Decoder
&
decoder
,
InputStream
&
is
,
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
;
const
auto
f
=
std
::
bind
(
decoder_run_stream_plugin
,
...
...
src/playlist/PlaylistRegistry.cxx
View file @
7d5442e1
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment