notaz.gp2x.de / picodrive.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
sound code rewrite for lower sample rates (except mp3s)
[picodrive.git] / platform / gp2x / emu.c
diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index 17e7028..871d05f 100644 (file)
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -48,6 +48,7 @@ unsigned char *rom_data = NULL;
 \r
 extern int crashed_940;\r
 \r
+static short sndBuffer[2*44100/50];\r
 static char noticeMsg[64];                                     // notice msg to draw\r
 static struct timeval noticeMsgTime = { 0, 0 };        // when started showing\r
 static int reset_timing, osd_fps_x;\r
@@ -276,6 +277,7 @@ int emu_ReloadRom(void)
                // bios_help() ?\r
                return 0;\r
        } else {\r
+               if (PicoMCD & 1) PicoExitMCD();\r
                PicoMCD &= ~1;\r
        }\r
 \r
@@ -374,7 +376,7 @@ int emu_ReloadRom(void)
                }\r
        }\r
        gettimeofday(&noticeMsgTime, 0);\r
-printf("PicoMCD: %x\n", PicoMCD);\r
+\r
        // load SRAM for this ROM\r
        if(currentConfig.EmuOpt & 1)\r
                emu_SaveLoadGame(1, 1);\r
@@ -452,9 +454,9 @@ int emu_ReadConfig(int game)
                // set default config\r
                memset(&currentConfig, 0, sizeof(currentConfig));\r
                currentConfig.lastRomFile[0] = 0;\r
-               currentConfig.EmuOpt  = 0x1f | 0xc00; // | cd_leds | cd_cdda\r
-               currentConfig.PicoOpt = 0x0f | 0x200; // | use_940\r
-               currentConfig.PsndRate = 44100;\r
+               currentConfig.EmuOpt  = 0x1f | 0x400; // | cd_leds\r
+               currentConfig.PicoOpt = 0x0f | 0xe00; // | use_940 | cd_pcm | cd_cdda\r
+               currentConfig.PsndRate = 22050; // 44100;\r
                currentConfig.PicoRegion = 0; // auto\r
                currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP\r
                currentConfig.Frameskip = -1; // auto\r
@@ -599,20 +601,20 @@ static void cd_leds(void)
                // 8-bit modes\r
                unsigned int col_g = (old_reg & 2) ? 0xc0c0c0c0 : 0xe0e0e0e0;\r
                unsigned int col_r = (old_reg & 1) ? 0xd0d0d0d0 : 0xe0e0e0e0;\r
-               *(unsigned int *)((char *)gp2x_screen + 320*2+306) =\r
-               *(unsigned int *)((char *)gp2x_screen + 320*3+306) =\r
-               *(unsigned int *)((char *)gp2x_screen + 320*4+306) = col_g;\r
-               *(unsigned int *)((char *)gp2x_screen + 320*2+312) =\r
-               *(unsigned int *)((char *)gp2x_screen + 320*3+312) =\r
-               *(unsigned int *)((char *)gp2x_screen + 320*4+312) = col_r;\r
+               *(unsigned int *)((char *)gp2x_screen + 320*2+ 4) =\r
+               *(unsigned int *)((char *)gp2x_screen + 320*3+ 4) =\r
+               *(unsigned int *)((char *)gp2x_screen + 320*4+ 4) = col_g;\r
+               *(unsigned int *)((char *)gp2x_screen + 320*2+12) =\r
+               *(unsigned int *)((char *)gp2x_screen + 320*3+12) =\r
+               *(unsigned int *)((char *)gp2x_screen + 320*4+12) = col_r;\r
        } else {\r
                // 16-bit modes\r
-               unsigned int *p = (unsigned int *)((short *)gp2x_screen + 320*2+306);\r
+               unsigned int *p = (unsigned int *)((short *)gp2x_screen + 320*2+4);\r
                unsigned int col_g = (old_reg & 2) ? 0x06000600 : 0;\r
                unsigned int col_r = (old_reg & 1) ? 0xc000c000 : 0;\r
-               *p++ = col_g; *p++ = col_g; p++; *p++ = col_r; *p++ = col_r; p += 320/2 - 10/2;\r
-               *p++ = col_g; *p++ = col_g; p++; *p++ = col_r; *p++ = col_r; p += 320/2 - 10/2;\r
-               *p++ = col_g; *p++ = col_g; p++; *p++ = col_r; *p++ = col_r; p += 320/2 - 10/2;\r
+               *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;\r
+               *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;\r
+               *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;\r
        }\r
 }\r
 \r
@@ -926,24 +928,10 @@ static void updateKeys(void)
        prevEvents = (allActions[0] | allActions[1]) >> 16;\r
 }\r
 \r
-static int snd_excess_add = 0, snd_excess_cnt = 0; // hack\r
 \r
