diff options
Diffstat (limited to 'apps/plugins/zxbox')
-rw-r--r-- | apps/plugins/zxbox/zxvid_16bpp.c | 11 | ||||
-rw-r--r-- | apps/plugins/zxbox/zxvid_2bpp.c | 13 |
2 files changed, 19 insertions, 5 deletions
diff --git a/apps/plugins/zxbox/zxvid_16bpp.c b/apps/plugins/zxbox/zxvid_16bpp.c index f8482e3147..f0e2cee5ac 100644 --- a/apps/plugins/zxbox/zxvid_16bpp.c +++ b/apps/plugins/zxbox/zxvid_16bpp.c | |||
@@ -33,6 +33,8 @@ static const unsigned _16bpp_colors[32] = { | |||
33 | LCD_RGBPACK(IB1, IB1, IB0), LCD_RGBPACK(IB1, IB1, IB1), | 33 | LCD_RGBPACK(IB1, IB1, IB0), LCD_RGBPACK(IB1, IB1, IB1), |
34 | }; | 34 | }; |
35 | 35 | ||
36 | static fb_data *lcd_fb = NULL; | ||
37 | |||
36 | void init_spect_scr(void) | 38 | void init_spect_scr(void) |
37 | { | 39 | { |
38 | int i; | 40 | int i; |
@@ -49,6 +51,11 @@ void init_spect_scr(void) | |||
49 | 51 | ||
50 | void update_screen(void) | 52 | void update_screen(void) |
51 | { | 53 | { |
54 | if (!lcd_fb) | ||
55 | { | ||
56 | struct viewport *vp_main = rb->lcd_set_viewport(NULL); | ||
57 | lcd_fb = vp_main->buffer->fb_ptr; | ||
58 | } | ||
52 | fb_data *frameb; | 59 | fb_data *frameb; |
53 | 60 | ||
54 | int y=0; | 61 | int y=0; |
@@ -58,7 +65,7 @@ void update_screen(void) | |||
58 | byte *scrptr; | 65 | byte *scrptr; |
59 | scrptr = (byte *) SPNM(image); | 66 | scrptr = (byte *) SPNM(image); |
60 | */ | 67 | */ |
61 | frameb = *rb->lcd_framebuffer; | 68 | frameb = lcd_fb; |
62 | for ( y = 0 ; y < HEIGHT*WIDTH; y++ ){ | 69 | for ( y = 0 ; y < HEIGHT*WIDTH; y++ ){ |
63 | frameb[y] = FB_SCALARPACK(_16bpp_colors[(unsigned)sp_image[y]]); | 70 | frameb[y] = FB_SCALARPACK(_16bpp_colors[(unsigned)sp_image[y]]); |
64 | } | 71 | } |
@@ -68,7 +75,7 @@ void update_screen(void) | |||
68 | int srcx, srcy=0; /* x / y coordinates in source image */ | 75 | int srcx, srcy=0; /* x / y coordinates in source image */ |
69 | unsigned char* image; | 76 | unsigned char* image; |
70 | image = sp_image + ( (Y_OFF)*(WIDTH) ) + X_OFF; | 77 | image = sp_image + ( (Y_OFF)*(WIDTH) ) + X_OFF; |
71 | frameb = *rb->lcd_framebuffer; | 78 | frameb = lcd_fb; |
72 | for(y = 0; y < LCD_HEIGHT; y++) | 79 | for(y = 0; y < LCD_HEIGHT; y++) |
73 | { | 80 | { |
74 | srcx = 0; /* reset our x counter before each row... */ | 81 | srcx = 0; /* reset our x counter before each row... */ |
diff --git a/apps/plugins/zxbox/zxvid_2bpp.c b/apps/plugins/zxbox/zxvid_2bpp.c index 9772625387..97e6a5de76 100644 --- a/apps/plugins/zxbox/zxvid_2bpp.c +++ b/apps/plugins/zxbox/zxvid_2bpp.c | |||
@@ -26,6 +26,8 @@ static const unsigned char graylevels[16] = { | |||
26 | 0, 1, 1, 1, 2, 2, 3, 3 | 26 | 0, 1, 1, 1, 2, 2, 3, 3 |
27 | }; | 27 | }; |
28 | 28 | ||
29 | static fb_data *lcd_fb = NULL; | ||
30 | |||
29 | void init_spect_scr(void) | 31 | void init_spect_scr(void) |
30 | { | 32 | { |
31 | int i; | 33 | int i; |
@@ -41,6 +43,11 @@ void init_spect_scr(void) | |||
41 | } | 43 | } |
42 | void update_screen(void) | 44 | void update_screen(void) |
43 | { | 45 | { |
46 | if (!lcd_fb) | ||
47 | { | ||
48 | struct viewport *vp_main = rb->lcd_set_viewport(NULL); | ||
49 | lcd_fb = vp_main->buffer->fb_ptr; | ||
50 | } | ||
44 | fb_data *frameb; | 51 | fb_data *frameb; |
45 | int y=0; | 52 | int y=0; |
46 | int x=0; | 53 | int x=0; |
@@ -51,7 +58,7 @@ void update_screen(void) | |||
51 | #if LCD_PIXELFORMAT == HORIZONTAL_PACKING | 58 | #if LCD_PIXELFORMAT == HORIZONTAL_PACKING |
52 | for(y = 0; y < LCD_HEIGHT; y++) | 59 | for(y = 0; y < LCD_HEIGHT; y++) |
53 | { | 60 | { |
54 | frameb = *rb->lcd_framebuffer + (y) * FB_WIDTH; | 61 | frameb = lcd_fb + (y) * FB_WIDTH; |
55 | srcx = 0; /* reset our x counter before each row... */ | 62 | srcx = 0; /* reset our x counter before each row... */ |
56 | for(x = 0; x < LCD_WIDTH; x++) | 63 | for(x = 0; x < LCD_WIDTH; x++) |
57 | { | 64 | { |
@@ -67,7 +74,7 @@ void update_screen(void) | |||
67 | int shift; | 74 | int shift; |
68 | for(y = 0; y < LCD_HEIGHT; y++) | 75 | for(y = 0; y < LCD_HEIGHT; y++) |
69 | { | 76 | { |
70 | frameb = *rb->lcd_framebuffer + (y/4) * LCD_WIDTH; | 77 | frameb = lcd_fb + (y/4) * LCD_WIDTH; |
71 | srcx = 0; /* reset our x counter before each row... */ | 78 | srcx = 0; /* reset our x counter before each row... */ |
72 | shift = ((y & 3 ) * 2 ); | 79 | shift = ((y & 3 ) * 2 ); |
73 | mask = ~pixmask[y & 3]; | 80 | mask = ~pixmask[y & 3]; |
@@ -84,7 +91,7 @@ void update_screen(void) | |||
84 | int shift; | 91 | int shift; |
85 | for(y = 0; y < LCD_HEIGHT; y++) | 92 | for(y = 0; y < LCD_HEIGHT; y++) |
86 | { | 93 | { |
87 | frameb = *rb->lcd_framebuffer + (y/8) * LCD_WIDTH; | 94 | frameb = lcd_fb + (y/8) * LCD_WIDTH; |
88 | srcx = 0; /* reset our x counter before each row... */ | 95 | srcx = 0; /* reset our x counter before each row... */ |
89 | shift = (y & 7); | 96 | shift = (y & 7); |
90 | mask = ~pixmask[y & 7]; | 97 | mask = ~pixmask[y & 7]; |