aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-06-01 01:07:02 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-06-01 01:07:02 +0000
commitaa2d56c81c3c7e83f827f6292bc5ec4f44881b93 (patch)
treeace7ff9e091b253e7febd30503700868850a16cc
parent6a16e08f9abbf608329b33059d2c98998b57878e (diff)
downloadmpd-aa2d56c81c3c7e83f827f6292bc5ec4f44881b93.tar.gz
mpd-aa2d56c81c3c7e83f827f6292bc5ec4f44881b93.tar.xz
mpd-aa2d56c81c3c7e83f827f6292bc5ec4f44881b93.zip
fix for bastard mp3 streams
git-svn-id: https://svn.musicpd.org/mpd/trunk@1268 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--src/decode.c5
-rw-r--r--src/inputPlugin.h4
2 files changed, 5 insertions, 4 deletions
diff --git a/src/decode.c b/src/decode.c
index b361b62f3..d403c5e25 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -304,6 +304,11 @@ void decodeStart(PlayerControl * pc, OutputBuffer * cb, DecoderControl * dc) {
plugin = getInputPluginFromSuffix(
getSuffix(dc->utf8url));
}
+ /* this is needed for bastard streams that don't have a suffix
+ or set the mimeType */
+ if(plugin == NULL) {
+ plugin = getInputPluginFromName("mp3");
+ }
if(plugin && (plugin->streamTypes & INPUT_PLUGIN_STREAM_URL) &&
plugin->streamDecodeFunc)
{
diff --git a/src/inputPlugin.h b/src/inputPlugin.h
index 940789744..0968bae8b 100644
--- a/src/inputPlugin.h
+++ b/src/inputPlugin.h
@@ -47,10 +47,6 @@ InputPlugin * getInputPluginFromMimeType(char * mimeType);
InputPlugin * getInputPluginFromName(char * name);
-/* this is needed b/c shoutcast and such don't indicate the proper mime type
- and don't have a suffix in the url! */
-InputPlugin * getDefaultInputPlugin();
-
/* this is where we "load" all the "plugins" ;-) */
void initInputPlugins();