summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2006-08-13 09:19:24 +0000
committerDave Chapman <dave@dchapman.com>2006-08-13 09:19:24 +0000
commit0a7ded3e29b302a83b61279128962b829817e4cb (patch)
tree7d3db8d0ff7fc50fb1e620c90f1bd8e866147e50
parent28910e7e17786607d0286f2901d77a83d55a7f2c (diff)
downloadrockbox-0a7ded3e29b302a83b61279128962b829817e4cb.tar.gz
rockbox-0a7ded3e29b302a83b61279128962b829817e4cb.tar.bz2
rockbox-0a7ded3e29b302a83b61279128962b829817e4cb.zip
Memory size checks in .c/.h files should use MEM, not MEMORYSIZE
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10557 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/pcmbuf.c2
-rw-r--r--apps/pcmbuf.h2
-rw-r--r--apps/playback.c6
-rw-r--r--apps/playback.h2
-rw-r--r--apps/settings.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c
index eb8b2a3f3d..b18d411db6 100644
--- a/apps/pcmbuf.c
+++ b/apps/pcmbuf.c
@@ -740,7 +740,7 @@ static bool prepare_insert(size_t length)
{
pcmbuf_boost(true);
/* Pre-buffer 1s. */
-#if MEMORYSIZE <= 1
+#if MEM <= 1
if (!LOW_DATA(1))
#else
if (!LOW_DATA(4))
diff --git a/apps/pcmbuf.h b/apps/pcmbuf.h
index 18a6894fee..b5035f4405 100644
--- a/apps/pcmbuf.h
+++ b/apps/pcmbuf.h
@@ -19,7 +19,7 @@
#ifndef PCMBUF_H
#define PCMBUF_H
-#if MEMORYSIZE > 1
+#if MEM > 1
#define PCMBUF_TARGET_CHUNK 32768 /* This is the target fill size of chunks
on the pcm buffer */
#define PCMBUF_MINAVG_CHUNK 24576 /* This is the minimum average size of
diff --git a/apps/playback.c b/apps/playback.c
index 04f67ef4fb..890a2d7d1b 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -136,7 +136,7 @@ enum {
};
/* As defined in plugins/lib/xxx2wav.h */
-#if MEMORYSIZE > 1
+#if MEM > 1
#define MALLOC_BUFSIZE (512*1024)
#define GUARD_BUFSIZE (32*1024)
#else
@@ -2935,14 +2935,14 @@ void audio_set_crossfade(int enable)
size_t size;
bool was_playing = (playing && audio_is_initialized);
size_t offset = 0;
-#if MEMORYSIZE > 1
+#if MEM > 1
int seconds = 1;
#endif
if (!filebuf)
return; /* Audio buffers not yet set up */
-#if MEMORYSIZE > 1
+#if MEM > 1
if (enable)
seconds = global_settings.crossfade_fade_out_delay
+ global_settings.crossfade_fade_out_duration;
diff --git a/apps/playback.h b/apps/playback.h
index 98e0784efe..7144974f36 100644
--- a/apps/playback.h
+++ b/apps/playback.h
@@ -33,7 +33,7 @@
/* Not yet implemented. */
#define CODEC_SET_AUDIOBUF_WATERMARK 4
-#if MEMORYSIZE > 1
+#if MEM > 1
#define MAX_TRACK 32
#else
#define MAX_TRACK 8
diff --git a/apps/settings.c b/apps/settings.c
index 87789bc617..0901095dd6 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -269,7 +269,7 @@ static const struct bit_entry rtc_bits[] =
"idle poweroff", "off,1,2,3,4,5,6,7,8,9,10,15,30,45,60" },
{18, S_O(runtime), 0, NULL, NULL },
{18, S_O(topruntime), 0, NULL, NULL },
-#if MEMORYSIZE > 1
+#if MEM > 1
{15, S_O(max_files_in_playlist), 10000,
"max files in playlist", NULL }, /* 1000...20000 */
{14, S_O(max_files_in_dir), 400,