From 18a5907a1e6745a80a584a9bae458cd3b34685a6 Mon Sep 17 00:00:00 2001
From: rogerman <rogerman@users.sf.net>
Date: Sat, 3 Mar 2012 21:18:27 +0000
Subject: [PATCH] Cocoa OpenEmu Plug-in: - Update method names to match the
 newest revision of the OEGameCore API. - Return audioBufferCount==0 since
 we're using DeSmuME's sound handling code for now. - Change the 3D rendering
 core to the null core on dealloc.

---
 desmume/src/cocoa/openemu/NDSGameCore.mm | 46 +++++++++---------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/desmume/src/cocoa/openemu/NDSGameCore.mm b/desmume/src/cocoa/openemu/NDSGameCore.mm
index 04d090e8f..d603126a8 100644
--- a/desmume/src/cocoa/openemu/NDSGameCore.mm
+++ b/desmume/src/cocoa/openemu/NDSGameCore.mm
@@ -95,7 +95,7 @@
 	free(input);
 	
 	SPU_ChangeSoundCore(SNDCORE_DUMMY, 0);
-	NDS_3D_ChangeCore(CORE3DLIST_SWRASTERIZE);
+	NDS_3D_ChangeCore(CORE3DLIST_NULL);
 	[CocoaDSCore shutdownCore];
 	
 	self.firmware = nil;
@@ -185,11 +185,17 @@
 	return GL_RGB5_A1;
 }
 
+- (NSTimeInterval)frameInterval
+{
+    return DS_FRAMES_PER_SECOND;
+}
+
 #pragma mark Audio
 
-- (NSUInteger)soundBufferCount
+- (NSUInteger)audioBufferCount
 {
-	return 1;
+	//return 1;
+	return 0;
 }
 
 - (void)getAudioBuffer:(void *)buffer frameCount:(NSUInteger)frameCount bufferIndex:(NSUInteger)index
@@ -201,7 +207,7 @@
 	
 	//if (openEmuSoundInterfaceBuffer != NULL)
 	//{
-	//	openEmuSoundInterfaceBuffer->read(buffer, frameCount * SPU_BUFFER_BYTES);
+	//	openEmuSoundInterfaceBuffer->read(buffer, frameCount * SPU_SAMPLE_SIZE);
 	//}
 }
 
@@ -211,24 +217,10 @@
 	return 0;
 }
 
-- (NSUInteger)frameSampleCount
-{
-	//static NSUInteger count = (NSUInteger)(SPU_SAMPLE_RATE / DS_FRAMES_PER_SECOND) + 1;
-	static NSUInteger count = 0;
-	
-	return count;
-}
-
-- (NSUInteger)soundBufferSize
-{
-	//return SPU_BUFFER_BYTES;
-	return 0;
-}
-
-- (NSUInteger)frameSampleRate
+- (double)audioSampleRate
 {
 	//return SPU_SAMPLE_RATE;
-	return 0;
+	return 0.0;
 }
 
 - (NSUInteger)channelCountForBuffer:(NSUInteger)buffer
@@ -236,19 +228,15 @@
     return [self channelCount];
 }
 
-- (NSUInteger)frameSampleCountForBuffer:(NSUInteger)buffer
+- (NSUInteger)audioBufferSizeForBuffer:(NSUInteger)buffer
 {
-    return [self frameSampleCount];
+	//return (SPU_BUFFER_BYTES * 2);
+	return 0;
 }
 
-- (NSUInteger)soundBufferSizeForBuffer:(NSUInteger)buffer
+- (double)audioSampleRateForBuffer:(NSUInteger)buffer
 {
-    return [self soundBufferSize];
-}
-
-- (NSUInteger)frameSampleRateForBuffer:(NSUInteger)buffer
-{
-    return [self frameSampleRate];
+    return [self audioSampleRate];
 }