diff options
-rw-r--r-- | apps/plugin.c | 2 | ||||
-rw-r--r-- | apps/plugin.h | 2 | ||||
-rw-r--r-- | apps/plugins/bounce.c | 2 | ||||
-rw-r--r-- | apps/plugins/brickmania.c | 3 | ||||
-rwxr-xr-x | apps/plugins/bubbles.c | 2 | ||||
-rw-r--r-- | apps/plugins/chessbox/chessbox.c | 2 | ||||
-rw-r--r-- | apps/plugins/demystify.c | 2 | ||||
-rw-r--r-- | apps/plugins/fire.c | 2 | ||||
-rw-r--r-- | apps/plugins/flipit.c | 2 | ||||
-rw-r--r-- | apps/plugins/jewels.c | 2 | ||||
-rw-r--r-- | apps/plugins/mandelbrot.c | 2 | ||||
-rw-r--r-- | apps/plugins/minesweeper.c | 2 | ||||
-rw-r--r-- | apps/plugins/plasma.c | 2 | ||||
-rw-r--r-- | apps/plugins/rockblox.c | 2 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockboy.c | 6 | ||||
-rw-r--r-- | apps/plugins/snake2.c | 2 | ||||
-rwxr-xr-x | apps/plugins/spacerocks.c | 2 | ||||
-rw-r--r-- | apps/plugins/sudoku/sudoku.c | 4 | ||||
-rw-r--r-- | apps/plugins/wormlet.c | 2 |
19 files changed, 38 insertions, 7 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index c6481e8eae..90b3837cf8 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -467,7 +467,9 @@ static const struct plugin_api rockbox_api = { | |||
467 | #endif /* HAVE_RECORDING */ | 467 | #endif /* HAVE_RECORDING */ |
468 | #endif /* CONFIG_CODEC == SWCODEC */ | 468 | #endif /* CONFIG_CODEC == SWCODEC */ |
469 | 469 | ||
470 | #if LCD_DEPTH > 1 | ||
470 | lcd_set_backdrop, | 471 | lcd_set_backdrop, |
472 | #endif | ||
471 | 473 | ||
472 | }; | 474 | }; |
473 | 475 | ||
diff --git a/apps/plugin.h b/apps/plugin.h index 2fcd52198c..e9a6cfdaed 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -579,7 +579,9 @@ struct plugin_api { | |||
579 | #endif /* HAVE_RECORDING */ | 579 | #endif /* HAVE_RECORDING */ |
580 | #endif /* CONFIG_CODEC == SWCODEC */ | 580 | #endif /* CONFIG_CODEC == SWCODEC */ |
581 | 581 | ||
582 | #if LCD_DEPTH > 1 | ||
582 | void (*lcd_set_backdrop)(fb_data* backdrop); | 583 | void (*lcd_set_backdrop)(fb_data* backdrop); |
584 | #endif | ||
583 | }; | 585 | }; |
584 | 586 | ||
585 | /* plugin header */ | 587 | /* plugin header */ |
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index e3e90468cc..89a6745720 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c | |||
@@ -480,7 +480,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
480 | rb = api; | 480 | rb = api; |
481 | 481 | ||
482 | len = rb->strlen(SS_TITLE); | 482 | len = rb->strlen(SS_TITLE); |
483 | #if LCD_DEPTH > 1 | ||
483 | rb->lcd_set_backdrop(NULL); | 484 | rb->lcd_set_backdrop(NULL); |
485 | #endif | ||
484 | rb->lcd_setfont(FONT_SYSFIXED); | 486 | rb->lcd_setfont(FONT_SYSFIXED); |
485 | rb->lcd_getstringsize((unsigned char *)SS_TITLE, &w, &h); | 487 | rb->lcd_getstringsize((unsigned char *)SS_TITLE, &w, &h); |
486 | 488 | ||
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 4eb366dc6e..5bcecce33b 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -1943,6 +1943,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
1943 | rb = api; | 1943 | rb = api; |
1944 | 1944 | ||
1945 | rb->lcd_setfont(FONT_SYSFIXED); | 1945 | rb->lcd_setfont(FONT_SYSFIXED); |
1946 | #if LCD_DEPTH > 1 | ||
1947 | rb->lcd_set_backdrop(NULL); | ||
1948 | #endif | ||
1946 | /* Permanently enable the backlight (unless the user has turned it off) */ | 1949 | /* Permanently enable the backlight (unless the user has turned it off) */ |
1947 | if (rb->global_settings->backlight_timeout > 0) | 1950 | if (rb->global_settings->backlight_timeout > 0) |
1948 | rb->backlight_set_timeout(1); | 1951 | rb->backlight_set_timeout(1); |
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index 4a3f1c6962..9ce6ee80c5 100755 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -2699,7 +2699,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
2699 | rb->lcd_clear_display(); | 2699 | rb->lcd_clear_display(); |
2700 | 2700 | ||
2701 | /* start app */ | 2701 | /* start app */ |
2702 | #if LCD_DEPTH > 1 | ||
2702 | rb->lcd_set_backdrop(NULL); | 2703 | rb->lcd_set_backdrop(NULL); |
2704 | #endif | ||
2703 | rb->lcd_setfont(FONT_SYSFIXED); | 2705 | rb->lcd_setfont(FONT_SYSFIXED); |
2704 | 2706 | ||
2705 | while(!exit) { | 2707 | while(!exit) { |
diff --git a/apps/plugins/chessbox/chessbox.c b/apps/plugins/chessbox/chessbox.c index d82ac9e181..3a69fc999a 100644 --- a/apps/plugins/chessbox/chessbox.c +++ b/apps/plugins/chessbox/chessbox.c | |||
@@ -643,7 +643,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
643 | /* plugin init */ | 643 | /* plugin init */ |
644 | (void)parameter; | 644 | (void)parameter; |
645 | rb = api; | 645 | rb = api; |
646 | #if LCD_DEPTH > 1 | ||
646 | rb->lcd_set_backdrop(NULL); | 647 | rb->lcd_set_backdrop(NULL); |
648 | #endif | ||
647 | /* end of plugin init */ | 649 | /* end of plugin init */ |
648 | 650 | ||
649 | /* load opening book, soon */ | 651 | /* load opening book, soon */ |
diff --git a/apps/plugins/demystify.c b/apps/plugins/demystify.c index 36e41a2a73..d29f6c3b14 100644 --- a/apps/plugins/demystify.c +++ b/apps/plugins/demystify.c | |||
@@ -445,7 +445,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
445 | int ret; | 445 | int ret; |
446 | 446 | ||
447 | rb = api; /* copy to global api pointer */ | 447 | rb = api; /* copy to global api pointer */ |
448 | #if LCD_DEPTH > 1 | ||
448 | rb->lcd_set_backdrop(NULL); | 449 | rb->lcd_set_backdrop(NULL); |
450 | #endif | ||
449 | (void)parameter; | 451 | (void)parameter; |
450 | if (rb->global_settings->backlight_timeout > 0) | 452 | if (rb->global_settings->backlight_timeout > 0) |
451 | { | 453 | { |
diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c index 6f20609e62..d03afa2aef 100644 --- a/apps/plugins/fire.c +++ b/apps/plugins/fire.c | |||
@@ -409,7 +409,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
409 | 409 | ||
410 | rb = api; // copy to global api pointer | 410 | rb = api; // copy to global api pointer |
411 | (void)parameter; | 411 | (void)parameter; |
412 | #if LCD_DEPTH > 1 | ||
412 | rb->lcd_set_backdrop(NULL); | 413 | rb->lcd_set_backdrop(NULL); |
414 | #endif | ||
413 | if (rb->global_settings->backlight_timeout > 0) | 415 | if (rb->global_settings->backlight_timeout > 0) |
414 | rb->backlight_set_timeout(1);/* keep the light on */ | 416 | rb->backlight_set_timeout(1);/* keep the light on */ |
415 | 417 | ||
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index b44a54d1da..0dd2fa5143 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -469,7 +469,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
469 | rb->lcd_set_foreground(LCD_BLACK); | 469 | rb->lcd_set_foreground(LCD_BLACK); |
470 | #endif | 470 | #endif |
471 | 471 | ||
472 | #if LCD_DEPTH > 1 | ||
472 | rb->lcd_set_backdrop(NULL); | 473 | rb->lcd_set_backdrop(NULL); |
474 | #endif | ||
473 | 475 | ||
474 | rb->splash(HZ, true, "FlipIt!"); | 476 | rb->splash(HZ, true, "FlipIt!"); |
475 | 477 | ||
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 1982d77db1..46a97f8d07 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -1562,7 +1562,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
1562 | jewels_loadscores(&bj); | 1562 | jewels_loadscores(&bj); |
1563 | 1563 | ||
1564 | rb->lcd_setfont(FONT_SYSFIXED); | 1564 | rb->lcd_setfont(FONT_SYSFIXED); |
1565 | #if LCD_DEPTH > 1 | ||
1565 | rb->lcd_set_backdrop(NULL); | 1566 | rb->lcd_set_backdrop(NULL); |
1567 | #endif | ||
1566 | jewels_setcolors(); | 1568 | jewels_setcolors(); |
1567 | 1569 | ||
1568 | while(!exit) { | 1570 | while(!exit) { |
diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c index 7e6c4f3d48..69c0fca98b 100644 --- a/apps/plugins/mandelbrot.c +++ b/apps/plugins/mandelbrot.c | |||
@@ -546,7 +546,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
546 | xlcd_init(rb); | 546 | xlcd_init(rb); |
547 | #endif | 547 | #endif |
548 | 548 | ||
549 | #if LCD_DEPTH > 1 | ||
549 | rb->lcd_set_backdrop(NULL); | 550 | rb->lcd_set_backdrop(NULL); |
551 | #endif | ||
550 | 552 | ||
551 | init_mandelbrot_set(); | 553 | init_mandelbrot_set(); |
552 | 554 | ||
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 143908e040..4859e4772f 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -657,7 +657,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
657 | 657 | ||
658 | (void)parameter; | 658 | (void)parameter; |
659 | rb = api; | 659 | rb = api; |
660 | #if LCD_DEPTH > 1 | ||
660 | rb->lcd_set_backdrop(NULL); | 661 | rb->lcd_set_backdrop(NULL); |
662 | #endif | ||
661 | 663 | ||
662 | while( !exit ) | 664 | while( !exit ) |
663 | { | 665 | { |
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index 927b290e12..ff410528d4 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c | |||
@@ -348,7 +348,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
348 | 348 | ||
349 | rb = api; /* copy to global api pointer */ | 349 | rb = api; /* copy to global api pointer */ |
350 | (void)parameter; | 350 | (void)parameter; |
351 | #if LCD_DEPTH > 1 | ||
351 | rb->lcd_set_backdrop(NULL); | 352 | rb->lcd_set_backdrop(NULL); |
353 | #endif | ||
352 | if (rb->global_settings->backlight_timeout > 0) | 354 | if (rb->global_settings->backlight_timeout > 0) |
353 | rb->backlight_set_timeout(1);/* keep the light on */ | 355 | rb->backlight_set_timeout(1);/* keep the light on */ |
354 | 356 | ||
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 34754bfd78..6337ff4acb 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -910,7 +910,9 @@ enum plugin_status plugin_start (struct plugin_api *api, void *parameter) | |||
910 | rb = api; | 910 | rb = api; |
911 | 911 | ||
912 | rb->srand (*rb->current_tick); | 912 | rb->srand (*rb->current_tick); |
913 | #if LCD_DEPTH > 1 | ||
913 | rb->lcd_set_backdrop(NULL); | 914 | rb->lcd_set_backdrop(NULL); |
915 | #endif | ||
914 | 916 | ||
915 | #ifdef HAVE_LCD_BITMAP | 917 | #ifdef HAVE_LCD_BITMAP |
916 | rb->lcd_setfont (FONT_SYSFIXED); | 918 | rb->lcd_setfont (FONT_SYSFIXED); |
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 5ef47b5813..f82b0c283a 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -170,12 +170,6 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
170 | 170 | ||
171 | rb->lcd_setfont(0); | 171 | rb->lcd_setfont(0); |
172 | 172 | ||
173 | rb->lcd_set_backdrop(NULL); | ||
174 | #if defined(HAVE_LCD_COLOR) | ||
175 | rb->lcd_set_foreground(LCD_WHITE); | ||
176 | rb->lcd_set_background(LCD_BLACK); | ||
177 | #endif | ||
178 | |||
179 | rb->lcd_clear_display(); | 173 | rb->lcd_clear_display(); |
180 | 174 | ||
181 | if (!parameter) | 175 | if (!parameter) |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 39ffec2dda..233dcf7185 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -1326,7 +1326,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
1326 | 1326 | ||
1327 | /* Lets use the default font */ | 1327 | /* Lets use the default font */ |
1328 | rb->lcd_setfont(FONT_SYSFIXED); | 1328 | rb->lcd_setfont(FONT_SYSFIXED); |
1329 | #if LCD_DEPTH > 1 | ||
1329 | rb->lcd_set_backdrop(NULL); | 1330 | rb->lcd_set_backdrop(NULL); |
1331 | #endif | ||
1330 | #ifdef HAVE_LCD_COLOR | 1332 | #ifdef HAVE_LCD_COLOR |
1331 | rb->lcd_set_foreground(LCD_BLACK); | 1333 | rb->lcd_set_foreground(LCD_BLACK); |
1332 | rb->lcd_set_background(LCD_WHITE); | 1334 | rb->lcd_set_background(LCD_WHITE); |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index c1daa94fa5..231772f76d 100755 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -1675,7 +1675,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
1675 | game_state = ATTRACT_MODE; | 1675 | game_state = ATTRACT_MODE; |
1676 | 1676 | ||
1677 | /* universal font */ | 1677 | /* universal font */ |
1678 | #if LCD_DEPTH > 1 | ||
1678 | rb->lcd_set_backdrop(NULL); | 1679 | rb->lcd_set_backdrop(NULL); |
1680 | #endif | ||
1679 | rb->lcd_setfont(FONT_SYSFIXED); | 1681 | rb->lcd_setfont(FONT_SYSFIXED); |
1680 | rb->backlight_set_timeout(1); | 1682 | rb->backlight_set_timeout(1); |
1681 | iohiscore(); | 1683 | iohiscore(); |
diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c index d280688a8d..5d319e262c 100644 --- a/apps/plugins/sudoku/sudoku.c +++ b/apps/plugins/sudoku/sudoku.c | |||
@@ -1125,8 +1125,10 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
1125 | /* plugin init */ | 1125 | /* plugin init */ |
1126 | rb = api; | 1126 | rb = api; |
1127 | /* end of plugin init */ | 1127 | /* end of plugin init */ |
1128 | 1128 | ||
1129 | #if LCD_DEPTH > 1 | ||
1129 | rb->lcd_set_backdrop(NULL); | 1130 | rb->lcd_set_backdrop(NULL); |
1131 | #endif | ||
1130 | 1132 | ||
1131 | clear_state(&state); | 1133 | clear_state(&state); |
1132 | 1134 | ||
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index 3d3cd4f25c..1ca570d24a 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -2355,7 +2355,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
2355 | rb->lcd_set_background(COLOR_BG); | 2355 | rb->lcd_set_background(COLOR_BG); |
2356 | #endif | 2356 | #endif |
2357 | 2357 | ||
2358 | #if LCD_DEPTH > 1 | ||
2358 | rb->lcd_set_backdrop(NULL); | 2359 | rb->lcd_set_backdrop(NULL); |
2360 | #endif | ||
2359 | 2361 | ||
2360 | #ifdef DEBUG_WORMLET | 2362 | #ifdef DEBUG_WORMLET |
2361 | testline_in_rect(); | 2363 | testline_in_rect(); |