mpegplayer on grayscale targets: use greylib to display all text and graphics with the video images.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16042 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 10 insertions, 5 deletions

diff --git a/apps/plugins/mpegplayer/mpegplayer.h b/apps/plugins/mpegplayer/mpegplayer.h
index 4ebf321fce..01ab9bdad6 100644
--- a/apps/plugins/mpegplayer/mpegplayer.h
+++ b/apps/plugins/mpegplayer/mpegplayer.h
@@ -80,11 +80,8 @@ enum mpeg_malloc_reason_t
 #define lcd_(fn)              rb->lcd_##fn
 #define lcd_splash            splash
 
-#define GRAY_FLUSH_ICACHE()
-#define GRAY_INVALIDATE_ICACHE()
-#define GRAY_VIDEO_FLUSH_ICACHE()
-#define GRAY_VIDEO_INVALIDATE_ICACHE()
 #else
+
 #include "grey.h"
 #define DRAW_BLACK            GREY_BLACK
 #define DRAW_DARKGRAY         GREY_DARKGRAY
@@ -92,6 +89,7 @@ enum mpeg_malloc_reason_t
 #define DRAW_WHITE            GREY_WHITE
 #define lcd_(fn)              grey_##fn
 
+#if defined(CPU_PP) && NUM_CORES > 1
 #define GRAY_FLUSH_ICACHE() \
     IF_COP(flush_icache())
 #define GRAY_INVALIDATE_ICACHE() \
@@ -100,11 +98,18 @@ enum mpeg_malloc_reason_t
     IF_COP(parser_send_video_msg(VIDEO_GRAY_CACHEOP, 0))
 #define GRAY_VIDEO_INVALIDATE_ICACHE() \
     IF_COP(parser_send_video_msg(VIDEO_GRAY_CACHEOP, 1))
-#if NUM_CORES > 1
+
 #define GRAY_CACHE_MAINT
 #endif
 #endif
 
+#ifndef GRAY_CACHE_MAINT
+#define GRAY_FLUSH_ICACHE()
+#define GRAY_INVALIDATE_ICACHE()
+#define GRAY_VIDEO_FLUSH_ICACHE()
+#define GRAY_VIDEO_INVALIDATE_ICACHE()
+#endif
+
 #include "mpeg2.h"
 #include "video_out.h"
 #include "mpeg_stream.h"