diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/pcmbuf.c | 2 | ||||
-rw-r--r-- | apps/pcmbuf.h | 2 | ||||
-rw-r--r-- | apps/playback.c | 6 | ||||
-rw-r--r-- | apps/playback.h | 2 | ||||
-rw-r--r-- | apps/settings.c | 2 |
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) | |||
740 | { | 740 | { |
741 | pcmbuf_boost(true); | 741 | pcmbuf_boost(true); |
742 | /* Pre-buffer 1s. */ | 742 | /* Pre-buffer 1s. */ |
743 | #if MEMORYSIZE <= 1 | 743 | #if MEM <= 1 |
744 | if (!LOW_DATA(1)) | 744 | if (!LOW_DATA(1)) |
745 | #else | 745 | #else |
746 | if (!LOW_DATA(4)) | 746 | 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 @@ | |||
19 | #ifndef PCMBUF_H | 19 | #ifndef PCMBUF_H |
20 | #define PCMBUF_H | 20 | #define PCMBUF_H |
21 | 21 | ||
22 | #if MEMORYSIZE > 1 | 22 | #if MEM > 1 |
23 | #define PCMBUF_TARGET_CHUNK 32768 /* This is the target fill size of chunks | 23 | #define PCMBUF_TARGET_CHUNK 32768 /* This is the target fill size of chunks |
24 | on the pcm buffer */ | 24 | on the pcm buffer */ |
25 | #define PCMBUF_MINAVG_CHUNK 24576 /* This is the minimum average size of | 25 | #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 { | |||
136 | }; | 136 | }; |
137 | 137 | ||
138 | /* As defined in plugins/lib/xxx2wav.h */ | 138 | /* As defined in plugins/lib/xxx2wav.h */ |
139 | #if MEMORYSIZE > 1 | 139 | #if MEM > 1 |
140 | #define MALLOC_BUFSIZE (512*1024) | 140 | #define MALLOC_BUFSIZE (512*1024) |
141 | #define GUARD_BUFSIZE (32*1024) | 141 | #define GUARD_BUFSIZE (32*1024) |
142 | #else | 142 | #else |
@@ -2935,14 +2935,14 @@ void audio_set_crossfade(int enable) | |||
2935 | size_t size; | 2935 | size_t size; |
2936 | bool was_playing = (playing && audio_is_initialized); | 2936 | bool was_playing = (playing && audio_is_initialized); |
2937 | size_t offset = 0; | 2937 | size_t offset = 0; |
2938 | #if MEMORYSIZE > 1 | 2938 | #if MEM > 1 |
2939 | int seconds = 1; | 2939 | int seconds = 1; |
2940 | #endif | 2940 | #endif |
2941 | 2941 | ||
2942 | if (!filebuf) | 2942 | if (!filebuf) |
2943 | return; /* Audio buffers not yet set up */ | 2943 | return; /* Audio buffers not yet set up */ |
2944 | 2944 | ||
2945 | #if MEMORYSIZE > 1 | 2945 | #if MEM > 1 |
2946 | if (enable) | 2946 | if (enable) |
2947 | seconds = global_settings.crossfade_fade_out_delay | 2947 | seconds = global_settings.crossfade_fade_out_delay |
2948 | + global_settings.crossfade_fade_out_duration; | 2948 | + 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 @@ | |||
33 | /* Not yet implemented. */ | 33 | /* Not yet implemented. */ |
34 | #define CODEC_SET_AUDIOBUF_WATERMARK 4 | 34 | #define CODEC_SET_AUDIOBUF_WATERMARK 4 |
35 | 35 | ||
36 | #if MEMORYSIZE > 1 | 36 | #if MEM > 1 |
37 | #define MAX_TRACK 32 | 37 | #define MAX_TRACK 32 |
38 | #else | 38 | #else |
39 | #define MAX_TRACK 8 | 39 | #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[] = | |||
269 | "idle poweroff", "off,1,2,3,4,5,6,7,8,9,10,15,30,45,60" }, | 269 | "idle poweroff", "off,1,2,3,4,5,6,7,8,9,10,15,30,45,60" }, |
270 | {18, S_O(runtime), 0, NULL, NULL }, | 270 | {18, S_O(runtime), 0, NULL, NULL }, |
271 | {18, S_O(topruntime), 0, NULL, NULL }, | 271 | {18, S_O(topruntime), 0, NULL, NULL }, |
272 | #if MEMORYSIZE > 1 | 272 | #if MEM > 1 |
273 | {15, S_O(max_files_in_playlist), 10000, | 273 | {15, S_O(max_files_in_playlist), 10000, |
274 | "max files in playlist", NULL }, /* 1000...20000 */ | 274 | "max files in playlist", NULL }, /* 1000...20000 */ |
275 | {14, S_O(max_files_in_dir), 400, | 275 | {14, S_O(max_files_in_dir), 400, |