spu: add a schedule callback

[pcsx_rearmed.git] / frontend / main.c

diff --git a/frontend/main.c b/frontend/main.c
index 0f0e641..acebaae 100644 (file)
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -50,7 +50,7 @@ extern int iUseInterpolation;
 extern int iXAPitch;
 extern int iVolume;
 
-int ready_to_go, g_resetting;
+int ready_to_go, g_emu_want_quit, g_emu_resetting;
 unsigned long gpuDisp;
 char cfgfile_basename[MAXPATHLEN];
 int state_slot;
@@ -251,7 +251,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 +406,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));
@@ -437,6 +448,12 @@ int emu_core_init(void)
        return 0;
 }
 
+void emu_core_ask_exit(void)
+{
+       stop = 1;
+       g_emu_want_quit = 1;
+}
+
 #ifndef NO_FRONTEND
 static void create_profile_dir(const char *directory) {
        char path[MAXPATHLEN];
@@ -622,7 +639,7 @@ int main(int argc, char *argv[])
 
        pl_start_watchdog();
 
-       while (1)
+       while (!g_emu_want_quit)
        {
                stop = 0;
                emu_action = SACTION_NONE;
@@ -632,6 +649,12 @@ int main(int argc, char *argv[])
                        do_emu_action();
        }
 
+       printf("Exit..\n");
+       ClosePlugins();
+       SysClose();
+       menu_finish();
+       plat_finish();
+
        return 0;
 }
 
@@ -668,6 +691,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() {
@@ -684,7 +713,7 @@ void SysReset() {
        // so we need to prevent updateLace() call..
        void *real_lace = GPU_updateLace;
        GPU_updateLace = dummy_lace;
-       g_resetting = 1;
+       g_emu_resetting = 1;
 
        // reset can run code, timing must be set
        pl_timing_prepare(Config.PsxType);
@@ -695,7 +724,7 @@ void SysReset() {
        CDR_stop();
 
        GPU_updateLace = real_lace;
-       g_resetting = 0;
+       g_emu_resetting = 0;
 }
 
 void SysClose() {
@@ -704,22 +733,15 @@ void SysClose() {
 
        StopDebugger();
 
-       if (emuLog != NULL) fclose(emuLog);
+       if (emuLog != NULL && emuLog != stdout && emuLog != stderr) {
+               fclose(emuLog);
+               emuLog = NULL;
+       }
 }
 
 void SysUpdate() {
 }
 
-void OnFile_Exit() {
-       printf("OnFile_Exit\n");
-       SysClose();
-#ifndef NO_FRONTEND
-       menu_finish();
-       plat_finish();
-       exit(0);
-#endif
-}
-
 int get_state_filename(char *buf, int size, int i) {
        return get_gameid_filename(buf, size,
                "." STATES_DIR "%.32s-%.9s.%3.3d", i);
@@ -777,6 +799,7 @@ void SysPrintf(const char *fmt, ...) {
        va_start(list, fmt);
        vfprintf(emuLog, fmt, list);
        va_end(list);
+       fflush(emuLog);
 }
 
 #else
@@ -808,11 +831,6 @@ void SysMessage(const char *fmt, ...) {
        SysPrintf("%s\n", msg);
 }
 
-static void SignalExit(int sig) {
-       ClosePlugins();
-       OnFile_Exit();
-}
-
 #define PARSEPATH(dst, src) \
        ptr = src + strlen(src); \
        while (*ptr != '\\' && ptr != src) ptr--; \
@@ -823,8 +841,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);
 
@@ -833,6 +853,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; }
@@ -915,8 +936,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();