1 files changed, 13 insertions, 7 deletions

diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c
index d1d999587b..6beda93991 100644
--- a/apps/menus/playback_menu.c
+++ b/apps/menus/playback_menu.c
@@ -34,6 +34,7 @@
 #include "scrobbler.h"
 #include "audio.h"
 #include "cuesheet.h"
+#include "misc.h"
 #if CONFIG_CODEC == SWCODEC
 #include "playback.h"
 #endif
@@ -116,14 +117,20 @@ static int replaygain_callback(int action,const struct menu_item_ex *this_item)
     switch (action)
     {
         case ACTION_EXIT_MENUITEM: /* on exit */    
-            dsp_set_replaygain();
+            replaygain_update();
             break;
     }
     return action;
 }
-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);
+MENUITEM_SETTING(replaygain_noclip,
+                 &global_settings.replaygain_settings.noclip,
+                 replaygain_callback);
+MENUITEM_SETTING(replaygain_type,
+                 &global_settings.replaygain_settings.type,
+                 replaygain_callback);
+MENUITEM_SETTING(replaygain_preamp,
+                 &global_settings.replaygain_settings.preamp,
+                 replaygain_callback);
 MAKE_MENU(replaygain_settings_menu,ID2P(LANG_REPLAYGAIN),0, Icon_NOICON,
           &replaygain_type, &replaygain_noclip, &replaygain_preamp);
           
@@ -244,9 +251,8 @@ static int playback_callback(int action,const struct menu_item_ex *this_item)
                 if (old_shuffle == global_settings.playlist_shuffle)
                     break;
 
-#if CONFIG_CODEC == SWCODEC
-                dsp_set_replaygain();
-#endif
+                replaygain_update();
+
                 if (global_settings.playlist_shuffle)
                 {
                     playlist_randomise(NULL, current_tick, true);