Merge the "Replaygain Off" option into the replaygain type; eliminate the "On/Off" setting (FS#10356). All WPS tags should work as before.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21414 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Alexander Levin 2009-06-20 21:13:24 +00:00
parent 01bcd2c612
commit 8589fcb3e3
5 changed files with 10 additions and 13 deletions

View file

@ -1108,12 +1108,10 @@ const struct settings_list settings[] = {
#if CONFIG_CODEC == SWCODEC
/* replay gain */
OFFON_SETTING(F_SOUNDSETTING, replaygain, LANG_REPLAYGAIN_ENABLE, true,
"replaygain", NULL),
CHOICE_SETTING(F_SOUNDSETTING, replaygain_type, LANG_REPLAYGAIN_MODE,
REPLAYGAIN_SHUFFLE, "replaygain type",
"track,album,track shuffle", NULL, 3, ID2P(LANG_TRACK_GAIN),
ID2P(LANG_ALBUM_GAIN), ID2P(LANG_SHUFFLE_GAIN)),
"track,album,track shuffle,off", NULL, 4, ID2P(LANG_TRACK_GAIN),
ID2P(LANG_ALBUM_GAIN), ID2P(LANG_SHUFFLE_GAIN), ID2P(LANG_OFF)),
OFFON_SETTING(F_SOUNDSETTING, replaygain_noclip, LANG_REPLAYGAIN_NOCLIP,
false, "replaygain noclip", NULL),
INT_SETTING_NOWRAP(F_SOUNDSETTING, replaygain_preamp,