X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Femu.c;h=41187c5d708596db2745b18be6dcb2b2e10d1625;hb=c4f2f371a6aacdb44280d6887056e7389291419a;hp=8bd1b66ac3b5944c92861370822ee294b5c160d1;hpb=8ede36b95ea08e10f12e67a487c508a0c8993d6c;p=libpicofe.git

diff --git a/gp2x/emu.c b/gp2x/emu.c
index 8bd1b66..41187c5 100644
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -105,7 +105,7 @@ static void find_combos(void)
 	for (act = 0; act < 32; act++)
 	{
 		int keyc = 0;
-		if (act == 16) continue; // player2 flag
+		if (act == 16 || act == 17) continue; // player2 flag
 		for (u = 0; u < 32; u++)
 		{
 			if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;
@@ -629,7 +629,7 @@ static void simpleWait(int thissec, int lim_time)
 void emu_Loop(void)
 {
 	static int gp2x_old_clock = 200;
-	static int PsndRate_old = 0, PicoOpt_old = 0, EmuOpt_old = 0, PsndLen_real = 0, pal_old = 0;
+	static int PsndRate_old = 0, PicoOpt_old = 0, EmuOpt_old = 0, pal_old = 0;
 	char fpsbuff[24]; // fps count c string
 	struct timeval tval; // timing
 	int thissec = 0, frames_done = 0, frames_shown = 0, oldmodes = 0;
@@ -682,7 +682,7 @@ void emu_Loop(void)
 				Reset940(1, 2);
 				Pause940(1);
 			}
-			sound_rerate(Pico.m.frame_count ? 1 : 0);
+			PsndRerate(Pico.m.frame_count ? 1 : 0);
 		}
 		snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;
 		printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
@@ -693,7 +693,6 @@ void emu_Loop(void)
 		memset(sndBuffer, 0, sizeof(sndBuffer));
 		PsndOut = sndBuffer;
 		PsndRate_old = PsndRate;
-		PsndLen_real = PsndLen;
 		PicoOpt_old  = PicoOpt;
 		pal_old = Pico.m.pal;
 	} else {