diff options
author | Henrik Backe <henrik@backe.eu> | 2005-09-02 15:05:35 +0000 |
---|---|---|
committer | Henrik Backe <henrik@backe.eu> | 2005-09-02 15:05:35 +0000 |
commit | b2473d58ab1a7ff0722bd27f08ce5a8856cd5502 (patch) | |
tree | 3eca1349052d07ddf975956bdd2ab8f4bce6e309 | |
parent | acf14e05693125d3768de80d99d7cfff6c2b164a (diff) | |
download | rockbox-b2473d58ab1a7ff0722bd27f08ce5a8856cd5502.tar.gz rockbox-b2473d58ab1a7ff0722bd27f08ce5a8856cd5502.zip |
Fixed associate problem with file extensions (.info files matched .nfo extension)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7456 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/filetree.c | 2 | ||||
-rw-r--r-- | apps/filetypes.c | 9 | ||||
-rw-r--r-- | apps/filetypes.h | 2 | ||||
-rw-r--r-- | apps/tree.c | 46 | ||||
-rw-r--r-- | firmware/export/config-fmrecorder.h | 4 | ||||
-rw-r--r-- | firmware/export/config-h100.h | 4 | ||||
-rw-r--r-- | firmware/export/config-h120.h | 4 | ||||
-rw-r--r-- | firmware/export/config-h300.h | 4 | ||||
-rw-r--r-- | firmware/export/config-iaudiox5.h | 4 | ||||
-rw-r--r-- | firmware/export/config-ondiofm.h | 4 | ||||
-rw-r--r-- | firmware/export/config-ondiosp.h | 4 | ||||
-rw-r--r-- | firmware/export/config-player.h | 4 | ||||
-rw-r--r-- | firmware/export/config-recorder.h | 4 | ||||
-rw-r--r-- | firmware/export/config-recorderv2.h | 4 |
14 files changed, 50 insertions, 49 deletions
diff --git a/apps/filetree.c b/apps/filetree.c index 691a6adee6..8ecdc0c93d 100644 --- a/apps/filetree.c +++ b/apps/filetree.c | |||
@@ -240,7 +240,7 @@ int ft_load(struct tree_context* c, const char* tempdir) | |||
240 | dptr->attr = entry->attribute; | 240 | dptr->attr = entry->attribute; |
241 | 241 | ||
242 | /* check for known file types */ | 242 | /* check for known file types */ |
243 | if ( !(dptr->attr & ATTR_DIRECTORY) && (len > 4) ) | 243 | if ( !(dptr->attr & ATTR_DIRECTORY) ) |
244 | dptr->attr |= filetype_get_attr(entry->d_name); | 244 | dptr->attr |= filetype_get_attr(entry->d_name); |
245 | 245 | ||
246 | #ifdef BOOTFILE | 246 | #ifdef BOOTFILE |
diff --git a/apps/filetypes.c b/apps/filetypes.c index ace89154fc..30ab2c34e5 100644 --- a/apps/filetypes.c +++ b/apps/filetypes.c | |||
@@ -209,17 +209,18 @@ bool filetype_supported(int attr) | |||
209 | } | 209 | } |
210 | 210 | ||
211 | /* get the "dynamic" attribute for an extension */ | 211 | /* get the "dynamic" attribute for an extension */ |
212 | int filetype_get_attr(const char* name) | 212 | int filetype_get_attr(char* name) |
213 | { | 213 | { |
214 | int i; | 214 | int i; |
215 | char *cp; | ||
215 | 216 | ||
216 | for (i=0; i < cnt_exttypes; i++) | 217 | for (i=0; i < cnt_exttypes; i++) |
217 | { | 218 | { |
218 | if (exttypes[i].extension) | 219 | if (exttypes[i].extension) |
219 | { | 220 | { |
220 | if (!strcasecmp(&name[strlen(name)- | 221 | cp=strrchr(name,'.'); |
221 | strlen(exttypes[i].extension)], | 222 | if (cp) cp++; |
222 | exttypes[i].extension)) | 223 | if ((!strcasecmp(cp,exttypes[i].extension)) && (cp)) |
223 | { | 224 | { |
224 | return ((((unsigned long)exttypes[i].type - | 225 | return ((((unsigned long)exttypes[i].type - |
225 | (unsigned long)&filetypes[0]) / | 226 | (unsigned long)&filetypes[0]) / |
diff --git a/apps/filetypes.h b/apps/filetypes.h index e72dd6ffd3..200d338039 100644 --- a/apps/filetypes.h +++ b/apps/filetypes.h | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <tree.h> | 23 | #include <tree.h> |
24 | #include <menu.h> | 24 | #include <menu.h> |
25 | 25 | ||
26 | int filetype_get_attr(const char*); | 26 | int filetype_get_attr(char*); |
27 | #ifdef HAVE_LCD_BITMAP | 27 | #ifdef HAVE_LCD_BITMAP |
28 | const char* filetype_get_icon(int); | 28 | const char* filetype_get_icon(int); |
29 | #else | 29 | #else |
diff --git a/apps/tree.c b/apps/tree.c index c42d18beab..eec71aeb93 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -68,30 +68,30 @@ | |||
68 | 68 | ||
69 | /* a table for the know file types */ | 69 | /* a table for the know file types */ |
70 | const struct filetype filetypes[] = { | 70 | const struct filetype filetypes[] = { |
71 | { ".mp3", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, | 71 | { "mp3", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, |
72 | { ".mp2", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, | 72 | { "mp2", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, |
73 | { ".mpa", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, | 73 | { "mpa", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, |
74 | #if CONFIG_CODEC == SWCODEC | 74 | #if CONFIG_CODEC == SWCODEC |
75 | /* Temporary hack to allow playlist creation */ | 75 | /* Temporary hack to allow playlist creation */ |
76 | { ".mp1", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, | 76 | { "mp1", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, |
77 | { ".ogg", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, | 77 | { "ogg", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, |
78 | { ".wma", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, | 78 | { "wma", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, |
79 | { ".wav", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, | 79 | { "wav", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, |
80 | { ".flac", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, | 80 | { "flac", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, |
81 | { ".ac3", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, | 81 | { "ac3", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, |
82 | { ".a52", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, | 82 | { "a52", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, |
83 | { ".mpc", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, | 83 | { "mpc", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, |
84 | { ".wv", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, | 84 | { "wv", TREE_ATTR_MPA, Icon_Audio, VOICE_EXT_MPA }, |
85 | #endif | 85 | #endif |
86 | { ".m3u", TREE_ATTR_M3U, Icon_Playlist, LANG_PLAYLIST }, | 86 | { "m3u", TREE_ATTR_M3U, Icon_Playlist, LANG_PLAYLIST }, |
87 | { ".cfg", TREE_ATTR_CFG, Icon_Config, VOICE_EXT_CFG }, | 87 | { "cfg", TREE_ATTR_CFG, Icon_Config, VOICE_EXT_CFG }, |
88 | { ".wps", TREE_ATTR_WPS, Icon_Wps, VOICE_EXT_WPS }, | 88 | { "wps", TREE_ATTR_WPS, Icon_Wps, VOICE_EXT_WPS }, |
89 | { ".lng", TREE_ATTR_LNG, Icon_Language, LANG_LANGUAGE }, | 89 | { "lng", TREE_ATTR_LNG, Icon_Language, LANG_LANGUAGE }, |
90 | { ".rock",TREE_ATTR_ROCK,Icon_Plugin, VOICE_EXT_ROCK }, | 90 | { "rock",TREE_ATTR_ROCK,Icon_Plugin, VOICE_EXT_ROCK }, |
91 | #ifdef HAVE_LCD_BITMAP | 91 | #ifdef HAVE_LCD_BITMAP |
92 | { ".fnt", TREE_ATTR_FONT,Icon_Font, VOICE_EXT_FONT }, | 92 | { "fnt", TREE_ATTR_FONT,Icon_Font, VOICE_EXT_FONT }, |
93 | #endif | 93 | #endif |
94 | { ".bmark",TREE_ATTR_BMARK, Icon_Bookmark, VOICE_EXT_BMARK }, | 94 | { "bmark",TREE_ATTR_BMARK, Icon_Bookmark, VOICE_EXT_BMARK }, |
95 | #ifdef BOOTFILE_EXT | 95 | #ifdef BOOTFILE_EXT |
96 | { BOOTFILE_EXT, TREE_ATTR_MOD, Icon_Firmware, VOICE_EXT_AJZ }, | 96 | { BOOTFILE_EXT, TREE_ATTR_MOD, Icon_Firmware, VOICE_EXT_AJZ }, |
97 | #endif /* #ifndef SIMULATOR */ | 97 | #endif /* #ifndef SIMULATOR */ |
@@ -1375,15 +1375,15 @@ static bool add_dir(char* dirname, int len, int fd) | |||
1375 | } | 1375 | } |
1376 | else { | 1376 | else { |
1377 | int x = strlen(entry->d_name); | 1377 | int x = strlen(entry->d_name); |
1378 | int xl; | ||
1379 | unsigned int i; | 1378 | unsigned int i; |
1379 | char *cp; | ||
1380 | 1380 | ||
1381 | /* add all supported audio files to playlists */ | 1381 | /* add all supported audio files to playlists */ |
1382 | for (i=0; i < sizeof(filetypes); i++) { | 1382 | for (i=0; i < sizeof(filetypes); i++) { |
1383 | if (filetypes[i].tree_attr == TREE_ATTR_MPA) { | 1383 | if (filetypes[i].tree_attr == TREE_ATTR_MPA) { |
1384 | xl=strlen(filetypes[i].extension); | 1384 | cp=strrchr(entry->d_name,'.'); |
1385 | if (!strcasecmp(&entry->d_name[x-xl], | 1385 | if (cp) cp++; |
1386 | filetypes[i].extension)) | 1386 | if ((!strcasecmp(cp,filetypes[i].extension)) && (cp)) |
1387 | { | 1387 | { |
1388 | char buf[8]; | 1388 | char buf[8]; |
1389 | write(fd, dirname, strlen(dirname)); | 1389 | write(fd, dirname, strlen(dirname)); |
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h index 188c60a5c2..b30b1a4332 100644 --- a/firmware/export/config-fmrecorder.h +++ b/firmware/export/config-fmrecorder.h | |||
@@ -88,7 +88,7 @@ | |||
88 | 88 | ||
89 | #define CONFIG_LCD LCD_SSD1815 | 89 | #define CONFIG_LCD LCD_SSD1815 |
90 | 90 | ||
91 | #define BOOTFILE_EXT ".ajz" | 91 | #define BOOTFILE_EXT "ajz" |
92 | #define BOOTFILE "ajbrec" BOOTFILE_EXT | 92 | #define BOOTFILE "ajbrec." BOOTFILE_EXT |
93 | 93 | ||
94 | #endif /* SIMULATOR */ | 94 | #endif /* SIMULATOR */ |
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index bdb1b1a163..3d8a164442 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h | |||
@@ -94,8 +94,8 @@ | |||
94 | /* Define this if you have adjustable CPU frequency */ | 94 | /* Define this if you have adjustable CPU frequency */ |
95 | #define HAVE_ADJUSTABLE_CPU_FREQ | 95 | #define HAVE_ADJUSTABLE_CPU_FREQ |
96 | 96 | ||
97 | #define BOOTFILE_EXT ".iriver" | 97 | #define BOOTFILE_EXT "iriver" |
98 | #define BOOTFILE "rockbox" BOOTFILE_EXT | 98 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
99 | 99 | ||
100 | #endif | 100 | #endif |
101 | 101 | ||
diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h index 2691a8a693..194c53b93c 100644 --- a/firmware/export/config-h120.h +++ b/firmware/export/config-h120.h | |||
@@ -90,8 +90,8 @@ | |||
90 | /* Define this if you have adjustable CPU frequency */ | 90 | /* Define this if you have adjustable CPU frequency */ |
91 | #define HAVE_ADJUSTABLE_CPU_FREQ | 91 | #define HAVE_ADJUSTABLE_CPU_FREQ |
92 | 92 | ||
93 | #define BOOTFILE_EXT ".iriver" | 93 | #define BOOTFILE_EXT "iriver" |
94 | #define BOOTFILE "rockbox" BOOTFILE_EXT | 94 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
95 | 95 | ||
96 | #endif | 96 | #endif |
97 | 97 | ||
diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h index df97fd245d..1de415830e 100644 --- a/firmware/export/config-h300.h +++ b/firmware/export/config-h300.h | |||
@@ -85,8 +85,8 @@ | |||
85 | /* Define this if you have adjustable CPU frequency */ | 85 | /* Define this if you have adjustable CPU frequency */ |
86 | #define HAVE_ADJUSTABLE_CPU_FREQ | 86 | #define HAVE_ADJUSTABLE_CPU_FREQ |
87 | 87 | ||
88 | #define BOOTFILE_EXT ".iriver" | 88 | #define BOOTFILE_EXT "iriver" |
89 | #define BOOTFILE "rockbox" BOOTFILE_EXT | 89 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
90 | 90 | ||
91 | /* Define this if you can control the S/PDIF power */ | 91 | /* Define this if you can control the S/PDIF power */ |
92 | #define HAVE_SPDIF_POWER | 92 | #define HAVE_SPDIF_POWER |
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h index f7d18c829e..19a97b1164 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h | |||
@@ -77,7 +77,7 @@ | |||
77 | /* Define this if you have adjustable CPU frequency */ | 77 | /* Define this if you have adjustable CPU frequency */ |
78 | #define HAVE_ADJUSTABLE_CPU_FREQ | 78 | #define HAVE_ADJUSTABLE_CPU_FREQ |
79 | 79 | ||
80 | #define BOOTFILE_EXT ".iaudio" | 80 | #define BOOTFILE_EXT "iaudio" |
81 | #define BOOTFILE "rockbox" BOOTFILE_EXT | 81 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
82 | 82 | ||
83 | #endif | 83 | #endif |
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h index 7ec82285aa..46ef98d51c 100644 --- a/firmware/export/config-ondiofm.h +++ b/firmware/export/config-ondiofm.h | |||
@@ -99,7 +99,7 @@ | |||
99 | /* define this if the unit can be powered or charged via USB */ | 99 | /* define this if the unit can be powered or charged via USB */ |
100 | #define HAVE_USB_POWER | 100 | #define HAVE_USB_POWER |
101 | 101 | ||
102 | #define BOOTFILE_EXT ".ajz" | 102 | #define BOOTFILE_EXT "ajz" |
103 | #define BOOTFILE "ajbrec" BOOTFILE_EXT | 103 | #define BOOTFILE "ajbrec." BOOTFILE_EXT |
104 | 104 | ||
105 | #endif /* SIMULATOR */ | 105 | #endif /* SIMULATOR */ |
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h index 478e8f2b70..120369243e 100644 --- a/firmware/export/config-ondiosp.h +++ b/firmware/export/config-ondiosp.h | |||
@@ -86,7 +86,7 @@ | |||
86 | /* define this if the unit can be powered or charged via USB */ | 86 | /* define this if the unit can be powered or charged via USB */ |
87 | #define HAVE_USB_POWER | 87 | #define HAVE_USB_POWER |
88 | 88 | ||
89 | #define BOOTFILE_EXT ".ajz" | 89 | #define BOOTFILE_EXT "ajz" |
90 | #define BOOTFILE "ajbrec" BOOTFILE_EXT | 90 | #define BOOTFILE "ajbrec." BOOTFILE_EXT |
91 | 91 | ||
92 | #endif /* SIMULATOR */ | 92 | #endif /* SIMULATOR */ |
diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h index 5163b3dc8b..d5ab70fa42 100644 --- a/firmware/export/config-player.h +++ b/firmware/export/config-player.h | |||
@@ -75,7 +75,7 @@ | |||
75 | 75 | ||
76 | #define CONFIG_LCD LCD_SSD1801 | 76 | #define CONFIG_LCD LCD_SSD1801 |
77 | 77 | ||
78 | #define BOOTFILE_EXT ".mod" | 78 | #define BOOTFILE_EXT "mod" |
79 | #define BOOTFILE "archos" BOOTFILE_EXT | 79 | #define BOOTFILE "archos." BOOTFILE_EXT |
80 | 80 | ||
81 | #endif /* SIMULATOR */ | 81 | #endif /* SIMULATOR */ |
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h index 8abcb8b390..5d77ae6f09 100644 --- a/firmware/export/config-recorder.h +++ b/firmware/export/config-recorder.h | |||
@@ -79,7 +79,7 @@ | |||
79 | 79 | ||
80 | #define CONFIG_LCD LCD_SSD1815 | 80 | #define CONFIG_LCD LCD_SSD1815 |
81 | 81 | ||
82 | #define BOOTFILE_EXT ".ajz" | 82 | #define BOOTFILE_EXT "ajz" |
83 | #define BOOTFILE "ajbrec" BOOTFILE_EXT | 83 | #define BOOTFILE "ajbrec." BOOTFILE_EXT |
84 | 84 | ||
85 | #endif /* SIMULATOR */ | 85 | #endif /* SIMULATOR */ |
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h index 02430e8a02..a4179c6da4 100644 --- a/firmware/export/config-recorderv2.h +++ b/firmware/export/config-recorderv2.h | |||
@@ -88,7 +88,7 @@ | |||
88 | 88 | ||
89 | #define CONFIG_LCD LCD_SSD1815 | 89 | #define CONFIG_LCD LCD_SSD1815 |
90 | 90 | ||
91 | #define BOOTFILE_EXT ".ajz" | 91 | #define BOOTFILE_EXT "ajz" |
92 | #define BOOTFILE "ajbrec" BOOTFILE_EXT | 92 | #define BOOTFILE "ajbrec." BOOTFILE_EXT |
93 | 93 | ||
94 | #endif /* SIMULATOR */ | 94 | #endif /* SIMULATOR */ |