summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2005-01-17 11:37:36 +0000
committerBjörn Stenberg <bjorn@haxx.se>2005-01-17 11:37:36 +0000
commitfc53fd708fc12e1a67217c102ea8180b2bde6a6f (patch)
treed27775cc09f28414d2d5b4bca0b6f22df910845b /apps
parent025f5c00845a328eb0b8674bc88fd5f9cb8ee76d (diff)
downloadrockbox-fc53fd708fc12e1a67217c102ea8180b2bde6a6f.tar.gz
rockbox-fc53fd708fc12e1a67217c102ea8180b2bde6a6f.tar.bz2
rockbox-fc53fd708fc12e1a67217c102ea8180b2bde6a6f.zip
Added ID3 database dirfilter
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5574 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/lang/english.lang6
-rw-r--r--apps/screens.c4
-rw-r--r--apps/settings.c4
-rw-r--r--apps/settings.h8
-rw-r--r--apps/settings_menu.c5
5 files changed, 19 insertions, 8 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 4cc95b8383..6cbe2c469b 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -2872,4 +2872,8 @@ eng: "Custom"
voice: "Custom"
new:
-
+id: LANG_FILTER_ID3DB
+desc: show ID3 database
+eng: "ID3 database"
+voice: "ID3 database"
+new:
diff --git a/apps/screens.c b/apps/screens.c
index 6f231f2e69..e4f44dd601 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -557,6 +557,10 @@ bool quick_screen(int context, int button)
case SHOW_PLAYLIST:
ptr = str(LANG_FILTER_PLAYLIST);
break;
+
+ case SHOW_ID3DB:
+ ptr = str(LANG_FILTER_ID3DB);
+ break;
}
snprintf(buf, sizeof buf, "%s:", str(LANG_FILTER));
diff --git a/apps/settings.c b/apps/settings.c
index ca1b900ef4..00ea560b40 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -277,8 +277,8 @@ static const struct bit_entry hd_bits[] =
{8, S_O(disk_spindown), 5, "disk spindown", NULL },
#endif
/* browser */
- {2, S_O(dirfilter), SHOW_MUSIC,
- "show files", "all,supported,music,playlists" },
+ {3, S_O(dirfilter), SHOW_MUSIC,
+ "show files", "all,supported,music,playlists,id3 database" },
{1, S_O(sort_case), false, "sort case", off_on },
{1, S_O(browse_current), false, "follow playlist", off_on },
/* playlist */
diff --git a/apps/settings.h b/apps/settings.h
index 88bc71804a..a794065eea 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -194,7 +194,8 @@ struct user_settings
/* misc options */
int repeat_mode; /* 0=off 1=repeat all 2=repeat one */
- int dirfilter; /* 0=display all, 1=only supported, 2=only music */
+ int dirfilter; /* 0=display all, 1=only supported, 2=only music,
+ 3=dirs+playlists, 4=ID3 database */
bool sort_case; /* dir sort order: 0=case insensitive, 1=sensitive */
int volume_type; /* how volume is displayed: 0=graphic, 1=percent */
int battery_type; /* how battery is displayed: 0=graphic, 1=percent */
@@ -351,8 +352,9 @@ enum { REPEAT_OFF, REPEAT_ALL, REPEAT_ONE, NUM_REPEAT_MODES };
/* Note: Any new filter modes need to be added before NUM_FILTER_MODES.
* Any new rockbox browse filter modes (accessible through the menu)
* must be added after NUM_FILTER_MODES. */
-enum { SHOW_ALL, SHOW_SUPPORTED, SHOW_MUSIC, SHOW_PLAYLIST, NUM_FILTER_MODES,
-SHOW_WPS, SHOW_CFG, SHOW_LNG, SHOW_MOD, SHOW_FONT, SHOW_PLUGINS};
+enum { SHOW_ALL, SHOW_SUPPORTED, SHOW_MUSIC, SHOW_PLAYLIST, SHOW_ID3DB,
+ NUM_FILTER_MODES,
+ SHOW_WPS, SHOW_CFG, SHOW_LNG, SHOW_MOD, SHOW_FONT, SHOW_PLUGINS};
/* recursive dir insert options */
enum { RECURSE_OFF, RECURSE_ON, RECURSE_ASK };
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index eae39f905f..cf87564c9d 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -471,10 +471,11 @@ static bool dir_filter(void)
{ STR(LANG_FILTER_ALL) },
{ STR(LANG_FILTER_SUPPORTED) },
{ STR(LANG_FILTER_MUSIC) },
- { STR(LANG_FILTER_PLAYLIST) }
+ { STR(LANG_FILTER_PLAYLIST) },
+ { STR(LANG_FILTER_ID3DB) }
};
return set_option( str(LANG_FILTER), &global_settings.dirfilter, INT,
- names, 4, NULL );
+ names, 5, NULL );
}
static bool sort_case(void)