make OSS detect blocking, adjust audio API

[libpicofe.git] / gp2x / emu.c

diff --git a/gp2x/emu.c b/gp2x/emu.c
index 659d3a7..4addd46 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -710,18 +710,13 @@ void plat_update_volume(int has_changed, int is_up)
        }\r
 }\r
 \r
-static void updateSound(int len)\r
+static void oss_write_nonblocking(int len)\r
 {\r
-       len <<= 1;\r
-       if (PicoOpt & POPT_EN_STEREO)\r
-               len <<= 1;\r
-\r
+       // sndout_oss_can_write() is not reliable, only use with no_frmlimit\r
        if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && !sndout_oss_can_write(len))\r
                return;\r
 \r
-       /* avoid writing audio when lagging behind to prevent audio lag */\r
-       if (PicoSkipFrame != 2)\r
-               sndout_oss_write(PsndOut, len);\r
+       sndout_oss_write_nb(PsndOut, len);\r
 }\r
 \r
 void pemu_sound_start(void)\r
@@ -739,7 +734,7 @@ void pemu_sound_start(void)
 \r
                memset(sndBuffer, 0, sizeof(sndBuffer));\r
                PsndOut = sndBuffer;\r
-               PicoWriteSound = updateSound;\r
+               PicoWriteSound = oss_write_nonblocking;\r
                plat_update_volume(0, 0);\r
 \r
                printf("starting audio: %i len: %i stereo: %i, pal: %i\n",\r
@@ -786,30 +781,16 @@ void pemu_sound_wait(void)
 \r
 void pemu_forced_frame(int no_scale, int do_emu)\r
 {\r
-       int po_old = PicoOpt;\r
-\r
-       PicoOpt &= ~POPT_ALT_RENDERER;\r
-       PicoOpt |= POPT_ACC_SPRITES;\r
-       if (!no_scale)\r
-               PicoOpt |= POPT_EN_SOFTSCALE;\r
-\r
-       memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);\r
-\r
-       PicoDrawSetOutFormat(PDF_RGB555, 1);\r
+       doing_bg_frame = 1;\r
        PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
        PicoDraw32xSetFrameMode(0, 0);\r
        PicoDrawSetCallbacks(NULL, NULL);\r
        Pico.m.dirtyPal = 1;\r
 \r
-       doing_bg_frame = 1;\r
-       if (do_emu)\r
-               PicoFrame();\r
-       else\r
-               PicoFrameDrawOnly();\r
-       doing_bg_frame = 0;\r
+       emu_cmn_forced_frame(no_scale, do_emu);\r
 \r
        g_menubg_src_ptr = g_screen_ptr;\r
-       PicoOpt = po_old;\r
+       doing_bg_frame = 0;\r
 }\r
 \r
 void plat_debug_cat(char *str)\r