X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Femu.c;h=32450758ee014cc713586453f6d7e50fa6805280;hb=7b436906b2677a8999cda2549df921fdc887dc43;hp=82f1c1dc1ced9f540e3c13592154c81139db62c1;hpb=54646a396bc0330c581be41863640f00680fbf9a;p=picodrive.git

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index 82f1c1d..3245075 100644
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -590,12 +590,16 @@ void plat_update_volume(int has_changed, int is_up)
 
 static void updateSound(int len)
 {
+	len <<= 1;
 	if (PicoOpt & POPT_EN_STEREO)
 		len <<= 1;
 
+	if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && !sndout_oss_can_write(len))
+		return;
+
 	/* avoid writing audio when lagging behind to prevent audio lag */
 	if (PicoSkipFrame != 2)
-		sndout_oss_write(PsndOut, len<<1);
+		sndout_oss_write(PsndOut, len);
 }
 
 void pemu_sound_start(void)
@@ -609,31 +613,40 @@ void pemu_sound_start(void)
 	{
 		int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;
 		int target_fps = Pico.m.pal ? 50 : 60;
-		int snd_excess_add;
+		int frame_samples, snd_excess_add;
 		gp2x_soc_t soc;
 
+		soc = soc_detect();
+
 		#define SOUND_RERATE_FLAGS (POPT_EN_FM|POPT_EN_PSG|POPT_EN_STEREO|POPT_EXT_FM|POPT_EN_MCD_CDDA)
 		if (PsndRate != PsndRate_old || Pico.m.pal != pal_old || ((PicoOpt & POPT_EXT_FM) && crashed_940) ||
 				((PicoOpt ^ PicoOpt_old) & SOUND_RERATE_FLAGS)) {
 			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",
-			PsndRate, PsndLen, snd_excess_add, is_stereo, Pico.m.pal);
-		sndout_oss_start(PsndRate, 16, is_stereo);
-		sndout_oss_setvol(currentConfig.volume, currentConfig.volume);
-		PicoWriteSound = updateSound;
-		plat_update_volume(0, 0);
+
 		memset(sndBuffer, 0, sizeof(sndBuffer));
 		PsndOut = sndBuffer;
+		PicoWriteSound = updateSound;
 		PsndRate_old = PsndRate;
 		PicoOpt_old  = PicoOpt;
 		pal_old = Pico.m.pal;
+		plat_update_volume(0, 0);
+
+		frame_samples = PsndLen;
+		snd_excess_add = ((PsndRate - PsndLen * target_fps)<<16) / target_fps;
+		if (snd_excess_add != 0)
+			frame_samples++;
+		if (soc == SOCID_POLLUX)
+			frame_samples *= 2;	/* force larger buffer */
+
+		printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
+			PsndRate, PsndLen, snd_excess_add, is_stereo, Pico.m.pal);
+		sndout_oss_setvol(currentConfig.volume, currentConfig.volume);
+		sndout_oss_start(PsndRate, frame_samples, is_stereo);
 
 		/* Wiz's sound hardware needs more prebuffer */
-		soc = soc_detect();
 		if (soc == SOCID_POLLUX)
-			updateSound(PsndLen);
+			updateSound(frame_samples);
 	}
 }
 
@@ -743,6 +756,9 @@ void pemu_loop_prep(void)
 {
 	static int gp2x_old_clock = -1, EmuOpt_old = 0, pal_old = 0;
 	static int gp2x_old_gamma = 100;
+	gp2x_soc_t soc;
+
+	soc = soc_detect();
 
 	if ((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_RAM_TIMINGS) {
 		if (currentConfig.EmuOpt & EOPT_RAM_TIMINGS)
@@ -760,16 +776,16 @@ void pemu_loop_prep(void)
 		printf(" done\n");
 	}
 
-	if (gp2x_old_gamma != currentConfig.gamma || (EmuOpt_old&0x1000) != (currentConfig.EmuOpt&0x1000)) {
-		set_lcd_gamma(currentConfig.gamma, !!(currentConfig.EmuOpt&0x1000));
+	if (gp2x_old_gamma != currentConfig.gamma || ((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_A_SN_GAMMA)) {
+		set_lcd_gamma(currentConfig.gamma, !!(currentConfig.EmuOpt & EOPT_A_SN_GAMMA));
 		gp2x_old_gamma = currentConfig.gamma;
 		printf("updated gamma to %i, A_SN's curve: %i\n", currentConfig.gamma, !!(currentConfig.EmuOpt&0x1000));
 	}
 
-	if (((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_PSYNC) || Pico.m.pal != pal_old) {
-		if (currentConfig.EmuOpt & EOPT_PSYNC)
+	if (((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_VSYNC) || Pico.m.pal != pal_old) {
+		if ((currentConfig.EmuOpt & EOPT_VSYNC) || soc == SOCID_POLLUX)
 			set_lcd_custom_rate(Pico.m.pal);
-		else
+		else if (EmuOpt_old & EOPT_VSYNC)
 			unset_lcd_custom_rate();
 	}
 
@@ -788,6 +804,22 @@ void pemu_loop_prep(void)
 
 void pemu_loop_end(void)
 {
+	int po_old = PicoOpt;
+	int eo_old = currentConfig.EmuOpt;
+
+	/* do one more frame for menu bg */
+	PicoOpt &= ~POPT_ALT_RENDERER;
+	PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES;
+	currentConfig.EmuOpt |= EOPT_16BPP;
+
+	PicoScanBegin = EmuScanBegin16;
+	PicoScanEnd = NULL;
+	PicoDrawSetColorFormat(1);
+	Pico.m.dirtyPal = 1;
+	PicoFrame();
+
+	PicoOpt = po_old;
+	currentConfig.EmuOpt = eo_old;
 }
 
 const char *plat_get_credits(void)