From 8589fcb3e3e0744b208ce5e8099fdf12e46ba9c2 Mon Sep 17 00:00:00 2001 From: Alexander Levin Date: Sat, 20 Jun 2009 21:13:24 +0000 Subject: 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 --- apps/dsp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'apps/dsp.c') diff --git a/apps/dsp.c b/apps/dsp.c index 0bb3ac0748..a760865afb 100644 --- a/apps/dsp.c +++ b/apps/dsp.c @@ -1449,13 +1449,14 @@ void dsp_set_replaygain(void) new_gain = false; - if (global_settings.replaygain || global_settings.replaygain_noclip) + if ((global_settings.replaygain_type != REPLAYGAIN_OFF) || + global_settings.replaygain_noclip) { bool track_mode = get_replaygain_mode(track_gain != 0, album_gain != 0) == REPLAYGAIN_TRACK; long peak = (track_mode || !album_peak) ? track_peak : album_peak; - if (global_settings.replaygain) + if (global_settings.replaygain_type != REPLAYGAIN_OFF) { gain = (track_mode || !album_gain) ? track_gain : album_gain; -- cgit v1.2.3