Minor OS X changes.

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

10 files changed, 66 insertions, 60 deletions

diff --git a/macosx/ARCBridge.h b/macosx/ARCBridge.h
index ea274b84..7e722980 100644
--- a/macosx/ARCBridge.h
+++ b/macosx/ARCBridge.h
@@ -19,6 +19,8 @@
 #define AUTORELEASEOBJNORETURN(obj)
 #define BRIDGE(toType, obj) (__bridge toType)(obj)
 #define __arcweak __weak
+#define arcweak weak
+#define arcstrong strong
 
 #else
 
@@ -30,7 +32,11 @@
 #define AUTORELEASEOBJNORETURN(obj) [obj autorelease]
 #define BRIDGE(toType, obj) (toType)obj
 #define __arcweak
+#define arcweak assign
+#define arcstrong retain
 
 #endif
 
+#define arcretain arcstrong
+
 #endif
diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj
index 4712a3e6..69d2969d 100644
--- a/macosx/Pcsxr.xcodeproj/project.pbxproj
+++ b/macosx/Pcsxr.xcodeproj/project.pbxproj
@@ -431,7 +431,7 @@
 		2B976C00074C14B4007C050A /* Kernel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kernel.framework; path = /System/Library/Frameworks/Kernel.framework; sourceTree = "<absolute>"; };
 		2BA178A505148D9D0026D74D /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = main.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		2BA178B30514CE260026D74D /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = InfoPlist.strings; sourceTree = "<group>"; };
-		2BA44360052DB2EA00E21DDD /* PcsxrPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrPlugin.h; sourceTree = "<group>"; };
+		2BA44360052DB2EA00E21DDD /* PcsxrPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = PcsxrPlugin.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		2BA44361052DB2EA00E21DDD /* PcsxrPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PcsxrPlugin.m; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		2BB3D6CF05427FE200831ACB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		2BB3D6D105427FE200831ACB /* PCSXR.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PCSXR.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -546,7 +546,7 @@
 		551A754A17868BEC0052D185 /* Info-AL.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-AL.plist"; path = "../../Info-AL.plist"; sourceTree = "<group>"; };
 		551A754B17868BEC0052D185 /* Info-SDL.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-SDL.plist"; path = "../../Info-SDL.plist"; sourceTree = "<group>"; };
 		551A754E17868BEC0052D185 /* maccfg.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = maccfg.h; sourceTree = "<group>"; };
-		551A754F17868BEC0052D185 /* NamedSlider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NamedSlider.h; sourceTree = "<group>"; };
+		551A754F17868BEC0052D185 /* NamedSlider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = NamedSlider.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		551A755017868BEC0052D185 /* NamedSlider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NamedSlider.m; sourceTree = "<group>"; };
 		551A755117868BEC0052D185 /* PluginController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PluginController.h; sourceTree = "<group>"; };
 		551A755217868BEC0052D185 /* PluginController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PluginController.m; sourceTree = "<group>"; };
@@ -719,16 +719,16 @@
 		55A9021E147D7C380037E18F /* PcsxrMemCardController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrMemCardController.h; sourceTree = "<group>"; };
 		55A9021F147D7C380037E18F /* PcsxrMemCardController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxrMemCardController.m; sourceTree = "<group>"; };
 		55A90222147D7C7A0037E18F /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = MemCardManager.xib; sourceTree = "<group>"; };
-		55A90227147D89380037E18F /* PcsxrMemoryObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrMemoryObject.h; sourceTree = "<group>"; };
-		55A90228147D89380037E18F /* PcsxrMemoryObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxrMemoryObject.m; sourceTree = "<group>"; };
-		55BB3493169CD42500850200 /* ARCBridge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ARCBridge.h; sourceTree = "<group>"; };
+		55A90227147D89380037E18F /* PcsxrMemoryObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = PcsxrMemoryObject.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		55A90228147D89380037E18F /* PcsxrMemoryObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PcsxrMemoryObject.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+		55BB3493169CD42500850200 /* ARCBridge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = ARCBridge.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		55BBA690149454DE003B2CEC /* PcsxrFileHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrFileHandle.h; sourceTree = "<group>"; };
 		55BBA691149455E1003B2CEC /* PcsxrMemCardHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrMemCardHandler.h; sourceTree = "<group>"; };
 		55BBA692149455E1003B2CEC /* PcsxrMemCardHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxrMemCardHandler.m; sourceTree = "<group>"; };
 		55BBA69414945628003B2CEC /* PcsxrPluginHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrPluginHandler.h; sourceTree = "<group>"; };
 		55BBA69514945628003B2CEC /* PcsxrPluginHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxrPluginHandler.m; sourceTree = "<group>"; };
 		55BBA69714953887003B2CEC /* PcsxrDiscHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrDiscHandler.h; sourceTree = "<group>"; };
-		55BBA69814953887003B2CEC /* PcsxrDiscHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxrDiscHandler.m; sourceTree = "<group>"; };
+		55BBA69814953887003B2CEC /* PcsxrDiscHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PcsxrDiscHandler.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		55BBA69A14958399003B2CEC /* PcsxrFreezeStateHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrFreezeStateHandler.h; sourceTree = "<group>"; };
 		55BBA69B1495839A003B2CEC /* PcsxrFreezeStateHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxrFreezeStateHandler.m; sourceTree = "<group>"; };
 		55C7A215148B2B3800C22ABC /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PcsxrMemCardDocument.xib; sourceTree = "<group>"; };
@@ -749,7 +749,7 @@
 		71F4C5630FDED12800529849 /* cdrom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cdrom.h; sourceTree = "<group>"; };
 		71F4C5640FDED12800529849 /* cheat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cheat.c; sourceTree = "<group>"; };
 		71F4C5650FDED12800529849 /* cheat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cheat.h; sourceTree = "<group>"; };
-		71F4C5660FDED12800529849 /* coff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coff.h; sourceTree = "<group>"; };
+		71F4C5660FDED12800529849 /* coff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = coff.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		71F4C5670FDED12800529849 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
 		71F4C5680FDED12800529849 /* decode_xa.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = decode_xa.c; sourceTree = "<group>"; };
 		71F4C5690FDED12800529849 /* decode_xa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decode_xa.h; sourceTree = "<group>"; };
@@ -963,7 +963,6 @@
 			isa = PBXGroup;
 			children = (
 				2B143D00078A2CBD00AF745A /* icons */,
