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 (file)
--- 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
 {\r
        int byte_offs = 0;\r
 \r
-       if (!(currentConfig.EmuOpt&0x800)) { // cdda disabled?\r
+       if (!(PicoOpt&0x800)) { // cdda disabled?\r
                return;\r
        }\r
 \r
@@ -601,7 +601,7 @@ int mp3_get_offset(void)
        int offs1024 = 0;\r
        int cdda_on;\r
 \r
-       cdda_on = (PicoMCD & 1) && (currentConfig.EmuOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&\r
+       cdda_on = (PicoMCD & 1) && (PicoOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&\r
                        (Pico_mcd->scd.Status_CDC & 1) && loaded_mp3 && shared_ctl->mp3_offs < shared_ctl->mp3_len;\r
 \r
        if (cdda_on) {\r

diff --git a/gp2x/emu.c b/gp2x/emu.c
index e564dfb..bbb78b2 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -455,7 +455,7 @@ int emu_ReadConfig(int game)
                currentConfig.lastRomFile[0] = 0;\r
                currentConfig.EmuOpt  = 0x1f | 0x400; // | cd_leds\r
                currentConfig.PicoOpt = 0x0f | 0xe00; // | use_940 | cd_pcm | cd_cdda\r
-               currentConfig.PsndRate = 44100;\r
+               currentConfig.PsndRate = 22050; // 44100;\r
                currentConfig.PicoRegion = 0; // auto\r
                currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP\r
                currentConfig.Frameskip = -1; // auto\r

diff --git a/gp2x/version.h b/gp2x/version.h
index bbb221d..a4d411f 100644 (file)
--- a/gp2x/version.h
+++ b/gp2x/version.h
@@ -1,2 +1,2 @@
-#define VERSION "1.10"\r
+#define VERSION "1.14"\r
 \r