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/menus | |
parent | 01bcd2c6121fa0ae1797ef11c02be298574f4fdb (diff) | |
download | rockbox-8589fcb3e3e0744b208ce5e8099fdf12e46ba9c2.tar.gz rockbox-8589fcb3e3e0744b208ce5e8099fdf12e46ba9c2.zip |
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/menus')
-rw-r--r-- | apps/menus/playback_menu.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c index 02e29b1840..28e8601282 100644 --- a/apps/menus/playback_menu.c +++ b/apps/menus/playback_menu.c | |||
@@ -120,13 +120,11 @@ static int replaygain_callback(int action,const struct menu_item_ex *this_item) | |||
120 | } | 120 | } |
121 | return action; | 121 | return action; |
122 | } | 122 | } |
123 | MENUITEM_SETTING(replaygain, &global_settings.replaygain ,replaygain_callback); | ||
124 | MENUITEM_SETTING(replaygain_noclip, &global_settings.replaygain_noclip ,replaygain_callback); | 123 | MENUITEM_SETTING(replaygain_noclip, &global_settings.replaygain_noclip ,replaygain_callback); |
125 | MENUITEM_SETTING(replaygain_type, &global_settings.replaygain_type ,replaygain_callback); | 124 | MENUITEM_SETTING(replaygain_type, &global_settings.replaygain_type ,replaygain_callback); |
126 | MENUITEM_SETTING(replaygain_preamp, &global_settings.replaygain_preamp ,replaygain_callback); | 125 | MENUITEM_SETTING(replaygain_preamp, &global_settings.replaygain_preamp ,replaygain_callback); |
127 | MAKE_MENU(replaygain_settings_menu,ID2P(LANG_REPLAYGAIN),0, Icon_NOICON, | 126 | MAKE_MENU(replaygain_settings_menu,ID2P(LANG_REPLAYGAIN),0, Icon_NOICON, |
128 | &replaygain,&replaygain_noclip, | 127 | &replaygain_type, &replaygain_noclip, &replaygain_preamp); |
129 | &replaygain_type,&replaygain_preamp); | ||
130 | 128 | ||
131 | MENUITEM_SETTING(beep, &global_settings.beep ,NULL); | 129 | MENUITEM_SETTING(beep, &global_settings.beep ,NULL); |
132 | #endif /* CONFIG_CODEC == SWCODEC */ | 130 | #endif /* CONFIG_CODEC == SWCODEC */ |