summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorThom Johansen <thomj@rockbox.org>2005-03-06 18:26:34 +0000
committerThom Johansen <thomj@rockbox.org>2005-03-06 18:26:34 +0000
commit6a33dd761eab41585fc1eaed933e561724454d99 (patch)
tree517d29b1da7b9c3f57ab3e9a0f70850606b38276 /apps
parent7144e38b5f76016512009fe47325e6fd1f7211ae (diff)
downloadrockbox-6a33dd761eab41585fc1eaed933e561724454d99.tar.gz
rockbox-6a33dd761eab41585fc1eaed933e561724454d99.zip
Undo previous commit. Apparently, this is not wanted behaviour.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6158 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/filetypes.c21
-rw-r--r--apps/filetypes.h2
-rw-r--r--apps/onplay.c2
3 files changed, 9 insertions, 16 deletions
diff --git a/apps/filetypes.c b/apps/filetypes.c
index 8c19cdd32c..68540802b0 100644
--- a/apps/filetypes.c
+++ b/apps/filetypes.c
@@ -220,28 +220,21 @@ int filetype_get_attr(const char* name)
220} 220}
221 221
222/* fill a menu list with viewers (used in onplay.c) */ 222/* fill a menu list with viewers (used in onplay.c) */
223int filetype_load_menu(struct menu_item* menu, int max_items, 223int filetype_load_menu(struct menu_item* menu,int max_items)
224 char *filename)
225{ 224{
226 int i; 225 int i;
227 int cnt=0; 226 int cnt=0;
228 227
229 for (i=0; i < cnt_exttypes; i++) 228 for (i=0; i < cnt_filetypes; i++)
230 { 229 {
231 if(exttypes[i].type->plugin) 230 if (filetypes[i].plugin)
232 { 231 {
233 if (strcasecmp(&filename[strlen(filename)- 232 menu[cnt].desc = filetypes[i].plugin;
234 strlen(exttypes[i].extension)], 233 cnt++;
235 exttypes[i].extension) == 0) 234 if (cnt == max_items)
236 { 235 break;
237 menu[cnt].desc = exttypes[i].type->plugin;
238 cnt++;
239 if (cnt == max_items)
240 break;
241 }
242 } 236 }
243 } 237 }
244
245 return cnt; 238 return cnt;
246} 239}
247 240
diff --git a/apps/filetypes.h b/apps/filetypes.h
index fd1e07721e..e72dd6ffd3 100644
--- a/apps/filetypes.h
+++ b/apps/filetypes.h
@@ -32,7 +32,7 @@ int filetype_get_icon(int);
32char* filetype_get_plugin(const struct entry*); 32char* filetype_get_plugin(const struct entry*);
33void filetype_init(void); 33void filetype_init(void);
34bool filetype_supported(int); 34bool filetype_supported(int);
35int filetype_load_menu(struct menu_item*, int, char*); 35int filetype_load_menu(struct menu_item*, int);
36int filetype_load_plugin(const char*, char*); 36int filetype_load_plugin(const char*, char*);
37 37
38struct file_type { 38struct file_type {
diff --git a/apps/onplay.c b/apps/onplay.c
index 9267c2341b..7ebe4e1f45 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -56,7 +56,7 @@ static bool list_viewers(void)
56 int m, i, result; 56 int m, i, result;
57 int ret = 0; 57 int ret = 0;
58 58
59 i=filetype_load_menu(menu,sizeof(menu)/sizeof(*menu),selected_file); 59 i=filetype_load_menu(menu,sizeof(menu)/sizeof(*menu));
60 if (i) 60 if (i)
61 { 61 {
62 m = menu_init( menu, i, NULL, NULL, NULL, NULL ); 62 m = menu_init( menu, i, NULL, NULL, NULL, NULL );