diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-17 10:31:31 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 658026e6267277b27d297c481728f74d160a8481 (patch) | |
tree | 915a9d2bb48469bdd5b9127dc19a61f230721a6c /apps/plugins/cube.c | |
parent | 8cb555460ff79e636a7907fb2589e16db98c8600 (diff) | |
download | rockbox-658026e6267277b27d297c481728f74d160a8481.tar.gz rockbox-658026e6267277b27d297c481728f74d160a8481.zip |
[4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice.
Note: I left behind lcd_bitmap in features.txt, because removing it
would require considerable work in the manual and the translations.
Change-Id: Ia8ca7761f610d9332a0d22a7d189775fb15ec88a
Diffstat (limited to 'apps/plugins/cube.c')
-rw-r--r-- | apps/plugins/cube.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 29d2ba2fc1..d2d831f81b 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -451,9 +451,6 @@ | |||
451 | #endif | 451 | #endif |
452 | #endif | 452 | #endif |
453 | 453 | ||
454 | |||
455 | #ifdef HAVE_LCD_BITMAP | ||
456 | |||
457 | #define DIST (10 * MIN(LCD_HEIGHT, LCD_WIDTH) / 16) | 454 | #define DIST (10 * MIN(LCD_HEIGHT, LCD_WIDTH) / 16) |
458 | static int x_off = LCD_WIDTH/2; | 455 | static int x_off = LCD_WIDTH/2; |
459 | static int y_off = LCD_HEIGHT/2; | 456 | static int y_off = LCD_HEIGHT/2; |
@@ -486,16 +483,6 @@ static struct my_lcd *mylcd = &greyfuncs; | |||
486 | #define ASPECT 256 /* = 1.00 */ | 483 | #define ASPECT 256 /* = 1.00 */ |
487 | #endif | 484 | #endif |
488 | 485 | ||
489 | #else /* !LCD_BITMAP */ | ||
490 | |||
491 | #define MYLCD(fn) pgfx_ ## fn | ||
492 | #define DIST 9 | ||
493 | static int x_off = 10; | ||
494 | static int y_off = 7; | ||
495 | #define ASPECT 300 /* = 1.175 */ | ||
496 | |||
497 | #endif /* !LCD_BITMAP */ | ||
498 | |||
499 | struct point_3D { | 486 | struct point_3D { |
500 | long x, y, z; | 487 | long x, y, z; |
501 | }; | 488 | }; |
@@ -771,7 +758,6 @@ enum plugin_status plugin_start(const void* parameter) | |||
771 | 758 | ||
772 | (void)(parameter); | 759 | (void)(parameter); |
773 | 760 | ||
774 | #ifdef HAVE_LCD_BITMAP | ||
775 | #if defined(USEGSLIB) | 761 | #if defined(USEGSLIB) |
776 | gbuf = (unsigned char *)rb->plugin_get_buffer(&gbuf_size); | 762 | gbuf = (unsigned char *)rb->plugin_get_buffer(&gbuf_size); |
777 | if (!grey_init(gbuf, gbuf_size, GREY_BUFFERED, | 763 | if (!grey_init(gbuf, gbuf_size, GREY_BUFFERED, |
@@ -794,7 +780,6 @@ enum plugin_status plugin_start(const void* parameter) | |||
794 | grey_setfont(FONT_SYSFIXED); | 780 | grey_setfont(FONT_SYSFIXED); |
795 | #endif | 781 | #endif |
796 | rb->lcd_setfont(FONT_SYSFIXED); | 782 | rb->lcd_setfont(FONT_SYSFIXED); |
797 | #endif | ||
798 | 783 | ||
799 | atexit(cleanup); | 784 | atexit(cleanup); |
800 | while(!quit) | 785 | while(!quit) |
@@ -808,7 +793,6 @@ enum plugin_status plugin_start(const void* parameter) | |||
808 | redraw = false; | 793 | redraw = false; |
809 | } | 794 | } |
810 | 795 | ||
811 | #ifdef HAVE_LCD_BITMAP | ||
812 | if (t_disp > 0) | 796 | if (t_disp > 0) |
813 | { | 797 | { |
814 | char buffer[30]; | 798 | char buffer[30]; |
@@ -821,24 +805,6 @@ enum plugin_status plugin_start(const void* parameter) | |||
821 | if (t_disp == 0) | 805 | if (t_disp == 0) |
822 | redraw = true; | 806 | redraw = true; |
823 | } | 807 | } |
824 | #else | ||
825 | if (t_disp > 0) | ||
826 | { | ||
827 | if (t_disp == DISP_TIME) | ||
828 | { | ||
829 | rb->lcd_puts(5, 0, axes[curr].label); | ||
830 | rb->lcd_putsf(5, 1, "%d %c", | ||
831 | paused ? axes[curr].angle : axes[curr].speed, | ||
832 | highspeed ? 'H' : ' '); | ||
833 | } | ||
834 | t_disp--; | ||
835 | if (t_disp == 0) | ||
836 | { | ||
837 | rb->lcd_clear_display(); | ||
838 | pgfx_display(0, 0); | ||
839 | } | ||
840 | } | ||
841 | #endif | ||
842 | #ifdef USEGSLIB | 808 | #ifdef USEGSLIB |
843 | if (mode_switch) | 809 | if (mode_switch) |
844 | { | 810 | { |