aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Alexander Treuman <jat@spatialrift.net>2006-07-25 22:08:55 +0000
committerJ. Alexander Treuman <jat@spatialrift.net>2006-07-25 22:08:55 +0000
commit356f16a8770ab87a4c32526d6468cf08f7cc7e20 (patch)
tree9368ad818a1c741bd546a141084f56f88a3290de
parent073970ec4a5f1d309127f4213ac9f965f9d44043 (diff)
downloadmpd-356f16a8770ab87a4c32526d6468cf08f7cc7e20.tar.gz
mpd-356f16a8770ab87a4c32526d6468cf08f7cc7e20.tar.xz
mpd-356f16a8770ab87a4c32526d6468cf08f7cc7e20.zip
Add support for mp1/2. Thanks to Stephan Beyer for the patch.
git-svn-id: https://svn.musicpd.org/mpd/trunk@4458 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--src/inputPlugins/mp3_plugin.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c
index 8d0df599e..bbcaa1baa 100644
--- a/src/inputPlugins/mp3_plugin.c
+++ b/src/inputPlugins/mp3_plugin.c
@@ -378,7 +378,10 @@ static int decodeNextFrameHeader(mp3DecodeData * data, MpdTag ** tag,
}
}
}
- if (data->frame.header.layer != MAD_LAYER_III) {
+ if ((data->frame.header.layer != MAD_LAYER_III) &&
+ (data->frame.header.layer != MAD_LAYER_II) &&
+ (data->frame.header.layer != MAD_LAYER_I)) {
+ DEBUG("HERE 1\n");
return DECODE_SKIP;
}
@@ -923,7 +926,7 @@ static MpdTag *mp3_tagDup(char *file)
return ret;
}
-static char *mp3_suffixes[] = { "mp3", NULL };
+static char *mp3_suffixes[] = { "mp3", "mp2", NULL };
static char *mp3_mimeTypes[] = { "audio/mpeg", NULL };
InputPlugin mp3Plugin = {