summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-06-18 09:51:10 +0000
committerJens Arnold <amiconn@rockbox.org>2005-06-18 09:51:10 +0000
commite2cd58145d90eac8e33f6e3684e73cf2b83692d3 (patch)
treee43d2c70b4f984b11b4508d045048d34f20b39ec
parent59b78940e83f4ef9b2b7404b6a405c94c0568bba (diff)
downloadrockbox-e2cd58145d90eac8e33f6e3684e73cf2b83692d3.zip
rockbox-e2cd58145d90eac8e33f6e3684e73cf2b83692d3.tar.gz
rockbox-e2cd58145d90eac8e33f6e3684e73cf2b83692d3.tar.bz2
rockbox-e2cd58145d90eac8e33f6e3684e73cf2b83692d3.tar.xz
Proper MPEG layer 1 support.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6745 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/metadata.c1
-rw-r--r--apps/playback.c3
-rw-r--r--apps/tree.c1
3 files changed, 4 insertions, 1 deletions
diff --git a/apps/metadata.c b/apps/metadata.c
index a4b373c..e4b4cf0 100644
--- a/apps/metadata.c
+++ b/apps/metadata.c
@@ -95,6 +95,7 @@ bool get_metadata(struct track_info* track, int fd, const char* trackname,
/* Load codec specific track tag information. */
switch (track->codectype) {
+ case AFMT_MPA_L1:
case AFMT_MPA_L2:
case AFMT_MPA_L3:
/* Should check the return value. */
diff --git a/apps/playback.c b/apps/playback.c
index cac0eae..fb9a788 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -498,9 +498,10 @@ bool loadcodec(const char *trackname, bool start_play)
logf("Codec: Vorbis");
codec_path = CODEC_VORBIS;
break;
+ case AFMT_MPA_L1:
case AFMT_MPA_L2:
case AFMT_MPA_L3:
- logf("Codec: MPA L2/L3");
+ logf("Codec: MPA L1/L2/L3");
codec_path = CODEC_MPA_L3;
break;
case AFMT_PCM_WAV:
diff --git a/apps/tree.c b/apps/tree.c
index 652a4e5..a147c21 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -73,6 +73,7 @@ const struct filetype filetypes[] = {
{ ".mpa", TREE_ATTR_MPA, File, VOICE_EXT_MPA },
#if CONFIG_HWCODEC == MASNONE
/* Temporary hack to allow playlist creation */
+ { ".mp1", TREE_ATTR_MPA, File, VOICE_EXT_MPA },
{ ".ogg", TREE_ATTR_MPA, File, VOICE_EXT_MPA },
{ ".wma", TREE_ATTR_MPA, File, VOICE_EXT_MPA },
{ ".wav", TREE_ATTR_MPA, File, VOICE_EXT_MPA },