summaryrefslogtreecommitdiff
path: root/apps/recorder
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2008-07-03 13:37:57 +0000
committerBertrik Sikken <bertrik@sikken.nl>2008-07-03 13:37:57 +0000
commitf4d4a6ab60960385b99fd43d8e1d0213bdf1aec3 (patch)
treea17522b121489fe8c52c40bd03f1ede2ccfcf8ab /apps/recorder
parent6fd40a57b81484a57f1c5a8ddbd48855a89e660f (diff)
downloadrockbox-f4d4a6ab60960385b99fd43d8e1d0213bdf1aec3.zip
rockbox-f4d4a6ab60960385b99fd43d8e1d0213bdf1aec3.tar.gz
rockbox-f4d4a6ab60960385b99fd43d8e1d0213bdf1aec3.tar.bz2
rockbox-f4d4a6ab60960385b99fd43d8e1d0213bdf1aec3.tar.xz
Implement FS#8947 - Add a stub in the simulator for ata_disk_is_active. This make it possible to clean up some #ifdef SIMULATOR macros.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17927 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/recorder')
-rw-r--r--apps/recorder/peakmeter.c2
-rw-r--r--apps/recorder/recording.c6
2 files changed, 2 insertions, 6 deletions
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c
index 29be704..fc7c9bc 100644
--- a/apps/recorder/peakmeter.c
+++ b/apps/recorder/peakmeter.c
@@ -1335,7 +1335,7 @@ int peak_meter_draw_get_btn(int action_context, int x, int y[],
long next_refresh = current_tick;
long next_big_refresh = current_tick + HZ / 10;
int i;
-#if (CONFIG_CODEC == SWCODEC) || defined(SIMULATOR)
+#if (CONFIG_CODEC == SWCODEC)
bool highperf = false;
#else
/* On MAS targets, we need to poll as often as possible in order to not
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index de4a2e6..4afa87e 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -292,11 +292,7 @@ static bool read_peak_levels(int *peak_l, int *peak_r, int *balance)
peak_valid_mem[peak_time % 3] = *peak_l;
if (((peak_valid_mem[0] == peak_valid_mem[1]) &&
(peak_valid_mem[1] == peak_valid_mem[2])) &&
- ((*peak_l < 32767)
-#ifndef SIMULATOR
- || ata_disk_is_active()
-#endif
- ))
+ ((*peak_l < 32767) || ata_disk_is_active()))
return false;
if (*peak_r > *peak_l)