From 9c3f6c40791b2f7b4aa7420a59fc9360306eaf45 Mon Sep 17 00:00:00 2001 From: Peter D'Hoye Date: Sat, 8 Mar 2008 20:32:37 +0000 Subject: Simplify that clip indicator reset code a bit git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16559 a1c6a512-1295-4272-9138-f99709370657 --- apps/recorder/peakmeter.c | 10 +++------- apps/recorder/recording.c | 4 +--- 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); } -- cgit v1.1