diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/chip8.c | 7 | ||||
-rw-r--r-- | apps/plugins/lib/grey_core.c | 6 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/video_out_rockbox.c | 2 | ||||
-rw-r--r-- | apps/plugins/test_fps.c | 8 | ||||
-rw-r--r-- | apps/plugins/video.c | 4 |
5 files changed, 14 insertions, 13 deletions
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 7e6fda0bbc..0f7e24b551 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -1178,11 +1178,12 @@ static void chip8_update_display(void) | |||
1178 | } | 1178 | } |
1179 | #if defined(SIMULATOR) || (LCD_DEPTH > 1) | 1179 | #if defined(SIMULATOR) || (LCD_DEPTH > 1) |
1180 | rb->lcd_set_drawmode(DRMODE_SOLID); | 1180 | rb->lcd_set_drawmode(DRMODE_SOLID); |
1181 | rb->lcd_mono_bitmap(lcd_framebuf[0], CHIP8_X, CHIP8_Y, CHIP8_LCDWIDTH, CHIP8_HEIGHT); | 1181 | rb->lcd_mono_bitmap(lcd_framebuf[0], CHIP8_X, CHIP8_Y, CHIP8_LCDWIDTH, |
1182 | CHIP8_HEIGHT); | ||
1182 | rb->lcd_update(); | 1183 | rb->lcd_update(); |
1183 | #else | 1184 | #else |
1184 | rb->lcd_blit(lcd_framebuf[0], CHIP8_X, CHIP8_Y>>3, CHIP8_LCDWIDTH, CHIP8_HEIGHT>>3 | 1185 | rb->lcd_blit_mono(lcd_framebuf[0], CHIP8_X, CHIP8_Y>>3, CHIP8_LCDWIDTH, |
1185 | , CHIP8_LCDWIDTH); | 1186 | CHIP8_HEIGHT>>3, CHIP8_LCDWIDTH); |
1186 | #endif | 1187 | #endif |
1187 | } | 1188 | } |
1188 | 1189 | ||
diff --git a/apps/plugins/lib/grey_core.c b/apps/plugins/lib/grey_core.c index 80daf494a0..caa7af2f25 100644 --- a/apps/plugins/lib/grey_core.c +++ b/apps/plugins/lib/grey_core.c | |||
@@ -239,12 +239,12 @@ static unsigned long _grey_get_pixel(int x, int y) | |||
239 | static void _timer_isr(void) | 239 | static void _timer_isr(void) |
240 | { | 240 | { |
241 | #if LCD_PIXELFORMAT == HORIZONTAL_PACKING | 241 | #if LCD_PIXELFORMAT == HORIZONTAL_PACKING |
242 | _grey_info.rb->lcd_grey_phase_blit(_grey_info.values, _grey_info.phases, | 242 | _grey_info.rb->lcd_blit_grey_phase(_grey_info.values, _grey_info.phases, |
243 | _grey_info.bx, _grey_info.y, | 243 | _grey_info.bx, _grey_info.y, |
244 | _grey_info.bwidth, _grey_info.height, | 244 | _grey_info.bwidth, _grey_info.height, |
245 | _grey_info.width); | 245 | _grey_info.width); |
246 | #else | 246 | #else |
247 | _grey_info.rb->lcd_grey_phase_blit(_grey_info.values, _grey_info.phases, | 247 | _grey_info.rb->lcd_blit_grey_phase(_grey_info.values, _grey_info.phases, |
248 | _grey_info.x, _grey_info.by, | 248 | _grey_info.x, _grey_info.by, |
249 | _grey_info.width, _grey_info.bheight, | 249 | _grey_info.width, _grey_info.bheight, |
250 | _grey_info.width); | 250 | _grey_info.width); |
@@ -457,7 +457,7 @@ void grey_release(void) | |||
457 | grey_deferred_update() instead. | 457 | grey_deferred_update() instead. |
458 | 458 | ||
459 | Other functions to avoid are: | 459 | Other functions to avoid are: |
460 | lcd_blit() (obviously), lcd_update_rect(), lcd_set_contrast(), | 460 | lcd_blit_mono(), lcd_update_rect(), lcd_set_contrast(), |
461 | lcd_set_invert_display(), lcd_set_flip() */ | 461 | lcd_set_invert_display(), lcd_set_flip() */ |
462 | void grey_show(bool enable) | 462 | void grey_show(bool enable) |
463 | { | 463 | { |
diff --git a/apps/plugins/mpegplayer/video_out_rockbox.c b/apps/plugins/mpegplayer/video_out_rockbox.c index 86a18cde2d..c8245cc1bf 100644 --- a/apps/plugins/mpegplayer/video_out_rockbox.c +++ b/apps/plugins/mpegplayer/video_out_rockbox.c | |||
@@ -104,7 +104,7 @@ static inline void yuv_blit(uint8_t * const * buf, int src_x, int src_y, | |||
104 | video_lock(); | 104 | video_lock(); |
105 | 105 | ||
106 | #ifdef HAVE_LCD_COLOR | 106 | #ifdef HAVE_LCD_COLOR |
107 | rb->lcd_yuv_blit(buf, src_x, src_y, stride, x, y , width, height); | 107 | rb->lcd_blit_yuv(buf, src_x, src_y, stride, x, y , width, height); |
108 | #else | 108 | #else |
109 | grey_ub_gray_bitmap_part(buf[0], src_x, src_y, stride, x, y, width, height); | 109 | grey_ub_gray_bitmap_part(buf[0], src_x, src_y, stride, x, y, width, height); |
110 | #endif | 110 | #endif |
diff --git a/apps/plugins/test_fps.c b/apps/plugins/test_fps.c index e8ceaed7a1..7c86fabdc0 100644 --- a/apps/plugins/test_fps.c +++ b/apps/plugins/test_fps.c | |||
@@ -192,7 +192,7 @@ static void time_main_yuv(void) | |||
192 | time_start = *rb->current_tick; | 192 | time_start = *rb->current_tick; |
193 | while((time_end = *rb->current_tick) - time_start < DURATION) | 193 | while((time_end = *rb->current_tick) - time_start < DURATION) |
194 | { | 194 | { |
195 | rb->lcd_yuv_blit(yuvbuf, 0, 0, YUV_WIDTH, | 195 | rb->lcd_blit_yuv(yuvbuf, 0, 0, YUV_WIDTH, |
196 | 0, 0, YUV_WIDTH, YUV_HEIGHT); | 196 | 0, 0, YUV_WIDTH, YUV_HEIGHT); |
197 | frame_count++; | 197 | frame_count++; |
198 | } | 198 | } |
@@ -208,7 +208,7 @@ static void time_main_yuv(void) | |||
208 | time_start = *rb->current_tick; | 208 | time_start = *rb->current_tick; |
209 | while((time_end = *rb->current_tick) - time_start < DURATION) | 209 | while((time_end = *rb->current_tick) - time_start < DURATION) |
210 | { | 210 | { |
211 | rb->lcd_yuv_blit(yuvbuf, 0, 0, YUV_WIDTH, | 211 | rb->lcd_blit_yuv(yuvbuf, 0, 0, YUV_WIDTH, |
212 | part14_x, part14_y, part14_w, part14_h); | 212 | part14_x, part14_y, part14_w, part14_h); |
213 | frame_count++; | 213 | frame_count++; |
214 | } | 214 | } |
@@ -260,7 +260,7 @@ static void time_remote_update(void) | |||
260 | } | 260 | } |
261 | #endif | 261 | #endif |
262 | 262 | ||
263 | #if LCD_DEPTH < 4 | 263 | #if (LCD_DEPTH < 4) && !defined(IAUDIO_M3) |
264 | 264 | ||
265 | GREY_INFO_STRUCT_IRAM | 265 | GREY_INFO_STRUCT_IRAM |
266 | static unsigned char greydata[LCD_HEIGHT][LCD_WIDTH]; | 266 | static unsigned char greydata[LCD_HEIGHT][LCD_WIDTH]; |
@@ -357,7 +357,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
357 | log_text("Main LCD YUV"); | 357 | log_text("Main LCD YUV"); |
358 | time_main_yuv(); | 358 | time_main_yuv(); |
359 | #endif | 359 | #endif |
360 | #if LCD_DEPTH < 4 | 360 | #if (LCD_DEPTH < 4) && !defined(IAUDIO_M3) |
361 | log_text("Greyscale library"); | 361 | log_text("Greyscale library"); |
362 | time_greyscale(); | 362 | time_greyscale(); |
363 | #endif | 363 | #endif |
diff --git a/apps/plugins/video.c b/apps/plugins/video.c index 2799e3d5d1..fa1646d112 100644 --- a/apps/plugins/video.c +++ b/apps/plugins/video.c | |||
@@ -361,13 +361,13 @@ void timer4_isr(void) | |||
361 | height = MIN(LCD_HEIGHT/8-1, height); /* reserve bottom line */ | 361 | height = MIN(LCD_HEIGHT/8-1, height); /* reserve bottom line */ |
362 | if (gPlay.bDirtyOSD) | 362 | if (gPlay.bDirtyOSD) |
363 | { /* OSD to bottom line */ | 363 | { /* OSD to bottom line */ |
364 | rb->lcd_blit(gBuf.pOSD, 0, LCD_HEIGHT/8-1, | 364 | rb->lcd_blit_mono(gBuf.pOSD, 0, LCD_HEIGHT/8-1, |
365 | LCD_WIDTH, 1, LCD_WIDTH); | 365 | LCD_WIDTH, 1, LCD_WIDTH); |
366 | gPlay.bDirtyOSD = false; | 366 | gPlay.bDirtyOSD = false; |
367 | } | 367 | } |
368 | } | 368 | } |
369 | 369 | ||
370 | rb->lcd_blit(gBuf.pReadVideo, 0, 0, | 370 | rb->lcd_blit_mono(gBuf.pReadVideo, 0, 0, |
371 | gFileHdr.video_width, height, gFileHdr.video_width); | 371 | gFileHdr.video_width, height, gFileHdr.video_width); |
372 | 372 | ||
373 | available = Available(gBuf.pReadVideo); | 373 | available = Available(gBuf.pReadVideo); |