-				D422E66C16DC48D000526DCF /* CheatWindow.xib */,
 				02FE55E616765F9400205CF2 /* KeyNames.plist */,
 				2BBB1786051E0D9700B84448 /* Credits.rtf */,
 				28F0C3C4146521A700A90285 /* Configuration.xib */,
@@ -973,6 +972,7 @@
 				28F0C3CA146521B700A90285 /* AddPluginSheet.xib */,
 				55A90221147D7C7A0037E18F /* MemCardManager.xib */,
 				55C7A216148B2B3800C22ABC /* PcsxrMemCardDocument.xib */,
+				D422E66C16DC48D000526DCF /* CheatWindow.xib */,
 			);
 			name = Resources;
 			path = English.lproj;
diff --git a/macosx/PcsxrController.m b/macosx/PcsxrController.m
index 6fe9fa40..8795f944 100755
--- a/macosx/PcsxrController.m
+++ b/macosx/PcsxrController.m
@@ -44,7 +44,7 @@ void ShowHelpAndExit(FILE* output, int exitCode)
 @property (readwrite) BOOL endAtEmuClose;
 @property (readwrite) BOOL sleepInBackground;
 @property (readwrite) BOOL wasPausedBeforeBGSwitch;
-@property (retain) NSMutableArray *skipFiles;
+@property (arcstrong) NSMutableArray *skipFiles;
 @end
 
 @implementation PcsxrController
diff --git a/macosx/PcsxrDiscHandler.m b/macosx/PcsxrDiscHandler.m
index 1bf2bfe5..0420940c 100755
--- a/macosx/PcsxrDiscHandler.m
+++ b/macosx/PcsxrDiscHandler.m
@@ -13,9 +13,10 @@
 #include "cdrom.h"
 #import "RecentItemsMenu.h"
 #import "PcsxrController.h"
+#import "ARCBridge.h"
 
 @interface PcsxrDiscHandler ()
-@property (retain) NSURL *discURL;
+@property (arcstrong) NSURL *discURL;
 @end
 
 @implementation PcsxrDiscHandler
diff --git a/macosx/PcsxrMemCardController.m b/macosx/PcsxrMemCardController.m
index e7b194fc..d54cc590 100755
--- a/macosx/PcsxrMemCardController.m
+++ b/macosx/PcsxrMemCardController.m
@@ -199,8 +199,8 @@ static inline void CopyMemcardData(char *from, char *to, int srci, int dsti, cha
 	//[self setupValues];
 	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(memoryCardDidChangeNotification:) name:memChangeNotifier object:nil];
 
