diff options
author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-02-02 17:43:32 +0000 |
---|---|---|
committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-02-02 17:43:32 +0000 |
commit | 5d849a963e562d1996c20cd72228835276288141 (patch) | |
tree | 8c96a2524f6c1b6d714506a8d012a9c7ded24918 /apps/mpeg.c | |
parent | 35bcdef1441519bb66a77b675013309ef39e9eec (diff) | |
download | rockbox-5d849a963e562d1996c20cd72228835276288141.tar.gz rockbox-5d849a963e562d1996c20cd72228835276288141.zip |
Clean up multiple definitions of RAM size. Remove -DMEM (make) and MEM (code), use the already defined MEMORYSIZE instead.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29189 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/mpeg.c')
-rw-r--r-- | apps/mpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/mpeg.c b/apps/mpeg.c index 583e4e2122..bdca92048f 100644 --- a/apps/mpeg.c +++ b/apps/mpeg.c | |||
@@ -1623,7 +1623,7 @@ static void mpeg_thread(void) | |||
1623 | #if (CONFIG_STORAGE & STORAGE_MMC) | 1623 | #if (CONFIG_STORAGE & STORAGE_MMC) |
1624 | /* MMC is slow, so don't read too large chunks */ | 1624 | /* MMC is slow, so don't read too large chunks */ |
1625 | amount_to_read = MIN(0x40000, amount_to_read); | 1625 | amount_to_read = MIN(0x40000, amount_to_read); |
1626 | #elif MEM == 8 | 1626 | #elif MEMORYSIZE == 8 |
1627 | amount_to_read = MIN(0x100000, amount_to_read); | 1627 | amount_to_read = MIN(0x100000, amount_to_read); |
1628 | #endif | 1628 | #endif |
1629 | 1629 | ||
@@ -1933,7 +1933,7 @@ static void mpeg_thread(void) | |||
1933 | #if (CONFIG_STORAGE & STORAGE_MMC) | 1933 | #if (CONFIG_STORAGE & STORAGE_MMC) |
1934 | /* MMC is slow, so don't save too large chunks at once */ | 1934 | /* MMC is slow, so don't save too large chunks at once */ |
1935 | amount_to_save = MIN(0x40000, amount_to_save); | 1935 | amount_to_save = MIN(0x40000, amount_to_save); |
1936 | #elif MEM == 8 | 1936 | #elif MEMORYSIZE == 8 |
1937 | amount_to_save = MIN(0x100000, amount_to_save); | 1937 | amount_to_save = MIN(0x100000, amount_to_save); |
1938 | #endif | 1938 | #endif |
1939 | rc = write(mpeg_file, audiobuf + audiobuf_read, | 1939 | rc = write(mpeg_file, audiobuf + audiobuf_read, |