diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-06-21 16:53:00 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-06-21 16:53:00 +0000 |
commit | 35e8b1429a2cdcf6580f6d25890fed9865165d0b (patch) | |
tree | 084be19a29bffa879eee8e3cad92d8f3b342a337 /apps/recorder/peakmeter.c | |
parent | 02e04585bdf1fbd00cf84d2000f59ec198440cb3 (diff) | |
download | rockbox-35e8b1429a2cdcf6580f6d25890fed9865165d0b.tar.gz rockbox-35e8b1429a2cdcf6580f6d25890fed9865165d0b.zip |
Rockbox as an application: Replace many occurences of #ifdef SIMULATOR with #if (CONFIG_PLATFORM & PLATFORM_HOSTED) (or equivalently).
The simulator defines PLATFORM_HOSTED, as RaaA will do (RaaA will not define SIMULATOR).
The new define is to (de-)select code to compile on hosted platforms generally.
Should be no functional change to targets or the simulator.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27019 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/recorder/peakmeter.c')
-rw-r--r-- | apps/recorder/peakmeter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c index 164b14b15c..9e93638717 100644 --- a/apps/recorder/peakmeter.c +++ b/apps/recorder/peakmeter.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * KIND, either express or implied. | 18 | * KIND, either express or implied. |
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | #ifdef SIMULATOR | 21 | #if defined(SIMULATOR) && (CONFIG_CODEC != SWCODEC) |
22 | #include <stdlib.h> /* sim uses rand for peakmeter simulation */ | 22 | #include <stdlib.h> /* sim uses rand for peakmeter simulation */ |
23 | #endif | 23 | #endif |
24 | #include "config.h" | 24 | #include "config.h" |
@@ -538,7 +538,7 @@ void pm_reset_clipcount(void) | |||
538 | void peak_meter_playback(bool playback) | 538 | void peak_meter_playback(bool playback) |
539 | { | 539 | { |
540 | int i; | 540 | int i; |
541 | #ifdef SIMULATOR | 541 | #if (CONFIG_PLATFORM & PLATFORM_HOSTED) |
542 | (void)playback; | 542 | (void)playback; |
543 | #elif CONFIG_CODEC == SWCODEC | 543 | #elif CONFIG_CODEC == SWCODEC |
544 | pm_playback = playback; | 544 | pm_playback = playback; |
@@ -595,7 +595,7 @@ void peak_meter_peek(void) | |||
595 | left = pm_cur_left; | 595 | left = pm_cur_left; |
596 | right = pm_cur_right; | 596 | right = pm_cur_right; |
597 | #else | 597 | #else |
598 | #ifndef SIMULATOR | 598 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
599 | pm_cur_left = left = mas_codec_readreg(pm_src_left); | 599 | pm_cur_left = left = mas_codec_readreg(pm_src_left); |
600 | pm_cur_right = right = mas_codec_readreg(pm_src_right); | 600 | pm_cur_right = right = mas_codec_readreg(pm_src_right); |
601 | #else | 601 | #else |