summaryrefslogtreecommitdiff
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
parent7144e38b5f76016512009fe47325e6fd1f7211ae (diff)
downloadrockbox-6a33dd761eab41585fc1eaed933e561724454d99.zip
rockbox-6a33dd761eab41585fc1eaed933e561724454d99.tar.gz
rockbox-6a33dd761eab41585fc1eaed933e561724454d99.tar.bz2
rockbox-6a33dd761eab41585fc1eaed933e561724454d99.tar.xz
Undo previous commit. Apparently, this is not wanted behaviour.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6158 a1c6a512-1295-4272-9138-f99709370657
-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 8c19cdd..6854080 100644
--- a/apps/filetypes.c
+++ b/apps/filetypes.c
@@ -220,28 +220,21 @@ int filetype_get_attr(const char* name)
}
/* fill a menu list with viewers (used in onplay.c) */
-int filetype_load_menu(struct menu_item* menu, int max_items,
- char *filename)
+int filetype_load_menu(struct menu_item* menu,int max_items)
{
int i;
int cnt=0;
- for (i=0; i < cnt_exttypes; i++)
+ for (i=0; i < cnt_filetypes; i++)
{
- if(exttypes[i].type->plugin)
+ if (filetypes[i].plugin)
{
- if (strcasecmp(&filename[strlen(filename)-
- strlen(exttypes[i].extension)],
- exttypes[i].extension) == 0)
- {
- menu[cnt].desc = exttypes[i].type->plugin;
- cnt++;
- if (cnt == max_items)
- break;
- }
+ menu[cnt].desc = filetypes[i].plugin;
+ cnt++;
+ if (cnt == max_items)
+ break;
}
}
-
return cnt;
}
diff --git a/apps/filetypes.h b/apps/filetypes.h
index fd1e077..e72dd6f 100644
--- a/apps/filetypes.h
+++ b/apps/filetypes.h
@@ -32,7 +32,7 @@ int filetype_get_icon(int);
char* filetype_get_plugin(const struct entry*);
void filetype_init(void);
bool filetype_supported(int);
-int filetype_load_menu(struct menu_item*, int, char*);
+int filetype_load_menu(struct menu_item*, int);
int filetype_load_plugin(const char*, char*);
struct file_type {
diff --git a/apps/onplay.c b/apps/onplay.c
index 9267c23..7ebe4e1 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -56,7 +56,7 @@ static bool list_viewers(void)
int m, i, result;
int ret = 0;
- i=filetype_load_menu(menu,sizeof(menu)/sizeof(*menu),selected_file);
+ i=filetype_load_menu(menu,sizeof(menu)/sizeof(*menu));
if (i)
{
m = menu_init( menu, i, NULL, NULL, NULL, NULL );