debug bgm player, sound code refactoring

[libpicofe.git] / psp / emu.c

diff --git a/psp/emu.c b/psp/emu.c
index e099d58..015c320 100644 (file)
--- a/psp/emu.c
+++ b/psp/emu.c
@@ -21,7 +21,8 @@
 #include "../common/emu.h"
 #include "../common/config.h"
 #include "../common/lprintf.h"
-#include "../../Pico/PicoInt.h"
+#include <pico/pico_int.h>
+#include <pico/cd/cue.h>
 
 #define OSD_FPS_X 432
 
@@ -34,7 +35,7 @@ int sceAudioOutput2GetRestSample();
 
 char romFileName[PATH_MAX];
 unsigned char *PicoDraw2FB = (unsigned char *)VRAM_CACHED_STUFF + 8; // +8 to be able to skip border with 1 quadword..
-int engineState = PGS_Menu;
+int engineState = PGS_Menu, engineStateSuspend;
 
 static unsigned int noticeMsgTime = 0;
 int reset_timing = 0; // do we need this?
@@ -53,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)
@@ -151,16 +153,7 @@ void emu_prepareDefaultConfig(void)
        defaultConfig.scale = 1.20;    // fullscreen
        defaultConfig.hscale40 = 1.25;
        defaultConfig.hscale32 = 1.56;
-}
-
-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;
+       defaultConfig.turbo_rate = 15;
 }
 
 
@@ -270,9 +263,9 @@ 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 *)(void *)(localPal+0x80), (void *)localPal, 0x40/2);
+               memcpy32((int *)dpal+0x80/2, (void *)localPal, 0x40*2/4);
        }
 }
 
@@ -294,9 +287,10 @@ static void EmuScanPrepare(void)
 
        if (dynamic_palette > 0)
                dynamic_palette--;
+
        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;
 }
@@ -320,7 +314,7 @@ static int EmuScanSlowEnd(unsigned int num)
                        do_slowmode_lines(num);
                        dynamic_palette = 3; // last for 2 more frames
                }
-               do_pal_update(1, 0);
+               do_pal_update(1, 1);
        }
 
        if (dynamic_palette) {
@@ -532,6 +526,11 @@ static void vidResetMode(void)
        sceGuSync(0,0);
 }
 
+void emu_platformDebugCat(char *str)
+{
+       strcat(str, blit_16bit_mode ? "soft clut\n" : "hard clut\n");
+}
+
 
 /* sound stuff */
 #define SOUND_BLOCK_SIZE_NTSC (1470*2) // 1024 // 1152
@@ -610,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;
@@ -649,7 +648,7 @@ static void sound_prepare(void)
        }
 }
 
-static void sound_end(void)
+void emu_endSound(void)
 {
        int i;
        if (samples_done == 0)
@@ -668,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;
@@ -862,8 +869,11 @@ static void updateKeys(void)
                }
        }
 
-       PicoPad[0] = (unsigned short) allActions[0];
-       PicoPad[1] = (unsigned short) allActions[1];
+       PicoPad[0] = allActions[0] & 0xfff;
+       PicoPad[1] = allActions[1] & 0xfff;
+
+       if (allActions[0] & 0x7000) emu_DoTurbo(&PicoPad[0], allActions[0]);
+       if (allActions[1] & 0x7000) emu_DoTurbo(&PicoPad[1], allActions[1]);
 
        events = (allActions[0] | allActions[1]) >> 16;
 
@@ -942,7 +952,7 @@ void emu_Loop(void)
        PsndOut = NULL;
        if (currentConfig.EmuOpt & 4)
        {
-               sound_prepare();
+               emu_startSound();
        }
 
        sceDisplayWaitVblankStart();
@@ -1088,8 +1098,8 @@ void emu_Loop(void)
        if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
 
        if (PsndOut != NULL) {
+               emu_endSound();
                PsndOut = NULL;
-               sound_end();
        }
 
        // save SRAM
@@ -1114,15 +1124,31 @@ void emu_HandleResume(void)
 {
        if (!(PicoAHW & PAHW_MCD)) return;
 
-       // reopen files..
+       // reopen first CD track
        if (Pico_mcd->TOC.Tracks[0].F != NULL)
        {
-               lprintf("emu_HandleResume: reopen %s\n", romFileName);
+               char *fname = romFileName;
+               int len = strlen(romFileName);
+               cue_data_t *cue_data = NULL;
+
+               if (len > 4 && strcasecmp(fname + len - 4,  ".cue") == 0)
+               {
+                       cue_data = cue_parse(romFileName);
+                       if (cue_data != NULL)
+                               fname = cue_data->tracks[1].fname;
+               }
+
+               lprintf("emu_HandleResume: reopen %s\n", fname);
                pm_close(Pico_mcd->TOC.Tracks[0].F);
-               Pico_mcd->TOC.Tracks[0].F = pm_open(romFileName);
+               Pico_mcd->TOC.Tracks[0].F = pm_open(fname);
                lprintf("reopen %s\n", Pico_mcd->TOC.Tracks[0].F != NULL ? "ok" : "failed");
+
+               if (cue_data != NULL) cue_destroy(cue_data);
        }
 
        mp3_reopen_file();
+
+       if (!(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))
+               cdda_start_play();
 }