diff options
| author | Alexander Levin <al.le@rockbox.org> | 2009-06-20 21:13:24 +0000 |
|---|---|---|
| committer | Alexander Levin <al.le@rockbox.org> | 2009-06-20 21:13:24 +0000 |
| commit | 8589fcb3e3e0744b208ce5e8099fdf12e46ba9c2 (patch) | |
| tree | aac31dccb328366674c0284cba2d9a86ca3dfe4e /apps/settings_list.c | |
| parent | 01bcd2c6121fa0ae1797ef11c02be298574f4fdb (diff) | |
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
Diffstat (limited to 'apps/settings_list.c')
| -rw-r--r-- | apps/settings_list.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index dcad718ee5..9e40cbd301 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -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, |