summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter D'Hoye <peter.dhoye@gmail.com>2008-03-08 20:32:37 +0000
committerPeter D'Hoye <peter.dhoye@gmail.com>2008-03-08 20:32:37 +0000
commit9c3f6c40791b2f7b4aa7420a59fc9360306eaf45 (patch)
treeb18ef62e63cdf666c676e79776112756ce844a10
parent3290999e0957fe2b30609c1f413e80b7e9c2d761 (diff)
downloadrockbox-9c3f6c40791b2f7b4aa7420a59fc9360306eaf45.zip
rockbox-9c3f6c40791b2f7b4aa7420a59fc9360306eaf45.tar.gz
rockbox-9c3f6c40791b2f7b4aa7420a59fc9360306eaf45.tar.bz2
rockbox-9c3f6c40791b2f7b4aa7420a59fc9360306eaf45.tar.xz
Simplify that clip indicator reset code a bit
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16559 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/recorder/peakmeter.c10
-rw-r--r--apps/recorder/recording.c4
2 files changed, 4 insertions, 10 deletions
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c
index b5f38e7..541101c 100644
--- a/apps/recorder/peakmeter.c
+++ b/apps/recorder/peakmeter.c
@@ -869,13 +869,9 @@ void peak_meter_get_peakhold(int *peak_left, int *peak_right)
*/
void peak_meter_set_clip_hold(int time)
{
- pm_clip_eternal = false;
-
- if (time <= 0) {
- pm_clip_left = false;
- pm_clip_right = false;
- pm_clip_eternal = true;
- }
+ pm_clip_left = false;
+ pm_clip_right = false;
+ pm_clip_eternal = (time > 0) ? false : true;
}
/**
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 1c2cd8e..543b7f2 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -281,9 +281,7 @@ static void set_gain(void)
global_settings.rec_right_gain,
AUDIO_GAIN_LINEIN);
}
- /* reset the clipping indicators:
- use -1 to clear them, then call again with settings value */
- peak_meter_set_clip_hold(-1);
+ /* reset the clipping indicators */
peak_meter_set_clip_hold(global_settings.peak_meter_clip_hold);
}