diff options
| author | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-30 15:46:36 +0000 |
|---|---|---|
| committer | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-30 15:46:36 +0000 |
| commit | ca4066b2fb81c66a1a478b3c24ef463b6107cefe (patch) | |
| tree | 1a4e07bd56189bd8a7dd24067c8a918914b114bb /macosx/Plugin.c | |
| parent | 85ba8b161a5974b78de6876faf81389b3064d812 (diff) | |
| download | pcsxr-ca4066b2fb81c66a1a478b3c24ef463b6107cefe.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72730 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/Plugin.c')
| -rw-r--r-- | macosx/Plugin.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/macosx/Plugin.c b/macosx/Plugin.c index 9d1a8d0e..ff5b1c88 100644 --- a/macosx/Plugin.c +++ b/macosx/Plugin.c @@ -80,7 +80,6 @@ int _OpenPlugins() { SPU_registerCallback(SPUirq); ret = GPU_open(&gpuDisp, "PCSXR", NULL); if (ret < 0) { SysMessage(_("Error Opening GPU Plugin")); return -1; } - GPU_registerCallback(GPUbusy); ret = PAD1_open(&gpuDisp); if (ret < 0) { SysMessage(_("Error Opening PAD1 Plugin")); return -1; } PAD1_registerVibration(GPU_visualVibration); @@ -93,7 +92,7 @@ int _OpenPlugins() { if (Config.UseNet && !NetOpened) { netInfo info; char path[MAXPATHLEN]; - + strcpy(info.EmuName, "PCSX " PACKAGE_VERSION); strncpy(info.CdromID, CdromId, 9); strncpy(info.CdromLabel, CdromLabel, 9); @@ -113,19 +112,19 @@ int _OpenPlugins() { sprintf(path, "%s%s", Config.PluginsDir, Config.Cdr); strcpy(info.CDRpath, path); NET_setInfo(&info); - + ret = NET_open(&gpuDisp); if (ret < 0) { if (ret == -2) { // -2 is returned when something in the info // changed and needs to be synced char *ptr; - + PARSEPATH(Config.Bios, info.BIOSpath); PARSEPATH(Config.Gpu, info.GPUpath); PARSEPATH(Config.Spu, info.SPUpath); PARSEPATH(Config.Cdr, info.CDRpath); - + strcpy(Config.Mcd1, info.MCD1path); strcpy(Config.Mcd2, info.MCD2path); return -2; @@ -133,19 +132,19 @@ int _OpenPlugins() { Config.UseNet = FALSE; } } else { - + if (NET_queryPlayer() == 1) { if (SendPcsxInfo() == -1) Config.UseNet = FALSE; } else { if (RecvPcsxInfo() == -1) Config.UseNet = FALSE; } - + } NetOpened = TRUE; } else if (Config.UseNet) { NET_resume(); } - + return 0; } @@ -190,7 +189,7 @@ void ResetPlugins() { PAD1_shutdown(); PAD2_shutdown(); if (Config.UseNet) NET_shutdown(); - + ret = CDR_init(); if (ret < 0) { SysMessage(_("CDRinit error: %d"), ret); return; } ret = GPU_init(); @@ -208,4 +207,3 @@ void ResetPlugins() { NetOpened = FALSE; } - |