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

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)
     }
     return action;
 }
-MENUITEM_SETTING(replaygain, &global_settings.replaygain ,replaygain_callback);
 MENUITEM_SETTING(replaygain_noclip, &global_settings.replaygain_noclip ,replaygain_callback);
 MENUITEM_SETTING(replaygain_type, &global_settings.replaygain_type ,replaygain_callback);
 MENUITEM_SETTING(replaygain_preamp, &global_settings.replaygain_preamp ,replaygain_callback);
 MAKE_MENU(replaygain_settings_menu,ID2P(LANG_REPLAYGAIN),0, Icon_NOICON,
-          &replaygain,&replaygain_noclip,
-          &replaygain_type,&replaygain_preamp);
+          &replaygain_type, &replaygain_noclip, &replaygain_preamp);
           
 MENUITEM_SETTING(beep, &global_settings.beep ,NULL);
 #endif /* CONFIG_CODEC == SWCODEC */