frontend: eliminate osd_text dupes

not only dupe code is bad, it's crasing too

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 88fefd5..7f375a3 100644 (file)
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -738,8 +738,26 @@ mk_text_out(emu_text_out16_rot, unsigned short, 0xffff,
 \r
 #undef mk_text_out\r
 \r
+void emu_osd_text16(int x, int y, const char *text)\r
+{\r
+       int len = strlen(text) * 8;\r
+       int i, h;\r
+\r
+       len++;\r
+       if (x + len > g_screen_width)\r
+               len = g_screen_width - x;\r
+\r
+       for (h = 0; h < 8; h++) {\r
+               unsigned short *p;\r
+               p = (unsigned short *)g_screen_ptr\r
+                       + x + g_screen_width * (y + h);\r
+               for (i = len; i > 0; i--, p++)\r
+                       *p = (*p >> 2) & 0x39e7;\r
+       }\r
+       emu_text_out16(x, y, text);\r
+}\r
 \r
-void update_movie(void)\r
+static void update_movie(void)\r
 {\r
        int offs = Pico.m.frame_count*3 + 0x40;\r
        if (offs+3 > movie_size) {\r

diff --git a/platform/common/emu.h b/platform/common/emu.h
index 8f8f61f..6e7c399 100644 (file)
--- a/platform/common/emu.h
+++ b/platform/common/emu.h
@@ -129,6 +129,8 @@ void  emu_text_out16(int x, int y, const char *text);
 void  emu_text_out8_rot (int x, int y, const char *text);
 void  emu_text_out16_rot(int x, int y, const char *text);
 
+void  emu_osd_text16(int x, int y, const char *text);
+
 void  emu_make_path(char *buff, const char *end, int size);
 void  emu_update_input(void);
 void  emu_get_game_name(char *str150);

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index 74bcbcb..244f15d 100644 (file)
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -128,21 +128,6 @@ static void osd_text8(int x, int y, const char *text)
        emu_text_out8(x, y, text);\r
 }\r
 \r
-static void osd_text16(int x, int y, const char *text)\r
-{\r
-       int len = strlen(text)*8;\r
-       int *p, i, h, offs;\r
-\r
-       len = (len+1) >> 1;\r
-       for (h = 0; h < 8; h++) {\r
-               offs = (x + g_screen_width * (y+h)) & ~1;\r
-               p = (int *) ((short *)g_screen_ptr + offs);\r
-               for (i = len; i; i--, p++)\r
-                       *p = (*p >> 2) & 0x39e7;\r
-       }\r
-       emu_text_out16(x, y, text);\r
-}\r
-\r
 static void osd_text8_rot(int x, int y, const char *text)\r
 {\r
        int len = strlen(text) * 8;\r
@@ -540,7 +525,7 @@ static void vid_reset_mode(void)
        PicoDrawSetCallbacks(emu_scan_begin, emu_scan_end);\r
 \r
        if (is_16bit_mode())\r
-               osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text16_rot : osd_text16;\r
+               osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text16_rot : emu_osd_text16;\r
        else\r
                osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text8_rot : osd_text8;\r
 \r

diff --git a/platform/linux/emu.c b/platform/linux/emu.c
index 9e45fb1..c22f4fd 100644 (file)
--- a/platform/linux/emu.c
+++ b/platform/linux/emu.c
@@ -34,41 +34,6 @@ void pemu_validate_config(void)
        PicoOpt &= ~POPT_EN_DRC;\r
 }\r
 \r
-// FIXME: dupes from GP2X, need cleanup\r
-static void (*osd_text)(int x, int y, const char *text);\r
-\r
-/*\r
-static void osd_text8(int x, int y, const char *text)\r
-{\r
-       int len = strlen(text)*8;\r
-       int *p, i, h, offs;\r
-\r
-       len = (len+3) >> 2;\r
-       for (h = 0; h < 8; h++) {\r
-               offs = (x + g_screen_width * (y+h)) & ~3;\r
-               p = (int *) ((char *)g_screen_ptr + offs);\r
-               for (i = len; i; i--, p++)\r
-                       *p = 0xe0e0e0e0;\r
-       }\r
-       emu_text_out8(x, y, text);\r
-}\r
-*/\r
-\r
-static void osd_text16(int x, int y, const char *text)\r
-{\r
-       int len = strlen(text)*8;\r
-       int *p, i, h, offs;\r
-\r
-       len = (len+1) >> 1;\r
-       for (h = 0; h < 8; h++) {\r
-               offs = (x + g_screen_width * (y+h)) & ~1;\r
-               p = (int *) ((short *)g_screen_ptr + offs);\r
-               for (i = len; i; i--, p++)\r
-                       *p = (*p >> 2) & 0x39e7;\r
-       }\r
-       emu_text_out16(x, y, text);\r
-}\r
-\r
 static void draw_cd_leds(void)\r
 {\r
        int led_reg, pitch, scr_offs, led_offs;\r
@@ -115,9 +80,9 @@ void pemu_finalize_frame(const char *fps, const char *notice)
 \r
        if (notice || (currentConfig.EmuOpt & EOPT_SHOW_FPS)) {\r
                if (notice)\r
-                       osd_text(4, g_screen_height - 8, notice);\r
+                       emu_osd_text16(4, g_screen_height - 8, notice);\r
                if (currentConfig.EmuOpt & EOPT_SHOW_FPS)\r
-                       osd_text(g_screen_width - 60, g_screen_height - 8, fps);\r
+                       emu_osd_text16(g_screen_width - 60, g_screen_height - 8, fps);\r
        }\r
        if ((PicoAHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))\r
                draw_cd_leds();\r
@@ -215,7 +180,6 @@ void emu_video_mode_change(int start_line, int line_count, int is_32cols)
 void pemu_loop_prep(void)\r
 {\r
        apply_renderer();\r
-       osd_text = osd_text16;\r
 }\r
 \r
 void pemu_loop_end(void)\r

diff --git a/platform/pandora/plat.c b/platform/pandora/plat.c
index f82d702..8f8eac6 100644 (file)
--- a/platform/pandora/plat.c
+++ b/platform/pandora/plat.c
@@ -135,24 +135,6 @@ void pemu_validate_config(void)
        currentConfig.CPUclock = plat_target_cpu_clock_get();\r
 }\r
 \r
-static void osd_text(int x, int y, const char *text)\r
-{\r
-       int len = strlen(text)*8;\r
-       int i, h;\r
-\r
-       len++;\r
-       if (x + len > g_screen_width)\r
-               len = g_screen_width - x;\r
-\r
-       for (h = 0; h < 8; h++) {\r
-               unsigned short *p;\r
-               p = (unsigned short *)g_screen_ptr + x + g_screen_width*(y + h);\r
-               for (i = len; i > 0; i--, p++)\r
-                       *p = (*p>>2) & 0x39e7;\r
-       }\r
-       emu_text_out16(x, y, text);\r
-}\r
-\r
 static void draw_cd_leds(void)\r
 {\r
        int old_reg;\r
@@ -182,9 +164,9 @@ static void draw_cd_leds(void)
 void pemu_finalize_frame(const char *fps, const char *notice)\r
 {\r
        if (notice && notice[0])\r
-               osd_text(2, g_osd_y, notice);\r
+               emu_osd_text16(2, g_osd_y, notice);\r
        if (fps && fps[0] && (currentConfig.EmuOpt & EOPT_SHOW_FPS))\r
-               osd_text(g_osd_fps_x, g_osd_y, fps);\r
+               emu_osd_text16(g_osd_fps_x, g_osd_y, fps);\r
        if ((PicoAHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))\r
                draw_cd_leds();\r
 }\r