diff options
author | Björn Stenberg <bjorn@haxx.se> | 2005-01-17 11:37:36 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2005-01-17 11:37:36 +0000 |
commit | fc53fd708fc12e1a67217c102ea8180b2bde6a6f (patch) | |
tree | d27775cc09f28414d2d5b4bca0b6f22df910845b | |
parent | 025f5c00845a328eb0b8674bc88fd5f9cb8ee76d (diff) | |
download | rockbox-fc53fd708fc12e1a67217c102ea8180b2bde6a6f.tar.gz rockbox-fc53fd708fc12e1a67217c102ea8180b2bde6a6f.zip |
Added ID3 database dirfilter
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5574 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/lang/english.lang | 6 | ||||
-rw-r--r-- | apps/screens.c | 4 | ||||
-rw-r--r-- | apps/settings.c | 4 | ||||
-rw-r--r-- | apps/settings.h | 8 | ||||
-rw-r--r-- | apps/settings_menu.c | 5 |
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" | |||
2872 | voice: "Custom" | 2872 | voice: "Custom" |
2873 | new: | 2873 | new: |
2874 | 2874 | ||
2875 | 2875 | id: LANG_FILTER_ID3DB | |
2876 | desc: show ID3 database | ||
2877 | eng: "ID3 database" | ||
2878 | voice: "ID3 database" | ||
2879 | 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) | |||
557 | case SHOW_PLAYLIST: | 557 | case SHOW_PLAYLIST: |
558 | ptr = str(LANG_FILTER_PLAYLIST); | 558 | ptr = str(LANG_FILTER_PLAYLIST); |
559 | break; | 559 | break; |
560 | |||
561 | case SHOW_ID3DB: | ||
562 | ptr = str(LANG_FILTER_ID3DB); | ||
563 | break; | ||
560 | } | 564 | } |
561 | 565 | ||
562 | snprintf(buf, sizeof buf, "%s:", str(LANG_FILTER)); | 566 | 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[] = | |||
277 | {8, S_O(disk_spindown), 5, "disk spindown", NULL }, | 277 | {8, S_O(disk_spindown), 5, "disk spindown", NULL }, |
278 | #endif | 278 | #endif |
279 | /* browser */ | 279 | /* browser */ |
280 | {2, S_O(dirfilter), SHOW_MUSIC, | 280 | {3, S_O(dirfilter), SHOW_MUSIC, |
281 | "show files", "all,supported,music,playlists" }, | 281 | "show files", "all,supported,music,playlists,id3 database" }, |
282 | {1, S_O(sort_case), false, "sort case", off_on }, | 282 | {1, S_O(sort_case), false, "sort case", off_on }, |
283 | {1, S_O(browse_current), false, "follow playlist", off_on }, | 283 | {1, S_O(browse_current), false, "follow playlist", off_on }, |
284 | /* playlist */ | 284 | /* 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 | |||
194 | /* misc options */ | 194 | /* misc options */ |
195 | 195 | ||
196 | int repeat_mode; /* 0=off 1=repeat all 2=repeat one */ | 196 | int repeat_mode; /* 0=off 1=repeat all 2=repeat one */ |
197 | int dirfilter; /* 0=display all, 1=only supported, 2=only music */ | 197 | int dirfilter; /* 0=display all, 1=only supported, 2=only music, |
198 | 3=dirs+playlists, 4=ID3 database */ | ||
198 | bool sort_case; /* dir sort order: 0=case insensitive, 1=sensitive */ | 199 | bool sort_case; /* dir sort order: 0=case insensitive, 1=sensitive */ |
199 | int volume_type; /* how volume is displayed: 0=graphic, 1=percent */ | 200 | int volume_type; /* how volume is displayed: 0=graphic, 1=percent */ |
200 | int battery_type; /* how battery is displayed: 0=graphic, 1=percent */ | 201 | 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 }; | |||
351 | /* Note: Any new filter modes need to be added before NUM_FILTER_MODES. | 352 | /* Note: Any new filter modes need to be added before NUM_FILTER_MODES. |
352 | * Any new rockbox browse filter modes (accessible through the menu) | 353 | * Any new rockbox browse filter modes (accessible through the menu) |
353 | * must be added after NUM_FILTER_MODES. */ | 354 | * must be added after NUM_FILTER_MODES. */ |
354 | enum { SHOW_ALL, SHOW_SUPPORTED, SHOW_MUSIC, SHOW_PLAYLIST, NUM_FILTER_MODES, | 355 | enum { SHOW_ALL, SHOW_SUPPORTED, SHOW_MUSIC, SHOW_PLAYLIST, SHOW_ID3DB, |
355 | SHOW_WPS, SHOW_CFG, SHOW_LNG, SHOW_MOD, SHOW_FONT, SHOW_PLUGINS}; | 356 | NUM_FILTER_MODES, |
357 | SHOW_WPS, SHOW_CFG, SHOW_LNG, SHOW_MOD, SHOW_FONT, SHOW_PLUGINS}; | ||
356 | 358 | ||
357 | /* recursive dir insert options */ | 359 | /* recursive dir insert options */ |
358 | enum { RECURSE_OFF, RECURSE_ON, RECURSE_ASK }; | 360 | 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) | |||
471 | { STR(LANG_FILTER_ALL) }, | 471 | { STR(LANG_FILTER_ALL) }, |
472 | { STR(LANG_FILTER_SUPPORTED) }, | 472 | { STR(LANG_FILTER_SUPPORTED) }, |
473 | { STR(LANG_FILTER_MUSIC) }, | 473 | { STR(LANG_FILTER_MUSIC) }, |
474 | { STR(LANG_FILTER_PLAYLIST) } | 474 | { STR(LANG_FILTER_PLAYLIST) }, |
475 | { STR(LANG_FILTER_ID3DB) } | ||
475 | }; | 476 | }; |
476 | return set_option( str(LANG_FILTER), &global_settings.dirfilter, INT, | 477 | return set_option( str(LANG_FILTER), &global_settings.dirfilter, INT, |
477 | names, 4, NULL ); | 478 | names, 5, NULL ); |
478 | } | 479 | } |
479 | 480 | ||
480 | static bool sort_case(void) | 481 | static bool sort_case(void) |