summaryrefslogtreecommitdiff
path: root/macosx/main.m
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-01-09 01:50:38 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-01-09 01:50:38 +0000
commit9af085242bda9ad4da78ef23e9d4ed180aa2c629 (patch)
treec776a5dfefbe475936a461b54d469d244df9de75 /macosx/main.m
parentc5b4bf6974fbfd05b6e75c494d11569756034e36 (diff)
downloadpcsxr-9af085242bda9ad4da78ef23e9d4ed180aa2c629.tar.gz
Use ARC in 64-bit mode on the Mac.
Register when we drag a disc image (or double click) to Pcsxr in the recent menu. Comment out ReleasePlugins() in SysClose: it was causing a pointer to be released twice when you changed a plug-in (specifically, the GPU). Cleaning up the Recent items code. One notable case is only releasing objects we have ownership of (this is pointless in ARC, but necessary in 32-bit code). Had to rewrite -[PluginList setActivePlugin:forType:] because the previous version wasn't ARC-friendly. If we select a disc while the emulator is running, load the disc into the current session. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@82136 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/main.m')
-rwxr-xr-xmacosx/main.m7
1 files changed, 4 insertions, 3 deletions
diff --git a/macosx/main.m b/macosx/main.m
index 2508b21e..aeac823a 100755
--- a/macosx/main.m
+++ b/macosx/main.m
@@ -13,8 +13,9 @@
#import <unistd.h>
#include "psxcommon.h"
#include "sio.h"
-#import <IOKit/pwr_mgt/IOPMLib.h>
+#include <IOKit/pwr_mgt/IOPMLib.h>
#import "hotkeys.h"
+#import "ARCBridge.h"
static BOOL sysInited = NO;
//#define EMU_LOG
@@ -116,7 +117,7 @@ void SysMessage(const char *fmt, ...) {
NSDictionary *userInfo = [NSDictionary dictionaryWithObject:msg forKey:NSLocalizedFailureReasonErrorKey];
[NSApp presentError:[NSError errorWithDomain:@"Unknown Domain" code:-1 userInfo:userInfo]];
- [msg release];
+ RELEASEOBJ(msg);
}
void *SysLoadLibrary(const char *lib) {
@@ -157,7 +158,7 @@ void SysRunGui() {
// Close mem and plugins
void SysClose() {
EmuShutdown();
- ReleasePlugins();
+ //ReleasePlugins();
if (powerAssertion != kIOPMNullAssertionID) {
IOPMAssertionRelease(powerAssertion);