From b96092d6fbde83d1e3036a6591b0bed356526733 Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Mon, 8 Sep 2014 14:27:51 +0000 Subject: OS X: Have the memory card images be represented as gif files. This makes it less of a chore handling the animation, as the OS will do it automatically for us now. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@91357 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- macosx/Source/PcsxrMemoryObject.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'macosx/Source/PcsxrMemoryObject.h') diff --git a/macosx/Source/PcsxrMemoryObject.h b/macosx/Source/PcsxrMemoryObject.h index 9ae756b2..39b44be5 100644 --- a/macosx/Source/PcsxrMemoryObject.h +++ b/macosx/Source/PcsxrMemoryObject.h @@ -9,8 +9,6 @@ #import #include "sio.h" -extern NSString *const memoryAnimateTimerKey; - typedef NS_ENUM(char, PCSXRMemFlags) { memFlagDeleted, memFlagFree, @@ -35,13 +33,13 @@ typedef NS_ENUM(char, PCSXRMemFlags) { @property (readonly, strong) NSString *memName; @property (readonly, strong) NSString *memID; @property (readonly, strong) NSArray *memoryCardImages; -@property (readonly, nonatomic) NSInteger memImageIndex; +@property (readonly, strong, nonatomic) NSImage *memImage; @property (readonly) PCSXRMemFlags flagNameIndex; @property (readonly) uint8_t startingIndex; @property (readonly) uint8_t blockSize; +@property (readonly) BOOL hasImages; @property (readonly, copy) NSImage *firstMemImage; -@property (readonly, unsafe_unretained, nonatomic) NSImage *memImage; @property (readonly, nonatomic) NSUInteger memIconCount; @property (readonly, unsafe_unretained, nonatomic) NSString *flagName; @property (readonly, unsafe_unretained, nonatomic) NSAttributedString *attributedFlagName; -- cgit v1.2.3