diff options
| author | Alexander Levin <al.le@rockbox.org> | 2009-06-20 21:13:24 +0000 |
|---|---|---|
| committer | Alexander Levin <al.le@rockbox.org> | 2009-06-20 21:13:24 +0000 |
| commit | 8589fcb3e3e0744b208ce5e8099fdf12e46ba9c2 (patch) | |
| tree | aac31dccb328366674c0284cba2d9a86ca3dfe4e /apps/dsp.c | |
| parent | 01bcd2c6121fa0ae1797ef11c02be298574f4fdb (diff) | |
| download | rockbox-8589fcb3e3e0744b208ce5e8099fdf12e46ba9c2.zip rockbox-8589fcb3e3e0744b208ce5e8099fdf12e46ba9c2.tar.gz rockbox-8589fcb3e3e0744b208ce5e8099fdf12e46ba9c2.tar.bz2 rockbox-8589fcb3e3e0744b208ce5e8099fdf12e46ba9c2.tar.xz | |
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
Diffstat (limited to 'apps/dsp.c')
| -rw-r--r-- | apps/dsp.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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; |