libretro: update for newer spu code

[pcsx_rearmed.git] / frontend / main.c

diff --git a/frontend/main.c b/frontend/main.c
index df2af8f..426ef13 100644 (file)
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -25,6 +25,7 @@
 #include "../libpcsxcore/cheat.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/cdrcimg/cdrcimg.h"
+#include "../plugins/dfsound/spu_config.h"
 #include "revision.h"
 
 #ifndef NO_FRONTEND
@@ -44,12 +45,6 @@ static void check_memcards(void);
 void StartDebugger();
 void StopDebugger();
 
-// sound plugin
-extern int iUseReverb;
-extern int iUseInterpolation;
-extern int iXAPitch;
-extern int iVolume;
-
 int ready_to_go, g_emu_want_quit, g_emu_resetting;
 unsigned long gpuDisp;
 char cfgfile_basename[MAXPATHLEN];
@@ -141,13 +136,15 @@ void emu_set_default_config(void)
        pl_rearmed_cbs.gpu_peopsgl.iVRamSize = 64;
        pl_rearmed_cbs.gpu_peopsgl.iTexGarbageCollection = 1;
 
-       iUseReverb = 2;
-       iUseInterpolation = 1;
-       iXAPitch = 0;
-       iVolume = 768;
-#ifndef __ARM_ARCH_7A__ /* XXX */
-       iUseReverb = 0;
-       iUseInterpolation = 0;
+       spu_config.iUseReverb = 1;
+       spu_config.iUseInterpolation = 1;
+       spu_config.iXAPitch = 0;
+       spu_config.iVolume = 768;
+       spu_config.iTempo = 0;
+#if defined(__arm__) && !defined(__ARM_ARCH_7A__) /* XXX */
+       spu_config.iUseReverb = 0;
+       spu_config.iUseInterpolation = 0;
+       spu_config.iTempo = 1;
 #endif
        new_dynarec_hacks = 0;
        cycle_multiplier = 200;
@@ -251,7 +248,11 @@ do_state_slot:
                }
        case SACTION_VOLUME_UP:
        case SACTION_VOLUME_DOWN:
-               plat_target_step_volume(emu_action == SACTION_VOLUME_UP);
+               {
+                       static int volume;
+                       plat_target_step_volume(&volume,
+                               emu_action == SACTION_VOLUME_UP ? 1 : -1);
+               }
                return;
        case SACTION_MINIMIZE:
                if (GPU_close != NULL)
@@ -402,7 +403,14 @@ int emu_core_preinit(void)
        // it may be redefined by -cfg on the command line
        strcpy(cfgfile_basename, "pcsx.cfg");
 
+#ifdef IOS
+       emuLog = fopen("/User/Documents/pcsxr.log", "w");
+       if (emuLog == NULL)
+               emuLog = fopen("pcsxr.log", "w");
+       if (emuLog == NULL)
+#endif
        emuLog = stdout;
+
        SetIsoFile(NULL);
 
        memset(&Config, 0, sizeof(Config));
@@ -680,6 +688,12 @@ static void toggle_fast_forward(int force_off)
                snprintf(hud_msg, sizeof(hud_msg), "FAST FORWARD %s",
                        fast_forward ? "ON" : "OFF");
 }
+
+static void SignalExit(int sig) {
+       // only to restore framebuffer/resolution on some devices
+       plat_finish();
+       exit(1);
+}
 #endif
 
 void SysRunGui() {
@@ -782,6 +796,7 @@ void SysPrintf(const char *fmt, ...) {
        va_start(list, fmt);
        vfprintf(emuLog, fmt, list);
        va_end(list);
+       fflush(emuLog);
 }
 
 #else
@@ -813,10 +828,6 @@ void SysMessage(const char *fmt, ...) {
        SysPrintf("%s\n", msg);
 }
 
-static void SignalExit(int sig) {
-       emu_core_ask_exit();
-}
-
 #define PARSEPATH(dst, src) \
        ptr = src + strlen(src); \
        while (*ptr != '\\' && ptr != src) ptr--; \
@@ -827,8 +838,10 @@ static void SignalExit(int sig) {
 static int _OpenPlugins(void) {
        int ret;
 
+#ifndef NO_FRONTEND
        signal(SIGINT, SignalExit);
        signal(SIGPIPE, SignalExit);
+#endif
 
        GPU_clearDynarec(clearDynarec);
 
@@ -837,6 +850,7 @@ static int _OpenPlugins(void) {
        ret = SPU_open();
        if (ret < 0) { SysMessage(_("Error opening SPU plugin!")); return -1; }
        SPU_registerCallback(SPUirq);
+       SPU_registerScheduleCb(SPUschedule);
        // pcsx-rearmed: we handle gpu elsewhere
        //ret = GPU_open(&gpuDisp, "PCSX", NULL);
        //if (ret < 0) { SysMessage(_("Error opening GPU plugin!")); return -1; }
@@ -919,8 +933,11 @@ int OpenPlugins() {
 void ClosePlugins() {
        int ret;
 
+#ifndef NO_FRONTEND
        signal(SIGINT, SIG_DFL);
        signal(SIGPIPE, SIG_DFL);
+#endif
+
        ret = CDR_close();
        if (ret < 0) { SysMessage(_("Error closing CD-ROM plugin!")); return; }
        ret = SPU_close();