Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Memory size checks in .c/.h files should use MEM, not MEMORYSIZE

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10557 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2006-08-13 09:19:24 +00:00
parent 28910e7e17
commit 0a7ded3e29
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/pcmbuf.c
View file

@ -740,7 +740,7 @@ static bool prepare_insert(size_t length)
{ {
pcmbuf_boost(true); pcmbuf_boost(true);
/* Pre-buffer 1s. */ /* Pre-buffer 1s. */
#if MEMORYSIZE <= 1 #if MEM <= 1
if (!LOW_DATA(1)) if (!LOW_DATA(1))
#else #else
if (!LOW_DATA(4)) if (!LOW_DATA(4))

2
apps/pcmbuf.h
View file

@ -19,7 +19,7 @@
#ifndef PCMBUF_H #ifndef PCMBUF_H
#define PCMBUF_H #define PCMBUF_H
#if MEMORYSIZE > 1 #if MEM > 1
#define PCMBUF_TARGET_CHUNK 32768 /* This is the target fill size of chunks #define PCMBUF_TARGET_CHUNK 32768 /* This is the target fill size of chunks
on the pcm buffer */ on the pcm buffer */
#define PCMBUF_MINAVG_CHUNK 24576 /* This is the minimum average size of #define PCMBUF_MINAVG_CHUNK 24576 /* This is the minimum average size of

6
apps/playback.c
View file

@ -136,7 +136,7 @@ enum {
}; };
/* As defined in plugins/lib/xxx2wav.h */ /* As defined in plugins/lib/xxx2wav.h */
#if MEMORYSIZE > 1 #if MEM > 1
#define MALLOC_BUFSIZE (512*1024) #define MALLOC_BUFSIZE (512*1024)
#define GUARD_BUFSIZE (32*1024) #define GUARD_BUFSIZE (32*1024)
#else #else
@ -2935,14 +2935,14 @@ void audio_set_crossfade(int enable)
size_t size; size_t size;
bool was_playing = (playing && audio_is_initialized); bool was_playing = (playing && audio_is_initialized);
size_t offset = 0; size_t offset = 0;
#if MEMORYSIZE > 1 #if MEM > 1
int seconds = 1; int seconds = 1;
#endif #endif
if (!filebuf) if (!filebuf)
return; /* Audio buffers not yet set up */ return; /* Audio buffers not yet set up */
#if MEMORYSIZE > 1 #if MEM > 1
if (enable) if (enable)
seconds = global_settings.crossfade_fade_out_delay seconds = global_settings.crossfade_fade_out_delay
+ global_settings.crossfade_fade_out_duration; + global_settings.crossfade_fade_out_duration;

2
apps/playback.h
View file

@ -33,7 +33,7 @@
/* Not yet implemented. */ /* Not yet implemented. */
#define CODEC_SET_AUDIOBUF_WATERMARK 4 #define CODEC_SET_AUDIOBUF_WATERMARK 4
#if MEMORYSIZE > 1 #if MEM > 1
#define MAX_TRACK 32 #define MAX_TRACK 32
#else #else
#define MAX_TRACK 8 #define MAX_TRACK 8

2
apps/settings.c
View file

@ -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" }, "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(runtime), 0, NULL, NULL },
{18, S_O(topruntime), 0, NULL, NULL }, {18, S_O(topruntime), 0, NULL, NULL },
#if MEMORYSIZE > 1 #if MEM > 1
{15, S_O(max_files_in_playlist), 10000, {15, S_O(max_files_in_playlist), 10000,
"max files in playlist", NULL }, /* 1000...20000 */ "max files in playlist", NULL }, /* 1000...20000 */
{14, S_O(max_files_in_dir), 400, {14, S_O(max_files_in_dir), 400,