diff options
author | Dan Everton <dan@iocaine.org> | 2006-02-23 21:13:03 +0000 |
---|---|---|
committer | Dan Everton <dan@iocaine.org> | 2006-02-23 21:13:03 +0000 |
commit | e37654521144e1d224f0044268643f20e3b8a363 (patch) | |
tree | d6f617b340c3f22d10f938eb54dcb0442966914a /apps/recorder | |
parent | f0d1c96ee435e03af0c92aa5ac5260499ae589ed (diff) | |
download | rockbox-e37654521144e1d224f0044268643f20e3b8a363.tar.gz rockbox-e37654521144e1d224f0044268643f20e3b8a363.zip |
Make peak meter work in simulator for SWCODEC targets.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8815 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/recorder')
-rw-r--r-- | apps/recorder/peakmeter.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c index 0142a9d093..f70e9ae709 100644 --- a/apps/recorder/peakmeter.c +++ b/apps/recorder/peakmeter.c | |||
@@ -44,9 +44,7 @@ | |||
44 | #include "pcm_record.h" | 44 | #include "pcm_record.h" |
45 | #endif | 45 | #endif |
46 | 46 | ||
47 | #ifndef SIMULATOR /* this is not used in the sim */ | ||
48 | static bool pm_playback = true; /* selects between playback and recording peaks */ | 47 | static bool pm_playback = true; /* selects between playback and recording peaks */ |
49 | #endif | ||
50 | 48 | ||
51 | #endif | 49 | #endif |
52 | 50 | ||
@@ -539,11 +537,7 @@ void peak_meter_peek(void) | |||
539 | { | 537 | { |
540 | int left, right; | 538 | int left, right; |
541 | /* read current values */ | 539 | /* read current values */ |
542 | #ifdef SIMULATOR | 540 | #if CONFIG_CODEC == SWCODEC |
543 | pm_cur_left = left = 8000; | ||
544 | pm_cur_right = right = 9000; | ||
545 | #elif CONFIG_CODEC == SWCODEC | ||
546 | |||
547 | if (pm_playback) | 541 | if (pm_playback) |
548 | pcm_calculate_peaks(&pm_cur_left, &pm_cur_right); | 542 | pcm_calculate_peaks(&pm_cur_left, &pm_cur_right); |
549 | #ifdef HAVE_RECORDING | 543 | #ifdef HAVE_RECORDING |
@@ -555,8 +549,13 @@ void peak_meter_peek(void) | |||
555 | left = pm_cur_left; | 549 | left = pm_cur_left; |
556 | right = pm_cur_right; | 550 | right = pm_cur_right; |
557 | #else | 551 | #else |
552 | #ifndef SIMULATOR | ||
558 | pm_cur_left = left = mas_codec_readreg(pm_src_left); | 553 | pm_cur_left = left = mas_codec_readreg(pm_src_left); |
559 | pm_cur_right = right = mas_codec_readreg(pm_src_right); | 554 | pm_cur_right = right = mas_codec_readreg(pm_src_right); |
555 | #else | ||
556 | pm_cur_left = left = 8000; | ||
557 | pm_cur_right = right = 9000; | ||
558 | #endif | ||
560 | #endif | 559 | #endif |
561 | 560 | ||
562 | /* check for clips | 561 | /* check for clips |