pandora: tripplebuffer fbdev out, refactoring

[libpicofe.git] / linux / emu.c

diff --git a/linux/emu.c b/linux/emu.c
index aa5185f..98e2b72 100644 (file)
--- a/linux/emu.c
+++ b/linux/emu.c
@@ -17,18 +17,11 @@
 \r
 \r
 static short __attribute__((aligned(4))) sndBuffer[2*44100/50];\r
-unsigned char temp_frame[320 * 240 * 2];\r
-unsigned char *PicoDraw2FB = temp_frame;\r
-static int osd_fps_x;\r
 char cpu_clk_name[] = "unused";\r
 \r
-extern void update_screen(void);\r
-\r
 \r
 void pemu_prep_defconfig(void)\r
 {\r
-       // XXX: move elsewhere\r
-       g_menubg_ptr = temp_frame;\r
 }\r
 \r
 void pemu_validate_config(void)\r
@@ -41,6 +34,7 @@ void pemu_validate_config(void)
 // 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
@@ -55,6 +49,7 @@ static void osd_text8(int x, int y, const char *text)
        }\r
        emu_text_out8(x, y, text);\r
 }\r
+*/\r
 \r
 static void osd_text16(int x, int y, const char *text)\r
 {\r
@@ -108,18 +103,16 @@ static int EmuScanBegin16(unsigned int num)
        return 0;\r
 }\r
 \r
-void pemu_update_display(const char *fps, const char *notice)\r
+void pemu_finalize_frame(const char *fps, const char *notice)\r
 {\r
        if (notice || (currentConfig.EmuOpt & EOPT_SHOW_FPS)) {\r
                if (notice)\r
                        osd_text(4, g_screen_height - 8, notice);\r
                if (currentConfig.EmuOpt & EOPT_SHOW_FPS)\r
-                       osd_text(osd_fps_x, g_screen_height - 8, fps);\r
+                       osd_text(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
-\r
-       update_screen();\r
 }\r
 \r
 void plat_video_toggle_renderer(int is_next, int force_16bpp, int is_menu)\r
@@ -139,7 +132,7 @@ void plat_video_menu_begin(void)
 \r
 void plat_video_menu_end(void)\r
 {\r
-       update_screen();\r
+       plat_video_flip();\r
 }\r
 \r
 void plat_status_msg_clear(void)\r
@@ -152,7 +145,8 @@ void plat_status_msg_clear(void)
 void plat_status_msg_busy_next(const char *msg)\r
 {\r
        plat_status_msg_clear();\r
-       pemu_update_display("", msg);\r
+       pemu_finalize_frame("", msg);\r
+       plat_video_flip();\r
        emu_status_msg("");\r
        reset_timing = 1;\r
 }\r
@@ -202,29 +196,30 @@ static void updateSound(int len)
 \r
 void pemu_sound_start(void)\r
 {\r
-       static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;\r
        int target_fps = Pico.m.pal ? 50 : 60;\r
 \r
        PsndOut = NULL;\r
 \r
        if (currentConfig.EmuOpt & EOPT_EN_SOUND)\r
        {\r
-               int snd_excess_add;\r
-               if (PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old)\r
-                       PsndRerate(Pico.m.frame_count ? 1 : 0);\r
+               int snd_excess_add, frame_samples;\r
+               int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;\r
+\r
+               PsndRerate(Pico.m.frame_count ? 1 : 0);\r
+\r
+               frame_samples = PsndLen;\r
+               snd_excess_add = ((PsndRate - PsndLen * target_fps)<<16) / target_fps;\r
+               if (snd_excess_add != 0)\r
+                       frame_samples++;\r
 \r
-               snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;\r
                printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",\r
-                       PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal);\r
-               sndout_oss_start(PsndRate, 16, (PicoOpt&8)>>3);\r
+                       PsndRate, PsndLen, snd_excess_add, is_stereo, Pico.m.pal);\r
+               sndout_oss_start(PsndRate, frame_samples, is_stereo);\r
                sndout_oss_setvol(currentConfig.volume, currentConfig.volume);\r
                PicoWriteSound = updateSound;\r
                plat_update_volume(0, 0);\r
                memset(sndBuffer, 0, sizeof(sndBuffer));\r
                PsndOut = sndBuffer;\r
-               PsndRate_old = PsndRate;\r
-               PicoOpt_old  = PicoOpt;\r
-               pal_old = Pico.m.pal;\r
        }\r
 }\r
 \r
@@ -243,8 +238,6 @@ void plat_debug_cat(char *str)
 \r
 void emu_video_mode_change(int start_line, int line_count, int is_32cols)\r
 {\r
-       osd_fps_x = 260;\r
-\r
        // clear whole screen in all buffers\r
        memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);\r
 }\r
@@ -292,10 +285,6 @@ void plat_wait_till_us(unsigned int us_to)
        }\r
 }\r
 \r
-void plat_video_wait_vsync(void)\r
-{\r
-}\r
-\r
 const char *plat_get_credits(void)\r
 {\r
        return "PicoDrive v" VERSION " (c) notaz, 2006-2009\n\n\n"\r