diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-11-16 21:05:39 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-11-16 21:05:39 +0000 |
| commit | 759e29705c38cc58880dc892da2c28e8a84c2fac (patch) | |
| tree | fe332d151b01fe7f85d756ca6cf6c9303be44e82 /macosx/Pcsxr-QL | |
| parent | eded81ac8a46a6948a18bea53bb9388f519c052b (diff) | |
| download | pcsxr-759e29705c38cc58880dc892da2c28e8a84c2fac.tar.gz | |
OS X: Re-work PcsxrMemoryObject to make the properties more readable.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@92297 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/Pcsxr-QL')
| -rw-r--r-- | macosx/Pcsxr-QL/GeneratePreviewForURL.m | 8 | ||||
| -rw-r--r-- | macosx/Pcsxr-QL/GenerateThumbnailForURL.m | 2 | ||||
| -rw-r--r-- | macosx/Pcsxr-QL/PSXMemEnumerator.m | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/macosx/Pcsxr-QL/GeneratePreviewForURL.m b/macosx/Pcsxr-QL/GeneratePreviewForURL.m index e5fe49a0..7076b380 100644 --- a/macosx/Pcsxr-QL/GeneratePreviewForURL.m +++ b/macosx/Pcsxr-QL/GeneratePreviewForURL.m @@ -102,11 +102,11 @@ static OSStatus GeneratePreviewForMemCard(void *thisInterface, QLPreviewRequestR NSDictionary *gifPrep = @{(NSString *) kCGImagePropertyGIFDictionary: @{(NSString *) kCGImagePropertyGIFDelayTime: @0.30f}}; for (PcsxrMemoryObject *obj in memCards) { - if (!obj.hasImages || obj.memIconCount == 1) { + if (!obj.hasImages || obj.iconCount == 1) { NSMutableData *pngData = [[NSMutableData alloc] init]; { CGImageDestinationRef dst = CGImageDestinationCreateWithData((__bridge CFMutableDataRef)pngData, kUTTypePNG, 1, NULL); - NSImage *theImage = [obj firstMemImage]; + NSImage *theImage = [obj firstImage]; CGImageRef imageRef = [theImage CGImageForProposedRect:NULL context:nil hints:nil]; CGImageDestinationAddImage(dst, imageRef, NULL); @@ -124,8 +124,8 @@ static OSStatus GeneratePreviewForMemCard(void *thisInterface, QLPreviewRequestR } NSMutableData *gifData = [[NSMutableData alloc] init]; - CGImageDestinationRef dst = CGImageDestinationCreateWithData((__bridge CFMutableDataRef)gifData, kUTTypeGIF, obj.memIconCount, NULL); - for (NSImage *theImage in obj.memoryCardImages) { + CGImageDestinationRef dst = CGImageDestinationCreateWithData((__bridge CFMutableDataRef)gifData, kUTTypeGIF, obj.iconCount, NULL); + for (NSImage *theImage in obj.imageArray) { CGImageRef imageRef = [theImage CGImageForProposedRect:NULL context:nil hints:nil]; CGImageDestinationAddImage(dst, imageRef, (__bridge CFDictionaryRef)(gifPrep)); } diff --git a/macosx/Pcsxr-QL/GenerateThumbnailForURL.m b/macosx/Pcsxr-QL/GenerateThumbnailForURL.m index 077980a6..2925ddf3 100644 --- a/macosx/Pcsxr-QL/GenerateThumbnailForURL.m +++ b/macosx/Pcsxr-QL/GenerateThumbnailForURL.m @@ -100,7 +100,7 @@ static NSImage *MemoryImageAtIndex(NSArray *memArray, NSInteger my) for (PcsxrMemoryObject *obj in memArray) { NSIndexSet *idxSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(i, obj.blockSize)]; if ([idxSet containsIndex:my]) { - return obj.firstMemImage; + return obj.firstImage; } i += obj.blockSize; } diff --git a/macosx/Pcsxr-QL/PSXMemEnumerator.m b/macosx/Pcsxr-QL/PSXMemEnumerator.m index 4aa78c33..b5545da2 100644 --- a/macosx/Pcsxr-QL/PSXMemEnumerator.m +++ b/macosx/Pcsxr-QL/PSXMemEnumerator.m @@ -103,7 +103,7 @@ static void GetSoloBlockInfo(unsigned char *data, int block, McdBlock *Info) strlcpy(Info->Name, ptr, 16); } -static inline PCSXRMemFlags MemBlockFlag(unsigned char blockFlags) +static inline PCSXRMemFlag MemBlockFlag(unsigned char blockFlags) { if ((blockFlags & 0xF0) == 0xA0) { if ((blockFlags & 0xF) >= 1 && (blockFlags & 0xF) <= 3) |