-static void updateSound(void)\r
+static void updateSound(int len)\r
 {\r
-       int len = (PicoOpt&8)?PsndLen*2:PsndLen;\r
-\r
-       snd_excess_cnt += snd_excess_add;\r
-       if (snd_excess_cnt >= 0x10000) {\r
-               snd_excess_cnt -= 0x10000;\r
-               if (PicoOpt&8) {\r
-                       PsndOut[len]   = PsndOut[len-2];\r
-                       PsndOut[len+1] = PsndOut[len-1];\r
-                       len+=2;\r
-               } else {\r
-                       PsndOut[len]   = PsndOut[len-1];\r
-                       len++;\r
-               }\r
-       }\r
+       if (PicoOpt&8) len<<=1;\r
 \r
        gp2x_sound_write(PsndOut, len<<1);\r
 }\r
@@ -1023,22 +1011,23 @@ void emu_Loop(void)
 \r
        // prepare sound stuff\r
        if(currentConfig.EmuOpt & 4) {\r
+               int snd_excess_add;\r
                if(PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old || crashed_940) {\r
                        /* if 940 is turned off, we need it to be put back to sleep */\r
                        if (!(PicoOpt&0x200) && ((PicoOpt^PicoOpt_old)&0x200)) {\r
                                Reset940(1, 2);\r
                                Pause940(1);\r
                        }\r
-                       sound_rerate();\r
+                       sound_rerate(1);\r
                }\r
                //excess_samples = PsndRate - PsndLen*target_fps;\r
-               snd_excess_cnt = 0;\r
                snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;\r
                printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n", PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal);\r
                gp2x_start_sound(PsndRate, 16, (PicoOpt&8)>>3);\r
                gp2x_sound_volume(currentConfig.volume, currentConfig.volume);\r
                PicoWriteSound = updateSound;\r
-               PsndOut = calloc((PicoOpt&8) ? (PsndLen*4+4) : (PsndLen*2+2), 1);\r
+               memset(sndBuffer, 0, sizeof(sndBuffer));\r
+               PsndOut = sndBuffer;\r
                PsndRate_old = PsndRate;\r
                PsndLen_real = PsndLen;\r
                PicoOpt_old  = PicoOpt;\r
@@ -1238,11 +1227,6 @@ if (Pico.m.frame_count == 31563) {
                emu_SaveLoadGame(0, 1);\r
                SRam.changed = 0;\r
        }\r
-\r
-       if (PsndOut != 0) {\r
-               free(PsndOut);\r
-               PsndOut = 0;\r
-       }\r
 }\r
 \r
 \r
@@ -1264,7 +1248,6 @@ size_t gzWrite2(void *p, size_t _size, size_t _n, void *file)
        return gzwrite(file, p, _n);\r
 }\r
 \r
-typedef unsigned int (*STATE_SL_FUNC)(void *, unsigned int, unsigned int, void *);\r
 \r
 int emu_SaveLoadGame(int load, int sram)\r
 {\r
@@ -1326,6 +1309,7 @@ int emu_SaveLoadGame(int load, int sram)
                                areaRead  = gzRead2;\r
                                areaWrite = gzWrite2;\r
                                areaEof   = (areaeof *) gzeof;\r
+                               areaSeek  = (areaseek *) gzseek;\r
                                if(!load) gzsetparams(PmovFile, 9, Z_DEFAULT_STRATEGY);\r
                        } else\r
                                saveFname[strlen(saveFname)-3] = 0;\r
@@ -1335,18 +1319,23 @@ int emu_SaveLoadGame(int load, int sram)
                                areaRead  = (arearw *) fread;\r
                                areaWrite = (arearw *) fwrite;\r
                                areaEof   = (areaeof *) feof;\r
+                               areaSeek  = (areaseek *) fseek;\r
                        }\r
                }\r
                if(PmovFile) {\r
-                       PmovState(load ? 6 : 5, PmovFile);\r
-                       strcpy(noticeMsg, load ? "GAME LOADED  " : "GAME SAVED   ");\r
+                       ret = PmovState(load ? 6 : 5, PmovFile);\r
                        if(areaRead == gzRead2)\r
                                 gzclose(PmovFile);\r
                        else fclose ((FILE *) PmovFile);\r
                        PmovFile = 0;\r
                        if (!load) sync();\r
                        else Pico.m.dirtyPal=1;\r
-               } else {\r
+               }\r
+               else    ret = -1;\r
+               if (!ret)\r
+                       strcpy(noticeMsg, load ? "GAME LOADED  " : "GAME SAVED   ");\r
+               else\r
+               {\r
                        strcpy(noticeMsg, load ? "LOAD FAILED  " : "SAVE FAILED  ");\r
                        ret = -1;\r
                }\r
fast MegaDrive/MegaCD/32X emulator