diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/codecs/spc.c | 2 | ||||
-rw-r--r-- | apps/playlist.c | 4 | ||||
-rw-r--r-- | apps/screen_access.h | 2 | ||||
-rw-r--r-- | apps/screens.c | 2 | ||||
-rw-r--r-- | apps/settings_list.c | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/apps/codecs/spc.c b/apps/codecs/spc.c index 2dac1d4e61..604529109e 100644 --- a/apps/codecs/spc.c +++ b/apps/codecs/spc.c | |||
@@ -92,7 +92,7 @@ static inline void set_le16( void* p, unsigned n ) | |||
92 | #define GET_LE16( addr ) get_le16( addr ) | 92 | #define GET_LE16( addr ) get_le16( addr ) |
93 | #define SET_LE16( addr, data ) set_le16( addr, data ) | 93 | #define SET_LE16( addr, data ) set_le16( addr, data ) |
94 | 94 | ||
95 | #if ROCKBOX_LITTLE_ENDIAN | 95 | #ifdef ROCKBOX_LITTLE_ENDIAN |
96 | #define GET_LE16A( addr ) (*(uint16_t*) (addr)) | 96 | #define GET_LE16A( addr ) (*(uint16_t*) (addr)) |
97 | #define GET_LE16SA( addr ) (*( int16_t*) (addr)) | 97 | #define GET_LE16SA( addr ) (*( int16_t*) (addr)) |
98 | #define SET_LE16A( addr, data ) (void) (*(uint16_t*) (addr) = (data)) | 98 | #define SET_LE16A( addr, data ) (void) (*(uint16_t*) (addr) = (data)) |
diff --git a/apps/playlist.c b/apps/playlist.c index 56ffccc474..6997b12675 100644 --- a/apps/playlist.c +++ b/apps/playlist.c | |||
@@ -1056,7 +1056,7 @@ static int get_next_index(const struct playlist_info* playlist, int steps, | |||
1056 | } | 1056 | } |
1057 | 1057 | ||
1058 | case REPEAT_ONE: | 1058 | case REPEAT_ONE: |
1059 | #if (AB_REPEAT_ENABLE == 1) | 1059 | #ifdef AB_REPEAT_ENABLE |
1060 | case REPEAT_AB: | 1060 | case REPEAT_AB: |
1061 | #endif | 1061 | #endif |
1062 | next_index = current_index; | 1062 | next_index = current_index; |
@@ -2479,7 +2479,7 @@ int playlist_next(int steps) | |||
2479 | int index; | 2479 | int index; |
2480 | 2480 | ||
2481 | if ( (steps > 0) | 2481 | if ( (steps > 0) |
2482 | #if (AB_REPEAT_ENABLE == 1) | 2482 | #ifdef AB_REPEAT_ENABLE |
2483 | && (global_settings.repeat_mode != REPEAT_AB) | 2483 | && (global_settings.repeat_mode != REPEAT_AB) |
2484 | #endif | 2484 | #endif |
2485 | && (global_settings.repeat_mode != REPEAT_ONE) ) | 2485 | && (global_settings.repeat_mode != REPEAT_ONE) ) |
diff --git a/apps/screen_access.h b/apps/screen_access.h index eea15e86a5..54f2d64fdb 100644 --- a/apps/screen_access.h +++ b/apps/screen_access.h | |||
@@ -96,7 +96,7 @@ struct screen | |||
96 | #if defined(HAVE_LCD_COLOR) && defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1 | 96 | #if defined(HAVE_LCD_COLOR) && defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1 |
97 | unsigned (*color_to_native)(unsigned color); | 97 | unsigned (*color_to_native)(unsigned color); |
98 | #endif | 98 | #endif |
99 | #if (LCD_DEPTH > 1) || (LCD_REMOTE_DEPTH > 1) | 99 | #if (LCD_DEPTH > 1) || (defined(LCD_REMOTE_DEPTH) && (LCD_REMOTE_DEPTH > 1)) |
100 | unsigned (*get_background)(void); | 100 | unsigned (*get_background)(void); |
101 | unsigned (*get_foreground)(void); | 101 | unsigned (*get_foreground)(void); |
102 | void (*set_background)(unsigned background); | 102 | void (*set_background)(unsigned background); |
diff --git a/apps/screens.c b/apps/screens.c index b5e22fded5..d74b7c193c 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -663,7 +663,7 @@ bool quick_screen_quick(int button_enter) | |||
663 | [REPEAT_ALL]={ STR(LANG_SYSFONT_REPEAT_ALL) }, | 663 | [REPEAT_ALL]={ STR(LANG_SYSFONT_REPEAT_ALL) }, |
664 | [REPEAT_ONE]={ STR(LANG_SYSFONT_REPEAT_ONE) }, | 664 | [REPEAT_ONE]={ STR(LANG_SYSFONT_REPEAT_ONE) }, |
665 | [REPEAT_SHUFFLE]={ STR(LANG_SYSFONT_SHUFFLE) }, | 665 | [REPEAT_SHUFFLE]={ STR(LANG_SYSFONT_SHUFFLE) }, |
666 | #if (AB_REPEAT_ENABLE == 1) | 666 | #ifdef AB_REPEAT_ENABLE |
667 | [REPEAT_AB]={ STR(LANG_SYSFONT_REPEAT_AB) } | 667 | [REPEAT_AB]={ STR(LANG_SYSFONT_REPEAT_AB) } |
668 | #endif | 668 | #endif |
669 | }; | 669 | }; |
diff --git a/apps/settings_list.c b/apps/settings_list.c index 0d84408346..37fa7c53c3 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -387,17 +387,17 @@ const struct settings_list settings[] = { | |||
387 | SYSTEM_SETTING(NVRAM(4),resume_seed,-1), | 387 | SYSTEM_SETTING(NVRAM(4),resume_seed,-1), |
388 | CHOICE_SETTING(0, repeat_mode, LANG_REPEAT, REPEAT_ALL, "repeat", | 388 | CHOICE_SETTING(0, repeat_mode, LANG_REPEAT, REPEAT_ALL, "repeat", |
389 | "off,all,one,shuffle" | 389 | "off,all,one,shuffle" |
390 | #if (AB_REPEAT_ENABLE == 1) | 390 | #ifdef AB_REPEAT_ENABLE |
391 | ",ab" | 391 | ",ab" |
392 | #endif | 392 | #endif |
393 | , NULL, | 393 | , NULL, |
394 | #if (AB_REPEAT_ENABLE == 1) | 394 | #ifdef AB_REPEAT_ENABLE |
395 | 5, | 395 | 5, |
396 | #else | 396 | #else |
397 | 4, | 397 | 4, |
398 | #endif | 398 | #endif |
399 | ID2P(LANG_OFF), ID2P(LANG_REPEAT_ALL), ID2P(LANG_REPEAT_ONE), ID2P(LANG_SHUFFLE) | 399 | ID2P(LANG_OFF), ID2P(LANG_REPEAT_ALL), ID2P(LANG_REPEAT_ONE), ID2P(LANG_SHUFFLE) |
400 | #if (AB_REPEAT_ENABLE == 1) | 400 | #ifdef AB_REPEAT_ENABLE |
401 | ,ID2P(LANG_REPEAT_AB) | 401 | ,ID2P(LANG_REPEAT_AB) |
402 | #endif | 402 | #endif |
403 | ), /* CHOICE_SETTING( repeat_mode ) */ | 403 | ), /* CHOICE_SETTING( repeat_mode ) */ |