if (len > 0) *dst = 0;
}
-static void osd_text(int x, const char *text, int is_active)
+static void osd_text(int x, const char *text, int is_active, int clear_all)
{
unsigned short *screen = is_active ? psp_video_get_active_fb() : psp_screen;
- int len = strlen(text) * 8 / 2;
+ int len = clear_all ? (480 / 2) : (strlen(text) * 8 / 2);
int *p, h;
void *tmp;
for (h = 0; h < 8; h++) {
void emu_msg_cb(const char *msg)
{
- osd_text(4, msg, 1);
+ osd_text(4, msg, 1, 1);
noticeMsgTime = sceKernelGetSystemTimeLow() - 2000000;
/* assumption: emu_msg_cb gets called only when something slow is about to happen */
currentConfig.KeyBinds[12] = 1<<26; // switch rnd
currentConfig.KeyBinds[ 8] = 1<<27; // save state
currentConfig.KeyBinds[ 9] = 1<<28; // load state
- currentConfig.PicoCDBuffers = 0;
- currentConfig.scaling = 1; // bilinear filtering for psp
- currentConfig.scale = currentConfig.hscale32 = currentConfig.hscale40 = 1.0;
+ currentConfig.KeyBinds[28] = 1<<0; // num "buttons"
+ currentConfig.KeyBinds[30] = 1<<1;
+ currentConfig.KeyBinds[31] = 1<<2;
+ currentConfig.KeyBinds[29] = 1<<3;
+ currentConfig.PicoCDBuffers = 64;
+ currentConfig.scaling = 1; // bilinear filtering for psp
+ currentConfig.scale = 1.20; // fullscreen
+ currentConfig.hscale40 = 1.25;
+ currentConfig.hscale32 = 1.56;
}
static void cd_leds(void)
{
- static int old_reg = 0;
- unsigned int col_g, col_r, *p;
+ unsigned int reg, col_g, col_r, *p;
- if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change
- old_reg = Pico_mcd->s68k_regs[0];
+ reg = Pico_mcd->s68k_regs[0];
p = (unsigned int *)((short *)psp_screen + 512*2+4+2);
- col_g = (old_reg & 2) ? 0x06000600 : 0;
- col_r = (old_reg & 1) ? 0x00180018 : 0;
+ col_g = (reg & 2) ? 0x06000600 : 0;
+ col_r = (reg & 1) ? 0x00180018 : 0;
*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 512/2 - 12/2;
*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 512/2 - 12/2;
*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r;
int vsync = 0, emu_opt = currentConfig.EmuOpt;
if (notice || (emu_opt & 2)) {
- if (notice) osd_text(4, notice, 0);
- if (emu_opt & 2) osd_text(OSD_FPS_X, fps, 0);
+ if (notice) osd_text(4, notice, 0, 0);
+ if (emu_opt & 2) osd_text(OSD_FPS_X, fps, 0, 0);
}
dbg_text();
/* sound stuff */
#define SOUND_BLOCK_SIZE_NTSC (1470*2) // 1024 // 1152
#define SOUND_BLOCK_SIZE_PAL (1764*2)
-#define SOUND_BLOCK_COUNT 4
+#define SOUND_BLOCK_COUNT 8
static short __attribute__((aligned(4))) sndBuffer[SOUND_BLOCK_SIZE_PAL*SOUND_BLOCK_COUNT + 44100/50*2];
static short *snd_playptr = NULL, *sndBuffer_endptr = NULL;
static int sound_thread(SceSize args, void *argp)
{
- int ret;
+ int ret = 0;
lprintf("sthr: started, priority %i\n", sceKernelGetThreadCurrentPriority());
{
if (samples_made - samples_done < samples_block) {
// wait for data (use at least 2 blocks)
- //lprintf("sthr: wait... (%i)\n", samples_made - samples_done);
+ lprintf("sthr: wait... (%i)\n", samples_made - samples_done);
while (samples_made - samples_done <= samples_block*2 && !sound_thread_exit)
ret = sceKernelWaitSema(sound_sem, 1, 0);
- //lprintf("sthr: sceKernelWaitSema: %i\n", ret);
+ if (ret < 0) lprintf("sthr: sceKernelWaitSema: %i\n", ret);
continue;
}
- //lprintf("sthr: got data: %i\n", samples_made - samples_done);
+ // lprintf("sthr: got data: %i\n", samples_made - samples_done);
ret = sceAudio_E0727056(PSP_AUDIO_VOLUME_MAX, snd_playptr);
// shouln't happen, but just in case
if (samples_made - samples_done >= samples_block*3) {
- //lprintf("block skip (%i)\n", samples_made - samples_done);
+ lprintf("sthr: block skip (%i)\n", samples_made - samples_done);
samples_done += samples_block; // skip
snd_playptr += samples_block;
}
lprintf("starting audio: %i, len: %i, stereo: %i, pal: %i, block samples: %i\n",
PsndRate, PsndLen, stereo, Pico.m.pal, samples_block);
- while (sceAudioOutput2GetRestSample() > 0) psp_msleep(100);
- sceAudio_5C37C0AE();
+ // while (sceAudioOutput2GetRestSample() > 0) psp_msleep(100);
+ // sceAudio_5C37C0AE();
ret = sceAudio_38553111(samples_block/2, PsndRate, 2); // seems to not need that stupid 64byte alignment
if (ret < 0) {
lprintf("sceAudio_38553111() failed: %i\n", ret);
static void sound_end(void)
{
+ int i;
+ if (samples_done == 0)
+ {
+ // if no data is written between sceAudio_38553111 and sceAudio_5C37C0AE calls,
+ // we get a deadlock on next sceAudio_38553111 call
+ // so this is yet another workaround:
+ memset32((int *)(void *)sndBuffer, 0, samples_block*4/4);
+ samples_made = samples_block * 3;
+ sceKernelSignalSema(sound_sem, 1);
+ }
+ sceKernelDelayThread(100*1000);
samples_made = samples_done = 0;
- while (sceAudioOutput2GetRestSample() > 0)
+ for (i = 0; sceAudioOutput2GetRestSample() > 0 && i < 16; i++)
psp_msleep(100);
sceAudio_5C37C0AE();
}
lprintf("mov\n");
}
else*/
+ if (PsndOut > sndBuffer_endptr) lprintf("snd oflow %i!\n", PsndOut - sndBuffer_endptr);
if (PsndOut >= sndBuffer_endptr)
PsndOut = sndBuffer;
if (samples_made - samples_done > samples_block*2) {
// lprintf("signal, %i/%i\n", samples_done, samples_made);
ret = sceKernelSignalSema(sound_sem, 1);
- // lprintf("signal ret %i\n", ret);
+ //if (ret < 0) lprintf("snd signal ret %08x\n", ret);
}
}
if (do_it)
{
- osd_text(4, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME", 1);
+ osd_text(4, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME", 1, 0);
PicoStateProgressCB = emu_msg_cb;
emu_SaveLoadGame((which & 0x1000) >> 12, 0);
PicoStateProgressCB = NULL;
combo_keys = combo_acts = 0;
for (act = 0; act < 32; act++)
{
- int keyc = 0;
+ int keyc = 0, keyc2 = 0;
if (act == 16 || act == 17) continue; // player2 flag
- for (u = 0; u < 32; u++)
+ if (act > 17)
+ {
+ for (u = 0; u < 28; u++) // 28 because nub can't produce combos
+ if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;
+ }
+ else
{
- if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;
+ for (u = 0; u < 28; u++)
+ if ((currentConfig.KeyBinds[u] & 0x30000) == 0 && // pl. 1
+ (currentConfig.KeyBinds[u] & (1 << act))) keyc++;
+ for (u = 0; u < 28; u++)
+ if ((currentConfig.KeyBinds[u] & 0x30000) == 1 && // pl. 2
+ (currentConfig.KeyBinds[u] & (1 << act))) keyc2++;
}
- if (keyc > 1)
+ if (keyc > 1 || keyc2 > 1)
{
// loop again and mark those keys and actions as combo
- for (u = 0; u < 32; u++)
+ for (u = 0; u < 28; u++)
{
if (currentConfig.KeyBinds[u] & (1 << act)) {
combo_keys |= 1 << u;
sound_prepare();
}
+ sceDisplayWaitVblankStart();
+
// loop?
while (engineState == PGS_Running)
{