debug bgm player, sound code refactoring

[libpicofe.git] / psp / emu.c

diff --git a/psp/emu.c b/psp/emu.c
index b050419..015c320 100644 (file)
--- a/psp/emu.c
+++ b/psp/emu.c
@@ -21,8 +21,8 @@
 #include "../common/emu.h"
 #include "../common/config.h"
 #include "../common/lprintf.h"
-#include "../../Pico/PicoInt.h"
-#include "../../Pico/cd/cue.h"
+#include <pico/pico_int.h>
+#include <pico/cd/cue.h>
 
 #define OSD_FPS_X 432
 
@@ -54,9 +54,10 @@ void emu_noticeMsgUpdated(void)
        noticeMsgTime = sceKernelGetSystemTimeLow();
 }
 
-void emu_getMainDir(char *dst, int len)
+int emu_getMainDir(char *dst, int len)
 {
        if (len > 0) *dst = 0;
+       return 0;
 }
 
 static void osd_text(int x, const char *text, int is_active, int clear_all)
@@ -155,16 +156,6 @@ void emu_prepareDefaultConfig(void)
        defaultConfig.turbo_rate = 15;
 }
 
-void emu_setDefaultConfig(void)
-{
-       memcpy(&currentConfig, &defaultConfig, sizeof(currentConfig));
-       PicoOpt = currentConfig.s_PicoOpt;
-       PsndRate = currentConfig.s_PsndRate;
-       PicoRegionOverride = currentConfig.s_PicoRegion;
-       PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;
-       PicoCDBuffers = currentConfig.s_PicoCDBuffers;
-}
-
 
 extern void amips_clut(unsigned short *dst, unsigned char *src, unsigned short *pal, int count);
 extern void amips_clut_6bit(unsigned short *dst, unsigned char *src, unsigned short *pal, int count);
@@ -272,7 +263,7 @@ static void do_pal_update(int allow_sh, int allow_as)
                localPal[0xe0] = 0;
                localPal[0xf0] = 0x001f;
        }
-       else if (allow_as && (rendstatus & PDRAW_ACC_SPRITES))
+       else if (allow_as && (rendstatus & PDRAW_SPR_LO_ON_HI))
        {
                memcpy32((int *)dpal+0x80/2, (void *)localPal, 0x40*2/4);
        }
@@ -299,7 +290,7 @@ static void EmuScanPrepare(void)
 
        if (Pico.m.dirtyPal)
                do_pal_update(1, 1);
-       if ((rendstatus & PDRAW_ACC_SPRITES) && !(Pico.video.reg[0xC]&8))
+       if ((rendstatus & PDRAW_SPR_LO_ON_HI) && !(Pico.video.reg[0xC]&8))
             amips_clut_f = amips_clut_6bit;
        else amips_clut_f = amips_clut;
 }
@@ -618,7 +609,7 @@ static void sound_init(void)
                lprintf("sceKernelCreateThread failed: %i\n", thid);
 }
 
-static void sound_prepare(void)
+void emu_startSound(void)
 {
        static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;
        int ret, stereo;
@@ -657,7 +648,7 @@ static void sound_prepare(void)
        }
 }
 
-static void sound_end(void)
+void emu_endSound(void)
 {
        int i;
        if (samples_done == 0)
@@ -676,6 +667,14 @@ static void sound_end(void)
        sceAudio_5C37C0AE();
 }
 
+/* wait until we can write more sound */
+void emu_waitSound(void)
+{
+       // TODO: test this
+       while (!sound_thread_exit && samples_made - samples_done > samples_block * 4)
+               psp_msleep(10);
+}
+
 static void sound_deinit(void)
 {
        sound_thread_exit = 1;
@@ -953,7 +952,7 @@ void emu_Loop(void)
        PsndOut = NULL;
        if (currentConfig.EmuOpt & 4)
        {
-               sound_prepare();
+               emu_startSound();
        }
 
        sceDisplayWaitVblankStart();
@@ -1099,8 +1098,8 @@ void emu_Loop(void)
        if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
 
        if (PsndOut != NULL) {
+               emu_endSound();
                PsndOut = NULL;
-               sound_end();
        }
 
        // save SRAM