len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-20 10:32:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

New option, ID3 tag order

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4965 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2004-07-27 19:20:51 +00:00
parent fa1afb72c9
commit 4cdcbb97bc
4 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
apps/lang/english.lang
View file

@ -2811,3 +2811,21 @@ desc: in shutdown screen
eng: "Press OFF to shut down" eng: "Press OFF to shut down"
voice: "" voice: ""
new: new:
id: LANG_ID3_ORDER
desc: in playback settings screen
eng: "ID3 tag priority"
voice: "ID3 tag priority"
new:
id: LANG_ID3_V1_FIRST
desc: in playback settings screen
eng: "V1 then V2"
voice: "Version 1 then version 2"
new:
id: LANG_ID3_V2_FIRST
desc: in playback settings screen
eng: "V2 then V1"
voice: "Version 2 then version 1"
new:

4
apps/settings.c
View file

@ -321,7 +321,6 @@ static const struct bit_entry hd_bits[] =
{2, S_O(talk_file), 0, "talk file", "off,number,spell" }, {2, S_O(talk_file), 0, "talk file", "off,number,spell" },
{1, S_O(talk_menu), true, "talk menu", off_on }, {1, S_O(talk_menu), true, "talk menu", off_on },
/* new stuff to be added at the end */
/* If values are just added to the end, no need to bump the version. */ /* If values are just added to the end, no need to bump the version. */
{2, S_O(sort_file), 0, "sort files", "alpha,oldest,newest,type" }, {2, S_O(sort_file), 0, "sort files", "alpha,oldest,newest,type" },
{2, S_O(sort_dir), 0, "sort dirs", "alpha,oldest,newest" }, {2, S_O(sort_dir), 0, "sort dirs", "alpha,oldest,newest" },
@ -330,6 +329,9 @@ static const struct bit_entry hd_bits[] =
{9, S_O(mdb_center), 0, "mdb center", NULL}, {9, S_O(mdb_center), 0, "mdb center", NULL},
{9, S_O(mdb_shape), 0, "mdb shape", NULL}, {9, S_O(mdb_shape), 0, "mdb shape", NULL},
{1, S_O(mdb_enable), 0, "mdb enable", off_on}, {1, S_O(mdb_enable), 0, "mdb enable", off_on},
{1, S_O(id3_v1_first), 0, "id3 tag order", "v2 first,v1 first"},
/* new stuff to be added at the end */
/* Sum of all bit sizes must not grow beyond 0xB8*8 = 1472 */ /* Sum of all bit sizes must not grow beyond 0xB8*8 = 1472 */
}; };

2
apps/settings.h
View file

@ -230,6 +230,8 @@ struct user_settings
bool line_in; /* false=off, true=active */ bool line_in; /* false=off, true=active */
bool id3_v1_first; /* true = ID3V1 has prio over ID3V2 tag */
/* playlist viewer settings */ /* playlist viewer settings */
bool playlist_viewer_icons; /* display icons on viewer */ bool playlist_viewer_icons; /* display icons on viewer */
bool playlist_viewer_indices; /* display playlist indices on viewer */ bool playlist_viewer_indices; /* display playlist indices on viewer */

10
apps/settings_menu.c
View file

@ -980,6 +980,15 @@ static bool ff_rewind_settings_menu(void)
return result; return result;
} }
static bool id3_order(void)
{
return set_bool_options( str(LANG_ID3_ORDER),
&global_settings.id3_v1_first,
STR(LANG_ID3_V1_FIRST),
STR(LANG_ID3_V2_FIRST),
mpeg_id3_options);
}
static bool playback_settings_menu(void) static bool playback_settings_menu(void)
{ {
int m; int m;
@ -993,6 +1002,7 @@ static bool playback_settings_menu(void)
{ ID2P(LANG_WIND_MENU), ff_rewind_settings_menu }, { ID2P(LANG_WIND_MENU), ff_rewind_settings_menu },
{ ID2P(LANG_MP3BUFFER_MARGIN), buffer_margin }, { ID2P(LANG_MP3BUFFER_MARGIN), buffer_margin },
{ ID2P(LANG_FADE_ON_STOP), set_fade_on_stop }, { ID2P(LANG_FADE_ON_STOP), set_fade_on_stop },
{ ID2P(LANG_ID3_ORDER), id3_order },
}; };
bool old_shuffle = global_settings.playlist_shuffle; bool old_shuffle = global_settings.playlist_shuffle;