Cocoa Port (OpenEmu Plug-in):

- Fix crashing bug when initializing the plug-in.
- Update to the latest version of the OpenEmu SDK.

desmume/src/cocoa/DeSmuME_Prefix.pch

@@ -32,4 +32,5 @@
 	#define HAVE_JIT
 #endif
 
-#define PORT_VERSION	"Cocoa"
+#define PORT_VERSION	"Cocoa"
+#define PORT_VERSION_OS_X_APP

desmume/src/cocoa/cocoa_GPU.mm

@@ -714,6 +714,7 @@ void GPUEventHandlerOSX::DidFrameEnd(bool isFrameSkipped)
 {
 	this->FramebufferUnlock();
 	
+#if !defined(PORT_VERSION_OPENEMU)
 	if (!isFrameSkipped)
 	{
 		if (this->_mutexOutputList != NULL)
@@ -736,6 +737,7 @@ void GPUEventHandlerOSX::DidFrameEnd(bool isFrameSkipped)
 			pthread_mutex_unlock(this->_mutexOutputList);
 		}
 	}
+#endif
 }
 
 void GPUEventHandlerOSX::DidRender3DBegin()

desmume/src/cocoa/openemu/DeSmuME_Prefix_OpenEmu.pch

@@ -28,4 +28,5 @@
 	#define HAVE_JIT
 #endif
 
-#define PORT_VERSION	"OpenEmu"
+#define PORT_VERSION	"OpenEmu"
+#define PORT_VERSION_OPENEMU

desmume/src/cocoa/openemu/NDSGameCore.mm

@@ -73,22 +73,21 @@ volatile bool execute = true;
 	inputID[OENDSButtonLid]			= DSControllerState_Lid;
 	inputID[OENDSButtonDebug]		= DSControllerState_Debug;
 	
-	// Set up the DS controller
-	cdsController = [[[[CocoaDSController alloc] init] retain] autorelease];
-	[cdsController setMicMode:MICMODE_INTERNAL_NOISE];
-	
-	// Set up the DS GPU
-	cdsGPU = [[[[CocoaDSGPU alloc] init] retain] autorelease];
-	[cdsGPU setRwlockProducer:&rwlockCoreExecute];
-	[cdsGPU setRender3DThreads:0]; // Pass 0 to automatically set the number of rendering threads
-	[cdsGPU setRender3DRenderingEngine:CORE3DLIST_SWRASTERIZE];
-	
 	// Set up the emulation core
 	CommonSettings.advanced_timing = true;
 	CommonSettings.jit_max_block_size = 12;
 	CommonSettings.use_jit = true;
 	NDS_Init();
 	
+	// Set up the DS GPU
+	cdsGPU = [[[[CocoaDSGPU alloc] init] retain] autorelease];
+	[cdsGPU setRender3DThreads:0]; // Pass 0 to automatically set the number of rendering threads
+	[cdsGPU setRender3DRenderingEngine:CORE3DLIST_SWRASTERIZE];
+	
+	// Set up the DS controller
+	cdsController = [[[[CocoaDSController alloc] init] retain] autorelease];
+	[cdsController setMicMode:MICMODE_INTERNAL_NOISE];
+	
 	// Set up the cheat system
 	cdsCheats = [[[[CocoaDSCheatManager alloc] init] retain] autorelease];
 	[cdsCheats setRwlockCoreExecute:&rwlockCoreExecute];
@@ -181,9 +180,21 @@ volatile bool execute = true;
 	OSSpinLockUnlock(&spinlockDisplayMode);
 }
 
-#pragma mark -
+#pragma mark - Plug-in Support
 
-#pragma mark Execution
+- (BOOL)supportsRewinding
+{
+	return NO;
+}
+
+#pragma mark - Execution
+
+- (BOOL)rendersToOpenGL
+{
+	return NO;
+}
+
+#pragma mark - ABSTRACT METHODS
 
 - (void)resetEmulation
 {
@@ -247,12 +258,7 @@ volatile bool execute = true;
 	return isRomLoaded;
 }
 
-#pragma mark Video
+#pragma mark - Video
-
-- (BOOL)rendersToOpenGL
-{
-	return NO;
-}
 
 - (OEIntRect)screenRect
 {
@@ -324,7 +330,7 @@ volatile bool execute = true;
     }
 }
 
-#pragma mark Audio
+#pragma mark - Audio
 
 - (NSUInteger)audioBufferCount
 {
@@ -361,7 +367,7 @@ volatile bool execute = true;
 	return [self audioSampleRate];
 }
 
-#pragma mark Input
+#pragma mark - Input
 
 - (oneway void)didPushNDSButton:(OENDSButton)button forPlayer:(NSUInteger)player
 {
@@ -437,7 +443,7 @@ volatile bool execute = true;
 	//[self doesNotImplementSelector:_cmd];
 }
 
-#pragma mark Save State
+#pragma mark - Save State
 
 - (BOOL)saveStateToFileAtPath:(NSString *)fileName
 {
@@ -449,7 +455,7 @@ volatile bool execute = true;
 	return [CocoaDSFile loadState:[NSURL fileURLWithPath:fileName]];
 }
 
-#pragma mark Miscellaneous
+#pragma mark - Miscellaneous
 
 - (void)setCheat:(NSString *)code setType:(NSString *)type setEnabled:(BOOL)enabled
 {