From ea7992455a9704e2eb6bd6c9b39fabd111a7b997 Mon Sep 17 00:00:00 2001 From: Magnus Holmgren Date: Wed, 15 Nov 2006 20:26:33 +0000 Subject: Make the updated %rg tag match playback behaviour (fall back to track gain if album gain requested but not available). Share the mode decision logic with playback code and simplify the %rg tag handling. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11532 a1c6a512-1295-4272-9138-f99709370657 --- apps/dsp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'apps/dsp.c') diff --git a/apps/dsp.c b/apps/dsp.c index 94e825c..5627b05 100644 --- a/apps/dsp.c +++ b/apps/dsp.c @@ -26,6 +26,7 @@ #include "system.h" #include "settings.h" #include "replaygain.h" +#include "misc.h" #include "debug.h" #ifndef SIMULATOR @@ -1093,10 +1094,8 @@ void dsp_set_replaygain(bool always) if (global_settings.replaygain || global_settings.replaygain_noclip) { - bool track_mode - = ((global_settings.replaygain_type == REPLAYGAIN_TRACK) - || ((global_settings.replaygain_type == REPLAYGAIN_SHUFFLE) - && global_settings.playlist_shuffle)); + bool track_mode = get_replaygain_mode(dsp->track_gain != 0, + dsp->album_gain != 0) == REPLAYGAIN_TRACK; long peak = (track_mode || !dsp->album_peak) ? dsp->track_peak : dsp->album_peak; -- cgit v1.1