From: notaz <notasas@gmail.com>
Date: Mon, 5 Feb 2007 22:23:19 +0000 (+0000)
Subject: 1.14 release
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bc9cd7fe1342253ef870075a0df5aee8084e1c2;p=libpicofe.git

1.14 release

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@29 be3aeb3a-fb24-0410-a615-afba39da0efa
---

diff --git a/gp2x/940ctl_ym2612.c b/gp2x/940ctl_ym2612.c
index 3502b82..1a8160d 100644
--- a/gp2x/940ctl_ym2612.c
+++ b/gp2x/940ctl_ym2612.c
@@ -565,7 +565,7 @@ void mp3_start_play(FILE *f, int pos) // pos is 0-1023
 {
 	int byte_offs = 0;
 
-	if (!(currentConfig.EmuOpt&0x800)) { // cdda disabled?
+	if (!(PicoOpt&0x800)) { // cdda disabled?
 		return;
 	}
 
@@ -601,7 +601,7 @@ int mp3_get_offset(void)
 	int offs1024 = 0;
 	int cdda_on;
 
-	cdda_on = (PicoMCD & 1) && (currentConfig.EmuOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&
+	cdda_on = (PicoMCD & 1) && (PicoOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&
 			(Pico_mcd->scd.Status_CDC & 1) && loaded_mp3 && shared_ctl->mp3_offs < shared_ctl->mp3_len;
 
 	if (cdda_on) {
diff --git a/gp2x/emu.c b/gp2x/emu.c
index e564dfb..bbb78b2 100644
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -455,7 +455,7 @@ int emu_ReadConfig(int game)
 		currentConfig.lastRomFile[0] = 0;
 		currentConfig.EmuOpt  = 0x1f | 0x400; // | cd_leds
 		currentConfig.PicoOpt = 0x0f | 0xe00; // | use_940 | cd_pcm | cd_cdda
-		currentConfig.PsndRate = 44100;
+		currentConfig.PsndRate = 22050; // 44100;
 		currentConfig.PicoRegion = 0; // auto
 		currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP
 		currentConfig.Frameskip = -1; // auto
diff --git a/gp2x/version.h b/gp2x/version.h
index bbb221d..a4d411f 100644
--- a/gp2x/version.h
+++ b/gp2x/version.h
@@ -1,2 +1,2 @@
-#define VERSION "1.10"
+#define VERSION "1.14"