diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2004-07-27 19:20:51 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2004-07-27 19:20:51 +0000 |
commit | 4cdcbb97bcc9398b111b133b8284902fb9af49c7 (patch) | |
tree | 4305841804eaed2ca7e936353f94c20bc2789cd1 | |
parent | fa1afb72c9b668ded3290b6d918b28bb375c3ee0 (diff) | |
download | rockbox-4cdcbb97bcc9398b111b133b8284902fb9af49c7.tar.gz rockbox-4cdcbb97bcc9398b111b133b8284902fb9af49c7.zip |
New option, ID3 tag order
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4965 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/lang/english.lang | 18 | ||||
-rw-r--r-- | apps/settings.c | 4 | ||||
-rw-r--r-- | apps/settings.h | 2 | ||||
-rw-r--r-- | apps/settings_menu.c | 10 |
4 files changed, 33 insertions, 1 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 055c90bd7c..99d3520cbc 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -2811,3 +2811,21 @@ desc: in shutdown screen | |||
2811 | eng: "Press OFF to shut down" | 2811 | eng: "Press OFF to shut down" |
2812 | voice: "" | 2812 | voice: "" |
2813 | new: | 2813 | new: |
2814 | |||
2815 | id: LANG_ID3_ORDER | ||
2816 | desc: in playback settings screen | ||
2817 | eng: "ID3 tag priority" | ||
2818 | voice: "ID3 tag priority" | ||
2819 | new: | ||
2820 | |||
2821 | id: LANG_ID3_V1_FIRST | ||
2822 | desc: in playback settings screen | ||
2823 | eng: "V1 then V2" | ||
2824 | voice: "Version 1 then version 2" | ||
2825 | new: | ||
2826 | |||
2827 | id: LANG_ID3_V2_FIRST | ||
2828 | desc: in playback settings screen | ||
2829 | eng: "V2 then V1" | ||
2830 | voice: "Version 2 then version 1" | ||
2831 | new: | ||
diff --git a/apps/settings.c b/apps/settings.c index 83d69710df..ba5a668d3c 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -321,7 +321,6 @@ static const struct bit_entry hd_bits[] = | |||
321 | {2, S_O(talk_file), 0, "talk file", "off,number,spell" }, | 321 | {2, S_O(talk_file), 0, "talk file", "off,number,spell" }, |
322 | {1, S_O(talk_menu), true, "talk menu", off_on }, | 322 | {1, S_O(talk_menu), true, "talk menu", off_on }, |
323 | 323 | ||
324 | /* new stuff to be added at the end */ | ||
325 | /* If values are just added to the end, no need to bump the version. */ | 324 | /* If values are just added to the end, no need to bump the version. */ |
326 | {2, S_O(sort_file), 0, "sort files", "alpha,oldest,newest,type" }, | 325 | {2, S_O(sort_file), 0, "sort files", "alpha,oldest,newest,type" }, |
327 | {2, S_O(sort_dir), 0, "sort dirs", "alpha,oldest,newest" }, | 326 | {2, S_O(sort_dir), 0, "sort dirs", "alpha,oldest,newest" }, |
@@ -330,6 +329,9 @@ static const struct bit_entry hd_bits[] = | |||
330 | {9, S_O(mdb_center), 0, "mdb center", NULL}, | 329 | {9, S_O(mdb_center), 0, "mdb center", NULL}, |
331 | {9, S_O(mdb_shape), 0, "mdb shape", NULL}, | 330 | {9, S_O(mdb_shape), 0, "mdb shape", NULL}, |
332 | {1, S_O(mdb_enable), 0, "mdb enable", off_on}, | 331 | {1, S_O(mdb_enable), 0, "mdb enable", off_on}, |
332 | {1, S_O(id3_v1_first), 0, "id3 tag order", "v2 first,v1 first"}, | ||
333 | |||
334 | /* new stuff to be added at the end */ | ||
333 | 335 | ||
334 | /* Sum of all bit sizes must not grow beyond 0xB8*8 = 1472 */ | 336 | /* Sum of all bit sizes must not grow beyond 0xB8*8 = 1472 */ |
335 | }; | 337 | }; |
diff --git a/apps/settings.h b/apps/settings.h index fc9a004cfc..36b4a839a4 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -230,6 +230,8 @@ struct user_settings | |||
230 | 230 | ||
231 | bool line_in; /* false=off, true=active */ | 231 | bool line_in; /* false=off, true=active */ |
232 | 232 | ||
233 | bool id3_v1_first; /* true = ID3V1 has prio over ID3V2 tag */ | ||
234 | |||
233 | /* playlist viewer settings */ | 235 | /* playlist viewer settings */ |
234 | bool playlist_viewer_icons; /* display icons on viewer */ | 236 | bool playlist_viewer_icons; /* display icons on viewer */ |
235 | bool playlist_viewer_indices; /* display playlist indices on viewer */ | 237 | bool playlist_viewer_indices; /* display playlist indices on viewer */ |
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 1141361281..0187da376d 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -980,6 +980,15 @@ static bool ff_rewind_settings_menu(void) | |||
980 | return result; | 980 | return result; |
981 | } | 981 | } |
982 | 982 | ||
983 | static bool id3_order(void) | ||
984 | { | ||
985 | return set_bool_options( str(LANG_ID3_ORDER), | ||
986 | &global_settings.id3_v1_first, | ||
987 | STR(LANG_ID3_V1_FIRST), | ||
988 | STR(LANG_ID3_V2_FIRST), | ||
989 | mpeg_id3_options); | ||
990 | } | ||
991 | |||
983 | static bool playback_settings_menu(void) | 992 | static bool playback_settings_menu(void) |
984 | { | 993 | { |
985 | int m; | 994 | int m; |
@@ -993,6 +1002,7 @@ static bool playback_settings_menu(void) | |||
993 | { ID2P(LANG_WIND_MENU), ff_rewind_settings_menu }, | 1002 | { ID2P(LANG_WIND_MENU), ff_rewind_settings_menu }, |
994 | { ID2P(LANG_MP3BUFFER_MARGIN), buffer_margin }, | 1003 | { ID2P(LANG_MP3BUFFER_MARGIN), buffer_margin }, |
995 | { ID2P(LANG_FADE_ON_STOP), set_fade_on_stop }, | 1004 | { ID2P(LANG_FADE_ON_STOP), set_fade_on_stop }, |
1005 | { ID2P(LANG_ID3_ORDER), id3_order }, | ||
996 | }; | 1006 | }; |
997 | 1007 | ||
998 | bool old_shuffle = global_settings.playlist_shuffle; | 1008 | bool old_shuffle = global_settings.playlist_shuffle; |