xavi/pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@35429 e17a0e51-4ae3-4d35-97c3-1a29b211df97

Browse Source
This commit is contained in:
SND\weimingzhi_cp 2009-11-04 09:20:55 +00:00
parent b3f057b019
commit 51e9552e84
4 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -9,6 +9,7 @@ November 4, 2009 Wei Mingzhi <weimingzhi@gmail.com>
* macosx/English.lproj/PCSX.nib/objects.nib: Likewise.
* macosx/English.lproj/PCSX.nib/info.nib: Likewise.
* macosx/English.lproj/PCSX.nib/classes.nib: Likewise.
* macosx/main.m: Reload plugins at each time emulation starts.
November 3, 2009 Wei Mingzhi <weimingzhi@gmail.com>

2
macosx/Pcsx.xcodeproj/project.pbxproj
View File

@ -139,7 +139,7 @@
2BA44360052DB2EA00E21DDD /* PcsxPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxPlugin.h; sourceTree = "<group>"; };
2BA44361052DB2EA00E21DDD /* PcsxPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxPlugin.m; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
2BB3D6CF05427FE200831ACB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
2BB3D6D105427FE200831ACB /* PCSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PCSX.app; sourceTree = BUILT_PRODUCTS_DIR; };
2BB3D6D105427FE200831ACB /* PCSX.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = PCSX.app; sourceTree = BUILT_PRODUCTS_DIR; };
2BBB1126051DC00500B84448 /* PluginList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginList.h; sourceTree = "<group>"; };
2BBB1127051DC00500B84448 /* PluginList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PluginList.m; sourceTree = "<group>"; };
2BBB1787051E0D9700B84448 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = Credits.rtf; sourceTree = "<group>"; };

8
macosx/PcsxController.m
View File

@ -154,11 +154,11 @@ NSString *saveStatePath;
[menuItem setState:([EmuThread isPaused] ? NSOnState : NSOffState)];
}
if ([menuItem action] == @selector(pause:) || [menuItem action] == @selector(freeze:) ||
[menuItem action] == @selector(fullscreen:))
if ([menuItem action] == @selector(pause:) || [menuItem action] == @selector(fullscreen:))
return [EmuThread active];
if ([menuItem action] == @selector(reset:) || [menuItem action] == @selector(ejectCD:))
if ([menuItem action] == @selector(reset:) || [menuItem action] == @selector(ejectCD:) ||
[menuItem action] == @selector(freeze:))
return [EmuThread active] && ![EmuThread isRunBios];
if ([menuItem action] == @selector(runCD:) || [menuItem action] == @selector(runIso:) ||
@ -174,7 +174,7 @@ NSString *saveStatePath;
}
if ([menuItem action] == @selector(defrost:)) {
if (![EmuThread active])
if (![EmuThread active] || [EmuThread isRunBios])
return NO;
NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxstate", saveStatePath, CdromId, [menuItem tag]];

51
macosx/main.m
View File

@ -14,8 +14,7 @@
#include "psxcommon.h"
#include "sio.h"
int sysInited = 0;
static BOOL sysInited = NO;
//#define EMU_LOG
int main(int argc, const char *argv[])
@ -50,40 +49,35 @@ int main(int argc, const char *argv[])
}
int SysInit()
{
if (sysInited)
return 0;
int SysInit() {
if (!sysInited) {
#ifdef GTE_DUMP
gteLog = fopen("gteLog.txt","wb");
setvbuf(gteLog, NULL, _IONBF, 0);
gteLog = fopen("gteLog.txt","wb");
setvbuf(gteLog, NULL, _IONBF, 0);
#endif
#ifdef EMU_LOG
#ifndef LOG_STDOUT
emuLog = fopen("emuLog.txt","wb");
emuLog = fopen("emuLog.txt","wb");
#else
emuLog = stdout;
emuLog = stdout;
#endif
setvbuf(emuLog, NULL, _IONBF, 0);
setvbuf(emuLog, NULL, _IONBF, 0);
#endif
if (psxInit() != 0)
return -1;
while (LoadPlugins() == -1) {
if (psxInit() != 0)
return -1;
//CancelQuit = 1;
//ConfigurePlugins();
//CancelQuit = 0;
}
LoadMcds(Config.Mcd1, Config.Mcd2);
sysInited = 1;
return 0;
sysInited = YES;
}
if (LoadPlugins() == -1) {
return -1;
}
LoadMcds(Config.Mcd1, Config.Mcd2);
return 0;
}
void SysReset() {
@ -91,8 +85,7 @@ void SysReset() {
//psxReset();
}
void SysPrintf(char *fmt, ...)
{
void SysPrintf(char *fmt, ...) {
va_list list;
char msg[512];
@ -238,8 +231,8 @@ void SysClose() // Close mem and plugins
ReleasePlugins();
if (emuLog != NULL) fclose(emuLog);
sysInited = false;
sysInited = NO;
}
void OnFile_Exit()