-	imageAnimateTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:2] interval:2.0/5.0 target:self selector:@selector(animateMemCards:) userInfo:nil repeats:YES];
-	[[NSRunLoop mainRunLoop] addTimer:imageAnimateTimer forMode:NSDefaultRunLoopMode];
+	imageAnimateTimer = [[NSTimer alloc] initWithFireDate:[NSDate date] interval:3.0/10.0 target:self selector:@selector(animateMemCards:) userInfo:nil repeats:YES];
+	[[NSRunLoop mainRunLoop] addTimer:imageAnimateTimer forMode:NSRunLoopCommonModes];
 }
 
 - (void)animateMemCards:(NSTimer*)theTimer
diff --git a/macosx/PcsxrMemoryObject.h b/macosx/PcsxrMemoryObject.h
index 985a64b3..92ae447f 100755
--- a/macosx/PcsxrMemoryObject.h
+++ b/macosx/PcsxrMemoryObject.h
@@ -8,6 +8,7 @@
 
 #import <Foundation/NSObject.h>
 #include "sio.h"
+#import "ARCBridge.h"
 
 @class NSImage;
 @class NSString;
@@ -21,7 +22,7 @@ extern NSString *const memoryAnimateTimerKey;
 	NSString *sjisName;
 	NSString *memName;
 	NSString *memID;
-	NSImage *memImage;
+	NSInteger memImageIndex;
 	NSArray *memImages;
 	BOOL notDeleted;
 	unsigned char memFlags;
@@ -30,11 +31,11 @@ extern NSString *const memoryAnimateTimerKey;
 
 - (id)initWithMcdBlock:(McdBlock *)infoBlock;
 
-@property (readonly, retain) NSString *englishName;
-@property (readonly, retain) NSString *sjisName;
-@property (readonly, retain) NSString *memName;
-@property (readonly, retain) NSString *memID;
-@property (readonly, retain) NSImage *memImage;
+@property (readonly, arcstrong) NSString *englishName;
+@property (readonly, arcstrong) NSString *sjisName;
+@property (readonly, arcstrong) NSString *memName;
+@property (readonly, arcstrong) NSString *memID;
+@property (readonly, unsafe_unretained, nonatomic) NSImage *memImage;
 @property (readonly) int memIconCount;
 @property (readonly, getter = isNotDeleted) BOOL notDeleted;
 @property (readonly) unsigned char memFlags;
diff --git a/macosx/PcsxrMemoryObject.m b/macosx/PcsxrMemoryObject.m
index 4d740b30..a9db8e03 100755
--- a/macosx/PcsxrMemoryObject.m
+++ b/macosx/PcsxrMemoryObject.m
@@ -17,15 +17,15 @@
 NSString *const memoryAnimateTimerKey = @"PCSXR Memory Card Image Animate";
 
 @interface PcsxrMemoryObject ()
-//Mangle the setters' names so that if someone tries to use them, they won't work
-@property (readwrite, retain, setter = setEngName:) NSString *englishName;
-@property (readwrite, retain, setter = setJapaneseName:) NSString *sjisName;
-@property (readwrite, retain, setter = setTheMemName:) NSString *memName;
-@property (readwrite, retain, setter = setTheMemId:) NSString *memID;
-@property (readwrite, retain, setter = setTheMemImage:) NSImage *memImage;
-@property (readwrite, getter = isNotDeleted, setter = setIsNotDeleted:) BOOL notDeleted;
-@property (readwrite, setter = setTheMemFlags:) unsigned char memFlags;
-@property (retain) NSArray *memImages;
+@property (readwrite, arcstrong) NSString *englishName;
+@property (readwrite, arcstrong) NSString *sjisName;
+@property (readwrite, arcstrong) NSString *memName;
+@property (readwrite, arcstrong) NSString *memID;
+@property (readwrite, getter = isNotDeleted) BOOL notDeleted;
+@property (readwrite) unsigned char memFlags;
+
+@property (readwrite, nonatomic) NSInteger memImageIndex;
+@property (arcstrong) NSArray *memImages;
 @end
 
 @implementation PcsxrMemoryObject
