summaryrefslogtreecommitdiff
path: root/apps/menus/playback_menu.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2012-04-30 16:27:01 -0400
committerMichael Sevakis <jethead71@rockbox.org>2012-04-30 22:47:37 +0200
commit57a20d2d638895fffe88a23cbd2960f1102b292f (patch)
treedf1943429ec040a18d854fa0a0091051e4200304 /apps/menus/playback_menu.c
parenta32cbf33465367cd6fe36d636da8d03485e9d15d (diff)
downloadrockbox-57a20d2d638895fffe88a23cbd2960f1102b292f.tar.gz
rockbox-57a20d2d638895fffe88a23cbd2960f1102b292f.zip
Make DSP's replaygain independent of global_settings.
Moves replaygain definitions to lib/rbcodec/dsp/dsp_misc.h. Intermediate functions in misc.c handle any adjustment and calling the rbcodec APIs. Change-Id: I9f03561bca9aedd13760cf19c4e19aa3c68e7024 Reviewed-on: http://gerrit.rockbox.org/140 Reviewed-by: Michael Sevakis <jethead71@rockbox.org>
Diffstat (limited to 'apps/menus/playback_menu.c')
-rw-r--r--apps/menus/playback_menu.c20
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 @@
34#include "scrobbler.h" 34#include "scrobbler.h"
35#include "audio.h" 35#include "audio.h"
36#include "cuesheet.h" 36#include "cuesheet.h"
37#include "misc.h"
37#if CONFIG_CODEC == SWCODEC 38#if CONFIG_CODEC == SWCODEC
38#include "playback.h" 39#include "playback.h"
39#endif 40#endif
@@ -116,14 +117,20 @@ static int replaygain_callback(int action,const struct menu_item_ex *this_item)
116 switch (action) 117 switch (action)
117 { 118 {
118 case ACTION_EXIT_MENUITEM: /* on exit */ 119 case ACTION_EXIT_MENUITEM: /* on exit */
119 dsp_set_replaygain(); 120 replaygain_update();
120 break; 121 break;
121 } 122 }
122 return action; 123 return action;
123} 124}
124MENUITEM_SETTING(replaygain_noclip, &global_settings.replaygain_noclip ,replaygain_callback); 125MENUITEM_SETTING(replaygain_noclip,
125MENUITEM_SETTING(replaygain_type, &global_settings.replaygain_type ,replaygain_callback); 126 &global_settings.replaygain_settings.noclip,
126MENUITEM_SETTING(replaygain_preamp, &global_settings.replaygain_preamp ,replaygain_callback); 127 replaygain_callback);
128MENUITEM_SETTING(replaygain_type,
129 &global_settings.replaygain_settings.type,
130 replaygain_callback);
131MENUITEM_SETTING(replaygain_preamp,
132 &global_settings.replaygain_settings.preamp,
133 replaygain_callback);
127MAKE_MENU(replaygain_settings_menu,ID2P(LANG_REPLAYGAIN),0, Icon_NOICON, 134MAKE_MENU(replaygain_settings_menu,ID2P(LANG_REPLAYGAIN),0, Icon_NOICON,
128 &replaygain_type, &replaygain_noclip, &replaygain_preamp); 135 &replaygain_type, &replaygain_noclip, &replaygain_preamp);
129 136
@@ -244,9 +251,8 @@ static int playback_callback(int action,const struct menu_item_ex *this_item)
244 if (old_shuffle == global_settings.playlist_shuffle) 251 if (old_shuffle == global_settings.playlist_shuffle)
245 break; 252 break;
246 253
247#if CONFIG_CODEC == SWCODEC 254 replaygain_update();
248 dsp_set_replaygain(); 255
249#endif
250 if (global_settings.playlist_shuffle) 256 if (global_settings.playlist_shuffle)
251 { 257 {
252 playlist_randomise(NULL, current_tick, true); 258 playlist_randomise(NULL, current_tick, true);