summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Holmgren <magnushol@gmail.com>2006-12-08 13:55:14 +0000
committerMagnus Holmgren <magnushol@gmail.com>2006-12-08 13:55:14 +0000
commitd00f1d599a7fe422da450836774fd6ce2ed09b3d (patch)
tree4c8a05f730beecfa049d92a6f93923100eb9ce7e
parente9163b4fb45cbf4322fb3a7febbe3b8e54b38b9a (diff)
downloadrockbox-d00f1d599a7fe422da450836774fd6ce2ed09b3d.tar.gz
rockbox-d00f1d599a7fe422da450836774fd6ce2ed09b3d.zip
Add "m4b" to the list of supported filename extensions.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11689 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/stats.c4
-rw-r--r--apps/tree.c1
-rw-r--r--firmware/id3.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c
index 0a1f2e48f9..8b02152a1b 100644
--- a/apps/plugins/stats.c
+++ b/apps/plugins/stats.c
@@ -64,8 +64,8 @@ static int fontwidth, fontheight;
64 64
65/* TODO: Better get the exts from the filetypes var in tree.c */ 65/* TODO: Better get the exts from the filetypes var in tree.c */
66const char *music_exts[] = {"mp3","mp2","mp1","mpa","ogg", 66const char *music_exts[] = {"mp3","mp2","mp1","mpa","ogg",
67 "wav","flac","ac3","a52","mpc","wv","m4a","mp4","shn", 67 "wav","flac","ac3","a52","mpc","wv","m4a","m4b","mp4",
68 "aif","aiff"}; 68 "shn","aif","aiff"};
69 69
70void prn(const char *str, int y) 70void prn(const char *str, int y)
71{ 71{
diff --git a/apps/tree.c b/apps/tree.c
index 24b5c2114c..17da91d72b 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -101,6 +101,7 @@ const struct filetype filetypes[] = {
101 { "mpc", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, 101 { "mpc", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA },
102 { "wv", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, 102 { "wv", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA },
103 { "m4a", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, 103 { "m4a", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA },
104 { "m4b", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA },
104 { "mp4", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, 105 { "mp4", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA },
105 { "shn", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, 106 { "shn", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA },
106 { "aif", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, 107 { "aif", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA },
diff --git a/firmware/id3.c b/firmware/id3.c
index 74cea7f037..21c6730e29 100644
--- a/firmware/id3.c
+++ b/firmware/id3.c
@@ -85,7 +85,7 @@ const struct afmt_entry audio_formats[AFMT_NUM_CODECS] =
85 AFMT_ENTRY("WV", "wavpack", "wavpack_enc", "wv\0" ), 85 AFMT_ENTRY("WV", "wavpack", "wavpack_enc", "wv\0" ),
86 /* Apple Lossless Audio Codec */ 86 /* Apple Lossless Audio Codec */
87 [AFMT_ALAC] = 87 [AFMT_ALAC] =
88 AFMT_ENTRY("ALAC", "alac", NULL, "m4a\0" ), 88 AFMT_ENTRY("ALAC", "alac", NULL, "m4a\0m4b\0" ),
89 /* Advanced Audio Coding in M4A container */ 89 /* Advanced Audio Coding in M4A container */
90 [AFMT_AAC] = 90 [AFMT_AAC] =
91 AFMT_ENTRY("AAC", "aac", NULL, "mp4\0" ), 91 AFMT_ENTRY("AAC", "aac", NULL, "mp4\0" ),