diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-08 01:16:38 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-08 01:16:38 +0000 |
| commit | 4d39defcb59600513ff65a688c54f3d6b13ca63a (patch) | |
| tree | c1b89b128f8c7f53a277a8cac28979d02357d083 /macosx | |
| parent | aaaf3199b1afd1e5f88f23ce40305a5df5455599 (diff) | |
| download | pcsxr-4d39defcb59600513ff65a688c54f3d6b13ca63a.tar.gz | |
more cleanups.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47580 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/EmuThread.m | 4 | ||||
| -rw-r--r-- | macosx/main.m | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/macosx/EmuThread.m b/macosx/EmuThread.m index 9eba8649..941d77da 100644 --- a/macosx/EmuThread.m +++ b/macosx/EmuThread.m @@ -56,7 +56,7 @@ static pthread_mutex_t eventMutex; setjmp(restartJmp); - psxReset(); + EmuReset(); int res = CheckCdrom(); if (res == -1) { @@ -104,7 +104,7 @@ done: if (OpenPlugins() == -1) goto done; - psxReset(); + EmuReset(); psxCpu->Execute(); diff --git a/macosx/main.m b/macosx/main.m index e6bb6019..e9f77b9f 100644 --- a/macosx/main.m +++ b/macosx/main.m @@ -59,7 +59,7 @@ int SysInit() { setvbuf(emuLog, NULL, _IONBF, 0); #endif - if (psxInit() != 0) + if (EmuInit() != 0) return -1; sysInited = YES; @@ -76,7 +76,7 @@ int SysInit() { void SysReset() { [EmuThread resetNow]; - //psxReset(); + //EmuReset(); } void SysPrintf(char *fmt, ...) { @@ -221,7 +221,7 @@ void SysRunGui() // Returns to the Gui } void SysClose() // Close mem and plugins { - psxShutdown(); + EmuShutdown(); ReleasePlugins(); if (emuLog != NULL) fclose(emuLog); |