aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2007-01-14 03:07:50 +0000
committerEric Wong <normalperson@yhbt.net>2007-01-14 03:07:50 +0000
commit45716f877b940ffa38efc82d1692cbcc216caba2 (patch)
tree992bbd9d70d286ae852bab6c81880cffe0615b5d
parent3c2d123ab95227f7382fbaef56f25318b57d4ea8 (diff)
downloadmpd-45716f877b940ffa38efc82d1692cbcc216caba2.tar.gz
mpd-45716f877b940ffa38efc82d1692cbcc216caba2.tar.xz
mpd-45716f877b940ffa38efc82d1692cbcc216caba2.zip
flac/ogg/oggflac: keep old mime-types in addition to the new ones
We'll be dealing with legacy server configurations for a long time to come. git-svn-id: https://svn.musicpd.org/mpd/trunk@5253 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--src/inputPlugins/flac_plugin.c9
-rw-r--r--src/inputPlugins/oggflac_plugin.c5
-rw-r--r--src/inputPlugins/oggvorbis_plugin.c5
3 files changed, 15 insertions, 4 deletions
diff --git a/src/inputPlugins/flac_plugin.c b/src/inputPlugins/flac_plugin.c
index 81dc223ab..0b5ad5752 100644
--- a/src/inputPlugins/flac_plugin.c
+++ b/src/inputPlugins/flac_plugin.c
@@ -478,7 +478,10 @@ static unsigned int oggflac_try_decode(InputStream * inStream)
}
static char *oggflac_suffixes[] = { "ogg", NULL };
-static char *oggflac_mime_types[] = { "audio/x-flac+ogg", NULL };
+static char *oggflac_mime_types[] = { "audio/x-flac+ogg",
+ "application/ogg",
+ "application/x-ogg",
+ NULL };
static int flac_plugin_init(void)
{
@@ -503,7 +506,9 @@ static int flac_plugin_init(void)
#endif /* FLAC_API_VERSION_CURRENT >= 7 */
static char *flacSuffixes[] = { "flac", NULL };
-static char *flac_mime_types[] = { "audio/x-flac", NULL };
+static char *flac_mime_types[] = { "audio/x-flac",
+ "application/x-flac",
+ NULL };
InputPlugin flacPlugin = {
"flac",
diff --git a/src/inputPlugins/oggflac_plugin.c b/src/inputPlugins/oggflac_plugin.c
index 2384df140..4b03d5c7b 100644
--- a/src/inputPlugins/oggflac_plugin.c
+++ b/src/inputPlugins/oggflac_plugin.c
@@ -398,7 +398,10 @@ fail:
}
static char *oggflac_Suffixes[] = { "ogg", NULL };
-static char *oggflac_mime_types[] = { "audio/x-flac+ogg", NULL };
+static char *oggflac_mime_types[] = { "audio/x-flac+ogg",
+ "application/ogg",
+ "application/x-ogg",
+ NULL };
InputPlugin oggflacPlugin = {
"oggflac",
diff --git a/src/inputPlugins/oggvorbis_plugin.c b/src/inputPlugins/oggvorbis_plugin.c
index 609df24ec..f032824b2 100644
--- a/src/inputPlugins/oggvorbis_plugin.c
+++ b/src/inputPlugins/oggvorbis_plugin.c
@@ -409,7 +409,10 @@ static unsigned int oggvorbis_try_decode(InputStream * inStream)
}
static char *oggvorbis_Suffixes[] = { "ogg", NULL };
-static char *oggvorbis_MimeTypes[] = { "application/ogg", "application/x-ogg",NULL };
+static char *oggvorbis_MimeTypes[] = { "application/ogg",
+ "audio/x-vorbis+ogg",
+ "application/x-ogg",
+ NULL };
InputPlugin oggvorbisPlugin = {
"oggvorbis",