@@ -82,19 +82,21 @@ NSString *const memoryAnimateTimerKey = @"PCSXR Memory Card Image Animate";
 	if (self = [super init]) {
 		self.englishName = [NSString stringWithCString:infoBlock->Title encoding:NSASCIIStringEncoding];
 		self.sjisName = [NSString stringWithCString:infoBlock->sTitle encoding:NSShiftJISStringEncoding];
-		self.memImages = [PcsxrMemoryObject imagesFromMcd:infoBlock];
+		@autoreleasepool {
+			self.memImages = [PcsxrMemoryObject imagesFromMcd:infoBlock];
+		}
 		if ([memImages count] == 0) {
-			self.memImage = [PcsxrMemoryObject blankImage];
+			self.memImageIndex = -1;
 		} else if ([memImages count] == 1) {
-			self.memImage = [memImages objectAtIndex:0];
+			self.memImageIndex = 0;
 		} else {
-			self.memImage = [self.memImages objectAtIndex:0];
+			self.memImageIndex = 0;
 			[[NSNotificationCenter defaultCenter] addObserverForName:memoryAnimateTimerKey object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
-				NSInteger index = [memImages indexOfObject:memImage];
+				NSInteger index = memImageIndex;
 				if (++index >= [memImages count]) {
 					index = 0;
 				}
-				self.memImage = [memImages objectAtIndex:index];
+				self.memImageIndex = index;
 			}];
 		}
 		self.memName = [NSString stringWithCString:infoBlock->Name encoding:NSASCIIStringEncoding];
@@ -114,44 +116,38 @@ NSString *const memoryAnimateTimerKey = @"PCSXR Memory Card Image Animate";
 	return self;
 }
 
+#pragma mark - Property Synthesizers
 @synthesize englishName;
 @synthesize sjisName;
-@synthesize memImage;
-- (void)setTheMemImage:(NSImage *)theMemImage
+@synthesize memImageIndex;
+- (void)setMemImageIndex:(NSInteger)theMemImageIndex
 {
-	if (memImage == theMemImage) {
-		return;
-	}
-	//This is the only setter that is being watched AND changed.
-#if __has_feature(objc_arc)
-	[self willChangeValueForKey:@"memImage"];
-	memImage = theMemImage;
-	[self didChangeValueForKey:@"memImage"];
-#else
-	NSImage *tmpImage = memImage;
 	[self willChangeValueForKey:@"memImage"];
-	memImage = [theMemImage retain];
+	memImageIndex = theMemImageIndex;
 	[self didChangeValueForKey:@"memImage"];
-	[tmpImage release];
-#endif
-}
-- (NSImage*)memImage
-{
-	@synchronized(memImage)
-	{
-		return memImage;
-	}
 }
 
 @synthesize notDeleted;
 @synthesize memFlags;
 @synthesize memName;
 @synthesize memID;
+@synthesize memImages;
+
+#pragma mark Non-synthesize Properties
 - (int)memIconCount
 {
 	return [memImages count];
 }
-@synthesize memImages;
+
+- (NSImage*)memImage
+{
+	if (memImageIndex == -1) {
+		return [PcsxrMemoryObject blankImage];
+	}
+	return [memImages objectAtIndex:memImageIndex];
+}
+
+#pragma mark -
 
 - (void)dealloc
 {
diff --git a/macosx/PcsxrPlugin.h b/macosx/PcsxrPlugin.h
index 75764464..ca8ae625 100755
--- a/macosx/PcsxrPlugin.h
+++ b/macosx/PcsxrPlugin.h
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "ARCBridge.h"
 
 @interface PcsxrPlugin : NSObject {
 	void *pluginRef;
@@ -21,7 +22,7 @@
 }
 
 @property (readonly, copy) NSString *path;
-@property (readonly, retain) NSString *name;
+@property (readonly, arcstrong) NSString *name;
 
 + (NSString *)prefixForType:(int)type;
 + (NSString *)defaultKeyForType:(int)type;
diff --git a/macosx/PcsxrPlugin.m b/macosx/PcsxrPlugin.m
index 6b715a3b..d8ec9a4c 100755
--- a/macosx/PcsxrPlugin.m
+++ b/macosx/PcsxrPlugin.m
@@ -18,9 +18,9 @@
 
 @interface PcsxrPlugin ()
 @property (readwrite, copy) NSString *path;
-@property (readwrite, retain) NSDate *modDate;
-@property (readwrite, retain) NSString *name;
-@property (readwrite, retain) NSString *fullPlugPath;
+@property (readwrite, arcstrong) NSDate *modDate;
+@property (readwrite, arcstrong) NSString *name;
+@property (readwrite, arcstrong) NSString *fullPlugPath;
 @end
 
 @implementation PcsxrPlugin
diff --git a/macosx/plugins/DFSound/macsrc/NamedSlider.h b/macosx/plugins/DFSound/macsrc/NamedSlider.h
index 1dcfe3a3..0494b83e 100755
--- a/macosx/plugins/DFSound/macsrc/NamedSlider.h
+++ b/macosx/plugins/DFSound/macsrc/NamedSlider.h
@@ -1,6 +1,7 @@
 /* NetSfPeopsSPUPluginNamedSlider */
 
 #import <Cocoa/Cocoa.h>
+#import "ARCBridge.h"
 
 @interface NamedSlider : NSSlider
 {