From 63ba93c9ca33094b61cdd4c14d8794fc78ddd1a2 Mon Sep 17 00:00:00 2001 From: Brandon Low Date: Fri, 10 Mar 2006 13:47:12 +0000 Subject: Revert non-functional peakmeter fix, fix it for real? this time git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8990 a1c6a512-1295-4272-9138-f99709370657 --- firmware/pcm_playback.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'firmware/pcm_playback.c') diff --git a/firmware/pcm_playback.c b/firmware/pcm_playback.c index f3098fac93..efe9f0eedf 100644 --- a/firmware/pcm_playback.c +++ b/firmware/pcm_playback.c @@ -774,11 +774,11 @@ void pcm_calculate_peaks(int *left, int *right) #endif if (samples > PEAK_SAMPLES) - samples = PEAK_SAMPLES - PEAK_STRIDE; + samples = PEAK_SAMPLES - (PEAK_STRIDE - 1); else - samples -= MIN(PEAK_STRIDE, samples); + samples -= MIN(PEAK_STRIDE - 1, samples); - end = addr + samples * 4; + end = &addr[samples * 2]; } if (left && right) { @@ -796,7 +796,7 @@ void pcm_calculate_peaks(int *left, int *right) else if (-value > right_peak) right_peak = -value; - addr += PEAK_STRIDE * 2; + addr = &addr[PEAK_STRIDE * 2]; } *left = left_peak; -- cgit v1.2.3