summaryrefslogtreecommitdiff
path: root/apps/settings_menu.c
diff options
context:
space:
mode:
authorMagnus Holmgren <magnushol@gmail.com>2005-09-24 15:22:48 +0000
committerMagnus Holmgren <magnushol@gmail.com>2005-09-24 15:22:48 +0000
commit4b711c2f72608441f1ef44db584eccc9ca823ea1 (patch)
tree34398d7fd8f1a200c36470659b278819553c676f /apps/settings_menu.c
parent9a625ef7ac544976f45734d62294a52ef32cfe66 (diff)
downloadrockbox-4b711c2f72608441f1ef44db584eccc9ca823ea1.zip
rockbox-4b711c2f72608441f1ef44db584eccc9ca823ea1.tar.gz
rockbox-4b711c2f72608441f1ef44db584eccc9ca823ea1.tar.bz2
rockbox-4b711c2f72608441f1ef44db584eccc9ca823ea1.tar.xz
Iriver: Added new ReplayGain type: track gain if shuffle mode is active, album gain otherwise. Properly apply ReplayGain settings on config file load. Bumped config version, so save your settings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7558 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_menu.c')
-rw-r--r--apps/settings_menu.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 1bbb09d..59c8005 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -1184,11 +1184,13 @@ static bool replaygain(void)
static bool replaygain_mode(void)
{
- bool result = set_bool_options(str(LANG_REPLAYGAIN_MODE),
- &global_settings.replaygain_track,
- STR(LANG_TRACK_GAIN),
- STR(LANG_ALBUM_GAIN),
- NULL);
+ static const struct opt_items names[] = {
+ { STR(LANG_TRACK_GAIN) },
+ { STR(LANG_ALBUM_GAIN) },
+ { STR(LANG_SHUFFLE_GAIN) },
+ };
+ bool result = set_option(str(LANG_REPLAYGAIN_MODE),
+ &global_settings.replaygain_type, INT, names, 3, NULL);
dsp_set_replaygain(true);
return result;
@@ -1294,6 +1296,8 @@ static bool playback_settings_menu(void)
if ((old_shuffle != global_settings.playlist_shuffle)
&& (audio_status() & AUDIO_STATUS_PLAY))
{
+ dsp_set_replaygain(true);
+
if (global_settings.playlist_shuffle)
{
playlist_randomise(NULL, current_tick, true);