diff options
author | Magnus Holmgren <magnushol@gmail.com> | 2006-09-10 10:59:51 +0000 |
---|---|---|
committer | Magnus Holmgren <magnushol@gmail.com> | 2006-09-10 10:59:51 +0000 |
commit | e605786b2a737246e5813b5af1a910a0797f36de (patch) | |
tree | cfa8eccbf265e617d89a07c48f2d41f4db34f38a /apps | |
parent | a4858cfa1c0f3c271ebc301b75769fdac74d3a20 (diff) | |
download | rockbox-e605786b2a737246e5813b5af1a910a0797f36de.tar.gz rockbox-e605786b2a737246e5813b5af1a910a0797f36de.zip |
Patch #5770 by Dominik Riebeling: Skip BOM in playlists. Add '.m3u8' as a supported playlist extension.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10917 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/playlist.c | 8 | ||||
-rw-r--r-- | apps/tree.c | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/apps/playlist.c b/apps/playlist.c index aa84bb090f..2f0895a590 100644 --- a/apps/playlist.c +++ b/apps/playlist.c | |||
@@ -501,6 +501,14 @@ static int add_indices_to_playlist(struct playlist_info* playlist, | |||
501 | 501 | ||
502 | p = (unsigned char *)buffer; | 502 | p = (unsigned char *)buffer; |
503 | 503 | ||
504 | /* utf8 BOM at beginning of file? */ | ||
505 | if(i == 0 && nread > 3 | ||
506 | && *p == 0xef && *(p+1) == 0xbb && *(p+2) == 0xbf) { | ||
507 | nread -= 3; | ||
508 | p += 3; | ||
509 | i += 3; | ||
510 | } | ||
511 | |||
504 | for(count=0; count < nread; count++,p++) { | 512 | for(count=0; count < nread; count++,p++) { |
505 | 513 | ||
506 | /* Are we on a new line? */ | 514 | /* Are we on a new line? */ |
diff --git a/apps/tree.c b/apps/tree.c index 82a7a3b1b6..50ad92239e 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -106,6 +106,7 @@ const struct filetype filetypes[] = { | |||
106 | { "sid", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, | 106 | { "sid", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, |
107 | #endif | 107 | #endif |
108 | { "m3u", TREE_ATTR_M3U, Icon_Playlist, LANG_PLAYLIST }, | 108 | { "m3u", TREE_ATTR_M3U, Icon_Playlist, LANG_PLAYLIST }, |
109 | { "m3u8", TREE_ATTR_M3U, Icon_Playlist, LANG_PLAYLIST }, | ||
109 | { "cfg", TREE_ATTR_CFG, Icon_Config, VOICE_EXT_CFG }, | 110 | { "cfg", TREE_ATTR_CFG, Icon_Config, VOICE_EXT_CFG }, |
110 | { "wps", TREE_ATTR_WPS, Icon_Wps, VOICE_EXT_WPS }, | 111 | { "wps", TREE_ATTR_WPS, Icon_Wps, VOICE_EXT_WPS }, |
111 | #ifdef HAVE_REMOTE_LCD | 112 | #ifdef HAVE_REMOTE_LCD |