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
This commit is contained in:
parent
28910e7e17
commit
0a7ded3e29
5 changed files with 7 additions and 7 deletions
|
@ -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))
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue