X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Femu.c;h=acc3881aa31f7aece65f4375d6dd9075d9c53ca3;hb=b08ccf71d5652983e5846fc5bdb61bc5b4660e64;hp=372ce56fe1d148c6412f6d0e82dc1998c225caca;hpb=b24e0f6ce6e8a59ba43597520709ca79fa36ff8e;p=picodrive.git

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index 372ce56..acc3881 100644
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -409,6 +409,7 @@ void plat_status_msg_busy_next(const char *msg)
 {
 	plat_status_msg_clear();
 	pemu_update_display("", msg);
+	emu_status_msg("");
 
 	/* assumption: msg_busy_next gets called only when
 	 * something slow is about to happen */
@@ -575,7 +576,7 @@ void plat_update_volume(int has_changed, int is_up)
 		prev_frame = Pico.m.frame_count;
 	}
 
-	if (need_low_volume)
+	if (!need_low_volume)
 		return;
 
 	/* set the right mixer func */
@@ -589,41 +590,63 @@ 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)
 {
 	static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;
-	int target_fps = Pico.m.pal ? 50 : 60;
 
 	PsndOut = NULL;
 
 	// prepare sound stuff
-	if (currentConfig.EmuOpt & 4)
+	if (currentConfig.EmuOpt & EOPT_EN_SOUND)
 	{
-		int snd_excess_add;
-		if (PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old ||
-				((PicoOpt&0x200) && crashed_940)) {
+		int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;
+		int target_fps = Pico.m.pal ? 50 : 60;
+		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, (PicoOpt&8)>>3, Pico.m.pal);
-		sndout_oss_start(PsndRate, 16, (PicoOpt&8)>>3);
-		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 */
+		if (soc == SOCID_POLLUX)
+			updateSound(frame_samples);
 	}
 }
 
@@ -778,6 +801,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)