DeSmuME

Revision: 4423
          http://desmume.svn.sourceforge.net/desmume/?rev=4423&view=rev
Author:   rogerman
Date:     2012-12-08 01:10:33 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
Cocoa Port:
- Allow the OpenGL 3D renderer to render in HW (allow for SW fallback).
- Remove the depth buffer from the display output context (doesn't need it and never will need it).

Modified Paths:
--------------
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
    trunk/desmume/src/cocoa/userinterface/displayView.mm

Modified: trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
===================================================================
--- trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib	2012-12-08 01:05:13 UTC (rev 4422)
+++ trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib	2012-12-08 01:10:33 UTC (rev 4423)
@@ -5112,7 +5112,7 @@
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<string key="NSWindowContentMinSize">{256, 408}</string>
 				<object class="NSView" key="NSWindowView" id="439893737">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -5122,10 +5122,11 @@
 							<object class="NSPSMatrix" key="NSDrawMatrix"/>
 							<string key="NSFrame">{{0, 24}, {256, 384}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<bool key="NSViewCanDrawConcurrently">YES</bool>
 							<object class="NSOpenGLPixelFormat" key="NSPixelFormat">
 								<object class="NSMutableData" key="NSPixelAttributes">
-									<bytes key="NS.bytes">AAAABQAAAAgAAAAPAAAACwAAAAEAAAAMAAAAEAAAAAA</bytes>
+									<bytes key="NS.bytes">AAAABQAAAAgAAAAYAAAACwAAAAgAAAAAA</bytes>
 								</object>
 							</object>
 						</object>
@@ -5135,6 +5136,7 @@
 							<object class="NSPSMatrix" key="NSDrawMatrix"/>
 							<string key="NSFrame">{{2, 3}, {16, 16}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<int key="NSpiFlags">28938</int>
 							<double key="NSMaxValue">100</double>
 						</object>
@@ -5143,6 +5145,7 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{180, 3}, {56, 15}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSSliderCell" key="NSCell" id="918619685">
 								<int key="NSCellFlags">-2079981824</int>
@@ -5176,6 +5179,7 @@
 							</object>
 							<string key="NSFrame">{{160, 1}, {20, 20}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSImageCell" key="NSCell" id="58250235">
 								<int key="NSCellFlags">130560</int>
@@ -5196,6 +5200,7 @@
 							<int key="NSvFlags">294</int>
 							<string key="NSFrame">{{17, 5}, {137, 14}}</string>
 							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="60380140">
 								<int key="NSCellFlags">68288064</int>
@@ -5214,6 +5219,8 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{256, 408}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{256, 476}</string>
@@ -16821,7 +16828,7 @@
 										<object class="NSButton" id="59471532">
 											<reference key="NSNextResponder" ref="887816052"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{16, 32}, {113, 18}}</string>
+											<string key="NSFrame">{{15, 32}, {113, 18}}</string>
 											<reference key="NSSuperview" ref="887816052"/>
 											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>

Modified: trunk/desmume/src/cocoa/userinterface/displayView.mm
===================================================================
--- trunk/desmume/src/cocoa/userinterface/displayView.mm	2012-12-08 01:05:13 UTC (rev 4422)
+++ trunk/desmume/src/cocoa/userinterface/displayView.mm	2012-12-08 01:10:33 UTC (rev 4423)
@@ -78,6 +78,7 @@
 	spinlockDisplayOrder = OS_SPINLOCK_INIT;
 	
 	normalSize = NSMakeSize(GPU_DISPLAY_WIDTH, GPU_DISPLAY_HEIGHT * 2.0);
+	comboScreenGap = (normalSize.height/2.0) * DS_DISPLAY_VERTICAL_GAP_TO_HEIGHT_RATIO;
 	sendPortDisplay = nil;
 	cdsController = nil;
 	isHudEnabled = NO;
@@ -135,6 +136,28 @@
 	return theSize;
 }
 
+- (NSSize) normalSizeWithGap
+{
+	OSSpinLockLock(&spinlockNormalSize);
+	NSSize theSize = normalSize;
+	OSSpinLockUnlock(&spinlockNormalSize);
+	
+	NSInteger theType = [self displayType];
+	if (theType == DS_DISPLAY_TYPE_COMBO)
+	{
+		if ([self displayOrientation] == DS_DISPLAY_ORIENTATION_VERTICAL)
+		{
+			theSize.height += (theSize.height/2.0) * DS_DISPLAY_VERTICAL_GAP_TO_HEIGHT_RATIO;
+		}
+		else
+		{
+			theSize.width += (theSize.width/2.0) * DS_DISPLAY_VERTICAL_GAP_TO_HEIGHT_RATIO;
+		}
+	}
+	
+	return theSize;
+}
+
 - (void) setGpuStateFlags:(UInt32)flags
 {
 	OSSpinLockLock(&spinlockGpuStateFlags);
@@ -413,9 +436,9 @@
 		viewAngle = CLOCKWISE_DEGREES(viewAngle);
 	}
 	
-	NSPoint touchLoc = GetNormalPointFromTransformedPoint(clickLoc, self.normalSize, [[self view] bounds].size, [self scale], viewAngle);
+	NSPoint touchLoc = GetNormalPointFromTransformedPoint(clickLoc, [self normalSizeWithGap], [[self view] bounds].size, [self scale], viewAngle);
 	
-	// Normalize the y-coordinate to the DS.
+	// Normalize the touch location to the DS.
 	if ([self displayType] == DS_DISPLAY_TYPE_COMBO)
 	{
 		NSInteger theOrientation = [self displayOrientation];
@@ -423,11 +446,11 @@
 		
 		if (theOrientation == DS_DISPLAY_ORIENTATION_VERTICAL && theOrder == DS_DISPLAY_ORDER_TOUCH_FIRST)
 		{
-			touchLoc.y -= GPU_DISPLAY_HEIGHT;
+			touchLoc.y -= GPU_DISPLAY_HEIGHT /* + transformedGap */;
 		}
 		else if (theOrientation == DS_DISPLAY_ORIENTATION_HORIZONTAL && theOrder == DS_DISPLAY_ORDER_MAIN_FIRST)
 		{
-			touchLoc.x -= GPU_DISPLAY_WIDTH;
+			touchLoc.x -= GPU_DISPLAY_WIDTH /* + transformedGap */;
 		}
 	}
 	
@@ -924,11 +947,19 @@
 		NSOpenGLPFAAlphaSize, (NSOpenGLPixelFormatAttribute)8,
 		NSOpenGLPFADepthSize, (NSOpenGLPixelFormatAttribute)24,
 		NSOpenGLPFAStencilSize, (NSOpenGLPixelFormatAttribute)8,
-		NSOpenGLPFAOffScreen,
+		NSOpenGLPFAAccelerated,
 		(NSOpenGLPixelFormatAttribute)0
 	};
 	
 	NSOpenGLPixelFormat *tempPixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs];
+	if (tempPixelFormat == nil)
+	{
+		// Remove the HW rendering requirement and try again. Note that this will
+		// result in SW rendering, which will cause a substantial speed hit.
+		attrs[8] = (NSOpenGLPixelFormatAttribute)0;
+		tempPixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs];
+	}
+	
 	NSOpenGLPixelBuffer *tempPixelBuffer = [[NSOpenGLPixelBuffer alloc]
 											initWithTextureTarget:GL_TEXTURE_2D
 											textureInternalFormat:GL_RGBA
@@ -987,7 +1018,7 @@
 	CGLSetCurrentContext(cglDisplayContext);
 	
 	glViewport(0, 0, rect.size.width, rect.size.height);
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+	glClear(GL_COLOR_BUFFER_BIT);
 	
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
@@ -1019,7 +1050,7 @@
 	
 	glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 	glClearDepth(1.0f);
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+	glClear(GL_COLOR_BUFFER_BIT);
 	
 	// Set up initial display vertices and store in VBO
 	static const GLint vertices[8*2] =	{-GPU_DISPLAY_WIDTH/2, GPU_DISPLAY_HEIGHT,		// Top display, top left
@@ -1123,7 +1154,7 @@
 	GLfloat angleDegrees = (GLfloat)CLOCKWISE_DEGREES([dispViewDelegate rotation]);
 	GLfloat s = (GLfloat)[dispViewDelegate scale];
 	
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+	glClear(GL_COLOR_BUFFER_BIT);
 	
 	glBindBuffer(GL_ARRAY_BUFFER, vboTexCoordID);
 	glTexCoordPointer(2, GL_FLOAT, 0, 0);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4447
          http://desmume.svn.sourceforge.net/desmume/?rev=4447&view=rev
Author:   rogerman
Date:     2012-12-28 03:36:57 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
Cocoa Port:
- Add new static method to run a video filter without needed to instantiate a new video filter object.
- When changing filters, do not reinitialize the destination buffers if the video filter ID is the same.
- Do some other cleanup of the video filter code.
- Add new HQ4XS video filter.

Modified Paths:
--------------
    trunk/desmume/src/cocoa/cocoa_videofilter.h
    trunk/desmume/src/cocoa/cocoa_videofilter.mm
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.strings
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
    trunk/desmume/src/cocoa/videofilter.cpp
    trunk/desmume/src/cocoa/videofilter.h

Modified: trunk/desmume/src/cocoa/cocoa_videofilter.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_videofilter.h	2012-12-28 03:25:20 UTC (rev 4446)
+++ trunk/desmume/src/cocoa/cocoa_videofilter.h	2012-12-28 03:36:57 UTC (rev 4447)
@@ -31,6 +31,7 @@
 @interface CocoaVideoFilter : NSObject
 {
 	VideoFilter *vf;
+	VideoFilterTypeID currentFilterType;
 }
 
 - (id) initWithSize:(NSSize)theSize;

Modified: trunk/desmume/src/cocoa/cocoa_videofilter.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_videofilter.mm	2012-12-28 03:25:20 UTC (rev 4446)
+++ trunk/desmume/src/cocoa/cocoa_videofilter.mm	2012-12-28 03:36:57 UTC (rev 4447)
@@ -46,6 +46,7 @@
 	}
 	
 	vf = new VideoFilter((unsigned int)theSize.width, (unsigned int)theSize.height, typeID, numThreads);
+	currentFilterType = typeID;
 	
 	return self;
 }
@@ -73,11 +74,19 @@
 {
 	BOOL result = NO;
 	
-	bool cResult = vf->ChangeFilter(typeID);
-	if (cResult)
+	if (typeID == currentFilterType)
 	{
 		result = YES;
 	}
+	else
+	{
+		bool cResult = vf->ChangeFilterByID(typeID);
+		if (cResult)
+		{
+			result = YES;
+			currentFilterType = typeID;
+		}
+	}
 	
 	return result;
 }

Modified: trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.strings
===================================================================
--- trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.strings	2012-12-28 03:25:20 UTC (rev 4446)
+++ trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.strings	2012-12-28 03:36:57 UTC (rev 4447)
@@ -1337,41 +1337,41 @@

Revision: 4451
          http://desmume.svn.sourceforge.net/desmume/?rev=4451&view=rev
Author:   rogerman
Date:     2012-12-29 02:15:58 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
Cocoa Port:
- The OpenGL 3D renderer now respects the "Rendering Threads" setting.
- Display output now auto-configures whether to run video filters in single-threaded or multi-threaded mode.
- Video filters now run much better in single-threaded mode.
- Do a lot of very heavy cleanup of the video filter code.
- Fixed bug in the UI where the HQ4xS option didn't work correctly in the user preferences.

Modified Paths:
--------------
    trunk/desmume/src/cocoa/cocoa_output.mm
    trunk/desmume/src/cocoa/cocoa_videofilter.mm
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.strings
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
    trunk/desmume/src/cocoa/videofilter.cpp
    trunk/desmume/src/cocoa/videofilter.h

Modified: trunk/desmume/src/cocoa/cocoa_output.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_output.mm	2012-12-28 09:19:54 UTC (rev 4450)
+++ trunk/desmume/src/cocoa/cocoa_output.mm	2012-12-29 02:15:58 UTC (rev 4451)
@@ -931,6 +931,10 @@
 	{
 		NDS_3D_ChangeCore(CORE3DLIST_SWRASTERIZE);
 	}
+	else if ([self render3DRenderingEngine] == CORE3DLIST_OPENGL)
+	{
+		NDS_3D_ChangeCore(CORE3DLIST_OPENGL);
+	}
 	
 	pthread_mutex_unlock(self.mutexProducer);
 }
@@ -1384,7 +1388,14 @@
 	spinlockVideoFilterType = OS_SPINLOCK_INIT;
 	spinlockVfSrcBuffer = OS_SPINLOCK_INIT;
 	
-	vf = [[CocoaVideoFilter alloc] initWithSize:frameSize typeID:VideoFilterTypeID_None numberThreads:2];
+	if ([[NSProcessInfo processInfo] activeProcessorCount] >= 2)
+	{
+		vf = [[CocoaVideoFilter alloc] initWithSize:frameSize typeID:VideoFilterTypeID_None numberThreads:2];
+	}
+	else
+	{
+		vf = [[CocoaVideoFilter alloc] initWithSize:frameSize typeID:VideoFilterTypeID_None numberThreads:0];
+	}
 	
 	[property setValue:[NSNumber numberWithInteger:(NSInteger)VideoFilterTypeID_None] forKey:@"videoFilterType"];
 	[property setValue:[CocoaVideoFilter typeStringByID:VideoFilterTypeID_None] forKey:@"videoFilterTypeString"];

Modified: trunk/desmume/src/cocoa/cocoa_videofilter.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_videofilter.mm	2012-12-28 09:19:54 UTC (rev 4450)
+++ trunk/desmume/src/cocoa/cocoa_videofilter.mm	2012-12-29 02:15:58 UTC (rev 4451)
@@ -24,17 +24,17 @@
 
 - (id)init
 {
-	return [self initWithSize:NSMakeSize(1, 1) typeID:VideoFilterTypeID_None numberThreads:1];
+	return [self initWithSize:NSMakeSize(1, 1) typeID:VideoFilterTypeID_None numberThreads:0];
 }
 
 - (id) initWithSize:(NSSize)theSize
 {
-	return [self initWithSize:theSize typeID:VideoFilterTypeID_None numberThreads:1];
+	return [self initWithSize:theSize typeID:VideoFilterTypeID_None numberThreads:0];
 }
 
 - (id) initWithSize:(NSSize)theSize typeID:(VideoFilterTypeID)typeID
 {
-	return [self initWithSize:theSize typeID:typeID numberThreads:1];
+	return [self initWithSize:theSize typeID:typeID numberThreads:0];
 }
 
 - (id) initWithSize:(NSSize)theSize typeID:(VideoFilterTypeID)typeID numberThreads:(NSUInteger)numThreads

Modified: trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.strings
===================================================================
--- trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.strings	2012-12-28 09:19:54 UTC (rev 4450)
+++ trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.strings	2012-12-29 02:15:58 UTC (rev 4451)
@@ -1598,8 +1598,8 @@

Revision: 4452
          http://desmume.svn.sourceforge.net/desmume/?rev=4452&view=rev
Author:   rogerman
Date:     2012-12-30 09:08:19 +0000 (Sun, 30 Dec 2012)
Log Message:
-----------
Cocoa Port:
- New feature: Users can now use some very user-friendly forms for submitting support requests and bug reports. The new forms can be found in the Help menu.
- The About box now shows the model identifier and running OS version.
- The About box display font for the read me files has been changed to Monaco 10.

Modified Paths:
--------------
    trunk/desmume/src/cocoa/cocoa_globals.h
    trunk/desmume/src/cocoa/cocoa_rom.mm
    trunk/desmume/src/cocoa/cocoa_util.h
    trunk/desmume/src/cocoa/cocoa_util.mm
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.strings
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
    trunk/desmume/src/cocoa/userinterface/appDelegate.h
    trunk/desmume/src/cocoa/userinterface/appDelegate.mm

Added Paths:
-----------
    trunk/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.h
    trunk/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.mm

Modified: trunk/desmume/src/cocoa/cocoa_globals.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_globals.h	2012-12-29 02:15:58 UTC (rev 4451)
+++ trunk/desmume/src/cocoa/cocoa_globals.h	2012-12-30 09:08:19 UTC (rev 4452)
@@ -19,7 +19,8 @@
 #define STRING_DESMUME_WEBSITE						"http://desmume.org"
 #define STRING_DESMUME_SHORT_DESCRIPTION			"Nintendo DS Emulator"
 #define STRING_DESMUME_FORUM_SITE					"http://forums.desmume.org/index.php"
-#define STRING_DESMUME_BUG_SITE						"http://sourceforge.net/tracker/?group_id=164579&atid=832291"
+#define STRING_DESMUME_TECH_SUPPORT_SITE			"http://forums.desmume.org/viewforum.php?id=4"
+#define STRING_DESMUME_BUG_REPORT_SITE				"http://sourceforge.net/tracker/?group_id=164579&atid=832291"
 
 // User Interface Localized Strings
 #define NSSTRING_TITLE_OPEN_ROM_PANEL				NSLocalizedString(@"Open ROM", nil)
@@ -51,6 +52,13 @@
 #define NSSTRING_TITLE_SPEED_2X						NSLocalizedString(@"Speed 2x", nil)
 #define NSSTRING_TITLE_SLOT_NUMBER					NSLocalizedString(@"Slot %d", nil)
 
+#define NSSTRING_TITLE_TECH_SUPPORT_WINDOW_TITLE	NSLocalizedString(@"Support Request Form", nil)
+#define NSSTRING_TITLE_BUG_REPORT_WINDOW_TITLE		NSLocalizedString(@"Bug Report Form", nil)
+#define NSSTRING_TITLE_GO_TECH_SUPPORT_WEBPAGE_TITLE	NSLocalizedString(@"Go to Tech Support Webpage", nil)
+#define NSSTRING_TITLE_GO_BUG_REPORT_WEBPAGE_TITLE	NSLocalizedString(@"Go to Bug Report Webpage", nil)
+#define NSSTRING_HELP_COPY_PASTE_TECH_SUPPORT		NSLocalizedString(@"Please copy-paste the above information into our tech support webpage. This will ensure the fastest response time from us.", nil)
+#define NSSTRING_HELP_COPY_PASTE_BUG_REPORT			NSLocalizedString(@"Please copy-paste the above information into our bug report webpage. This will ensure the fastest response time from us.", nil)
+
 #define NSSTRING_ALERT_CRITICAL_FILE_MISSING_PRI	NSLocalizedString(@"A critical file is missing. DeSmuME will now quit.", nil)
 #define NSSTRING_ALERT_CRITICAL_FILE_MISSING_SEC	NSLocalizedString(@"The file \"DefaultUserPrefs.plist\" is missing. Please reinstall DeSmuME.", nil)
 

Modified: trunk/desmume/src/cocoa/cocoa_rom.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_rom.mm	2012-12-29 02:15:58 UTC (rev 4451)
+++ trunk/desmume/src/cocoa/cocoa_rom.mm	2012-12-30 09:08:19 UTC (rev 4452)
@@ -201,6 +201,11 @@
 	
 	[self.bindings setValue:[self.header objectForKey:@"romInternalName"] forKey:@"romInternalName"];
 	[self.bindings setValue:[self.header objectForKey:@"romSerial"] forKey:@"romSerial"];
+	
+	NSString *romNameAndSerialInfoString = @"Name: ";
+	romNameAndSerialInfoString = [romNameAndSerialInfoString stringByAppendingString:[self.header objectForKey:@"romInternalName"]];
+	romNameAndSerialInfoString = [[romNameAndSerialInfoString stringByAppendingString:@"\nSerial: "] stringByAppendingString:[self.header objectForKey:@"romSerial"]];
+	[self.bindings setValue:romNameAndSerialInfoString forKey:@"romNameAndSerialInfo"];
 }
 
 - (BOOL) loadData:(NSURL *)theURL
@@ -477,9 +482,14 @@
 {
 	NSImage *iconImage = [[[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"AppIcon_DeSmuME" ofType:@"icns"]] autorelease];
 	
+	NSString *romNameAndSerialInfoString = @"Name: ";
+	romNameAndSerialInfoString = [romNameAndSerialInfoString stringByAppendingString:NSSTRING_STATUS_NO_ROM_LOADED];
+	romNameAndSerialInfoString = [[romNameAndSerialInfoString stringByAppendingString:@"\nSerial: "] stringByAppendingString:NSSTRING_STATUS_NO_ROM_LOADED];
+	
 	return [NSMutableDictionary dictionaryWithObjectsAndKeys:
 			NSSTRING_STATUS_NO_ROM_LOADED, @"romInternalName",
 			NSSTRING_STATUS_NO_ROM_LOADED, @"romSerial",
+			romNameAndSerialInfoString, @"romNameAndSerialInfo",
 			NSSTRING_STATUS_NO_ROM_LOADED, @"bannerJapanese",
 			NSSTRING_STATUS_NO_ROM_LOADED, @"bannerEnglish",
 			NSSTRING_STATUS_NO_ROM_LOADED, @"bannerFrench",

Modified: trunk/desmume/src/cocoa/cocoa_util.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_util.h	2012-12-29 02:15:58 UTC (rev 4451)
+++ trunk/desmume/src/cocoa/cocoa_util.h	2012-12-30 09:08:19 UTC (rev 4452)
@@ -46,6 +46,9 @@
 + (NSString *) appInternalNameAndVersionString;
 + (NSString *) appCompilerDetailString;
 
++ (NSString *) operatingSystemString;
++ (NSString *) modelIdentifierString;
+
 @end
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4

Modified: trunk/desmume/src/cocoa/cocoa_util.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_util.mm	2012-12-29 02:15:58 UTC (rev 4451)
+++ trunk/desmume/src/cocoa/cocoa_util.mm	2012-12-30 09:08:19 UTC (rev 4452)
@@ -20,6 +20,8 @@
 #import "cocoa_globals.h"
 #import "types.h"
 
+#include <sys/types.h>
+#include <sys/sysctl.h>
 #include "../version.h"
 
 #undef BOOL
@@ -147,6 +149,37 @@
 	return [NSString stringWithCString:EMU_DESMUME_COMPILER_DETAIL() encoding:NSUTF8StringEncoding];
 }
 
++ (NSString *) operatingSystemString
+{
+	NSDictionary *systemDict = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];
+	
+	NSString *productString = (NSString *)[systemDict objectForKey:@"ProductName"];
+	NSString *versionString = (NSString *)[systemDict objectForKey:@"ProductVersion"];
+	NSString *buildString = (NSString *)[systemDict objectForKey:@"ProductBuildVersion"];
+	
+	return [[[[[productString stringByAppendingString:@" v"] stringByAppendingString:versionString] stringByAppendingString:@" ("] stringByAppendingString:buildString] stringByAppendingString:@")"];
+}
+
++ (NSString *) modelIdentifierString
+{
+	NSString *modelIdentifierStr = @"";
+	size_t stringLength = 0;
+	char *modelCString = NULL;
+	
+	sysctlbyname("hw.model", NULL, &stringLength, NULL, 0);
+	if (stringLength == 0)
+	{
+		return modelIdentifierStr;
+	}
+	
+	modelCString = (char *)malloc(stringLength * sizeof(char));
+	sysctlbyname("hw.model", modelCString, &stringLength, NULL, 0);
+	modelIdentifierStr = [NSString stringWithCString:modelCString encoding:NSUTF8StringEncoding];
+	free(modelCString);
+	
+	return modelIdentifierStr;
+}
+
 @end
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4

Modified: trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.strings
===================================================================
--- trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.strings	2012-12-29 02:15:58 UTC (rev 4451)
+++ trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.strings	2012-12-30 09:08:19 UTC (rev 4452)
@@ -2902,4 +2902,118 @@

Revision: 4453
          http://desmume.svn.sourceforge.net/desmume/?rev=4453&view=rev
Author:   rogerman
Date:     2012-12-31 02:01:37 +0000 (Mon, 31 Dec 2012)
Log Message:
-----------
Cocoa Port:
- Fix some compilation issues related to r4452.
- Switch the order of model identifier info and OS info in the About box.
- Do some minor code cleanup.

Revision Links:
--------------
    http://desmume.svn.sourceforge.net/desmume/?rev=4452&view=rev

Modified Paths:
--------------
    trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj
    trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
    trunk/desmume/src/cocoa/userinterface/appDelegate.h
    trunk/desmume/src/cocoa/userinterface/appDelegate.mm
    trunk/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.mm

Modified: trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj
===================================================================
--- trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj	2012-12-30 09:08:19 UTC (rev 4452)
+++ trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj	2012-12-31 02:01:37 UTC (rev 4453)
@@ -577,6 +577,10 @@
 		AB73AA2E1507C9F500A310C8 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABC570D4134431DA00E7B0B1 /* OpenGL.framework */; };
 		AB73AA2F1507C9F500A310C8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AB0A0D1914AACA9600E83E91 /* libz.dylib */; };
 		AB75226F14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB75226D14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns */; };
+		ABA03570169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABA0356F169127C000817C69 /* troubleshootingWindowDelegate.mm */; };
+		ABA03571169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABA0356F169127C000817C69 /* troubleshootingWindowDelegate.mm */; };
+		ABA03572169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABA0356F169127C000817C69 /* troubleshootingWindowDelegate.mm */; };
+		ABA03573169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABA0356F169127C000817C69 /* troubleshootingWindowDelegate.mm */; };
 		ABAD0F7315ACE7A00000EC47 /* KeyNames.plist in Resources */ = {isa = PBXBuildFile; fileRef = AB02475B13886BF300E9F9AB /* KeyNames.plist */; };
 		ABAD0F7415ACE7A00000EC47 /* DefaultKeyMappings.plist in Resources */ = {isa = PBXBuildFile; fileRef = ABC719E1138CB25E002827A9 /* DefaultKeyMappings.plist */; };
 		ABAD0F7515ACE7A00000EC47 /* DefaultUserPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = ABBC0F8C1394B1AA0028B6BD /* DefaultUserPrefs.plist */; };
@@ -915,6 +919,8 @@
 		AB901BE31420707D00348EEC /* Norwegian */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = Norwegian; path = translations/Norwegian.lproj/Localizable.strings; sourceTree = "<group>"; };
 		AB901BE41420708200348EEC /* Romanian */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = Romanian; path = translations/Romanian.lproj/Localizable.strings; sourceTree = "<group>"; };
 		AB9971CE134EDA0800531BA7 /* cocoa_globals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_globals.h; sourceTree = "<group>"; };
+		ABA0356E169127BB00817C69 /* troubleshootingWindowDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = troubleshootingWindowDelegate.h; sourceTree = "<group>"; };
+		ABA0356F169127C000817C69 /* troubleshootingWindowDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = troubleshootingWindowDelegate.mm; sourceTree = "<group>"; };
 		ABA6574914511EC90077E5E9 /* cocoa_cheat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_cheat.h; sourceTree = "<group>"; };
 		ABA6574A14511EC90077E5E9 /* cocoa_cheat.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_cheat.mm; sourceTree = "<group>"; };
 		ABAD104915ACE7A00000EC47 /* DeSmuME (PPC).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DeSmuME (PPC).app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1395,12 +1401,14 @@
 				AB3ACB6C14C2361100D7D192 /* emuWindowDelegate.h */,
 				AB3ACB6E14C2361100D7D192 /* inputPrefsView.h */,
 				AB3ACB7014C2361100D7D192 /* preferencesWindowDelegate.h */,
+				ABA0356E169127BB00817C69 /* troubleshootingWindowDelegate.h */,
 				AB3ACB6714C2361100D7D192 /* appDelegate.mm */,
 				AB3ACB6914C2361100D7D192 /* cheatWindowDelegate.mm */,
 				AB3ACB6B14C2361100D7D192 /* displayView.mm */,
 				AB3ACB6D14C2361100D7D192 /* emuWindowDelegate.mm */,
 				AB3ACB6F14C2361100D7D192 /* inputPrefsView.mm */,
 				AB3ACB7114C2361100D7D192 /* preferencesWindowDelegate.mm */,
+				ABA0356F169127C000817C69 /* troubleshootingWindowDelegate.mm */,
 			);
 			path = userinterface;
 			sourceTree = "<group>";
@@ -2489,6 +2497,7 @@
 				AB2F3C3715CF9C6000858373 /* scanline.cpp in Sources */,
 				AB2F3C3815CF9C6000858373 /* coreaudiosound.cpp in Sources */,
 				AB2F3C3915CF9C6000858373 /* ringbuffer.cpp in Sources */,
+				ABA03571169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2627,6 +2636,7 @@
 				ABBCE2F215ACB29100A2C965 /* OperandX86X64.cpp in Sources */,
 				ABBCE2F315ACB29100A2C965 /* Platform.cpp in Sources */,
 				ABBCE2F615ACB29100A2C965 /* Util.cpp in Sources */,
+				ABA03572169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2765,6 +2775,7 @@
 				ABBCE2E215ACB29100A2C965 /* OperandX86X64.cpp in Sources */,
 				ABBCE2E315ACB29100A2C965 /* Platform.cpp in Sources */,
 				ABBCE2E615ACB29100A2C965 /* Util.cpp in Sources */,
+				ABA03570169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2889,6 +2900,7 @@
 				ABAD102D15ACE7A00000EC47 /* scanline.cpp in Sources */,
 				ABAD102E15ACE7A00000EC47 /* coreaudiosound.cpp in Sources */,
 				ABAD102F15ACE7A00000EC47 /* ringbuffer.cpp in Sources */,
+				ABA03573169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Modified: trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj
===================================================================
--- trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj	2012-12-30 09:08:19 UTC (rev 4452)
+++ trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj	2012-12-31 02:01:37 UTC (rev 4453)
@@ -547,6 +547,8 @@
 		ABEFCF62141AB82A000CC0CD /* AppIcon_DeSmuME.icns in Resources */ = {isa = PBXBuildFile; fileRef = ABEFCF5E141AB82A000CC0CD /* AppIcon_DeSmuME.icns */; };
 		ABEFCF63141AB82A000CC0CD /* AppIcon_NintendoDS_ROM.icns in Resources */ = {isa = PBXBuildFile; fileRef = ABEFCF5F141AB82A000CC0CD /* AppIcon_NintendoDS_ROM.icns */; };
 		ABEFCF64141AB82A000CC0CD /* AppIcon_SaveState.icns in Resources */ = {isa = PBXBuildFile; fileRef = ABEFCF60141AB82A000CC0CD /* AppIcon_SaveState.icns */; };
+		ABF2B9FB16904133000FF7C0 /* troubleshootingWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABF2B9FA16904133000FF7C0 /* troubleshootingWindowDelegate.mm */; };
+		ABF2B9FC16904133000FF7C0 /* troubleshootingWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABF2B9FA16904133000FF7C0 /* troubleshootingWindowDelegate.mm */; };
 		ABFE150714C92FF5005D6699 /* 2xsai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE14FA14C92FF5005D6699 /* 2xsai.cpp */; };
 		ABFE150814C92FF5005D6699 /* bilinear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE14FB14C92FF5005D6699 /* bilinear.cpp */; };
 		ABFE150914C92FF5005D6699 /* epx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE14FC14C92FF5005D6699 /* epx.cpp */; };
@@ -933,6 +935,8 @@
 		ABEFCF5E141AB82A000CC0CD /* AppIcon_DeSmuME.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = AppIcon_DeSmuME.icns; sourceTree = "<group>"; };
 		ABEFCF5F141AB82A000CC0CD /* AppIcon_NintendoDS_ROM.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = AppIcon_NintendoDS_ROM.icns; sourceTree = "<group>"; };
 		ABEFCF60141AB82A000CC0CD /* AppIcon_SaveState.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = AppIcon_SaveState.icns; sourceTree = "<group>"; };
+		ABF2B9F81690412A000FF7C0 /* troubleshootingWindowDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = troubleshootingWindowDelegate.h; sourceTree = "<group>"; };
+		ABF2B9FA16904133000FF7C0 /* troubleshootingWindowDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = troubleshootingWindowDelegate.mm; sourceTree = "<group>"; };
 		ABFE14FA14C92FF5005D6699 /* 2xsai.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = 2xsai.cpp; sourceTree = "<group>"; };
 		ABFE14FB14C92FF5005D6699 /* bilinear.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bilinear.cpp; sourceTree = "<group>"; };
 		ABFE14FC14C92FF5005D6699 /* epx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = epx.cpp; sourceTree = "<group>"; };
@@ -1128,12 +1132,14 @@
 				AB3ACB6C14C2361100D7D192 /* emuWindowDelegate.h */,
 				AB3ACB6E14C2361100D7D192 /* inputPrefsView.h */,
 				AB3ACB7014C2361100D7D192 /* preferencesWindowDelegate.h */,
+				ABF2B9F81690412A000FF7C0 /* troubleshootingWindowDelegate.h */,
 				AB3ACB6714C2361100D7D192 /* appDelegate.mm */,
 				AB3ACB6914C2361100D7D192 /* cheatWindowDelegate.mm */,
 				AB3ACB6B14C2361100D7D192 /* displayView.mm */,
 				AB3ACB6D14C2361100D7D192 /* emuWindowDelegate.mm */,
 				AB3ACB6F14C2361100D7D192 /* inputPrefsView.mm */,
 				AB3ACB7114C2361100D7D192 /* preferencesWindowDelegate.mm */,
+				ABF2B9FA16904133000FF7C0 /* troubleshootingWindowDelegate.mm */,
 			);
 			path = userinterface;
 			sourceTree = "<group>";
@@ -2052,6 +2058,7 @@
 				AB796DD115CDD20F00C59155 /* OperandX86X64.cpp in Sources */,
 				AB796DD615CDD20F00C59155 /* Platform.cpp in Sources */,
 				AB796DE515CDD20F00C59155 /* Util.cpp in Sources */,
+				ABF2B9FC16904133000FF7C0 /* troubleshootingWindowDelegate.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2190,6 +2197,7 @@
 				AB796DD415CDD20F00C59155 /* OperandX86X64.cpp in Sources */,
 				AB796DD915CDD20F00C59155 /* Platform.cpp in Sources */,
 				AB796DE815CDD20F00C59155 /* Util.cpp in Sources */,
+				ABF2B9FB16904133000FF7C0 /* troubleshootingWindowDelegate.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Modified: trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
===================================================================
--- trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib	2012-12-30 09:08:19 UTC (rev 4452)
+++ trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib	2012-12-31 02:01:37 UTC (rev 4453)
@@ -4260,7 +4260,7 @@
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="982736366">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -4281,7 +4281,6 @@
 							</object>
 							<string key="NSFrame">{{20, 302}, {128, 128}}</string>
 							<reference key="NSSuperview" ref="982736366"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSImageCell" key="NSCell" id="1010597503">
 								<int key="NSCellFlags">130560</int>
@@ -4302,7 +4301,6 @@
 							<int key="NSvFlags">18</int>
 							<string key="NSFrame">{{13, 10}, {524, 290}}</string>
 							<reference key="NSSuperview" ref="982736366"/>
-							<reference key="NSWindow"/>
 							<object class="NSMutableArray" key="NSTabViewItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSTabViewItem" id="830687618">
@@ -4327,7 +4325,6 @@
 																<int key="NSvFlags">2322</int>
 																<string key="NSFrameSize">{490, 14}</string>
 																<reference key="NSSuperview" ref="369492831"/>
-																<reference key="NSWindow"/>
 																<object class="NSTextContainer" key="NSTextContainer" id="789743053">
 																	<object class="NSLayoutManager" key="NSLayoutManager">
 																		<object class="NSTextStorage" key="NSTextStorage">
@@ -4407,7 +4404,7 @@
 														</object>
 														<string key="NSFrameSize">{490, 244}</string>
 														<reference key="NSSuperview" ref="327910638"/>
-														<reference key="NSWindow"/>
+														<reference key="NSNextKeyView" ref="1041259261"/>
 														<reference key="NSDocView" ref="1041259261"/>
 														<reference key="NSBGColor" ref="991462592"/>
 														<object class="NSCursor" key="NSCursor" id="2825">
@@ -4421,7 +4418,6 @@
 														<int key="NSvFlags">256</int>
 														<string key="NSFrame">{{490, 0}, {15, 244}}</string>
 														<reference key="NSSuperview" ref="327910638"/>
-														<reference key="NSWindow"/>
 														<reference key="NSTarget" ref="327910638"/>
 														<string key="NSAction">_doScroller:</string>
 														<double key="NSPercent">0.96240601503759393</double>
@@ -4431,7 +4427,6 @@
 														<int key="NSvFlags">-2147483392</int>
 														<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 														<reference key="NSSuperview" ref="327910638"/>
-														<reference key="NSWindow"/>
 														<int key="NSsFlags">1</int>
 														<reference key="NSTarget" ref="327910638"/>
 														<string key="NSAction">_doScroller:</string>
@@ -4441,7 +4436,7 @@
 												</object>
 												<string key="NSFrame">{{-3, -3}, {505, 244}}</string>
 												<reference key="NSSuperview" ref="398550257"/>
-												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="369492831"/>
 												<int key="NSsFlags">16</int>
 												<reference key="NSVScroller" ref="1002239285"/>
 												<reference key="NSHScroller" ref="540873356"/>
@@ -4450,7 +4445,6 @@
 										</object>
 										<string key="NSFrame">{{10, 33}, {504, 244}}</string>
 										<reference key="NSSuperview" ref="912999179"/>
-										<reference key="NSWindow"/>
 									</object>
 									<string key="NSLabel">Read Me</string>
 									<reference key="NSColor" ref="266180242"/>
@@ -4853,7 +4847,6 @@
 							<int key="NSvFlags">270</int>
 							<string key="NSFrame">{{153, 374}, {380, 56}}</string>
 							<reference key="NSSuperview" ref="982736366"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="933990936">
 								<int key="NSCellFlags">69336577</int>
@@ -4871,7 +4864,6 @@
 							<int key="NSvFlags">270</int>
 							<string key="NSFrame">{{156, 302}, {374, 64}}</string>
 							<reference key="NSSuperview" ref="982736366"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="873080509">
 								<int key="NSCellFlags">73530881</int>
@@ -4887,8 +4879,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{550, 450}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -5458,11 +5448,9 @@
 				</object>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="318805510">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<string key="NSFrameSize">{400, 100}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -10520,7 +10508,7 @@
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="738688999">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -10529,7 +10517,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{119, 300}, {166, 22}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="850036257">
 								<int key="NSCellFlags">-1804468671</int>
@@ -10548,7 +10535,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{119, 246}, {166, 44}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="194394292">
 								<int key="NSCellFlags">-1805517311</int>
@@ -10567,7 +10553,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 302}, {71, 17}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="229258194">
 								<int key="NSCellFlags">68288064</int>
@@ -10584,7 +10569,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 270}, {63, 17}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="626803626">
 								<int key="NSCellFlags">68288064</int>
@@ -10601,7 +10585,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 220}, {97, 17}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="293778518">
 								<int key="NSCellFlags">68288064</int>
@@ -10618,7 +10601,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 178}, {60, 17}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="46788551">
 								<int key="NSCellFlags">68288064</int>
@@ -10635,7 +10617,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 150}, {69, 17}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="352113877">
 								<int key="NSCellFlags">68288064</int>
@@ -10652,7 +10633,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{119, 176}, {169, 27}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSDatePickerCell" key="NSCell" id="1068024499">
 								<int key="NSCellFlags">71433728</int>
@@ -10673,7 +10653,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{116, 144}, {172, 26}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="846364979">
 								<int key="NSCellFlags">-2076049856</int>
@@ -10773,7 +10752,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{116, 214}, {172, 26}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="852518189">
 								<int key="NSCellFlags">-2076049856</int>
@@ -11046,7 +11024,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 55}, {271, 85}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="764736196">
 								<int key="NSCellFlags">67239424</int>
@@ -11063,7 +11040,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{104, 12}, {96, 32}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="702699067">
 								<int key="NSCellFlags">67239424</int>
@@ -11081,8 +11057,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{305, 339}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -11680,7 +11654,7 @@
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="667010674">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -11699,14 +11673,12 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrameSize">{270, 321}</string>
 											<reference key="NSSuperview" ref="1055577013"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="716353213">
 												<reference key="NSNextResponder" ref="584243960"/>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrameSize">{270, 17}</string>
 												<reference key="NSSuperview" ref="584243960"/>
-												<reference key="NSWindow"/>
 												<reference key="NSTableView" ref="894702591"/>
 											</object>
 											<object class="_NSCornerView" key="NSCornerView" id="2505">
@@ -11714,7 +11686,6 @@
 												<int key="NSvFlags">-2147483392</int>
 												<string key="NSFrame">{{256, 0}, {16, 17}}</string>
 												<reference key="NSSuperview" ref="1011480808"/>
-												<reference key="NSWindow"/>
 											</object>
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
@@ -11824,7 +11795,6 @@
 									</object>
 									<string key="NSFrame">{{1, 17}, {270, 321}}</string>
 									<reference key="NSSuperview" ref="1011480808"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="894702591"/>
 									<reference key="NSDocView" ref="894702591"/>
 									<reference key="NSBGColor" ref="856317944"/>
@@ -11835,7 +11805,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{256, 17}, {15, 306}}</string>
 									<reference key="NSSuperview" ref="1011480808"/>
-									<reference key="NSWindow"/>
 									<reference key="NSTarget" ref="1011480808"/>
 									<string key="NSAction">_doScroller:</string>
 									<double key="NSPercent">0.99689440993788825</double>
@@ -11845,7 +11814,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{1, 323}, {270, 15}}</string>
 									<reference key="NSSuperview" ref="1011480808"/>
-									<reference key="NSWindow"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="1011480808"/>
 									<string key="NSAction">_doScroller:</string>
@@ -11860,7 +11828,6 @@
 									</object>
 									<string key="NSFrame">{{1, 0}, {270, 17}}</string>
 									<reference key="NSSuperview" ref="1011480808"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="716353213"/>
 									<reference key="NSDocView" ref="716353213"/>
 									<reference key="NSBGColor" ref="856317944"/>
@@ -11870,7 +11837,6 @@
 							</object>
 							<string key="NSFrame">{{20, 49}, {272, 339}}</string>
 							<reference key="NSSuperview" ref="667010674"/>
-							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="1055577013"/>
 							<int key="NSsFlags">562</int>
 							<reference key="NSVScroller" ref="744012231"/>
@@ -11885,7 +11851,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{113, 12}, {185, 32}}</string>
 							<reference key="NSSuperview" ref="667010674"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="193441988">
 								<int key="NSCellFlags">67239424</int>
@@ -11906,7 +11871,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{47, 19}, {28, 23}}</string>
 							<reference key="NSSuperview" ref="667010674"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="694582833">
 								<int key="NSCellFlags">-2080244224</int>
@@ -11928,7 +11892,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{20, 19}, {28, 23}}</string>
 							<reference key="NSSuperview" ref="667010674"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="349665005">
 								<int key="NSCellFlags">-2080244224</int>
@@ -11960,7 +11923,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{100, 372}, {209, 26}}</string>
 											<reference key="NSSuperview" ref="880513976"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSPopUpButtonCell" key="NSCell" id="252559910">
 												<int key="NSCellFlags">-2076049856</int>
@@ -12025,7 +11987,6 @@
 											<int key="NSvFlags">301</int>
 											<string key="NSFrame">{{2, 33}, {320, 290}}</string>
 											<reference key="NSSuperview" ref="880513976"/>
-											<reference key="NSWindow"/>
 											<string key="NSClassName">NSView</string>
 										</object>
 										<object class="NSButton" id="1044249996">
@@ -12033,7 +11994,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{16, 402}, {129, 18}}</string>
 											<reference key="NSSuperview" ref="880513976"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="471706675">
 												<int key="NSCellFlags">67239424</int>
@@ -12056,7 +12016,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 378}, {83, 17}}</string>
 											<reference key="NSSuperview" ref="880513976"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="5206494">
 												<int key="NSCellFlags">68288064</int>
@@ -12077,7 +12036,6 @@
 											<int key="NSvFlags">12</int>
 											<string key="NSFrame">{{14, 320}, {292, 5}}</string>
 											<reference key="NSSuperview" ref="880513976"/>
-											<reference key="NSWindow"/>
 											<string key="NSOffsets">{0, 0}</string>
 											<object class="NSTextFieldCell" key="NSTitleCell">
 												<int key="NSCellFlags">67239424</int>
@@ -12100,7 +12058,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{103, 331}, {203, 39}}</string>
 											<reference key="NSSuperview" ref="880513976"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="559465196">
 												<int key="NSCellFlags">-1805517311</int>
@@ -12118,7 +12075,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 353}, {83, 17}}</string>
 											<reference key="NSSuperview" ref="880513976"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="895191486">
 												<int key="NSCellFlags">68288064</int>
@@ -12135,7 +12091,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{114, 6}, {96, 32}}</string>
 											<reference key="NSSuperview" ref="880513976"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="27100057">
 												<int key="NSCellFlags">67239424</int>
@@ -12154,12 +12109,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {324, 428}}</string>
 									<reference key="NSSuperview" ref="253817892"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{297, 16}, {326, 444}}</string>
 							<reference key="NSSuperview" ref="667010674"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -12183,7 +12136,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{89, 446}, {70, 14}}</string>
 							<reference key="NSSuperview" ref="667010674"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="633991481">
 								<int key="NSCellFlags">68288064</int>
@@ -12204,7 +12156,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{89, 421}, {69, 14}}</string>
 							<reference key="NSSuperview" ref="667010674"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="954688792">
 								<int key="NSCellFlags">68288064</int>
@@ -12221,7 +12172,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{160, 421}, {135, 14}}</string>
 							<reference key="NSSuperview" ref="667010674"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="986975935">
 								<int key="NSCellFlags">70385217</int>
@@ -12239,7 +12189,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{161, 446}, {134, 14}}</string>
 							<reference key="NSSuperview" ref="667010674"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="1070444135">
 								<int key="NSCellFlags">70385217</int>
@@ -12257,7 +12206,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{90, 394}, {190, 18}}</string>
 							<reference key="NSSuperview" ref="667010674"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="702020116">
 								<int key="NSCellFlags">-2080244224</int>
@@ -12292,7 +12240,6 @@
 							</object>
 							<string key="NSFrame">{{20, 396}, {64, 64}}</string>
 							<reference key="NSSuperview" ref="667010674"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSImageCell" key="NSCell" id="532880466">
 								<int key="NSCellFlags">130560</int>
@@ -12307,8 +12254,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{640, 480}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -12317,7 +12262,7 @@
 				<string key="NSClassName">CheatWindowDelegate</string>
 			</object>
 			<object class="NSCustomView" id="653859410">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -12326,7 +12271,6 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{17, 4}, {294, 14}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="985033608">
 							<int key="NSCellFlags">68288064</int>
@@ -12344,7 +12288,6 @@
 						<object class="NSPSMatrix" key="NSDrawMatrix"/>
 						<string key="NSFrame">{{214, 220}, {16, 16}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
-						<reference key="NSWindow"/>
 						<int key="NSpiFlags">28938</int>
 						<double key="NSMaxValue">100</double>
 					</object>
@@ -12353,7 +12296,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{133, 369}, {136, 22}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="825069250">
 							<int key="NSCellFlags">-1539178944</int>
@@ -12410,7 +12352,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{59, 374}, {60, 14}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="260875644">
 							<int key="NSCellFlags">68288064</int>
@@ -12427,7 +12368,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{59, 398}, {72, 14}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="242082681">
 							<int key="NSCellFlags">68288064</int>
@@ -12444,7 +12384,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{133, 393}, {136, 22}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="23677458">
 							<int key="NSCellFlags">-2076049856</int>
@@ -12501,7 +12440,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{0, 237}, {328, 134}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
-						<reference key="NSWindow"/>
 						<string key="NSClassName">NSView</string>
 					</object>
 					<object class="NSButton" id="493042311">
@@ -12509,7 +12447,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{233, 213}, {80, 28}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="570153276">
 							<int key="NSCellFlags">67239424</int>
@@ -12530,7 +12467,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{59, 222}, {150, 14}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="38661384">
 							<int key="NSCellFlags">68288064</int>
@@ -12548,7 +12484,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 222}, {45, 14}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="717962612">
 							<int key="NSCellFlags">68288064</int>
@@ -12575,14 +12510,12 @@
 										<int key="NSvFlags">256</int>
 										<string key="NSFrameSize">{286, 176}</string>
 										<reference key="NSSuperview" ref="381081269"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSTableHeaderView" key="NSHeaderView" id="833610819">
 											<reference key="NSNextResponder" ref="872327306"/>
 											<int key="NSvFlags">256</int>
 											<string key="NSFrameSize">{286, 17}</string>
 											<reference key="NSSuperview" ref="872327306"/>
-											<reference key="NSWindow"/>
 											<reference key="NSTableView" ref="1001428622"/>
 										</object>
 										<object class="_NSCornerView" key="NSCornerView" id="2381">
@@ -12590,7 +12523,6 @@
 											<int key="NSvFlags">-2147483392</int>
 											<string key="NSFrame">{{224, 0}, {16, 17}}</string>
 											<reference key="NSSuperview" ref="502150128"/>
-											<reference key="NSWindow"/>
 										</object>
 										<object class="NSMutableArray" key="NSTableColumns">
 											<bool key="EncodedWithXMLCoder">YES</bool>
@@ -12670,7 +12602,6 @@
 								</object>
 								<string key="NSFrame">{{1, 17}, {286, 176}}</string>
 								<reference key="NSSuperview" ref="502150128"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1001428622"/>
 								<reference key="NSDocView" ref="1001428622"/>
 								<reference key="NSBGColor" ref="856317944"/>
@@ -12681,7 +12612,6 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{224, 17}, {15, 102}}</string>
 								<reference key="NSSuperview" ref="502150128"/>
-								<reference key="NSWindow"/>
 								<reference key="NSTarget" ref="502150128"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSPercent">0.94863013698630139</double>
@@ -12691,7 +12621,6 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{1, 294}, {338, 15}}</string>
 								<reference key="NSSuperview" ref="502150128"/>
-								<reference key="NSWindow"/>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="502150128"/>
 								<string key="NSAction">_doScroller:</string>
@@ -12706,7 +12635,6 @@
 								</object>
 								<string key="NSFrame">{{1, 0}, {286, 17}}</string>
 								<reference key="NSSuperview" ref="502150128"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="833610819"/>
 								<reference key="NSDocView" ref="833610819"/>
 								<reference key="NSBGColor" ref="856317944"/>
@@ -12716,7 +12644,6 @@
 						</object>
 						<string key="NSFrame">{{20, 20}, {288, 194}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="381081269"/>
 						<int key="NSsFlags">562</int>
 						<reference key="NSVScroller" ref="116802186"/>
@@ -12728,8 +12655,6 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{328, 434}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSDrawer" id="22830540">
@@ -13106,7 +13031,7 @@
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
 			</object>
 			<object class="NSCustomView" id="531093625">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -13115,7 +13040,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{233, 54}, {80, 28}}</string>
 						<reference key="NSSuperview" ref="531093625"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="19450435">
 							<int key="NSCellFlags">67239424</int>
@@ -13136,7 +13060,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{20, 59}, {210, 19}}</string>
 						<reference key="NSSuperview" ref="531093625"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSSearchFieldCell" key="NSCell" id="910542123">
 							<int key="NSCellFlags">343014976</int>
@@ -13198,7 +13121,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 86}, {294, 14}}</string>
 						<reference key="NSSuperview" ref="531093625"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="457648173">
 							<int key="NSCellFlags">67239424</int>
@@ -13215,7 +13137,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 100}, {294, 14}}</string>
 						<reference key="NSSuperview" ref="531093625"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="125683977">
 							<int key="NSCellFlags">67239424</int>
@@ -13229,8 +13150,6 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{328, 134}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="285216239">
@@ -13899,7 +13818,7 @@
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="439595996">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">301</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -13941,7 +13860,6 @@
 										</object>
 										<string key="NSFrame">{{0, 125}, {278, 53}}</string>
 										<reference key="NSSuperview" ref="612858975"/>
-										<reference key="NSWindow"/>
 										<object class="NSTextContainer" key="NSTextContainer" id="848187789">
 											<object class="NSLayoutManager" key="NSLayoutManager">
 												<object class="NSTextStorage" key="NSTextStorage">
@@ -14013,7 +13931,6 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {278, 223}}</string>
 								<reference key="NSSuperview" ref="332554094"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="612136785"/>
 								<reference key="NSDocView" ref="612136785"/>
 								<reference key="NSBGColor" ref="991462592"/>
@@ -14025,7 +13942,6 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{231, 1}, {15, 172}}</string>
 								<reference key="NSSuperview" ref="332554094"/>
-								<reference key="NSWindow"/>
 								<reference key="NSTarget" ref="332554094"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSPercent">0.68253968253968256</double>
@@ -14035,7 +13951,6 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 								<reference key="NSSuperview" ref="332554094"/>
-								<reference key="NSWindow"/>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="332554094"/>
 								<string key="NSAction">_doScroller:</string>
@@ -14045,7 +13960,6 @@
 						</object>
 						<string key="NSFrame">{{20, 20}, {280, 225}}</string>
 						<reference key="NSSuperview" ref="439595996"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="612858975"/>
 						<int key="NSsFlags">530</int>
 						<reference key="NSVScroller" ref="662113178"/>
@@ -14057,7 +13971,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 253}, {138, 17}}</string>
 						<reference key="NSSuperview" ref="439595996"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="924249429">
 							<int key="NSCellFlags">68288064</int>
@@ -14071,8 +13984,6 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{320, 290}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="970420241">
@@ -18152,7 +18063,7 @@
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="928014023">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -18172,7 +18083,6 @@
 							</object>
 							<string key="NSFrame">{{20, 440}, {128, 128}}</string>
 							<reference key="NSSuperview" ref="928014023"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSImageCell" key="NSCell" id="458596636">
 								<int key="NSCellFlags">130560</int>
@@ -18200,7 +18110,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 89}, {131, 17}}</string>
 											<reference key="NSSuperview" ref="122143312"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="451385578">
 												<int key="NSCellFlags">68288064</int>
@@ -18217,7 +18126,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 64}, {131, 17}}</string>
 											<reference key="NSSuperview" ref="122143312"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="490536624">
 												<int key="NSCellFlags">68288064</int>
@@ -18234,7 +18142,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 39}, {131, 17}}</string>
 											<reference key="NSSuperview" ref="122143312"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="876009461">
 												<int key="NSCellFlags">68288064</int>
@@ -18251,7 +18158,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 14}, {131, 17}}</string>
 											<reference key="NSSuperview" ref="122143312"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="127808067">
 												<int key="NSCellFlags">68288064</int>
@@ -18268,7 +18174,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{148, 89}, {245, 17}}</string>
 											<reference key="NSSuperview" ref="122143312"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="688433790">
 												<int key="NSCellFlags">68288064</int>
@@ -18289,7 +18194,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{148, 64}, {245, 17}}</string>
 											<reference key="NSSuperview" ref="122143312"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="991144778">
 												<int key="NSCellFlags">68288064</int>
@@ -18307,7 +18211,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{148, 39}, {245, 17}}</string>
 											<reference key="NSSuperview" ref="122143312"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="694048878">
 												<int key="NSCellFlags">68288064</int>
@@ -18325,7 +18228,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{148, 14}, {245, 17}}</string>
 											<reference key="NSSuperview" ref="122143312"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="741945800">
 												<int key="NSCellFlags">68288064</int>
@@ -18341,12 +18243,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {408, 116}}</string>
 									<reference key="NSSuperview" ref="804066475"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{153, 436}, {410, 132}}</string>
 							<reference key="NSSuperview" ref="928014023"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -18380,7 +18280,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 376}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="148445300"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="1041246813">
 												<int key="NSCellFlags">68288064</int>
@@ -18397,7 +18296,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 312}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="148445300"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="893283599">
 												<int key="NSCellFlags">68288064</int>
@@ -18414,7 +18312,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 248}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="148445300"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="437752317">
 												<int key="NSCellFlags">68288064</int>
@@ -18431,7 +18328,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 184}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="148445300"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="916991236">
 												<int key="NSCellFlags">68288064</int>
@@ -18448,7 +18344,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 120}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="148445300"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="917591505">
 												<int key="NSCellFlags">68288064</int>
@@ -18465,7 +18360,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 56}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="148445300"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="194924755">
 												<int key="NSCellFlags">68288064</int>
@@ -18482,7 +18376,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 334}, {186, 42}}</string>
 											<reference key="NSSuperview" ref="148445300"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="140116628">
 												<int key="NSCellFlags">67239424</int>
@@ -18500,7 +18393,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 270}, {186, 42}}</string>
 											<reference key="NSSuperview" ref="148445300"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="71709036">
 												<int key="NSCellFlags">67239424</int>
@@ -18518,7 +18410,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 206}, {186, 42}}</string>
 											<reference key="NSSuperview" ref="148445300"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="739747393">
 												<int key="NSCellFlags">67239424</int>
@@ -18536,7 +18427,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 142}, {186, 42}}</string>
 											<reference key="NSSuperview" ref="148445300"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="966085965">
 												<int key="NSCellFlags">67239424</int>
@@ -18554,7 +18444,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 78}, {186, 42}}</string>
 											<reference key="NSSuperview" ref="148445300"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="1258570">
 												<int key="NSCellFlags">67239424</int>
@@ -18572,7 +18461,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 14}, {186, 42}}</string>
 											<reference key="NSSuperview" ref="148445300"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="262720167">
 												<int key="NSCellFlags">67239424</int>
@@ -18588,12 +18476,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {216, 400}}</string>
 									<reference key="NSSuperview" ref="166861586"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{17, 16}, {218, 416}}</string>
 							<reference key="NSSuperview" ref="928014023"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -18627,7 +18513,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 168}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="607397655"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="842194641">
 												<int key="NSCellFlags">68288064</int>
@@ -18644,7 +18529,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 146}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="607397655"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="847695160">
 												<int key="NSCellFlags">68288064</int>
@@ -18661,7 +18545,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 124}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="607397655"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="685074766">
 												<int key="NSCellFlags">68288064</int>
@@ -18678,7 +18561,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 102}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="607397655"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="956826119">
 												<int key="NSCellFlags">68288064</int>
@@ -18695,7 +18577,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 80}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="607397655"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="638249718">
 												<int key="NSCellFlags">68288064</int>
@@ -18712,7 +18593,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 58}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="607397655"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="181865321">
 												<int key="NSCellFlags">68288064</int>
@@ -18729,7 +18609,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 36}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="607397655"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="775620613">
 												<int key="NSCellFlags">68288064</int>
@@ -18746,7 +18625,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 14}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="607397655"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="59029651">
 												<int key="NSCellFlags">68288064</int>
@@ -18763,7 +18641,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{203, 168}, {106, 14}}</string>
 											<reference key="NSSuperview" ref="607397655"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="620769760">
 												<int key="NSCellFlags">68288064</int>
@@ -18780,7 +18657,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{203, 146}, {106, 14}}</string>
 											<reference key="NSSuperview" ref="607397655"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="880369759">
 												<int key="NSCellFlags">68288064</int>
@@ -18798,7 +18674,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{203, 124}, {106, 14}}</string>
 											<reference key="NSSuperview" ref="607397655"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="544600416">
 												<int key="NSCellFlags">68288064</int>
@@ -18816,7 +18691,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{203, 102}, {106, 14}}</string>
 											<reference key="NSSuperview" ref="607397655"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="920705841">
 												<int key="NSCellFlags">68288064</int>
@@ -18834,7 +18708,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{203, 80}, {106, 14}}</string>
 											<reference key="NSSuperview" ref="607397655"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="964797">
 												<int key="NSCellFlags">68288064</int>
@@ -18852,7 +18725,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{203, 58}, {106, 14}}</string>
 											<reference key="NSSuperview" ref="607397655"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="689844678">
 												<int key="NSCellFlags">68288064</int>
@@ -18870,7 +18742,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{203, 36}, {106, 14}}</string>
 											<reference key="NSSuperview" ref="607397655"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="208815616">
 												<int key="NSCellFlags">68288064</int>
@@ -18888,7 +18759,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{203, 14}, {106, 14}}</string>
 											<reference key="NSSuperview" ref="607397655"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="491545827">
 												<int key="NSCellFlags">68288064</int>
@@ -18904,12 +18774,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {324, 192}}</string>
 									<reference key="NSSuperview" ref="894439383"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{237, 224}, {326, 208}}</string>
 							<reference key="NSSuperview" ref="928014023"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -18943,7 +18811,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 80}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="1039929003"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="967292265">
 												<int key="NSCellFlags">68288064</int>
@@ -18960,7 +18827,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{203, 80}, {106, 14}}</string>
 											<reference key="NSSuperview" ref="1039929003"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="7173805">
 												<int key="NSCellFlags">68288064</int>
@@ -18978,7 +18844,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 58}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="1039929003"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="345170408">
 												<int key="NSCellFlags">68288064</int>
@@ -18995,7 +18860,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{203, 58}, {106, 14}}</string>
 											<reference key="NSSuperview" ref="1039929003"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="298806443">
 												<int key="NSCellFlags">68288064</int>
@@ -19013,7 +18877,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 36}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="1039929003"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="465767443">
 												<int key="NSCellFlags">68288064</int>
@@ -19030,7 +18893,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{203, 36}, {106, 14}}</string>
 											<reference key="NSSuperview" ref="1039929003"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="796554986">
 												<int key="NSCellFlags">68288064</int>
@@ -19048,7 +18910,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 14}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="1039929003"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="789342067">
 												<int key="NSCellFlags">68288064</int>
@@ -19065,7 +18926,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{203, 14}, {106, 14}}</string>
 											<reference key="NSSuperview" ref="1039929003"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="268033081">
 												<int key="NSCellFlags">68288064</int>
@@ -19081,12 +18941,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {324, 104}}</string>
 									<reference key="NSSuperview" ref="550711189"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{237, 98}, {326, 120}}</string>
 							<reference key="NSSuperview" ref="928014023"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -19120,7 +18978,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 36}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="378723666"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="924362054">
 												<int key="NSCellFlags">68288064</int>
@@ -19137,7 +18994,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{203, 36}, {106, 14}}</string>
 											<reference key="NSSuperview" ref="378723666"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="756845058">
 												<int key="NSCellFlags">68288064</int>
@@ -19155,7 +19011,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 14}, {186, 14}}</string>
 											<reference key="NSSuperview" ref="378723666"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="36485897">
 												<int key="NSCellFlags">68288064</int>
@@ -19172,7 +19027,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{203, 14}, {106, 14}}</string>
 											<reference key="NSSuperview" ref="378723666"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="698313391">
 												<int key="NSCellFlags">68288064</int>
@@ -19188,12 +19042,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {324, 60}}</string>
 									<reference key="NSSuperview" ref="117663985"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{237, 16}, {326, 76}}</string>
 							<reference key="NSSuperview" ref="928014023"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -19214,8 +19066,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{580, 588}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -19964,18 +19814,16 @@
 				<string key="NSWindowContentMaxSize">{580, 592}</string>
 				<string key="NSWindowContentMinSize">{580, 592}</string>
 				<object class="NSView" key="NSWindowView" id="5992307">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<string key="NSFrameSize">{580, 592}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{580, 614}</string>
 				<string key="NSMaxSize">{580, 614}</string>
 			</object>
 			<object class="NSCustomView" id="688926332">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -20015,9 +19863,8 @@
 												<string>public.url</string>
 											</object>
 										</object>
-										<string key="NSFrameSize">{523, 202}</string>
+										<string key="NSFrame">{{0, 69}, {523, 133}}</string>
 										<reference key="NSSuperview" ref="909629174"/>
-										<reference key="NSWindow"/>
 										<object class="NSTextContainer" key="NSTextContainer" id="558063868">
 											<object class="NSLayoutManager" key="NSLayoutManager">
 												<object class="NSTextStorage" key="NSTextStorage">
@@ -20081,7 +19928,6 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {523, 202}}</string>
 								<reference key="NSSuperview" ref="865252730"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="343414037"/>
 								<reference key="NSDocView" ref="343414037"/>
 								<reference key="NSBGColor" ref="991462592"/>
@@ -20093,7 +19939,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{524, 1}, {15, 202}}</string>
 								<reference key="NSSuperview" ref="865252730"/>
-								<reference key="NSWindow"/>
 								<reference key="NSTarget" ref="865252730"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSPercent">0.99248120300751874</double>
@@ -20103,7 +19948,6 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 								<reference key="NSSuperview" ref="865252730"/>
-								<reference key="NSWindow"/>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="865252730"/>
 								<string key="NSAction">_doScroller:</string>
@@ -20113,7 +19957,6 @@
 						</object>
 						<string key="NSFrame">{{20, 61}, {540, 204}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="909629174"/>
 						<int key="NSsFlags">18</int>
 						<reference key="NSVScroller" ref="69605143"/>
@@ -20125,7 +19968,6 @@
 						<int key="NSvFlags">265</int>
 						<string key="NSFrame">{{397, 342}, {166, 28}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="1047843512">
 							<int key="NSCellFlags">69336577</int>
@@ -20154,7 +19996,6 @@
 						</object>
 						<string key="NSFrame">{{365, 340}, {30, 30}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSImageCell" key="NSCell" id="771097799">
 							<int key="NSCellFlags">130560</int>
@@ -20172,7 +20013,6 @@
 						<int key="NSvFlags">288</int>
 						<string key="NSFrame">{{125, 16}, {438, 28}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="266901347">
 							<int key="NSCellFlags">67239424</int>
@@ -20189,7 +20029,6 @@
 						<int key="NSvFlags">34</int>
 						<string key="NSFrame">{{12, 50}, {556, 5}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -20212,7 +20051,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 273}, {546, 28}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="1043590873">
 							<int key="NSCellFlags">67239424</int>
@@ -20229,7 +20067,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 309}, {546, 17}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="828350814">
 							<int key="NSCellFlags">68288064</int>
@@ -20246,7 +20083,6 @@
 						<int key="NSvFlags">10</int>
 						<string key="NSFrame">{{12, 332}, {556, 5}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -20269,7 +20105,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 489}, {546, 42}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="973004211">
 							<int key="NSCellFlags">67239424</int>
@@ -20286,7 +20121,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 539}, {546, 17}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="36139863">
 							<int key="NSCellFlags">68288064</int>
@@ -20303,7 +20137,6 @@
 						<int key="NSvFlags">10</int>
 						<string key="NSFrame">{{12, 478}, {556, 5}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -20326,7 +20159,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 455}, {546, 17}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="71825134">
 							<int key="NSCellFlags">68288064</int>
@@ -20343,7 +20175,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 405}, {546, 42}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="764006935">
 							<int key="NSCellFlags">67239424</int>
@@ -20360,7 +20191,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 347}, {77, 17}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="996430230">
 							<int key="NSCellFlags">68288064</int>
@@ -20377,7 +20207,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 377}, {78, 17}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="917904438">
 							<int key="NSCellFlags">68288064</int>
@@ -20394,7 +20223,6 @@
 						<int key="NSvFlags">266</int>
 						<string key="NSFrame">{{100, 345}, {256, 22}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="464497415">
 							<int key="NSCellFlags">-1804468671</int>
@@ -20412,7 +20240,6 @@
 						<int key="NSvFlags">266</int>
 						<string key="NSFrame">{{100, 375}, {256, 22}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="200930878">
 							<int key="NSCellFlags">-1804468671</int>
@@ -20430,7 +20257,6 @@
 						<int key="NSvFlags">265</int>
 						<string key="NSFrame">{{358, 370}, {209, 32}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="587710438">
 							<int key="NSCellFlags">67239424</int>
@@ -20451,7 +20277,6 @@
 						<int key="NSvFlags">288</int>
 						<string key="NSFrame">{{14, 12}, {112, 32}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="1005178133">
 							<int key="NSCellFlags">67239424</int>
@@ -20469,12 +20294,10 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{580, 567}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="528865158">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -20514,9 +20337,8 @@
 												<string>public.url</string>
 											</object>
 										</object>
-										<string key="NSFrameSize">{524, 80}</string>
+										<string key="NSFrame">{{0, 18}, {524, 62}}</string>
 										<reference key="NSSuperview" ref="158641684"/>
-										<reference key="NSWindow"/>
 										<object class="NSTextContainer" key="NSTextContainer" id="259965128">
 											<object class="NSLayoutManager" key="NSLayoutManager">
 												<object class="NSTextStorage" key="NSTextStorage">
@@ -20580,7 +20402,6 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {524, 80}}</string>
 								<reference key="NSSuperview" ref="894001553"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="70543453"/>
 								<reference key="NSDocView" ref="70543453"/>
 								<reference key="NSBGColor" ref="991462592"/>
@@ -20592,7 +20413,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{525, 1}, {15, 80}}</string>
 								<reference key="NSSuperview" ref="894001553"/>
-								<reference key="NSWindow"/>
 								<reference key="NSTarget" ref="894001553"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSPercent">0.99248120300751874</double>
@@ -20602,7 +20422,6 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 								<reference key="NSSuperview" ref="894001553"/>
-								<reference key="NSWindow"/>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="894001553"/>
 								<string key="NSAction">_doScroller:</string>
@@ -20612,7 +20431,6 @@
 						</object>
 						<string key="NSFrame">{{20, 61}, {541, 82}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="158641684"/>
 						<int key="NSsFlags">18</int>
 						<reference key="NSVScroller" ref="1016206682"/>
@@ -20655,9 +20473,8 @@
 												<string>public.url</string>
 											</object>
 										</object>
-										<string key="NSFrameSize">{523, 71}</string>
+										<string key="NSFrame">{{0, 6}, {523, 65}}</string>
 										<reference key="NSSuperview" ref="631391189"/>
-										<reference key="NSWindow"/>
 										<object class="NSTextContainer" key="NSTextContainer" id="680249763">
 											<object class="NSLayoutManager" key="NSLayoutManager">
 												<object class="NSTextStorage" key="NSTextStorage">
@@ -20721,7 +20538,6 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {523, 80}}</string>
 								<reference key="NSSuperview" ref="1056928026"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="892813377"/>
 								<reference key="NSDocView" ref="892813377"/>
 								<reference key="NSBGColor" ref="991462592"/>
@@ -20733,7 +20549,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{524, 1}, {15, 80}}</string>
 								<reference key="NSSuperview" ref="1056928026"/>
-								<reference key="NSWindow"/>
 								<reference key="NSTarget" ref="1056928026"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSPercent">0.99248120300751874</double>
@@ -20743,7 +20558,6 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 								<reference key="NSSuperview" ref="1056928026"/>
-								<reference key="NSWindow"/>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="1056928026"/>
 								<string key="NSAction">_doScroller:</string>
@@ -20753,7 +20567,6 @@
 						</object>
 						<string key="NSFrame">{{20, 167}, {540, 82}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="631391189"/>
 						<int key="NSsFlags">18</int>
 						<reference key="NSVScroller" ref="115711234"/>
@@ -20765,7 +20578,6 @@
 						<int key="NSvFlags">265</int>
 						<string key="NSFrame">{{397, 342}, {166, 28}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="87023810">
 							<int key="NSCellFlags">69336577</int>
@@ -20794,7 +20606,6 @@
 						</object>
 						<string key="NSFrame">{{365, 340}, {30, 30}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSImageCell" key="NSCell" id="853203050">
 							<int key="NSCellFlags">130560</int>
@@ -20812,7 +20623,6 @@
 						<int key="NSvFlags">288</int>
 						<string key="NSFrame">{{125, 16}, {438, 28}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="835354879">
 							<int key="NSCellFlags">67239424</int>
@@ -20829,7 +20639,6 @@
 						<int key="NSvFlags">34</int>
 						<string key="NSFrame">{{12, 50}, {556, 5}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -20852,7 +20661,6 @@
 						<int key="NSvFlags">256</int>
 						<string key="NSFrame">{{17, 145}, {206, 14}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="696270217">
 							<int key="NSCellFlags">68288064</int>
@@ -20869,7 +20677,6 @@
 						<int key="NSvFlags">256</int>
 						<string key="NSFrame">{{17, 251}, {206, 14}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="652273172">
 							<int key="NSCellFlags">68288064</int>
@@ -20886,7 +20693,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 273}, {546, 28}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="247645440">
 							<int key="NSCellFlags">67239424</int>
@@ -20903,7 +20709,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 309}, {546, 17}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="764833909">
 							<int key="NSCellFlags">68288064</int>
@@ -20920,7 +20725,6 @@
 						<int key="NSvFlags">10</int>
 						<string key="NSFrame">{{12, 332}, {556, 5}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -20943,7 +20747,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 489}, {546, 42}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="814010567">
 							<int key="NSCellFlags">67239424</int>
@@ -20960,7 +20763,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 539}, {546, 17}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="349066047">
 							<int key="NSCellFlags">68288064</int>
@@ -20977,7 +20779,6 @@
 						<int key="NSvFlags">10</int>
 						<string key="NSFrame">{{12, 478}, {556, 5}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -21000,7 +20801,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 455}, {546, 17}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="861186381">
 							<int key="NSCellFlags">68288064</int>
@@ -21017,7 +20817,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 405}, {546, 42}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="808019260">
 							<int key="NSCellFlags">67239424</int>
@@ -21034,7 +20833,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 347}, {77, 17}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="536962846">
 							<int key="NSCellFlags">68288064</int>
@@ -21051,7 +20849,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 377}, {78, 17}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="281005532">
 							<int key="NSCellFlags">68288064</int>
@@ -21068,7 +20865,6 @@
 						<int key="NSvFlags">266</int>
 						<string key="NSFrame">{{100, 345}, {255, 22}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="428210772">
 							<int key="NSCellFlags">-1804468671</int>
@@ -21086,7 +20882,6 @@
 						<int key="NSvFlags">266</int>
 						<string key="NSFrame">{{100, 375}, {255, 22}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="841784751">
 							<int key="NSCellFlags">-1804468671</int>
@@ -21104,7 +20899,6 @@
 						<int key="NSvFlags">265</int>
 						<string key="NSFrame">{{358, 370}, {209, 32}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="966834598">
 							<int key="NSCellFlags">67239424</int>
@@ -21125,7 +20919,6 @@
 						<int key="NSvFlags">288</int>
 						<string key="NSFrame">{{14, 12}, {112, 32}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="444752351">
 							<int key="NSCellFlags">67239424</int>
@@ -21143,12 +20936,10 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{580, 567}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="209000274">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -21157,7 +20948,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{342, 55}, {224, 32}}</string>
 						<reference key="NSSuperview" ref="209000274"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="751339628">
 							<int key="NSCellFlags">67239424</int>
@@ -21178,7 +20968,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 52}, {326, 42}}</string>
 						<reference key="NSSuperview" ref="209000274"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="851027747">
 							<int key="NSCellFlags">67239424</int>
@@ -21195,7 +20984,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{342, 12}, {224, 32}}</string>
 						<reference key="NSSuperview" ref="209000274"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="775891456">
 							<int key="NSCellFlags">67239424</int>
@@ -21216,7 +21004,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{14, 12}, {112, 32}}</string>
 						<reference key="NSSuperview" ref="209000274"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="679515494">
 							<int key="NSCellFlags">67239424</int>
@@ -21245,9 +21032,8 @@
 									<object class="NSTextView" id="1061178666">
 										<reference key="NSNextResponder" ref="310103818"/>
 										<int key="NSvFlags">2322</int>
-										<string key="NSFrameSize">{523, 171}</string>
+										<string key="NSFrame">{{0, 157}, {523, 14}}</string>
 										<reference key="NSSuperview" ref="310103818"/>
-										<reference key="NSWindow"/>
 										<object class="NSTextContainer" key="NSTextContainer" id="831487841">
 											<object class="NSLayoutManager" key="NSLayoutManager">
 												<object class="NSTextStorage" key="NSTextStorage">
@@ -21311,7 +21097,7 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {523, 443}}</string>
 								<reference key="NSSuperview" ref="4253638"/>
-								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="1061178666"/>
 								<reference key="NSDocView" ref="1061178666"/>
 								<reference key="NSBGColor" ref="991462592"/>
 								<reference key="NSCursor" ref="2825"/>
@@ -21322,7 +21108,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{524, 1}, {15, 443}}</string>
 								<reference key="NSSuperview" ref="4253638"/>
-								<reference key="NSWindow"/>
 								<reference key="NSTarget" ref="4253638"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSCurValue">1</double>
@@ -21333,7 +21118,6 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 								<reference key="NSSuperview" ref="4253638"/>
-								<reference key="NSWindow"/>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="4253638"/>
 								<string key="NSAction">_doScroller:</string>
@@ -21343,7 +21127,7 @@
 						</object>
 						<string key="NSFrame">{{20, 102}, {540, 445}}</string>
 						<reference key="NSSuperview" ref="209000274"/>
-						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="310103818"/>
 						<int key="NSsFlags">18</int>
 						<reference key="NSVScroller" ref="941492009"/>
 						<reference key="NSHScroller" ref="437993781"/>
@@ -21351,8 +21135,6 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{580, 567}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomObject" id="1057202244">
@@ -30500,22 +30282,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">troubleshootingBugReportView</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="528865158"/>
-					</object>
-					<int key="connectionID">6447</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">troubleshootingSupportRequestView</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="688926332"/>
-					</object>
-					<int key="connectionID">6448</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
 						<string key="label">troubleshootingWindow</string>
 						<reference key="source" ref="976324537"/>
 						<reference key="destination" ref="768921918"/>
@@ -49099,8 +48865,6 @@
 							<string>prefGeneralView</string>
 							<string>prefWindow</string>
 							<string>prefWindowController</string>
-							<string>troubleshootingBugReportView</string>
-							<string>troubleshootingSupportRequestView</string>
 							<string>troubleshootingWindow</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
@@ -49124,8 +48888,6 @@
 							<string>NSView</string>
 							<string>NSWindow</string>
 							<string>NSObjectController</string>
-							<string>NSView</string>
-							<string>NSView</string>
 							<string>NSWindow</string>
 						</object>
 					</object>
@@ -49152,8 +48914,6 @@
 							<string>prefGeneralView</string>
 							<string>prefWindow</string>
 							<string>prefWindowController</string>
-							<string>troubleshootingBugReportView</string>
-							<string>troubleshootingSupportRequestView</string>
 							<string>troubleshootingWindow</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
@@ -49235,14 +48995,6 @@
 								<string key="candidateClassName">NSObjectController</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">troubleshootingBugReportView</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">troubleshootingSupportRequestView</string>
-								<string key="candidateClassName">NSView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
 								<string key="name">troubleshootingWindow</string>
 								<string key="candidateClassName">NSWindow</string>
 							</object>

Modified: trunk/desmume/src/cocoa/userinterface/appDelegate.h
===================================================================
--- trunk/desmume/src/cocoa/userinterface/appDelegate.h	2012-12-30 09:08:19 UTC (rev 4452)
+++ trunk/desmume/src/cocoa/userinterface/appDelegate.h	2012-12-31 02:01:37 UTC (rev 4453)
@@ -43,8 +43,6 @@
 	NSWindow *migrationWindow;
 	NSView *prefGeneralView;
 	InputPrefsView *inputPrefsView;
-	NSView *troubleshootingSupportRequestView;
-	NSView *troubleshootingBugReportView;
 	
 	NSMenu *mLoadStateSlot;
 	NSMenu *mSaveStateSlot;
@@ -76,8 +74,6 @@
 @property (readonly) IBOutlet NSMenu *mLoadStateSlot;
 @property (readonly) IBOutlet NSMenu *mSaveStateSlot;
 @property (readonly) IBOutlet InputPrefsView *inputPrefsView;
-@... (readonly) IBOutlet NSView *troubleshootingSupportRequestView;
-@... (readonly) IBOutlet NSView *troubleshootingBugReportView;
 
 @property (readonly) IBOutlet NSBox *boxGeneralInfo;
 @property (readonly) IBOutlet NSBox *boxTitles;

Modified: trunk/desmume/src/cocoa/userinterface/appDelegate.mm
===================================================================
--- trunk/desmume/src/cocoa/userinterface/appDelegate.mm	2012-12-30 09:08:19 UTC (rev 4452)
+++ trunk/desmume/src/cocoa/userinterface/appDelegate.mm	2012-12-31 02:01:37 UTC (rev 4453)
@@ -46,8 +46,6 @@
 @synthesize mLoadStateSlot;
 @synthesize mSaveStateSlot;
 @synthesize inputPrefsView;
-@... troubleshootingSupportRequestView;
-@... troubleshootingBugReportView;
 @synthesize fileMigrationList;
 @synthesize aboutWindowController;
 @synthesize emuWindowController;
@@ -125,8 +123,8 @@
 	NSString *buildInfoStr = @"Build Info:";
 	buildInfoStr = [[buildInfoStr stringByAppendingString:[CocoaDSUtil appInternalVersionString]] stringByAppendingString:[CocoaDSUtil appCompilerDetailString]];
 	buildInfoStr = [[buildInfoStr stringByAppendingString:@"\nBuild Date: "] stringByAppendingString:@__DATE__];
-	buildInfoStr = [[buildInfoStr stringByAppendingString:@"\nModel Identifier: "] stringByAppendingString:[CocoaDSUtil modelIdentifierString]];
 	buildInfoStr = [[buildInfoStr stringByAppendingString:@"\nOperating System: "] stringByAppendingString:[CocoaDSUtil operatingSystemString]];
+	buildInfoStr = [[buildInfoStr stringByAppendingString:@"\nModel Identifier: "] stringByAppendingString:[CocoaDSUtil modelIdentifierString]];
 	
 	NSFont *aboutTextFilesFont = [NSFont fontWithName:@"Monaco" size:10];
 	NSMutableDictionary *aboutWindowProperties = [NSMutableDictionary dictionaryWithObjectsAndKeys:

Modified: trunk/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.mm
===================================================================
--- trunk/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.mm	2012-12-30 09:08:19 UTC (rev 4452)
+++ trunk/desmume/src/cocoa/userinterface/troubleshootingWindowDelegate.mm	2012-12-31 02:01:37 UTC (rev 4453)
@@ -67,7 +67,7 @@
 
 - (IBAction) continueToFinalForm:(id)sender
 {
-	static const NSString *unspecifiedStr = @"Unspecified"; // Do not expose localized version for this NSString -- we want this to be in English
+	static NSString *unspecifiedStr = @"Unspecified"; // Do not expose localized version for this NSString -- we want this to be in English
 	
 	// Force end of editing of any text fields.
 	[window makeFirstResponder:nil];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4463
          http://desmume.svn.sourceforge.net/desmume/?rev=4463&view=rev
Author:   rogerman
Date:     2013-01-05 01:32:05 +0000 (Sat, 05 Jan 2013)
Log Message:
-----------
Cocoa Port:
- Do some small optimizations to the windowing system.
- Fix an occasional crashing bug that sometimes occurred when changing the display mode.
- Do some code cleanup.

Modified Paths:
--------------
    trunk/desmume/src/cocoa/cocoa_globals.h
    trunk/desmume/src/cocoa/cocoa_output.h
    trunk/desmume/src/cocoa/cocoa_output.mm
    trunk/desmume/src/cocoa/userinterface/displayView.h
    trunk/desmume/src/cocoa/userinterface/displayView.mm
    trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.mm

Modified: trunk/desmume/src/cocoa/cocoa_globals.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_globals.h	2013-01-04 01:40:52 UTC (rev 4462)
+++ trunk/desmume/src/cocoa/cocoa_globals.h	2013-01-05 01:32:05 UTC (rev 4463)
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2012 DeSmuME team
+	Copyright (C) 2013 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -352,6 +352,7 @@
 	
 	// Video Messages
 	MESSAGE_RESIZE_VIEW,
+	MESSAGE_TRANSFORM_VIEW,
 	MESSAGE_REDRAW_VIEW,
 	MESSAGE_SET_GPU_STATE_FLAGS,
 	MESSAGE_CHANGE_DISPLAY_TYPE,

Modified: trunk/desmume/src/cocoa/cocoa_output.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_output.h	2013-01-04 01:40:52 UTC (rev 4462)
+++ trunk/desmume/src/cocoa/cocoa_output.h	2013-01-05 01:32:05 UTC (rev 4463)
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2012 DeSmuME team
+	Copyright (C) 2013 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -23,11 +23,28 @@
 #import "cocoa_util.h"
 
 
+typedef struct
+{
+	double	scale;
+	double	rotation;		// Angle is in degrees
+	double	translationX;
+	double	translationY;
+	double	translationZ;
+} DisplayOutputTransformData;
+
+typedef struct
+{
+	NSInteger displayModeID;
+	unsigned int width;			// Measured in pixels
+	unsigned int height;		// Measured in pixels
+} DisplaySrcPixelAttributes;
+
 @interface CocoaDSOutput : CocoaDSThread
 {
 	BOOL isStateChanged;
 	NSUInteger frameCount;
 	NSData *frameData;
+	NSData *frameAttributesData;
 	NSMutableDictionary *property;
 	
 	pthread_mutex_t *mutexProducer;
@@ -37,12 +54,13 @@
 @property (assign) BOOL isStateChanged;
 @property (assign) NSUInteger frameCount;
 @property (retain) NSData *frameData;
+@property (retain) NSData *frameAttributesData;
 @property (readonly) NSMutableDictionary *property;
 @property (assign) pthread_mutex_t *mutexProducer;
 @property (readonly) pthread_mutex_t *mutexConsume;
 
 - (void) doCoreEmuFrame;
-- (void) handleEmuFrameProcessed:(NSData *)theData;
+- (void) handleEmuFrameProcessed:(NSData *)mainData attributes:(NSData *)attributesData;
 
 @end
 
@@ -95,7 +113,7 @@
 @protocol CocoaDSDisplayDelegate <NSObject>
 
 @required
-- (void) doDisplayTypeChanged:(NSInteger)displayTypeID;
+- (void) doDisplayModeChanged:(NSInteger)displayModeID;
 
 @property (retain) NSPort *sendPortDisplay;
 @property (assign) BOOL isHudEnabled;
@@ -107,10 +125,11 @@
 
 @required
 - (void) doInitVideoOutput:(NSDictionary *)properties;
-- (void) doProcessVideoFrame:(const void *)videoFrameData frameSize:(NSSize)frameSize;
+- (void) doProcessVideoFrame:(const void *)videoFrameData displayMode:(const NSInteger)displayModeID width:(const NSInteger)frameWidth height:(const NSInteger)frameHeight;
 
 @optional
 - (void) doResizeView:(NSRect)rect;
+- (void) doTransformView:(DisplayOutputTransformData *)transformData;
 - (void) doRedraw;
 - (void) doDisplayOrientationChanged:(NSInteger)displayOrientationID;
 - (void) doDisplayOrderChanged:(NSInteger)displayOrderID;
@@ -125,7 +144,7 @@
 {
 	UInt32 gpuStateFlags;
 	id <CocoaDSDisplayDelegate> delegate;
-	NSInteger displayType;
+	NSInteger displayMode;
 	NSSize frameSize;
 	
 	pthread_mutex_t *mutexRender3D;
@@ -144,7 +163,7 @@
 
 @property (assign) UInt32 gpuStateFlags;
 @property (retain) id <CocoaDSDisplayDelegate> delegate;
-@... (assign) NSInteger displayType;
+@property (assign) NSInteger displayMode;
 @property (readonly) NSSize frameSize;
 @property (readonly) pthread_mutex_t *mutexRender3D;
 
@@ -166,7 +185,7 @@
 - (BOOL) render3DLineHack;
 
 - (void) handleChangeGpuStateFlags:(NSData *)flagsData;
-- (void) handleChangeDisplayType:(NSData *)displayTypeIdData;
+- (void) handleChangeDisplayMode:(NSData *)displayModeData;
 - (void) handleSetRender3DRenderingEngine:(NSData *)methodIdData;
 - (void) handleSetRender3DHighPrecisionColorInterpolation:(NSData *)stateData;
 - (void) handleSetRender3DEdgeMarking:(NSData *)stateData;
@@ -180,7 +199,7 @@
 - (void) handleRequestScreenshot:(NSData *)fileURLStringData fileTypeData:(NSData *)fileTypeData;
 - (void) handleCopyToPasteboard;
 
-- (void) fillVideoFrameWithColor:(UInt8)colorValue;
+- (void) fillVideoFrameWithColor:(UInt16)colorValue;
 
 - (NSImage *) image;
 - (NSBitmapImageRep *) bitmapImageRep;
@@ -196,15 +215,17 @@
 {
 	CocoaVideoFilter *vf;
 	id <CocoaDSDisplayVideoDelegate> videoDelegate;
+	NSInteger lastDisplayMode;
 		
 	OSSpinLock spinlockVideoFilterType;
-	OSSpinLock spinlockVfSrcBuffer;
+	OSSpinLock spinlockVFBuffers;
 }
 
 @property (retain) id <CocoaDSDisplayVideoDelegate> delegate;
 @property (assign) CocoaVideoFilter *vf;
 
 - (void) handleResizeView:(NSData *)rectData;
+- (void) handleTransformView:(NSData *)transformData;
 - (void) handleRedrawView;
 - (void) handleChangeDisplayOrientation:(NSData *)displayOrientationIdData;
 - (void) handleChangeDisplayOrder:(NSData *)displayOrderIdData;
@@ -220,10 +241,10 @@
 #endif
 
 void HandleMessageEchoResponse(NSPortMessage *portMessage);
-void SetGPULayerState(int displayType, unsigned int i, bool state);
-bool GetGPULayerState(int displayType, unsigned int i);
-void SetGPUDisplayState(int displayType, bool state);
-bool GetGPUDisplayState(int displayType);
+void SetGPULayerState(int gpuType, unsigned int i, bool state);
+bool GetGPULayerState(int gpuType, unsigned int i);
+void SetGPUDisplayState(int gpuType, bool state);
+bool GetGPUDisplayState(int gpuType);
 
 void SetOpenGLRendererFunctions(bool (*initFunction)(),
 								bool (*beginOGLFunction)(),

Modified: trunk/desmume/src/cocoa/cocoa_output.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_output.mm	2013-01-04 01:40:52 UTC (rev 4462)
+++ trunk/desmume/src/cocoa/cocoa_output.mm	2013-01-05 01:32:05 UTC (rev 4463)
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2012 DeSmuME team
+	Copyright (C) 2013 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -45,6 +45,7 @@
 @synthesize isStateChanged;
 @synthesize frameCount;
 @synthesize frameData;
+@synthesize frameAttributesData;
 @synthesize property;
 @synthesize mutexProducer;
 @synthesize mutexConsume;
@@ -60,6 +61,7 @@
 	isStateChanged = NO;
 	frameCount = 0;
 	frameData = nil;
+	frameAttributesData = nil;
 	
 	property = [[NSMutableDictionary alloc] init];
 	[property setValue:[NSDate date] forKey:@"outputTime"];
@@ -85,6 +87,7 @@
 	}
 	
 	self.frameData = nil;
+	self.frameAttributesData = nil;
 	[property release];
 	
 	pthread_mutex_destroy(mutexConsume);
@@ -107,7 +110,7 @@
 	switch (message)
 	{
 		case MESSAGE_EMU_FRAME_PROCESSED:
-			[self handleEmuFrameProcessed:[messageComponents objectAtIndex:0]];
+			[self handleEmuFrameProcessed:[messageComponents objectAtIndex:0] attributes:[messageComponents objectAtIndex:1]];
 			break;
 			
 		default:
@@ -116,10 +119,11 @@
 	}
 }
 
-- (void) handleEmuFrameProcessed:(NSData *)theData
+- (void) handleEmuFrameProcessed:(NSData *)mainData attributes:(NSData *)attributesData
 {
 	self.frameCount++;
-	self.frameData = theData;
+	self.frameData = mainData;
+	self.frameAttributesData = attributesData;
 }
 
 @end
@@ -353,7 +357,7 @@
 	switch (message)
 	{
 		case MESSAGE_EMU_FRAME_PROCESSED:
-			[self handleEmuFrameProcessed:nil];
+			[self handleEmuFrameProcessed:nil attributes:nil];
 			break;
 			
 		case MESSAGE_SET_AUDIO_PROCESS_METHOD:
@@ -386,47 +390,47 @@
 	}
 }
 
-- (void) handleEmuFrameProcessed:(NSData *)theData
+- (void) handleEmuFrameProcessed:(NSData *)mainData attributes:(NSData *)attributesData
 {
 	SPU_Emulate_user();
 	
-	[super handleEmuFrameProcessed:theData];
+	[super handleEmuFrameProcessed:mainData attributes:attributesData];
 }
 
 - (void) handleSetVolume:(NSData *)volumeData
 {
-	const float *vol = (float *)[volumeData bytes];
-	[self setVolume:*vol];
+	const float vol = *(float *)[volumeData bytes];
+	[self setVolume:vol];
 }
 
 - (void) handleSetAudioOutputEngine:(NSData *)methodIdData
 {
-	const NSInteger *methodID = (NSInteger *)[methodIdData bytes];
-	[self setAudioOutputEngine:*methodID];
+	const NSInteger methodID = *(NSInteger *)[methodIdData bytes];
+	[self setAudioOutputEngine:methodID];
 }
 
 - (void) handleSetSpuAdvancedLogic:(NSData *)stateData
 {
-	const BOOL *theState = (BOOL *)[stateData bytes];
-	[self setSpuAdvancedLogic:*theState];
+	const BOOL theState = *(BOOL *)[stateData bytes];
+	[self setSpuAdvancedLogic:theState];
 }
 
 - (void) handleSetSpuSyncMode:(NSData *)modeIdData
 {
-	const NSInteger *modeID = (NSInteger *)[modeIdData bytes];
-	[self setSpuSyncMode:*modeID];
+	const NSInteger modeID = *(NSInteger *)[modeIdData bytes];
+	[self setSpuSyncMode:modeID];
 }
 
 - (void) handleSetSpuSyncMethod:(NSData *)methodIdData
 {
-	const NSInteger *methodID = (NSInteger *)[methodIdData bytes];
-	[self setSpuSyncMethod:*methodID];
+	const NSInteger methodID = *(NSInteger *)[methodIdData bytes];
+	[self setSpuSyncMethod:methodID];
 }
 
 - (void) handleSetSpuInterpolationMode:(NSData *)modeIdData
 {
-	const NSInteger *modeID = (NSInteger *)[modeIdData bytes];
-	[self setSpuInterpolationMode:*modeID];
+	const NSInteger modeID = *(NSInteger *)[modeIdData bytes];
+	[self setSpuInterpolationMode:modeID];
 }
 
 @end
@@ -435,7 +439,7 @@
 
 @synthesize gpuStateFlags;
 @dynamic delegate;
-@... displayType;
+@dynamic displayMode;
 @dynamic frameSize;
 @synthesize mutexRender3D;
 
@@ -462,7 +466,8 @@
 	spinlockRender3DThreads = OS_SPINLOCK_INIT;
 	spinlockRender3DLineHack = OS_SPINLOCK_INIT;
 	
-	displayType = DS_DISPLAY_TYPE_COMBO;
+	delegate = nil;
+	displayMode = DS_DISPLAY_TYPE_COMBO;
 	frameSize = NSMakeSize((CGFloat)GPU_DISPLAY_WIDTH, (CGFloat)GPU_DISPLAY_HEIGHT * 2);
 	
 	gpuStateFlags =	GPUSTATE_MAIN_GPU_MASK |
@@ -478,10 +483,6 @@
 	GPUSTATE_SUB_BG3_MASK |
 	GPUSTATE_SUB_OBJ_MASK;
 	
-	frameCount = 0;
-	frameData = nil;
-	delegate = nil;
-	
 	[property setValue:[NSNumber numberWithBool:YES] forKey:@"gpuStateMainGPU"];
 	[property setValue:[NSNumber numberWithBool:YES] forKey:@"gpuStateMainBG0"];
 	[property setValue:[NSNumber numberWithBool:YES] forKey:@"gpuStateMainBG1"];
@@ -494,7 +495,7 @@
 	[property setValue:[NSNumber numberWithBool:YES] forKey:@"gpuStateSubBG2"];
 	[property setValue:[NSNumber numberWithBool:YES] forKey:@"gpuStateSubBG3"];
 	[property setValue:[NSNumber numberWithBool:YES] forKey:@"gpuStateSubOBJ"];
-	[property setValue:[NSNumber numberWithInteger:displayType] forKey:@"displayMode"];
+	[property setValue:[NSNumber numberWithInteger:displayMode] forKey:@"displayMode"];
 	[property setValue:NSSTRING_DISPLAYMODE_MAIN forKey:@"displayModeString"];
 	[property setValue:[NSNumber numberWithInteger:CORE3DLIST_NULL] forKey:@"render3DRenderingEngine"];
 	[property setValue:[NSNumber numberWithBool:YES] forKey:@"render3DHighPrecisionColorInterpolation"];
@@ -702,12 +703,12 @@
 	return flags;
 }
 
-- (void) setDisplayType:(NSInteger)dispType
+- (void) setDisplayMode:(NSInteger)displayModeID
 {
 	NSString *newDispString = nil;
 	NSSize newFrameSize = NSMakeSize((CGFloat)GPU_DISPLAY_WIDTH, (CGFloat)GPU_DISPLAY_HEIGHT);
 	
-	switch (dispType)
+	switch (displayModeID)
 	{
 		case DS_DISPLAY_TYPE_MAIN:
 			newDispString = NSSTRING_DISPLAYMODE_MAIN;
@@ -728,20 +729,20 @@
 	}
 	
 	OSSpinLockLock(&spinlockDisplayType);
-	displayType = dispType;
+	displayMode = displayModeID;
 	frameSize = newFrameSize;
-	[property setValue:[NSNumber numberWithInteger:dispType] forKey:@"displayMode"];
+	[property setValue:[NSNumber numberWithInteger:displayModeID] forKey:@"displayMode"];
 	[property setValue:newDispString forKey:@"displayModeString"];
 	OSSpinLockUnlock(&spinlockDisplayType);
 }
 
-- (NSInteger) displayType
+- (NSInteger) displayMode
 {
 	OSSpinLockLock(&spinlockDisplayType);
-	NSInteger dispType = displayType;
+	NSInteger displayModeID = displayMode;
 	OSSpinLockUnlock(&spinlockDisplayType);
 	
-	return dispType;
+	return displayModeID;
 }
 
 - (NSSize) frameSize
@@ -977,29 +978,36 @@
 - (void) doCoreEmuFrame
 {
 	NSData *gpuData = nil;
-	NSInteger dispType = self.displayType;
+	NSInteger displayModeID = [self displayMode];
+	NSSize displayFrameSize = [self frameSize];
 	
 	// Here, we copy the raw GPU data from the emulation core.
 	// 
 	// The core data contains the GPU pixels from both the main and touch screens. So
 	// depending on the display type, we copy only the pixels from the respective screen.
-	if (dispType == DS_DISPLAY_TYPE_MAIN)
+	if (displayModeID == DS_DISPLAY_TYPE_MAIN)
 	{
 		gpuData = [[NSData alloc] initWithBytes:GPU_screen length:GPU_SCREEN_SIZE_BYTES];
 	}
-	else if(dispType == DS_DISPLAY_TYPE_TOUCH)
+	else if(displayModeID == DS_DISPLAY_TYPE_TOUCH)
 	{
 		gpuData = [[NSData alloc] initWithBytes:(GPU_screen + GPU_SCREEN_SIZE_BYTES) length:GPU_SCREEN_SIZE_BYTES];
 	}
-	else if(dispType == DS_DISPLAY_TYPE_COMBO)
+	else if(displayModeID == DS_DISPLAY_TYPE_COMBO)
 	{
 		gpuData = [[NSData alloc] initWithBytes:GPU_screen length:GPU_SCREEN_SIZE_BYTES * 2];
 	}
 	
-	[CocoaDSUtil messageSendOneWayWithData:self.receivePort msgID:MESSAGE_EMU_FRAME_PROCESSED data:gpuData];
+	DisplaySrcPixelAttributes attr = {displayModeID, (unsigned int)displayFrameSize.width, (unsigned int)displayFrameSize.height};
+	NSData *attributesData = [[NSData alloc] initWithBytes:&attr length:sizeof(DisplaySrcPixelAttributes)];
 	
+	NSArray *messageComponents = [[NSArray alloc] initWithObjects:gpuData, attributesData, nil];
+	[CocoaDSUtil messageSendOneWayWithMessageComponents:self.receivePort msgID:MESSAGE_EMU_FRAME_PROCESSED array:messageComponents];
+	
 	// Now that we've finished sending the GPU data, release the local copy.
 	[gpuData release];
+	[attributesData release];
+	[messageComponents release];
 }
 
 - (void)handlePortMessage:(NSPortMessage *)portMessage
@@ -1010,7 +1018,7 @@
 	switch (message)
 	{
 		case MESSAGE_EMU_FRAME_PROCESSED:
-			[self handleEmuFrameProcessed:[messageComponents objectAtIndex:0]];
+			[self handleEmuFrameProcessed:[messageComponents objectAtIndex:0] attributes:[messageComponents objectAtIndex:1]];
 			break;
 			
 		case MESSAGE_SET_GPU_STATE_FLAGS:
@@ -1018,7 +1026,7 @@
 			break;
 			
 		case MESSAGE_CHANGE_DISPLAY_TYPE:
-			[self handleChangeDisplayType:[messageComponents objectAtIndex:0]];
+			[self handleChangeDisplayMode:[messageComponents objectAtIndex:0]];
 			break;
 			
 		case MESSAGE_SET_RENDER3D_METHOD:
@@ -1075,97 +1083,97 @@
 	}
 }
 
-- (void) handleEmuFrameProcessed:(NSData *)theData
+- (void) handleEmuFrameProcessed:(NSData *)mainData attributes:(NSData *)attributesData
 {
-	[super handleEmuFrameProcessed:theData];
+	[super handleEmuFrameProcessed:mainData attributes:attributesData];
 }
 
 - (void) handleChangeGpuStateFlags:(NSData *)flagsData
 {
-	const NSInteger *flags = (NSInteger *)[flagsData bytes];
-	self.gpuStateFlags = (UInt32)*flags;
-	[self handleEmuFrameProcessed:self.frameData];
+	const NSInteger flags = *(NSInteger *)[flagsData bytes];
+	self.gpuStateFlags = (UInt32)flags;
+	[self handleEmuFrameProcessed:self.frameData attributes:self.frameAttributesData];
 }
 
-- (void) handleChangeDisplayType:(NSData *)displayTypeIdData
+- (void) handleChangeDisplayMode:(NSData *)displayModeData
 {
-	if (delegate == nil || ![delegate respondsToSelector:@selector(doDisplayTypeChanged:)])
+	if (delegate == nil || ![delegate respondsToSelector:@selector(doDisplayModeChanged:)])
 	{
 		return;
 	}
 	
-	const NSInteger *theType = (NSInteger *)[displayTypeIdData bytes];
-	self.displayType = *theType;
-	[delegate doDisplayTypeChanged:*theType];
+	const NSInteger displayModeID = *(NSInteger *)[displayModeData bytes];
+	self.displayMode = displayModeID;
+	[delegate doDisplayModeChanged:displayModeID];
 }
 
 - (void) handleSetRender3DRenderingEngine:(NSData *)methodIdData
 {
-	const NSInteger *methodID = (NSInteger *)[methodIdData bytes];
-	[self setRender3DRenderingEngine:*methodID];
+	const NSInteger methodID = *(NSInteger *)[methodIdData bytes];
+	[self setRender3DRenderingEngine:methodID];
 }
 
 - (void) handleSetRender3DHighPrecisionColorInterpolation:(NSData *)stateData
 {
-	const BOOL *theState = (BOOL *)[stateData bytes];
-	[self setRender3DHighPrecisionColorInterpolation:*theState];
+	const BOOL theState = *(BOOL *)[stateData bytes];
+	[self setRender3DHighPrecisionColorInterpolation:theState];
 }
 
 - (void) handleSetRender3DEdgeMarking:(NSData *)stateData
 {
-	const BOOL *theState = (BOOL *)[stateData bytes];
-	[self setRender3DEdgeMarking:*theState];
+	const BOOL theState = *(BOOL *)[stateData bytes];
+	[self setRender3DEdgeMarking:theState];
 }
 
 - (void) handleSetRender3DFog:(NSData *)stateData
 {
-	const BOOL *theState = (BOOL *)[stateData bytes];
-	[self setRender3DFog:*theState];
+	const BOOL theState = *(BOOL *)[stateData bytes];
+	[self setRender3DFog:theState];
 }
 
 - (void) handleSetRender3DTextures:(NSData *)stateData
 {
-	const BOOL *theState = (BOOL *)[stateData bytes];
-	[self setRender3DTextures:*theState];
+	const BOOL theState = *(BOOL *)[stateData bytes];
+	[self setRender3DTextures:theState];
 }
 
 - (void) handleSetRender3DDepthComparisonThreshold:(NSData *)thresholdData
 {
-	const NSUInteger *threshold = (NSUInteger *)[thresholdData bytes];
-	[self setRender3DDepthComparisonThreshold:*threshold];
+	const NSUInteger threshold = *(NSUInteger *)[thresholdData bytes];
+	[self setRender3DDepthComparisonThreshold:threshold];
 }
 
 - (void) handleSetRender3DThreads:(NSData *)numberThreadsData
 {
-	const NSUInteger *numberThreads = (NSUInteger *)[numberThreadsData bytes];
-	[self setRender3DThreads:*numberThreads];
+	const NSUInteger numberThreads = *(NSUInteger *)[numberThreadsData bytes];
+	[self setRender3DThreads:numberThreads];
 }
 
 - (void) handleSetRender3DLineHack:(NSData *)stateData
 {
-	const BOOL *theState = (BOOL *)[stateData bytes];
-	[self setRender3DLineHack:*theState];
+	const BOOL theState = *(BOOL *)[stateData bytes];
+	[self setRender3DLineHack:theState];
 }
 
 - (void) handleSetViewToBlack
 {
-	[self fillVideoFrameWithColor:0];
+	[self fillVideoFrameWithColor:0x8000];
 }
 
 - (void) handleSetViewToWhite
 {
-	[self fillVideoFrameWithColor:255];
+	[self fillVideoFrameWithColor:0xFFFF];
 }
 
 - (void) handleRequestScreenshot:(NSData *)fileURLStringData fileTypeData:(NSData *)fileTypeData
 {
 	NSString *fileURLString = [[NSString alloc] initWithData:fileURLStringData encoding:NSUTF8StringEncoding];
 	NSURL *fileURL = [NSURL URLWithString:fileURLString];
-	NSBitmapImageFileType *fileType = (NSBitmapImageFileType *)[fileTypeData bytes];	
+	NSBitmapImageFileType fileType = *(NSBitmapImageFileType *)[fileTypeData bytes];	
 	
 	NSDictionary *userInfo = [[NSDictionary alloc] initWithObjectsAndKeys:
 							  fileURL, @"fileURL", 
-							  [NSNumber numberWithInteger:(NSInteger)*fileType], @"fileType",
+							  [NSNumber numberWithInteger:(NSInteger)fileType], @"fileType",
 							  [self image], @"screenshotImage",
 							  nil];
 	
@@ -1188,22 +1196,35 @@
 	[pboard setData:[screenshot TIFFRepresentationUsingCompression:NSTIFFCompressionLZW factor:1.0f] forType:NSTIFFPboardType];
 }
 
-- (void) fillVideoFrameWithColor:(UInt8)colorValue
+- (void) fillVideoFrameWithColor:(UInt16)colorValue
 {
-	UInt16 *gpuBytes = (UInt16 *)malloc(GPU_SCREEN_SIZE_BYTES * 2);
+	NSData *gpuData = nil;
+	NSInteger displayModeID = [self displayMode];
+	NSSize displayFrameSize = [self frameSize];
+	size_t numberBytes = GPU_SCREEN_SIZE_BYTES * 2;
+	
+	if (displayModeID == DS_DISPLAY_TYPE_MAIN || displayModeID == DS_DISPLAY_TYPE_TOUCH)
+	{
+		numberBytes = GPU_SCREEN_SIZE_BYTES;
+	}
+	
+	UInt16 *gpuBytes = (UInt16 *)malloc(numberBytes);
 	if (gpuBytes == NULL)
 	{
 		return;
 	}
 	
-	memset(gpuBytes, colorValue, GPU_SCREEN_SIZE_BYTES * 2);
+	const UInt16 colorValuePattern[] = {colorValue, colorValue, colorValue, colorValue, colorValue, colorValue, colorValue, colorValue};
+	memset_pattern16(gpuBytes, colorValuePattern, numberBytes);
+	gpuData = [[[NSData alloc] initWithBytes:gpuBytes length:numberBytes] autorelease];
 	
-	NSData *gpuData = [[[NSData alloc] initWithBytes:gpuBytes length:GPU_SCREEN_SIZE_BYTES * 2] autorelease];
-	
 	free(gpuBytes);
 	gpuBytes = nil;
 	
-	[self handleEmuFrameProcessed:gpuData];
+	DisplaySrcPixelAttributes attr = {displayModeID, (unsigned int)displayFrameSize.width, (unsigned int)displayFrameSize.height};
+	NSData *attributesData = [[[NSData alloc] initWithBytes:&attr length:sizeof(DisplaySrcPixelAttributes)] autorelease];
+	
+	[self handleEmuFrameProcessed:gpuData attributes:attributesData];
 }
 
 - (NSImage *) image
@@ -1384,9 +1405,10 @@
 	}
 	
 	videoDelegate = nil;
+	lastDisplayMode = DS_DISPLAY_TYPE_COMBO;
 	
 	spinlockVideoFilterType = OS_SPINLOCK_INIT;
-	spinlockVfSrcBuffer = OS_SPINLOCK_INIT;
+	spinlockVFBuffers = OS_SPINLOCK_INIT;
 	
 	if ([[NSProcessInfo processInfo] activeProcessorCount] >= 2)
 	{
@@ -1443,18 +1465,11 @@
 	return theDelegate;
 }
 
-- (void) setDisplayType:(NSInteger)dispType
-{
-	[super setDisplayType:dispType];
-	
-	OSSpinLockLock(&spinlockVfSrcBuffer);
-	[vf setSourceSize:self.frameSize];
-	OSSpinLockUnlock(&spinlockVfSrcBuffer);
-}
-
 - (void) setVfType:(NSInteger)videoFilterTypeID
 {
+	OSSpinLockLock(&spinlockVFBuffers);
 	[vf changeFilter:(VideoFilterTypeID)videoFilterTypeID];
+	OSSpinLockUnlock(&spinlockVFBuffers);
 	
 	OSSpinLockLock(&spinlockVideoFilterType);
 	[property setValue:[NSNumber numberWithInteger:videoFilterTypeID] forKey:@"videoFilterType"];
@@ -1488,13 +1503,17 @@
 	switch (message)
 	{
 		case MESSAGE_EMU_FRAME_PROCESSED:
-			[self handleEmuFrameProcessed:[messageComponents objectAtIndex:0]];
+			[self handleEmuFrameProcessed:[messageComponents objectAtIndex:0] attributes:[messageComponents objectAtIndex:1]];
 			break;
 			
 		case MESSAGE_RESIZE_VIEW:
 			[self handleResizeView:[messageComponents objectAtIndex:0]];
 			break;
 			
+		case MESSAGE_TRANSFORM_VIEW:
+			[self handleTransformView:[messageComponents objectAtIndex:0]];
+			break;
+			
 		case MESSAGE_REDRAW_VIEW:
 			[self handleRedrawView];
 			break;
@@ -1525,39 +1544,43 @@
 	}
 }
 
-- (void) handleEmuFrameProcessed:(NSData *)theData
+- (void) handleEmuFrameProcessed:(NSData *)mainData attributes:(NSData *)attributesData
 {
-	if (theData == nil)
+	if (mainData == nil || attributesData == nil)
 	{
 		return;
 	}
 	
-	NSSize destSize = [vf destSize];
-	size_t dataSize = (size_t)destSize.width * (size_t)destSize.height * sizeof(UInt32);
-	if ([vf typeID] == VideoFilterTypeID_None)
+	const DisplaySrcPixelAttributes attr = *(DisplaySrcPixelAttributes *)[attributesData bytes];
+	const NSInteger displayModeID = attr.displayModeID;
+	
+	// Tell the video delegate to process the video frame with our copied GPU data.
+	OSSpinLockLock(&spinlockVFBuffers);
+	
+	if (lastDisplayMode != displayModeID)
 	{
-		destSize = self.frameSize;
-		dataSize = (size_t)destSize.width * (size_t)destSize.height * sizeof(UInt16);
+		const NSSize newSrcSize = NSMakeSize((CGFloat)attr.width, (CGFloat)attr.height);
+		[vf setSourceSize:newSrcSize];
+		lastDisplayMode = displayModeID;
 	}
 	
-	// Tell the video delegate to process the video frame with our copied GPU data.
+	const NSInteger destWidth = (NSInteger)[vf destSize].width;
+	const NSInteger destHeight = (NSInteger)[vf destSize].height;
+	
 	if ([vf typeID] == VideoFilterTypeID_None)
 	{
-		[videoDelegate doProcessVideoFrame:[theData bytes] frameSize:self.frameSize];
+		[videoDelegate doProcessVideoFrame:[mainData bytes] displayMode:displayModeID width:destWidth height:destHeight];
 	}
 	else
 	{
-		NSSize srcSize = [vf srcSize];
-		
-		OSSpinLockLock(&spinlockVfSrcBuffer);
-		RGBA5551ToRGBA8888Buffer((const uint16_t *)[theData bytes], (uint32_t *)[vf srcBufferPtr], ((unsigned int)srcSize.width * (unsigned int)srcSize.height));
-		OSSpinLockUnlock(&spinlockVfSrcBuffer);
-		
-		UInt32 *vfDestBuffer = [vf runFilter];
-		[videoDelegate doProcessVideoFrame:vfDestBuffer frameSize:[vf destSize]];
+		RGBA5551ToRGBA8888Buffer((const uint16_t *)[mainData bytes], (uint32_t *)[vf srcBufferPtr], [mainData length] / sizeof(UInt16));
+		const UInt32 *vfDestBuffer = [vf runFilter];
+		[videoDelegate doProcessVideoFrame:vfDestBuffer displayMode:displayModeID width:destWidth height:destHeight];
 	}
+	
+	OSSpinLockUnlock(&spinlockVFBuffers);
 		
-	[super handleEmuFrameProcessed:theData];
+	[super handleEmuFrameProcessed:mainData attributes:attributesData];
 }
 
 - (void) handleResizeView:(NSData *)rectData
@@ -1567,10 +1590,20 @@
 		return;
 	}
 	
-	const NSRect *resizeRect = (NSRect *)[rectData bytes];
-	[videoDelegate doResizeView:*resizeRect];
+	const NSRect resizeRect = *(NSRect *)[rectData bytes];
+	[videoDelegate doResizeView:resizeRect];
 }
 
+- (void) handleTransformView:(NSData *)transformData
+{
+	if (videoDelegate == nil || ![videoDelegate respondsToSelector:@selector(doTransformView:)])
+	{
+		return;
+	}
+	
+	[videoDelegate doTransformView:(DisplayOutputTransformData *)[transformData bytes]];
+}
+
 - (void) handleRedrawView
 {
 	if (videoDelegate == nil || ![videoDelegate respondsToSelector:@selector(doRedraw)])
@@ -1588,8 +1621,8 @@
 		return;
 	}
 	
-	const NSInteger *theOrientation = (NSInteger *)[displayOrientationIdData bytes];
-	[videoDelegate doDisplayOrientationChanged:*theOrientation];
+	const NSInteger theOrientation = *(NSInteger *)[displayOrientationIdData bytes];
+	[videoDelegate doDisplayOrientationChanged:theOrientation];
 }
 
 - (void) handleChangeDisplayOrder:(NSData *)displayOrderIdData
@@ -1599,8 +1632,8 @@
 		return;
 	}
 	
-	const NSInteger *theOrder = (NSInteger *)[displayOrderIdData bytes];
-	[videoDelegate doDisplayOrderChanged:*theOrder];
+	const NSInteger theOrder = *(NSInteger *)[displayOrderIdData bytes];
+	[videoDelegate doDisplayOrderChanged:theOrder];
 }
 
 - (void) handleChangeBilinearOutput:(NSData *)bilinearStateData
@@ -1610,9 +1643,9 @@
 		return;
 	}
 	
-	const BOOL *theState = (BOOL *)[bilinearStateData bytes];
-	[videoDelegate doBilinearOutputChanged:*theState];
-	[self handleEmuFrameProcessed:self.frameData];
+	const BOOL theState = *(BOOL *)[bilinearStateData bytes];
+	[videoDelegate doBilinearOutputChanged:theState];
+	[self handleEmuFrameProcessed:self.frameData attributes:self.frameAttributesData];
 }
 
 - (void) handleChangeVerticalSync:(NSData *)verticalSyncStateData
@@ -1622,8 +1655,8 @@
 		return;
 	}
 	
-	const BOOL *theState = (BOOL *)[verticalSyncStateData bytes];
-	[videoDelegate doVerticalSyncChanged:*theState];
+	const BOOL theState = *(BOOL *)[verticalSyncStateData bytes];
+	[videoDelegate doVerticalSyncChanged:theState];
 }
 
 - (void) handleChangeVideoFilter:(NSData *)videoFilterTypeIdData
@@ -1633,10 +1666,10 @@
 		return;
 	}
 	
-	const NSInteger *theType = (NSInteger *)[videoFilterTypeIdData bytes];
-	[self setVfType:*theType];
-	[videoDelegate doVideoFilterChanged:*theType frameSize:[vf destSize]];
-	[self handleEmuFrameProcessed:self.frameData];
+	const NSInteger theType = *(NSInteger *)[videoFilterTypeIdData bytes];
+	[self setVfType:theType];
+	[videoDelegate doVideoFilterChanged:theType frameSize:[vf destSize]];
+	[self handleEmuFrameProcessed:self.frameData attributes:self.frameAttributesData];
 }
 
 @end
@@ -1651,7 +1684,7 @@
 	[sendDate release];
 }
 
-void SetGPULayerState(int displayType, unsigned int i, bool state)
+void SetGPULayerState(int gpuType, unsigned int i, bool state)
 {
 	GPU *theGpu = NULL;
 	
@@ -1661,7 +1694,7 @@
 		return;
 	}
 	
-	switch (displayType)
+	switch (gpuType)
 	{
 		case DS_GPU_TYPE_MAIN:
 			theGpu = SubScreen.gpu;
@@ -1693,7 +1726,7 @@
 	}
 }
 
-bool GetGPULayerState(int displayType, unsigned int i)
+bool GetGPULayerState(int gpuType, unsigned int i)
 {
 	bool result = false;
 	
@@ -1703,7 +1736,7 @@
 		return result;
 	}
 	
-	switch (displayType)
+	switch (gpuType)
 	{
 		case DS_GPU_TYPE_MAIN:
 			if (SubScreen.gpu != nil)
@@ -1733,9 +1766,9 @@
 	return result;
 }
 
-void SetGPUDisplayState(int displayType, bool state)
+void SetGPUDisplayState(int gpuType, bool state)
 {
-	switch (displayType)
+	switch (gpuType)
 	{
 		case DS_GPU_TYPE_MAIN:
 			CommonSettings.showGpu.sub = state;
@@ -1755,11 +1788,11 @@
 	}
 }
 
-bool GetGPUDisplayState(int displayType)
+bool GetGPUDisplayState(int gpuType)
 {
 	bool result = false;
 	
-	switch (displayType)
+	switch (gpuType)
 	{
 		case DS_GPU_TYPE_MAIN:
 			result = CommonSettings.showGpu.sub;

Modified: trunk/desmume/src/cocoa/userinterface/displayView.h
===================================================================
--- trunk/desmume/src/cocoa/userinterface/displayView.h	2013-01-04 01:40:52 UTC (rev 4462)
+++ trunk/desmume/src/cocoa/userinterface/displayView.h	2013-01-05 01:32:05 UTC (rev 4463)
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2012 DeSmuME team
+	Copyright (C) 2013 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -30,14 +30,15 @@
 
 @required
 - (void) doInitVideoOutput:(NSDictionary *)properties;
-- (void) doProcessVideoFrame:(const void *)videoFrameData frameSize:(NSSize)frameSize;
+- (void) doProcessVideoFrame:(const void *)videoFrameData displayMode:(const NSInteger)displayModeID width:(const NSInteger)frameWidth height:(const NSInteger)frameHeight;
 
 @property (retain) DisplayViewDelegate *dispViewDelegate;
 
 @optional
 - (void) doResizeView:(NSRect)rect;
+- (void) doTransformView:(DisplayOutputTransformData *)transformData;
 - (void) doRedraw;
-- (void) doDisplayTypeChanged:(NSInteger)displayTypeID;
+- (void) doDisplayModeChanged:(NSInteger)displayModeID;
 - (void) doDisplayOrientationChanged:(NSInteger)displayOrientationID;
 - (void) doDisplayOrderChanged:(NSInteger)displayOrderID;
 - (void) doBilinearOutputChanged:(BOOL)useBilinear;
@@ -80,7 +81,7 @@
 @property (assign) double rotation;
 @property (assign) BOOL useBilinearOutput;
 @property (assign) BOOL useVerticalSync;
-@... (assign) NSInteger displayType;
+@property (assign) NSInteger displayMode;
 @property (assign) NSInteger displayOrientation;
 @property (assign) NSInteger displayOrder;
 @property (readonly) NSMutableDictionary *bindings;
@@ -113,7 +114,7 @@
 	NSBitmapImageRep *currentImageRep;
 }
 
-- (NSBitmapImageRep *) bitmapImageRep:(const void *)videoFrameData imageSize:(NSSize)imageSize;
+- (NSBitmapImageRep *) bitmapImageRep:(const void *)videoFrameData displayMode:(const NSInteger)displayModeID width:(const NSInteger)imageWidth height:(const NSInteger)imageHeight;
 
 @end
 
@@ -127,6 +128,8 @@
 	BOOL isVAOSupported;
 	
 	DisplayViewDelegate *dispViewDelegate;
+	NSInteger lastDisplayMode;
+	NSInteger currentDisplayOrientation;
 	GLint glTexRenderStyle;
 	GLenum glTexPixelFormat;
 	GLvoid *glTexBack;
@@ -150,15 +153,14 @@
 	GLint *vtxBuffer;
 	GLfloat *texCoordBuffer;
 	GLubyte *vtxIndexBuffer;
-	GLsizei vtxElementCount;
 	
 	unsigned int vtxBufferOffset;
 }
 
 - (void) drawVideoFrame;
-- (void) uploadDisplayTextures:(const GLvoid *)textureData textureSize:(NSSize)textureSize;
-- (void) renderDisplay;
-- (void) updateDisplayVertices;
+- (void) uploadDisplayTextures:(const GLvoid *)textureData width:(const GLsizei)texWidth height:(const GLsizei)texHeight;
+- (void) renderDisplayUsingDisplayMode:(const NSInteger)displayModeID;
+- (void) updateDisplayVerticesUsingDisplayMode:(const NSInteger)displayModeID orientation:(const NSInteger)displayOrientationID;
 
 @end
 

Modified: trunk/desmume/src/cocoa/userinterface/displayView.mm
===================================================================
--- trunk/desmume/src/cocoa/userinterface/displayView.mm	2013-01-04 01:40:52 UTC (rev 4462)
+++ trunk/desmume/src/cocoa/userinterface/displayView.mm	2013-01-05 01:32:05 UTC (rev 4463)
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2012 DeSmuME team
+	Copyright (C) 2013 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -103,7 +103,7 @@
 @dynamic rotation;
 @dynamic useBilinearOutput;
 @dynamic useVerticalSync;
-@... displayType;
+@dynamic displayMode;
 @dynamic displayOrientation;
 @dynamic displayOrder;
 @synthesize bindings;
@@ -216,6 +216,16 @@
 	OSSpinLockLock(&spinlockScale);
 	[bindings setValue:[NSNumber numberWithDouble:s] forKey:@"scale"];
 	OSSpinLockUnlock(&spinlockScale);
+	
+	DisplayOutputTransformData transformData	= { s,
+												    [self rotation],
+												    0.0,
+												    0.0,
+												    0.0 };
+	
+	[CocoaDSUtil messageSendOneWayWithData:[self sendPortDisplay]
+									 msgID:MESSAGE_TRANSFORM_VIEW
+									  data:[NSData dataWithBytes:&transformData length:sizeof(DisplayOutputTransformData)]];
 }
 
 - (double) scale
@@ -232,6 +242,16 @@
 	OSSpinLockLock(&spinlockRotation);
 	[bindings setValue:[NSNumber numberWithDouble:angleDegrees] forKey:@"rotation"];
 	OSSpinLockUnlock(&spinlockRotation);
+	
+	DisplayOutputTransformData transformData	= { [self scale],
+												    angleDegrees,
+												    0.0,
+												    0.0,
+												    0.0 };
+	
+	[CocoaDSUtil messageSendOneWayWithData:[self sendPortDisplay]
+									 msgID:MESSAGE_TRANSFORM_VIEW
+									  data:[NSData dataWithBytes:&transformData length:sizeof(DisplayOutputTransformData)]];
 }
 
 - (double) rotation
@@ -279,12 +299,12 @@
 	return theState;
 }
 
-- (void) setDisplayType:(NSInteger)theType
+- (void) setDisplayMode:(NSInteger)displayModeID
 {
 	NSSize newDisplaySize = NSMakeSize(GPU_DISPLAY_WIDTH, GPU_DISPLAY_HEIGHT);
 	NSString *modeString = @"Unknown";
 	
-	switch (theType)
+	switch (displayModeID)
 	{
 		case DS_DISPLAY_TYPE_MAIN:
 			modeString = NSSTRING_DISPLAYMODE_MAIN;
@@ -313,7 +333,8 @@
 	}
 	
 	OSSpinLockLock(&spinlockDisplayType);
-	[bindings setValue:[NSNumber numberWithInteger:theType] forKey:@"displayMode"];
+	NSInteger oldMode = [[bindings valueForKey:@"displayMode"] integerValue];
+	[bindings setValue:[NSNumber numberWithInteger:displayModeID] forKey:@"displayMode"];
 	[bindings setValue:modeString forKey:@"displayModeString"];
 	OSSpinLockUnlock(&spinlockDisplayType);
 	
@@ -321,16 +342,24 @@
 	normalSize = newDisplaySize;
 	OSSpinLockUnlock(&spinlockNormalSize);
 	
-	[CocoaDSUtil messageSendOneWayWithInteger:self.sendPortDisplay msgID:MESSAGE_CHANGE_DISPLAY_TYPE integerValue:theType];
+	[CocoaDSUtil messageSendOneWayWithInteger:self.sendPortDisplay msgID:MESSAGE_CHANGE_DISPLAY_TYPE integerValue:displayModeID];
+	
+	// If the display mode swaps between Main Only and Touch Only, the view will not resize to implicitly
+	// redraw the view. So when swapping between these two display modes, explicitly tell the view to redraw.
+	if ( (oldMode == DS_DISPLAY_TYPE_MAIN && displayModeID == DS_DISPLAY_TYPE_TOUCH) ||
+		 (oldMode == DS_DISPLAY_TYPE_TOUCH && displayModeID == DS_DISPLAY_TYPE_MAIN) )
+	{
+		[view setNeedsDisplay:YES];
+	}
 }
 
-- (NSInteger) displayType
+- (NSInteger) displayMode
 {
 	OSSpinLockLock(&spinlockDisplayType);
-	NSInteger theType = [[bindings valueForKey:@"displayMode"] integerValue];
+	NSInteger displayModeID = [[bindings valueForKey:@"displayMode"] integerValue];
 	OSSpinLockUnlock(&spinlockDisplayType);
 	
-	return theType;
+	return displayModeID;
 }
 
 - (void) setDisplayOrientation:(NSInteger)theOrientation
@@ -339,7 +368,7 @@
 	[bindings setValue:[NSNumber numberWithInteger:theOrientation] forKey:@"displayOrientation"];
 	OSSpinLockUnlock(&spinlockDisplayOrientation);
 	
-	if ([self displayType] == DS_DISPLAY_TYPE_COMBO)
+	if ([self displayMode] == DS_DISPLAY_TYPE_COMBO)
 	{
 		NSSize newDisplaySize = NSMakeSize(GPU_DISPLAY_WIDTH, GPU_DISPLAY_HEIGHT);
 		
@@ -474,7 +503,7 @@
 	NSPoint touchLoc = GetNormalPointFromTransformedPoint(clickLoc, [self normalSize], [[self view] bounds].size, [self scale], viewAngle);
 	
 	// Normalize the touch location to the DS.
-	if ([self displayType] == DS_DISPLAY_TYPE_COMBO)
+	if ([self displayMode] == DS_DISPLAY_TYPE_COMBO)
 	{
 		NSInteger theOrientation = [self displayOrientation];
 		NSInteger theOrder = [self displayOrder];
@@ -576,9 +605,9 @@
 - (BOOL) handleMouseButton:(NSEvent *)theEvent buttonPressed:(BOOL)buttonPressed
 {
 	BOOL isHandled = NO;
-	NSInteger dispType = [self displayType];
+	NSInteger displayModeID = [self displayMode];
 	
-	if (self.cdsController == nil || (dispType != DS_DISPLAY_TYPE_TOUCH && dispType != DS_DISPLAY_TYPE_COMBO))
+	if (self.cdsController == nil || (displayModeID != DS_DISPLAY_TYPE_TOUCH && displayModeID != DS_DISPLAY_TYPE_COMBO))
 	{
 		return isHandled;
 	}
@@ -633,9 +662,9 @@
 	[view doInitVideoOutput:properties];
 }
 
-- (void) doProcessVideoFrame:(const void *)videoFrameData frameSize:(NSSize)frameSize
+- (void) doProcessVideoFrame:(const void *)videoFrameData displayMode:(const NSInteger)displayModeID width:(const NSInteger)frameWidth height:(const NSInteger)frameHeight
 {
-	[view doProcessVideoFrame:videoFrameData frameSize:frameSize];
+	[view doProcessVideoFrame:videoFrameData displayMode:displayModeID width:frameWidth height:frameHeight];
 }
 
 - (void) doResizeView:(NSRect)rect
@@ -648,6 +677,16 @@
 	[view doResizeView:rect];
 }
 
+- (void) doTransformView:(DisplayOutputTransformData *)transformData
+{
+	if (view == nil || ![view respondsToSelector:@selector(doTransformView:)])
+	{
+		return;
+	}
+	
+	[view doTransformView:transformData];
+}
+
 - (void) doRedraw
 {
 	if (view == nil || ![view respondsToSelector:@selector(doRedraw)])
@@ -658,14 +697,14 @@
 	[view doRedraw];
 }
 
-- (void) doDisplayTypeChanged:(NSInteger)displayTypeID
+- (void) doDisplayModeChanged:(NSInteger)displayModeID
 {
-	if (view == nil || ![view respondsToSelector:@selector(doDisplayTypeChanged:)])
+	if (view == nil || ![view respondsToSelector:@selector(doDisplayModeChanged:)])
 	{
 		return;
 	}
 	
-	[view doDisplayTypeChanged:displayTypeID];
+	[view doDisplayModeChanged:displayModeID];
 }
 
 - (void) doDisplayOrientationChanged:(NSInteger)displayOrientationID
@@ -766,24 +805,22 @@
 	[CocoaDSUtil messageSendOneWayWithRect:dispViewDelegate.sendPortDisplay msgID:MESSAGE_RESIZE_VIEW rect:rect];
 }
 
-- (NSBitmapImageRep *) bitmapImageRep:(const void *)videoFrameData imageSize:(NSSize)imageSize
+- (NSBitmapImageRep *) bitmapImageRep:(const void *)videoFrameData displayMode:(const NSInteger)displayModeID width:(const NSInteger)imageWidth height:(const NSInteger)imageHeight
 {
 	if (videoFrameData == nil)
 	{
 		return nil;
 	}
 	
-	NSUInteger w = (NSUInteger)imageSize.width;
-	NSUInteger h = (NSUInteger)imageSize.height;
 	NSBitmapImageRep *imageRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL
-																	  pixelsWide:w
-																	  pixelsHigh:h
+																	  pixelsWide:imageWidth
+																	  pixelsHigh:imageHeight
 																   bitsPerSample:8
 																 samplesPerPixel:4
 																		hasAlpha:YES
 																		isPlanar:NO
 																  colorSpaceName:NSCalibratedRGBColorSpace
-																	 bytesPerRow:w * 4
+																	 bytesPerRow:imageWidth * 4
 																	bitsPerPixel:32];
 	
 	if(!imageRep)
@@ -792,10 +829,10 @@
 	}
 	
 	uint32_t *bitmapData = (uint32_t *)[imageRep bitmapData];
-	RGBA5551ToRGBA8888Buffer((const uint16_t *)videoFrameData, bitmapData, (w * h));
+	RGBA5551ToRGBA8888Buffer((const uint16_t *)videoFrameData, bitmapData, (imageWidth * imageHeight));
 	
 #ifdef __BIG_ENDIAN__
-	uint32_t *bitmapDataEnd = bitmapData + (w * h);
+	uint32_t *bitmapDataEnd = bitmapData + (imageWidth * imageHeight);
 	while (bitmapData < bitmapDataEnd)
 	{
 		*bitmapData++ = CFSwapInt32LittleToHost(*bitmapData);
@@ -913,10 +950,10 @@
 	currentImageRep = nil;
 }
 
-- (void)doProcessVideoFrame:(const void *)videoFrameData frameSize:(NSSize)frameSize
+- (void)doProcessVideoFrame:(const void *)videoFrameData displayMode:(const NSInteger)displayModeID width:(const NSInteger)frameWidth height:(const NSInteger)frameHeight
 {
 	// Render the frame in an NSBitmapImageRep
-	NSBitmapImageRep *newImageRep = [self bitmapImageRep:videoFrameData imageSize:frameSize];
+	NSBitmapImageRep *newImageRep = [self bitmapImageRep:videoFrameData displayMode:displayModeID width:frameWidth height:frameHeight];
 	if (newImageRep == nil)
 	{
 		return;
@@ -951,6 +988,8 @@
 	}
 	
 	dispViewDelegate = nil;
+	lastDisplayMode = DS_DISPLAY_TYPE_COMBO;
+	currentDisplayOrientation = DS_DISPLAY_ORIENTATION_VERTICAL;
 	glTexPixelFormat = GL_UNSIGNED_SHORT_1_5_5_5_REV;
 	glTexRenderStyle = GL_LINEAR;
 	
@@ -964,7 +1003,6 @@
 	texCoordBuffer = new GLfloat[2 * 8];
 	vtxIndexBuffer = new GLubyte[12];
 	vtxBufferOffset = 0;
-	vtxElementCount = 12;
 	
 	// Create a new context for the OpenGL-based emulated 3D renderer
 	NSOpenGLPixelFormatAttribute attrs[] =
@@ -1067,42 +1105,10 @@
 	NSRect oldFrame = [self frame];
 	[super setFrame:rect];
 	
-	GLfloat angleDegrees = (GLfloat)[dispViewDelegate rotation];
-	GLfloat s = (GLfloat)[dispViewDelegate scale];
-	
-	CGLLockContext(cglDisplayContext);
-	CGLSetCurrentContext(cglDisplayContext);
-	
-	glViewport(0, 0, rect.size.width, rect.size.height);
-	glClear(GL_COLOR_BUFFER_BIT);
-	
-	if (isShadersSupported)
+	if (rect.size.width != oldFrame.size.width || rect.size.height != oldFrame.size.height)
 	{
-		glUniform2f(uniformViewSize, rect.size.width, rect.size.height);
-		glUniform1f(uniformAngleDegrees, angleDegrees);
-		glUniform1f(uniformScalar, s);
-	}
-	else
-	{
-		glMatrixMode(GL_PROJECTION);
-		glLoadIdentity();
-		glOrtho(-rect.size.width/2, -rect.size.width/2 + rect.size.width, -rect.size.height/2, -rect.size.height/2 + rect.size.height, -1.0, 1.0);
-		
-		glMatrixMode(GL_MODELVIEW);
-		glLoadIdentity();
-		glRotatef(CLOCKWISE_DEGREES(angleDegrees), 0.0f, 0.0f, 1.0f);
-		glScalef(s, s, 1.0f);
-	}
-	
-	CGLUnlockContext(cglDisplayContext);
-	
-	if (rect.size.width == oldFrame.size.width && rect.size.height == oldFrame.size.height)
-	{
-		[CocoaDSUtil messageSendOneWay:dispViewDelegate.sendPortDisplay msgID:MESSAGE_REDRAW_VIEW];
-	}
-	else
-	{
 		[CocoaDSUtil messageSendOneWayWithRect:dispViewDelegate.sendPortDisplay msgID:MESSAGE_RESIZE_VIEW rect:rect];
+		[self setNeedsDisplay:YES];
 	}
 }
 
@@ -1245,7 +1251,7 @@
 	CGLFlushDrawable(cglDisplayContext);
 }
 
-- (void) uploadDisplayTextures:(const GLvoid *)textureData textureSize:(NSSize)textureSize
+- (void) uploadDisplayTextures:(const GLvoid *)textureData width:(const GLsizei)texWidth height:(const GLsizei)texHeight
 {
 	if (textureData == NULL)
 	{
@@ -1253,11 +1259,11 @@
 	}
 	
 	glBindTexture(GL_TEXTURE_2D, displayTexID);
-	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, (GLsizei)textureSize.width, (GLsizei)textureSize.height, GL_RGBA, glTexPixelFormat, textureData);
+	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, texWidth, texHeight, GL_RGBA, glTexPixelFormat, textureData);
 	glBindTexture(GL_TEXTURE_2D, 0);
 }
 
-- (void) renderDisplay
+- (void) renderDisplayUsingDisplayMode:(const NSInteger)displayModeID
 {
 	GLubyte *elementPointer = NULL;
 	
@@ -1311,6 +1317,25 @@
 	}
 	
 	// Perform the render.
+	if (lastDisplayMode != displayModeID)
+	{
+		lastDisplayMode = displayModeID;
+		[self updateDisplayVerticesUsingDisplayMode:displayModeID orientation:currentDisplayOrientation];
+		
+		if (isVBOSupported)
+		{
+			glBindBuffer(GL_ARRAY_BUFFER, vboVertexID);
+			glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(GLint) * (2 * 8), vtxBuffer + vtxBufferOffset);
+			glBindBuffer(GL_ARRAY_BUFFER, 0);
+		}
+	}
+	
+	GLsizei vtxElementCount = 6;
+	if (displayModeID == DS_DISPLAY_TYPE_COMBO)
+	{
+		vtxElementCount = 12;
+	}
+	
 	glClear(GL_COLOR_BUFFER_BIT);
 	glBindTexture(GL_TEXTURE_2D, displayTexID);
 	glDrawElements(GL_TRIANGLES, vtxElementCount, GL_UNSIGNED_BYTE, elementPointer);
@@ -1348,18 +1373,15 @@
 	}
 }
 
-- (void) updateDisplayVertices
+- (void) updateDisplayVerticesUsingDisplayMode:(const NSInteger)displayModeID orientation:(const NSInteger)displayOrientationID
 {
-	NSInteger displayType = [dispViewDelegate displayType];
 	GLint w = (GLint)GPU_DISPLAY_WIDTH;
 	GLint h = (GLint)GPU_DISPLAY_HEIGHT;
 	
-	if (displayType == DS_DISPLAY_TYPE_COMBO)
+	if (displayModeID == DS_DISPLAY_TYPE_COMBO)
 	{
-		NSInteger displayOrientation = [dispViewDelegate displayOrientation];
-		
 		// displayOrder == DS_DISPLAY_ORDER_MAIN_FIRST
-		if (displayOrientation == DS_DISPLAY_ORIENTATION_VERTICAL)
+		if (displayOrientationID == DS_DISPLAY_ORIENTATION_VERTICAL)
 		{
 			vtxBuffer[0]	= -w/2;		vtxBuffer[1]		= h;		// Top display, top left
 			vtxBuffer[2]	= w/2;		vtxBuffer[3]		= h;		// Top display, top right
@@ -1371,7 +1393,7 @@
 			vtxBuffer[12]	= w/2;		vtxBuffer[13]		= -h;		// Bottom display, bottom right
 			vtxBuffer[14]	= -w/2;		vtxBuffer[15]		= -h;		// Bottom display, bottom left
 		}
-		else // displayOrientation == DS_DISPLAY_ORIENTATION_HORIZONTAL
+		else // displayOrientationID == DS_DISPLAY_ORIENTATION_HORIZONTAL
 		{
 			vtxBuffer[0]	= -w;		vtxBuffer[1]		= h/2;		// Left display, top left
 			vtxBuffer[2]	= 0;		vtxBuffer[3]		= h/2;		// Left display, top right
@@ -1388,7 +1410,7 @@
 		memcpy(vtxBuffer + (2 * 8), vtxBuffer + (1 * 8), sizeof(GLint) * (1 * 8));
 		memcpy(vtxBuffer + (3 * 8), vtxBuffer + (0 * 8), sizeof(GLint) * (1 * 8));
 	}
-	else // displayType == DS_DISPLAY_TYPE_MAIN || displayType == DS_DISPLAY_TYPE_TOUCH
+	else // displayModeID == DS_DISPLAY_TYPE_MAIN || displayModeID == DS_DISPLAY_TYPE_TOUCH
 	{
 		vtxBuffer[0]	= -w/2;		vtxBuffer[1]		= h/2;		// First display, top left
 		vtxBuffer[2]	= w/2;		vtxBuffer[3]		= h/2;		// First display, top right
@@ -1507,13 +1529,13 @@
 	// No init needed, so do nothing.
 }
 
-- (void)doProcessVideoFrame:(const void *)videoFrameData frameSize:(NSSize)frameSize
+- (void)doProcessVideoFrame:(const void *)videoFrameData displayMode:(const NSInteger)displayModeID width:(const NSInteger)frameWidth height:(const NSInteger)frameHeight
 {
 	CGLLockContext(cglDisplayContext);
 	
 	CGLSetCurrentContext(cglDisplayContext);
-	[self uploadDisplayTextures:videoFrameData textureSize:frameSize];
-	[self renderDisplay];
+	[self uploadDisplayTextures:videoFrameData width:frameWidth height:frameHeight];
+	[self renderDisplayUsingDisplayMode:displayModeID];
 	[self drawVideoFrame];
 	
 	CGLUnlockContext(cglDisplayContext);
@@ -1521,33 +1543,65 @@
 
 - (void)doResizeView:(NSRect)rect
 {
-	// Do nothing
+	CGLLockContext(cglDisplayContext);
+	CGLSetCurrentContext(cglDisplayContext);
+	
+	glViewport(0, 0, rect.size.width, rect.size.height);
+	
+	if (isShadersSupported)
+	{
+		glUniform2f(uniformViewSize, rect.size.width, rect.size.height);
+	}
+	else
+	{
+		glMatrixMode(GL_PROJECTION);
+		glLoadIdentity();
+		glOrtho(-rect.size.width/2, -rect.size.width/2 + rect.size.width, -rect.size.height/2, -rect.size.height/2 + rect.size.height, -1.0, 1.0);
+	}
+	
+	CGLUnlockContext(cglDisplayContext);
 }
 
+- (void) doTransformView:(DisplayOutputTransformData *)transformData
+{
+	GLfloat angleDegrees = (GLfloat)transformData->rotation;
+	GLfloat s = (GLfloat)transformData->scale;
+	
+	CGLLockContext(cglDisplayContext);
+	CGLSetCurrentContext(cglDisplayContext);
+	
+	if (isShadersSupported)
+	{
+		glUniform1f(uniformAngleDegrees, angleDegrees);
+		glUniform1f(uniformScalar, s);
+	}
+	else
+	{
+		glMatrixMode(GL_MODELVIEW);
+		glLoadIdentity();
+		glRotatef(CLOCKWISE_DEGREES(angleDegrees), 0.0f, 0.0f, 1.0f);
+		glScalef(s, s, 1.0f);
+	}
+	
+	CGLUnlockContext(cglDisplayContext);
+}
+
 - (void)doRedraw
 {
 	CGLLockContext(cglDisplayContext);
 	
 	CGLSetCurrentContext(cglDisplayContext);
-	[self renderDisplay];
+	[self renderDisplayUsingDisplayMode:lastDisplayMode];
 	[self drawVideoFrame];
 	
 	CGLUnlockContext(cglDisplayContext);
 }
 
-- (void)doDisplayTypeChanged:(NSInteger)displayTypeID
+- (void)doDisplayModeChanged:(NSInteger)displayModeID
 {
-	if (displayTypeID == DS_DISPLAY_TYPE_COMBO)
-	{
-		vtxElementCount = 12;
-	}
-	else
-	{
-		vtxElementCount = 6;
-	}
+	lastDisplayMode = displayModeID;
+	[self updateDisplayVerticesUsingDisplayMode:displayModeID orientation:currentDisplayOrientation];
 	
-	[self updateDisplayVertices];
-	
 	CGLLockContext(cglDisplayContext);
 	CGLSetCurrentContext(cglDisplayContext);
 	
@@ -1581,7 +1635,8 @@
 
 - (void) doDisplayOrientationChanged:(NSInteger)displayOrientationID
 {
-	[self updateDisplayVertices];
+	currentDisplayOrientation = displayOrientationID;
+	[self updateDisplayVerticesUsingDisplayMode:lastDisplayMode orientation:displayOrientationID];
 	
 	CGLLockContext(cglDisplayContext);
 	CGLSetCurrentContext(cglDisplayContext);
@@ -1617,9 +1672,9 @@
 		glBindBuffer(GL_ARRAY_BUFFER, 0);
 	}
 	
-	if ([dispViewDelegate displayType] == DS_DISPLAY_TYPE_COMBO)
+	if (lastDisplayMode == DS_DISPLAY_TYPE_COMBO)
 	{
-		[self renderDisplay];
+		[self renderDisplayUsingDisplayMode:lastDisplayMode];
 		[self drawVideoFrame];
 	}
 	
@@ -1667,28 +1722,28 @@
 		}
 	}
 	
-	GLfloat w = (GLfloat)(videoFilterDestSize.width / potW);
-	GLfloat h = (GLfloat)(videoFilterDestSize.height / potH);
+	GLfloat s = (GLfloat)(videoFilterDestSize.width / potW);
+	GLfloat t = (GLfloat)(videoFilterDestSize.height / potH);
 	
 	// Set up texture coordinates
-	if ([dispViewDelegate displayType] == DS_DISPLAY_TYPE_COMBO)
+	if ([dispViewDelegate displayMode] == DS_DISPLAY_TYPE_COMBO)
 	{
 		texCoordBuffer[0]	= 0.0f;		texCoordBuffer[1]	=   0.0f;
-		texCoordBuffer[2]	=    w;		texCoordBuffer[3]	=   0.0f;
-		texCoordBuffer[4]	=    w;		texCoordBuffer[5]	= h/2.0f;
-		texCoordBuffer[6]	= 0.0f;		texCoordBuffer[7]	= h/2.0f;
+		texCoordBuffer[2]	=    s;		texCoordBuffer[3]	=   0.0f;
+		texCoordBuffer[4]	=    s;		texCoordBuffer[5]	= t/2.0f;
+		texCoordBuffer[6]	= 0.0f;		texCoordBuffer[7]	= t/2.0f;
 		
-		texCoordBuffer[8]	= 0.0f;		texCoordBuffer[9]	= h/2.0f;
-		texCoordBuffer[10]	=    w;		texCoordBuffer[11]	= h/2.0f;
-		texCoordBuffer[12]	=    w;		texCoordBuffer[13]	=      h;
-		texCoordBuffer[14]	= 0.0f;		texCoordBuffer[15]	=      h;
+		texCoordBuffer[8]	= 0.0f;		texCoordBuffer[9]	= t/2.0f;
+		texCoordBuffer[10]	=    s;		texCoordBuffer[11]	= t/2.0f;
+		texCoordBuffer[12]	=    s;		texCoordBuffer[13]	=      t;
+		texCoordBuffer[14]	= 0.0f;		texCoordBuffer[15]	=      t;
 	}
-	else // displayType == DS_DISPLAY_TYPE_MAIN || displayType == DS_DISPLAY_TYPE_TOUCH
+	else // displayMode == DS_DISPLAY_TYPE_MAIN || displayMode == DS_DISPLAY_TYPE_TOUCH
 	{
 		texCoordBuffer[0]	= 0.0f;		texCoordBuffer[1]	= 0.0f;
-		texCoordBuffer[2]	=    w;		texCoordBuffer[3]	= 0.0f;
-		texCoordBuffer[4]	=    w;		texCoordBuffer[5]	=    h;
-		texCoordBuffer[6]	= 0.0f;		texCoordBuffer[7]	=    h;
+		texCoordBuffer[2]	=    s;		texCoordBuffer[3]	= 0.0f;
+		texCoordBuffer[4]	=    s;		texCoordBuffer[5]	=    t;
+		texCoordBuffer[6]	= 0.0f;		texCoordBuffer[7]	=    t;
 		
 		memcpy(texCoordBuffer + (1 * 8), texCoordBuffer + (0 * 8), sizeof(GLfloat) * (1 * 8));
 	}

Modified: trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.mm
===================================================================
--- trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.mm	2013-01-04 01:40:52 UTC (rev 4462)
+++ trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.mm	2013-01-05 01:32:05 UTC (rev 4463)
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2012 DeSmuME team
+	Copyright (C) 2013 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -151,11 +151,9 @@
 
 - (void) setContentScalar:(double)s
 {
-	[dispViewDelegate setScale:s];
-	
 	// Resize the window when contentScalar changes.
-	NSSize drawBounds = [dispViewDelegate normalSize];
-	[self resizeWithTransform:drawBounds scalar:s rotation:[dispViewDelegate rotation]];
+	// No need to set the view's scale here since window resizing will implicitly change it.
+	[self resizeWithTransform:[dispViewDelegate normalSize] scalar:s rotation:[dispViewDelegate rotation]];
 }
 
 - (void) setContentRotation:(double)angleDegrees
@@ -174,25 +172,21 @@
 	[dispViewDelegate setRotation:newAngleDegrees];
 	
 	// Set the minimum content size for the window, since this will change based on rotation.
-	NSSize drawBounds = minDisplayViewSize;
-	NSSize minContentSize = GetTransformedBounds(drawBounds, 1.0, CLOCKWISE_DEGREES(newAngleDegrees));
+	NSSize minContentSize = GetTransformedBounds(minDisplayViewSize, 1.0, CLOCKWISE_DEGREES(newAngleDegrees));
 	minContentSize.height += statusBarHeight;
 	[window setContentMinSize:minContentSize];
 	
 	// Resize the window.
-	NSSize oldBounds = [window frame].size;
+	const NSSize oldBounds = [window frame].size;
 	[self resizeWithTransform:[dispViewDelegate normalSize] scalar:[dispViewDelegate scale] rotation:newAngleDegrees];
-	NSSize newBounds = [window frame].size;
+	const NSSize newBounds = [window frame].size;
 	
 	// If the window size didn't change, it is possible that the old and new rotation angles
 	// are 180 degrees offset from each other. In this case, we'll need to force the
 	// display view to update itself.
 	if (oldBounds.width == newBounds.width && oldBounds.height == newBounds.height)
 	{
-		NSRect newContentFrame = [[window contentView] bounds];
-		newContentFrame.origin.y = statusBarHeight;
-		newContentFrame.size.height -= statusBarHeight;
-		[displayView setFrame:newContentFrame];
+		[displayView setNeedsDisplay:YES];
 	}
 }
 
@@ -202,26 +196,27 @@
 	angleDegrees = CLOCKWISE_DEGREES(angleDegrees);
 	
 	// Get the maximum scalar size within drawBounds. Constrain scalar to maxScalar if necessary.
-	NSSize checkSize = GetTransformedBounds(normalBounds, 1.0, angleDegrees);
-	double maxScalar = [self maxContentScalar:checkSize];
+	const NSSize checkSize = GetTransformedBounds(normalBounds, 1.0, angleDegrees);
+	const double maxScalar = [self maxContentScalar:checkSize];
 	if (scalar > maxScalar)
 	{
 		scalar = maxScalar;
 	}
 	
 	// Get the new bounds for the window's content view based on the transformed draw bounds.
-	NSSize transformedBounds = GetTransformedBounds(normalBounds, scalar, angleDegrees);
+	const NSSize transformedBounds = GetTransformedBounds(normalBounds, scalar, angleDegrees);
 	
 	// Get the center of the content view in screen coordinates.
-	NSRect windowContentRect = [[window contentView] bounds];
-	double translationX = (windowContentRect.size.width - transformedBounds.width) / 2.0;
-	double translationY = ((windowContentRect.size.height - statusBarHeight) - transformedBounds.height) / 2.0;
+	const NSRect windowContentRect = [[window contentView] bounds];
+	const double translationX = (windowContentRect.size.width - transformedBounds.width) / 2.0;
+	const double translationY = ((windowContentRect.size.height - statusBarHeight) - transformedBounds.height) / 2.0;
 	
 	// Resize the window.
-	NSRect windowFrame = [window frame];
-	NSRect newFrame = [window frameRectForContentRect:NSMakeRect(windowFrame.origin.x + translationX, windowFrame.origin.y + translationY, transformedBounds.width, transformedBounds.height + statusBarHeight)];
+	const NSRect windowFrame = [window frame];
+	const NSRect newFrame = [window frameRectForContentRect:NSMakeRect(windowFrame.origin.x + translationX, windowFrame.origin.y + translationY, transformedBounds.width, transformedBounds.height + statusBarHeight)];
 	[window setFrame:newFrame display:YES animate:NO];
 	
+	// Return the actual scale used for the view (may be constrained).
 	return scalar;
 }
 
@@ -229,13 +224,11 @@
 {
 	// Determine the maximum scale based on the visible screen size (which
 	// doesn't include the menu bar or dock).
-	NSRect screenFrame = [[NSScreen mainScreen] visibleFrame];
-	NSRect windowFrame = [window frameRectForContentRect:NSMakeRect(0.0, 0.0, contentBounds.width, contentBounds.height + statusBarHeight)];
+	const NSRect screenFrame = [[NSScreen mainScreen] visibleFrame];
+	const NSRect windowFrame = [window frameRectForContentRect:NSMakeRect(0.0, 0.0, contentBounds.width, contentBounds.height + statusBarHeight)];
+	const NSSize visibleScreenBounds = { (screenFrame.size.width - (windowFrame.size.width - contentBounds.width)), (screenFrame.size.height - (windowFrame.size.height - contentBounds.height)) };
 	
-	NSSize visibleScreenBounds = { (screenFrame.size.width - (windowFrame.size.width - contentBounds.width)), (screenFrame.size.height - (windowFrame.size.height - contentBounds.height)) };
-	double maxS = GetMaxScalarInBounds(contentBounds.width, contentBounds.height, visibleScreenBounds.width, visibleScreenBounds.height);
-	
-	return maxS;
+	return GetMaxScalarInBounds(contentBounds.width, contentBounds.height, visibleScreenBounds.width, visibleScreenBounds.height);
 }
 
 - (void) setVolume:(float)vol
@@ -297,7 +290,7 @@
 {
 	isMinSizeNormal = theState;
 	
-	if ([dispViewDelegate displayType] == DS_DISPLAY_TYPE_COMBO)
+	if ([dispViewDelegate displayMode] == DS_DISPLAY_TYPE_COMBO)
 	{
 		if ([dispViewDelegate displayOrientation] == DS_DISPLAY_ORIENTATION_HORIZONTAL)
 		{
@@ -899,13 +892,27 @@
 
 - (IBAction) changeDisplayMode:(id)sender
 {
-	[dispViewDelegate setDisplayType:[CocoaDSUtil getIBActionSenderTag:sender]];
+	NSInteger newDisplayModeID = [CocoaDSUtil getIBActionSenderTag:sender];
+	
+	if (newDisplayModeID == [dispViewDelegate displayMode])
+	{
+		return;
+	}
+	
+	[dispViewDelegate setDisplayMode:newDisplayModeID];
 	[self resizeWithTransform:[dispViewDelegate normalSize] scalar:[dispViewDelegate scale] rotation:[dispViewDelegate rotation]];
 }
 
 - (IBAction) changeDisplayOrientation:(id)sender
 {
-	[dispViewDelegate setDisplayOrientation:[CocoaDSUtil getIBActionSenderTag:sender]];
+	NSInteger newDisplayOrientation = [CocoaDSUtil getIBActionSenderTag:sender];
+	
+	if (newDisplayOrientation == [dispViewDelegate displayOrientation])
+	{
+		return;
+	}
+	
+	[dispViewDelegate setDisplayOrientation:newDisplayOrientation];
 	[self setIsMinSizeNormal:[self isMinSizeNormal]];
 	[self resizeWithTransform:[dispViewDelegate normalSize] scalar:[dispViewDelegate scale] rotation:[dispViewDelegate rotation]];
 }
@@ -1723,7 +1730,7 @@
 	{
 		if ([(id)theItem isMemberOfClass:[NSMenuItem class]])
 		{
-			if ([dispViewDelegate displayType] == [theItem tag])
+			if ([dispViewDelegate displayMode] == [theItem tag])
 			{
 				[(NSMenuItem*)theItem setState:NSOnState];
 			}
@@ -1873,7 +1880,6 @@
 	const NSSize checkSize = GetTransformedBounds(normalBounds, 1.0, [dispViewDelegate rotation]);
 	const NSSize contentBounds = NSMakeSize(contentRect.size.width, contentRect.size.height - statusBarHeight);
 	const double maxS = GetMaxScalarInBounds(checkSize.width, checkSize.height, contentBounds.width, contentBounds.height);
-	[dispViewDelegate setScale:maxS];
 	
 	// Make a new content Rect with our max scalar, and convert it back to a frame Rect.
 	const NSRect finalContentRect = NSMakeRect(0.0f, 0.0f, checkSize.width * maxS, (checkSize.height * maxS) + statusBarHeight);
@@ -1892,7 +1898,7 @@
 	{
 		return;
 	}
-		
+	
 	const NSSize normalBounds = [dispViewDelegate normalSize];
 	const double r = [dispViewDelegate rotation];
 	
@@ -2040,7 +2046,7 @@
 	// Set the display settings per user preferences.
 	double displayScalar = (double)([[NSUserDefaults standardUserDefaults] floatForKey:@"DisplayView_Size"] / 100.0);
 	double displayRotation = (double)[[NSUserDefaults standardUserDefaults] floatForKey:@"DisplayView_Rotation"];
-	[dispViewDelegate setDisplayType:[[NSUserDefaults standardUserDefaults] integerForKey:@"DisplayView_Mode"]];
+	[dispViewDelegate setDisplayMode:[[NSUserDefaults standardUserDefaults] integerForKey:@"DisplayView_Mode"]];
 	[dispViewDelegate setDisplayOrientation:[[NSUserDefaults standardUserDefaults] integerForKey:@"DisplayViewCombo_Orientation"]];
 	[dispViewDelegate setDisplayOrder:[[NSUserDefaults standardUserDefaults] integerForKey:@"DisplayViewCombo_Order"]];
 	[self setContentScalar:displayScalar];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4468
          http://desmume.svn.sourceforge.net/desmume/?rev=4468&view=rev
Author:   rogerman
Date:     2013-01-09 08:31:21 +0000 (Wed, 09 Jan 2013)
Log Message:
-----------
Cocoa Port:
- Fixed dimension bug in VideoFilter::RunFilterCustom().
- Do some minor code cleanup of the video filters code.
- Fixed bug in setting GPU layer states where the Main and Sub GPUs were swapped.
- Add DS_DISPLAY_VERTICAL_GAP_TO_HEIGHT_RATIO token.

Modified Paths:
--------------
    trunk/desmume/src/cocoa/cocoa_globals.h
    trunk/desmume/src/cocoa/cocoa_output.mm
    trunk/desmume/src/cocoa/cocoa_videofilter.h
    trunk/desmume/src/cocoa/cocoa_videofilter.mm
    trunk/desmume/src/cocoa/videofilter.cpp
    trunk/desmume/src/cocoa/videofilter.h

Modified: trunk/desmume/src/cocoa/cocoa_globals.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_globals.h	2013-01-09 05:25:17 UTC (rev 4467)
+++ trunk/desmume/src/cocoa/cocoa_globals.h	2013-01-09 08:31:21 UTC (rev 4468)
@@ -150,6 +150,8 @@
 #define GPU_DISPLAY_COLOR_DEPTH						sizeof(UInt16)
 #define GPU_SCREEN_SIZE_BYTES						(GPU_DISPLAY_WIDTH * GPU_DISPLAY_HEIGHT * GPU_DISPLAY_COLOR_DEPTH) // The numbers are: 256px width, 192px height, 16bit color depth
 
+#define DS_DISPLAY_VERTICAL_GAP_TO_HEIGHT_RATIO		(21.0/46.0) // Based on the official DS specification: 21mm/46mm
+
 #define WINDOW_STATUS_BAR_HEIGHT					24		// Height of an emulation window status bar in pixels.
 
 #define SPEED_SCALAR_QUARTER						0.25	// Speed scalar for quarter execution speed.

Modified: trunk/desmume/src/cocoa/cocoa_output.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_output.mm	2013-01-09 05:25:17 UTC (rev 4467)
+++ trunk/desmume/src/cocoa/cocoa_output.mm	2013-01-09 08:31:21 UTC (rev 4468)
@@ -1738,14 +1738,14 @@
 	
 	switch (gpuType)
 	{
-		case DS_GPU_TYPE_MAIN:
+		case DS_GPU_TYPE_SUB:
 			if (SubScreen.gpu != nil)
 			{
 				result = CommonSettings.dispLayers[SubScreen.gpu->core][i];
 			}
 			break;
 			
-		case DS_GPU_TYPE_SUB:
+		case DS_GPU_TYPE_MAIN:
 			if (MainScreen.gpu != nil)
 			{
 				result = CommonSettings.dispLayers[MainScreen.gpu->core][i];
@@ -1770,11 +1770,11 @@
 {
 	switch (gpuType)
 	{
-		case DS_GPU_TYPE_MAIN:
+		case DS_GPU_TYPE_SUB:
 			CommonSettings.showGpu.sub = state;
 			break;
 			
-		case DS_GPU_TYPE_SUB:
+		case DS_GPU_TYPE_MAIN:
 			CommonSettings.showGpu.main = state;
 			break;
 			
@@ -1794,11 +1794,11 @@
 	
 	switch (gpuType)
 	{
-		case DS_GPU_TYPE_MAIN:
+		case DS_GPU_TYPE_SUB:
 			result = CommonSettings.showGpu.sub;
 			break;
 			
-		case DS_GPU_TYPE_SUB:
+		case DS_GPU_TYPE_MAIN:
 			result = CommonSettings.showGpu.main;
 			break;
 			

Modified: trunk/desmume/src/cocoa/cocoa_videofilter.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_videofilter.h	2013-01-09 05:25:17 UTC (rev 4467)
+++ trunk/desmume/src/cocoa/cocoa_videofilter.h	2013-01-09 08:31:21 UTC (rev 4468)
@@ -45,7 +45,7 @@
 - (VideoFilterTypeID) typeID;
 - (NSString *) typeString;
 - (UInt32 *) srcBufferPtr;
-- (UInt32 *) destBufferPtr;
+- (UInt32 *) dstBufferPtr;
 - (NSSize) srcSize;
 - (NSSize) destSize;
 + (NSString *) typeStringByID:(VideoFilterTypeID)typeID;

Modified: trunk/desmume/src/cocoa/cocoa_videofilter.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_videofilter.mm	2013-01-09 05:25:17 UTC (rev 4467)
+++ trunk/desmume/src/cocoa/cocoa_videofilter.mm	2013-01-09 08:31:21 UTC (rev 4468)
@@ -119,8 +119,8 @@
 
 - (NSBitmapImageRep *) bitmapImageRep
 {
-	NSUInteger w = (NSUInteger)vf->GetDestWidth();
-	NSUInteger h = (NSUInteger)vf->GetDestHeight();
+	NSUInteger w = (NSUInteger)vf->GetDstWidth();
+	NSUInteger h = (NSUInteger)vf->GetDstHeight();
 	
 	NSBitmapImageRep *imageRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL
 																		 pixelsWide:w
@@ -167,9 +167,9 @@
 	return (UInt32 *)vf->GetSrcBufferPtr();
 }
 
-- (UInt32 *) destBufferPtr
+- (UInt32 *) dstBufferPtr
 {
-	return (UInt32 *)vf->GetDestBufferPtr();
+	return (UInt32 *)vf->GetDstBufferPtr();
 }
 
 - (NSSize) srcSize
@@ -179,7 +179,7 @@
 
 - (NSSize) destSize
 {
-	return NSMakeSize((CGFloat)vf->GetDestWidth(), (CGFloat)vf->GetDestHeight());
+	return NSMakeSize((CGFloat)vf->GetDstWidth(), (CGFloat)vf->GetDstHeight());
 }
 
 + (NSString *) typeStringByID:(VideoFilterTypeID)typeID

Modified: trunk/desmume/src/cocoa/videofilter.cpp
===================================================================
--- trunk/desmume/src/cocoa/videofilter.cpp	2013-01-09 05:25:17 UTC (rev 4467)
+++ trunk/desmume/src/cocoa/videofilter.cpp	2013-01-09 08:31:21 UTC (rev 4468)
@@ -41,7 +41,7 @@
 	_vfTypeID = typeID;
 	
 	pthread_mutex_init(&_mutexSrc, NULL);
-	pthread_mutex_init(&_mutexDest, NULL);
+	pthread_mutex_init(&_mutexDst, NULL);
 	pthread_mutex_init(&_mutexTypeID, NULL);
 	pthread_mutex_init(&_mutexTypeString, NULL);
 	pthread_cond_init(&_condRunning, NULL);
@@ -52,7 +52,7 @@
 	for (unsigned int i = 0; i < numberThreads; i++)
 	{
 		_vfThread[i].param.srcSurface = _vfSrcSurface;
-		_vfThread[i].param.destSurface = _vfDstSurface;
+		_vfThread[i].param.dstSurface = _vfDstSurface;
 		_vfThread[i].param.filterFunction = NULL;
 		
 		_vfThread[i].task = new Task;
@@ -79,17 +79,17 @@
 	_vfThread.clear();
 	
 	// Destroy everything else
-	pthread_mutex_lock(&this->_mutexDest);
+	pthread_mutex_lock(&this->_mutexDst);
 	
 	while (this->_isFilterRunning)
 	{
-		pthread_cond_wait(&this->_condRunning, &this->_mutexDest);
+		pthread_cond_wait(&this->_condRunning, &this->_mutexDst);
 	}
 	
 	free(_vfDstSurface.Surface);
 	_vfDstSurface.Surface = NULL;
 	
-	pthread_mutex_unlock(&_mutexDest);
+	pthread_mutex_unlock(&_mutexDst);
 	
 	pthread_mutex_lock(&_mutexSrc);
 	
@@ -100,7 +100,7 @@
 	pthread_mutex_unlock(&_mutexSrc);
 	
 	pthread_mutex_destroy(&_mutexSrc);
-	pthread_mutex_destroy(&_mutexDest);
+	pthread_mutex_destroy(&_mutexDst);
 	pthread_mutex_destroy(&_mutexTypeID);
 	pthread_mutex_destroy(&_mutexTypeString);
 	pthread_cond_destroy(&_condRunning);
@@ -225,7 +225,7 @@
 	const char *typeString = vfAttr->typeString;
 	const VideoFilterFunc filterFunction = vfAttr->filterFunction;
 	
-	pthread_mutex_lock(&this->_mutexDest);
+	pthread_mutex_lock(&this->_mutexDst);
 	
 	uint32_t *newSurfaceBuffer = (uint32_t *)calloc(dstWidth * dstHeight, sizeof(uint32_t));
 	if (newSurfaceBuffer == NULL)
@@ -246,20 +246,20 @@
 	
 	for (unsigned int i = 0; i < threadCount; i++)
 	{
-		SSurface &threadDstSurface = this->_vfThread[i].param.destSurface;
+		SSurface &threadDstSurface = this->_vfThread[i].param.dstSurface;
 		threadDstSurface = this->_vfDstSurface;
 		threadDstSurface.Height /= threadCount;
 		
 		if (i > 0)
 		{
-			SSurface &prevThreadDstSurface = this->_vfThread[i - 1].param.destSurface;
+			SSurface &prevThreadDstSurface = this->_vfThread[i - 1].param.dstSurface;
 			threadDstSurface.Surface = (unsigned char *)((uint32_t *)prevThreadDstSurface.Surface + (prevThreadDstSurface.Width * prevThreadDstSurface.Height));
 		}
 		
 		this->_vfThread[i].param.filterFunction = this->_vfFunc;
 	}
 	
-	pthread_mutex_unlock(&this->_mutexDest);
+	pthread_mutex_unlock(&this->_mutexDst);
 	
 	this->SetTypeID(typeID);
 	this->SetTypeString(typeString);
@@ -283,7 +283,7 @@
  ********************************************************************************************/
 uint32_t* VideoFilter::RunFilter()
 {
-	pthread_mutex_lock(&this->_mutexDest);
+	pthread_mutex_lock(&this->_mutexDst);
 	
 	this->_isFilterRunning = true;
 	uint32_t *destBufPtr = (uint32_t *)this->_vfDstSurface.Surface;
@@ -302,7 +302,7 @@
 		{
 			for (unsigned int i = 0; i < threadCount; i++)
 			{
-				this->_vfThread[i].task->execute(RunVideoFilterTask, &this->_vfThread[i].param);
+				this->_vfThread[i].task->execute(&RunVideoFilterTask, &this->_vfThread[i].param);
 			}
 			
 			for (unsigned int i = 0; i < threadCount; i++)
@@ -320,7 +320,7 @@
 	
 	this->_isFilterRunning = false;
 	pthread_cond_signal(&this->_condRunning);
-	pthread_mutex_unlock(&this->_mutexDest);
+	pthread_mutex_unlock(&this->_mutexDst);
 	
 	return destBufPtr;
 }
@@ -362,7 +362,7 @@
 	
 	const VideoFilterAttributes *vfAttr = &VideoFilterAttributesList[typeID];
 	const unsigned int dstWidth = srcWidth * vfAttr->scaleMultiply / vfAttr->scaleDivide;
-	const unsigned int dstHeight = dstWidth * vfAttr->scaleMultiply / vfAttr->scaleDivide;
+	const unsigned int dstHeight = srcHeight * vfAttr->scaleMultiply / vfAttr->scaleDivide;
 	const VideoFilterFunc filterFunction = vfAttr->filterFunction;
 	
 	SSurface srcSurface = {(unsigned char *)srcBuffer, srcWidth*2, srcWidth, srcHeight};
@@ -450,11 +450,11 @@
 	return ptr;
 }
 
-uint32_t* VideoFilter::GetDestBufferPtr()
+uint32_t* VideoFilter::GetDstBufferPtr()
 {
-	pthread_mutex_lock(&this->_mutexDest);
+	pthread_mutex_lock(&this->_mutexDst);
 	uint32_t *ptr = (uint32_t *)this->_vfDstSurface.Surface;
-	pthread_mutex_unlock(&this->_mutexDest);
+	pthread_mutex_unlock(&this->_mutexDst);
 	
 	return ptr;
 }
@@ -477,20 +477,20 @@
 	return height;
 }
 
-unsigned int VideoFilter::GetDestWidth()
+unsigned int VideoFilter::GetDstWidth()
 {
-	pthread_mutex_lock(&this->_mutexDest);
+	pthread_mutex_lock(&this->_mutexDst);
 	unsigned int width = this->_vfDstSurface.Width;
-	pthread_mutex_unlock(&this->_mutexDest);
+	pthread_mutex_unlock(&this->_mutexDst);
 	
 	return width;
 }
 
-unsigned int VideoFilter::GetDestHeight()
+unsigned int VideoFilter::GetDstHeight()
 {
-	pthread_mutex_lock(&this->_mutexDest);
+	pthread_mutex_lock(&this->_mutexDst);
 	unsigned int height = this->_vfDstSurface.Height;
-	pthread_mutex_unlock(&this->_mutexDest);
+	pthread_mutex_unlock(&this->_mutexDst);
 	
 	return height;
 }
@@ -500,7 +500,7 @@
 {
 	VideoFilterThreadParam *param = (VideoFilterThreadParam *)arg;
 	
-	param->filterFunction(param->srcSurface, param->destSurface);
+	param->filterFunction(param->srcSurface, param->dstSurface);
 	
 	return NULL;
 }

Modified: trunk/desmume/src/cocoa/videofilter.h
===================================================================
--- trunk/desmume/src/cocoa/videofilter.h	2013-01-09 05:25:17 UTC (rev 4467)
+++ trunk/desmume/src/cocoa/videofilter.h	2013-01-09 08:31:21 UTC (rev 4468)
@@ -69,11 +69,11 @@
 // Attributes list of known video filters, indexed using VideoFilterTypeID.
 const VideoFilterAttributes VideoFilterAttributesList[] = {
 	{VideoFilterTypeID_None,			"None",				NULL,							1,	1},
-	{VideoFilterTypeID_LQ2X,			"LQ2X",				&RenderLQ2X,					2,	1},
-	{VideoFilterTypeID_LQ2XS,			"LQ2XS",			&RenderLQ2XS,					2,	1},
-	{VideoFilterTypeID_HQ2X,			"HQ2X",				&RenderHQ2X,					2,	1},
-	{VideoFilterTypeID_HQ2XS,			"HQ2XS",			&RenderHQ2XS,					2,	1},
-	{VideoFilterTypeID_HQ4X,			"HQ4X",				&RenderHQ4X,					4,	1},
+	{VideoFilterTypeID_LQ2X,			"LQ2x",				&RenderLQ2X,					2,	1},
+	{VideoFilterTypeID_LQ2XS,			"LQ2xS",			&RenderLQ2XS,					2,	1},
+	{VideoFilterTypeID_HQ2X,			"HQ2x",				&RenderHQ2X,					2,	1},
+	{VideoFilterTypeID_HQ2XS,			"HQ2xS",			&RenderHQ2XS,					2,	1},
+	{VideoFilterTypeID_HQ4X,			"HQ4x",				&RenderHQ4X,					4,	1},
 	{VideoFilterTypeID_2xSaI,			"2xSaI",			&Render2xSaI,					2,	1},
 	{VideoFilterTypeID_Super2xSaI,		"Super 2xSaI",		&RenderSuper2xSaI,				2,	1},
 	{VideoFilterTypeID_SuperEagle,		"Super Eagle",		&RenderSuperEagle,				2,	1},
@@ -86,13 +86,13 @@
 	{VideoFilterTypeID_EPXPlus,			"EPX+",				&RenderEPXPlus,					2,	1},
 	{VideoFilterTypeID_EPX1_5X,			"EPX 1.5x",			&RenderEPX_1Point5x,			3,	2},
 	{VideoFilterTypeID_EPXPlus1_5X,		"EPX+ 1.5x",		&RenderEPXPlus_1Point5x,		3,	2},
-	{VideoFilterTypeID_HQ4XS,			"HQ4XS",			&RenderHQ4XS,					4,	1} };
+	{VideoFilterTypeID_HQ4XS,			"HQ4xS",			&RenderHQ4XS,					4,	1} };
 
 // Parameters struct for IPC
 typedef struct
 {
 	SSurface srcSurface;
-	SSurface destSurface;
+	SSurface dstSurface;
 	VideoFilterFunc filterFunction;
 } VideoFilterThreadParam;
 
@@ -118,7 +118,7 @@
 	   and then stores the resulting pixels into the destination buffer in RGBA8888
 	   format.
 	6. At this point, the destination buffer pixels can be used. RunFilter() returns
-	   a pointer to the destination buffer. Alternatively, GetDestBufferPtr() can be
+	   a pointer to the destination buffer. Alternatively, GetDstBufferPtr() can be
 	   used to get the pointer.
  
 	Thread Safety:
@@ -138,7 +138,7 @@
 	
 	bool _isFilterRunning;
 	pthread_mutex_t _mutexSrc;
-	pthread_mutex_t _mutexDest;
+	pthread_mutex_t _mutexDst;
 	pthread_mutex_t _mutexTypeID;
 	pthread_mutex_t _mutexTypeString;
 	pthread_cond_t _condRunning;
@@ -162,11 +162,11 @@
 	VideoFilterTypeID GetTypeID();
 	const char* GetTypeString();
 	uint32_t* GetSrcBufferPtr();
-	uint32_t* GetDestBufferPtr();
+	uint32_t* GetDstBufferPtr();
 	unsigned int GetSrcWidth();
 	unsigned int GetSrcHeight();
-	unsigned int GetDestWidth();
-	unsigned int GetDestHeight();
+	unsigned int GetDstWidth();
+	unsigned int GetDstHeight();
 };
 
 static void* RunVideoFilterTask(void *arg);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4472
          http://desmume.svn.sourceforge.net/desmume/?rev=4472&view=rev
Author:   rogerman
Date:     2013-01-11 09:27:07 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
Cocoa Port:
- Make the video filters code more cross-platform friendly by adding #includes for Linux.
- Do more parameter checks in RunFilterCustom() and also add more helpful comments.

Modified Paths:
--------------
    trunk/desmume/src/cocoa/videofilter.cpp
    trunk/desmume/src/cocoa/videofilter.h

Modified: trunk/desmume/src/cocoa/videofilter.cpp
===================================================================
--- trunk/desmume/src/cocoa/videofilter.cpp	2013-01-10 22:02:10 UTC (rev 4471)
+++ trunk/desmume/src/cocoa/videofilter.cpp	2013-01-11 09:27:07 UTC (rev 4472)
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2012 DeSmuME team
+	Copyright (C) 2013 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
 */
 
 #include "videofilter.h"
+#include <string.h>
 
 // Parameters for Scanline filter
 int scanline_filter_a = 0;
@@ -327,10 +328,12 @@
 
 /********************************************************************************************
 	RunFilterCustom() - STATIC
-
+	
 	Runs the pixels from srcBuffer through the video filter, and then stores the
-	resulting pixels into dstBuffer.
-
+	resulting pixels into dstBuffer. This function is useful for when your source or
+	destination buffers are already established, or when you want to run a filter once
+	without having to instantiate a new filter object.
+	
 	Takes:
 		srcBuffer - A pointer to the source pixel buffer. The caller is responsible
 			for ensuring that this buffer is valid. Also note that certain video filters
@@ -347,7 +350,7 @@
 		
 		typeID - The type ID of the video filter. See the VideoFilterTypeID
 			enumeration for possible values.
-
+	
 	Returns:
 		Nothing.
  ********************************************************************************************/
@@ -355,16 +358,23 @@
 								  const unsigned int srcWidth, const unsigned int srcHeight,
 								  const VideoFilterTypeID typeID)
 {
-	if (typeID >= VideoFilterTypeIDCount)
+	// Parameter check
+	if (srcBuffer == NULL ||
+		dstBuffer == NULL ||
+		srcWidth == 0 ||
+		srcHeight == 0 ||
+		typeID >= VideoFilterTypeIDCount)
 	{
 		return;
 	}
 	
+	// Get the filter attributes
 	const VideoFilterAttributes *vfAttr = &VideoFilterAttributesList[typeID];
 	const unsigned int dstWidth = srcWidth * vfAttr->scaleMultiply / vfAttr->scaleDivide;
 	const unsigned int dstHeight = srcHeight * vfAttr->scaleMultiply / vfAttr->scaleDivide;
 	const VideoFilterFunc filterFunction = vfAttr->filterFunction;
 	
+	// Assign the surfaces and run the filter
 	SSurface srcSurface = {(unsigned char *)srcBuffer, srcWidth*2, srcWidth, srcHeight};
 	SSurface dstSurface = {(unsigned char *)dstBuffer, dstWidth*2, dstWidth, dstHeight};
 	

Modified: trunk/desmume/src/cocoa/videofilter.h
===================================================================
--- trunk/desmume/src/cocoa/videofilter.h	2013-01-10 22:02:10 UTC (rev 4471)
+++ trunk/desmume/src/cocoa/videofilter.h	2013-01-11 09:27:07 UTC (rev 4472)
@@ -19,6 +19,7 @@
 #ifndef _VIDEOFILTER_
 #define _VIDEOFILTER_
 
+#include <stdint.h>
 #include <stdlib.h>
 #include <string>
 #include <vector>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4484
          http://desmume.svn.sourceforge.net/desmume/?rev=4484&view=rev
Author:   rogerman
Date:     2013-01-17 01:22:53 +0000 (Thu, 17 Jan 2013)
Log Message:
-----------
Cocoa Port:
- New feature: Add support for the OpenGL renderer's multisample antialiasing (MSAA) feature.
- Update UI tooltips for the 3D renderers to reflect the current state of the code.

Modified Paths:
--------------
    trunk/desmume/src/cocoa/DefaultUserPrefs.plist
    trunk/desmume/src/cocoa/cocoa_globals.h
    trunk/desmume/src/cocoa/cocoa_output.h
    trunk/desmume/src/cocoa/cocoa_output.mm
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.strings
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
    trunk/desmume/src/cocoa/userinterface/displayView.h
    trunk/desmume/src/cocoa/userinterface/displayView.mm
    trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.h
    trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.mm

Modified: trunk/desmume/src/cocoa/DefaultUserPrefs.plist
===================================================================
--- trunk/desmume/src/cocoa/DefaultUserPrefs.plist	2013-01-17 01:19:08 UTC (rev 4483)
+++ trunk/desmume/src/cocoa/DefaultUserPrefs.plist	2013-01-17 01:22:53 UTC (rev 4484)
@@ -1,56 +1,55 @@
-bplist00\xDF5

Revision: 4487
          http://desmume.svn.sourceforge.net/desmume/?rev=4487&view=rev
Author:   rogerman
Date:     2013-01-18 07:53:09 +0000 (Fri, 18 Jan 2013)
Log Message:
-----------
Cocoa Port:
- Add the (Get/Set)FilterParameter family of methods for video filters that need parameters.
- Make VideoFilter::RunFilter() and the destructor a little bit more thread-safe.
- Do some minor code cleanup.

Modified Paths:
--------------
    trunk/desmume/src/cocoa/cocoa_videofilter.h
    trunk/desmume/src/cocoa/cocoa_videofilter.mm
    trunk/desmume/src/cocoa/videofilter.cpp
    trunk/desmume/src/cocoa/videofilter.h

Modified: trunk/desmume/src/cocoa/cocoa_videofilter.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_videofilter.h	2013-01-17 09:14:06 UTC (rev 4486)
+++ trunk/desmume/src/cocoa/cocoa_videofilter.h	2013-01-18 07:53:09 UTC (rev 4487)
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2012 DeSmuME team
+	Copyright (C) 2013 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -48,6 +48,13 @@
 - (UInt32 *) dstBufferPtr;
 - (NSSize) srcSize;
 - (NSSize) destSize;
+- (VideoFilterParamType) filterParameterType:(VideoFilterParamID)paramID;
+- (int) filterParameteri:(VideoFilterParamID)paramID;
+- (unsigned int) filterParameterui:(VideoFilterParamID)paramID;
+- (float) filterParameterf:(VideoFilterParamID)paramID;
+- (void) setFilterParameter:(VideoFilterParamID)paramID intValue:(int)value;
+- (void) setFilterParameter:(VideoFilterParamID)paramID uintValue:(unsigned int)value;
+- (void) setFilterParameter:(VideoFilterParamID)paramID floatValue:(float)value;
 + (NSString *) typeStringByID:(VideoFilterTypeID)typeID;
 
 @end

Modified: trunk/desmume/src/cocoa/cocoa_videofilter.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_videofilter.mm	2013-01-17 09:14:06 UTC (rev 4486)
+++ trunk/desmume/src/cocoa/cocoa_videofilter.mm	2013-01-18 07:53:09 UTC (rev 4487)
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2012 DeSmuME team
+	Copyright (C) 2013 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -182,6 +182,41 @@
 	return NSMakeSize((CGFloat)vf->GetDstWidth(), (CGFloat)vf->GetDstHeight());
 }
 
+- (VideoFilterParamType) filterParameterType:(VideoFilterParamID)paramID
+{
+	return vf->GetFilterParameterType(paramID);
+}
+
+- (int) filterParameteri:(VideoFilterParamID)paramID
+{
+	return vf->GetFilterParameteri(paramID);
+}
+
+- (unsigned int) filterParameterui:(VideoFilterParamID)paramID
+{
+	return vf->GetFilterParameterui(paramID);
+}
+
+- (float) filterParameterf:(VideoFilterParamID)paramID
+{
+	return vf->GetFilterParameterf(paramID);
+}
+
+- (void) setFilterParameter:(VideoFilterParamID)paramID intValue:(int)value
+{
+	vf->SetFilterParameteri(paramID, value);
+}
+
+- (void) setFilterParameter:(VideoFilterParamID)paramID uintValue:(unsigned int)value
+{
+	vf->SetFilterParameterui(paramID, value);
+}
+
+- (void) setFilterParameter:(VideoFilterParamID)paramID floatValue:(float)value
+{
+	vf->SetFilterParameterf(paramID, value);
+}
+
 + (NSString *) typeStringByID:(VideoFilterTypeID)typeID
 {
 	const char *vfTypeCString = VideoFilter::GetTypeStringByID(typeID);

Modified: trunk/desmume/src/cocoa/videofilter.cpp
===================================================================
--- trunk/desmume/src/cocoa/videofilter.cpp	2013-01-17 09:14:06 UTC (rev 4486)
+++ trunk/desmume/src/cocoa/videofilter.cpp	2013-01-18 07:53:09 UTC (rev 4487)
@@ -25,6 +25,20 @@
 int scanline_filter_c = 2;
 int scanline_filter_d = 4;
 
+// 
+typedef struct
+{
+	void *index;
+	VideoFilterParamType type;
+} _VideoFilterParamAttributes;
+
+static const _VideoFilterParamAttributes _VideoFilterParamAttributesList[] = {
+	{&scanline_filter_a,	VF_INT},
+	{&scanline_filter_b,	VF_INT},
+	{&scanline_filter_c,	VF_INT},
+	{&scanline_filter_d,	VF_INT},
+};
+
 /********************************************************************************************
 	CLASS CONSTRUCTORS
  ********************************************************************************************/
@@ -80,6 +94,7 @@
 	_vfThread.clear();
 	
 	// Destroy everything else
+	pthread_mutex_lock(&_mutexSrc);
 	pthread_mutex_lock(&this->_mutexDst);
 	
 	while (this->_isFilterRunning)
@@ -92,8 +107,6 @@
 	
 	pthread_mutex_unlock(&_mutexDst);
 	
-	pthread_mutex_lock(&_mutexSrc);
-	
 	free(_vfSrcSurfacePixBuffer);
 	_vfSrcSurfacePixBuffer = NULL;
 	_vfSrcSurface.Surface = NULL;
@@ -284,13 +297,12 @@
  ********************************************************************************************/
 uint32_t* VideoFilter::RunFilter()
 {
+	pthread_mutex_lock(&this->_mutexSrc);
 	pthread_mutex_lock(&this->_mutexDst);
 	
 	this->_isFilterRunning = true;
 	uint32_t *destBufPtr = (uint32_t *)this->_vfDstSurface.Surface;
 	
-	pthread_mutex_lock(&this->_mutexSrc);
-	
 	if (this->_vfFunc == NULL)
 	{
 		memcpy(this->_vfDstSurface.Surface, this->_vfSrcSurface.Surface, this->_vfDstSurface.Width * this->_vfDstSurface.Height * sizeof(uint32_t));
@@ -317,11 +329,11 @@
 		}
 	}
 	
-	pthread_mutex_unlock(&this->_mutexSrc);
-	
 	this->_isFilterRunning = false;
 	pthread_cond_signal(&this->_condRunning);
+	
 	pthread_mutex_unlock(&this->_mutexDst);
+	pthread_mutex_unlock(&this->_mutexSrc);
 	
 	return destBufPtr;
 }
@@ -505,6 +517,188 @@
 	return height;
 }
 
+VideoFilterParamType VideoFilter::GetFilterParameterType(VideoFilterParamID paramID)
+{
+	return _VideoFilterParamAttributesList[paramID].type;
+}
+
+int VideoFilter::GetFilterParameteri(VideoFilterParamID paramID)
+{
+	int value = 0;
+	
+	pthread_mutex_lock(&this->_mutexDst);
+	
+	switch (_VideoFilterParamAttributesList[paramID].type)
+	{
+		case VF_INT:
+			value = (int)(*((int *)_VideoFilterParamAttributesList[paramID].index));
+			break;
+			
+		case VF_UINT:
+			value = (int)(*((unsigned int *)_VideoFilterParamAttributesList[paramID].index));
+			break;
+			
+		case VF_FLOAT:
+			value = (int)(*((float *)_VideoFilterParamAttributesList[paramID].index));
+			break;
+			
+		default:
+			break;
+	}
+	
+	pthread_mutex_unlock(&this->_mutexDst);
+	
+	return value;
+}
+
+unsigned int VideoFilter::GetFilterParameterui(VideoFilterParamID paramID)
+{
+	unsigned int value = 0;
+	
+	pthread_mutex_lock(&this->_mutexDst);
+	
+	switch (_VideoFilterParamAttributesList[paramID].type)
+	{
+		case VF_INT:
+			value = (unsigned int)(*((int *)_VideoFilterParamAttributesList[paramID].index));
+			break;
+			
+		case VF_UINT:
+			value = (unsigned int)(*((unsigned int *)_VideoFilterParamAttributesList[paramID].index));
+			break;
+			
+		case VF_FLOAT:
+			value = (unsigned int)(*((float *)_VideoFilterParamAttributesList[paramID].index));
+			break;
+			
+		default:
+			break;
+	}
+	
+	pthread_mutex_unlock(&this->_mutexDst);
+	
+	return value;
+}
+
+float VideoFilter::GetFilterParameterf(VideoFilterParamID paramID)
+{
+	float value = 0.0f;
+	
+	pthread_mutex_lock(&this->_mutexDst);
+	
+	switch (_VideoFilterParamAttributesList[paramID].type)
+	{
+		case VF_INT:
+			value = (float)(*((int *)_VideoFilterParamAttributesList[paramID].index));
+			break;
+			
+		case VF_UINT:
+			value = (float)(*((unsigned int *)_VideoFilterParamAttributesList[paramID].index));
+			break;
+			
+		case VF_FLOAT:
+			value = (float)(*((float *)_VideoFilterParamAttributesList[paramID].index));
+			break;
+			
+		default:
+			break;
+	}
+	
+	pthread_mutex_unlock(&this->_mutexDst);
+	
+	return value;
+}
+
+void VideoFilter::SetFilterParameteri(VideoFilterParamID paramID, int value)
+{
+	if (paramID >= VideoFilterParamIDCount)
+	{
+		return;
+	}
+	
+	pthread_mutex_lock(&this->_mutexDst);
+	
+	switch (_VideoFilterParamAttributesList[paramID].type)
+	{
+		case VF_INT:
+			*((int *)_VideoFilterParamAttributesList[paramID].index) = (int)value;
+			break;
+			
+		case VF_UINT:
+			*((unsigned int *)_VideoFilterParamAttributesList[paramID].index) = (unsigned int)value;
+			break;
+			
+		case VF_FLOAT:
+			*((float *)_VideoFilterParamAttributesList[paramID].index) = (float)value;
+			break;
+			
+		default:
+			break;
+	}
+	
+	pthread_mutex_unlock(&this->_mutexDst);
+}
+
+void VideoFilter::SetFilterParameterui(VideoFilterParamID paramID, unsigned int value)
+{
+	if (paramID >= VideoFilterParamIDCount)
+	{
+		return;
+	}
+	
+	pthread_mutex_lock(&this->_mutexDst);
+	
+	switch (_VideoFilterParamAttributesList[paramID].type)
+	{
+		case VF_INT:
+			*((int *)_VideoFilterParamAttributesList[paramID].index) = (int)value;
+			break;
+			
+		case VF_UINT:
+			*((unsigned int *)_VideoFilterParamAttributesList[paramID].index) = (unsigned int)value;
+			break;
+			
+		case VF_FLOAT:
+			*((float *)_VideoFilterParamAttributesList[paramID].index) = (float)value;
+			break;
+			
+		default:
+			break;
+	}
+	
+	pthread_mutex_unlock(&this->_mutexDst);
+}
+
+void VideoFilter::SetFilterParameterf(VideoFilterParamID paramID, float value)
+{
+	if (paramID >= VideoFilterParamIDCount)
+	{
+		return;
+	}
+	
+	pthread_mutex_lock(&this->_mutexDst);
+	
+	switch (_VideoFilterParamAttributesList[paramID].type)
+	{
+		case VF_INT:
+			*((int *)_VideoFilterParamAttributesList[paramID].index) = (int)value;
+			break;
+			
+		case VF_UINT:
+			*((unsigned int *)_VideoFilterParamAttributesList[paramID].index) = (unsigned int)value;
+			break;
+			
+		case VF_FLOAT:
+			*((float *)_VideoFilterParamAttributesList[paramID].index) = (float)value;
+			break;
+			
+		default:
+			break;
+	}
+	
+	pthread_mutex_unlock(&this->_mutexDst);
+}
+
 // Task function for multithreaded filtering
 static void* RunVideoFilterTask(void *arg)
 {

Modified: trunk/desmume/src/cocoa/videofilter.h
===================================================================
--- trunk/desmume/src/cocoa/videofilter.h	2013-01-17 09:14:06 UTC (rev 4486)
+++ trunk/desmume/src/cocoa/videofilter.h	2013-01-18 07:53:09 UTC (rev 4487)
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2012 DeSmuME team
+	Copyright (C) 2013 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -28,6 +28,10 @@
 #include "../utils/task.h"
 
 
+#define VIDEOFILTERTYPE_UNKNOWN_STRING "Unknown"
+
+typedef void (*VideoFilterFunc)(SSurface Src, SSurface Dst);
+
 // VIDEO FILTER TYPES
 enum VideoFilterTypeID
 {
@@ -54,10 +58,6 @@
 	VideoFilterTypeIDCount // Make sure this one is always last
 };
 
-#define VIDEOFILTERTYPE_UNKNOWN_STRING "Unknown"
-
-typedef void (*VideoFilterFunc)(SSurface Src, SSurface Dst);
-
 typedef struct
 {
 	VideoFilterTypeID typeID;
@@ -89,6 +89,26 @@
 	{VideoFilterTypeID_EPXPlus1_5X,		"EPX+ 1.5x",		&RenderEPXPlus_1Point5x,		3,	2},
 	{VideoFilterTypeID_HQ4XS,			"HQ4xS",			&RenderHQ4XS,					4,	1} };
 
+// VIDEO FILTER PARAMETER DATA TYPES
+enum VideoFilterParamType
+{
+	VF_INT = 0,
+	VF_UINT,
+	VF_FLOAT
+};
+
+// VIDEO FILTER PARAMETERS
+// These tokens are used with the (Get/Set)FilterParameter family of methods.
+enum VideoFilterParamID
+{
+	VF_PARAM_SCANLINE_A = 0,	// Must always start at 0
+	VF_PARAM_SCANLINE_B,
+	VF_PARAM_SCANLINE_C,
+	VF_PARAM_SCANLINE_D,
+	
+	VideoFilterParamIDCount		// Make sure this one is always last
+};
+
 // Parameters struct for IPC
 typedef struct
 {
@@ -168,6 +188,13 @@
 	unsigned int GetSrcHeight();
 	unsigned int GetDstWidth();
 	unsigned int GetDstHeight();
+	VideoFilterParamType GetFilterParameterType(VideoFilterParamID paramID);
+	int GetFilterParameteri(VideoFilterParamID paramID);
+	unsigned int GetFilterParameterui(VideoFilterParamID paramID);
+	float GetFilterParameterf(VideoFilterParamID paramID);
+	void SetFilterParameteri(VideoFilterParamID paramID, int value);
+	void SetFilterParameterui(VideoFilterParamID paramID, unsigned int value);
+	void SetFilterParameterf(VideoFilterParamID paramID, float value);
 };
 
 static void* RunVideoFilterTask(void *arg);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4502
          http://desmume.svn.sourceforge.net/desmume/?rev=4502&view=rev
Author:   rogerman
Date:     2013-02-05 07:12:50 +0000 (Tue, 05 Feb 2013)
Log Message:
-----------
Cocoa Port:
- Add support for the new OpenGL 3.2 renderer. (Requires OS X v10.7 or later, Xcode 4 builds only.)

Modified Paths:
--------------
    trunk/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj
    trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj
    trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj
    trunk/desmume/src/cocoa/cocoa_output.h
    trunk/desmume/src/cocoa/cocoa_output.mm
    trunk/desmume/src/cocoa/cocoa_util.h
    trunk/desmume/src/cocoa/cocoa_util.mm
    trunk/desmume/src/cocoa/userinterface/displayView.h
    trunk/desmume/src/cocoa/userinterface/displayView.mm

Modified: trunk/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj
===================================================================
--- trunk/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj	2013-02-05 06:36:47 UTC (rev 4501)
+++ trunk/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj	2013-02-05 07:12:50 UTC (rev 4502)
@@ -1236,7 +1236,6 @@
 		AB06CD02135B8ACE00E977B3 /* ROMReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ROMReader.h; path = ../ROMReader.h; sourceTree = SOURCE_ROOT; };
 		AB06CD03135B8ACE00E977B3 /* rtc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rtc.h; path = ../rtc.h; sourceTree = SOURCE_ROOT; };
 		AB06CD04135B8ACE00E977B3 /* saves.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = saves.h; path = ../saves.h; sourceTree = SOURCE_ROOT; };
-		AB06CD05135B8ACE00E977B3 /* shaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = shaders.h; path = ../shaders.h; sourceTree = SOURCE_ROOT; };
 		AB06CD06135B8ACE00E977B3 /* slot1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = slot1.h; path = ../slot1.h; sourceTree = SOURCE_ROOT; };
 		AB06CD07135B8ACE00E977B3 /* sndsdl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sndsdl.h; path = ../sndsdl.h; sourceTree = SOURCE_ROOT; };
 		AB06CD08135B8ACE00E977B3 /* SPU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPU.h; path = ../SPU.h; sourceTree = SOURCE_ROOT; };
@@ -1804,7 +1803,6 @@
 				AB06CD02135B8ACE00E977B3 /* ROMReader.h */,
 				AB06CD03135B8ACE00E977B3 /* rtc.h */,
 				AB06CD04135B8ACE00E977B3 /* saves.h */,
-				AB06CD05135B8ACE00E977B3 /* shaders.h */,
 				AB06CD06135B8ACE00E977B3 /* slot1.h */,
 				AB06CD07135B8ACE00E977B3 /* sndsdl.h */,
 				AB06CD08135B8ACE00E977B3 /* SPU.h */,

Modified: trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj
===================================================================
--- trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj	2013-02-05 06:36:47 UTC (rev 4501)
+++ trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj	2013-02-05 07:12:50 UTC (rev 4502)
@@ -1114,7 +1114,6 @@
 		ABD1FE951345AC8400AF11D1 /* ROMReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ROMReader.h; path = ../ROMReader.h; sourceTree = SOURCE_ROOT; };
 		ABD1FE961345AC8400AF11D1 /* rtc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rtc.h; path = ../rtc.h; sourceTree = SOURCE_ROOT; };
 		ABD1FE971345AC8400AF11D1 /* saves.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = saves.h; path = ../saves.h; sourceTree = SOURCE_ROOT; };
-		ABD1FE981345AC8400AF11D1 /* shaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = shaders.h; path = ../shaders.h; sourceTree = SOURCE_ROOT; };
 		ABD1FE991345AC8400AF11D1 /* slot1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = slot1.h; path = ../slot1.h; sourceTree = SOURCE_ROOT; };
 		ABD1FE9A1345AC8400AF11D1 /* sndsdl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sndsdl.h; path = ../sndsdl.h; sourceTree = SOURCE_ROOT; };
 		ABD1FE9B1345AC8400AF11D1 /* SPU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPU.h; path = ../SPU.h; sourceTree = SOURCE_ROOT; };
@@ -1735,7 +1734,6 @@
 				ABD1FE951345AC8400AF11D1 /* ROMReader.h */,
 				ABD1FE961345AC8400AF11D1 /* rtc.h */,
 				ABD1FE971345AC8400AF11D1 /* saves.h */,
-				ABD1FE981345AC8400AF11D1 /* shaders.h */,
 				ABD1FE991345AC8400AF11D1 /* slot1.h */,
 				ABD1FE9A1345AC8400AF11D1 /* sndsdl.h */,
 				ABD1FE9B1345AC8400AF11D1 /* SPU.h */,

Modified: trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj
===================================================================
--- trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj	2013-02-05 06:36:47 UTC (rev 4501)
+++ trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj	2013-02-05 07:12:50 UTC (rev 4502)
@@ -64,6 +64,7 @@
 		AB1B9E661501A78000464647 /* ringbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB1B9E601501A78000464647 /* ringbuffer.cpp */; };
 		AB1F468413A0ADE400B80DE6 /* SndOut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF7A1345ACFA00AF11D1 /* SndOut.cpp */; };
 		AB1F469813A0AE2F00B80DE6 /* Timestretcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF9B1345ACFA00AF11D1 /* Timestretcher.cpp */; };
+		AB26D87C16B5253D00A2305C /* OGLRender_3_2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB68A0DA16B139BC00DE0546 /* OGLRender_3_2.cpp */; };
 		AB350B6A1478A5B3007165AC /* cocoa_hid.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB350B691478A5B3007165AC /* cocoa_hid.mm */; };
 		AB350BA51478AC96007165AC /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB350BA41478AC96007165AC /* IOKit.framework */; };
 		AB350D3B147A1D93007165AC /* HID_usage_strings.plist in Resources */ = {isa = PBXBuildFile; fileRef = AB350D3A147A1D93007165AC /* HID_usage_strings.plist */; };
@@ -172,6 +173,7 @@
 		AB4FCEBF1692AB82000F498F /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB4FCEBC1692AB82000F498F /* Accelerate.framework */; };
 		AB58F32D1364F44B0074C376 /* cocoa_file.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB58F32C1364F44B0074C376 /* cocoa_file.mm */; };
 		AB64987C13ECC73800EE7DD2 /* FileTypeInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = AB64987B13ECC73800EE7DD2 /* FileTypeInfo.plist */; };
+		AB68A0DD16B139BC00DE0546 /* OGLRender_3_2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB68A0DA16B139BC00DE0546 /* OGLRender_3_2.cpp */; };
 		AB6FBEF6139B6258007BB045 /* slot1_retail_nand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */; };
 		AB75226E14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB75226D14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns */; };
 		AB796C9C15CDCB0F00C59155 /* arm_jit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB796C9B15CDCB0F00C59155 /* arm_jit.cpp */; };
@@ -765,6 +767,7 @@
 		AB58F32B1364F44B0074C376 /* cocoa_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_file.h; sourceTree = "<group>"; };
 		AB58F32C1364F44B0074C376 /* cocoa_file.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_file.mm; sourceTree = "<group>"; };
 		AB64987B13ECC73800EE7DD2 /* FileTypeInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = FileTypeInfo.plist; sourceTree = "<group>"; };
+		AB68A0DA16B139BC00DE0546 /* OGLRender_3_2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OGLRender_3_2.cpp; path = ../OGLRender_3_2.cpp; sourceTree = "<group>"; };
 		AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_retail_nand.cpp; sourceTree = "<group>"; };
 		AB75226D14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = AppIcon_FirmwareConfig.icns; sourceTree = "<group>"; };
 		AB796C9B15CDCB0F00C59155 /* arm_jit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = arm_jit.cpp; path = ../arm_jit.cpp; sourceTree = "<group>"; };
@@ -817,6 +820,7 @@
 		ABB97873144E89CC00793FA3 /* Icon_ActionReplay_32x32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_ActionReplay_32x32.png; path = Images/Icon_ActionReplay_32x32.png; sourceTree = "<group>"; };
 		ABB97874144E89CC00793FA3 /* Icon_CodeBreaker_32x32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_CodeBreaker_32x32.png; path = Images/Icon_CodeBreaker_32x32.png; sourceTree = "<group>"; };
 		ABB97875144E89CC00793FA3 /* Icon_DeSmuME_32x32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_DeSmuME_32x32.png; path = Images/Icon_DeSmuME_32x32.png; sourceTree = "<group>"; };
+		ABBB421516B4A5F30012E5AB /* OGLRender_3_2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OGLRender_3_2.h; path = ../OGLRender_3_2.h; sourceTree = "<group>"; };
 		ABBC0F8C1394B1AA0028B6BD /* DefaultUserPrefs.plist */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = DefaultUserPrefs.plist; sourceTree = "<group>"; };
 		ABBF04A414B515F300E505A0 /* AppIcon_ROMCheats.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = AppIcon_ROMCheats.icns; sourceTree = "<group>"; };
 		ABC3AF2B14B7F06900D5B13D /* Icon_VolumeFull_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_VolumeFull_16x16.png; path = images/Icon_VolumeFull_16x16.png; sourceTree = "<group>"; };
@@ -881,7 +885,6 @@
 		ABD1FE951345AC8400AF11D1 /* ROMReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ROMReader.h; path = ../ROMReader.h; sourceTree = SOURCE_ROOT; };
 		ABD1FE961345AC8400AF11D1 /* rtc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rtc.h; path = ../rtc.h; sourceTree = SOURCE_ROOT; };
 		ABD1FE971345AC8400AF11D1 /* saves.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = saves.h; path = ../saves.h; sourceTree = SOURCE_ROOT; };
-		ABD1FE981345AC8400AF11D1 /* shaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = shaders.h; path = ../shaders.h; sourceTree = SOURCE_ROOT; };
 		ABD1FE991345AC8400AF11D1 /* slot1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = slot1.h; path = ../slot1.h; sourceTree = SOURCE_ROOT; };
 		ABD1FE9A1345AC8400AF11D1 /* sndsdl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sndsdl.h; path = ../sndsdl.h; sourceTree = SOURCE_ROOT; };
 		ABD1FE9B1345AC8400AF11D1 /* SPU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPU.h; path = ../SPU.h; sourceTree = SOURCE_ROOT; };
@@ -1453,6 +1456,7 @@
 				ABD1FEBF1345AC8400AF11D1 /* movie.cpp */,
 				ABD1FEC01345AC8400AF11D1 /* NDSSystem.cpp */,
 				ABD1FEC11345AC8400AF11D1 /* OGLRender.cpp */,
+				AB68A0DA16B139BC00DE0546 /* OGLRender_3_2.cpp */,
 				ABD1FEC21345AC8400AF11D1 /* path.cpp */,
 				ABD1FEC31345AC8400AF11D1 /* rasterize.cpp */,
 				ABD1FEC41345AC8400AF11D1 /* readwrite.cpp */,
@@ -1504,6 +1508,7 @@
 				ABD1FE8B1345AC8400AF11D1 /* movie.h */,
 				ABD1FE8C1345AC8400AF11D1 /* NDSSystem.h */,
 				ABD1FE8D1345AC8400AF11D1 /* OGLRender.h */,
+				ABBB421516B4A5F30012E5AB /* OGLRender_3_2.h */,
 				ABD1FE8F1345AC8400AF11D1 /* PACKED.h */,
 				ABD1FE8E1345AC8400AF11D1 /* PACKED_END.h */,
 				ABD1FE901345AC8400AF11D1 /* path.h */,
@@ -1514,7 +1519,6 @@
 				ABD1FE951345AC8400AF11D1 /* ROMReader.h */,
 				ABD1FE961345AC8400AF11D1 /* rtc.h */,
 				ABD1FE971345AC8400AF11D1 /* saves.h */,
-				ABD1FE981345AC8400AF11D1 /* shaders.h */,
 				ABD1FE991345AC8400AF11D1 /* slot1.h */,
 				ABD1FE9A1345AC8400AF11D1 /* sndsdl.h */,
 				ABD1FE9B1345AC8400AF11D1 /* SPU.h */,
@@ -2370,6 +2374,7 @@
 				AB40568D169F5DCC0016AC3E /* x86func.cpp in Sources */,
 				AB405690169F5DCC0016AC3E /* x86operand.cpp in Sources */,
 				AB405693169F5DCC0016AC3E /* x86util.cpp in Sources */,
+				AB26D87C16B5253D00A2305C /* OGLRender_3_2.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2513,6 +2518,7 @@
 				AB40568F169F5DCC0016AC3E /* x86func.cpp in Sources */,
 				AB405692169F5DCC0016AC3E /* x86operand.cpp in Sources */,
 				AB405695169F5DCC0016AC3E /* x86util.cpp in Sources */,
+				AB68A0DD16B139BC00DE0546 /* OGLRender_3_2.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2569,6 +2575,7 @@
 		AB796D6F15CDCBA200C59155 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				LLVM_LTO = YES;
 			};
 			name = Release;
 		};

Modified: trunk/desmume/src/cocoa/cocoa_output.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_output.h	2013-02-05 06:36:47 UTC (rev 4501)
+++ trunk/desmume/src/cocoa/cocoa_output.h	2013-02-05 07:12:50 UTC (rev 4502)
@@ -250,6 +250,7 @@
 void SetGPUDisplayState(int gpuType, bool state);
 bool GetGPUDisplayState(int gpuType);
 
+void RequestOpenGLRenderer_3_2(bool request_3_2);
 void SetOpenGLRendererFunctions(bool (*initFunction)(),
 								bool (*beginOGLFunction)(),
 								void (*endOGLFunction)());

Modified: trunk/desmume/src/cocoa/cocoa_output.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_output.mm	2013-02-05 06:36:47 UTC (rev 4501)
+++ trunk/desmume/src/cocoa/cocoa_output.mm	2013-02-05 07:12:50 UTC (rev 4502)
@@ -22,15 +22,18 @@
 #import "cocoa_util.h"
 #include "sndOSX.h"
 
-#include <OpenGL/OpenGL.h>
-
 #include "../NDSSystem.h"
 #include "../GPU.h"
-#include "../OGLRender.h"
 #include "../rasterize.h"
 #include "../SPU.h"
 #include "../metaspu/metaspu.h"
 
+#ifdef MAC_OS_X_VERSION_10_7
+#include "../OGLRender_3_2.h"
+#else
+#include "../OGLRender.h"
+#endif
+
 #undef BOOL
 
 GPU3DInterface *core3DList[] = {
@@ -1851,6 +1854,25 @@
 	return result;
 }
 
+void RequestOpenGLRenderer_3_2(bool request_3_2)
+{
+#ifdef OGLRENDER_3_2_H
+	if (request_3_2)
+	{
+		OGLLoadEntryPoints_3_2_Func = &OGLLoadEntryPoints_3_2;
+		OGLCreateRenderer_3_2_Func = &OGLCreateRenderer_3_2;
+	}
+	else
+	{
+		OGLLoadEntryPoints_3_2_Func = NULL;
+		OGLCreateRenderer_3_2_Func = NULL;
+	}
+#else
+	OGLLoadEntryPoints_3_2_Func = NULL;
+	OGLCreateRenderer_3_2_Func = NULL;
+#endif
+}
+
 void SetOpenGLRendererFunctions(bool (*initFunction)(),
 								bool (*beginOGLFunction)(),
 								void (*endOGLFunction)())

Modified: trunk/desmume/src/cocoa/cocoa_util.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_util.h	2013-02-05 06:36:47 UTC (rev 4501)
+++ trunk/desmume/src/cocoa/cocoa_util.h	2013-02-05 07:12:50 UTC (rev 4502)
@@ -48,6 +48,7 @@
 
 + (NSString *) operatingSystemString;
 + (NSString *) modelIdentifierString;
++ (BOOL) OSVersionCheckMajor:(NSUInteger)checkMajor minor:(NSUInteger)checkMinor revision:(NSUInteger)checkRevision;
 
 @end
 

Modified: trunk/desmume/src/cocoa/cocoa_util.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_util.mm	2013-02-05 06:36:47 UTC (rev 4501)
+++ trunk/desmume/src/cocoa/cocoa_util.mm	2013-02-05 07:12:50 UTC (rev 4502)
@@ -181,6 +181,29 @@
 	return modelIdentifierStr;
 }
 
++ (BOOL) OSVersionCheckMajor:(NSUInteger)checkMajor minor:(NSUInteger)checkMinor revision:(NSUInteger)checkRevision
+{
+	BOOL result = NO;
+	
+	NSDictionary *systemDict = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];
+	NSString *versionString = (NSString *)[systemDict objectForKey:@"ProductVersion"];
+	const char *versionCString = [versionString cStringUsingEncoding:NSUTF8StringEncoding];
+	
+	unsigned int OSMajor = 0;
+	unsigned int OSMinor = 0;
+	unsigned int OSRevision = 0;
+	sscanf(versionCString, "%u.%u.%u", &OSMajor, &OSMinor, &OSRevision);
+	
+	if ((OSMajor > checkMajor) ||
+		(OSMajor >= checkMajor && OSMinor > checkMinor) ||
+		(OSMajor >= checkMajor && OSMinor >= checkMinor && OSRevision >= checkRevision) )
+	{
+		result = YES;
+	}
+	
+	return result;
+}
+
 @end
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4

Modified: trunk/desmume/src/cocoa/userinterface/displayView.h
===================================================================
--- trunk/desmume/src/cocoa/userinterface/displayView.h	2013-02-05 06:36:47 UTC (rev 4501)
+++ trunk/desmume/src/cocoa/userinterface/displayView.h	2013-02-05 07:12:50 UTC (rev 4502)
@@ -124,6 +124,7 @@
 	CGLContextObj cglDisplayContext;
 	NSOpenGLContext *oglRendererContext;
 	
+	BOOL useContext_3_2;
 	BOOL isVBOSupported;
 	BOOL isShadersSupported;
 	BOOL isVAOSupported;
@@ -158,6 +159,8 @@
 	unsigned int vtxBufferOffset;
 }
 
+- (void) setupOpenGL_Legacy;
+- (void) setupOpenGL_3_2;
 - (void) drawVideoFrame;
 - (void) uploadDisplayTextures:(const GLvoid *)textureData width:(const GLsizei)texWidth height:(const GLsizei)texHeight;
 - (void) renderDisplayUsingDisplayMode:(const NSInteger)displayModeID;
@@ -170,7 +173,7 @@
 {
 #endif
 
-static GLint SetupShaders(GLuint *vShaderID, GLuint *fShaderID, GLuint *programID);
+GLint SetupShaders(GLuint *programID, GLuint *vertShaderID, const char *vertShaderProgram, GLuint *fragShaderID, const char *fragShaderProgram);
 bool OSXOpenGLRendererInit();
 bool OSXOpenGLRendererBegin();
 void OSXOpenGLRendererEnd();

Modified: trunk/desmume/src/cocoa/userinterface/displayView.mm
===================================================================
--- trunk/desmume/src/cocoa/userinterface/displayView.mm	2013-02-05 06:36:47 UTC (rev 4501)
+++ trunk/desmume/src/cocoa/userinterface/displayView.mm	2013-02-05 07:12:50 UTC (rev 4502)
@@ -39,13 +39,13 @@
 #undef BOOL
 
 // VERTEX SHADER FOR DISPLAY OUTPUT
-const char *vShader = {"\
+const char *vShader_100 = {"\
 	attribute vec2 inPosition; \n\
 	attribute vec2 inTexCoord0; \n\
 	\n\
-	uniform vec2 viewSize;\n\
-	uniform float scalar;\n\
-	uniform float angleDegrees;\n\
+	uniform vec2 viewSize; \n\
+	uniform float scalar; \n\
+	uniform float angleDegrees; \n\
 	\n\
 	varying vec2 vtxTexCoord; \n\
 	\n\
@@ -53,8 +53,8 @@
 	{ \n\
 		float angleRadians = radians(angleDegrees); \n\
 		\n\
-		mat2 projection	= mat2(	vec2(2.0/viewSize.x, 0.0), \n\
-								vec2(0.0, 2.0/viewSize.y));\n\
+		mat2 projection	= mat2(	vec2(2.0/viewSize.x,            0.0), \n\
+								vec2(           0.0, 2.0/viewSize.y)); \n\
 		\n\
 		mat2 rotation	= mat2(	vec2(cos(angleRadians), -sin(angleRadians)), \n\
 								vec2(sin(angleRadians),  cos(angleRadians))); \n\
@@ -63,20 +63,18 @@
 								vec2(   0.0, scalar)); \n\
 		\n\
 		vtxTexCoord = inTexCoord0; \n\
-		gl_Position = vec4(projection * rotation * scale * inPosition, 1.0, 1.0);\n\
+		gl_Position = vec4(projection * rotation * scale * inPosition, 1.0, 1.0); \n\
 	} \n\
-	"};
+"};
 
 // FRAGMENT SHADER FOR DISPLAY OUTPUT
-const char *fShader = {"\
-	uniform sampler2D tex;\n\
-	\n\
+const char *fShader_100 = {"\
 	varying vec2 vtxTexCoord; \n\
+	uniform sampler2D tex; \n\
 	\n\
 	void main() \n\
 	{ \n\
-		vec4 color = texture2D(tex, vtxTexCoord);\n\
-		gl_FragColor = color;\n\
+		gl_FragColor = texture2D(tex, vtxTexCoord); \n\
 	} \n\
 "};
 
@@ -1012,6 +1010,19 @@
 	vtxBufferOffset = 0;
 	
 	// Create a new context for the OpenGL-based emulated 3D renderer
+#ifdef MAC_OS_X_VERSION_10_7
+	NSOpenGLPixelFormatAttribute attrs[] = {
+		NSOpenGLPFAColorSize, (NSOpenGLPixelFormatAttribute)24,
+		NSOpenGLPFAAlphaSize, (NSOpenGLPixelFormatAttribute)8,
+		NSOpenGLPFADepthSize, (NSOpenGLPixelFormatAttribute)24,
+		NSOpenGLPFAStencilSize, (NSOpenGLPixelFormatAttribute)8,
+		NSOpenGLPFAAccelerated,
+		NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core,
+		(NSOpenGLPixelFormatAttribute)0
+	};
+	
+	useContext_3_2 = [CocoaDSUtil OSVersionCheckMajor:10 minor:7 revision:0] ? YES : NO;
+#else
 	NSOpenGLPixelFormatAttribute attrs[] =
 	{
 		NSOpenGLPFAColorSize, (NSOpenGLPixelFormatAttribute)24,
@@ -1019,9 +1030,20 @@
 		NSOpenGLPFADepthSize, (NSOpenGLPixelFormatAttribute)24,
 		NSOpenGLPFAStencilSize, (NSOpenGLPixelFormatAttribute)8,
 		NSOpenGLPFAAccelerated,
+		(NSOpenGLPixelFormatAttribute)0, (NSOpenGLPixelFormatAttribute)0,
 		(NSOpenGLPixelFormatAttribute)0
 	};
 	
+	useContext_3_2 = NO;
+#endif
+	// If we're not using a 3.2 Core Profile context, then remove that
+	// requirement from the pixel format.
+	if (!useContext_3_2)
+	{
+		attrs[9] = (NSOpenGLPixelFormatAttribute)0;
+		attrs[10] = (NSOpenGLPixelFormatAttribute)0;
+	}
+	
 	NSOpenGLPixelFormat *tempPixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs];
 	if (tempPixelFormat == nil)
 	{
@@ -1031,22 +1053,26 @@
 		tempPixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs];
 	}
 	
-	NSOpenGLPixelBuffer *tempPixelBuffer = [[NSOpenGLPixelBuffer alloc]
-											initWithTextureTarget:GL_TEXTURE_2D
-											textureInternalFormat:GL_BGRA
-											textureMaxMipMapLevel:0
-											pixelsWide:GPU_DISPLAY_WIDTH
-											pixelsHigh:GPU_DISPLAY_HEIGHT*2];
-	
 	NSOpenGLContext *newOGLRendererContext = [[NSOpenGLContext alloc] initWithFormat:tempPixelFormat shareContext:nil];
-	[newOGLRendererContext setPixelBuffer:tempPixelBuffer cubeMapFace:0 mipMapLevel:0 currentVirtualScreen:[[self openGLContext] currentVirtualScreen]];
-	
 	[tempPixelFormat release];
-	[tempPixelBuffer release];
 	
+	if (!useContext_3_2)
+	{
+		NSOpenGLPixelBuffer *tempPixelBuffer = [[NSOpenGLPixelBuffer alloc]
+												initWithTextureTarget:GL_TEXTURE_2D
+												textureInternalFormat:GL_BGRA
+												textureMaxMipMapLevel:0
+												pixelsWide:GPU_DISPLAY_WIDTH
+												pixelsHigh:GPU_DISPLAY_HEIGHT*2];
+		
+		[newOGLRendererContext setPixelBuffer:tempPixelBuffer cubeMapFace:0 mipMapLevel:0 currentVirtualScreen:[[self openGLContext] currentVirtualScreen]];
+		[tempPixelBuffer release];
+	}
+	
 	oglRendererContext = newOGLRendererContext;
 	OSXOpenGLRendererContext = (CGLContextObj)[oglRendererContext CGLContextObj];
 	
+	RequestOpenGLRenderer_3_2(useContext_3_2);
 	SetOpenGLRendererFunctions(&OSXOpenGLRendererInit,
 							   &OSXOpenGLRendererBegin,
 							   &OSXOpenGLRendererEnd);
@@ -1149,22 +1175,23 @@
 	vtxIndexBuffer[6]	= 4;	vtxIndexBuffer[7]	= 5;	vtxIndexBuffer[8]	= 6;
 	vtxIndexBuffer[9]	= 6;	vtxIndexBuffer[10]	= 7;	vtxIndexBuffer[11]	= 4;
 	
+	[self setupOpenGL_Legacy];
+}
+
+- (void) setupOpenGL_Legacy
+{
 	// Check the OpenGL capabilities for this renderer
 	const GLubyte *glExtString = glGetString(GL_EXTENSIONS);
 	BOOL isPBOSupported	= gluCheckExtension((const GLubyte *)"GL_ARB_pixel_buffer_object", glExtString);
 	
-	// Enable OS X's multithreaded OpenGL engine if both VBOs and PBOs are supported.
-	//
-	// If these aren't supported, then multithreading may result in a substantial
-	// performance penalty.
-	if (isVBOSupported && isPBOSupported)
-	{
-		CGLEnable(cglDisplayContext, kCGLCEMPEngine);
-		CGLEnable(OSXOpenGLRendererContext, kCGLCEMPEngine);
-	}
-	
 	// Set up textures
 	glGenTextures(1, &displayTexID);
+	glBindTexture(GL_TEXTURE_2D, displayTexID);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+	glBindTexture(GL_TEXTURE_2D, 0);
 	
 	// Set up VBOs
 	isVBOSupported = gluCheckExtension((const GLubyte *)"GL_ARB_vertex_buffer_object", glExtString);
@@ -1186,13 +1213,13 @@
 	}
 	
 	// Set up shaders
-	isShadersSupported	= ( gluCheckExtension((const GLubyte *)"GL_ARB_shader_objects", glExtString) &&
-						    gluCheckExtension((const GLubyte *)"GL_ARB_vertex_shader", glExtString) &&
-						    gluCheckExtension((const GLubyte *)"GL_ARB_fragment_shader", glExtString) &&
-						    gluCheckExtension((const GLubyte *)"GL_ARB_vertex_program", glExtString) );
+	isShadersSupported	= (gluCheckExtension((const GLubyte *)"GL_ARB_shader_objects", glExtString) &&
+						   gluCheckExtension((const GLubyte *)"GL_ARB_vertex_shader", glExtString) &&
+						   gluCheckExtension((const GLubyte *)"GL_ARB_fragment_shader", glExtString) &&
+						   gluCheckExtension((const GLubyte *)"GL_ARB_vertex_program", glExtString) );
 	if (isShadersSupported)
 	{
-		GLint shaderStatus = SetupShaders(&vertexShaderID, &fragmentShaderID, &shaderProgram);
+		GLint shaderStatus = SetupShaders(&shaderProgram, &vertexShaderID, vShader_100, &fragmentShaderID, fShader_100);
 		if (shaderStatus == GL_TRUE)
 		{
 			glUseProgram(shaderProgram);
@@ -1212,10 +1239,10 @@
 	}
 	
 	// Set up VAO
-	isVAOSupported	=  isVBOSupported &&
-					   isShadersSupported &&
-					  (gluCheckExtension((const GLubyte *)"GL_ARB_vertex_array_object", glExtString) ||
-					   gluCheckExtension((const GLubyte *)"GL_APPLE_vertex_array_object", glExtString) );
+	isVAOSupported	= ( isVBOSupported &&
+					    isShadersSupported &&
+					   (gluCheckExtension((const GLubyte *)"GL_ARB_vertex_array_object", glExtString) ||
+						gluCheckExtension((const GLubyte *)"GL_APPLE_vertex_array_object", glExtString) ) );
 	if (isVAOSupported)
 	{
 		glGenVertexArrays(1, &vaoMainStatesID);
@@ -1244,7 +1271,7 @@
 	{
 		glDisable(GL_ALPHA_TEST);
 		glDisable(GL_LIGHTING);
-		glDisable(GL_FOG);		
+		glDisable(GL_FOG);
 		glEnable(GL_TEXTURE_2D);
 	}
 	
@@ -1773,42 +1800,42 @@
 
 @end
 
-static GLint SetupShaders(GLuint *vShaderID, GLuint *fShaderID, GLuint *programID)
+GLint SetupShaders(GLuint *programID, GLuint *vertShaderID, const char *vertShaderProgram, GLuint *fragShaderID, const char *fragShaderProgram)
 {
 	GLint shaderStatus = GL_TRUE;
 	
-	*vShaderID = glCreateShader(GL_VERTEX_SHADER);
-	if (*vShaderID == 0)
+	*vertShaderID = glCreateShader(GL_VERTEX_SHADER);
+	if (*vertShaderID == 0)
 	{
 		NSLog(@"OpenGL Error - Failed to create vertex shader.");
 		return shaderStatus;
 	}
 	
-	glShaderSource(*vShaderID, 1, (const GLchar **)&vShader, NULL);
-	glCompileShader(*vShaderID);
-	glGetShaderiv(*vShaderID, GL_COMPILE_STATUS, &shaderStatus);
+	glShaderSource(*vertShaderID, 1, (const GLchar **)&vertShaderProgram, NULL);
+	glCompileShader(*vertShaderID);
+	glGetShaderiv(*vertShaderID, GL_COMPILE_STATUS, &shaderStatus);
 	if (shaderStatus == GL_FALSE)
 	{
-		glDeleteShader(*vShaderID);
+		glDeleteShader(*vertShaderID);
 		NSLog(@"OpenGL Error - Failed to compile vertex shader.");
 		return shaderStatus;
 	}
 	
-	*fShaderID = glCreateShader(GL_FRAGMENT_SHADER);
-	if (*fShaderID == 0)
+	*fragShaderID = glCreateShader(GL_FRAGMENT_SHADER);
+	if (*fragShaderID == 0)
 	{
-		glDeleteShader(*vShaderID);
+		glDeleteShader(*vertShaderID);
 		NSLog(@"OpenGL Error - Failed to create fragment shader.");
 		return shaderStatus;
 	}
 	
-	glShaderSource(*fShaderID, 1, (const GLchar **)&fShader, NULL);
-	glCompileShader(*fShaderID);
-	glGetShaderiv(*fShaderID, GL_COMPILE_STATUS, &shaderStatus);
+	glShaderSource(*fragShaderID, 1, (const GLchar **)&fragShaderProgram, NULL);
+	glCompileShader(*fragShaderID);
+	glGetShaderiv(*fragShaderID, GL_COMPILE_STATUS, &shaderStatus);
 	if (shaderStatus == GL_FALSE)
 	{
-		glDeleteShader(*vShaderID);
-		glDeleteShader(*fShaderID);
+		glDeleteShader(*vertShaderID);
+		glDeleteShader(*fragShaderID);
 		NSLog(@"OpenGL Error - Failed to compile fragment shader.");
 		return shaderStatus;
 	}
@@ -1816,14 +1843,14 @@
 	*programID = glCreateProgram();
 	if (*programID == 0)
 	{
-		glDeleteShader(*vShaderID);
-		glDeleteShader(*fShaderID);
+		glDeleteShader(*vertShaderID);
+		glDeleteShader(*fragShaderID);
 		NSLog(@"OpenGL Error - Failed to create shader program.");
 		return shaderStatus;
 	}
 	
-	glAttachShader(*programID, *vShaderID);
-	glAttachShader(*programID, *fShaderID);
+	glAttachShader(*programID, *vertShaderID);
+	glAttachShader(*programID, *fragShaderID);
 	
 	glBindAttribLocation(*programID, OGLVertexAttributeID_Position, "inPosition");
 	glBindAttribLocation(*programID, OGLVertexAttributeID_TexCoord0, "inTexCoord0");
@@ -1833,8 +1860,8 @@
 	if (shaderStatus == GL_FALSE)
 	{
 		glDeleteProgram(*programID);
-		glDeleteShader(*vShaderID);
-		glDeleteShader(*fShaderID);
+		glDeleteShader(*vertShaderID);
+		glDeleteShader(*fragShaderID);
 		NSLog(@"OpenGL Error - Failed to link shader program.");
 		return shaderStatus;
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4503
          http://desmume.svn.sourceforge.net/desmume/?rev=4503&view=rev
Author:   rogerman
Date:     2013-02-06 00:54:39 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
Cocoa Port:
- Move OpenGL renderer code from the UI code to the emulation core interface code.
- Clean up the OpenGL renderer init code, and lazy load the context init.
- Fix bug where the wrong display would show when changing display modes after changing video filters.
- Do some other random bug fixes.

Modified Paths:
--------------
    trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj
    trunk/desmume/src/cocoa/cocoa_mic.mm
    trunk/desmume/src/cocoa/cocoa_output.h
    trunk/desmume/src/cocoa/cocoa_output.mm
    trunk/desmume/src/cocoa/coreaudiosound.cpp
    trunk/desmume/src/cocoa/userinterface/displayView.h
    trunk/desmume/src/cocoa/userinterface/displayView.mm

Modified: trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj
===================================================================
--- trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj	2013-02-05 07:12:50 UTC (rev 4502)
+++ trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj	2013-02-06 00:54:39 UTC (rev 4503)
@@ -1781,7 +1781,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0430;
+				LastUpgradeCheck = 0460;
 				ORGANIZATIONNAME = "DeSmuME Team";
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DeSmuME (XCode 4)" */;
@@ -2575,7 +2575,6 @@
 		AB796D6F15CDCBA200C59155 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				LLVM_LTO = YES;
 			};
 			name = Release;
 		};
@@ -2635,6 +2634,10 @@
 				CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CLANG_X86_VECTOR_INSTRUCTIONS = sse3;
 				COPY_PHASE_STRIP = NO;
 				DEAD_CODE_STRIPPING = YES;
@@ -2655,6 +2658,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_SHADOW = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
 				IBC_FLATTEN_NIBS = NO;
 				INFOPLIST_FILE = "Info (Debug).plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
@@ -2674,6 +2678,10 @@
 				CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CLANG_X86_VECTOR_INSTRUCTIONS = ssse3;
 				"CLANG_X86_VECTOR_INSTRUCTIONS[arch=i386]" = sse3;
 				COPY_PHASE_STRIP = NO;
@@ -2694,6 +2702,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_SHADOW = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = Info.plist;
 				LD_NO_PIE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;

Modified: trunk/desmume/src/cocoa/cocoa_mic.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_mic.mm	2013-02-05 07:12:50 UTC (rev 4502)
+++ trunk/desmume/src/cocoa/cocoa_mic.mm	2013-02-06 00:54:39 UTC (rev 4503)
@@ -179,7 +179,7 @@
 
 - (UInt8) generateWhiteNoiseSample
 {
-	return (UInt8)(rand() & 0xFF);
+	return (UInt8)(arc4random() & 0xFF);
 }
 
 - (void) fillWithNullSamples

Modified: trunk/desmume/src/cocoa/cocoa_output.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_output.h	2013-02-05 07:12:50 UTC (rev 4502)
+++ trunk/desmume/src/cocoa/cocoa_output.h	2013-02-06 00:54:39 UTC (rev 4503)
@@ -250,6 +250,12 @@
 void SetGPUDisplayState(int gpuType, bool state);
 bool GetGPUDisplayState(int gpuType);
 
+bool OSXOpenGLRendererInit();
+bool OSXOpenGLRendererBegin();
+void OSXOpenGLRendererEnd();
+
+bool CreateOpenGLRenderer();
+void DestroyOpenGLRenderer();
 void RequestOpenGLRenderer_3_2(bool request_3_2);
 void SetOpenGLRendererFunctions(bool (*initFunction)(),
 								bool (*beginOGLFunction)(),

Modified: trunk/desmume/src/cocoa/cocoa_output.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_output.mm	2013-02-05 07:12:50 UTC (rev 4502)
+++ trunk/desmume/src/cocoa/cocoa_output.mm	2013-02-06 00:54:39 UTC (rev 4503)
@@ -1463,11 +1463,17 @@
 	[property setValue:[NSNumber numberWithInteger:(NSInteger)VideoFilterTypeID_None] forKey:@"videoFilterType"];
 	[property setValue:[CocoaVideoFilter typeStringByID:VideoFilterTypeID_None] forKey:@"videoFilterTypeString"];
 	
+	SetOpenGLRendererFunctions(&OSXOpenGLRendererInit,
+							   &OSXOpenGLRendererBegin,
+							   &OSXOpenGLRendererEnd);
+	
 	return self;
 }
 
 - (void)dealloc
 {
+	DestroyOpenGLRenderer();
+	
 	[vf release];
 	
 	[super dealloc];
@@ -1854,6 +1860,119 @@
 	return result;
 }
 
+CGLContextObj OSXOpenGLRendererContext = NULL;
+CGLPBufferObj OSXOpenGLRendererPBuffer = NULL;
+
+bool OSXOpenGLRendererInit()
+{
+	static bool isContextAlreadyCreated = false;
+	
+	if (!isContextAlreadyCreated)
+	{
+		isContextAlreadyCreated = CreateOpenGLRenderer();
+	}
+	
+	return true;
+}
+
+bool OSXOpenGLRendererBegin()
+{
+	CGLSetCurrentContext(OSXOpenGLRendererContext);
+	
+	return true;
+}
+
+void OSXOpenGLRendererEnd()
+{
+	
+}
+
+bool CreateOpenGLRenderer()
+{
+	bool result = false;
+	bool useContext_3_2 = false;
+	CGLPixelFormatObj cglPixFormat = NULL;
+	CGLContextObj newContext = NULL;
+	CGLPBufferObj newPBuffer = NULL;
+	GLint virtualScreenCount = 0;
+	
+	CGLPixelFormatAttribute attrs[] = {
+		kCGLPFAColorSize, (CGLPixelFormatAttribute)24,
+		kCGLPFAAlphaSize, (CGLPixelFormatAttribute)8,
+		kCGLPFADepthSize, (CGLPixelFormatAttribute)24,
+		kCGLPFAStencilSize, (CGLPixelFormatAttribute)8,
+		kCGLPFAAccelerated,
+		(CGLPixelFormatAttribute)0, (CGLPixelFormatAttribute)0,
+		(CGLPixelFormatAttribute)0
+	};
+
+#ifdef MAC_OS_X_VERSION_10_7
+	// If we can support a 3.2 Core Profile context, then request that in our
+	// pixel format attributes.
+	useContext_3_2 = [CocoaDSUtil OSVersionCheckMajor:10 minor:7 revision:0] ? true : false;
+	if (useContext_3_2)
+	{
+		attrs[9] = kCGLPFAOpenGLProfile;
+		attrs[10] = (CGLPixelFormatAttribute)kCGLOGLPVersion_3_2_Core;
+	}
+#endif
+	
+	CGLChoosePixelFormat(attrs, &cglPixFormat, &virtualScreenCount);
+	if (cglPixFormat == NULL)
+	{
+		// Remove the HW rendering requirement and try again. Note that this will
+		// result in SW rendering, which will cause a substantial speed hit.
+		attrs[8] = (CGLPixelFormatAttribute)0;
+		CGLChoosePixelFormat(attrs, &cglPixFormat, &virtualScreenCount);
+		if (cglPixFormat == NULL)
+		{
+			return result;
+		}
+	}
+	
+	CGLCreateContext(cglPixFormat, NULL, &newContext);
+	CGLReleasePixelFormat(cglPixFormat);
+	
+	// Create a PBuffer for legacy contexts since the availability of FBOs
+	// is not guaranteed.
+	if (!useContext_3_2)
+	{
+		CGLCreatePBuffer(GPU_DISPLAY_WIDTH, GPU_DISPLAY_HEIGHT, GL_TEXTURE_2D, GL_RGBA, 0, &newPBuffer);
+		
+		if (newPBuffer == NULL)
+		{
+			CGLReleaseContext(newContext);
+			return result;
+		}
+		else
+		{
+			GLint virtualScreenID = 0;
+			
+			CGLGetVirtualScreen(newContext, &virtualScreenID);
+			CGLSetPBuffer(newContext, newPBuffer, 0, 0, virtualScreenID);
+		}
+	}
+	
+	RequestOpenGLRenderer_3_2(useContext_3_2);
+	OSXOpenGLRendererContext = newContext;
+	OSXOpenGLRendererPBuffer = newPBuffer;
+	
+	result = true;
+	return result;
+}
+
+void DestroyOpenGLRenderer()
+{
+	if (OSXOpenGLRendererContext == NULL)
+	{
+		return;
+	}
+	
+	CGLReleasePBuffer(OSXOpenGLRendererPBuffer);
+	CGLReleaseContext(OSXOpenGLRendererContext);
+	OSXOpenGLRendererContext = NULL;
+}
+
 void RequestOpenGLRenderer_3_2(bool request_3_2)
 {
 #ifdef OGLRENDER_3_2_H

Modified: trunk/desmume/src/cocoa/coreaudiosound.cpp
===================================================================
--- trunk/desmume/src/cocoa/coreaudiosound.cpp	2013-02-05 07:12:50 UTC (rev 4502)
+++ trunk/desmume/src/cocoa/coreaudiosound.cpp	2013-02-06 00:54:39 UTC (rev 4503)
@@ -43,7 +43,7 @@
 	}
 	
 	error = OpenAComponent(comp, &_au);
-	if (comp == NULL)
+	if (error != noErr || comp == NULL)
 	{
 		return;
 	}

Modified: trunk/desmume/src/cocoa/userinterface/displayView.h
===================================================================
--- trunk/desmume/src/cocoa/userinterface/displayView.h	2013-02-05 07:12:50 UTC (rev 4502)
+++ trunk/desmume/src/cocoa/userinterface/displayView.h	2013-02-06 00:54:39 UTC (rev 4503)
@@ -122,9 +122,7 @@
 @interface OpenGLDisplayView : NSOpenGLView <DisplayViewDelegate>
 {
 	CGLContextObj cglDisplayContext;
-	NSOpenGLContext *oglRendererContext;
 	
-	BOOL useContext_3_2;
 	BOOL isVBOSupported;
 	BOOL isShadersSupported;
 	BOOL isVAOSupported;
@@ -160,9 +158,8 @@
 }
 
 - (void) setupOpenGL_Legacy;
-- (void) setupOpenGL_3_2;
 - (void) drawVideoFrame;
-- (void) uploadDisplayTextures:(const GLvoid *)textureData width:(const GLsizei)texWidth height:(const GLsizei)texHeight;
+- (void) uploadDisplayTextures:(const GLvoid *)textureData displayMode:(const NSInteger)displayModeID width:(const GLsizei)texWidth height:(const GLsizei)texHeight;
 - (void) renderDisplayUsingDisplayMode:(const NSInteger)displayModeID;
 - (void) updateDisplayVerticesUsingDisplayMode:(const NSInteger)displayModeID orientation:(const NSInteger)displayOrientationID;
 
@@ -174,9 +171,6 @@
 #endif
 
 GLint SetupShaders(GLuint *programID, GLuint *vertShaderID, const char *vertShaderProgram, GLuint *fragShaderID, const char *fragShaderProgram);
-bool OSXOpenGLRendererInit();
-bool OSXOpenGLRendererBegin();
-void OSXOpenGLRendererEnd();
 
 #ifdef __cplusplus
 }

Modified: trunk/desmume/src/cocoa/userinterface/displayView.mm
===================================================================
--- trunk/desmume/src/cocoa/userinterface/displayView.mm	2013-02-05 07:12:50 UTC (rev 4502)
+++ trunk/desmume/src/cocoa/userinterface/displayView.mm	2013-02-06 00:54:39 UTC (rev 4503)
@@ -85,8 +85,6 @@
 };
 
 
-CGLContextObj OSXOpenGLRendererContext = NULL;
-
 @implementation DisplayViewDelegate
 
 @synthesize view;
@@ -348,7 +346,7 @@
 	if ( (oldMode == DS_DISPLAY_TYPE_MAIN && displayModeID == DS_DISPLAY_TYPE_TOUCH) ||
 		 (oldMode == DS_DISPLAY_TYPE_TOUCH && displayModeID == DS_DISPLAY_TYPE_MAIN) )
 	{
-		[view setNeedsDisplay:YES];
+		[CocoaDSUtil messageSendOneWay:self.sendPortDisplay msgID:MESSAGE_REDRAW_VIEW];
 	}
 }
 
@@ -1009,82 +1007,11 @@
 	vtxIndexBuffer = new GLubyte[12];
 	vtxBufferOffset = 0;
 	
-	// Create a new context for the OpenGL-based emulated 3D renderer
-#ifdef MAC_OS_X_VERSION_10_7
-	NSOpenGLPixelFormatAttribute attrs[] = {
-		NSOpenGLPFAColorSize, (NSOpenGLPixelFormatAttribute)24,
-		NSOpenGLPFAAlphaSize, (NSOpenGLPixelFormatAttribute)8,
-		NSOpenGLPFADepthSize, (NSOpenGLPixelFormatAttribute)24,
-		NSOpenGLPFAStencilSize, (NSOpenGLPixelFormatAttribute)8,
-		NSOpenGLPFAAccelerated,
-		NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core,
-		(NSOpenGLPixelFormatAttribute)0
-	};
-	
-	useContext_3_2 = [CocoaDSUtil OSVersionCheckMajor:10 minor:7 revision:0] ? YES : NO;
-#else
-	NSOpenGLPixelFormatAttribute attrs[] =
-	{
-		NSOpenGLPFAColorSize, (NSOpenGLPixelFormatAttribute)24,
-		NSOpenGLPFAAlphaSize, (NSOpenGLPixelFormatAttribute)8,
-		NSOpenGLPFADepthSize, (NSOpenGLPixelFormatAttribute)24,
-		NSOpenGLPFAStencilSize, (NSOpenGLPixelFormatAttribute)8,
-		NSOpenGLPFAAccelerated,
-		(NSOpenGLPixelFormatAttribute)0, (NSOpenGLPixelFormatAttribute)0,
-		(NSOpenGLPixelFormatAttribute)0
-	};
-	
-	useContext_3_2 = NO;
-#endif
-	// If we're not using a 3.2 Core Profile context, then remove that
-	// requirement from the pixel format.
-	if (!useContext_3_2)
-	{
-		attrs[9] = (NSOpenGLPixelFormatAttribute)0;
-		attrs[10] = (NSOpenGLPixelFormatAttribute)0;
-	}
-	
-	NSOpenGLPixelFormat *tempPixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs];
-	if (tempPixelFormat == nil)
-	{
-		// Remove the HW rendering requirement and try again. Note that this will
-		// result in SW rendering, which will cause a substantial speed hit.
-		attrs[8] = (NSOpenGLPixelFormatAttribute)0;
-		tempPixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs];
-	}
-	
-	NSOpenGLContext *newOGLRendererContext = [[NSOpenGLContext alloc] initWithFormat:tempPixelFormat shareContext:nil];
-	[tempPixelFormat release];
-	
-	if (!useContext_3_2)
-	{
-		NSOpenGLPixelBuffer *tempPixelBuffer = [[NSOpenGLPixelBuffer alloc]
-												initWithTextureTarget:GL_TEXTURE_2D
-												textureInternalFormat:GL_BGRA
-												textureMaxMipMapLevel:0
-												pixelsWide:GPU_DISPLAY_WIDTH
-												pixelsHigh:GPU_DISPLAY_HEIGHT*2];
-		
-		[newOGLRendererContext setPixelBuffer:tempPixelBuffer cubeMapFace:0 mipMapLevel:0 currentVirtualScreen:[[self openGLContext] currentVirtualScreen]];
-		[tempPixelBuffer release];
-	}
-	
-	oglRendererContext = newOGLRendererContext;
-	OSXOpenGLRendererContext = (CGLContextObj)[oglRendererContext CGLContextObj];
-	
-	RequestOpenGLRenderer_3_2(useContext_3_2);
-	SetOpenGLRendererFunctions(&OSXOpenGLRendererInit,
-							   &OSXOpenGLRendererBegin,
-							   &OSXOpenGLRendererEnd);
-	
     return self;
 }
 
 - (void)dealloc
 {
-	[oglRendererContext release];
-	OSXOpenGLRendererContext = NULL;
-	
 	CGLContextObj prevContext = CGLGetCurrentContext();
 	CGLSetCurrentContext(cglDisplayContext);
 	
@@ -1182,7 +1109,6 @@
 {
 	// Check the OpenGL capabilities for this renderer
 	const GLubyte *glExtString = glGetString(GL_EXTENSIONS);
-	BOOL isPBOSupported	= gluCheckExtension((const GLubyte *)"GL_ARB_pixel_buffer_object", glExtString);
 	
 	// Set up textures
 	glGenTextures(1, &displayTexID);
@@ -1285,22 +1211,22 @@
 	CGLFlushDrawable(cglDisplayContext);
 }
 
-- (void) uploadDisplayTextures:(const GLvoid *)textureData width:(const GLsizei)texWidth height:(const GLsizei)texHeight
+- (void) uploadDisplayTextures:(const GLvoid *)textureData displayMode:(const NSInteger)displayModeID width:(const GLsizei)texWidth height:(const GLsizei)texHeight
 {
 	if (textureData == NULL)
 	{
 		return;
 	}
 	
+	const GLint lineOffset = (displayModeID == DS_DISPLAY_TYPE_TOUCH) ? texHeight : 0;
+	
 	glBindTexture(GL_TEXTURE_2D, displayTexID);
-	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, texWidth, texHeight, GL_RGBA, glTexPixelFormat, textureData);
+	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, lineOffset, texWidth, texHeight, GL_RGBA, glTexPixelFormat, textureData);
 	glBindTexture(GL_TEXTURE_2D, 0);
 }
 
 - (void) renderDisplayUsingDisplayMode:(const NSInteger)displayModeID
 {
-	GLubyte *elementPointer = NULL;
-	
 	// Assign vertex attributes based on which OpenGL features we have.
 	if (isVAOSupported)
 	{
@@ -1322,7 +1248,6 @@
 			{
 				glVertexAttribPointer(OGLVertexAttributeID_Position, 2, GL_INT, GL_FALSE, 0, vtxBuffer);
 				glVertexAttribPointer(OGLVertexAttributeID_TexCoord0, 2, GL_FLOAT, GL_FALSE, 0, texCoordBuffer);
-				elementPointer = vtxIndexBuffer;
 			}
 			
 			glEnableVertexAttribArray(OGLVertexAttributeID_Position);
@@ -1342,7 +1267,6 @@
 			{
 				glTexCoordPointer(2, GL_FLOAT, 0, texCoordBuffer);
 				glVertexPointer(2, GL_INT, 0, vtxBuffer);
-				elementPointer = vtxIndexBuffer;
 			}
 			
 			glEnableClientState(GL_VERTEX_ARRAY);
@@ -1364,10 +1288,12 @@
 		}
 	}
 	
-	GLsizei vtxElementCount = 6;
-	if (displayModeID == DS_DISPLAY_TYPE_COMBO)
+	const GLsizei vtxElementCount = (displayModeID == DS_DISPLAY_TYPE_COMBO) ? 12 : 6;
+	GLubyte *elementPointer = isVBOSupported ? NULL : vtxIndexBuffer;
+	
+	if (displayModeID == DS_DISPLAY_TYPE_TOUCH)
 	{
-		vtxElementCount = 12;
+		elementPointer += vtxElementCount;
 	}
 	
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -1568,7 +1494,7 @@
 	CGLLockContext(cglDisplayContext);
 	
 	CGLSetCurrentContext(cglDisplayContext);
-	[self uploadDisplayTextures:videoFrameData width:frameWidth height:frameHeight];
+	[self uploadDisplayTextures:videoFrameData displayMode:displayModeID width:frameWidth height:frameHeight];
 	[self renderDisplayUsingDisplayMode:displayModeID];
 	[self drawVideoFrame];
 	
@@ -1738,6 +1664,11 @@
 		glTexPixelFormat = GL_UNSIGNED_SHORT_1_5_5_5_REV;
 	}
 	
+	if ([dispViewDelegate displayMode] != DS_DISPLAY_TYPE_COMBO)
+	{
+		videoFilterDestSize.height = (uint32_t)videoFilterDestSize.height * 2;
+	}
+	
 	// Convert textures to Power-of-Two to support older GPUs
 	// Example: Radeon X1600M on the 2006 MacBook Pro
 	uint32_t potW = GetNearestPositivePOT((uint32_t)videoFilterDestSize.width);
@@ -1756,32 +1687,20 @@
 		}
 	}
 	
-	GLfloat s = (GLfloat)(videoFilterDestSize.width / potW);
-	GLfloat t = (GLfloat)(videoFilterDestSize.height / potH);
+	const GLfloat s = (GLfloat)videoFilterDestSize.width / (GLfloat)potW;
+	const GLfloat t = (GLfloat)videoFilterDestSize.height / (GLfloat)potH;
 	
 	// Set up texture coordinates
-	if ([dispViewDelegate displayMode] == DS_DISPLAY_TYPE_COMBO)
-	{
-		texCoordBuffer[0]	= 0.0f;		texCoordBuffer[1]	=   0.0f;
-		texCoordBuffer[2]	=    s;		texCoordBuffer[3]	=   0.0f;
-		texCoordBuffer[4]	=    s;		texCoordBuffer[5]	= t/2.0f;
-		texCoordBuffer[6]	= 0.0f;		texCoordBuffer[7]	= t/2.0f;
-		
-		texCoordBuffer[8]	= 0.0f;		texCoordBuffer[9]	= t/2.0f;
-		texCoordBuffer[10]	=    s;		texCoordBuffer[11]	= t/2.0f;
-		texCoordBuffer[12]	=    s;		texCoordBuffer[13]	=      t;
-		texCoordBuffer[14]	= 0.0f;		texCoordBuffer[15]	=      t;
-	}
-	else // displayMode == DS_DISPLAY_TYPE_MAIN || displayMode == DS_DISPLAY_TYPE_TOUCH
-	{
-		texCoordBuffer[0]	= 0.0f;		texCoordBuffer[1]	= 0.0f;
-		texCoordBuffer[2]	=    s;		texCoordBuffer[3]	= 0.0f;
-		texCoordBuffer[4]	=    s;		texCoordBuffer[5]	=    t;
-		texCoordBuffer[6]	= 0.0f;		texCoordBuffer[7]	=    t;
-		
-		memcpy(texCoordBuffer + (1 * 8), texCoordBuffer + (0 * 8), sizeof(GLfloat) * (1 * 8));
-	}
+	texCoordBuffer[0]	= 0.0f;		texCoordBuffer[1]	=   0.0f;
+	texCoordBuffer[2]	=    s;		texCoordBuffer[3]	=   0.0f;
+	texCoordBuffer[4]	=    s;		texCoordBuffer[5]	= t/2.0f;
+	texCoordBuffer[6]	= 0.0f;		texCoordBuffer[7]	= t/2.0f;
 	
+	texCoordBuffer[8]	= 0.0f;		texCoordBuffer[9]	= t/2.0f;
+	texCoordBuffer[10]	=    s;		texCoordBuffer[11]	= t/2.0f;
+	texCoordBuffer[12]	=    s;		texCoordBuffer[13]	=      t;
+	texCoordBuffer[14]	= 0.0f;		texCoordBuffer[15]	=      t;
+	
 	CGLLockContext(cglDisplayContext);
 	
 	glBindTexture(GL_TEXTURE_2D, displayTexID);
@@ -1870,20 +1789,3 @@
 	
 	return shaderStatus;
 }
-
-bool OSXOpenGLRendererInit()
-{
-	return true;
-}
-
-bool OSXOpenGLRendererBegin()
-{
-	CGLSetCurrentContext(OSXOpenGLRendererContext);
-	
-	return true;
-}
-
-void OSXOpenGLRendererEnd()
-{
-	
-}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4504
          http://desmume.svn.sourceforge.net/desmume/?rev=4504&view=rev
Author:   rogerman
Date:     2013-02-06 05:17:53 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
Cocoa Port:
- Add Rigorous 3D Rendering Timing setting to Emulation Settings.
- Add option for 8 Threads to 3D Rendering Settings.
- Do some code cleanup to the display code.

Modified Paths:
--------------
    trunk/desmume/src/cocoa/DefaultUserPrefs.plist
    trunk/desmume/src/cocoa/cocoa_core.h
    trunk/desmume/src/cocoa/cocoa_core.mm
    trunk/desmume/src/cocoa/cocoa_globals.h
    trunk/desmume/src/cocoa/cocoa_output.h
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.strings
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
    trunk/desmume/src/cocoa/userinterface/appDelegate.mm
    trunk/desmume/src/cocoa/userinterface/displayView.h
    trunk/desmume/src/cocoa/userinterface/displayView.mm
    trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.mm

Modified: trunk/desmume/src/cocoa/DefaultUserPrefs.plist
===================================================================
--- trunk/desmume/src/cocoa/DefaultUserPrefs.plist	2013-02-06 00:54:39 UTC (rev 4503)
+++ trunk/desmume/src/cocoa/DefaultUserPrefs.plist	2013-02-06 05:17:53 UTC (rev 4504)
@@ -1,55 +1,55 @@
-bplist00\xDF6

Revision: 4505
          http://desmume.svn.sourceforge.net/desmume/?rev=4505&view=rev
Author:   rogerman
Date:     2013-02-06 05:55:23 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
Cocoa Port:
- Fix many compiler warnings.

Modified Paths:
--------------
    trunk/desmume/src/cocoa/cocoa_file.mm
    trunk/desmume/src/cocoa/cocoa_firmware.h
    trunk/desmume/src/cocoa/cocoa_firmware.mm
    trunk/desmume/src/cocoa/cocoa_globals.h
    trunk/desmume/src/cocoa/cocoa_hid.mm
    trunk/desmume/src/cocoa/cocoa_input.mm
    trunk/desmume/src/cocoa/userinterface/appDelegate.mm
    trunk/desmume/src/cocoa/userinterface/cheatWindowDelegate.mm
    trunk/desmume/src/cocoa/userinterface/displayView.mm
    trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.mm
    trunk/desmume/src/cocoa/userinterface/inputPrefsView.mm
    trunk/desmume/src/cocoa/userinterface/preferencesWindowDelegate.mm

Modified: trunk/desmume/src/cocoa/cocoa_file.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_file.mm	2013-02-06 05:17:53 UTC (rev 4504)
+++ trunk/desmume/src/cocoa/cocoa_file.mm	2013-02-06 05:55:23 UTC (rev 4505)
@@ -958,7 +958,7 @@
 	}
 	
 	NSString *romFileName = [[romURL path] lastPathComponent];
-	NSString *fileExt = [NSString stringWithFormat:@"ds%d", slotNumber];
+	NSString *fileExt = [NSString stringWithFormat:@"ds%ld", (unsigned long)slotNumber];
 	
 	return [[romFileName stringByDeletingPathExtension] stringByAppendingPathExtension:fileExt];
 }

Modified: trunk/desmume/src/cocoa/cocoa_firmware.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_firmware.h	2013-02-06 05:17:53 UTC (rev 4504)
+++ trunk/desmume/src/cocoa/cocoa_firmware.h	2013-02-06 05:55:23 UTC (rev 4505)
@@ -39,7 +39,7 @@
 {
 	struct NDS_fw_config_data *data;
 	struct NDS_fw_config_data *internalData;
-	NSInteger birth_year;
+	NSUInteger birth_year;
 	pthread_mutex_t mutex;
 }
 

Modified: trunk/desmume/src/cocoa/cocoa_firmware.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_firmware.mm	2013-02-06 05:17:53 UTC (rev 4504)
+++ trunk/desmume/src/cocoa/cocoa_firmware.mm	2013-02-06 05:55:23 UTC (rev 4505)
@@ -254,7 +254,7 @@
 - (NSDate *) birthday
 {
 	pthread_mutex_lock(&mutex);
-	NSDate *theBirthday = [NSDate dateWithString:[NSString stringWithFormat:@"%d-%d-%d 12:00:00 +0000", birth_year, data->birth_month, data->birth_day]];
+	NSDate *theBirthday = [NSDate dateWithString:[NSString stringWithFormat:@"%ld-%ld-%ld 12:00:00 +0000", (unsigned long)birth_year, (unsigned long)data->birth_month, (unsigned long)data->birth_day]];
 	pthread_mutex_unlock(&mutex);
 	
 	return theBirthday;

Modified: trunk/desmume/src/cocoa/cocoa_globals.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_globals.h	2013-02-06 05:17:53 UTC (rev 4504)
+++ trunk/desmume/src/cocoa/cocoa_globals.h	2013-02-06 05:55:23 UTC (rev 4505)
@@ -50,7 +50,7 @@
 #define NSSTRING_TITLE_SHOW_STATUS_BAR				NSLocalizedString(@"Show Status Bar", nil)
 #define NSSTRING_TITLE_SPEED_1X						NSLocalizedString(@"Speed 1x", nil)
 #define NSSTRING_TITLE_SPEED_2X						NSLocalizedString(@"Speed 2x", nil)
-#define NSSTRING_TITLE_SLOT_NUMBER					NSLocalizedString(@"Slot %d", nil)
+#define NSSTRING_TITLE_SLOT_NUMBER					NSLocalizedString(@"Slot %ld", nil)
 
 #define NSSTRING_TITLE_TECH_SUPPORT_WINDOW_TITLE	NSLocalizedString(@"Support Request Form", nil)
 #define NSSTRING_TITLE_BUG_REPORT_WINDOW_TITLE		NSLocalizedString(@"Bug Report Form", nil)

Modified: trunk/desmume/src/cocoa/cocoa_hid.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_hid.mm	2013-02-06 05:17:53 UTC (rev 4504)
+++ trunk/desmume/src/cocoa/cocoa_hid.mm	2013-02-06 05:55:23 UTC (rev 4505)
@@ -219,7 +219,7 @@
 	NSString *elementCode = nil;
 	if (altElementCode == nil)
 	{
-		elementCode = [NSString stringWithFormat:@"0x%04X/0x%04X", elementUsagePage, elementUsage];
+		elementCode = [NSString stringWithFormat:@"0x%04lX/0x%04lX", (long)elementUsagePage, (long)elementUsage];
 	}
 	else
 	{
@@ -235,16 +235,16 @@
 		{
 			if (elementUsagePage == kHIDPage_Button)
 			{
-				elementName = [NSString stringWithFormat:@"Button %i", elementUsage];
+				elementName = [NSString stringWithFormat:@"Button %li", (long)elementUsage];
 			}
 			else if (elementUsagePage == kHIDPage_VendorDefinedStart)
 			{
-				elementName = [NSString stringWithFormat:@"VendorDefined %i", elementUsage];
+				elementName = [NSString stringWithFormat:@"VendorDefined %li", (long)elementUsage];
 			}
 			else
 			{
-				NSDictionary *elementUsagePageDict = (NSDictionary *)[hidUsageTable valueForKey:[NSString stringWithFormat:@"0x%04X", elementUsagePage]];
-				elementName = (NSString *)[elementUsagePageDict valueForKey:[NSString stringWithFormat:@"0x%04X", elementUsage]];
+				NSDictionary *elementUsagePageDict = (NSDictionary *)[hidUsageTable valueForKey:[NSString stringWithFormat:@"0x%04lX", (long)elementUsagePage]];
+				elementName = (NSString *)[elementUsagePageDict valueForKey:[NSString stringWithFormat:@"0x%04lX", (long)elementUsage]];
 			}
 		}
 		else
@@ -363,8 +363,8 @@
 		NSInteger upperThreshold = (((logicalMax - logicalMin) * 2) / 3) + logicalMin;
 		NSNumber *onState = [NSNumber numberWithBool:YES];
 		NSNumber *offState = [NSNumber numberWithBool:NO];
-		NSString *elementCodeLowerThreshold = [NSString stringWithFormat:@"0x%04X/0x%04X/LowerThreshold", elementUsagePage, elementUsage];
-		NSString *elementCodeUpperThreshold = [NSString stringWithFormat:@"0x%04X/0x%04X/UpperThreshold", elementUsagePage, elementUsage];
+		NSString *elementCodeLowerThreshold = [NSString stringWithFormat:@"0x%04lX/0x%04lX/LowerThreshold", (long)elementUsagePage, (long)elementUsage];
+		NSString *elementCodeUpperThreshold = [NSString stringWithFormat:@"0x%04lX/0x%04lX/UpperThreshold", (long)elementUsagePage, (long)elementUsage];
 		
 		if (logicalValue <= lowerThreshold)
 		{
@@ -410,18 +410,18 @@
 	
 	NSNumber *onState = [NSNumber numberWithBool:YES];
 	NSNumber *offState = [NSNumber numberWithBool:NO];
-	NSString *elementCodeFourWayUp = [NSString stringWithFormat:@"0x%04X/0x%04X/%d-FourDirection", elementUsagePage, elementUsage, 0];
-	NSString *elementCodeFourWayRight = [NSString stringWithFormat:@"0x%04X/0x%04X/%d-FourDirection", elementUsagePage, elementUsage, 1];
-	NSString *elementCodeFourWayDown = [NSString stringWithFormat:@"0x%04X/0x%04X/%d-FourDirection", elementUsagePage, elementUsage, 2];
-	NSString *elementCodeFourWayLeft = [NSString stringWithFormat:@"0x%04X/0x%04X/%d-FourDirection", elementUsagePage, elementUsage, 3];
-	NSString *elementCodeEightWayUp = [NSString stringWithFormat:@"0x%04X/0x%04X/%d-EightDirection", elementUsagePage, elementUsage, 0];
-	NSString *elementCodeEightWayUpRight = [NSString stringWithFormat:@"0x%04X/0x%04X/%d-EightDirection", elementUsagePage, elementUsage, 1];
-	NSString *elementCodeEightWayRight = [NSString stringWithFormat:@"0x%04X/0x%04X/%d-EightDirection", elementUsagePage, elementUsage, 2];
-	NSString *elementCodeEightWayDownRight = [NSString stringWithFormat:@"0x%04X/0x%04X/%d-EightDirection", elementUsagePage, elementUsage, 3];
-	NSString *elementCodeEightWayDown = [NSString stringWithFormat:@"0x%04X/0x%04X/%d-EightDirection", elementUsagePage, elementUsage, 4];
-	NSString *elementCodeEightWayDownLeft = [NSString stringWithFormat:@"0x%04X/0x%04X/%d-EightDirection", elementUsagePage, elementUsage, 5];
-	NSString *elementCodeEightWayLeft = [NSString stringWithFormat:@"0x%04X/0x%04X/%d-EightDirection", elementUsagePage, elementUsage, 6];
-	NSString *elementCodeEightWayUpLeft = [NSString stringWithFormat:@"0x%04X/0x%04X/%d-EightDirection", elementUsagePage, elementUsage, 7];
+	NSString *elementCodeFourWayUp = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-FourDirection", (long)elementUsagePage, (long)elementUsage, 0];
+	NSString *elementCodeFourWayRight = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-FourDirection", (long)elementUsagePage, (long)elementUsage, 1];
+	NSString *elementCodeFourWayDown = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-FourDirection", (long)elementUsagePage, (long)elementUsage, 2];
+	NSString *elementCodeFourWayLeft = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-FourDirection", (long)elementUsagePage, (long)elementUsage, 3];
+	NSString *elementCodeEightWayUp = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-EightDirection", (long)elementUsagePage, (long)elementUsage, 0];
+	NSString *elementCodeEightWayUpRight = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-EightDirection", (long)elementUsagePage, (long)elementUsage, 1];
+	NSString *elementCodeEightWayRight = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-EightDirection", (long)elementUsagePage, (long)elementUsage, 2];
+	NSString *elementCodeEightWayDownRight = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-EightDirection", (long)elementUsagePage, (long)elementUsage, 3];
+	NSString *elementCodeEightWayDown = [NSString stringWithFormat:@"0x%04lXX/0x%04lX/%d-EightDirection",(long) (long)elementUsagePage, (long)elementUsage, 4];
+	NSString *elementCodeEightWayDownLeft = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-EightDirection", (long)elementUsagePage, (long)elementUsage, 5];
+	NSString *elementCodeEightWayLeft = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-EightDirection", (long)elementUsagePage, (long)elementUsage, 6];
+	NSString *elementCodeEightWayUpLeft = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-EightDirection", (long)elementUsagePage, (long)elementUsage, 7];
 	
 	if (logicalMax == 3)
 	{

Modified: trunk/desmume/src/cocoa/cocoa_input.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_input.mm	2013-02-06 05:17:53 UTC (rev 4504)
+++ trunk/desmume/src/cocoa/cocoa_input.mm	2013-02-06 05:55:23 UTC (rev 4505)
@@ -48,7 +48,7 @@
 	
 	if (theCode == nil)
 	{
-		deviceCode = [[NSString stringWithFormat:@"0x%08X", rand()] retain];
+		deviceCode = [[NSString stringWithFormat:@"0x%08X", arc4random()] retain];
 	}
 	else
 	{
@@ -497,7 +497,7 @@
 		case NSRightMouseDragged:
 		case NSOtherMouseDragged:
 			input = (CocoaDSInput *)[self.inputs valueForKey:@"NSEventMouse"];
-			elementCode = [NSString stringWithFormat:@"%i", [event buttonNumber]];
+			elementCode = [NSString stringWithFormat:@"%li", (long)[event buttonNumber]];
 			break;
 			
 		default:

Modified: trunk/desmume/src/cocoa/userinterface/appDelegate.mm
===================================================================
--- trunk/desmume/src/cocoa/userinterface/appDelegate.mm	2013-02-06 05:17:53 UTC (rev 4504)
+++ trunk/desmume/src/cocoa/userinterface/appDelegate.mm	2013-02-06 05:55:23 UTC (rev 4505)
@@ -360,9 +360,9 @@
 		slotNumberKey = 0;
 	}
 	
-	NSMenuItem *mItem = [menu addItemWithTitle:[NSString stringWithFormat:NSSTRING_TITLE_SLOT_NUMBER, slotNumber]
+	NSMenuItem *mItem = [menu addItemWithTitle:[NSString stringWithFormat:NSSTRING_TITLE_SLOT_NUMBER, (unsigned long)slotNumber]
 										action:nil
-								 keyEquivalent:[NSString stringWithFormat:@"%d", slotNumberKey]];
+								 keyEquivalent:[NSString stringWithFormat:@"%ld", (unsigned long)slotNumberKey]];
 	
 	[mItem setTarget:[mainWindow delegate]];
 	

Modified: trunk/desmume/src/cocoa/userinterface/cheatWindowDelegate.mm
===================================================================
--- trunk/desmume/src/cocoa/userinterface/cheatWindowDelegate.mm	2013-02-06 05:17:53 UTC (rev 4504)
+++ trunk/desmume/src/cocoa/userinterface/cheatWindowDelegate.mm	2013-02-06 05:55:23 UTC (rev 4505)
@@ -119,7 +119,7 @@
 	self.untitledCount++;
 	if (self.untitledCount > 1)
 	{
-		untitledString = [NSString stringWithFormat:@"Untitled %d", self.untitledCount];
+		untitledString = [NSString stringWithFormat:@"Untitled %ld", (unsigned long)self.untitledCount];
 	}
 	else
 	{

Modified: trunk/desmume/src/cocoa/userinterface/displayView.mm
===================================================================
--- trunk/desmume/src/cocoa/userinterface/displayView.mm	2013-02-06 05:17:53 UTC (rev 4504)
+++ trunk/desmume/src/cocoa/userinterface/displayView.mm	2013-02-06 05:55:23 UTC (rev 4505)
@@ -597,7 +597,7 @@
 	
 	if (keyPressed && [theEvent window] != nil && [[[theEvent window] delegate] respondsToSelector:@selector(setStatus:)])
 	{
-		[[[theEvent window] delegate] setStatus:[NSString stringWithFormat:@"Keyboard:%i", [theEvent keyCode]]];
+		[(EmuWindowDelegate *)[[theEvent window] delegate] setStatus:[NSString stringWithFormat:@"Keyboard:%i", [theEvent keyCode]]];
 	}
 	
 	isHandled = [self.cdsController setStateWithInput:inputAttributes];
@@ -619,8 +619,8 @@
 	// and finally to DS touchscreen coordinates.
 	NSPoint touchLoc = [self dsPointFromEvent:theEvent];
 	
-	NSString *elementCode = [NSString stringWithFormat:@"%i", [theEvent buttonNumber]];
-	NSString *elementName = [NSString stringWithFormat:@"Button %i", [theEvent buttonNumber]];
+	NSString *elementCode = [NSString stringWithFormat:@"%li", (long)[theEvent buttonNumber]];
+	NSString *elementName = [NSString stringWithFormat:@"Button %li", (long)[theEvent buttonNumber]];
 	
 	switch ([theEvent buttonNumber])
 	{
@@ -652,7 +652,7 @@
 	
 	if (buttonPressed && [theEvent window] != nil && [[[theEvent window] delegate] respondsToSelector:@selector(setStatus:)])
 	{
-		[[[theEvent window] delegate] setStatus:[NSString stringWithFormat:@"Mouse:%i X:%i Y:%i", [theEvent buttonNumber], (NSInteger)(touchLoc.x), (NSInteger)(touchLoc.y)]];
+		[(EmuWindowDelegate *)[[theEvent window] delegate] setStatus:[NSString stringWithFormat:@"Mouse:%li X:%li Y:%li", (long)[theEvent buttonNumber], (long)(touchLoc.x), (long)(touchLoc.y)]];
 	}
 	
 	isHandled = [self.cdsController setStateWithInput:inputAttributes];

Modified: trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.mm
===================================================================
--- trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.mm	2013-02-06 05:17:53 UTC (rev 4504)
+++ trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.mm	2013-02-06 05:55:23 UTC (rev 4505)
@@ -1319,7 +1319,7 @@
 				
 				[cheatWindowBindings setValue:titleString forKey:@"cheatDBTitle"];
 				[cheatWindowBindings setValue:dateString forKey:@"cheatDBDate"];
-				[cheatWindowBindings setValue:[NSString stringWithFormat:@"%d", [dbList count]] forKey:@"cheatDBItemCount"];
+				[cheatWindowBindings setValue:[NSString stringWithFormat:@"%ld", (unsigned long)[dbList count]] forKey:@"cheatDBItemCount"];
 			}
 			else
 			{

Modified: trunk/desmume/src/cocoa/userinterface/inputPrefsView.mm
===================================================================
--- trunk/desmume/src/cocoa/userinterface/inputPrefsView.mm	2013-02-06 05:17:53 UTC (rev 4504)
+++ trunk/desmume/src/cocoa/userinterface/inputPrefsView.mm	2013-02-06 05:55:23 UTC (rev 4505)
@@ -119,8 +119,8 @@
 - (BOOL) handleMouseDown:(NSEvent *)mouseEvent
 {
 	BOOL isHandled = NO;
-	NSString *elementCode = [NSString stringWithFormat:@"%i", [mouseEvent buttonNumber]];
-	NSString *elementName = [NSString stringWithFormat:@"Button %i", [mouseEvent buttonNumber]];
+	NSString *elementCode = [NSString stringWithFormat:@"%li", (long)[mouseEvent buttonNumber]];
+	NSString *elementName = [NSString stringWithFormat:@"Button %li", (long)[mouseEvent buttonNumber]];
 	
 	switch ([mouseEvent buttonNumber])
 	{

Modified: trunk/desmume/src/cocoa/userinterface/preferencesWindowDelegate.mm
===================================================================
--- trunk/desmume/src/cocoa/userinterface/preferencesWindowDelegate.mm	2013-02-06 05:17:53 UTC (rev 4504)
+++ trunk/desmume/src/cocoa/userinterface/preferencesWindowDelegate.mm	2013-02-06 05:55:23 UTC (rev 4505)
@@ -351,7 +351,7 @@
 			
 			[cheatWindowBindings setValue:titleString forKey:@"cheatDBTitle"];
 			[cheatWindowBindings setValue:dateString forKey:@"cheatDBDate"];
-			[cheatWindowBindings setValue:[NSString stringWithFormat:@"%d", [dbList count]] forKey:@"cheatDBItemCount"];
+			[cheatWindowBindings setValue:[NSString stringWithFormat:@"%ld", (unsigned long)[dbList count]] forKey:@"cheatDBItemCount"];
 		}
 		else
 		{

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4507
          http://desmume.svn.sourceforge.net/desmume/?rev=4507&view=rev
Author:   rogerman
Date:     2013-02-06 21:39:22 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
Cocoa Port:
- Remove the requirement for the OS X v10.5 SDK when building using the "OS X App; v10.5 Leopard Release Build" scheme in the Xcode 4 project. The scheme now uses the latest OS X SDK available. This is being done for forward compatibility purposes.
- Fix compiling when building using the OS X v10.5 and earlier SDKs in the Xcode 3 and Legacy projects.
- Fix compiling when building for all PowerPC build targets.

Modified Paths:
--------------
    trunk/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj
    trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj
    trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj
    trunk/desmume/src/cocoa/cocoa_output.mm

Added Paths:
-----------
    trunk/desmume/src/cocoa/macosx_10_5_compat.cpp

Modified: trunk/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj
===================================================================
--- trunk/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj	2013-02-06 21:12:07 UTC (rev 4506)
+++ trunk/desmume/src/cocoa/DeSmuME (Legacy).xcodeproj/project.pbxproj	2013-02-06 21:39:22 UTC (rev 4507)
@@ -756,6 +756,7 @@
 		AB46781714ABD4890002FF94 /* AppIcon_NintendoDS_ROM.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB46780714ABD4890002FF94 /* AppIcon_NintendoDS_ROM.icns */; };
 		AB46781814ABD4890002FF94 /* AppIcon_ROMSave.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB46780814ABD4890002FF94 /* AppIcon_ROMSave.icns */; };
 		AB46781914ABD4890002FF94 /* AppIcon_SaveState.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB46780914ABD4890002FF94 /* AppIcon_SaveState.icns */; };
+		AB4F981716C30117000E90EA /* OGLRender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD2E135B8ACE00E977B3 /* OGLRender.cpp */; };
 		AB73B12B14BDA01C00F49C92 /* appDelegate_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB73B12914BDA01C00F49C92 /* appDelegate_legacy.mm */; };
 		AB73B12C14BDA01C00F49C92 /* emuWindowDelegate_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB73B12A14BDA01C00F49C92 /* emuWindowDelegate_legacy.mm */; };
 		AB73B12D14BDA01C00F49C92 /* appDelegate_legacy.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB73B12914BDA01C00F49C92 /* appDelegate_legacy.mm */; };
@@ -896,35 +897,6 @@
 		ABF50BC9169F61540018C08D /* x86func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA9169F61540018C08D /* x86func.cpp */; };
 		ABF50BCA169F61540018C08D /* x86operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAB169F61540018C08D /* x86operand.cpp */; };
 		ABF50BCB169F61540018C08D /* x86util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAD169F61540018C08D /* x86util.cpp */; };
-		ABF50BCC169F61540018C08D /* assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B70169F61540018C08D /* assembler.cpp */; };
-		ABF50BCD169F61540018C08D /* assert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B72169F61540018C08D /* assert.cpp */; };
-		ABF50BCE169F61540018C08D /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B74169F61540018C08D /* buffer.cpp */; };
-		ABF50BCF169F61540018C08D /* compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B77169F61540018C08D /* compiler.cpp */; };
-		ABF50BD0169F61540018C08D /* compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B79169F61540018C08D /* compilercontext.cpp */; };
-		ABF50BD1169F61540018C08D /* compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B7B169F61540018C08D /* compilerfunc.cpp */; };
-		ABF50BD2169F61540018C08D /* compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B7D169F61540018C08D /* compileritem.cpp */; };
-		ABF50BD3169F61540018C08D /* context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B7F169F61540018C08D /* context.cpp */; };
-		ABF50BD4169F61540018C08D /* cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B81169F61540018C08D /* cpuinfo.cpp */; };
-		ABF50BD5169F61540018C08D /* defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B83169F61540018C08D /* defs.cpp */; };
-		ABF50BD6169F61540018C08D /* func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B85169F61540018C08D /* func.cpp */; };
-		ABF50BD7169F61540018C08D /* logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B89169F61540018C08D /* logger.cpp */; };
-		ABF50BD8169F61540018C08D /* memorymanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B8B169F61540018C08D /* memorymanager.cpp */; };
-		ABF50BD9169F61540018C08D /* memorymarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B8D169F61540018C08D /* memorymarker.cpp */; };
-		ABF50BDA169F61540018C08D /* operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B8F169F61540018C08D /* operand.cpp */; };
-		ABF50BDB169F61540018C08D /* stringbuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B92169F61540018C08D /* stringbuilder.cpp */; };
-		ABF50BDC169F61540018C08D /* stringutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B94169F61540018C08D /* stringutil.cpp */; };
-		ABF50BDD169F61540018C08D /* virtualmemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B96169F61540018C08D /* virtualmemory.cpp */; };
-		ABF50BDE169F61540018C08D /* zonememory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B98169F61540018C08D /* zonememory.cpp */; };
-		ABF50BDF169F61540018C08D /* x86assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B9B169F61540018C08D /* x86assembler.cpp */; };
-		ABF50BE0169F61540018C08D /* x86compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B9D169F61540018C08D /* x86compiler.cpp */; };
-		ABF50BE1169F61540018C08D /* x86compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B9F169F61540018C08D /* x86compilercontext.cpp */; };
-		ABF50BE2169F61540018C08D /* x86compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA1169F61540018C08D /* x86compilerfunc.cpp */; };
-		ABF50BE3169F61540018C08D /* x86compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA3169F61540018C08D /* x86compileritem.cpp */; };
-		ABF50BE4169F61540018C08D /* x86cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA5169F61540018C08D /* x86cpuinfo.cpp */; };
-		ABF50BE5169F61540018C08D /* x86defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA7169F61540018C08D /* x86defs.cpp */; };
-		ABF50BE6169F61540018C08D /* x86func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA9169F61540018C08D /* x86func.cpp */; };
-		ABF50BE7169F61540018C08D /* x86operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAB169F61540018C08D /* x86operand.cpp */; };
-		ABF50BE8169F61540018C08D /* x86util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAD169F61540018C08D /* x86util.cpp */; };
 		ABF50BE9169F61540018C08D /* assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B70169F61540018C08D /* assembler.cpp */; };
 		ABF50BEA169F61540018C08D /* assert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B72169F61540018C08D /* assert.cpp */; };
 		ABF50BEB169F61540018C08D /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B74169F61540018C08D /* buffer.cpp */; };
@@ -983,35 +955,6 @@
 		ABF50C20169F61540018C08D /* x86func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA9169F61540018C08D /* x86func.cpp */; };
 		ABF50C21169F61540018C08D /* x86operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAB169F61540018C08D /* x86operand.cpp */; };
 		ABF50C22169F61540018C08D /* x86util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAD169F61540018C08D /* x86util.cpp */; };
-		ABF50C23169F61540018C08D /* assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B70169F61540018C08D /* assembler.cpp */; };
-		ABF50C24169F61540018C08D /* assert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B72169F61540018C08D /* assert.cpp */; };
-		ABF50C25169F61540018C08D /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B74169F61540018C08D /* buffer.cpp */; };
-		ABF50C26169F61540018C08D /* compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B77169F61540018C08D /* compiler.cpp */; };
-		ABF50C27169F61540018C08D /* compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B79169F61540018C08D /* compilercontext.cpp */; };
-		ABF50C28169F61540018C08D /* compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B7B169F61540018C08D /* compilerfunc.cpp */; };
-		ABF50C29169F61540018C08D /* compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B7D169F61540018C08D /* compileritem.cpp */; };
-		ABF50C2A169F61540018C08D /* context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B7F169F61540018C08D /* context.cpp */; };
-		ABF50C2B169F61540018C08D /* cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B81169F61540018C08D /* cpuinfo.cpp */; };
-		ABF50C2C169F61540018C08D /* defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B83169F61540018C08D /* defs.cpp */; };
-		ABF50C2D169F61540018C08D /* func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B85169F61540018C08D /* func.cpp */; };
-		ABF50C2E169F61540018C08D /* logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B89169F61540018C08D /* logger.cpp */; };
-		ABF50C2F169F61540018C08D /* memorymanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B8B169F61540018C08D /* memorymanager.cpp */; };
-		ABF50C30169F61540018C08D /* memorymarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B8D169F61540018C08D /* memorymarker.cpp */; };
-		ABF50C31169F61540018C08D /* operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B8F169F61540018C08D /* operand.cpp */; };
-		ABF50C32169F61540018C08D /* stringbuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B92169F61540018C08D /* stringbuilder.cpp */; };
-		ABF50C33169F61540018C08D /* stringutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B94169F61540018C08D /* stringutil.cpp */; };
-		ABF50C34169F61540018C08D /* virtualmemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B96169F61540018C08D /* virtualmemory.cpp */; };
-		ABF50C35169F61540018C08D /* zonememory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B98169F61540018C08D /* zonememory.cpp */; };
-		ABF50C36169F61540018C08D /* x86assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B9B169F61540018C08D /* x86assembler.cpp */; };
-		ABF50C37169F61540018C08D /* x86compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B9D169F61540018C08D /* x86compiler.cpp */; };
-		ABF50C38169F61540018C08D /* x86compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B9F169F61540018C08D /* x86compilercontext.cpp */; };
-		ABF50C39169F61540018C08D /* x86compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA1169F61540018C08D /* x86compilerfunc.cpp */; };
-		ABF50C3A169F61540018C08D /* x86compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA3169F61540018C08D /* x86compileritem.cpp */; };
-		ABF50C3B169F61540018C08D /* x86cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA5169F61540018C08D /* x86cpuinfo.cpp */; };
-		ABF50C3C169F61540018C08D /* x86defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA7169F61540018C08D /* x86defs.cpp */; };
-		ABF50C3D169F61540018C08D /* x86func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA9169F61540018C08D /* x86func.cpp */; };
-		ABF50C3E169F61540018C08D /* x86operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAB169F61540018C08D /* x86operand.cpp */; };
-		ABF50C3F169F61540018C08D /* x86util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAD169F61540018C08D /* x86util.cpp */; };
 		ABF50C40169F61540018C08D /* assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B70169F61540018C08D /* assembler.cpp */; };
 		ABF50C41169F61540018C08D /* assert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B72169F61540018C08D /* assert.cpp */; };
 		ABF50C42169F61540018C08D /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B74169F61540018C08D /* buffer.cpp */; };
@@ -1041,35 +984,6 @@
 		ABF50C5A169F61540018C08D /* x86func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA9169F61540018C08D /* x86func.cpp */; };
 		ABF50C5B169F61540018C08D /* x86operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAB169F61540018C08D /* x86operand.cpp */; };
 		ABF50C5C169F61540018C08D /* x86util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAD169F61540018C08D /* x86util.cpp */; };
-		ABF50C5D169F61540018C08D /* assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B70169F61540018C08D /* assembler.cpp */; };
-		ABF50C5E169F61540018C08D /* assert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B72169F61540018C08D /* assert.cpp */; };
-		ABF50C5F169F61540018C08D /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B74169F61540018C08D /* buffer.cpp */; };
-		ABF50C60169F61540018C08D /* compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B77169F61540018C08D /* compiler.cpp */; };
-		ABF50C61169F61540018C08D /* compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B79169F61540018C08D /* compilercontext.cpp */; };
-		ABF50C62169F61540018C08D /* compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B7B169F61540018C08D /* compilerfunc.cpp */; };
-		ABF50C63169F61540018C08D /* compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B7D169F61540018C08D /* compileritem.cpp */; };
-		ABF50C64169F61540018C08D /* context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B7F169F61540018C08D /* context.cpp */; };
-		ABF50C65169F61540018C08D /* cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B81169F61540018C08D /* cpuinfo.cpp */; };
-		ABF50C66169F61540018C08D /* defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B83169F61540018C08D /* defs.cpp */; };
-		ABF50C67169F61540018C08D /* func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B85169F61540018C08D /* func.cpp */; };
-		ABF50C68169F61540018C08D /* logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B89169F61540018C08D /* logger.cpp */; };
-		ABF50C69169F61540018C08D /* memorymanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B8B169F61540018C08D /* memorymanager.cpp */; };
-		ABF50C6A169F61540018C08D /* memorymarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B8D169F61540018C08D /* memorymarker.cpp */; };
-		ABF50C6B169F61540018C08D /* operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B8F169F61540018C08D /* operand.cpp */; };
-		ABF50C6C169F61540018C08D /* stringbuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B92169F61540018C08D /* stringbuilder.cpp */; };
-		ABF50C6D169F61540018C08D /* stringutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B94169F61540018C08D /* stringutil.cpp */; };
-		ABF50C6E169F61540018C08D /* virtualmemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B96169F61540018C08D /* virtualmemory.cpp */; };
-		ABF50C6F169F61540018C08D /* zonememory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B98169F61540018C08D /* zonememory.cpp */; };
-		ABF50C70169F61540018C08D /* x86assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B9B169F61540018C08D /* x86assembler.cpp */; };
-		ABF50C71169F61540018C08D /* x86compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B9D169F61540018C08D /* x86compiler.cpp */; };
-		ABF50C72169F61540018C08D /* x86compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50B9F169F61540018C08D /* x86compilercontext.cpp */; };
-		ABF50C73169F61540018C08D /* x86compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA1169F61540018C08D /* x86compilerfunc.cpp */; };
-		ABF50C74169F61540018C08D /* x86compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA3169F61540018C08D /* x86compileritem.cpp */; };
-		ABF50C75169F61540018C08D /* x86cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA5169F61540018C08D /* x86cpuinfo.cpp */; };
-		ABF50C76169F61540018C08D /* x86defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA7169F61540018C08D /* x86defs.cpp */; };
-		ABF50C77169F61540018C08D /* x86func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BA9169F61540018C08D /* x86func.cpp */; };
-		ABF50C78169F61540018C08D /* x86operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAB169F61540018C08D /* x86operand.cpp */; };
-		ABF50C79169F61540018C08D /* x86util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50BAD169F61540018C08D /* x86util.cpp */; };
 		ABFE4242143E32F0009A3CCE /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1F4B55090F53924500C8B514 /* Localizable.strings */; };
 		ABFE4251143E32F0009A3CCE /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD0E135B8ACE00E977B3 /* addons.cpp */; };
 		ABFE4252143E32F0009A3CCE /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB06CD10135B8ACE00E977B3 /* arm_instructions.cpp */; };
@@ -3335,35 +3249,6 @@
 				AB18153D15D212B4007A6CC3 /* coreaudiosound.cpp in Sources */,
 				AB18153E15D212B4007A6CC3 /* ringbuffer.cpp in Sources */,
 				AB1816B615D216EC007A6CC3 /* OGLRender.cpp in Sources */,
-				ABF50C23169F61540018C08D /* assembler.cpp in Sources */,
-				ABF50C24169F61540018C08D /* assert.cpp in Sources */,
-				ABF50C25169F61540018C08D /* buffer.cpp in Sources */,
-				ABF50C26169F61540018C08D /* compiler.cpp in Sources */,
-				ABF50C27169F61540018C08D /* compilercontext.cpp in Sources */,
-				ABF50C28169F61540018C08D /* compilerfunc.cpp in Sources */,
-				ABF50C29169F61540018C08D /* compileritem.cpp in Sources */,
-				ABF50C2A169F61540018C08D /* context.cpp in Sources */,
-				ABF50C2B169F61540018C08D /* cpuinfo.cpp in Sources */,
-				ABF50C2C169F61540018C08D /* defs.cpp in Sources */,
-				ABF50C2D169F61540018C08D /* func.cpp in Sources */,
-				ABF50C2E169F61540018C08D /* logger.cpp in Sources */,
-				ABF50C2F169F61540018C08D /* memorymanager.cpp in Sources */,
-				ABF50C30169F61540018C08D /* memorymarker.cpp in Sources */,
-				ABF50C31169F61540018C08D /* operand.cpp in Sources */,
-				ABF50C32169F61540018C08D /* stringbuilder.cpp in Sources */,
-				ABF50C33169F61540018C08D /* stringutil.cpp in Sources */,
-				ABF50C34169F61540018C08D /* virtualmemory.cpp in Sources */,
-				ABF50C35169F61540018C08D /* zonememory.cpp in Sources */,
-				ABF50C36169F61540018C08D /* x86assembler.cpp in Sources */,
-				ABF50C37169F61540018C08D /* x86compiler.cpp in Sources */,
-				ABF50C38169F61540018C08D /* x86compilercontext.cpp in Sources */,
-				ABF50C39169F61540018C08D /* x86compilerfunc.cpp in Sources */,
-				ABF50C3A169F61540018C08D /* x86compileritem.cpp in Sources */,
-				ABF50C3B169F61540018C08D /* x86cpuinfo.cpp in Sources */,
-				ABF50C3C169F61540018C08D /* x86defs.cpp in Sources */,
-				ABF50C3D169F61540018C08D /* x86func.cpp in Sources */,
-				ABF50C3E169F61540018C08D /* x86operand.cpp in Sources */,
-				ABF50C3F169F61540018C08D /* x86util.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3473,35 +3358,7 @@
 				AB1815D815D21469007A6CC3 /* video_output_view_legacy.mm in Sources */,
 				AB1815D915D21469007A6CC3 /* coreaudiosound.cpp in Sources */,
 				AB1815DA15D21469007A6CC3 /* ringbuffer.cpp in Sources */,
-				ABF50C5D169F61540018C08D /* assembler.cpp in Sources */,
-				ABF50C5E169F61540018C08D /* assert.cpp in Sources */,
-				ABF50C5F169F61540018C08D /* buffer.cpp in Sources */,
-				ABF50C60169F61540018C08D /* compiler.cpp in Sources */,
-				ABF50C61169F61540018C08D /* compilercontext.cpp in Sources */,
-				ABF50C62169F61540018C08D /* compilerfunc.cpp in Sources */,
-				ABF50C63169F61540018C08D /* compileritem.cpp in Sources */,
-				ABF50C64169F61540018C08D /* context.cpp in Sources */,
-				ABF50C65169F61540018C08D /* cpuinfo.cpp in Sources */,
-				ABF50C66169F61540018C08D /* defs.cpp in Sources */,
-				ABF50C67169F61540018C08D /* func.cpp in Sources */,
-				ABF50C68169F61540018C08D /* logger.cpp in Sources */,
-				ABF50C69169F61540018C08D /* memorymanager.cpp in Sources */,
-				ABF50C6A169F61540018C08D /* memorymarker.cpp in Sources */,
-				ABF50C6B169F61540018C08D /* operand.cpp in Sources */,
-				ABF50C6C169F61540018C08D /* stringbuilder.cpp in Sources */,
-				ABF50C6D169F61540018C08D /* stringutil.cpp in Sources */,
-				ABF50C6E169F61540018C08D /* virtualmemory.cpp in Sources */,
-				ABF50C6F169F61540018C08D /* zonememory.cpp in Sources */,
-				ABF50C70169F61540018C08D /* x86assembler.cpp in Sources */,
-				ABF50C71169F61540018C08D /* x86compiler.cpp in Sources */,
-				ABF50C72169F61540018C08D /* x86compilercontext.cpp in Sources */,
-				ABF50C73169F61540018C08D /* x86compilerfunc.cpp in Sources */,
-				ABF50C74169F61540018C08D /* x86compileritem.cpp in Sources */,
-				ABF50C75169F61540018C08D /* x86cpuinfo.cpp in Sources */,
-				ABF50C76169F61540018C08D /* x86defs.cpp in Sources */,
-				ABF50C77169F61540018C08D /* x86func.cpp in Sources */,
-				ABF50C78169F61540018C08D /* x86operand.cpp in Sources */,
-				ABF50C79169F61540018C08D /* x86util.cpp in Sources */,
+				AB4F981716C30117000E90EA /* OGLRender.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3622,35 +3479,6 @@
 				AB18167F15D214F2007A6CC3 /* coreaudiosound.cpp in Sources */,
 				AB18168015D214F2007A6CC3 /* ringbuffer.cpp in Sources */,
 				AB1816B815D216F5007A6CC3 /* OGLRender.cpp in Sources */,
-				ABF50BCC169F61540018C08D /* assembler.cpp in Sources */,
-				ABF50BCD169F61540018C08D /* assert.cpp in Sources */,
-				ABF50BCE169F61540018C08D /* buffer.cpp in Sources */,
-				ABF50BCF169F61540018C08D /* compiler.cpp in Sources */,
-				ABF50BD0169F61540018C08D /* compilercontext.cpp in Sources */,
-				ABF50BD1169F61540018C08D /* compilerfunc.cpp in Sources */,
-				ABF50BD2169F61540018C08D /* compileritem.cpp in Sources */,
-				ABF50BD3169F61540018C08D /* context.cpp in Sources */,
-				ABF50BD4169F61540018C08D /* cpuinfo.cpp in Sources */,
-				ABF50BD5169F61540018C08D /* defs.cpp in Sources */,
-				ABF50BD6169F61540018C08D /* func.cpp in Sources */,
-				ABF50BD7169F61540018C08D /* logger.cpp in Sources */,
-				ABF50BD8169F61540018C08D /* memorymanager.cpp in Sources */,
-				ABF50BD9169F61540018C08D /* memorymarker.cpp in Sources */,
-				ABF50BDA169F61540018C08D /* operand.cpp in Sources */,
-				ABF50BDB169F61540018C08D /* stringbuilder.cpp in Sources */,
-				ABF50BDC169F61540018C08D /* stringutil.cpp in Sources */,
-				ABF50BDD169F61540018C08D /* virtualmemory.cpp in Sources */,
-				ABF50BDE169F61540018C08D /* zonememory.cpp in Sources */,
-				ABF50BDF169F61540018C08D /* x86assembler.cpp in Sources */,
-				ABF50BE0169F61540018C08D /* x86compiler.cpp in Sources */,
-				ABF50BE1169F61540018C08D /* x86compilercontext.cpp in Sources */,
-				ABF50BE2169F61540018C08D /* x86compilerfunc.cpp in Sources */,
-				ABF50BE3169F61540018C08D /* x86compileritem.cpp in Sources */,
-				ABF50BE4169F61540018C08D /* x86cpuinfo.cpp in Sources */,
-				ABF50BE5169F61540018C08D /* x86defs.cpp in Sources */,
-				ABF50BE6169F61540018C08D /* x86func.cpp in Sources */,
-				ABF50BE7169F61540018C08D /* x86operand.cpp in Sources */,
-				ABF50BE8169F61540018C08D /* x86util.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Modified: trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj
===================================================================
--- trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj	2013-02-06 21:12:07 UTC (rev 4506)
+++ trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj	2013-02-06 21:39:22 UTC (rev 4507)
@@ -819,64 +819,6 @@
 		ABF50AD4169F5FDA0018C08D /* x86func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB4169F5FDA0018C08D /* x86func.cpp */; };
 		ABF50AD5169F5FDA0018C08D /* x86operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB6169F5FDA0018C08D /* x86operand.cpp */; };
 		ABF50AD6169F5FDA0018C08D /* x86util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB8169F5FDA0018C08D /* x86util.cpp */; };
-		ABF50AD7169F5FDA0018C08D /* assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A7B169F5FDA0018C08D /* assembler.cpp */; };
-		ABF50AD8169F5FDA0018C08D /* assert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A7D169F5FDA0018C08D /* assert.cpp */; };
-		ABF50AD9169F5FDA0018C08D /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A7F169F5FDA0018C08D /* buffer.cpp */; };
-		ABF50ADA169F5FDA0018C08D /* compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A82169F5FDA0018C08D /* compiler.cpp */; };
-		ABF50ADB169F5FDA0018C08D /* compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A84169F5FDA0018C08D /* compilercontext.cpp */; };
-		ABF50ADC169F5FDA0018C08D /* compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A86169F5FDA0018C08D /* compilerfunc.cpp */; };
-		ABF50ADD169F5FDA0018C08D /* compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A88169F5FDA0018C08D /* compileritem.cpp */; };
-		ABF50ADE169F5FDA0018C08D /* context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A8A169F5FDA0018C08D /* context.cpp */; };
-		ABF50ADF169F5FDA0018C08D /* cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A8C169F5FDA0018C08D /* cpuinfo.cpp */; };
-		ABF50AE0169F5FDA0018C08D /* defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A8E169F5FDA0018C08D /* defs.cpp */; };
-		ABF50AE1169F5FDA0018C08D /* func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A90169F5FDA0018C08D /* func.cpp */; };
-		ABF50AE2169F5FDA0018C08D /* logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A94169F5FDA0018C08D /* logger.cpp */; };
-		ABF50AE3169F5FDA0018C08D /* memorymanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A96169F5FDA0018C08D /* memorymanager.cpp */; };
-		ABF50AE4169F5FDA0018C08D /* memorymarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A98169F5FDA0018C08D /* memorymarker.cpp */; };
-		ABF50AE5169F5FDA0018C08D /* operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A9A169F5FDA0018C08D /* operand.cpp */; };
-		ABF50AE6169F5FDA0018C08D /* stringbuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A9D169F5FDA0018C08D /* stringbuilder.cpp */; };
-		ABF50AE7169F5FDA0018C08D /* stringutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A9F169F5FDA0018C08D /* stringutil.cpp */; };
-		ABF50AE8169F5FDA0018C08D /* virtualmemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AA1169F5FDA0018C08D /* virtualmemory.cpp */; };
-		ABF50AE9169F5FDA0018C08D /* zonememory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AA3169F5FDA0018C08D /* zonememory.cpp */; };
-		ABF50AEA169F5FDA0018C08D /* x86assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AA6169F5FDA0018C08D /* x86assembler.cpp */; };
-		ABF50AEB169F5FDA0018C08D /* x86compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AA8169F5FDA0018C08D /* x86compiler.cpp */; };
-		ABF50AEC169F5FDA0018C08D /* x86compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AAA169F5FDA0018C08D /* x86compilercontext.cpp */; };
-		ABF50AED169F5FDA0018C08D /* x86compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AAC169F5FDA0018C08D /* x86compilerfunc.cpp */; };
-		ABF50AEE169F5FDA0018C08D /* x86compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AAE169F5FDA0018C08D /* x86compileritem.cpp */; };
-		ABF50AEF169F5FDA0018C08D /* x86cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB0169F5FDA0018C08D /* x86cpuinfo.cpp */; };
-		ABF50AF0169F5FDA0018C08D /* x86defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB2169F5FDA0018C08D /* x86defs.cpp */; };
-		ABF50AF1169F5FDA0018C08D /* x86func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB4169F5FDA0018C08D /* x86func.cpp */; };
-		ABF50AF2169F5FDA0018C08D /* x86operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB6169F5FDA0018C08D /* x86operand.cpp */; };
-		ABF50AF3169F5FDA0018C08D /* x86util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB8169F5FDA0018C08D /* x86util.cpp */; };
-		ABF50AF4169F5FDA0018C08D /* assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A7B169F5FDA0018C08D /* assembler.cpp */; };
-		ABF50AF5169F5FDA0018C08D /* assert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A7D169F5FDA0018C08D /* assert.cpp */; };
-		ABF50AF6169F5FDA0018C08D /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A7F169F5FDA0018C08D /* buffer.cpp */; };
-		ABF50AF7169F5FDA0018C08D /* compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A82169F5FDA0018C08D /* compiler.cpp */; };
-		ABF50AF8169F5FDA0018C08D /* compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A84169F5FDA0018C08D /* compilercontext.cpp */; };
-		ABF50AF9169F5FDA0018C08D /* compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A86169F5FDA0018C08D /* compilerfunc.cpp */; };
-		ABF50AFA169F5FDA0018C08D /* compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A88169F5FDA0018C08D /* compileritem.cpp */; };
-		ABF50AFB169F5FDA0018C08D /* context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A8A169F5FDA0018C08D /* context.cpp */; };
-		ABF50AFC169F5FDA0018C08D /* cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A8C169F5FDA0018C08D /* cpuinfo.cpp */; };
-		ABF50AFD169F5FDA0018C08D /* defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A8E169F5FDA0018C08D /* defs.cpp */; };
-		ABF50AFE169F5FDA0018C08D /* func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A90169F5FDA0018C08D /* func.cpp */; };
-		ABF50AFF169F5FDA0018C08D /* logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A94169F5FDA0018C08D /* logger.cpp */; };
-		ABF50B00169F5FDA0018C08D /* memorymanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A96169F5FDA0018C08D /* memorymanager.cpp */; };
-		ABF50B01169F5FDA0018C08D /* memorymarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A98169F5FDA0018C08D /* memorymarker.cpp */; };
-		ABF50B02169F5FDA0018C08D /* operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A9A169F5FDA0018C08D /* operand.cpp */; };
-		ABF50B03169F5FDA0018C08D /* stringbuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A9D169F5FDA0018C08D /* stringbuilder.cpp */; };
-		ABF50B04169F5FDA0018C08D /* stringutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A9F169F5FDA0018C08D /* stringutil.cpp */; };
-		ABF50B05169F5FDA0018C08D /* virtualmemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AA1169F5FDA0018C08D /* virtualmemory.cpp */; };
-		ABF50B06169F5FDA0018C08D /* zonememory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AA3169F5FDA0018C08D /* zonememory.cpp */; };
-		ABF50B07169F5FDA0018C08D /* x86assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AA6169F5FDA0018C08D /* x86assembler.cpp */; };
-		ABF50B08169F5FDA0018C08D /* x86compiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AA8169F5FDA0018C08D /* x86compiler.cpp */; };
-		ABF50B09169F5FDA0018C08D /* x86compilercontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AAA169F5FDA0018C08D /* x86compilercontext.cpp */; };
-		ABF50B0A169F5FDA0018C08D /* x86compilerfunc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AAC169F5FDA0018C08D /* x86compilerfunc.cpp */; };
-		ABF50B0B169F5FDA0018C08D /* x86compileritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AAE169F5FDA0018C08D /* x86compileritem.cpp */; };
-		ABF50B0C169F5FDA0018C08D /* x86cpuinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB0169F5FDA0018C08D /* x86cpuinfo.cpp */; };
-		ABF50B0D169F5FDA0018C08D /* x86defs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB2169F5FDA0018C08D /* x86defs.cpp */; };
-		ABF50B0E169F5FDA0018C08D /* x86func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB4169F5FDA0018C08D /* x86func.cpp */; };
-		ABF50B0F169F5FDA0018C08D /* x86operand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB6169F5FDA0018C08D /* x86operand.cpp */; };
-		ABF50B10169F5FDA0018C08D /* x86util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50AB8169F5FDA0018C08D /* x86util.cpp */; };
 		ABF50B11169F5FDA0018C08D /* assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A7B169F5FDA0018C08D /* assembler.cpp */; };
 		ABF50B12169F5FDA0018C08D /* assert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A7D169F5FDA0018C08D /* assert.cpp */; };
 		ABF50B13169F5FDA0018C08D /* buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABF50A7F169F5FDA0018C08D /* buffer.cpp */; };
@@ -2680,35 +2622,6 @@
 				AB2F3C3815CF9C6000858373 /* coreaudiosound.cpp in Sources */,
 				AB2F3C3915CF9C6000858373 /* ringbuffer.cpp in Sources */,
 				ABA03571169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */,
-				ABF50AD7169F5FDA0018C08D /* assembler.cpp in Sources */,
-				ABF50AD8169F5FDA0018C08D /* assert.cpp in Sources */,
-				ABF50AD9169F5FDA0018C08D /* buffer.cpp in Sources */,
-				ABF50ADA169F5FDA0018C08D /* compiler.cpp in Sources */,
-				ABF50ADB169F5FDA0018C08D /* compilercontext.cpp in Sources */,
-				ABF50ADC169F5FDA0018C08D /* compilerfunc.cpp in Sources */,
-				ABF50ADD169F5FDA0018C08D /* compileritem.cpp in Sources */,
-				ABF50ADE169F5FDA0018C08D /* context.cpp in Sources */,
-				ABF50ADF169F5FDA0018C08D /* cpuinfo.cpp in Sources */,
-				ABF50AE0169F5FDA0018C08D /* defs.cpp in Sources */,
-				ABF50AE1169F5FDA0018C08D /* func.cpp in Sources */,
-				ABF50AE2169F5FDA0018C08D /* logger.cpp in Sources */,
-				ABF50AE3169F5FDA0018C08D /* memorymanager.cpp in Sources */,
-				ABF50AE4169F5FDA0018C08D /* memorymarker.cpp in Sources */,
-				ABF50AE5169F5FDA0018C08D /* operand.cpp in Sources */,
-				ABF50AE6169F5FDA0018C08D /* stringbuilder.cpp in Sources */,
-				ABF50AE7169F5FDA0018C08D /* stringutil.cpp in Sources */,
-				ABF50AE8169F5FDA0018C08D /* virtualmemory.cpp in Sources */,
-				ABF50AE9169F5FDA0018C08D /* zonememory.cpp in Sources */,
-				ABF50AEA169F5FDA0018C08D /* x86assembler.cpp in Sources */,
-				ABF50AEB169F5FDA0018C08D /* x86compiler.cpp in Sources */,
-				ABF50AEC169F5FDA0018C08D /* x86compilercontext.cpp in Sources */,
-				ABF50AED169F5FDA0018C08D /* x86compilerfunc.cpp in Sources */,
-				ABF50AEE169F5FDA0018C08D /* x86compileritem.cpp in Sources */,
-				ABF50AEF169F5FDA0018C08D /* x86cpuinfo.cpp in Sources */,
-				ABF50AF0169F5FDA0018C08D /* x86defs.cpp in Sources */,
-				ABF50AF1169F5FDA0018C08D /* x86func.cpp in Sources */,
-				ABF50AF2169F5FDA0018C08D /* x86operand.cpp in Sources */,
-				ABF50AF3169F5FDA0018C08D /* x86util.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3144,35 +3057,6 @@
 				ABAD102E15ACE7A00000EC47 /* coreaudiosound.cpp in Sources */,
 				ABAD102F15ACE7A00000EC47 /* ringbuffer.cpp in Sources */,
 				ABA03573169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */,
-				ABF50AF4169F5FDA0018C08D /* assembler.cpp in Sources */,
-				ABF50AF5169F5FDA0018C08D /* assert.cpp in Sources */,
-				ABF50AF6169F5FDA0018C08D /* buffer.cpp in Sources */,
-				ABF50AF7169F5FDA0018C08D /* compiler.cpp in Sources */,
-				ABF50AF8169F5FDA0018C08D /* compilercontext.cpp in Sources */,
-				ABF50AF9169F5FDA0018C08D /* compilerfunc.cpp in Sources */,
-				ABF50AFA169F5FDA0018C08D /* compileritem.cpp in Sources */,
-				ABF50AFB169F5FDA0018C08D /* context.cpp in Sources */,
-				ABF50AFC169F5FDA0018C08D /* cpuinfo.cpp in Sources */,
-				ABF50AFD169F5FDA0018C08D /* defs.cpp in Sources */,
-				ABF50AFE169F5FDA0018C08D /* func.cpp in Sources */,
-				ABF50AFF169F5FDA0018C08D /* logger.cpp in Sources */,
-				ABF50B00169F5FDA0018C08D /* memorymanager.cpp in Sources */,
-				ABF50B01169F5FDA0018C08D /* memorymarker.cpp in Sources */,
-				ABF50B02169F5FDA0018C08D /* operand.cpp in Sources */,
-				ABF50B03169F5FDA0018C08D /* stringbuilder.cpp in Sources */,
-				ABF50B04169F5FDA0018C08D /* stringutil.cpp in Sources */,
-				ABF50B05169F5FDA0018C08D /* virtualmemory.cpp in Sources */,
-				ABF50B06169F5FDA0018C08D /* zonememory.cpp in Sources */,
-				ABF50B07169F5FDA0018C08D /* x86assembler.cpp in Sources */,
-				ABF50B08169F5FDA0018C08D /* x86compiler.cpp in Sources */,
-				ABF50B09169F5FDA0018C08D /* x86compilercontext.cpp in Sources */,
-				ABF50B0A169F5FDA0018C08D /* x86compilerfunc.cpp in Sources */,
-				ABF50B0B169F5FDA0018C08D /* x86compileritem.cpp in Sources */,
-				ABF50B0C169F5FDA0018C08D /* x86cpuinfo.cpp in Sources */,
-				ABF50B0D169F5FDA0018C08D /* x86defs.cpp in Sources */,
-				ABF50B0E169F5FDA0018C08D /* x86func.cpp in Sources */,
-				ABF50B0F169F5FDA0018C08D /* x86operand.cpp in Sources */,
-				ABF50B10169F5FDA0018C08D /* x86util.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Modified: trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj
===================================================================
--- trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj	2013-02-06 21:12:07 UTC (rev 4506)
+++ trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj	2013-02-06 21:39:22 UTC (rev 4507)
@@ -64,6 +64,8 @@
 		AB1B9E661501A78000464647 /* ringbuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB1B9E601501A78000464647 /* ringbuffer.cpp */; };
 		AB1F468413A0ADE400B80DE6 /* SndOut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF7A1345ACFA00AF11D1 /* SndOut.cpp */; };
 		AB1F469813A0AE2F00B80DE6 /* Timestretcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF9B1345ACFA00AF11D1 /* Timestretcher.cpp */; };
+		AB23567416C2F6F400DA782E /* macosx_10_5_compat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB23567216C2F6F400DA782E /* macosx_10_5_compat.cpp */; };
+		AB23567516C2FAD800DA782E /* OGLRender_3_2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB68A0DA16B139BC00DE0546 /* OGLRender_3_2.cpp */; };
 		AB26D87C16B5253D00A2305C /* OGLRender_3_2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB68A0DA16B139BC00DE0546 /* OGLRender_3_2.cpp */; };
 		AB350B6A1478A5B3007165AC /* cocoa_hid.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB350B691478A5B3007165AC /* cocoa_hid.mm */; };
 		AB350BA51478AC96007165AC /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB350BA41478AC96007165AC /* IOKit.framework */; };
@@ -672,6 +674,7 @@
 		AB1B9E601501A78000464647 /* ringbuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ringbuffer.cpp; sourceTree = SOURCE_ROOT; };
 		AB1B9E611501A78000464647 /* coreaudiosound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coreaudiosound.h; sourceTree = SOURCE_ROOT; };
 		AB1B9E621501A78000464647 /* ringbuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ringbuffer.h; sourceTree = SOURCE_ROOT; };
+		AB23567216C2F6F400DA782E /* macosx_10_5_compat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = macosx_10_5_compat.cpp; sourceTree = "<group>"; };
 		AB350B681478A5B3007165AC /* cocoa_hid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_hid.h; sourceTree = "<group>"; };
 		AB350B691478A5B3007165AC /* cocoa_hid.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_hid.mm; sourceTree = "<group>"; };
 		AB350BA41478AC96007165AC /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
@@ -1095,6 +1098,7 @@
 				ABB3C63A1501BB8300E0C22E /* openemu */,
 				AB3ACB6514C2361100D7D192 /* userinterface */,
 				AB1B9E5F1501A78000464647 /* coreaudiosound.cpp */,
+				AB23567216C2F6F400DA782E /* macosx_10_5_compat.cpp */,
 				AB1B9E601501A78000464647 /* ringbuffer.cpp */,
 				ABD104141346652500AF11D1 /* sndOSX.cpp */,
 				AB817A35143EE2DB00A7DFE9 /* videofilter.cpp */,
@@ -2219,6 +2223,8 @@
 				AB40568E169F5DCC0016AC3E /* x86func.cpp in Sources */,
 				AB405691169F5DCC0016AC3E /* x86operand.cpp in Sources */,
 				AB405694169F5DCC0016AC3E /* x86util.cpp in Sources */,
+				AB23567416C2F6F400DA782E /* macosx_10_5_compat.cpp in Sources */,
+				AB23567516C2FAD800DA782E /* OGLRender_3_2.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2614,15 +2620,17 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
-				SDKROOT = macosx10.5;
 			};
 			name = Debug;
 		};
 		C01FCF4C08A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					NDEBUG,
+					PUBLIC_RELEASE,
+				);
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
-				SDKROOT = macosx10.5;
 			};
 			name = Release;
 		};

Modified: trunk/desmume/src/cocoa/cocoa_output.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_output.mm	2013-02-06 21:12:07 UTC (rev 4506)
+++ trunk/desmume/src/cocoa/cocoa_output.mm	2013-02-06 21:39:22 UTC (rev 4507)
@@ -28,6 +28,8 @@
 #include "../SPU.h"
 #include "../metaspu/metaspu.h"
 
+#include <OpenGL/OpenGL.h>
+
 #ifdef MAC_OS_X_VERSION_10_7
 #include "../OGLRender_3_2.h"
 #else

Added: trunk/desmume/src/cocoa/macosx_10_5_compat.cpp
===================================================================
--- trunk/desmume/src/cocoa/macosx_10_5_compat.cpp	                        (rev 0)
+++ trunk/desmume/src/cocoa/macosx_10_5_compat.cpp	2013-02-06 21:39:22 UTC (rev 4507)
@@ -0,0 +1,90 @@
+/*
+	Copyright (C) 2013 DeSmuME team
+
+	This file is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 2 of the License, or
+	(at your option) any later version.
+
+	This file is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <ostream>
+#include <istream>
+
+
+// Workarounds for symbols that are missing from Leopard stdlibc++.dylib.
+// http://stackoverflow.com/questions/3484043/os-x-program-runs-on-dev-machine-crashing-horribly-on-others
+
+_GLIBCXX_BEGIN_NAMESPACE(std)
+
+// From ostream_insert.h
+template ostream& __ostream_insert(ostream&, const char*, streamsize);
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+template wostream& __ostream_insert(wostream&, const wchar_t*, streamsize);
+#endif
+
+// From ostream.tcc
+template ostream& ostream::_M_insert(long);
+template ostream& ostream::_M_insert(unsigned long);
+template ostream& ostream::_M_insert(bool);
+#ifdef _GLIBCXX_USE_LONG_LONG
+template ostream& ostream::_M_insert(long long);
+template ostream& ostream::_M_insert(unsigned long long);
+#endif
+template ostream& ostream::_M_insert(double);
+template ostream& ostream::_M_insert(long double);
+template ostream& ostream::_M_insert(const void*);
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+template wostream& wostream::_M_insert(long);
+template wostream& wostream::_M_insert(unsigned long);
+template wostream& wostream::_M_insert(bool);
+#ifdef _GLIBCXX_USE_LONG_LONG
+template wostream& wostream::_M_insert(long long);
+template wostream& wostream::_M_insert(unsigned long long);
+#endif
+template wostream& wostream::_M_insert(double);
+template wostream& wostream::_M_insert(long double);
+template wostream& wostream::_M_insert(const void*);
+#endif
+
+// From istream.tcc
+template istream& istream::_M_extract(unsigned short&);
+template istream& istream::_M_extract(unsigned int&);
+template istream& istream::_M_extract(long&);
+template istream& istream::_M_extract(unsigned long&);
+template istream& istream::_M_extract(bool&);
+#ifdef _GLIBCXX_USE_LONG_LONG
+template istream& istream::_M_extract(long long&);
+template istream& istream::_M_extract(unsigned long long&);
+#endif
+template istream& istream::_M_extract(float&);
+template istream& istream::_M_extract(double&);
+template istream& istream::_M_extract(long double&);
+template istream& istream::_M_extract(void*&);
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+template wistream& wistream::_M_extract(unsigned short&);
+template wistream& wistream::_M_extract(unsigned int&);
+template wistream& wistream::_M_extract(long&);
+template wistream& wistream::_M_extract(unsigned long&);
+template wistream& wistream::_M_extract(bool&);
+#ifdef _GLIBCXX_USE_LONG_LONG
+template wistream& wistream::_M_extract(long long&);
+template wistream& wistream::_M_extract(unsigned long long&);
+#endif
+template wistream& wistream::_M_extract(float&);
+template wistream& wistream::_M_extract(double&);
+template wistream& wistream::_M_extract(long double&);
+template wistream& wistream::_M_extract(void*&);
+#endif
+
+_GLIBCXX_END_NAMESPACE

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4532
          http://desmume.svn.sourceforge.net/desmume/?rev=4532&view=rev
Author:   rogerman
Date:     2013-02-11 20:57:16 +0000 (Mon, 11 Feb 2013)
Log Message:
-----------
Cocoa Port:
- Do some random code cleanup.

Modified Paths:
--------------
    trunk/desmume/src/cocoa/cocoa_output.h
    trunk/desmume/src/cocoa/cocoa_output.mm
    trunk/desmume/src/cocoa/cocoa_rom.mm
    trunk/desmume/src/cocoa/cocoa_util.h
    trunk/desmume/src/cocoa/cocoa_util.mm
    trunk/desmume/src/cocoa/cocoa_videofilter.mm
    trunk/desmume/src/cocoa/userinterface/displayView.h
    trunk/desmume/src/cocoa/userinterface/displayView.mm
    trunk/desmume/src/cocoa/userinterface/preferencesWindowDelegate.mm

Modified: trunk/desmume/src/cocoa/cocoa_output.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_output.h	2013-02-11 07:17:27 UTC (rev 4531)
+++ trunk/desmume/src/cocoa/cocoa_output.h	2013-02-11 20:57:16 UTC (rev 4532)
@@ -16,12 +16,14 @@
 	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 #include <pthread.h>
 #include <libkern/OSAtomic.h>
 
 #import "cocoa_util.h"
 
+@class NSImage;
+@class NSBitmapImageRep;
 
 typedef struct
 {

Modified: trunk/desmume/src/cocoa/cocoa_output.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_output.mm	2013-02-11 07:17:27 UTC (rev 4531)
+++ trunk/desmume/src/cocoa/cocoa_output.mm	2013-02-11 20:57:16 UTC (rev 4532)
@@ -28,14 +28,15 @@
 #include "../SPU.h"
 #include "../metaspu/metaspu.h"
 
-#include <OpenGL/OpenGL.h>
-
 #ifdef MAC_OS_X_VERSION_10_7
 #include "../OGLRender_3_2.h"
 #else
 #include "../OGLRender.h"
 #endif
 
+#import <Cocoa/Cocoa.h>
+#include <OpenGL/OpenGL.h>
+
 #undef BOOL
 
 GPU3DInterface *core3DList[] = {
@@ -1320,7 +1321,7 @@
 	}
 	
 	uint32_t *bitmapData = (uint32_t *)[imageRep bitmapData];
-	RGBA5551ToRGBA8888Buffer((const uint16_t *)[self.frameData bytes], bitmapData, (w * h));
+	RGB555ToRGBA8888Buffer((const uint16_t *)[self.frameData bytes], bitmapData, (w * h));
 	
 #ifdef __BIG_ENDIAN__
 	uint32_t *bitmapDataEnd = bitmapData + (w * h);
@@ -1622,7 +1623,7 @@
 	}
 	else
 	{
-		RGBA5551ToRGBA8888Buffer((const uint16_t *)[mainData bytes], (uint32_t *)[vf srcBufferPtr], [mainData length] / sizeof(UInt16));
+		RGB555ToRGBA8888Buffer((const uint16_t *)[mainData bytes], (uint32_t *)[vf srcBufferPtr], [mainData length] / sizeof(UInt16));
 		const UInt32 *vfDestBuffer = [vf runFilter];
 		[videoDelegate doProcessVideoFrame:vfDestBuffer displayMode:displayModeID width:destWidth height:destHeight];
 	}
@@ -1973,6 +1974,7 @@
 	CGLReleasePBuffer(OSXOpenGLRendererPBuffer);
 	CGLReleaseContext(OSXOpenGLRendererContext);
 	OSXOpenGLRendererContext = NULL;
+	OSXOpenGLRendererPBuffer = NULL;
 }
 
 void RequestOpenGLRenderer_3_2(bool request_3_2)

Modified: trunk/desmume/src/cocoa/cocoa_rom.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_rom.mm	2013-02-11 07:17:27 UTC (rev 4531)
+++ trunk/desmume/src/cocoa/cocoa_rom.mm	2013-02-11 20:57:16 UTC (rev 4532)
@@ -571,14 +571,14 @@
 	iconClutPtr = (uint16_t *)&MMU.CART_ROM[iconOffset + 0x220] + 1;
 	iconPixPtr = (uint32_t *)&MMU.CART_ROM[iconOffset + 0x20];
 	
-	// Setup the 4-bit color CLUT.
+	// Setup the 4-bit CLUT.
 	//
-	// The actual color values are stored with the ROM icon data in RGBA5551 format.
+	// The actual color values are stored with the ROM icon data in RGB555 format.
 	// We convert these color values and store them in the CLUT as RGBA8888 values.
 	//
 	// The first entry always represents the alpha, so we can just ignore it.
 	clut[0] = 0x00000000;
-	RGBA5551ToRGBA8888Buffer(iconClutPtr, &clut[1], 15);
+	RGB555ToRGBA8888Buffer(iconClutPtr, &clut[1], 15);
 	
 	// Load the image from the icon pixel data.
 	//

Modified: trunk/desmume/src/cocoa/cocoa_util.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_util.h	2013-02-11 07:17:27 UTC (rev 4531)
+++ trunk/desmume/src/cocoa/cocoa_util.h	2013-02-11 20:57:16 UTC (rev 4532)
@@ -16,7 +16,7 @@
 	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
 	#include "macosx_10_4_compat.h"
@@ -93,10 +93,10 @@
 {
 #endif
 
-uint32_t RGBA5551ToRGBA8888(const uint16_t color16);
-uint32_t RGBA8888ToRGB888(const uint32_t color24);
-void RGBA5551ToRGBA8888Buffer(const uint16_t *__restrict__ srcBuffer, uint32_t *__restrict__ destBuffer, unsigned int numberPixels);
-void RGB888ToRGBA8888Buffer(const uint32_t *__restrict__ srcBuffer, uint32_t *__restrict__ destBuffer, unsigned int numberPixels);
+uint32_t RGB555ToRGBA8888(const uint16_t color16);
+uint32_t RGBA8888ForceOpaque(const uint32_t color32);
+void RGB555ToRGBA8888Buffer(const uint16_t *__restrict__ srcBuffer, uint32_t *__restrict__ destBuffer, unsigned int numberPixels);
+void RGBA8888ForceOpaqueBuffer(const uint32_t *__restrict__ srcBuffer, uint32_t *__restrict__ destBuffer, unsigned int numberPixels);
 NSSize GetTransformedBounds(NSSize normalBounds, double scalar, double angleDegrees);
 double GetMaxScalarInBounds(double normalBoundsWidth, double normalBoundsHeight, double keepInBoundsWidth, double keepInBoundsHeight);
 NSPoint GetNormalPointFromTransformedPoint(NSPoint transformedPt, NSSize normalBounds, NSSize transformBounds, double scalar, double angleDegrees);

Modified: trunk/desmume/src/cocoa/cocoa_util.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_util.mm	2013-02-11 07:17:27 UTC (rev 4531)
+++ trunk/desmume/src/cocoa/cocoa_util.mm	2013-02-11 20:57:16 UTC (rev 4532)
@@ -19,6 +19,7 @@
 #import "cocoa_util.h"
 #import "cocoa_globals.h"
 #import "types.h"
+#import <Cocoa/Cocoa.h>
 
 #include <Accelerate/Accelerate.h>
 #include <sys/types.h>
@@ -320,12 +321,12 @@
 @end
 
 /********************************************************************************************
-	RGBA5551ToRGBA8888() - INLINE
+	RGB555ToRGBA8888() - INLINE
 
-	Converts a color from 16-bit RGBA5551 format into 32-bit RGBA8888 format.
+	Converts a color from 15-bit RGB555 format into 32-bit RGBA8888 format.
 
 	Takes:
-		color16 - The pixel in 16-bit RGBA5551 format.
+		color16 - The pixel in 15-bit RGB555 format.
 
 	Returns:
 		A 32-bit unsigned integer containing the RGBA8888 formatted color.
@@ -333,7 +334,7 @@
 	Details:
 		The input and output pixels are expected to have little-endian byte order.
  ********************************************************************************************/
-FORCEINLINE uint32_t RGBA5551ToRGBA8888(const uint16_t color16)
+FORCEINLINE uint32_t RGB555ToRGBA8888(const uint16_t color16)
 {
 	return	((color16 & 0x001F) << 3) |
 			((color16 & 0x03E0) << 6) |
@@ -342,31 +343,31 @@
 }
 
 /********************************************************************************************
-	RGB888ToRGBA8888() - INLINE
+	RGBA8888ForceOpaque() - INLINE
 
-	Converts a color from 24-bit RGB888 format into 32-bit RGBA8888 format.
-
+	Forces the alpha channel of a 32-bit RGBA8888 color to a value of 0xFF.
+	
 	Takes:
-		color24 - The pixel in 24-bit RGB888 format.
-
+		color32 - The pixel in 32-bit RGBA8888 format.
+	
 	Returns:
 		A 32-bit unsigned integer containing the RGBA8888 formatted color.
-
+	
 	Details:
 		The input and output pixels are expected to have little-endian byte order.
  ********************************************************************************************/
-FORCEINLINE uint32_t RGB888ToRGBA8888(const uint32_t color24)
+FORCEINLINE uint32_t RGBA8888ForceOpaque(const uint32_t color32)
 {
-	return color24 | 0xFF000000;
+	return color32 | 0xFF000000;
 }
 
 /********************************************************************************************
-	RGBA5551ToRGBA8888Buffer()
+	RGB555ToRGBA8888Buffer()
 
-	Copies a 16-bit RGBA5551 pixel buffer into a 32-bit RGBA8888 pixel buffer.
+	Copies a 15-bit RGB555 pixel buffer into a 32-bit RGBA8888 pixel buffer.
 
 	Takes:
-		srcBuffer - Pointer to the source 16-bit RGBA5551 pixel buffer.
+		srcBuffer - Pointer to the source 15-bit RGB555 pixel buffer.
 		
 		destBuffer - Pointer to the destination 32-bit RGBA8888 pixel buffer.
 		
@@ -380,23 +381,24 @@
 		Also, it is the caller's responsibility to ensure that the source and destination
 		buffers are large enough to accomodate the requested number of pixels.
  ********************************************************************************************/
-void RGBA5551ToRGBA8888Buffer(const uint16_t *__restrict__ srcBuffer, uint32_t *__restrict__ destBuffer, unsigned int numberPixels)
+void RGB555ToRGBA8888Buffer(const uint16_t *__restrict__ srcBuffer, uint32_t *__restrict__ destBuffer, unsigned int numberPixels)
 {
 	const uint32_t *__restrict__ destBufferEnd = destBuffer + numberPixels;
 	
 	while (destBuffer < destBufferEnd)
 	{
-		*destBuffer++ = RGBA5551ToRGBA8888(*srcBuffer++);
+		*destBuffer++ = RGB555ToRGBA8888(*srcBuffer++);
 	}
 }
 
 /********************************************************************************************
-	RGB888ToRGBA8888Buffer()
+	RGBA8888ForceOpaqueBuffer()
 
-	Copies a 24-bit RGB888 pixel buffer into a 32-bit RGBA8888 pixel buffer.
+	Copies a 32-bit RGBA8888 pixel buffer into another 32-bit RGBA8888 pixel buffer.
+	The pixels in the destination buffer will have an alpha value of 0xFF.
 
 	Takes:
-		srcBuffer - Pointer to the source 24-bit RGB888 pixel buffer.
+		srcBuffer - Pointer to the source 32-bit RGBA8888 pixel buffer.
 		
 		destBuffer - Pointer to the destination 32-bit RGBA8888 pixel buffer.
 		
@@ -410,13 +412,13 @@
 		Also, it is the caller's responsibility to ensure that the source and destination
 		buffers are large enough to accomodate the requested number of pixels.
  ********************************************************************************************/
-void RGB888ToRGBA8888Buffer(const uint32_t *__restrict__ srcBuffer, uint32_t *__restrict__ destBuffer, unsigned int numberPixels)
+void RGBA8888ForceOpaqueBuffer(const uint32_t *__restrict__ srcBuffer, uint32_t *__restrict__ destBuffer, unsigned int numberPixels)
 {
 	const uint32_t *__restrict__ destBufferEnd = destBuffer + numberPixels;
 	
 	while (destBuffer < destBufferEnd)
 	{
-		*destBuffer++ = RGB888ToRGBA8888(*srcBuffer++);
+		*destBuffer++ = RGBA8888ForceOpaque(*srcBuffer++);
 	}
 }
 

Modified: trunk/desmume/src/cocoa/cocoa_videofilter.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_videofilter.mm	2013-02-11 07:17:27 UTC (rev 4531)
+++ trunk/desmume/src/cocoa/cocoa_videofilter.mm	2013-02-11 20:57:16 UTC (rev 4532)
@@ -139,7 +139,7 @@
 	}
 	
 	uint32_t *bitmapData = (uint32_t *)[imageRep bitmapData];
-	RGB888ToRGBA8888Buffer((const uint32_t *)[self runFilter], bitmapData, (w * h));
+	RGBA8888ForceOpaqueBuffer((const uint32_t *)[self runFilter], bitmapData, (w * h));
 	
 #ifdef __BIG_ENDIAN__
 	uint32_t *bitmapDataEnd = bitmapData + (w * h);

Modified: trunk/desmume/src/cocoa/userinterface/displayView.h
===================================================================
--- trunk/desmume/src/cocoa/userinterface/displayView.h	2013-02-11 07:17:27 UTC (rev 4531)
+++ trunk/desmume/src/cocoa/userinterface/displayView.h	2013-02-11 20:57:16 UTC (rev 4532)
@@ -22,6 +22,12 @@
 
 #import "cocoa_output.h"
 
+enum OGLVertexAttributeID
+{
+	OGLVertexAttributeID_Position = 0,
+	OGLVertexAttributeID_TexCoord0 = 8
+};
+
 @class DisplayViewDelegate;
 @class CocoaDSController;
 
@@ -154,22 +160,16 @@
 	unsigned int vtxBufferOffset;
 }
 
-- (void) setupOpenGL_Legacy;
+- (void) setupOpenGL;
+- (void) shutdownOpenGL;
+- (void) setupShaderIO;
+- (BOOL) setupShadersWithVertexProgram:(const char *)vertShaderProgram fragmentProgram:(const char *)fragShaderProgram;
 - (void) drawVideoFrame;
+- (void) uploadVertices;
+- (void) uploadTexCoords;
 - (void) uploadDisplayTextures:(const GLvoid *)textureData displayMode:(const NSInteger)displayModeID width:(const GLsizei)texWidth height:(const GLsizei)texHeight;
 - (void) renderDisplayUsingDisplayMode:(const NSInteger)displayModeID;
 - (void) updateDisplayVerticesUsingDisplayMode:(const NSInteger)displayModeID orientation:(const NSInteger)displayOrientationID;
 - (void) updateTexCoordS:(GLfloat)s T:(GLfloat)t;
 
 @end
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-GLint SetupShaders(GLuint *programID, GLuint *vertShaderID, GLuint *fragShaderID, const char *vertShaderProgram, const char *fragShaderProgram);
-
-#ifdef __cplusplus
-}
-#endif

Modified: trunk/desmume/src/cocoa/userinterface/displayView.mm
===================================================================
--- trunk/desmume/src/cocoa/userinterface/displayView.mm	2013-02-11 07:17:27 UTC (rev 4531)
+++ trunk/desmume/src/cocoa/userinterface/displayView.mm	2013-02-11 20:57:16 UTC (rev 4532)
@@ -24,14 +24,14 @@
 #import "cocoa_videofilter.h"
 #import "cocoa_util.h"
 
-#include <OpenGL/OpenGL.h>
 #include <OpenGL/gl.h>
+#include <OpenGL/glext.h>
 #include <OpenGL/glu.h>
 
 #undef BOOL
 
 // VERTEX SHADER FOR DISPLAY OUTPUT
-const char *vShader_100 = {"\
+const char *vertexProgram_100 = {"\
 	attribute vec2 inPosition; \n\
 	attribute vec2 inTexCoord0; \n\
 	\n\
@@ -60,7 +60,7 @@
 "};
 
 // FRAGMENT SHADER FOR DISPLAY OUTPUT
-const char *fShader_100 = {"\
+const char *fragmentProgram_100 = {"\
 	varying vec2 vtxTexCoord; \n\
 	uniform sampler2D tex; \n\
 	\n\
@@ -70,13 +70,7 @@
 	} \n\
 "};
 
-enum OGLVertexAttributeID
-{
-	OGLVertexAttributeID_Position = 0,
-	OGLVertexAttributeID_TexCoord0 = 8,
-};
 
-
 @implementation DisplayViewDelegate
 
 @synthesize view;
@@ -824,7 +818,7 @@
 	}
 	
 	uint32_t *bitmapData = (uint32_t *)[imageRep bitmapData];
-	RGBA5551ToRGBA8888Buffer((const uint16_t *)videoFrameData, bitmapData, (imageWidth * imageHeight));
+	RGB555ToRGBA8888Buffer((const uint16_t *)videoFrameData, bitmapData, (imageWidth * imageHeight));
 	
 #ifdef __BIG_ENDIAN__
 	uint32_t *bitmapDataEnd = bitmapData + (imageWidth * imageHeight);
@@ -1003,25 +997,8 @@
 	CGLContextObj prevContext = CGLGetCurrentContext();
 	CGLSetCurrentContext(cglDisplayContext);
 	
-	glDeleteTextures(1, &displayTexID);
+	[self shutdownOpenGL];
 	
-	glDeleteVertexArraysAPPLE(1, &vaoMainStatesID);
-	glDeleteBuffersARB(1, &vboVertexID);
-	glDeleteBuffersARB(1, &vboTexCoordID);
-	glDeleteBuffersARB(1, &vboElementID);
-	
-	if (isShaderSupported)
-	{
-		glUseProgram(0);
-		
-		glDetachShader(shaderProgram, vertexShaderID);
-		glDetachShader(shaderProgram, fragmentShaderID);
-		
-		glDeleteProgram(shaderProgram);
-		glDeleteShader(vertexShaderID);
-		glDeleteShader(fragmentShaderID);
-	}
-	
 	CGLSetCurrentContext(prevContext);
 	
 	free(glTexBack);
@@ -1061,10 +1038,10 @@
 	vtxIndexBuffer[6]	= 4;	vtxIndexBuffer[7]	= 5;	vtxIndexBuffer[8]	= 6;
 	vtxIndexBuffer[9]	= 6;	vtxIndexBuffer[10]	= 7;	vtxIndexBuffer[11]	= 4;
 	
-	[self setupOpenGL_Legacy];
+	[self setupOpenGL];
 }
 
-- (void) setupOpenGL_Legacy
+- (void) setupOpenGL
 {
 	// Check the OpenGL capabilities for this renderer
 	const GLubyte *glExtString = glGetString(GL_EXTENSIONS);
@@ -1089,8 +1066,8 @@
 #endif
 	if (isShaderSupported)
 	{
-		GLint shaderStatus = SetupShaders(&shaderProgram, &vertexShaderID, &fragmentShaderID, vShader_100, fShader_100);
-		if (shaderStatus == GL_TRUE)
+		BOOL isShaderSetUp = [self setupShadersWithVertexProgram:vertexProgram_100 fragmentProgram:fragmentProgram_100];
+		if (isShaderSetUp)
 		{
 			glUseProgram(shaderProgram);
 			
@@ -1172,11 +1149,125 @@
 	glClear(GL_COLOR_BUFFER_BIT);
 }
 
+- (void) shutdownOpenGL
+{
+	glDeleteTextures(1, &displayTexID);
+	
+	glDeleteVertexArraysAPPLE(1, &vaoMainStatesID);
+	glDeleteBuffersARB(1, &vboVertexID);
+	glDeleteBuffersARB(1, &vboTexCoordID);
+	glDeleteBuffersARB(1, &vboElementID);
+	
+	if (isShaderSupported)
+	{
+		glUseProgram(0);
+		
+		glDetachShader(shaderProgram, vertexShaderID);
+		glDetachShader(shaderProgram, fragmentShaderID);
+		
+		glDeleteProgram(shaderProgram);
+		glDeleteShader(vertexShaderID);
+		glDeleteShader(fragmentShaderID);
+	}
+}
+
+- (void) setupShaderIO
+{
+	glBindAttribLocation(shaderProgram, OGLVertexAttributeID_Position, "inPosition");
+	glBindAttribLocation(shaderProgram, OGLVertexAttributeID_TexCoord0, "inTexCoord0");
+}
+
+- (BOOL) setupShadersWithVertexProgram:(const char *)vertShaderProgram fragmentProgram:(const char *)fragShaderProgram
+{
+	BOOL result = NO;
+	GLint shaderStatus = GL_TRUE;
+	
+	vertexShaderID = glCreateShader(GL_VERTEX_SHADER);
+	if (vertexShaderID == 0)
+	{
+		NSLog(@"OpenGL Error - Failed to create vertex shader.");
+		return result;
+	}
+	
+	glShaderSource(vertexShaderID, 1, (const GLchar **)&vertShaderProgram, NULL);
+	glCompileShader(vertexShaderID);
+	glGetShaderiv(vertexShaderID, GL_COMPILE_STATUS, &shaderStatus);
+	if (shaderStatus == GL_FALSE)
+	{
+		glDeleteShader(vertexShaderID);
+		NSLog(@"OpenGL Error - Failed to compile vertex shader.");
+		return result;
+	}
+	
+	fragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER);
+	if (fragmentShaderID == 0)
+	{
+		glDeleteShader(vertexShaderID);
+		NSLog(@"OpenGL Error - Failed to create fragment shader.");
+		return result;
+	}
+	
+	glShaderSource(fragmentShaderID, 1, (const GLchar **)&fragShaderProgram, NULL);
+	glCompileShader(fragmentShaderID);
+	glGetShaderiv(fragmentShaderID, GL_COMPILE_STATUS, &shaderStatus);
+	if (shaderStatus == GL_FALSE)
+	{
+		glDeleteShader(vertexShaderID);
+		glDeleteShader(fragmentShaderID);
+		NSLog(@"OpenGL Error - Failed to compile fragment shader.");
+		return result;
+	}
+	
+	shaderProgram = glCreateProgram();
+	if (shaderProgram == 0)
+	{
+		glDeleteShader(vertexShaderID);
+		glDeleteShader(fragmentShaderID);
+		NSLog(@"OpenGL Error - Failed to create shader program.");
+		return result;
+	}
+	
+	glAttachShader(shaderProgram, vertexShaderID);
+	glAttachShader(shaderProgram, fragmentShaderID);
+	
+	[self setupShaderIO];
+	
+	glLinkProgram(shaderProgram);
+	glGetProgramiv(shaderProgram, GL_LINK_STATUS, &shaderStatus);
+	if (shaderStatus == GL_FALSE)
+	{
+		glDeleteProgram(shaderProgram);
+		glDeleteShader(vertexShaderID);
+		glDeleteShader(fragmentShaderID);
+		NSLog(@"OpenGL Error - Failed to link shader program.");
+		return result;
+	}
+	
+	glValidateProgram(shaderProgram);
+	
+	result = YES;
+	return result;
+}
+
 - (void) drawVideoFrame
 {
 	CGLFlushDrawable(cglDisplayContext);
 }
 
+- (void) uploadVertices
+{
+	glBindBufferARB(GL_ARRAY_BUFFER_ARB, vboVertexID);
+	glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(GLint) * (2 * 8), vtxBuffer + vtxBufferOffset);
+	glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
+}
+
+- (void) uploadTexCoords
+{
+	glBindBufferARB(GL_ARRAY_BUFFER_ARB, vboTexCoordID);
+	glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(GLfloat) * (2 * 8), texCoordBuffer);
+	glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
+}
+
 - (void) uploadDisplayTextures:(const GLvoid *)textureData displayMode:(const NSInteger)displayModeID width:(const GLsizei)texWidth height:(const GLsizei)texHeight
 {
 	if (textureData == NULL)
@@ -1201,10 +1292,7 @@
 	{
 		lastDisplayMode = displayModeID;
 		[self updateDisplayVerticesUsingDisplayMode:displayModeID orientation:currentDisplayOrientation];
-		
-		glBindBufferARB(GL_ARRAY_BUFFER_ARB, vboVertexID);
-		glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(GLint) * (2 * 8), vtxBuffer + vtxBufferOffset);
-		glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
+		[self uploadVertices];
 	}
 	
 	const GLsizei vtxElementCount = (displayModeID == DS_DISPLAY_TYPE_COMBO) ? 12 : 6;
@@ -1391,8 +1479,8 @@
 - (void)doProcessVideoFrame:(const void *)videoFrameData displayMode:(const NSInteger)displayModeID width:(const NSInteger)frameWidth height:(const NSInteger)frameHeight
 {
 	CGLLockContext(cglDisplayContext);
+	CGLSetCurrentContext(cglDisplayContext);
 	
-	CGLSetCurrentContext(cglDisplayContext);
 	[self uploadDisplayTextures:videoFrameData displayMode:displayModeID width:frameWidth height:frameHeight];
 	[self renderDisplayUsingDisplayMode:displayModeID];
 	[self drawVideoFrame];
@@ -1421,7 +1509,7 @@
 	CGLUnlockContext(cglDisplayContext);
 }
 
-- (void) doTransformView:(const DisplayOutputTransformData *)transformData
+- (void)doTransformView:(const DisplayOutputTransformData *)transformData
 {
 	const GLfloat angleDegrees = (GLfloat)transformData->rotation;
 	const GLfloat s = (GLfloat)transformData->scale;
@@ -1448,8 +1536,8 @@
 - (void)doRedraw
 {
 	CGLLockContext(cglDisplayContext);
+	CGLSetCurrentContext(cglDisplayContext);
 	
-	CGLSetCurrentContext(cglDisplayContext);
 	[self renderDisplayUsingDisplayMode:lastDisplayMode];
 	[self drawVideoFrame];
 	
@@ -1464,9 +1552,7 @@
 	CGLLockContext(cglDisplayContext);
 	CGLSetCurrentContext(cglDisplayContext);
 	
-	glBindBufferARB(GL_ARRAY_BUFFER_ARB, vboVertexID);
-	glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(GLint) * (2 * 8), vtxBuffer + vtxBufferOffset);
-	glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
+	[self uploadVertices];
 	
 	CGLUnlockContext(cglDisplayContext);
 }
@@ -1476,6 +1562,7 @@
 	const GLint textureFilter = useBilinear ? GL_LINEAR : GL_NEAREST;
 	
 	CGLLockContext(cglDisplayContext);
+	CGLSetCurrentContext(cglDisplayContext);
 	
 	glBindTexture(GL_TEXTURE_2D, displayTexID);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, textureFilter);
@@ -1493,9 +1580,7 @@
 	CGLLockContext(cglDisplayContext);
 	CGLSetCurrentContext(cglDisplayContext);
 	
-	glBindBufferARB(GL_ARRAY_BUFFER_ARB, vboVertexID);
-	glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(GLint) * (2 * 8), vtxBuffer + vtxBufferOffset);
-	glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
+	[self uploadVertices];
 	
 	CGLUnlockContext(cglDisplayContext);
 }
@@ -1514,9 +1599,7 @@
 	CGLLockContext(cglDisplayContext);
 	CGLSetCurrentContext(cglDisplayContext);
 	
-	glBindBufferARB(GL_ARRAY_BUFFER_ARB, vboVertexID);
-	glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(GLint) * (2 * 8), vtxBuffer + vtxBufferOffset);
-	glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
+	[self uploadVertices];
 	
 	if (lastDisplayMode == DS_DISPLAY_TYPE_COMBO)
 	{
@@ -1530,7 +1613,6 @@
 - (void)doVerticalSyncChanged:(BOOL)useVerticalSync
 {
 	const GLint swapInt = useVerticalSync ? 1 : 0;
-	
 	CGLSetParameter(cglDisplayContext, kCGLCPSwapInterval, &swapInt);
 }
 
@@ -1573,87 +1655,15 @@
 	[self updateTexCoordS:s T:t];
 	
 	CGLLockContext(cglDisplayContext);
+	CGLSetCurrentContext(cglDisplayContext);
 	
 	glBindTexture(GL_TEXTURE_2D, displayTexID);
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)potW, (GLsizei)potH, 0, GL_BGRA, glTexPixelFormat, glTexBack);
 	glBindTexture(GL_TEXTURE_2D, 0);
 	
-	glBindBufferARB(GL_ARRAY_BUFFER_ARB, vboTexCoordID);
-	glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(GLfloat) * (2 * 8), texCoordBuffer);
-	glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
+	[self uploadTexCoords];
 	
 	CGLUnlockContext(cglDisplayContext);
 }
 
 @end
-
-GLint SetupShaders(GLuint *programID, GLuint *vertShaderID, GLuint *fragShaderID, const char *vertShaderProgram, const char *fragShaderProgram)
-{
-	GLint shaderStatus = GL_TRUE;
-	
-	*vertShaderID = glCreateShader(GL_VERTEX_SHADER);
-	if (*vertShaderID == 0)
-	{
-		NSLog(@"OpenGL Error - Failed to create vertex shader.");
-		return shaderStatus;
-	}
-	
-	glShaderSource(*vertShaderID, 1, (const GLchar **)&vertShaderProgram, NULL);
-	glCompileShader(*vertShaderID);
-	glGetShaderiv(*vertShaderID, GL_COMPILE_STATUS, &shaderStatus);
-	if (shaderStatus == GL_FALSE)
-	{
-		glDeleteShader(*vertShaderID);
-		NSLog(@"OpenGL Error - Failed to compile vertex shader.");
-		return shaderStatus;
-	}
-	
-	*fragShaderID = glCreateShader(GL_FRAGMENT_SHADER);
-	if (*fragShaderID == 0)
-	{
-		glDeleteShader(*vertShaderID);
-		NSLog(@"OpenGL Error - Failed to create fragment shader.");
-		return shaderStatus;
-	}
-	
-	glShaderSource(*fragShaderID, 1, (const GLchar **)&fragShaderProgram, NULL);
-	glCompileShader(*fragShaderID);
-	glGetShaderiv(*fragShaderID, GL_COMPILE_STATUS, &shaderStatus);
-	if (shaderStatus == GL_FALSE)
-	{
-		glDeleteShader(*vertShaderID);
-		glDeleteShader(*fragShaderID);
-		NSLog(@"OpenGL Error - Failed to compile fragment shader.");
-		return shaderStatus;
-	}
-	
-	*programID = glCreateProgram();
-	if (*programID == 0)
-	{
-		glDeleteShader(*vertShaderID);
-		glDeleteShader(*fragShaderID);
-		NSLog(@"OpenGL Error - Failed to create shader program.");
-		return shaderStatus;
-	}
-	
-	glAttachShader(*programID, *vertShaderID);
-	glAttachShader(*programID, *fragShaderID);
-	
-	glBindAttribLocation(*programID, OGLVertexAttributeID_Position, "inPosition");
-	glBindAttribLocation(*programID, OGLVertexAttributeID_TexCoord0, "inTexCoord0");
-	
-	glLinkProgram(*programID);
-	glGetProgramiv(*programID, GL_LINK_STATUS, &shaderStatus);
-	if (shaderStatus == GL_FALSE)
-	{
-		glDeleteProgram(*programID);
-		glDeleteShader(*vertShaderID);
-		glDeleteShader(*fragShaderID);
-		NSLog(@"OpenGL Error - Failed to link shader program.");
-		return shaderStatus;
-	}
-	
-	glValidateProgram(*programID);
-	
-	return shaderStatus;
-}

Modified: trunk/desmume/src/cocoa/userinterface/preferencesWindowDelegate.mm
===================================================================
--- trunk/desmume/src/cocoa/userinterface/preferencesWindowDelegate.mm	2013-02-11 07:17:27 UTC (rev 4531)
+++ trunk/desmume/src/cocoa/userinterface/preferencesWindowDelegate.mm	2013-02-11 20:57:16 UTC (rev 4532)
@@ -81,7 +81,7 @@
 	
 	NSArray *imageRepArray = [videoFilterImage representations];
 	const NSBitmapImageRep *imageRep = [imageRepArray objectAtIndex:0];
-	RGB888ToRGBA8888Buffer((const uint32_t *)[imageRep bitmapData], (uint32_t *)[videoFilter srcBufferPtr], (64 * 64));
+	RGBA8888ForceOpaqueBuffer((const uint32_t *)[imageRep bitmapData], (uint32_t *)[videoFilter srcBufferPtr], (64 * 64));
 	[videoFilterImage release];
 	
 	BOOL useBilinear = [[NSUserDefaults standardUserDefaults] boolForKey:@"DisplayView_UseBilinearOutput"];
@@ -118,7 +118,7 @@
 		}
 	}
 	
-	RGB888ToRGBA8888Buffer((const uint32_t *)[videoFilter runFilter], (uint32_t *)[bilinearVideoFilter srcBufferPtr], (vfWidth * vfHeight));
+	RGBA8888ForceOpaqueBuffer((const uint32_t *)[videoFilter runFilter], (uint32_t *)[bilinearVideoFilter srcBufferPtr], (vfWidth * vfHeight));
 	[bindings setObject:[bilinearVideoFilter image] forKey:@"VideoFilterPreviewImage"];	
 		
 	iconVolumeFull = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_VolumeFull_16x16" ofType:@"png"]];
@@ -501,7 +501,7 @@
 		}
 	}
 	
-	RGB888ToRGBA8888Buffer((const uint32_t *)[videoFilter runFilter], (uint32_t *)[bilinearVideoFilter srcBufferPtr], (vfWidth * vfHeight));
+	RGBA8888ForceOpaqueBuffer((const uint32_t *)[videoFilter runFilter], (uint32_t *)[bilinearVideoFilter srcBufferPtr], (vfWidth * vfHeight));
 	NSBitmapImageRep *newPreviewImageRep = [bilinearVideoFilter bitmapImageRep];
 	
 	NSImage *videoFilterPreviewImage = [bindings objectForKey:@"VideoFilterPreviewImage"];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4533
          http://desmume.svn.sourceforge.net/desmume/?rev=4533&view=rev
Author:   rogerman
Date:     2013-02-13 23:46:02 +0000 (Wed, 13 Feb 2013)
Log Message:
-----------
Cocoa Port:
- Decouple window handling from the emulation control logic.
- Update copyright year on several files.
- Do various minor code cleanup.

Modified Paths:
--------------
    trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj
    trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj
    trunk/desmume/src/cocoa/Info (Debug).plist
    trunk/desmume/src/cocoa/Info.plist
    trunk/desmume/src/cocoa/cocoa_cheat.h
    trunk/desmume/src/cocoa/cocoa_core.h
    trunk/desmume/src/cocoa/cocoa_core.mm
    trunk/desmume/src/cocoa/cocoa_output.h
    trunk/desmume/src/cocoa/cocoa_output.mm
    trunk/desmume/src/cocoa/cocoa_rom.h
    trunk/desmume/src/cocoa/cocoa_rom.mm
    trunk/desmume/src/cocoa/cocoa_videofilter.h
    trunk/desmume/src/cocoa/sndOSX.h
    trunk/desmume/src/cocoa/translations/English.lproj/InfoPlist.strings
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.strings
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
    trunk/desmume/src/cocoa/userinterface/appDelegate.h
    trunk/desmume/src/cocoa/userinterface/appDelegate.mm
    trunk/desmume/src/cocoa/userinterface/displayView.h
    trunk/desmume/src/cocoa/userinterface/displayView.mm
    trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.h
    trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.mm

Added Paths:
-----------
    trunk/desmume/src/cocoa/cocoa_GPU.h
    trunk/desmume/src/cocoa/cocoa_GPU.mm
    trunk/desmume/src/cocoa/userinterface/EmuControllerDelegate.h
    trunk/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm

Modified: trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj
===================================================================
--- trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj	2013-02-11 20:57:16 UTC (rev 4532)
+++ trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj	2013-02-13 23:46:02 UTC (rev 4533)
@@ -52,6 +52,50 @@
 		AB0F29C714BE7213009ABC6F /* Icon_RotateCW_420x420.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0F29A314BE7213009ABC6F /* Icon_RotateCW_420x420.png */; };
 		AB0F29C814BE7213009ABC6F /* Icon_ShowHUD_420x420.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0F29A414BE7213009ABC6F /* Icon_ShowHUD_420x420.png */; };
 		AB0F29C914BE7213009ABC6F /* Icon_Speaker_420x420.png in Resources */ = {isa = PBXBuildFile; fileRef = AB0F29A514BE7213009ABC6F /* Icon_Speaker_420x420.png */; };
+		AB279D5916A4E6DE00ECC692 /* AAFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D4E16A4E6DE00ECC692 /* AAFilter.cpp */; };
+		AB279D5A16A4E6DE00ECC692 /* BPMDetect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D4F16A4E6DE00ECC692 /* BPMDetect.cpp */; };
+		AB279D5B16A4E6DE00ECC692 /* cpu_detect_x86.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5016A4E6DE00ECC692 /* cpu_detect_x86.cpp */; };
+		AB279D5C16A4E6DE00ECC692 /* FIFOSampleBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5116A4E6DE00ECC692 /* FIFOSampleBuffer.cpp */; };
+		AB279D5D16A4E6DE00ECC692 /* FIRFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5216A4E6DE00ECC692 /* FIRFilter.cpp */; };
+		AB279D5E16A4E6DE00ECC692 /* mmx_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5316A4E6DE00ECC692 /* mmx_optimized.cpp */; };
+		AB279D5F16A4E6DE00ECC692 /* PeakFinder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5416A4E6DE00ECC692 /* PeakFinder.cpp */; };
+		AB279D6016A4E6DE00ECC692 /* RateTransposer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5516A4E6DE00ECC692 /* RateTransposer.cpp */; };
+		AB279D6116A4E6DE00ECC692 /* SoundTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5616A4E6DE00ECC692 /* SoundTouch.cpp */; };
+		AB279D6216A4E6DE00ECC692 /* sse_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5716A4E6DE00ECC692 /* sse_optimized.cpp */; };
+		AB279D6316A4E6DE00ECC692 /* TDStretch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5816A4E6DE00ECC692 /* TDStretch.cpp */; };
+		AB279D6416A4E6DE00ECC692 /* AAFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D4E16A4E6DE00ECC692 /* AAFilter.cpp */; };
+		AB279D6516A4E6DE00ECC692 /* BPMDetect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D4F16A4E6DE00ECC692 /* BPMDetect.cpp */; };
+		AB279D6616A4E6DE00ECC692 /* cpu_detect_x86.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5016A4E6DE00ECC692 /* cpu_detect_x86.cpp */; };
+		AB279D6716A4E6DE00ECC692 /* FIFOSampleBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5116A4E6DE00ECC692 /* FIFOSampleBuffer.cpp */; };
+		AB279D6816A4E6DE00ECC692 /* FIRFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5216A4E6DE00ECC692 /* FIRFilter.cpp */; };
+		AB279D6916A4E6DE00ECC692 /* mmx_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5316A4E6DE00ECC692 /* mmx_optimized.cpp */; };
+		AB279D6A16A4E6DE00ECC692 /* PeakFinder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5416A4E6DE00ECC692 /* PeakFinder.cpp */; };
+		AB279D6B16A4E6DE00ECC692 /* RateTransposer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5516A4E6DE00ECC692 /* RateTransposer.cpp */; };
+		AB279D6C16A4E6DE00ECC692 /* SoundTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5616A4E6DE00ECC692 /* SoundTouch.cpp */; };
+		AB279D6D16A4E6DE00ECC692 /* sse_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5716A4E6DE00ECC692 /* sse_optimized.cpp */; };
+		AB279D6E16A4E6DE00ECC692 /* TDStretch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5816A4E6DE00ECC692 /* TDStretch.cpp */; };
+		AB279D6F16A4E6DE00ECC692 /* AAFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D4E16A4E6DE00ECC692 /* AAFilter.cpp */; };
+		AB279D7016A4E6DE00ECC692 /* BPMDetect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D4F16A4E6DE00ECC692 /* BPMDetect.cpp */; };
+		AB279D7116A4E6DE00ECC692 /* cpu_detect_x86.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5016A4E6DE00ECC692 /* cpu_detect_x86.cpp */; };
+		AB279D7216A4E6DE00ECC692 /* FIFOSampleBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5116A4E6DE00ECC692 /* FIFOSampleBuffer.cpp */; };
+		AB279D7316A4E6DE00ECC692 /* FIRFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5216A4E6DE00ECC692 /* FIRFilter.cpp */; };
+		AB279D7416A4E6DE00ECC692 /* mmx_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5316A4E6DE00ECC692 /* mmx_optimized.cpp */; };
+		AB279D7516A4E6DE00ECC692 /* PeakFinder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5416A4E6DE00ECC692 /* PeakFinder.cpp */; };
+		AB279D7616A4E6DE00ECC692 /* RateTransposer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5516A4E6DE00ECC692 /* RateTransposer.cpp */; };
+		AB279D7716A4E6DE00ECC692 /* SoundTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5616A4E6DE00ECC692 /* SoundTouch.cpp */; };
+		AB279D7816A4E6DE00ECC692 /* sse_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5716A4E6DE00ECC692 /* sse_optimized.cpp */; };
+		AB279D7916A4E6DE00ECC692 /* TDStretch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5816A4E6DE00ECC692 /* TDStretch.cpp */; };
+		AB279D7A16A4E6DE00ECC692 /* AAFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D4E16A4E6DE00ECC692 /* AAFilter.cpp */; };
+		AB279D7B16A4E6DE00ECC692 /* BPMDetect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D4F16A4E6DE00ECC692 /* BPMDetect.cpp */; };
+		AB279D7C16A4E6DE00ECC692 /* cpu_detect_x86.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5016A4E6DE00ECC692 /* cpu_detect_x86.cpp */; };
+		AB279D7D16A4E6DE00ECC692 /* FIFOSampleBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5116A4E6DE00ECC692 /* FIFOSampleBuffer.cpp */; };
+		AB279D7E16A4E6DE00ECC692 /* FIRFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5216A4E6DE00ECC692 /* FIRFilter.cpp */; };
+		AB279D7F16A4E6DE00ECC692 /* mmx_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5316A4E6DE00ECC692 /* mmx_optimized.cpp */; };
+		AB279D8016A4E6DE00ECC692 /* PeakFinder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5416A4E6DE00ECC692 /* PeakFinder.cpp */; };
+		AB279D8116A4E6DE00ECC692 /* RateTransposer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5516A4E6DE00ECC692 /* RateTransposer.cpp */; };
+		AB279D8216A4E6DE00ECC692 /* SoundTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5616A4E6DE00ECC692 /* SoundTouch.cpp */; };
+		AB279D8316A4E6DE00ECC692 /* sse_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5716A4E6DE00ECC692 /* sse_optimized.cpp */; };
+		AB279D8416A4E6DE00ECC692 /* TDStretch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB279D5816A4E6DE00ECC692 /* TDStretch.cpp */; };
 		AB2F3B7D15CF9C6000858373 /* KeyNames.plist in Resources */ = {isa = PBXBuildFile; fileRef = AB02475B13886BF300E9F9AB /* KeyNames.plist */; };
 		AB2F3B7E15CF9C6000858373 /* DefaultKeyMappings.plist in Resources */ = {isa = PBXBuildFile; fileRef = ABC719E1138CB25E002827A9 /* DefaultKeyMappings.plist */; };
 		AB2F3B7F15CF9C6000858373 /* DefaultUserPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = ABBC0F8C1394B1AA0028B6BD /* DefaultUserPrefs.plist */; };
@@ -124,7 +168,6 @@
 		AB2F3BC215CF9C6000858373 /* README.MAC in Resources */ = {isa = PBXBuildFile; fileRef = AB3ACC3D14C24D5400D7D192 /* README.MAC */; };
 		AB2F3BC315CF9C6000858373 /* AppIcon_FirmwareConfig.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB75226D14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns */; };
 		AB2F3BC515CF9C6000858373 /* ConvertUTF.c in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF1D1345ACBF00AF11D1 /* ConvertUTF.c */; };
-		AB2F3BC615CF9C6000858373 /* AAFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6513AF1D6D00502E1E /* AAFilter.cpp */; };
 		AB2F3BC715CF9C6000858373 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA11345AC8400AF11D1 /* addons.cpp */; };
 		AB2F3BC815CF9C6000858373 /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */; };
 		AB2F3BC915CF9C6000858373 /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA41345AC8400AF11D1 /* armcpu.cpp */; };
@@ -133,7 +176,6 @@
 		AB2F3BCC15CF9C6000858373 /* cheatSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA61345AC8400AF11D1 /* cheatSystem.cpp */; };
 		AB2F3BCD15CF9C6000858373 /* common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA81345AC8400AF11D1 /* common.cpp */; };
 		AB2F3BCE15CF9C6000858373 /* cp15.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA91345AC8400AF11D1 /* cp15.cpp */; };
-		AB2F3BCF15CF9C6000858373 /* cpu_detect_x86_gcc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6613AF1D6D00502E1E /* cpu_detect_x86_gcc.cpp */; };
 		AB2F3BD015CF9C6000858373 /* crc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF221345ACBF00AF11D1 /* crc.cpp */; };
 		AB2F3BD115CF9C6000858373 /* datetime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF1F1345ACBF00AF11D1 /* datetime.cpp */; };
 		AB2F3BD215CF9C6000858373 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEAB1345AC8400AF11D1 /* debug.cpp */; };
@@ -148,10 +190,8 @@
 		AB2F3BDB15CF9C6000858373 /* fatdir.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF391345ACBF00AF11D1 /* fatdir.cpp */; };
 		AB2F3BDC15CF9C6000858373 /* fatfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF3B1345ACBF00AF11D1 /* fatfile.cpp */; };
 		AB2F3BDD15CF9C6000858373 /* FIFO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEB01345AC8400AF11D1 /* FIFO.cpp */; };
-		AB2F3BDE15CF9C6000858373 /* FIFOSampleBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6813AF1D6D00502E1E /* FIFOSampleBuffer.cpp */; };
 		AB2F3BDF15CF9C6000858373 /* file_allocation_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF3D1345ACBF00AF11D1 /* file_allocation_table.cpp */; };
 		AB2F3BE015CF9C6000858373 /* filetime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF3F1345ACBF00AF11D1 /* filetime.cpp */; };
-		AB2F3BE115CF9C6000858373 /* FIRFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6913AF1D6D00502E1E /* FIRFilter.cpp */; };
 		AB2F3BE215CF9C6000858373 /* firmware.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEB11345AC8400AF11D1 /* firmware.cpp */; };
 		AB2F3BE315CF9C6000858373 /* fs-linux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEB21345AC8400AF11D1 /* fs-linux.cpp */; };
 		AB2F3BE415CF9C6000858373 /* gfx3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEB41345AC8400AF11D1 /* gfx3d.cpp */; };
@@ -167,13 +207,11 @@
 		AB2F3BEE15CF9C6000858373 /* md5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF4A1345ACBF00AF11D1 /* md5.cpp */; };
 		AB2F3BEF15CF9C6000858373 /* metaspu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF771345ACFA00AF11D1 /* metaspu.cpp */; };
 		AB2F3BF015CF9C6000858373 /* MMU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEBE1345AC8400AF11D1 /* MMU.cpp */; };
-		AB2F3BF115CF9C6000858373 /* mmx_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6A13AF1D6D00502E1E /* mmx_optimized.cpp */; };
 		AB2F3BF215CF9C6000858373 /* movie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEBF1345AC8400AF11D1 /* movie.cpp */; };
 		AB2F3BF315CF9C6000858373 /* NDSSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC01345AC8400AF11D1 /* NDSSystem.cpp */; };
 		AB2F3BF415CF9C6000858373 /* partition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF481345ACBF00AF11D1 /* partition.cpp */; };
 		AB2F3BF515CF9C6000858373 /* path.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC21345AC8400AF11D1 /* path.cpp */; };
 		AB2F3BF615CF9C6000858373 /* rasterize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC31345AC8400AF11D1 /* rasterize.cpp */; };
-		AB2F3BF715CF9C6000858373 /* RateTransposer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6B13AF1D6D00502E1E /* RateTransposer.cpp */; };
 		AB2F3BF815CF9C6000858373 /* readwrite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC41345AC8400AF11D1 /* readwrite.cpp */; };
 		AB2F3BF915CF9C6000858373 /* render3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC51345AC8400AF11D1 /* render3D.cpp */; };
 		AB2F3BFA15CF9C6000858373 /* ROMReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC61345AC8400AF11D1 /* ROMReader.cpp */; };
@@ -194,11 +232,8 @@
 		AB2F3C0915CF9C6000858373 /* slot2_rumblepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF0A1345AC9C00AF11D1 /* slot2_rumblepak.cpp */; };
 		AB2F3C0A15CF9C6000858373 /* sndOSX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD104141346652500AF11D1 /* sndOSX.cpp */; };
 		AB2F3C0B15CF9C6000858373 /* SndOut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF7A1345ACFA00AF11D1 /* SndOut.cpp */; };
-		AB2F3C0C15CF9C6000858373 /* SoundTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6C13AF1D6D00502E1E /* SoundTouch.cpp */; };
 		AB2F3C0D15CF9C6000858373 /* SPU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FECB1345AC8400AF11D1 /* SPU.cpp */; };
-		AB2F3C0E15CF9C6000858373 /* sse_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6D13AF1D6D00502E1E /* sse_optimized.cpp */; };
 		AB2F3C0F15CF9C6000858373 /* task.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF4C1345ACBF00AF11D1 /* task.cpp */; };
-		AB2F3C1015CF9C6000858373 /* TDStretch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6E13AF1D6D00502E1E /* TDStretch.cpp */; };
 		AB2F3C1115CF9C6000858373 /* texcache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FECC1345AC8400AF11D1 /* texcache.cpp */; };
 		AB2F3C1215CF9C6000858373 /* thumb_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FECD1345AC8400AF11D1 /* thumb_instructions.cpp */; };
 		AB2F3C1315CF9C6000858373 /* Timestretcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF9B1345ACFA00AF11D1 /* Timestretcher.cpp */; };
@@ -209,7 +244,6 @@
 		AB2F3C1815CF9C6000858373 /* version.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FECE1345AC8400AF11D1 /* version.cpp */; };
 		AB2F3C1915CF9C6000858373 /* vfat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF4F1345ACBF00AF11D1 /* vfat.cpp */; };
 		AB2F3C1A15CF9C6000858373 /* videofilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB817A35143EE2DB00A7DFE9 /* videofilter.cpp */; };
-		AB2F3C1B15CF9C6000858373 /* WavFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6F13AF1D6D00502E1E /* WavFile.cpp */; };
 		AB2F3C1C15CF9C6000858373 /* wifi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FECF1345AC8400AF11D1 /* wifi.cpp */; };
 		AB2F3C1D15CF9C6000858373 /* xstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF511345ACBF00AF11D1 /* xstring.cpp */; };
 		AB2F3C1E15CF9C6000858373 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = ABD104271346653B00AF11D1 /* main.m */; };
@@ -258,6 +292,14 @@
 		AB3ACC4614C24D5400D7D192 /* COPYING in Resources */ = {isa = PBXBuildFile; fileRef = AB3ACC3A14C24D5400D7D192 /* COPYING */; };
 		AB3ACC4714C24D5400D7D192 /* README in Resources */ = {isa = PBXBuildFile; fileRef = AB3ACC3B14C24D5400D7D192 /* README */; };
 		AB3ACC4914C24D5400D7D192 /* README.MAC in Resources */ = {isa = PBXBuildFile; fileRef = AB3ACC3D14C24D5400D7D192 /* README.MAC */; };
+		AB6A187C16C9951C00384EED /* EmuControllerDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB6A187B16C9951C00384EED /* EmuControllerDelegate.mm */; };
+		AB6A187D16C9951C00384EED /* EmuControllerDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB6A187B16C9951C00384EED /* EmuControllerDelegate.mm */; };
+		AB6A187E16C9951C00384EED /* EmuControllerDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB6A187B16C9951C00384EED /* EmuControllerDelegate.mm */; };
+		AB6A187F16C9951C00384EED /* EmuControllerDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB6A187B16C9951C00384EED /* EmuControllerDelegate.mm */; };
+		AB6A198316CAD66900384EED /* cocoa_GPU.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB6A198216CAD66900384EED /* cocoa_GPU.mm */; };
+		AB6A198416CAD66900384EED /* cocoa_GPU.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB6A198216CAD66900384EED /* cocoa_GPU.mm */; };
+		AB6A198516CAD66900384EED /* cocoa_GPU.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB6A198216CAD66900384EED /* cocoa_GPU.mm */; };
+		AB6A198616CAD66900384EED /* cocoa_GPU.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB6A198216CAD66900384EED /* cocoa_GPU.mm */; };
 		AB711ED21481C35F009011C8 /* KeyNames.plist in Resources */ = {isa = PBXBuildFile; fileRef = AB02475B13886BF300E9F9AB /* KeyNames.plist */; };
 		AB711ED31481C35F009011C8 /* DefaultKeyMappings.plist in Resources */ = {isa = PBXBuildFile; fileRef = ABC719E1138CB25E002827A9 /* DefaultKeyMappings.plist */; };
 		AB711ED81481C35F009011C8 /* DefaultUserPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = ABBC0F8C1394B1AA0028B6BD /* DefaultUserPrefs.plist */; };
@@ -351,15 +393,6 @@
 		AB711F501481C35F009011C8 /* slot1_retail_nand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */; };
 		AB711F511481C35F009011C8 /* SndOut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF7A1345ACFA00AF11D1 /* SndOut.cpp */; };
 		AB711F521481C35F009011C8 /* Timestretcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF9B1345ACFA00AF11D1 /* Timestretcher.cpp */; };
-		AB711F531481C35F009011C8 /* AAFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6513AF1D6D00502E1E /* AAFilter.cpp */; };
-		AB711F541481C35F009011C8 /* FIFOSampleBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6813AF1D6D00502E1E /* FIFOSampleBuffer.cpp */; };
-		AB711F551481C35F009011C8 /* FIRFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6913AF1D6D00502E1E /* FIRFilter.cpp */; };
-		AB711F561481C35F009011C8 /* mmx_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6A13AF1D6D00502E1E /* mmx_optimized.cpp */; };
-		AB711F571481C35F009011C8 /* RateTransposer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6B13AF1D6D00502E1E /* RateTransposer.cpp */; };
-		AB711F581481C35F009011C8 /* SoundTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6C13AF1D6D00502E1E /* SoundTouch.cpp */; };
-		AB711F591481C35F009011C8 /* sse_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6D13AF1D6D00502E1E /* sse_optimized.cpp */; };
-		AB711F5A1481C35F009011C8 /* TDStretch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6E13AF1D6D00502E1E /* TDStretch.cpp */; };
-		AB711F5B1481C35F009011C8 /* WavFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6F13AF1D6D00502E1E /* WavFile.cpp */; };
 		AB711F5C1481C35F009011C8 /* datetime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF1F1345ACBF00AF11D1 /* datetime.cpp */; };
 		AB711F5D1481C35F009011C8 /* fs-linux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEB21345AC8400AF11D1 /* fs-linux.cpp */; };
 		AB711F5E1481C35F009011C8 /* cocoa_mic.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD9A46413DB99B300777194 /* cocoa_mic.mm */; };
@@ -373,7 +406,6 @@
 		AB711F6D1481C35F009011C8 /* videofilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB817A35143EE2DB00A7DFE9 /* videofilter.cpp */; };
 		AB711F6E1481C35F009011C8 /* cocoa_videofilter.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE5DFE4143FB1DA00835AD8 /* cocoa_videofilter.mm */; };
 		AB711F701481C35F009011C8 /* cocoa_cheat.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABA6574A14511EC90077E5E9 /* cocoa_cheat.mm */; };
-		AB711F711481C35F009011C8 /* cpu_detect_x86_gcc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6613AF1D6D00502E1E /* cpu_detect_x86_gcc.cpp */; };
 		AB711F721481C35F009011C8 /* cocoa_hid.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB350B691478A5B3007165AC /* cocoa_hid.mm */; };
 		AB711F741481C35F009011C8 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
 		AB711F751481C35F009011C8 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABC570D0134431CE00E7B0B1 /* AudioUnit.framework */; };
@@ -453,7 +485,6 @@
 		AB73A9B01507C9F500A310C8 /* README.MAC in Resources */ = {isa = PBXBuildFile; fileRef = AB3ACC3D14C24D5400D7D192 /* README.MAC */; };
 		AB73A9B11507C9F500A310C8 /* AppIcon_FirmwareConfig.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB75226D14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns */; };
 		AB73A9B31507C9F500A310C8 /* ConvertUTF.c in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF1D1345ACBF00AF11D1 /* ConvertUTF.c */; };
-		AB73A9B41507C9F500A310C8 /* AAFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6513AF1D6D00502E1E /* AAFilter.cpp */; };
 		AB73A9B51507C9F500A310C8 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA11345AC8400AF11D1 /* addons.cpp */; };
 		AB73A9B61507C9F500A310C8 /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */; };
 		AB73A9B71507C9F500A310C8 /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA41345AC8400AF11D1 /* armcpu.cpp */; };
@@ -462,7 +493,6 @@
 		AB73A9BA1507C9F500A310C8 /* cheatSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA61345AC8400AF11D1 /* cheatSystem.cpp */; };
 		AB73A9BB1507C9F500A310C8 /* common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA81345AC8400AF11D1 /* common.cpp */; };
 		AB73A9BC1507C9F500A310C8 /* cp15.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA91345AC8400AF11D1 /* cp15.cpp */; };
-		AB73A9BD1507C9F500A310C8 /* cpu_detect_x86_gcc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6613AF1D6D00502E1E /* cpu_detect_x86_gcc.cpp */; };
 		AB73A9BE1507C9F500A310C8 /* crc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF221345ACBF00AF11D1 /* crc.cpp */; };
 		AB73A9BF1507C9F500A310C8 /* datetime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF1F1345ACBF00AF11D1 /* datetime.cpp */; };
 		AB73A9C01507C9F500A310C8 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEAB1345AC8400AF11D1 /* debug.cpp */; };
@@ -477,10 +507,8 @@
 		AB73A9C91507C9F500A310C8 /* fatdir.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF391345ACBF00AF11D1 /* fatdir.cpp */; };
 		AB73A9CA1507C9F500A310C8 /* fatfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF3B1345ACBF00AF11D1 /* fatfile.cpp */; };
 		AB73A9CB1507C9F500A310C8 /* FIFO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEB01345AC8400AF11D1 /* FIFO.cpp */; };
-		AB73A9CC1507C9F500A310C8 /* FIFOSampleBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6813AF1D6D00502E1E /* FIFOSampleBuffer.cpp */; };
 		AB73A9CD1507C9F500A310C8 /* file_allocation_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF3D1345ACBF00AF11D1 /* file_allocation_table.cpp */; };
 		AB73A9CE1507C9F500A310C8 /* filetime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF3F1345ACBF00AF11D1 /* filetime.cpp */; };
-		AB73A9CF1507C9F500A310C8 /* FIRFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6913AF1D6D00502E1E /* FIRFilter.cpp */; };
 		AB73A9D01507C9F500A310C8 /* firmware.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEB11345AC8400AF11D1 /* firmware.cpp */; };
 		AB73A9D11507C9F500A310C8 /* fs-linux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEB21345AC8400AF11D1 /* fs-linux.cpp */; };
 		AB73A9D21507C9F500A310C8 /* gfx3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEB41345AC8400AF11D1 /* gfx3d.cpp */; };
@@ -496,13 +524,11 @@
 		AB73A9DC1507C9F500A310C8 /* md5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF4A1345ACBF00AF11D1 /* md5.cpp */; };
 		AB73A9DD1507C9F500A310C8 /* metaspu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF771345ACFA00AF11D1 /* metaspu.cpp */; };
 		AB73A9DE1507C9F500A310C8 /* MMU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEBE1345AC8400AF11D1 /* MMU.cpp */; };
-		AB73A9DF1507C9F500A310C8 /* mmx_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6A13AF1D6D00502E1E /* mmx_optimized.cpp */; };
 		AB73A9E01507C9F500A310C8 /* movie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEBF1345AC8400AF11D1 /* movie.cpp */; };
 		AB73A9E11507C9F500A310C8 /* NDSSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC01345AC8400AF11D1 /* NDSSystem.cpp */; };
 		AB73A9E21507C9F500A310C8 /* partition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF481345ACBF00AF11D1 /* partition.cpp */; };
 		AB73A9E31507C9F500A310C8 /* path.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC21345AC8400AF11D1 /* path.cpp */; };
 		AB73A9E41507C9F500A310C8 /* rasterize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC31345AC8400AF11D1 /* rasterize.cpp */; };
-		AB73A9E51507C9F500A310C8 /* RateTransposer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6B13AF1D6D00502E1E /* RateTransposer.cpp */; };
 		AB73A9E61507C9F500A310C8 /* readwrite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC41345AC8400AF11D1 /* readwrite.cpp */; };
 		AB73A9E71507C9F500A310C8 /* render3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC51345AC8400AF11D1 /* render3D.cpp */; };
 		AB73A9E81507C9F500A310C8 /* ROMReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC61345AC8400AF11D1 /* ROMReader.cpp */; };
@@ -523,11 +549,8 @@
 		AB73A9F71507C9F500A310C8 /* slot2_rumblepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF0A1345AC9C00AF11D1 /* slot2_rumblepak.cpp */; };
 		AB73A9F81507C9F500A310C8 /* sndOSX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD104141346652500AF11D1 /* sndOSX.cpp */; };
 		AB73A9F91507C9F500A310C8 /* SndOut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF7A1345ACFA00AF11D1 /* SndOut.cpp */; };
-		AB73A9FA1507C9F500A310C8 /* SoundTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6C13AF1D6D00502E1E /* SoundTouch.cpp */; };
 		AB73A9FB1507C9F500A310C8 /* SPU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FECB1345AC8400AF11D1 /* SPU.cpp */; };
-		AB73A9FC1507C9F500A310C8 /* sse_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6D13AF1D6D00502E1E /* sse_optimized.cpp */; };
 		AB73A9FD1507C9F500A310C8 /* task.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF4C1345ACBF00AF11D1 /* task.cpp */; };
-		AB73A9FE1507C9F500A310C8 /* TDStretch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6E13AF1D6D00502E1E /* TDStretch.cpp */; };
 		AB73A9FF1507C9F500A310C8 /* texcache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FECC1345AC8400AF11D1 /* texcache.cpp */; };
 		AB73AA001507C9F500A310C8 /* thumb_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FECD1345AC8400AF11D1 /* thumb_instructions.cpp */; };
 		AB73AA011507C9F500A310C8 /* Timestretcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF9B1345ACFA00AF11D1 /* Timestretcher.cpp */; };
@@ -538,7 +561,6 @@
 		AB73AA061507C9F500A310C8 /* version.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FECE1345AC8400AF11D1 /* version.cpp */; };
 		AB73AA071507C9F500A310C8 /* vfat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF4F1345ACBF00AF11D1 /* vfat.cpp */; };
 		AB73AA081507C9F500A310C8 /* videofilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB817A35143EE2DB00A7DFE9 /* videofilter.cpp */; };
-		AB73AA091507C9F500A310C8 /* WavFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6F13AF1D6D00502E1E /* WavFile.cpp */; };
 		AB73AA0A1507C9F500A310C8 /* wifi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FECF1345AC8400AF11D1 /* wifi.cpp */; };
 		AB73AA0B1507C9F500A310C8 /* xstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF511345ACBF00AF11D1 /* xstring.cpp */; };
 		AB73AA0C1507C9F500A310C8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = ABD104271346653B00AF11D1 /* main.m */; };
@@ -657,7 +679,6 @@
 		ABAD0FB815ACE7A00000EC47 /* README.MAC in Resources */ = {isa = PBXBuildFile; fileRef = AB3ACC3D14C24D5400D7D192 /* README.MAC */; };
 		ABAD0FB915ACE7A00000EC47 /* AppIcon_FirmwareConfig.icns in Resources */ = {isa = PBXBuildFile; fileRef = AB75226D14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns */; };
 		ABAD0FBB15ACE7A00000EC47 /* ConvertUTF.c in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF1D1345ACBF00AF11D1 /* ConvertUTF.c */; };
-		ABAD0FBC15ACE7A00000EC47 /* AAFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6513AF1D6D00502E1E /* AAFilter.cpp */; };
 		ABAD0FBD15ACE7A00000EC47 /* addons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA11345AC8400AF11D1 /* addons.cpp */; };
 		ABAD0FBE15ACE7A00000EC47 /* arm_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA31345AC8400AF11D1 /* arm_instructions.cpp */; };
 		ABAD0FBF15ACE7A00000EC47 /* armcpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA41345AC8400AF11D1 /* armcpu.cpp */; };
@@ -666,7 +687,6 @@
 		ABAD0FC215ACE7A00000EC47 /* cheatSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA61345AC8400AF11D1 /* cheatSystem.cpp */; };
 		ABAD0FC315ACE7A00000EC47 /* common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA81345AC8400AF11D1 /* common.cpp */; };
 		ABAD0FC415ACE7A00000EC47 /* cp15.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEA91345AC8400AF11D1 /* cp15.cpp */; };
-		ABAD0FC515ACE7A00000EC47 /* cpu_detect_x86_gcc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6613AF1D6D00502E1E /* cpu_detect_x86_gcc.cpp */; };
 		ABAD0FC615ACE7A00000EC47 /* crc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF221345ACBF00AF11D1 /* crc.cpp */; };
 		ABAD0FC715ACE7A00000EC47 /* datetime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF1F1345ACBF00AF11D1 /* datetime.cpp */; };
 		ABAD0FC815ACE7A00000EC47 /* debug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEAB1345AC8400AF11D1 /* debug.cpp */; };
@@ -681,10 +701,8 @@
 		ABAD0FD115ACE7A00000EC47 /* fatdir.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF391345ACBF00AF11D1 /* fatdir.cpp */; };
 		ABAD0FD215ACE7A00000EC47 /* fatfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF3B1345ACBF00AF11D1 /* fatfile.cpp */; };
 		ABAD0FD315ACE7A00000EC47 /* FIFO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEB01345AC8400AF11D1 /* FIFO.cpp */; };
-		ABAD0FD415ACE7A00000EC47 /* FIFOSampleBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6813AF1D6D00502E1E /* FIFOSampleBuffer.cpp */; };
 		ABAD0FD515ACE7A00000EC47 /* file_allocation_table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF3D1345ACBF00AF11D1 /* file_allocation_table.cpp */; };
 		ABAD0FD615ACE7A00000EC47 /* filetime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF3F1345ACBF00AF11D1 /* filetime.cpp */; };
-		ABAD0FD715ACE7A00000EC47 /* FIRFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6913AF1D6D00502E1E /* FIRFilter.cpp */; };
 		ABAD0FD815ACE7A00000EC47 /* firmware.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEB11345AC8400AF11D1 /* firmware.cpp */; };
 		ABAD0FD915ACE7A00000EC47 /* fs-linux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEB21345AC8400AF11D1 /* fs-linux.cpp */; };
 		ABAD0FDA15ACE7A00000EC47 /* gfx3d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEB41345AC8400AF11D1 /* gfx3d.cpp */; };
@@ -700,13 +718,11 @@
 		ABAD0FE415ACE7A00000EC47 /* md5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF4A1345ACBF00AF11D1 /* md5.cpp */; };
 		ABAD0FE515ACE7A00000EC47 /* metaspu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF771345ACFA00AF11D1 /* metaspu.cpp */; };
 		ABAD0FE615ACE7A00000EC47 /* MMU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEBE1345AC8400AF11D1 /* MMU.cpp */; };
-		ABAD0FE715ACE7A00000EC47 /* mmx_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6A13AF1D6D00502E1E /* mmx_optimized.cpp */; };
 		ABAD0FE815ACE7A00000EC47 /* movie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEBF1345AC8400AF11D1 /* movie.cpp */; };
 		ABAD0FE915ACE7A00000EC47 /* NDSSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC01345AC8400AF11D1 /* NDSSystem.cpp */; };
 		ABAD0FEA15ACE7A00000EC47 /* partition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF481345ACBF00AF11D1 /* partition.cpp */; };
 		ABAD0FEB15ACE7A00000EC47 /* path.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC21345AC8400AF11D1 /* path.cpp */; };
 		ABAD0FEC15ACE7A00000EC47 /* rasterize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC31345AC8400AF11D1 /* rasterize.cpp */; };
-		ABAD0FED15ACE7A00000EC47 /* RateTransposer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6B13AF1D6D00502E1E /* RateTransposer.cpp */; };
 		ABAD0FEE15ACE7A00000EC47 /* readwrite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC41345AC8400AF11D1 /* readwrite.cpp */; };
 		ABAD0FEF15ACE7A00000EC47 /* render3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC51345AC8400AF11D1 /* render3D.cpp */; };
 		ABAD0FF015ACE7A00000EC47 /* ROMReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC61345AC8400AF11D1 /* ROMReader.cpp */; };
@@ -727,11 +743,8 @@
 		ABAD0FFF15ACE7A00000EC47 /* slot2_rumblepak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF0A1345AC9C00AF11D1 /* slot2_rumblepak.cpp */; };
 		ABAD100015ACE7A00000EC47 /* sndOSX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD104141346652500AF11D1 /* sndOSX.cpp */; };
 		ABAD100115ACE7A00000EC47 /* SndOut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF7A1345ACFA00AF11D1 /* SndOut.cpp */; };
-		ABAD100215ACE7A00000EC47 /* SoundTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6C13AF1D6D00502E1E /* SoundTouch.cpp */; };
 		ABAD100315ACE7A00000EC47 /* SPU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FECB1345AC8400AF11D1 /* SPU.cpp */; };
-		ABAD100415ACE7A00000EC47 /* sse_optimized.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6D13AF1D6D00502E1E /* sse_optimized.cpp */; };
 		ABAD100515ACE7A00000EC47 /* task.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF4C1345ACBF00AF11D1 /* task.cpp */; };
-		ABAD100615ACE7A00000EC47 /* TDStretch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6E13AF1D6D00502E1E /* TDStretch.cpp */; };
 		ABAD100715ACE7A00000EC47 /* texcache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FECC1345AC8400AF11D1 /* texcache.cpp */; };
 		ABAD100815ACE7A00000EC47 /* thumb_instructions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FECD1345AC8400AF11D1 /* thumb_instructions.cpp */; };
 		ABAD100915ACE7A00000EC47 /* Timestretcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF9B1345ACFA00AF11D1 /* Timestretcher.cpp */; };
@@ -742,7 +755,6 @@
 		ABAD100E15ACE7A00000EC47 /* version.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FECE1345AC8400AF11D1 /* version.cpp */; };
 		ABAD100F15ACE7A00000EC47 /* vfat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF4F1345ACBF00AF11D1 /* vfat.cpp */; };
 		ABAD101015ACE7A00000EC47 /* videofilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB817A35143EE2DB00A7DFE9 /* videofilter.cpp */; };
-		ABAD101115ACE7A00000EC47 /* WavFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABAD3E6F13AF1D6D00502E1E /* WavFile.cpp */; };
 		ABAD101215ACE7A00000EC47 /* wifi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FECF1345AC8400AF11D1 /* wifi.cpp */; };
 		ABAD101315ACE7A00000EC47 /* xstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FF511345ACBF00AF11D1 /* xstring.cpp */; };
 		ABAD101415ACE7A00000EC47 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = ABD104271346653B00AF11D1 /* main.m */; };
@@ -913,6 +925,29 @@
 		AB0F29A314BE7213009ABC6F /* Icon_RotateCW_420x420.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_RotateCW_420x420.png; path = images/Icon_RotateCW_420x420.png; sourceTree = "<group>"; };
 		AB0F29A414BE7213009ABC6F /* Icon_ShowHUD_420x420.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_ShowHUD_420x420.png; path = images/Icon_ShowHUD_420x420.png; sourceTree = "<group>"; };
 		AB0F29A514BE7213009ABC6F /* Icon_Speaker_420x420.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_Speaker_420x420.png; path = images/Icon_Speaker_420x420.png; sourceTree = "<group>"; };
+		AB279D4216A4E6DE00ECC692 /* AAFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AAFilter.h; sourceTree = "<group>"; };
+		AB279D4316A4E6DE00ECC692 /* BPMDetect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BPMDetect.h; sourceTree = "<group>"; };
+		AB279D4416A4E6DE00ECC692 /* cpu_detect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpu_detect.h; sourceTree = "<group>"; };
+		AB279D4516A4E6DE00ECC692 /* FIFOSampleBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIFOSampleBuffer.h; sourceTree = "<group>"; };
+		AB279D4616A4E6DE00ECC692 /* FIFOSamplePipe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIFOSamplePipe.h; sourceTree = "<group>"; };
+		AB279D4716A4E6DE00ECC692 /* FIRFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRFilter.h; sourceTree = "<group>"; };
+		AB279D4816A4E6DE00ECC692 /* PeakFinder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PeakFinder.h; sourceTree = "<group>"; };
+		AB279D4916A4E6DE00ECC692 /* RateTransposer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RateTransposer.h; sourceTree = "<group>"; };
+		AB279D4A16A4E6DE00ECC692 /* soundtouch_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = soundtouch_config.h; sourceTree = "<group>"; };
+		AB279D4B16A4E6DE00ECC692 /* SoundTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoundTouch.h; sourceTree = "<group>"; };
+		AB279D4C16A4E6DE00ECC692 /* STTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = STTypes.h; sourceTree = "<group>"; };
+		AB279D4D16A4E6DE00ECC692 /* TDStretch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDStretch.h; sourceTree = "<group>"; };
+		AB279D4E16A4E6DE00ECC692 /* AAFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AAFilter.cpp; sourceTree = "<group>"; };
+		AB279D4F16A4E6DE00ECC692 /* BPMDetect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BPMDetect.cpp; sourceTree = "<group>"; };
+		AB279D5016A4E6DE00ECC692 /* cpu_detect_x86.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cpu_detect_x86.cpp; sourceTree = "<group>"; };
+		AB279D5116A4E6DE00ECC692 /* FIFOSampleBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FIFOSampleBuffer.cpp; sourceTree = "<group>"; };
+		AB279D5216A4E6DE00ECC692 /* FIRFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FIRFilter.cpp; sourceTree = "<group>"; };
+		AB279D5316A4E6DE00ECC692 /* mmx_optimized.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mmx_optimized.cpp; sourceTree = "<group>"; };
+		AB279D5416A4E6DE00ECC692 /* PeakFinder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PeakFinder.cpp; sourceTree = "<group>"; };
+		AB279D5516A4E6DE00ECC692 /* RateTransposer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RateTransposer.cpp; sourceTree = "<group>"; };
+		AB279D5616A4E6DE00ECC692 /* SoundTouch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SoundTouch.cpp; sourceTree = "<group>"; };
+		AB279D5716A4E6DE00ECC692 /* sse_optimized.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sse_optimized.cpp; sourceTree = "<group>"; };
+		AB279D5816A4E6DE00ECC692 /* TDStretch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TDStretch.cpp; sourceTree = "<group>"; };
 		AB2F3C4515CF9C6000858373 /* DeSmuME (PPC).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DeSmuME (PPC).app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		AB350B681478A5B3007165AC /* cocoa_hid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_hid.h; sourceTree = "<group>"; };
 		AB350B691478A5B3007165AC /* cocoa_hid.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_hid.mm; sourceTree = "<group>"; };
@@ -940,6 +975,10 @@
 		AB58F32B1364F44B0074C376 /* cocoa_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_file.h; sourceTree = "<group>"; };
 		AB58F32C1364F44B0074C376 /* cocoa_file.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_file.mm; sourceTree = "<group>"; };
 		AB64987B13ECC73800EE7DD2 /* FileTypeInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = FileTypeInfo.plist; sourceTree = "<group>"; };
+		AB6A187A16C9951C00384EED /* EmuControllerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmuControllerDelegate.h; sourceTree = "<group>"; };
+		AB6A187B16C9951C00384EED /* EmuControllerDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EmuControllerDelegate.mm; sourceTree = "<group>"; };
+		AB6A198116CAD66900384EED /* cocoa_GPU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_GPU.h; sourceTree = "<group>"; };
+		AB6A198216CAD66900384EED /* cocoa_GPU.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_GPU.mm; sourceTree = "<group>"; };
 		AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_retail_nand.cpp; sourceTree = "<group>"; };
 		AB711F7F1481C35F009011C8 /* DeSmuME.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DeSmuME.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		AB73AA331507C9F500A310C8 /* DeSmuME.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DeSmuME.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -961,27 +1000,6 @@
 		ABA6574914511EC90077E5E9 /* cocoa_cheat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_cheat.h; sourceTree = "<group>"; };
 		ABA6574A14511EC90077E5E9 /* cocoa_cheat.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_cheat.mm; sourceTree = "<group>"; };
 		ABAD104915ACE7A00000EC47 /* DeSmuME (PPC).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DeSmuME (PPC).app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		ABAD3E5913AF1D6D00502E1E /* AAFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AAFilter.h; sourceTree = "<group>"; };
-		ABAD3E5A13AF1D6D00502E1E /* BPMDetect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BPMDetect.h; sourceTree = "<group>"; };
-		ABAD3E5B13AF1D6D00502E1E /* cpu_detect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpu_detect.h; sourceTree = "<group>"; };
-		ABAD3E5C13AF1D6D00502E1E /* FIFOSampleBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIFOSampleBuffer.h; sourceTree = "<group>"; };
-		ABAD3E5D13AF1D6D00502E1E /* FIFOSamplePipe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIFOSamplePipe.h; sourceTree = "<group>"; };
-		ABAD3E5E13AF1D6D00502E1E /* FIRFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRFilter.h; sourceTree = "<group>"; };
-		ABAD3E5F13AF1D6D00502E1E /* RateTransposer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RateTransposer.h; sourceTree = "<group>"; };
-		ABAD3E6013AF1D6D00502E1E /* SoundTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoundTouch.h; sourceTree = "<group>"; };
-		ABAD3E6113AF1D6D00502E1E /* STTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = STTypes.h; sourceTree = "<group>"; };
-		ABAD3E6213AF1D6D00502E1E /* TDStretch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TDStretch.h; sourceTree = "<group>"; };
-		ABAD3E6313AF1D6D00502E1E /* WavFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WavFile.h; sourceTree = "<group>"; };
-		ABAD3E6513AF1D6D00502E1E /* AAFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AAFilter.cpp; sourceTree = "<group>"; };
-		ABAD3E6613AF1D6D00502E1E /* cpu_detect_x86_gcc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cpu_detect_x86_gcc.cpp; sourceTree = "<group>"; };
-		ABAD3E6813AF1D6D00502E1E /* FIFOSampleBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FIFOSampleBuffer.cpp; sourceTree = "<group>"; };
-		ABAD3E6913AF1D6D00502E1E /* FIRFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FIRFilter.cpp; sourceTree = "<group>"; };
-		ABAD3E6A13AF1D6D00502E1E /* mmx_optimized.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mmx_optimized.cpp; sourceTree = "<group>"; };
-		ABAD3E6B13AF1D6D00502E1E /* RateTransposer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RateTransposer.cpp; sourceTree = "<group>"; };
-		ABAD3E6C13AF1D6D00502E1E /* SoundTouch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SoundTouch.cpp; sourceTree = "<group>"; };
-		ABAD3E6D13AF1D6D00502E1E /* sse_optimized.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sse_optimized.cpp; sourceTree = "<group>"; };
-		ABAD3E6E13AF1D6D00502E1E /* TDStretch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TDStretch.cpp; sourceTree = "<group>"; };
-		ABAD3E6F13AF1D6D00502E1E /* WavFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WavFile.cpp; sourceTree = "<group>"; };
 		ABB97873144E89CC00793FA3 /* Icon_ActionReplay_32x32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_ActionReplay_32x32.png; path = Images/Icon_ActionReplay_32x32.png; sourceTree = "<group>"; };
 		ABB97874144E89CC00793FA3 /* Icon_CodeBreaker_32x32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_CodeBreaker_32x32.png; path = Images/Icon_CodeBreaker_32x32.png; sourceTree = "<group>"; };
 		ABB97875144E89CC00793FA3 /* Icon_DeSmuME_32x32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon_DeSmuME_32x32.png; path = Images/Icon_DeSmuME_32x32.png; sourceTree = "<group>"; };
@@ -1353,6 +1371,7 @@
 				AB58F32B1364F44B0074C376 /* cocoa_file.h */,
 				ABE7F53C13EE1C7900FD3A71 /* cocoa_firmware.h */,
 				AB9971CE134EDA0800531BA7 /* cocoa_globals.h */,
+				AB6A198116CAD66900384EED /* cocoa_GPU.h */,
 				AB350B681478A5B3007165AC /* cocoa_hid.h */,
 				ABD103FF1346652500AF11D1 /* cocoa_input.h */,
 				ABD9A46313DB99B300777194 /* cocoa_mic.h */,
@@ -1367,6 +1386,7 @@
 				ABD104121346652500AF11D1 /* cocoa_core.mm */,
 				AB58F32C1364F44B0074C376 /* cocoa_file.mm */,
 				ABE7F53D13EE1C7900FD3A71 /* cocoa_firmware.mm */,
+				AB6A198216CAD66900384EED /* cocoa_GPU.mm */,
 				AB350B691478A5B3007165AC /* cocoa_hid.mm */,
 				ABD104111346652500AF11D1 /* cocoa_input.mm */,
 				ABD9A46413DB99B300777194 /* cocoa_mic.mm */,
@@ -1471,6 +1491,7 @@
 				AB3ACB6614C2361100D7D192 /* appDelegate.h */,
 				AB3ACB6814C2361100D7D192 /* cheatWindowDelegate.h */,
 				AB3ACB6A14C2361100D7D192 /* displayView.h */,
+				AB6A187A16C9951C00384EED /* EmuControllerDelegate.h */,
 				AB3ACB6C14C2361100D7D192 /* emuWindowDelegate.h */,
 				AB3ACB6E14C2361100D7D192 /* inputPrefsView.h */,
 				AB3ACB7014C2361100D7D192 /* preferencesWindowDelegate.h */,
@@ -1478,6 +1499,7 @@
 				AB3ACB6714C2361100D7D192 /* appDelegate.mm */,
 				AB3ACB6914C2361100D7D192 /* cheatWindowDelegate.mm */,
 				AB3ACB6B14C2361100D7D192 /* displayView.mm */,
+				AB6A187B16C9951C00384EED /* EmuControllerDelegate.mm */,
 				AB3ACB6D14C2361100D7D192 /* emuWindowDelegate.mm */,
 				AB3ACB6F14C2361100D7D192 /* inputPrefsView.mm */,
 				AB3ACB7114C2361100D7D192 /* preferencesWindowDelegate.mm */,
@@ -1810,27 +1832,29 @@
 		ABD1FF7C1345ACFA00AF11D1 /* SoundTouch */ = {
 			isa = PBXGroup;
 			children = (
-				ABAD3E5913AF1D6D00502E1E /* AAFilter.h */,
-				ABAD3E5A13AF1D6D00502E1E /* BPMDetect.h */,
-				ABAD3E5B13AF1D6D00502E1E /* cpu_detect.h */,
-				ABAD3E5C13AF1D6D00502E1E /* FIFOSampleBuffer.h */,
-				ABAD3E5D13AF1D6D00502E1E /* FIFOSamplePipe.h */,
-				ABAD3E5E13AF1D6D00502E1E /* FIRFilter.h */,
-				ABAD3E5F13AF1D6D00502E1E /* RateTransposer.h */,
-				ABAD3E6013AF1D6D00502E1E /* SoundTouch.h */,
-				ABAD3E6113AF1D6D00502E1E /* STTypes.h */,
-				ABAD3E6213AF1D6D00502E1E /* TDStretch.h */,
-				ABAD3E6313AF1D6D00502E1E /* WavFile.h */,
-				ABAD3E6513AF1D6D00502E1E /* AAFilter.cpp */,
-				ABAD3E6613AF1D6D00502E1E /* cpu_detect_x86_gcc.cpp */,
-				ABAD3E6813AF1D6D00502E1E /* FIFOSampleBuffer.cpp */,
-				ABAD3E6913AF1D6D00502E1E /* FIRFilter.cpp */,
-				ABAD3E6A13AF1D6D00502E1E /* mmx_optimized.cpp */,
-				ABAD3E6B13AF1D6D00502E1E /* RateTransposer.cpp */,
-				ABAD3E6C13AF1D6D00502E1E /* SoundTouch.cpp */,
-				ABAD3E6D13AF1D6D00502E1E /* sse_optimized.cpp */,
-				ABAD3E6E13AF1D6D00502E1E /* TDStretch.cpp */,
-				ABAD3E6F13AF1D6D00502E1E /* WavFile.cpp */,
+				AB279D4E16A4E6DE00ECC692 /* AAFilter.cpp */,
+				AB279D4F16A4E6DE00ECC692 /* BPMDetect.cpp */,
+				AB279D5016A4E6DE00ECC692 /* cpu_detect_x86.cpp */,
+				AB279D5116A4E6DE00ECC692 /* FIFOSampleBuffer.cpp */,
+				AB279D5216A4E6DE00ECC692 /* FIRFilter.cpp */,
+				AB279D5316A4E6DE00ECC692 /* mmx_optimized.cpp */,
+				AB279D5416A4E6DE00ECC692 /* PeakFinder.cpp */,
+				AB279D5516A4E6DE00ECC692 /* RateTransposer.cpp */,
+				AB279D5616A4E6DE00ECC692 /* SoundTouch.cpp */,
+				AB279D5716A4E6DE00ECC692 /* sse_optimized.cpp */,
+				AB279D5816A4E6DE00ECC692 /* TDStretch.cpp */,
+				AB279D4216A4E6DE00ECC692 /* AAFilter.h */,
+				AB279D4316A4E6DE00ECC692 /* BPMDetect.h */,
+				AB279D4416A4E6DE00ECC692 /* cpu_detect.h */,
+				AB279D4516A4E6DE00ECC692 /* FIFOSampleBuffer.h */,
+				AB279D4616A4E6DE00ECC692 /* FIFOSamplePipe.h */,
+				AB279D4716A4E6DE00ECC692 /* FIRFilter.h */,
+				AB279D4816A4E6DE00ECC692 /* PeakFinder.h */,
+				AB279D4916A4E6DE00ECC692 /* RateTransposer.h */,
+				AB279D4B16A4E6DE00ECC692 /* SoundTouch.h */,
+				AB279D4A16A4E6DE00ECC692 /* soundtouch_config.h */,
+				AB279D4C16A4E6DE00ECC692 /* STTypes.h */,
+				AB279D4D16A4E6DE00ECC692 /* TDStretch.h */,
 			);
 			path = SoundTouch;
 			sourceTree = "<group>";
@@ -2505,7 +2529,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				AB2F3BC515CF9C6000858373 /* ConvertUTF.c in Sources */,
-				AB2F3BC615CF9C6000858373 /* AAFilter.cpp in Sources */,
 				AB2F3BC715CF9C6000858373 /* addons.cpp in Sources */,
 				AB2F3BC815CF9C6000858373 /* arm_instructions.cpp in Sources */,
 				AB2F3BC915CF9C6000858373 /* armcpu.cpp in Sources */,
@@ -2514,7 +2537,6 @@
 				AB2F3BCC15CF9C6000858373 /* cheatSystem.cpp in Sources */,
 				AB2F3BCD15CF9C6000858373 /* common.cpp in Sources */,
 				AB2F3BCE15CF9C6000858373 /* cp15.cpp in Sources */,
-				AB2F3BCF15CF9C6000858373 /* cpu_detect_x86_gcc.cpp in Sources */,
 				AB2F3BD015CF9C6000858373 /* crc.cpp in Sources */,
 				AB2F3BD115CF9C6000858373 /* datetime.cpp in Sources */,
 				AB2F3BD215CF9C6000858373 /* debug.cpp in Sources */,
@@ -2529,10 +2551,8 @@
 				AB2F3BDB15CF9C6000858373 /* fatdir.cpp in Sources */,
 				AB2F3BDC15CF9C6000858373 /* fatfile.cpp in Sources */,
 				AB2F3BDD15CF9C6000858373 /* FIFO.cpp in Sources */,
-				AB2F3BDE15CF9C6000858373 /* FIFOSampleBuffer.cpp in Sources */,
 				AB2F3BDF15CF9C6000858373 /* file_allocation_table.cpp in Sources */,
 				AB2F3BE015CF9C6000858373 /* filetime.cpp in Sources */,
-				AB2F3BE115CF9C6000858373 /* FIRFilter.cpp in Sources */,
 				AB2F3BE215CF9C6000858373 /* firmware.cpp in Sources */,
 				AB2F3BE315CF9C6000858373 /* fs-linux.cpp in Sources */,
 				AB2F3BE415CF9C6000858373 /* gfx3d.cpp in Sources */,
@@ -2548,13 +2568,11 @@
 				AB2F3BEE15CF9C6000858373 /* md5.cpp in Sources */,
 				AB2F3BEF15CF9C6000858373 /* metaspu.cpp in Sources */,
 				AB2F3BF015CF9C6000858373 /* MMU.cpp in Sources */,
-				AB2F3BF115CF9C6000858373 /* mmx_optimized.cpp in Sources */,
 				AB2F3BF215CF9C6000858373 /* movie.cpp in Sources */,
 				AB2F3BF315CF9C6000858373 /* NDSSystem.cpp in Sources */,
 				AB2F3BF415CF9C6000858373 /* partition.cpp in Sources */,
 				AB2F3BF515CF9C6000858373 /* path.cpp in Sources */,
 				AB2F3BF615CF9C6000858373 /* rasterize.cpp in Sources */,
-				AB2F3BF715CF9C6000858373 /* RateTransposer.cpp in Sources */,
 				AB2F3BF815CF9C6000858373 /* readwrite.cpp in Sources */,
 				AB2F3BF915CF9C6000858373 /* render3D.cpp in Sources */,
 				AB2F3BFA15CF9C6000858373 /* ROMReader.cpp in Sources */,
@@ -2575,11 +2593,8 @@
 				AB2F3C0915CF9C6000858373 /* slot2_rumblepak.cpp in Sources */,
 				AB2F3C0A15CF9C6000858373 /* sndOSX.cpp in Sources */,
 				AB2F3C0B15CF9C6000858373 /* SndOut.cpp in Sources */,
-				AB2F3C0C15CF9C6000858373 /* SoundTouch.cpp in Sources */,
 				AB2F3C0D15CF9C6000858373 /* SPU.cpp in Sources */,
-				AB2F3C0E15CF9C6000858373 /* sse_optimized.cpp in Sources */,
 				AB2F3C0F15CF9C6000858373 /* task.cpp in Sources */,
-				AB2F3C1015CF9C6000858373 /* TDStretch.cpp in Sources */,
 				AB2F3C1115CF9C6000858373 /* texcache.cpp in Sources */,
 				AB2F3C1215CF9C6000858373 /* thumb_instructions.cpp in Sources */,
 				AB2F3C1315CF9C6000858373 /* Timestretcher.cpp in Sources */,
@@ -2590,7 +2605,6 @@
 				AB2F3C1815CF9C6000858373 /* version.cpp in Sources */,
 				AB2F3C1915CF9C6000858373 /* vfat.cpp in Sources */,
 				AB2F3C1A15CF9C6000858373 /* videofilter.cpp in Sources */,
-				AB2F3C1B15CF9C6000858373 /* WavFile.cpp in Sources */,
 				AB2F3C1C15CF9C6000858373 /* wifi.cpp in Sources */,
 				AB2F3C1D15CF9C6000858373 /* xstring.cpp in Sources */,
 				AB2F3C1E15CF9C6000858373 /* main.m in Sources */,
@@ -2622,6 +2636,19 @@
 				AB2F3C3815CF9C6000858373 /* coreaudiosound.cpp in Sources */,
 				AB2F3C3915CF9C6000858373 /* ringbuffer.cpp in Sources */,
 				ABA03571169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */,
+				AB279D6416A4E6DE00ECC692 /* AAFilter.cpp in Sources */,
+				AB279D6516A4E6DE00ECC692 /* BPMDetect.cpp in Sources */,
+				AB279D6616A4E6DE00ECC692 /* cpu_detect_x86.cpp in Sources */,
+				AB279D6716A4E6DE00ECC692 /* FIFOSampleBuffer.cpp in Sources */,
+				AB279D6816A4E6DE00ECC692 /* FIRFilter.cpp in Sources */,
+				AB279D6916A4E6DE00ECC692 /* mmx_optimized.cpp in Sources */,
+				AB279D6A16A4E6DE00ECC692 /* PeakFinder.cpp in Sources */,
+				AB279D6B16A4E6DE00ECC692 /* RateTransposer.cpp in Sources */,
+				AB279D6C16A4E6DE00ECC692 /* SoundTouch.cpp in Sources */,
+				AB279D6D16A4E6DE00ECC692 /* sse_optimized.cpp in Sources */,
+				AB279D6E16A4E6DE00ECC692 /* TDStretch.cpp in Sources */,
+				AB6A187C16C9951C00384EED /* EmuControllerDelegate.mm in Sources */,
+				AB6A198316CAD66900384EED /* cocoa_GPU.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2630,7 +2657,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				AB711F2D1481C35F009011C8 /* ConvertUTF.c in Sources */,
-				AB711F531481C35F009011C8 /* AAFilter.cpp in Sources */,
 				AB711F001481C35F009011C8 /* addons.cpp in Sources */,
 				AB711F011481C35F009011C8 /* arm_instructions.cpp in Sources */,
 				AB711F021481C35F009011C8 /* armcpu.cpp in Sources */,
@@ -2639,7 +2665,6 @@
 				AB711F041481C35F009011C8 /* cheatSystem.cpp in Sources */,
 				AB711F051481C35F009011C8 /* common.cpp in Sources */,
 				AB711F061481C35F009011C8 /* cp15.cpp in Sources */,
-				AB711F711481C35F009011C8 /* cpu_detect_x86_gcc.cpp in Sources */,
 				AB711F2E1481C35F009011C8 /* crc.cpp in Sources */,
 				AB711F5C1481C35F009011C8 /* datetime.cpp in Sources */,
 				AB711F071481C35F009011C8 /* debug.cpp in Sources */,
@@ -2654,10 +2679,8 @@
 				AB711F371481C35F009011C8 /* fatdir.cpp in Sources */,
 				AB711F381481C35F009011C8 /* fatfile.cpp in Sources */,
 				AB711F0B1481C35F009011C8 /* FIFO.cpp in Sources */,
-				AB711F541481C35F009011C8 /* FIFOSampleBuffer.cpp in Sources */,
 				AB711F391481C35F009011C8 /* file_allocation_table.cpp in Sources */,
 				AB711F3A1481C35F009011C8 /* filetime.cpp in Sources */,
-				AB711F551481C35F009011C8 /* FIRFilter.cpp in Sources */,
 				AB711F0C1481C35F009011C8 /* firmware.cpp in Sources */,
 				AB711F5D1481C35F009011C8 /* fs-linux.cpp in Sources */,
 				AB711F0D1481C35F009011C8 /* gfx3d.cpp in Sources */,
@@ -2673,14 +2696,12 @@
 				AB711F3F1481C35F009011C8 /* md5.cpp in Sources */,
 				AB711F431481C35F009011C8 /* metaspu.cpp in Sources */,
 				AB711F121481C35F009011C8 /* MMU.cpp in Sources */,
-				AB711F561481C35F009011C8 /* mmx_optimized.cpp in Sources */,
 				AB711F131481C35F009011C8 /* movie.cpp in Sources */,
 				AB711F141481C35F009011C8 /* NDSSystem.cpp in Sources */,
 				AB711F5F1481C35F009011C8 /* OGLRender.cpp in Sources */,
 				AB711F3E1481C35F009011C8 /* partition.cpp in Sources */,
 				AB711F151481C35F009011C8 /* path.cpp in Sources */,
 				AB711F161481C35F009011C8 /* rasterize.cpp in Sources */,
-				AB711F571481C35F009011C8 /* RateTransposer.cpp in Sources */,
 				AB711F171481C35F009011C8 /* readwrite.cpp in Sources */,
 				AB711F181481C35F009011C8 /* render3D.cpp in Sources */,
 				AB711F191481C35F009011C8 /* ROMReader.cpp in Sources */,
@@ -2701,11 +2722,8 @@
 				AB711F2C1481C35F009011C8 /* slot2_rumblepak.cpp in Sources */,
 				AB711F491481C35F009011C8 /* sndOSX.cpp in Sources */,
 				AB711F511481C35F009011C8 /* SndOut.cpp in Sources */,
-				AB711F581481C35F009011C8 /* SoundTouch.cpp in Sources */,
 				AB711F1D1481C35F009011C8 /* SPU.cpp in Sources */,
-				AB711F591481C35F009011C8 /* sse_optimized.cpp in Sources */,
 				AB711F401481C35F009011C8 /* task.cpp in Sources */,
-				AB711F5A1481C35F009011C8 /* TDStretch.cpp in Sources */,
 				AB711F1E1481C35F009011C8 /* texcache.cpp in Sources */,
 				AB711F1F1481C35F009011C8 /* thumb_instructions.cpp in Sources */,
 				AB711F521481C35F009011C8 /* Timestretcher.cpp in Sources */,
@@ -2716,7 +2734,6 @@
 				AB711F201481C35F009011C8 /* version.cpp in Sources */,
 				AB711F411481C35F009011C8 /* vfat.cpp in Sources */,
 				AB711F6D1481C35F009011C8 /* videofilter.cpp in Sources */,
-				AB711F5B1481C35F009011C8 /* WavFile.cpp in Sources */,
 				AB711F211481C35F009011C8 /* wifi.cpp in Sources */,
 				AB711F421481C35F009011C8 /* xstring.cpp in Sources */,
 				AB711F4A1481C35F009011C8 /* main.m in Sources */,
@@ -2777,6 +2794,19 @@
 				ABF50AD4169F5FDA0018C08D /* x86func.cpp in Sources */,
 				ABF50AD5169F5FDA0018C08D /* x86operand.cpp in Sources */,
 				ABF50AD6169F5FDA0018C08D /* x86util.cpp in Sources */,
+				AB279D6F16A4E6DE00ECC692 /* AAFilter.cpp in Sources */,
+				AB279D7016A4E6DE00ECC692 /* BPMDetect.cpp in Sources */,
+				AB279D7116A4E6DE00ECC692 /* cpu_detect_x86.cpp in Sources */,
+				AB279D7216A4E6DE00ECC692 /* FIFOSampleBuffer.cpp in Sources */,
+				AB279D7316A4E6DE00ECC692 /* FIRFilter.cpp in Sources */,
+				AB279D7416A4E6DE00ECC692 /* mmx_optimized.cpp in Sources */,
+				AB279D7516A4E6DE00ECC692 /* PeakFinder.cpp in Sources */,
+				AB279D7616A4E6DE00ECC692 /* RateTransposer.cpp in Sources */,
+				AB279D7716A4E6DE00ECC692 /* SoundTouch.cpp in Sources */,
+				AB279D7816A4E6DE00ECC692 /* sse_optimized.cpp in Sources */,
+				AB279D7916A4E6DE00ECC692 /* TDStretch.cpp in Sources */,
+				AB6A187E16C9951C00384EED /* EmuControllerDelegate.mm in Sources */,
+				AB6A198516CAD66900384EED /* cocoa_GPU.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2785,7 +2815,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				AB73A9B31507C9F500A310C8 /* ConvertUTF.c in Sources */,
-				AB73A9B41507C9F500A310C8 /* AAFilter.cpp in Sources */,
 				AB73A9B51507C9F500A310C8 /* addons.cpp in Sources */,
 				AB73A9B61507C9F500A310C8 /* arm_instructions.cpp in Sources */,
 				AB73A9B71507C9F500A310C8 /* armcpu.cpp in Sources */,
@@ -2794,7 +2823,6 @@
 				AB73A9BA1507C9F500A310C8 /* cheatSystem.cpp in Sources */,
 				AB73A9BB1507C9F500A310C8 /* common.cpp in Sources */,
 				AB73A9BC1507C9F500A310C8 /* cp15.cpp in Sources */,
-				AB73A9BD1507C9F500A310C8 /* cpu_detect_x86_gcc.cpp in Sources */,
 				AB73A9BE1507C9F500A310C8 /* crc.cpp in Sources */,
 				AB73A9BF1507C9F500A310C8 /* datetime.cpp in Sources */,
 				AB73A9C01507C9F500A310C8 /* debug.cpp in Sources */,
@@ -2809,10 +2837,8 @@
 				AB73A9C91507C9F500A310C8 /* fatdir.cpp in Sources */,
 				AB73A9CA1507C9F500A310C8 /* fatfile.cpp in Sources */,
 				AB73A9CB1507C9F500A310C8 /* FIFO.cpp in Sources */,
-				AB73A9CC1507C9F500A310C8 /* FIFOSampleBuffer.cpp in Sources */,
 				AB73A9CD1507C9F500A310C8 /* file_allocation_table.cpp in Sources */,
 				AB73A9CE1507C9F500A310C8 /* filetime.cpp in Sources */,
-				AB73A9CF1507C9F500A310C8 /* FIRFilter.cpp in Sources */,
 				AB73A9D01507C9F500A310C8 /* firmware.cpp in Sources */,
 				AB73A9D11507C9F500A310C8 /* fs-linux.cpp in Sources */,
 				AB73A9D21507C9F500A310C8 /* gfx3d.cpp in Sources */,
@@ -2828,13 +2854,11 @@
 				AB73A9DC1507C9F500A310C8 /* md5.cpp in Sources */,
 				AB73A9DD1507C9F500A310C8 /* metaspu.cpp in Sources */,
 				AB73A9DE1507C9F500A310C8 /* MMU.cpp in Sources */,
-				AB73A9DF1507C9F500A310C8 /* mmx_optimized.cpp in Sources */,
 				AB73A9E01507C9F500A310C8 /* movie.cpp in Sources */,
 				AB73A9E11507C9F500A310C8 /* NDSSystem.cpp in Sources */,
 				AB73A9E21507C9F500A310C8 /* partition.cpp in Sources */,
 				AB73A9E31507C9F500A310C8 /* path.cpp in Sources */,
 				AB73A9E41507C9F500A310C8 /* rasterize.cpp in Sources */,
-				AB73A9E51507C9F500A310C8 /* RateTransposer.cpp in Sources */,
 				AB73A9E61507C9F500A310C8 /* readwrite.cpp in Sources */,
 				AB73A9E71507C9F500A310C8 /* render3D.cpp in Sources */,
 				AB73A9E81507C9F500A310C8 /* ROMReader.cpp in Sources */,
@@ -2855,11 +2879,8 @@
 				AB73A9F71507C9F500A310C8 /* slot2_rumblepak.cpp in Sources */,
 				AB73A9F81507C9F500A310C8 /* sndOSX.cpp in Sources */,
 				AB73A9F91507C9F500A310C8 /* SndOut.cpp in Sources */,
-				AB73A9FA1507C9F500A310C8 /* SoundTouch.cpp in Sources */,
 				AB73A9FB1507C9F500A310C8 /* SPU.cpp in Sources */,
-				AB73A9FC1507C9F500A310C8 /* sse_optimized.cpp in Sources */,
 				AB73A9FD1507C9F500A310C8 /* task.cpp in Sources */,
-				AB73A9FE1507C9F500A310C8 /* TDStretch.cpp in Sources */,
 				AB73A9FF1507C9F500A310C8 /* texcache.cpp in Sources */,
 				AB73AA001507C9F500A310C8 /* thumb_instructions.cpp in Sources */,
 				AB73AA011507C9F500A310C8 /* Timestretcher.cpp in Sources */,
@@ -2870,7 +2891,6 @@
 				AB73AA061507C9F500A310C8 /* version.cpp in Sources */,
 				AB73AA071507C9F500A310C8 /* vfat.cpp in Sources */,
 				AB73AA081507C9F500A310C8 /* videofilter.cpp in Sources */,
-				AB73AA091507C9F500A310C8 /* WavFile.cpp in Sources */,
 				AB73AA0A1507C9F500A310C8 /* wifi.cpp in Sources */,
 				AB73AA0B1507C9F500A310C8 /* xstring.cpp in Sources */,
 				AB73AA0C1507C9F500A310C8 /* main.m in Sources */,
@@ -2932,6 +2952,19 @@
 				ABF50B2B169F5FDA0018C08D /* x86func.cpp in Sources */,
 				ABF50B2C169F5FDA0018C08D /* x86operand.cpp in Sources */,
 				ABF50B2D169F5FDA0018C08D /* x86util.cpp in Sources */,
+				AB279D5916A4E6DE00ECC692 /* AAFilter.cpp in Sources */,
+				AB279D5A16A4E6DE00ECC692 /* BPMDetect.cpp in Sources */,
+				AB279D5B16A4E6DE00ECC692 /* cpu_detect_x86.cpp in Sources */,
+				AB279D5C16A4E6DE00ECC692 /* FIFOSampleBuffer.cpp in Sources */,
+				AB279D5D16A4E6DE00ECC692 /* FIRFilter.cpp in Sources */,
+				AB279D5E16A4E6DE00ECC692 /* mmx_optimized.cpp in Sources */,
+				AB279D5F16A4E6DE00ECC692 /* PeakFinder.cpp in Sources */,
+				AB279D6016A4E6DE00ECC692 /* RateTransposer.cpp in Sources */,
+				AB279D6116A4E6DE00ECC692 /* SoundTouch.cpp in Sources */,
+				AB279D6216A4E6DE00ECC692 /* sse_optimized.cpp in Sources */,
+				AB279D6316A4E6DE00ECC692 /* TDStretch.cpp in Sources */,
+				AB6A187F16C9951C00384EED /* EmuControllerDelegate.mm in Sources */,
+				AB6A198616CAD66900384EED /* cocoa_GPU.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2940,7 +2973,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				ABAD0FBB15ACE7A00000EC47 /* ConvertUTF.c in Sources */,
-				ABAD0FBC15ACE7A00000EC47 /* AAFilter.cpp in Sources */,
 				ABAD0FBD15ACE7A00000EC47 /* addons.cpp in Sources */,
 				ABAD0FBE15ACE7A00000EC47 /* arm_instructions.cpp in Sources */,
 				ABAD0FBF15ACE7A00000EC47 /* armcpu.cpp in Sources */,
@@ -2949,7 +2981,6 @@
 				ABAD0FC215ACE7A00000EC47 /* cheatSystem.cpp in Sources */,
 				ABAD0FC315ACE7A00000EC47 /* common.cpp in Sources */,
 				ABAD0FC415ACE7A00000EC47 /* cp15.cpp in Sources */,
-				ABAD0FC515ACE7A00000EC47 /* cpu_detect_x86_gcc.cpp in Sources */,
 				ABAD0FC615ACE7A00000EC47 /* crc.cpp in Sources */,
 				ABAD0FC715ACE7A00000EC47 /* datetime.cpp in Sources */,
 				ABAD0FC815ACE7A00000EC47 /* debug.cpp in Sources */,
@@ -2964,10 +2995,8 @@
 				ABAD0FD115ACE7A00000EC47 /* fatdir.cpp in Sources */,
 				ABAD0FD215ACE7A00000EC47 /* fatfile.cpp in Sources */,
 				ABAD0FD315ACE7A00000EC47 /* FIFO.cpp in Sources */,
-				ABAD0FD415ACE7A00000EC47 /* FIFOSampleBuffer.cpp in Sources */,
 				ABAD0FD515ACE7A00000EC47 /* file_allocation_table.cpp in Sources */,
 				ABAD0FD615ACE7A00000EC47 /* filetime.cpp in Sources */,
-				ABAD0FD715ACE7A00000EC47 /* FIRFilter.cpp in Sources */,
 				ABAD0FD815ACE7A00000EC47 /* firmware.cpp in Sources */,
 				ABAD0FD915ACE7A00000EC47 /* fs-linux.cpp in Sources */,
 				ABAD0FDA15ACE7A00000EC47 /* gfx3d.cpp in Sources */,
@@ -2983,13 +3012,11 @@
 				ABAD0FE415ACE7A00000EC47 /* md5.cpp in Sources */,
 				ABAD0FE515ACE7A00000EC47 /* metaspu.cpp in Sources */,
 				ABAD0FE615ACE7A00000EC47 /* MMU.cpp in Sources */,
-				ABAD0FE715ACE7A00000EC47 /* mmx_optimized.cpp in Sources */,
 				ABAD0FE815ACE7A00000EC47 /* movie.cpp in Sources */,
 				ABAD0FE915ACE7A00000EC47 /* NDSSystem.cpp in Sources */,
 				ABAD0FEA15ACE7A00000EC47 /* partition.cpp in Sources */,
 				ABAD0FEB15ACE7A00000EC47 /* path.cpp in Sources */,
 				ABAD0FEC15ACE7A00000EC47 /* rasterize.cpp in Sources */,
-				ABAD0FED15ACE7A00000EC47 /* RateTransposer.cpp in Sources */,
 				ABAD0FEE15ACE7A00000EC47 /* readwrite.cpp in Sources */,
 				ABAD0FEF15ACE7A00000EC47 /* render3D.cpp in Sources */,
 				ABAD0FF015ACE7A00000EC47 /* ROMReader.cpp in Sources */,
@@ -3010,11 +3037,8 @@
 				ABAD0FFF15ACE7A00000EC47 /* slot2_rumblepak.cpp in Sources */,
 				ABAD100015ACE7A00000EC47 /* sndOSX.cpp in Sources */,
 				ABAD100115ACE7A00000EC47 /* SndOut.cpp in Sources */,
-				ABAD100215ACE7A00000EC47 /* SoundTouch.cpp in Sources */,
 				ABAD100315ACE7A00000EC47 /* SPU.cpp in Sources */,
-				ABAD100415ACE7A00000EC47 /* sse_optimized.cpp in Sources */,
 				ABAD100515ACE7A00000EC47 /* task.cpp in Sources */,
-				ABAD100615ACE7A00000EC47 /* TDStretch.cpp in Sources */,
 				ABAD100715ACE7A00000EC47 /* texcache.cpp in Sources */,
 				ABAD100815ACE7A00000EC47 /* thumb_instructions.cpp in Sources */,
 				ABAD100915ACE7A00000EC47 /* Timestretcher.cpp in Sources */,
@@ -3025,7 +3049,6 @@
 				ABAD100E15ACE7A00000EC47 /* version.cpp in Sources */,
 				ABAD100F15ACE7A00000EC47 /* vfat.cpp in Sources */,
 				ABAD101015ACE7A00000EC47 /* videofilter.cpp in Sources */,
-				ABAD101115ACE7A00000EC47 /* WavFile.cpp in Sources */,
 				ABAD101215ACE7A00000EC47 /* wifi.cpp in Sources */,
 				ABAD101315ACE7A00000EC47 /* xstring.cpp in Sources */,
 				ABAD101415ACE7A00000EC47 /* main.m in Sources */,
@@ -3057,6 +3080,19 @@
 				ABAD102E15ACE7A00000EC47 /* coreaudiosound.cpp in Sources */,
 				ABAD102F15ACE7A00000EC47 /* ringbuffer.cpp in Sources */,
 				ABA03573169127C000817C69 /* troubleshootingWindowDelegate.mm in Sources */,
+				AB279D7A16A4E6DE00ECC692 /* AAFilter.cpp in Sources */,
+				AB279D7B16A4E6DE00ECC692 /* BPMDetect.cpp in Sources */,
+				AB279D7C16A4E6DE00ECC692 /* cpu_detect_x86.cpp in Sources */,
+				AB279D7D16A4E6DE00ECC692 /* FIFOSampleBuffer.cpp in Sources */,
+				AB279D7E16A4E6DE00ECC692 /* FIRFilter.cpp in Sources */,
+				AB279D7F16A4E6DE00ECC692 /* mmx_optimized.cpp in Sources */,
+				AB279D8016A4E6DE00ECC692 /* PeakFinder.cpp in Sources */,
+				AB279D8116A4E6DE00ECC692 /* RateTransposer.cpp in Sources */,
+				AB279D8216A4E6DE00ECC692 /* SoundTouch.cpp in Sources */,
+				AB279D8316A4E6DE00ECC692 /* sse_optimized.cpp in Sources */,
+				AB279D8416A4E6DE00ECC692 /* TDStretch.cpp in Sources */,
+				AB6A187D16C9951C00384EED /* EmuControllerDelegate.mm in Sources */,
+				AB6A198416CAD66900384EED /* cocoa_GPU.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Modified: trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj
===================================================================
--- trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj	2013-02-11 20:57:16 UTC (rev 4532)
+++ trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj	2013-02-13 23:46:02 UTC (rev 4533)
@@ -70,6 +70,11 @@
 		AB350B6A1478A5B3007165AC /* cocoa_hid.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB350B691478A5B3007165AC /* cocoa_hid.mm */; };
 		AB350BA51478AC96007165AC /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB350BA41478AC96007165AC /* IOKit.framework */; };
 		AB350D3B147A1D93007165AC /* HID_usage_strings.plist in Resources */ = {isa = PBXBuildFile; fileRef = AB350D3A147A1D93007165AC /* HID_usage_strings.plist */; };
+		AB3A655E16CC5421001F5D4A /* EmuControllerDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3A655D16CC5421001F5D4A /* EmuControllerDelegate.mm */; };
+		AB3A655F16CC5421001F5D4A /* EmuControllerDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3A655D16CC5421001F5D4A /* EmuControllerDelegate.mm */; };
+		AB3A656116CC5438001F5D4A /* cocoa_GPU.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3A656016CC5438001F5D4A /* cocoa_GPU.mm */; };
+		AB3A656216CC5438001F5D4A /* cocoa_GPU.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3A656016CC5438001F5D4A /* cocoa_GPU.mm */; };
+		AB3A656316CC5438001F5D4A /* cocoa_GPU.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3A656016CC5438001F5D4A /* cocoa_GPU.mm */; };
 		AB3ACB7214C2361100D7D192 /* appDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6714C2361100D7D192 /* appDelegate.mm */; };
 		AB3ACB7314C2361100D7D192 /* cheatWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6914C2361100D7D192 /* cheatWindowDelegate.mm */; };
 		AB3ACB7414C2361100D7D192 /* displayView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6B14C2361100D7D192 /* displayView.mm */; };
@@ -679,6 +684,10 @@
 		AB350B691478A5B3007165AC /* cocoa_hid.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_hid.mm; sourceTree = "<group>"; };
 		AB350BA41478AC96007165AC /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		AB350D38147A1D8D007165AC /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = English; path = translations/English.lproj/HID_usage_strings.plist; sourceTree = "<group>"; };
+		AB3A655C16CC5416001F5D4A /* EmuControllerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmuControllerDelegate.h; sourceTree = "<group>"; };
+		AB3A655D16CC5421001F5D4A /* EmuControllerDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EmuControllerDelegate.mm; sourceTree = "<group>"; };
+		AB3A656016CC5438001F5D4A /* cocoa_GPU.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_GPU.mm; sourceTree = "<group>"; };
+		AB3A656416CC5442001F5D4A /* cocoa_GPU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_GPU.h; sourceTree = "<group>"; };
 		AB3ACB6614C2361100D7D192 /* appDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = appDelegate.h; sourceTree = "<group>"; };
 		AB3ACB6714C2361100D7D192 /* appDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = appDelegate.mm; sourceTree = "<group>"; };
 		AB3ACB6814C2361100D7D192 /* cheatWindowDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cheatWindowDelegate.h; sourceTree = "<group>"; };
@@ -1106,6 +1115,7 @@
 				AB58F32B1364F44B0074C376 /* cocoa_file.h */,
 				ABE7F53C13EE1C7900FD3A71 /* cocoa_firmware.h */,
 				AB9971CE134EDA0800531BA7 /* cocoa_globals.h */,
+				AB3A656416CC5442001F5D4A /* cocoa_GPU.h */,
 				AB350B681478A5B3007165AC /* cocoa_hid.h */,
 				ABD103FF1346652500AF11D1 /* cocoa_input.h */,
 				ABD9A46313DB99B300777194 /* cocoa_mic.h */,
@@ -1120,6 +1130,7 @@
 				ABD104121346652500AF11D1 /* cocoa_core.mm */,
 				AB58F32C1364F44B0074C376 /* cocoa_file.mm */,
 				ABE7F53D13EE1C7900FD3A71 /* cocoa_firmware.mm */,
+				AB3A656016CC5438001F5D4A /* cocoa_GPU.mm */,
 				AB350B691478A5B3007165AC /* cocoa_hid.mm */,
 				ABD104111346652500AF11D1 /* cocoa_input.mm */,
 				ABD9A46413DB99B300777194 /* cocoa_mic.mm */,
@@ -1224,6 +1235,7 @@
 				AB3ACB6614C2361100D7D192 /* appDelegate.h */,
 				AB3ACB6814C2361100D7D192 /* cheatWindowDelegate.h */,
 				AB3ACB6A14C2361100D7D192 /* displayView.h */,
+				AB3A655C16CC5416001F5D4A /* EmuControllerDelegate.h */,
 				AB3ACB6C14C2361100D7D192 /* emuWindowDelegate.h */,
 				AB3ACB6E14C2361100D7D192 /* inputPrefsView.h */,
 				AB3ACB7014C2361100D7D192 /* preferencesWindowDelegate.h */,
@@ -1231,6 +1243,7 @@
 				AB3ACB6714C2361100D7D192 /* appDelegate.mm */,
 				AB3ACB6914C2361100D7D192 /* cheatWindowDelegate.mm */,
 				AB3ACB6B14C2361100D7D192 /* displayView.mm */,
+				AB3A655D16CC5421001F5D4A /* EmuControllerDelegate.mm */,
 				AB3ACB6D14C2361100D7D192 /* emuWindowDelegate.mm */,
 				AB3ACB6F14C2361100D7D192 /* inputPrefsView.mm */,
 				AB3ACB7114C2361100D7D192 /* preferencesWindowDelegate.mm */,
@@ -2225,6 +2238,8 @@
 				AB405694169F5DCC0016AC3E /* x86util.cpp in Sources */,
 				AB23567416C2F6F400DA782E /* macosx_10_5_compat.cpp in Sources */,
 				AB23567516C2FAD800DA782E /* OGLRender_3_2.cpp in Sources */,
+				AB3A655F16CC5421001F5D4A /* EmuControllerDelegate.mm in Sources */,
+				AB3A656216CC5438001F5D4A /* cocoa_GPU.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2381,6 +2396,8 @@
 				AB405690169F5DCC0016AC3E /* x86operand.cpp in Sources */,
 				AB405693169F5DCC0016AC3E /* x86util.cpp in Sources */,
 				AB26D87C16B5253D00A2305C /* OGLRender_3_2.cpp in Sources */,
+				AB3A655E16CC5421001F5D4A /* EmuControllerDelegate.mm in Sources */,
+				AB3A656116CC5438001F5D4A /* cocoa_GPU.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2525,6 +2542,7 @@
 				AB405692169F5DCC0016AC3E /* x86operand.cpp in Sources */,
 				AB405695169F5DCC0016AC3E /* x86util.cpp in Sources */,
 				AB68A0DD16B139BC00DE0546 /* OGLRender_3_2.cpp in Sources */,
+				AB3A656316CC5438001F5D4A /* cocoa_GPU.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Modified: trunk/desmume/src/cocoa/Info (Debug).plist
===================================================================
--- trunk/desmume/src/cocoa/Info (Debug).plist	2013-02-11 20:57:16 UTC (rev 4532)
+++ trunk/desmume/src/cocoa/Info (Debug).plist	2013-02-13 23:46:02 UTC (rev 4533)
@@ -250,7 +250,7 @@
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright ©2012 DeSmuME Team. All rights reserved.</string>
+	<string>Copyright ©2013 DeSmuME Team. All rights reserved.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

Modified: trunk/desmume/src/cocoa/Info.plist
===================================================================
--- trunk/desmume/src/cocoa/Info.plist	2013-02-11 20:57:16 UTC (rev 4532)
+++ trunk/desmume/src/cocoa/Info.plist	2013-02-13 23:46:02 UTC (rev 4533)
@@ -250,7 +250,7 @@
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright ©2012 DeSmuME Team. All rights reserved.</string>
+	<string>Copyright ©2013 DeSmuME Team. All rights reserved.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

Added: trunk/desmume/src/cocoa/cocoa_GPU.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_GPU.h	                        (rev 0)
+++ trunk/desmume/src/cocoa/cocoa_GPU.h	2013-02-13 23:46:02 UTC (rev 4533)
@@ -0,0 +1,89 @@
+/*
+	Copyright (C) 2013 DeSmuME team
+
+	This file is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 2 of the License, or
+	(at your option) any later version.
+
+	This file is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#import <Foundation/Foundation.h>
+#include <pthread.h>
+#include <libkern/OSAtomic.h>
+
+
+@interface CocoaDSGPU : NSObject
+{
+	UInt32 gpuStateFlags;
+	OSSpinLock spinlockGpuState;
+	
+	BOOL gpuStateMainGPU;
+	BOOL gpuStateMainBG0;
+	BOOL gpuStateMainBG1;
+	BOOL gpuStateMainBG2;
+	BOOL gpuStateMainBG3;
+	BOOL gpuStateMainOBJ;
+	BOOL gpuStateSubGPU;
+	BOOL gpuStateSubBG0;
+	BOOL gpuStateSubBG1;
+	BOOL gpuStateSubBG2;
+	BOOL gpuStateSubBG3;
+	BOOL gpuStateSubOBJ;
+	
+	BOOL isCPUCoreCountAuto;
+	
+	pthread_mutex_t *mutexProducer;
+}
+
+@property (assign) UInt32 gpuStateFlags;
+@property (assign) pthread_mutex_t *mutexProducer;
+
+@property (assign) NSInteger render3DRenderingEngine;
+@property (assign) BOOL render3DHighPrecisionColorInterpolation;
+@property (assign) BOOL render3DEdgeMarking;
+@property (assign) BOOL render3DFog;
+@property (assign) BOOL render3DTextures;
+@property (assign) NSUInteger render3DDepthComparisonThreshold;
+@property (assign) NSUInteger render3DThreads;
+@property (assign) BOOL render3DLineHack;
+@property (assign) BOOL render3DMultisample;
+
+- (BOOL) gpuStateByBit:(const UInt32)stateBit;
+- (BOOL) isGPUTypeDisplayed:(const NSInteger)theGpuType;
+- (void) hideGPUType:(const NSInteger)theGpuType;
+- (void) showGPUType:(const NSInteger)theGpuType;
+
+@end
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+void SetGPULayerState(const int gpuType, const unsigned int i, const bool state);
+bool GetGPULayerState(const int gpuType, const unsigned int i);
+void SetGPUDisplayState(const int gpuType, const bool state);
+bool GetGPUDisplayState(const int gpuType);
+
+bool OSXOpenGLRendererInit();
+bool OSXOpenGLRendererBegin();
+void OSXOpenGLRendererEnd();
+
+bool CreateOpenGLRenderer();
+void DestroyOpenGLRenderer();
+void RequestOpenGLRenderer_3_2(bool request_3_2);
+void SetOpenGLRendererFunctions(bool (*initFunction)(),
+								bool (*beginOGLFunction)(),
+								void (*endOGLFunction)());
+
+#ifdef __cplusplus
+}
+#endif

Added: trunk/desmume/src/cocoa/cocoa_GPU.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_GPU.mm	                        (rev 0)
+++ trunk/desmume/src/cocoa/cocoa_GPU.mm	2013-02-13 23:46:02 UTC (rev 4533)
@@ -0,0 +1,811 @@
+/*
+	Copyright (C) 2013 DeSmuME team
+
+	This file is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 2 of the License, or
+	(at your option) any later version.
+
+	This file is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#import "cocoa_GPU.h"
+#import "cocoa_globals.h"
+#import "cocoa_util.h"
+
+#include "../NDSSystem.h"
+#include "../GPU.h"
+#include "../rasterize.h"
+
+#ifdef MAC_OS_X_VERSION_10_7
+#include "../OGLRender_3_2.h"
+#else
+#include "../OGLRender.h"
+#endif
+
+#include <OpenGL/OpenGL.h>
+
+#undef BOOL
+
+GPU3DInterface *core3DList[] = {
+	&gpu3DNull,
+	&gpu3DRasterize,
+	&gpu3Dgl,
+	NULL
+};
+
+@implementation CocoaDSGPU
+
+@dynamic gpuStateFlags;
+@synthesize mutexProducer;
+
+@dynamic render3DRenderingEngine;
+@dynamic render3DHighPrecisionColorInterpolation;
+@dynamic render3DEdgeMarking;
+@dynamic render3DFog;
+@dynamic render3DTextures;
+@dynamic render3DDepthComparisonThreshold;
+@dynamic render3DThreads;
+@dynamic render3DLineHack;
+@dynamic render3DMultisample;
+
+
+- (id)init
+{
+	self = [super init];
+	if (self == nil)
+	{
+		return self;
+	}
+	
+	spinlockGpuState = OS_SPINLOCK_INIT;
+	mutexProducer = NULL;
+	
+	gpuStateFlags	= GPUSTATE_MAIN_GPU_MASK |
+					  GPUSTATE_MAIN_BG0_MASK |
+					  GPUSTATE_MAIN_BG1_MASK |
+					  GPUSTATE_MAIN_BG2_MASK |
+					  GPUSTATE_MAIN_BG3_MASK |
+					  GPUSTATE_MAIN_OBJ_MASK |
+					  GPUSTATE_SUB_GPU_MASK |
+					  GPUSTATE_SUB_BG0_MASK |
+					  GPUSTATE_SUB_BG1_MASK |
+					  GPUSTATE_SUB_BG2_MASK |
+					  GPUSTATE_SUB_BG3_MASK |
+					  GPUSTATE_SUB_OBJ_MASK;
+	
+	gpuStateMainGPU = YES;
+	gpuStateMainBG0 = YES;
+	gpuStateMainBG1 = YES;
+	gpuStateMainBG2 = YES;
+	gpuStateMainBG3 = YES;
+	gpuStateMainOBJ = YES;
+	gpuStateSubGPU = YES;
+	gpuStateSubBG0 = YES;
+	gpuStateSubBG1 = YES;
+	gpuStateSubBG2 = YES;
+	gpuStateSubBG3 = YES;
+	gpuStateSubOBJ = YES;
+	
+	isCPUCoreCountAuto = NO;
+	
+	SetOpenGLRendererFunctions(&OSXOpenGLRendererInit,
+							   &OSXOpenGLRendererBegin,
+							   &OSXOpenGLRendererEnd);
+	
+	return self;
+}
+
+- (void)dealloc
+{
+	DestroyOpenGLRenderer();
+	
+	[super dealloc];
+}
+
+- (void) setGpuStateFlags:(UInt32)flags
+{
+	OSSpinLockLock(&spinlockGpuState);
+	gpuStateFlags = flags;
+	OSSpinLockUnlock(&spinlockGpuState);
+	
+	pthread_mutex_lock(self.mutexProducer);
+	
+	if (flags & GPUSTATE_MAIN_GPU_MASK)
+	{
+		SetGPUDisplayState(DS_GPU_TYPE_MAIN, true);
+		gpuStateMainGPU = YES;
+	}
+	else
+	{
+		SetGPUDisplayState(DS_GPU_TYPE_MAIN, false);
+		gpuStateMainGPU = NO;
+	}
+	
+	if (flags & GPUSTATE_MAIN_BG0_MASK)
+	{
+		SetGPULayerState(DS_GPU_TYPE_MAIN, 0, true);
+		gpuStateMainBG0 = YES;
+	}
+	else
+	{
+		SetGPULayerState(DS_GPU_TYPE_MAIN, 0, false);
+		gpuStateMainBG0 = NO;
+	}
+	
+	if (flags & GPUSTATE_MAIN_BG1_MASK)
+	{
+		SetGPULayerState(DS_GPU_TYPE_MAIN, 1, true);
+		gpuStateMainBG1 = YES;
+	}
+	else
+	{
+		SetGPULayerState(DS_GPU_TYPE_MAIN, 1, false);
+		gpuStateMainBG1 = NO;
+	}
+	
+	if (flags & GPUSTATE_MAIN_BG2_MASK)
+	{
+		SetGPULayerState(DS_GPU_TYPE_MAIN, 2, true);
+		gpuStateMainBG2 = YES;
+	}
+	else
+	{
+		SetGPULayerState(DS_GPU_TYPE_MAIN, 2, false);
+		gpuStateMainBG2 = NO;
+	}
+	
+	if (flags & GPUSTATE_MAIN_BG3_MASK)
+	{
+		SetGPULayerState(DS_GPU_TYPE_MAIN, 3, true);
+		gpuStateMainBG3 = YES;
+	}
+	else
+	{
+		SetGPULayerState(DS_GPU_TYPE_MAIN, 3, false);
+		gpuStateMainBG3 = NO;
+	}
+	
+	if (flags & GPUSTATE_MAIN_OBJ_MASK)
+	{
+		SetGPULayerState(DS_GPU_TYPE_MAIN, 4, true);
+		gpuStateMainOBJ = YES;
+	}
+	else
+	{
+		SetGPULayerState(DS_GPU_TYPE_MAIN, 4, false);
+		gpuStateMainOBJ = NO;
+	}
+	
+	if (flags & GPUSTATE_SUB_GPU_MASK)
+	{
+		SetGPUDisplayState(DS_GPU_TYPE_SUB, true);
+		gpuStateSubGPU = YES;
+	}
+	else
+	{
+		SetGPUDisplayState(DS_GPU_TYPE_SUB, false);
+		gpuStateSubGPU = NO;
+	}
+	
+	if (flags & GPUSTATE_SUB_BG0_MASK)
+	{
+		SetGPULayerState(DS_GPU_TYPE_SUB, 0, true);
+		gpuStateSubBG0 = YES;
+	}
+	else
+	{
+		SetGPULayerState(DS_GPU_TYPE_SUB, 0, false);
+		gpuStateSubBG0 = NO;
+	}
+	
+	if (flags & GPUSTATE_SUB_BG1_MASK)
+	{
+		SetGPULayerState(DS_GPU_TYPE_SUB, 1, true);
+		gpuStateSubBG1 = YES;
+	}
+	else
+	{
+		SetGPULayerState(DS_GPU_TYPE_SUB, 1, false);
+		gpuStateSubBG1 = NO;
+	}
+	
+	if (flags & GPUSTATE_SUB_BG2_MASK)
+	{
+		SetGPULayerState(DS_GPU_TYPE_SUB, 2, true);
+		gpuStateSubBG2 = YES;
+	}
+	else
+	{
+		SetGPULayerState(DS_GPU_TYPE_SUB, 2, false);
+		gpuStateSubBG2 = NO;
+	}
+	
+	if (flags & GPUSTATE_SUB_BG3_MASK)
+	{
+		SetGPULayerState(DS_GPU_TYPE_SUB, 3, true);
+		gpuStateSubBG3 = YES;
+	}
+	else
+	{
+		SetGPULayerState(DS_GPU_TYPE_SUB, 3, false);
+		gpuStateSubBG3 = NO;
+	}
+	
+	if (flags & GPUSTATE_SUB_OBJ_MASK)
+	{
+		SetGPULayerState(DS_GPU_TYPE_SUB, 4, true);
+		gpuStateSubOBJ = YES;
+	}
+	else
+	{
+		SetGPULayerState(DS_GPU_TYPE_SUB, 4, false);
+		gpuStateSubOBJ = NO;
+	}
+	
+	pthread_mutex_unlock(self.mutexProducer);
+}
+
+- (UInt32) gpuStateFlags
+{
+	OSSpinLockLock(&spinlockGpuState);
+	const UInt32 flags = gpuStateFlags;
+	OSSpinLockUnlock(&spinlockGpuState);
+	
+	return flags;
+}
+
+- (void) setRender3DRenderingEngine:(NSInteger)methodID
+{
+	pthread_mutex_lock(self.mutexProducer);
+	NDS_3D_ChangeCore(methodID);
+	pthread_mutex_unlock(self.mutexProducer);
+}
+
+- (NSInteger) render3DRenderingEngine
+{
+	pthread_mutex_lock(self.mutexProducer);
+	const NSInteger methodID = (NSInteger)cur3DCore;
+	pthread_mutex_unlock(self.mutexProducer);
+	
+	return methodID;
+}
+
+- (void) setRender3DHighPrecisionColorInterpolation:(BOOL)state
+{
+	pthread_mutex_lock(self.mutexProducer);
+	CommonSettings.GFX3D_HighResolutionInterpolateColor = state ? true : false;
+	pthread_mutex_unlock(self.mutexProducer);
+}
+
+- (BOOL) render3DHighPrecisionColorInterpolation
+{
+	pthread_mutex_lock(self.mutexProducer);
+	const BOOL state = CommonSettings.GFX3D_HighResolutionInterpolateColor ? YES : NO;
+	pthread_mutex_unlock(self.mutexProducer);
+	
+	return state;
+}
+
+- (void) setRender3DEdgeMarking:(BOOL)state
+{
+	pthread_mutex_lock(self.mutexProducer);
+	CommonSettings.GFX3D_EdgeMark = state ? true : false;
+	pthread_mutex_unlock(self.mutexProducer);
+}
+
+- (BOOL) render3DEdgeMarking
+{
+	pthread_mutex_lock(self.mutexProducer);
+	const BOOL state = CommonSettings.GFX3D_EdgeMark ? YES : NO;
+	pthread_mutex_unlock(self.mutexProducer);
+	
+	return state;
+}
+
+- (void) setRender3DFog:(BOOL)state
+{
+	pthread_mutex_lock(self.mutexProducer);
+	CommonSettings.GFX3D_Fog = state ? true : false;
+	pthread_mutex_unlock(self.mutexProducer);
+}
+
+- (BOOL) render3DFog
+{
+	pthread_mutex_lock(self.mutexProducer);
+	const BOOL state = CommonSettings.GFX3D_Fog ? YES : NO;
+	pthread_mutex_unlock(self.mutexProducer);
+	
+	return state;
+}
+
+- (void) setRender3DTextures:(BOOL)state
+{
+	pthread_mutex_lock(self.mutexProducer);
+	CommonSettings.GFX3D_Texture = state ? true : false;
+	pthread_mutex_unlock(self.mutexProducer);
+}
+
+- (BOOL) render3DTextures
+{
+	pthread_mutex_lock(self.mutexProducer);
+	const BOOL state = CommonSettings.GFX3D_Texture ? YES : NO;
+	pthread_mutex_unlock(self.mutexProducer);
+	
+	return state;
+}
+
+- (void) setRender3DDepthComparisonThreshold:(NSUInteger)threshold
+{
+	pthread_mutex_lock(self.mutexProducer);
+	CommonSettings.GFX3D_Zelda_Shadow_Depth_Hack = threshold;
+	pthread_mutex_unlock(self.mutexProducer);
+}
+
+- (NSUInteger) render3DDepthComparisonThreshold
+{
+	pthread_mutex_lock(self.mutexProducer);
+	const NSUInteger threshold = (NSUInteger)CommonSettings.GFX3D_Zelda_Shadow_Depth_Hack;
+	pthread_mutex_unlock(self.mutexProducer);
+	
+	return threshold;
+}
+
+- (void) setRender3DThreads:(NSUInteger)numberThreads
+{
+	NSUInteger numberCores = [[NSProcessInfo processInfo] activeProcessorCount];
+	if (numberThreads == 0)
+	{
+		isCPUCoreCountAuto = YES;
+		
+		if (numberCores >= 8)
+		{
+			numberCores = 8;
+		}
+		else if (numberCores >= 4)
+		{
+			numberCores = 4;
+		}
+		else if (numberCores >= 2)
+		{
+			numberCores = 2;
+		}
+		else
+		{
+			numberCores = 1;
+		}
+	}
+	else
+	{
+		isCPUCoreCountAuto = NO;
+		numberCores = numberThreads;
+	}
+	
+	NSInteger renderingEngineID = [self render3DRenderingEngine];
+	
+	pthread_mutex_lock(self.mutexProducer);
+	
+	CommonSettings.num_cores = numberCores;
+	if (renderingEngineID == CORE3DLIST_SWRASTERIZE)
+	{
+		NDS_3D_ChangeCore(CORE3DLIST_SWRASTERIZE);
+	}
+	else if (renderingEngineID == CORE3DLIST_OPENGL)
+	{
+		NDS_3D_ChangeCore(CORE3DLIST_OPENGL);
+	}
+	
+	pthread_mutex_unlock(self.mutexProducer);
+}
+
+- (NSUInteger) render3DThreads
+{
+	pthread_mutex_lock(self.mutexProducer);
+	const NSUInteger numberThreads = isCPUCoreCountAuto ? 0 : (NSUInteger)CommonSettings.num_cores;
+	pthread_mutex_unlock(self.mutexProducer);
+	
+	return numberThreads;
+}
+
+- (void) setRender3DLineHack:(BOOL)state
+{
+	pthread_mutex_lock(self.mutexProducer);
+	CommonSettings.GFX3D_LineHack = state ? true : false;
+	pthread_mutex_unlock(self.mutexProducer);
+}
+
+- (BOOL) render3DLineHack
+{
+	pthread_mutex_lock(self.mutexProducer);
+	const BOOL state = CommonSettings.GFX3D_LineHack ? YES : NO;
+	pthread_mutex_unlock(self.mutexProducer);
+	
+	return state;
+}
+
+- (void) setRender3DMultisample:(BOOL)state
+{
+	pthread_mutex_lock(self.mutexProducer);
+	CommonSettings.GFX3D_Renderer_Multisample = state ? true : false;
+	pthread_mutex_unlock(self.mutexProducer);
+}
+
+- (BOOL) render3DMultisample
+{
+	pthread_mutex_lock(self.mutexProducer);
+	const BOOL state = CommonSettings.GFX3D_Renderer_Multisample ? YES : NO;
+	pthread_mutex_unlock(self.mutexProducer);
+	
+	return state;
+}
+
+- (BOOL) gpuStateByBit:(const UInt32)stateBit
+{
+	return (self.gpuStateFlags & (1 << stateBit)) ? YES : NO;
+}
+
+- (BOOL) isGPUTypeDisplayed:(const NSInteger)theGpuType
+{
+	BOOL result = NO;
+	const UInt32 flags = self.gpuStateFlags;
+	
+	switch (theGpuType)
+	{
+		case DS_GPU_TYPE_MAIN:
+			if (flags & GPUSTATE_MAIN_GPU_MASK)
+			{
+				result = YES;
+			}
+			break;
+			
+		case DS_GPU_TYPE_SUB:
+			if (flags & GPUSTATE_SUB_GPU_MASK)
+			{
+				result = YES;
+			}
+			break;
+			
+		case DS_GPU_TYPE_COMBO:
+			if (flags & (GPUSTATE_MAIN_GPU_MASK | GPUSTATE_SUB_GPU_MASK))
+			{
+				result = YES;
+			}
+			break;
+			
+		default:
+			break;
+	}
+	
+	return result;
+}
+
+- (void) hideGPUType:(const NSInteger)theGpuType
+{
+	UInt32 flags = self.gpuStateFlags;
+	
+	switch (theGpuType)
+	{
+		case DS_GPU_TYPE_MAIN:
+			flags &= ~GPUSTATE_MAIN_GPU_MASK;
+			break;
+			
+		case DS_GPU_TYPE_SUB:
+			flags &= ~GPUSTATE_SUB_GPU_MASK;
+			break;
+			
+		case DS_GPU_TYPE_COMBO:
+			flags &= ~GPUSTATE_MAIN_GPU_MASK;
+			flags &= ~GPUSTATE_SUB_GPU_MASK;
+			break;
+			
+		default:
+			break;
+	}
+	
+	self.gpuStateFlags = flags;
+}
+
+- (void) showGPUType:(const NSInteger)theGpuType
+{
+	UInt32 flags = self.gpuStateFlags;
+	
+	switch (theGpuType)
+	{
+		case DS_GPU_TYPE_MAIN:
+			flags |= GPUSTATE_MAIN_GPU_MASK;
+			break;
+			
+		case DS_GPU_TYPE_SUB:
+			flags |= GPUSTATE_SUB_GPU_MASK;
+			break;
+			
+		case DS_GPU_TYPE_COMBO:
+			flags |= GPUSTATE_MAIN_GPU_MASK;
+			flags |= GPUSTATE_SUB_GPU_MASK;
+			break;
+			
+		default:
+			break;
+	}
+	
+	self.gpuStateFlags = flags;
+}
+
+@end
+
+void SetGPULayerState(const int gpuType, const unsigned int i, const bool state)
+{
+	GPU *theGpu = NULL;
+	
+	// Check bounds on the layer index.
+	if(i > 4)
+	{
+		return;
+	}
+	
+	switch (gpuType)
+	{
+		case DS_GPU_TYPE_SUB:
+			theGpu = SubScreen.gpu;
+			break;
+			
+		case DS_GPU_TYPE_MAIN:
+			theGpu = MainScreen.gpu;
+			break;
+			
+		case DS_GPU_TYPE_COMBO:
+			SetGPULayerState(DS_GPU_TYPE_SUB, i, state); // Recursive call
+			theGpu = MainScreen.gpu;
+			break;
+			
+		default:
+			break;
+	}
+	
+	if (theGpu != NULL)
+	{
+		if (state)
+		{
+			GPU_addBack(theGpu, i);
+		}
+		else
+		{
+			GPU_remove(theGpu, i);
+		}
+	}
+}
+
+bool GetGPULayerState(const int gpuType, const unsigned int i)
+{
+	bool result = false;
+	
+	// Check bounds on the layer index.
+	if(i > 4)
+	{
+		return result;
+	}
+	
+	switch (gpuType)
+	{
+		case DS_GPU_TYPE_SUB:
+			if (SubScreen.gpu != nil)
+			{
+				result = CommonSettings.dispLayers[SubScreen.gpu->core][i];
+			}
+			break;
+			
+		case DS_GPU_TYPE_MAIN:
+			if (MainScreen.gpu != nil)
+			{
+				result = CommonSettings.dispLayers[MainScreen.gpu->core][i];
+			}
+			break;
+			
+		case DS_GPU_TYPE_COMBO:
+			if (SubScreen.gpu != nil && MainScreen.gpu != nil)
+			{
+				result = (CommonSettings.dispLayers[SubScreen.gpu->core][i] && CommonSettings.dispLayers[MainScreen.gpu->core][i]);
+			}
+			break;
+			
+		default:
+			break;
+	}
+	
+	return result;
+}
+
+void SetGPUDisplayState(const int gpuType, const bool state)
+{
+	switch (gpuType)
+	{
+		case DS_GPU_TYPE_SUB:
+			CommonSettings.showGpu.sub = state;
+			break;
+			
+		case DS_GPU_TYPE_MAIN:
+			CommonSettings.showGpu.main = state;
+			break;
+			
+		case DS_GPU_TYPE_COMBO:
+			CommonSettings.showGpu.sub = state;
+			CommonSettings.showGpu.main = state;
+			break;
+			
+		default:
+			break;
+	}
+}
+
+bool GetGPUDisplayState(const int gpuType)
+{
+	bool result = false;
+	
+	switch (gpuType)
+	{
+		case DS_GPU_TYPE_SUB:
+			result = CommonSettings.showGpu.sub;
+			break;
+			
+		case DS_GPU_TYPE_MAIN:
+			result = CommonSettings.showGpu.main;
+			break;
+			
+		case DS_GPU_TYPE_COMBO:
+			result = (CommonSettings.showGpu.sub && CommonSettings.showGpu.main);
+			break;
+			
+		default:
+			break;
+	}
+	
+	return result;
+}
+
+CGLContextObj OSXOpenGLRendererContext = NULL;
+CGLPBufferObj OSXOpenGLRendererPBuffer = NULL;
+
+bool OSXOpenGLRendererInit()
+{
+	static bool isContextAlreadyCreated = false;
+	
+	if (!isContextAlreadyCreated)
+	{
+		isContextAlreadyCreated = CreateOpenGLRenderer();
+	}
+	
+	return true;
+}
+
+bool OSXOpenGLRendererBegin()
+{
+	CGLSetCurrentContext(OSXOpenGLRendererContext);
+	
+	return true;
+}
+
+void OSXOpenGLRendererEnd()
+{
+	
+}
+
+bool CreateOpenGLRenderer()
+{
+	bool result = false;
+	bool useContext_3_2 = false;
+	CGLPixelFormatObj cglPixFormat = NULL;
+	CGLContextObj newContext = NULL;
+	CGLPBufferObj newPBuffer = NULL;
+	GLint virtualScreenCount = 0;
+	
+	CGLPixelFormatAttribute attrs[] = {
+		kCGLPFAColorSize, (CGLPixelFormatAttribute)24,
+		kCGLPFAAlphaSize, (CGLPixelFormatAttribute)8,
+		kCGLPFADepthSize, (CGLPixelFormatAttribute)24,
+		kCGLPFAStencilSize, (CGLPixelFormatAttribute)8,
+		kCGLPFAAccelerated,
+		(CGLPixelFormatAttribute)0, (CGLPixelFormatAttribute)0,
+		(CGLPixelFormatAttribute)0
+	};
+	
+#ifdef MAC_OS_X_VERSION_10_7
+	// If we can support a 3.2 Core Profile context, then request that in our
+	// pixel format attributes.
+	useContext_3_2 = [CocoaDSUtil OSVersionCheckMajor:10 minor:7 revision:0] ? true : false;
+	if (useContext_3_2)
+	{
+		attrs[9] = kCGLPFAOpenGLProfile;
+		attrs[10] = (CGLPixelFormatAttribute)kCGLOGLPVersion_3_2_Core;
+	}
+#endif
+	
+	CGLChoosePixelFormat(attrs, &cglPixFormat, &virtualScreenCount);
+	if (cglPixFormat == NULL)
+	{
+		// Remove the HW rendering requirement and try again. Note that this will
+		// result in SW rendering, which will cause a substantial speed hit.
+		attrs[8] = (CGLPixelFormatAttribute)0;
+		CGLChoosePixelFormat(attrs, &cglPixFormat, &virtualScreenCount);
+		if (cglPixFormat == NULL)
+		{
+			return result;
+		}
+	}
+	
+	CGLCreateContext(cglPixFormat, NULL, &newContext);
+	CGLReleasePixelFormat(cglPixFormat);
+	
+	// Create a PBuffer for legacy contexts since the availability of FBOs
+	// is not guaranteed.
+	if (!useContext_3_2)
+	{
+		CGLCreatePBuffer(GPU_DISPLAY_WIDTH, GPU_DISPLAY_HEIGHT, GL_TEXTURE_2D, GL_RGBA, 0, &newPBuffer);
+		
+		if (newPBuffer == NULL)
+		{
+			CGLReleaseContext(newContext);
+			return result;
+		}
+		else
+		{
+			GLint virtualScreenID = 0;
+			
+			CGLGetVirtualScreen(newContext, &virtualScreenID);
+			CGLSetPBuffer(newContext, newPBuffer, 0, 0, virtualScreenID);
+		}
+	}
+	
+	RequestOpenGLRenderer_3_2(useContext_3_2);
+	OSXOpenGLRendererContext = newContext;
+	OSXOpenGLRendererPBuffer = newPBuffer;
+	
+	result = true;
+	return result;
+}
+
+void DestroyOpenGLRenderer()
+{
+	if (OSXOpenGLRendererContext == NULL)
+	{
+		return;
+	}
+	
+	CGLReleasePBuffer(OSXOpenGLRendererPBuffer);
+	CGLReleaseContext(OSXOpenGLRendererContext);
+	OSXOpenGLRendererContext = NULL;
+	OSXOpenGLRendererPBuffer = NULL;
+}
+
+void RequestOpenGLRenderer_3_2(bool request_3_2)
+{
+#ifdef OGLRENDER_3_2_H
+	if (request_3_2)
+	{
+		OGLLoadEntryPoints_3_2_Func = &OGLLoadEntryPoints_3_2;
+		OGLCreateRenderer_3_2_Func = &OGLCreateRenderer_3_2;
+	}
+	else
+	{
+		OGLLoadEntryPoints_3_2_Func = NULL;
+		OGLCreateRenderer_3_2_Func = NULL;
+	}
+#else
+	OGLLoadEntryPoints_3_2_Func = NULL;
+	OGLCreateRenderer_3_2_Func = NULL;
+#endif
+}
+
+void SetOpenGLRendererFunctions(bool (*initFunction)(),
+								bool (*beginOGLFunction)(),
+								void (*endOGLFunction)())
+{
+	oglrender_init = initFunction;
+	oglrender_beginOpenGL = beginOGLFunction;
+	oglrender_endOpenGL = endOGLFunction;
+}

Modified: trunk/desmume/src/cocoa/cocoa_cheat.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_cheat.h	2013-02-11 20:57:16 UTC (rev 4532)
+++ trunk/desmume/src/cocoa/cocoa_cheat.h	2013-02-13 23:46:02 UTC (rev 4533)
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2012 DeSmuME team
+	Copyright (C) 2011-2013 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 
 #import <Cocoa/Cocoa.h>
 #include "../cheatSystem.h"
+#undef BOOL
 
 @class CocoaDSCore;
 

Modified: trunk/desmume/src/cocoa/cocoa_core.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_core.h	2013-02-11 20:57:16 UTC (rev 4532)
+++ trunk/desmume/src/cocoa/cocoa_core.h	2013-02-13 23:46:02 UTC (rev 4533)
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2012 DeSmuME team
+	Copyright (C) 2011-2013 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 
 @class CocoaDSController;
 @class CocoaDSFirmware;
+@class CocoaDSGPU;
 @class CocoaDSOutput;
 
 typedef struct
@@ -45,6 +46,7 @@
 {
 	CocoaDSController *cdsController;
 	CocoaDSFirmware *cdsFirmware;
+	CocoaDSGPU *cdsGPU;
 	NSMutableArray *cdsOutputList;
 	
 	pthread_t coreThread;
@@ -77,7 +79,8 @@
 
 @property (retain) CocoaDSController *cdsController;
 @property (retain) CocoaDSFirmware *cdsFirmware;
-@... (readonly) NSMutableArray *cdsOutputList;
+@property (retain) CocoaDSGPU *cdsGPU;
+@property (assign) NSMutableArray *cdsOutputList;
 
 @property (assign) BOOL masterExecute;
 @property (assign) BOOL isFrameSkipEnabled;

Modified: trunk/desmume/src/cocoa/cocoa_core.mm

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4534
          http://desmume.svn.sourceforge.net/desmume/?rev=4534&view=rev
Author:   rogerman
Date:     2013-02-15 02:37:14 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
Cocoa Port:
- Fix regression from r4533 where the UI elements in the Cheat Manager window wouldn't update in sync with ROM loading/unloading.
- Do a bunch of code cleanup.

Revision Links:
--------------
    http://desmume.svn.sourceforge.net/desmume/?rev=4533&view=rev

Modified Paths:
--------------
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
    trunk/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm
    trunk/desmume/src/cocoa/userinterface/displayView.h
    trunk/desmume/src/cocoa/userinterface/displayView.mm
    trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.mm
    trunk/desmume/src/cocoa/userinterface/preferencesWindowDelegate.mm

Modified: trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
===================================================================
--- trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib	2013-02-13 23:46:02 UTC (rev 4533)
+++ trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib	2013-02-15 02:37:14 UTC (rev 4534)
@@ -10374,7 +10374,7 @@
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<string key="NSWindowContentMinSize">{700, 250}</string>
 				<object class="NSView" key="NSWindowView" id="744235317">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -10383,7 +10383,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 310}, {666, 34}}</string>
 							<reference key="NSSuperview" ref="744235317"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="779344339">
 								<int key="NSCellFlags">67239424</int>
@@ -10404,7 +10403,6 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{362, 12}, {162, 32}}</string>
 							<reference key="NSSuperview" ref="744235317"/>
-							<reference key="NSWindow"/>
 							<int key="NSTag">2</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="258533086">
@@ -10426,7 +10424,6 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{200, 12}, {162, 32}}</string>
 							<reference key="NSSuperview" ref="744235317"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="597655813">
 								<int key="NSCellFlags">67239424</int>
@@ -10447,7 +10444,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 274}, {666, 28}}</string>
 							<reference key="NSSuperview" ref="744235317"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="229271955">
 								<int key="NSCellFlags">67239424</int>
@@ -10464,7 +10460,6 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{18, 21}, {182, 18}}</string>
 							<reference key="NSSuperview" ref="744235317"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="845859732">
 								<int key="NSCellFlags">67239424</int>
@@ -10487,7 +10482,6 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{524, 12}, {162, 32}}</string>
 							<reference key="NSSuperview" ref="744235317"/>
-							<reference key="NSWindow"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="861554098">
@@ -10519,14 +10513,12 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrameSize">{700, 195}</string>
 											<reference key="NSSuperview" ref="105498168"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="410961279">
 												<reference key="NSNextResponder" ref="163187225"/>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrameSize">{700, 17}</string>
 												<reference key="NSSuperview" ref="163187225"/>
-												<reference key="NSWindow"/>
 												<reference key="NSTableView" ref="253463434"/>
 											</object>
 											<object class="_NSCornerView" key="NSCornerView" id="2083">
@@ -10534,7 +10526,6 @@
 												<int key="NSvFlags">-2147483392</int>
 												<string key="NSFrame">{{544, 0}, {16, 17}}</string>
 												<reference key="NSSuperview" ref="728474876"/>
-												<reference key="NSWindow"/>
 											</object>
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
@@ -10690,7 +10681,6 @@
 									</object>
 									<string key="NSFrame">{{1, 17}, {700, 195}}</string>
 									<reference key="NSSuperview" ref="728474876"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="253463434"/>
 									<reference key="NSDocView" ref="253463434"/>
 									<reference key="NSBGColor" ref="856317944"/>
@@ -10701,7 +10691,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{544, 17}, {15, 180}}</string>
 									<reference key="NSSuperview" ref="728474876"/>
-									<reference key="NSWindow"/>
 									<reference key="NSTarget" ref="728474876"/>
 									<string key="NSAction">_doScroller:</string>
 									<double key="NSPercent">0.92307692307692313</double>
@@ -10711,7 +10700,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{1, 197}, {598, 15}}</string>
 									<reference key="NSSuperview" ref="728474876"/>
-									<reference key="NSWindow"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="728474876"/>
 									<string key="NSAction">_doScroller:</string>
@@ -10726,7 +10714,6 @@
 									</object>
 									<string key="NSFrame">{{1, 0}, {700, 17}}</string>
 									<reference key="NSSuperview" ref="728474876"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="410961279"/>
 									<reference key="NSDocView" ref="410961279"/>
 									<reference key="NSBGColor" ref="856317944"/>
@@ -10736,7 +10723,6 @@
 							</object>
 							<string key="NSFrame">{{-1, 53}, {702, 213}}</string>
 							<reference key="NSSuperview" ref="744235317"/>
-							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="105498168"/>
 							<int key="NSsFlags">562</int>
 							<reference key="NSVScroller" ref="153897110"/>
@@ -10748,8 +10734,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{700, 364}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{700, 272}</string>
@@ -11609,7 +11593,7 @@
 				<string key="NSClassName">CheatWindowDelegate</string>
 			</object>
 			<object class="NSCustomView" id="653859410">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -11618,6 +11602,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{17, 4}, {294, 14}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="985033608">
 							<int key="NSCellFlags">68288064</int>
@@ -11635,6 +11620,7 @@
 						<object class="NSPSMatrix" key="NSDrawMatrix"/>
 						<string key="NSFrame">{{214, 220}, {16, 16}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
+						<reference key="NSWindow"/>
 						<int key="NSpiFlags">28938</int>
 						<double key="NSMaxValue">100</double>
 					</object>
@@ -11643,6 +11629,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{133, 369}, {136, 22}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="825069250">
 							<int key="NSCellFlags">-1539178944</int>
@@ -11699,6 +11686,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{59, 374}, {60, 14}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="260875644">
 							<int key="NSCellFlags">68288064</int>
@@ -11715,6 +11703,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{59, 398}, {72, 14}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="242082681">
 							<int key="NSCellFlags">68288064</int>
@@ -11731,6 +11720,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{133, 393}, {136, 22}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="23677458">
 							<int key="NSCellFlags">-2076049856</int>
@@ -11787,6 +11777,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{0, 237}, {328, 134}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
+						<reference key="NSWindow"/>
 						<string key="NSClassName">NSView</string>
 					</object>
 					<object class="NSButton" id="493042311">
@@ -11794,6 +11785,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{233, 213}, {80, 28}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="570153276">
 							<int key="NSCellFlags">67239424</int>
@@ -11814,6 +11806,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{59, 222}, {150, 14}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="38661384">
 							<int key="NSCellFlags">68288064</int>
@@ -11831,6 +11824,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 222}, {45, 14}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="717962612">
 							<int key="NSCellFlags">68288064</int>
@@ -11857,12 +11851,14 @@
 										<int key="NSvFlags">256</int>
 										<string key="NSFrameSize">{286, 176}</string>
 										<reference key="NSSuperview" ref="381081269"/>
+										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSTableHeaderView" key="NSHeaderView" id="833610819">
 											<reference key="NSNextResponder" ref="872327306"/>
 											<int key="NSvFlags">256</int>
 											<string key="NSFrameSize">{286, 17}</string>
 											<reference key="NSSuperview" ref="872327306"/>
+											<reference key="NSWindow"/>
 											<reference key="NSTableView" ref="1001428622"/>
 										</object>
 										<object class="_NSCornerView" key="NSCornerView" id="2381">
@@ -11870,6 +11866,7 @@
 											<int key="NSvFlags">-2147483392</int>
 											<string key="NSFrame">{{224, 0}, {16, 17}}</string>
 											<reference key="NSSuperview" ref="502150128"/>
+											<reference key="NSWindow"/>
 										</object>
 										<object class="NSMutableArray" key="NSTableColumns">
 											<bool key="EncodedWithXMLCoder">YES</bool>
@@ -11949,6 +11946,8 @@
 								</object>
 								<string key="NSFrame">{{1, 17}, {286, 176}}</string>
 								<reference key="NSSuperview" ref="502150128"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="1001428622"/>
 								<reference key="NSDocView" ref="1001428622"/>
 								<reference key="NSBGColor" ref="856317944"/>
 								<int key="NScvFlags">4</int>
@@ -11958,6 +11957,7 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{224, 17}, {15, 102}}</string>
 								<reference key="NSSuperview" ref="502150128"/>
+								<reference key="NSWindow"/>
 								<reference key="NSTarget" ref="502150128"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSPercent">0.94863013698630139</double>
@@ -11967,6 +11967,7 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{1, 294}, {338, 15}}</string>
 								<reference key="NSSuperview" ref="502150128"/>
+								<reference key="NSWindow"/>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="502150128"/>
 								<string key="NSAction">_doScroller:</string>
@@ -11981,6 +11982,8 @@
 								</object>
 								<string key="NSFrame">{{1, 0}, {286, 17}}</string>
 								<reference key="NSSuperview" ref="502150128"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="833610819"/>
 								<reference key="NSDocView" ref="833610819"/>
 								<reference key="NSBGColor" ref="856317944"/>
 								<int key="NScvFlags">4</int>
@@ -11989,6 +11992,8 @@
 						</object>
 						<string key="NSFrame">{{20, 20}, {288, 194}}</string>
 						<reference key="NSSuperview" ref="653859410"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="381081269"/>
 						<int key="NSsFlags">562</int>
 						<reference key="NSVScroller" ref="116802186"/>
 						<reference key="NSHScroller" ref="432085887"/>
@@ -11999,6 +12004,8 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{328, 434}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSDrawer" id="22830540">
@@ -12023,7 +12030,7 @@
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<string key="NSWindowContentMinSize">{500, 272}</string>
 				<object class="NSView" key="NSWindowView" id="353538986">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -12042,12 +12049,14 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrameSize">{500, 287}</string>
 											<reference key="NSSuperview" ref="979497021"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="882670721">
 												<reference key="NSNextResponder" ref="621690129"/>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrameSize">{500, 17}</string>
 												<reference key="NSSuperview" ref="621690129"/>
+												<reference key="NSWindow"/>
 												<reference key="NSTableView" ref="471622593"/>
 											</object>
 											<object class="_NSCornerView" key="NSCornerView" id="2609">
@@ -12055,6 +12064,7 @@
 												<int key="NSvFlags">-2147483392</int>
 												<string key="NSFrame">{{224, 0}, {16, 17}}</string>
 												<reference key="NSSuperview" ref="740354183"/>
+												<reference key="NSWindow"/>
 											</object>
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
@@ -12136,6 +12146,7 @@
 									</object>
 									<string key="NSFrame">{{1, 17}, {500, 287}}</string>
 									<reference key="NSSuperview" ref="740354183"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="471622593"/>
 									<reference key="NSDocView" ref="471622593"/>
 									<reference key="NSBGColor" ref="856317944"/>
@@ -12146,6 +12157,7 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{224, 17}, {15, 102}}</string>
 									<reference key="NSSuperview" ref="740354183"/>
+									<reference key="NSWindow"/>
 									<reference key="NSTarget" ref="740354183"/>
 									<string key="NSAction">_doScroller:</string>
 									<double key="NSPercent">0.94773519163763065</double>
@@ -12155,6 +12167,7 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{1, 249}, {568, 15}}</string>
 									<reference key="NSSuperview" ref="740354183"/>
+									<reference key="NSWindow"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="740354183"/>
 									<string key="NSAction">_doScroller:</string>
@@ -12169,6 +12182,7 @@
 									</object>
 									<string key="NSFrame">{{1, 0}, {500, 17}}</string>
 									<reference key="NSSuperview" ref="740354183"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="882670721"/>
 									<reference key="NSDocView" ref="882670721"/>
 									<reference key="NSBGColor" ref="856317944"/>
@@ -12178,6 +12192,7 @@
 							</object>
 							<string key="NSFrame">{{-1, 57}, {502, 305}}</string>
 							<reference key="NSSuperview" ref="353538986"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="979497021"/>
 							<int key="NSsFlags">562</int>
 							<reference key="NSVScroller" ref="537392378"/>
@@ -12192,6 +12207,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 370}, {120, 14}}</string>
 							<reference key="NSSuperview" ref="353538986"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="130101551">
 								<int key="NSCellFlags">68288064</int>
@@ -12208,6 +12224,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 392}, {63, 14}}</string>
 							<reference key="NSSuperview" ref="353538986"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="598451249">
 								<int key="NSCellFlags">68288064</int>
@@ -12224,6 +12241,7 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{14, 12}, {114, 32}}</string>
 							<reference key="NSSuperview" ref="353538986"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="753942431">
 								<int key="NSCellFlags">67239424</int>
@@ -12244,6 +12262,7 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{128, 12}, {114, 32}}</string>
 							<reference key="NSSuperview" ref="353538986"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="505105353">
 								<int key="NSCellFlags">67239424</int>
@@ -12264,6 +12283,7 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{390, 12}, {96, 32}}</string>
 							<reference key="NSSuperview" ref="353538986"/>
+							<reference key="NSWindow"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="916129418">
@@ -12285,6 +12305,7 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{294, 12}, {96, 32}}</string>
 							<reference key="NSSuperview" ref="353538986"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="1008167590">
 								<int key="NSCellFlags">67239424</int>
@@ -12305,6 +12326,7 @@
 							<int key="NSvFlags">265</int>
 							<string key="NSFrame">{{378, 370}, {42, 14}}</string>
 							<reference key="NSSuperview" ref="353538986"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="423886330">
 								<int key="NSCellFlags">68288064</int>
@@ -12321,6 +12343,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{139, 370}, {237, 14}}</string>
 							<reference key="NSSuperview" ref="353538986"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="168969464">
 								<int key="NSCellFlags">68288064</int>
@@ -12338,6 +12361,7 @@
 							<int key="NSvFlags">265</int>
 							<string key="NSFrame">{{422, 370}, {61, 14}}</string>
 							<reference key="NSSuperview" ref="353538986"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="299520343">
 								<int key="NSCellFlags">68288064</int>
@@ -12355,6 +12379,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{82, 392}, {401, 14}}</string>
 							<reference key="NSSuperview" ref="353538986"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="1055682485">
 								<int key="NSCellFlags">68288064</int>
@@ -12369,6 +12394,8 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{500, 416}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{500, 294}</string>
@@ -12503,7 +12530,7 @@
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="285216239">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -12512,6 +12539,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 86}, {294, 14}}</string>
 						<reference key="NSSuperview" ref="285216239"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="275372728">
 							<int key="NSCellFlags">67239424</int>
@@ -12528,6 +12556,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 100}, {294, 14}}</string>
 						<reference key="NSSuperview" ref="285216239"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="130647976">
 							<int key="NSCellFlags">67239424</int>
@@ -12544,6 +12573,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{116, 47}, {96, 28}}</string>
 						<reference key="NSSuperview" ref="285216239"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="691211442">
 							<int key="NSCellFlags">67239424</int>
@@ -12561,10 +12591,12 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{328, 134}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="1374314">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -12573,6 +12605,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 72}, {294, 28}}</string>
 						<reference key="NSSuperview" ref="1374314"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="838644280">
 							<int key="NSCellFlags">67239424</int>
@@ -12589,6 +12622,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 100}, {294, 14}}</string>
 						<reference key="NSSuperview" ref="1374314"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="122094388">
 							<int key="NSCellFlags">67239424</int>
@@ -12605,6 +12639,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{163, 13}, {150, 28}}</string>
 						<reference key="NSSuperview" ref="1374314"/>
+						<reference key="NSWindow"/>
 						<int key="NSTag">1</int>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="102618341">
@@ -12626,6 +12661,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{163, 40}, {150, 28}}</string>
 						<reference key="NSSuperview" ref="1374314"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="561792157">
 							<int key="NSCellFlags">67239424</int>
@@ -12646,6 +12682,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{15, 13}, {150, 28}}</string>
 						<reference key="NSSuperview" ref="1374314"/>
+						<reference key="NSWindow"/>
 						<int key="NSTag">3</int>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="667680815">
@@ -12667,6 +12704,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{15, 40}, {150, 28}}</string>
 						<reference key="NSSuperview" ref="1374314"/>
+						<reference key="NSWindow"/>
 						<int key="NSTag">2</int>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="414497844">
@@ -12685,10 +12723,12 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{328, 134}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="306344915">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">301</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -12697,6 +12737,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{197, 191}, {109, 32}}</string>
 						<reference key="NSSuperview" ref="306344915"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="135944944">
 							<int key="NSCellFlags">67239424</int>
@@ -12717,6 +12758,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 20}, {286, 42}}</string>
 						<reference key="NSSuperview" ref="306344915"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="129743229">
 							<int key="NSCellFlags">67239424</int>
@@ -12733,6 +12775,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 262}, {128, 17}}</string>
 						<reference key="NSSuperview" ref="306344915"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="956303325">
 							<int key="NSCellFlags">68288064</int>
@@ -12749,6 +12792,7 @@
 						<int key="NSvFlags">265</int>
 						<string key="NSFrame">{{149, 257}, {27, 27}}</string>
 						<reference key="NSSuperview" ref="306344915"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="107511138">
 							<int key="NSCellFlags">-2080244224</int>
@@ -12773,6 +12817,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{79, 230}, {38, 17}}</string>
 						<reference key="NSSuperview" ref="306344915"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="245978693">
 							<int key="NSCellFlags">68288064</int>
@@ -12793,6 +12838,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{67, 198}, {128, 22}}</string>
 						<reference key="NSSuperview" ref="306344915"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="528979890">
 							<int key="NSCellFlags">-1804468671</int>
@@ -12864,6 +12910,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 201}, {45, 17}}</string>
 						<reference key="NSSuperview" ref="306344915"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="64587549">
 							<int key="NSCellFlags">68288064</int>
@@ -12880,6 +12927,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{122, 228}, {73, 22}}</string>
 						<reference key="NSSuperview" ref="306344915"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="219872989">
 							<int key="NSCellFlags">-1804468671</int>
@@ -12897,6 +12945,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 231}, {60, 17}}</string>
 						<reference key="NSSuperview" ref="306344915"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="771067014">
 							<int key="NSCellFlags">68288064</int>
@@ -12923,6 +12972,7 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{18, 14}, {190, 78}}</string>
 										<reference key="NSSuperview" ref="690888117"/>
+										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<int key="NSNumRows">4</int>
 										<int key="NSNumCols">1</int>
@@ -13141,10 +13191,12 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {226, 102}}</string>
 								<reference key="NSSuperview" ref="224000982"/>
+								<reference key="NSWindow"/>
 							</object>
 						</object>
 						<string key="NSFrame">{{46, 72}, {228, 118}}</string>
 						<reference key="NSSuperview" ref="306344915"/>
+						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -13165,10 +13217,12 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{320, 290}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="439595996">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">301</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -13210,6 +13264,7 @@
 										</object>
 										<string key="NSFrame">{{0, 125}, {278, 53}}</string>
 										<reference key="NSSuperview" ref="612858975"/>
+										<reference key="NSWindow"/>
 										<object class="NSTextContainer" key="NSTextContainer" id="848187789">
 											<object class="NSLayoutManager" key="NSLayoutManager">
 												<object class="NSTextStorage" key="NSTextStorage">
@@ -13281,6 +13336,7 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {278, 223}}</string>
 								<reference key="NSSuperview" ref="332554094"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="612136785"/>
 								<reference key="NSDocView" ref="612136785"/>
 								<reference key="NSBGColor" ref="991462592"/>
@@ -13292,6 +13348,7 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{231, 1}, {15, 172}}</string>
 								<reference key="NSSuperview" ref="332554094"/>
+								<reference key="NSWindow"/>
 								<reference key="NSTarget" ref="332554094"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSPercent">0.68253968253968256</double>
@@ -13301,6 +13358,7 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 								<reference key="NSSuperview" ref="332554094"/>
+								<reference key="NSWindow"/>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="332554094"/>
 								<string key="NSAction">_doScroller:</string>
@@ -13310,6 +13368,7 @@
 						</object>
 						<string key="NSFrame">{{20, 20}, {280, 225}}</string>
 						<reference key="NSSuperview" ref="439595996"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="612858975"/>
 						<int key="NSsFlags">530</int>
 						<reference key="NSVScroller" ref="662113178"/>
@@ -13321,6 +13380,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 253}, {138, 17}}</string>
 						<reference key="NSSuperview" ref="439595996"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="924249429">
 							<int key="NSCellFlags">68288064</int>
@@ -13334,10 +13394,12 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{320, 290}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="970420241">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">301</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -13358,6 +13420,7 @@
 						</object>
 						<string key="NSFrame">{{101, 133}, {128, 128}}</string>
 						<reference key="NSSuperview" ref="970420241"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSImageCell" key="NSCell" id="871279379">
 							<int key="NSCellFlags">130560</int>
@@ -13378,6 +13441,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 35}, {286, 72}}</string>
 						<reference key="NSSuperview" ref="970420241"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="167903530">
 							<int key="NSCellFlags">67239424</int>
@@ -13395,6 +13459,8 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{320, 290}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSWindowTemplate" id="193751677">
@@ -15428,7 +15494,7 @@
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="729561310">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -15447,7 +15513,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 77}, {206, 18}}</string>
 											<reference key="NSSuperview" ref="372893695"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="715693022">
 												<int key="NSCellFlags">-2080244224</int>
@@ -15470,7 +15535,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 57}, {134, 18}}</string>
 											<reference key="NSSuperview" ref="372893695"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="874032897">
 												<int key="NSCellFlags">-2080244224</int>
@@ -15493,7 +15557,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 37}, {80, 18}}</string>
 											<reference key="NSSuperview" ref="372893695"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="67001337">
 												<int key="NSCellFlags">-2080244224</int>
@@ -15516,7 +15579,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{185, 12}, {45, 19}}</string>
 											<reference key="NSSuperview" ref="372893695"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="424545719">
 												<int key="NSCellFlags">-1804468671</int>
@@ -15597,7 +15659,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 14}, {165, 14}}</string>
 											<reference key="NSSuperview" ref="372893695"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="714807735">
 												<int key="NSCellFlags">68288064</int>
@@ -15612,12 +15673,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {248, 103}}</string>
 									<reference key="NSSuperview" ref="219189503"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{17, 241}, {250, 119}}</string>
 							<reference key="NSSuperview" ref="729561310"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -15641,7 +15700,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{65, 18}, {154, 19}}</string>
 							<reference key="NSSuperview" ref="729561310"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="837427736">
 								<int key="NSCellFlags">-2080244224</int>
@@ -15672,7 +15730,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{18, 14}, {107, 58}}</string>
 											<reference key="NSSuperview" ref="909175549"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<int key="NSNumRows">3</int>
 											<int key="NSNumCols">1</int>
@@ -15877,12 +15934,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {248, 82}}</string>
 									<reference key="NSSuperview" ref="299127137"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{17, 442}, {250, 98}}</string>
 							<reference key="NSSuperview" ref="729561310"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -15916,7 +15971,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{18, 14}, {120, 98}}</string>
 											<reference key="NSSuperview" ref="1000433834"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<int key="NSNumRows">5</int>
 											<int key="NSNumCols">1</int>
@@ -16181,12 +16235,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {248, 122}}</string>
 									<reference key="NSSuperview" ref="264524412"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{17, 41}, {250, 138}}</string>
 							<reference key="NSSuperview" ref="729561310"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -16220,7 +16272,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 32}, {113, 18}}</string>
 											<reference key="NSSuperview" ref="887816052"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="394241287">
 												<int key="NSCellFlags">-2080244224</int>
@@ -16243,7 +16294,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 12}, {108, 18}}</string>
 											<reference key="NSSuperview" ref="887816052"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="109440671">
 												<int key="NSCellFlags">-2080244224</int>
@@ -16264,12 +16314,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {248, 58}}</string>
 									<reference key="NSSuperview" ref="353783913"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{17, 364}, {250, 74}}</string>
 							<reference key="NSSuperview" ref="729561310"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -16303,7 +16351,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{16, 12}, {192, 18}}</string>
 											<reference key="NSSuperview" ref="633221410"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="477056413">
 												<int key="NSCellFlags">67239424</int>
@@ -16324,12 +16371,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {248, 38}}</string>
 									<reference key="NSSuperview" ref="226041199"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{17, 183}, {250, 54}}</string>
 							<reference key="NSSuperview" ref="729561310"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -16350,8 +16395,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{284, 560}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -16366,7 +16409,7 @@
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="924299424">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -16385,7 +16428,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{18, 14}, {61, 58}}</string>
 											<reference key="NSSuperview" ref="946617804"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<int key="NSNumRows">3</int>
 											<int key="NSNumCols">1</int>
@@ -16590,12 +16632,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {253, 82}}</string>
 									<reference key="NSSuperview" ref="1036485405"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{16, 189}, {255, 98}}</string>
 							<reference key="NSSuperview" ref="924299424"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -16629,7 +16669,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{18, 80}, {154, 38}}</string>
 											<reference key="NSSuperview" ref="651086227"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<int key="NSNumRows">2</int>
 											<int key="NSNumCols">1</int>
@@ -16823,7 +16862,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{53, 14}, {100, 58}}</string>
 											<reference key="NSSuperview" ref="651086227"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<int key="NSNumRows">3</int>
 											<int key="NSNumCols">1</int>
@@ -17028,12 +17066,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {253, 128}}</string>
 									<reference key="NSSuperview" ref="982308127"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{16, 41}, {255, 144}}</string>
 							<reference key="NSSuperview" ref="924299424"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -17067,7 +17103,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 12}, {129, 18}}</string>
 											<reference key="NSSuperview" ref="216894813"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="291427635">
 												<int key="NSCellFlags">-2080244224</int>
@@ -17088,12 +17123,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {253, 38}}</string>
 									<reference key="NSSuperview" ref="658920776"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{16, 291}, {255, 54}}</string>
 							<reference key="NSSuperview" ref="924299424"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -17127,7 +17160,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{47, 13}, {136, 21}}</string>
 											<reference key="NSSuperview" ref="112653742"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSSliderCell" key="NSCell" id="811159600">
 												<int key="NSCellFlags">67501824</int>
@@ -17149,7 +17181,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{186, 17}, {52, 17}}</string>
 											<reference key="NSSuperview" ref="112653742"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="365973783">
 												<int key="NSCellFlags">68288064</int>
@@ -17240,7 +17271,6 @@
 											</object>
 											<string key="NSFrame">{{18, 14}, {20, 20}}</string>
 											<reference key="NSSuperview" ref="112653742"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSImageCell" key="NSCell" id="32483980">
 												<int key="NSCellFlags">130560</int>
@@ -17256,12 +17286,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {253, 44}}</string>
 									<reference key="NSSuperview" ref="755029719"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{16, 349}, {255, 60}}</string>
 							<reference key="NSSuperview" ref="924299424"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -17285,7 +17313,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{66, 18}, {154, 19}}</string>
 							<reference key="NSSuperview" ref="924299424"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="1024891561">
 								<int key="NSCellFlags">-2080244224</int>
@@ -17316,7 +17343,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{18, 14}, {116, 38}}</string>
 											<reference key="NSSuperview" ref="300862151"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<int key="NSNumRows">2</int>
 											<int key="NSNumCols">1</int>
@@ -17508,12 +17534,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {253, 62}}</string>
 									<reference key="NSSuperview" ref="67832852"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{16, 413}, {255, 78}}</string>
 							<reference key="NSSuperview" ref="924299424"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -17534,8 +17558,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{288, 511}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -18567,7 +18589,7 @@
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="186498688">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -18576,7 +18598,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{30, 43}, {411, 26}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSSliderCell" key="NSCell" id="173171109">
 								<int key="NSCellFlags">-2079981824</int>
@@ -18598,7 +18619,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 77}, {38, 17}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="693364134">
 								<int key="NSCellFlags">68288064</int>
@@ -18615,7 +18635,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{412, 77}, {38, 17}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="588852667">
 								<int key="NSCellFlags">68288064</int>
@@ -18632,7 +18651,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{97, 77}, {38, 17}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="159905866">
 								<int key="NSCellFlags">68288064</int>
@@ -18649,7 +18667,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{176, 77}, {38, 17}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="298527919">
 								<int key="NSCellFlags">68288064</int>
@@ -18666,7 +18683,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{254, 77}, {38, 17}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="615451230">
 								<int key="NSCellFlags">68288064</int>
@@ -18683,7 +18699,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{335, 77}, {38, 17}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="678116475">
 								<int key="NSCellFlags">68288064</int>
@@ -18700,7 +18715,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{32, 18}, {133, 19}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<int key="NSTag">100</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="181573003">
@@ -18722,7 +18736,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{260, 21}, {123, 17}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="305690556">
 								<int key="NSCellFlags">68288064</int>
@@ -18739,7 +18752,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{385, 21}, {57, 17}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="62614240">
 								<int key="NSCellFlags">68288064</int>
@@ -18820,7 +18832,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{158, 100}, {154, 18}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="835222530">
 								<int key="NSCellFlags">-2080244224</int>
@@ -18840,8 +18851,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{467, 135}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -18856,7 +18865,7 @@
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="856469526">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -18865,7 +18874,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{88, 119}, {32, 34}}</string>
 							<reference key="NSSuperview" ref="856469526"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSSliderCell" key="NSCell" id="636020567">
 								<int key="NSCellFlags">67501824</int>
@@ -18888,7 +18896,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{85, 161}, {38, 17}}</string>
 							<reference key="NSSuperview" ref="856469526"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="686946566">
 								<int key="NSCellFlags">68288064</int>
@@ -18905,7 +18912,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{85, 94}, {39, 17}}</string>
 							<reference key="NSSuperview" ref="856469526"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="166720966">
 								<int key="NSCellFlags">68288064</int>
@@ -18922,7 +18928,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{44, 127}, {39, 17}}</string>
 							<reference key="NSSuperview" ref="856469526"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="552017571">
 								<int key="NSCellFlags">68288064</int>
@@ -18939,7 +18944,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{125, 127}, {38, 17}}</string>
 							<reference key="NSSuperview" ref="856469526"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="725270155">
 								<int key="NSCellFlags">68288064</int>
@@ -18956,7 +18960,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{127, 69}, {57, 17}}</string>
 							<reference key="NSSuperview" ref="856469526"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="840389521">
 								<int key="NSCellFlags">68288064</int>
@@ -19039,7 +19042,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{24, 69}, {101, 17}}</string>
 							<reference key="NSSuperview" ref="856469526"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="987188082">
 								<int key="NSCellFlags">68288064</int>
@@ -19056,7 +19058,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{27, 42}, {154, 19}}</string>
 							<reference key="NSSuperview" ref="856469526"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="945807840">
 								<int key="NSCellFlags">-2080244224</int>
@@ -19077,7 +19078,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{27, 17}, {154, 19}}</string>
 							<reference key="NSSuperview" ref="856469526"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="480841799">
 								<int key="NSCellFlags">-2080244224</int>
@@ -19095,8 +19095,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{213, 198}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -20689,37 +20687,16 @@
 			<object class="NSObjectController" id="280539556">
 				<object class="NSMutableArray" key="NSDeclaredKeys">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>gpuStateMainGPU</string>
-					<string>gpuStateMainBG0</string>
-					<string>gpuStateMainBG1</string>
-					<string>gpuStateMainBG2</string>
-					<string>gpuStateMainBG3</string>
-					<string>gpuStateMainOBJ</string>
-					<string>gpuStateSubGPU</string>
-					<string>gpuStateSubBG0</string>
-					<string>gpuStateSubBG1</string>
-					<string>gpuStateSubBG2</string>
-					<string>gpuStateSubBG3</string>
-					<string>gpuStateSubOBJ</string>
 					<string>displayMode</string>
 					<string>displayModeString</string>
 					<string>videoFilterType</string>
 					<string>videoFilterTypeString</string>
-					<string>render3DRenderingEngine</string>
-					<string>render3DDepthComparisonThreshold</string>
-					<string>render3DEdgeMarking</string>
-					<string>render3DFog</string>
-					<string>render3DHighPrecisionColorInterpolation</string>
-					<string>render3DTextures</string>
-					<string>render3DThreads</string>
-					<string>render3DLineHack</string>
 					<string>scale</string>
 					<string>rotation</string>
 					<string>useBilinearOutput</string>
 					<string>useVerticalSync</string>
 					<string>displayOrientation</string>
 					<string>displayOrder</string>
-					<string>render3DMultisample</string>
 				</object>
 				<bool key="NSEditable">YES</bool>
 				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
@@ -20767,11 +20744,6 @@
 			<object class="NSObjectController" id="573159313">
 				<object class="NSMutableArray" key="NSDeclaredKeys">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>isWorking</string>
-					<string>status</string>
-					<string>volumeIconImage</string>
-					<string>volume</string>
-					<string>isRomLoaded</string>
 					<string>isShowingStatusBar</string>
 				</object>
 				<bool key="NSEditable">YES</bool>
@@ -24142,312 +24114,6 @@
 					<int key="connectionID">5525</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.isRomLoaded</string>
-						<reference key="source" ref="894702591"/>
-						<reference key="destination" ref="573159313"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="894702591"/>
-							<reference key="NSDestination" ref="573159313"/>
-							<string key="NSLabel">enabled: selection.isRomLoaded</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.isRomLoaded</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5530</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.isRomLoaded</string>
-						<reference key="source" ref="1044249996"/>
-						<reference key="destination" ref="573159313"/>
-						<object class="NSNibBindingConnector" key="connector" id="466468745">
-							<reference key="NSSource" ref="1044249996"/>
-							<reference key="NSDestination" ref="573159313"/>
-							<string key="NSLabel">enabled: selection.isRomLoaded</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.isRomLoaded</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5531</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled2: selection.isSupportedCheatType</string>
-						<reference key="source" ref="1044249996"/>
-						<reference key="destination" ref="934928886"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="1044249996"/>
-							<reference key="NSDestination" ref="934928886"/>
-							<string key="NSLabel">enabled2: selection.isSupportedCheatType</string>
-							<string key="NSBinding">enabled2</string>
-							<string key="NSKeyPath">selection.isSupportedCheatType</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-								</object>
-							</object>
-							<reference key="NSPreviousConnector" ref="466468745"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5532</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.isRomLoaded</string>
-						<reference key="source" ref="916529122"/>
-						<reference key="destination" ref="573159313"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="916529122"/>
-							<reference key="NSDestination" ref="573159313"/>
-							<string key="NSLabel">enabled: selection.isRomLoaded</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.isRomLoaded</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5533</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.isRomLoaded</string>
-						<reference key="source" ref="741164598"/>
-						<reference key="destination" ref="573159313"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="741164598"/>
-							<reference key="NSDestination" ref="573159313"/>
-							<string key="NSLabel">enabled: selection.isRomLoaded</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.isRomLoaded</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5534</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.isRomLoaded</string>
-						<reference key="source" ref="923758771"/>
-						<reference key="destination" ref="573159313"/>
-						<object class="NSNibBindingConnector" key="connector" id="889045818">
-							<reference key="NSSource" ref="923758771"/>
-							<reference key="NSDestination" ref="573159313"/>
-							<string key="NSLabel">enabled: selection.isRomLoaded</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.isRomLoaded</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5535</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.isRomLoaded</string>
-						<reference key="source" ref="581241470"/>
-						<reference key="destination" ref="573159313"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="581241470"/>
-							<reference key="NSDestination" ref="573159313"/>
-							<string key="NSLabel">enabled: selection.isRomLoaded</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.isRomLoaded</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5538</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.isRomLoaded</string>
-						<reference key="source" ref="102113802"/>
-						<reference key="destination" ref="573159313"/>
-						<object class="NSNibBindingConnector" key="connector" id="991705611">
-							<reference key="NSSource" ref="102113802"/>
-							<reference key="NSDestination" ref="573159313"/>
-							<string key="NSLabel">enabled: selection.isRomLoaded</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.isRomLoaded</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5539</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.isRomLoaded</string>
-						<reference key="source" ref="817986733"/>
-						<reference key="destination" ref="573159313"/>
-						<object class="NSNibBindingConnector" key="connector" id="1026931816">
-							<reference key="NSSource" ref="817986733"/>
-							<reference key="NSDestination" ref="573159313"/>
-							<string key="NSLabel">enabled: selection.isRomLoaded</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.isRomLoaded</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5541</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.isRomLoaded</string>
-						<reference key="source" ref="407944638"/>
-						<reference key="destination" ref="573159313"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="407944638"/>
-							<reference key="NSDestination" ref="573159313"/>
-							<string key="NSLabel">enabled: selection.isRomLoaded</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.isRomLoaded</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5543</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.isRomLoaded</string>
-						<reference key="source" ref="1001428622"/>
-						<reference key="destination" ref="573159313"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="1001428622"/>
-							<reference key="NSDestination" ref="573159313"/>
-							<string key="NSLabel">enabled: selection.isRomLoaded</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.isRomLoaded</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5545</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.isRomLoaded</string>
-						<reference key="source" ref="752124485"/>
-						<reference key="destination" ref="573159313"/>
-						<object class="NSNibBindingConnector" key="connector" id="323155185">
-							<reference key="NSSource" ref="752124485"/>
-							<reference key="NSDestination" ref="573159313"/>
-							<string key="NSLabel">enabled: selection.isRomLoaded</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.isRomLoaded</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5546</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.isRomLoaded</string>
-						<reference key="source" ref="995667800"/>
-						<reference key="destination" ref="573159313"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="995667800"/>
-							<reference key="NSDestination" ref="573159313"/>
-							<string key="NSLabel">enabled: selection.isRomLoaded</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.isRomLoaded</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5549</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.isRomLoaded</string>
-						<reference key="source" ref="1051440679"/>
-						<reference key="destination" ref="573159313"/>
-						<object class="NSNibBindingConnector" key="connector" id="894493386">
-							<reference key="NSSource" ref="1051440679"/>
-							<reference key="NSDestination" ref="573159313"/>
-							<string key="NSLabel">enabled: selection.isRomLoaded</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.isRomLoaded</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5550</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.isRomLoaded</string>
-						<reference key="source" ref="110663890"/>
-						<reference key="destination" ref="573159313"/>
-						<object class="NSNibBindingConnector" key="connector" id="24905309">
-							<reference key="NSSource" ref="110663890"/>
-							<reference key="NSDestination" ref="573159313"/>
-							<string key="NSLabel">enabled: selection.isRomLoaded</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.isRomLoaded</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5552</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.isRomLoaded</string>
-						<reference key="source" ref="339025995"/>
-						<reference key="destination" ref="573159313"/>
-						<object class="NSNibBindingConnector" key="connector" id="768561544">
-							<reference key="NSSource" ref="339025995"/>
-							<reference key="NSDestination" ref="573159313"/>
-							<string key="NSLabel">enabled: selection.isRomLoaded</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.isRomLoaded</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5555</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.isRomLoaded</string>
-						<reference key="source" ref="893200922"/>
-						<reference key="destination" ref="573159313"/>
-						<object class="NSNibBindingConnector" key="connector" id="714029089">
-							<reference key="NSSource" ref="893200922"/>
-							<reference key="NSDestination" ref="573159313"/>
-							<string key="NSLabel">enabled: selection.isRomLoaded</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.isRomLoaded</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5558</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled: selection.isRomLoaded</string>
-						<reference key="source" ref="803326444"/>
-						<reference key="destination" ref="573159313"/>
-						<object class="NSNibBindingConnector" key="connector" id="596885615">
-							<reference key="NSSource" ref="803326444"/>
-							<reference key="NSDestination" ref="573159313"/>
-							<string key="NSLabel">enabled: selection.isRomLoaded</string>
-							<string key="NSBinding">enabled</string>
-							<string key="NSKeyPath">selection.isRomLoaded</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5561</int>
-				</object>
-				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">displayView</string>
 						<reference key="source" ref="580129455"/>
@@ -25382,108 +25048,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled2: selection.hasSelection</string>
-						<reference key="source" ref="102113802"/>
-						<reference key="destination" ref="347664034"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="102113802"/>
-							<reference key="NSDestination" ref="347664034"/>
-							<string key="NSLabel">enabled2: selection.hasSelection</string>
-							<string key="NSBinding">enabled2</string>
-							<string key="NSKeyPath">selection.hasSelection</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-								</object>
-							</object>
-							<reference key="NSPreviousConnector" ref="991705611"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5613</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled2: selection.hasSelection</string>
-						<reference key="source" ref="923758771"/>
-						<reference key="destination" ref="347664034"/>
-						<object class="NSNibBindingConnector" key="connector" id="258984187">
-							<reference key="NSSource" ref="923758771"/>
-							<reference key="NSDestination" ref="347664034"/>
-							<string key="NSLabel">enabled2: selection.hasSelection</string>
-							<string key="NSBinding">enabled2</string>
-							<string key="NSKeyPath">selection.hasSelection</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-								</object>
-							</object>
-							<reference key="NSPreviousConnector" ref="889045818"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5616</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled3: selection.isSupportedCheatType</string>
-						<reference key="source" ref="923758771"/>
-						<reference key="destination" ref="934928886"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="923758771"/>
-							<reference key="NSDestination" ref="934928886"/>
-							<string key="NSLabel">enabled3: selection.isSupportedCheatType</string>
-							<string key="NSBinding">enabled3</string>
-							<string key="NSKeyPath">selection.isSupportedCheatType</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-								</object>
-							</object>
-							<reference key="NSPreviousConnector" ref="258984187"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5617</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: selection.cheatDBTitle</string>
 						<reference key="source" ref="659347"/>
 						<reference key="destination" ref="347664034"/>
@@ -25580,42 +25144,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled2: selection.cheatSearchSearchValue</string>
-						<reference key="source" ref="752124485"/>
-						<reference key="destination" ref="347664034"/>
-						<object class="NSNibBindingConnector" key="connector" id="287833114">
-							<reference key="NSSource" ref="752124485"/>
-							<reference key="NSDestination" ref="347664034"/>
-							<string key="NSLabel">enabled2: selection.cheatSearchSearchValue</string>
-							<string key="NSBinding">enabled2</string>
-							<string key="NSKeyPath">selection.cheatSearchSearchValue</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-									<string>NSValueTransformerName</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<string>NSIsNotNil</string>
-								</object>
-							</object>
-							<reference key="NSPreviousConnector" ref="323155185"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5624</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
 						<string key="label">animate: selection.isRunningSearch</string>
 						<reference key="source" ref="278520085"/>
 						<reference key="destination" ref="347664034"/>
@@ -25652,359 +25180,7 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled3: selection.isRunningSearch</string>
-						<reference key="source" ref="752124485"/>
-						<reference key="destination" ref="347664034"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="752124485"/>
-							<reference key="NSDestination" ref="347664034"/>
-							<string key="NSLabel">enabled3: selection.isRunningSearch</string>
-							<string key="NSBinding">enabled3</string>
-							<string key="NSKeyPath">selection.isRunningSearch</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-									<string>NSValueTransformerName</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<string>NSNegateBoolean</string>
-								</object>
-							</object>
-							<reference key="NSPreviousConnector" ref="287833114"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5630</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled2: selection.isRunningSearch</string>
-						<reference key="source" ref="1051440679"/>
-						<reference key="destination" ref="347664034"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="1051440679"/>
-							<reference key="NSDestination" ref="347664034"/>
-							<string key="NSLabel">enabled2: selection.isRunningSearch</string>
-							<string key="NSBinding">enabled2</string>
-							<string key="NSKeyPath">selection.isRunningSearch</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-									<string>NSValueTransformerName</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<string>NSNegateBoolean</string>
-								</object>
-							</object>
-							<reference key="NSPreviousConnector" ref="894493386"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5631</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
 						<string key="label">enabled2: selection.isSearchStarted</string>
-						<reference key="source" ref="110663890"/>
-						<reference key="destination" ref="347664034"/>
-						<object class="NSNibBindingConnector" key="connector" id="690815236">
-							<reference key="NSSource" ref="110663890"/>
-							<reference key="NSDestination" ref="347664034"/>
-							<string key="NSLabel">enabled2: selection.isSearchStarted</string>
-							<string key="NSBinding">enabled2</string>
-							<string key="NSKeyPath">selection.isSearchStarted</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-								</object>
-							</object>
-							<reference key="NSPreviousConnector" ref="24905309"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5636</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled3: selection.isRunningSearch</string>
-						<reference key="source" ref="110663890"/>
-						<reference key="destination" ref="347664034"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="110663890"/>
-							<reference key="NSDestination" ref="347664034"/>
-							<string key="NSLabel">enabled3: selection.isRunningSearch</string>
-							<string key="NSBinding">enabled3</string>
-							<string key="NSKeyPath">selection.isRunningSearch</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-									<string>NSValueTransformerName</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<string>NSNegateBoolean</string>
-								</object>
-							</object>
-							<reference key="NSPreviousConnector" ref="690815236"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5637</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled2: selection.isSearchStarted</string>
-						<reference key="source" ref="339025995"/>
-						<reference key="destination" ref="347664034"/>
-						<object class="NSNibBindingConnector" key="connector" id="336356976">
-							<reference key="NSSource" ref="339025995"/>
-							<reference key="NSDestination" ref="347664034"/>
-							<string key="NSLabel">enabled2: selection.isSearchStarted</string>
-							<string key="NSBinding">enabled2</string>
-							<string key="NSKeyPath">selection.isSearchStarted</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-								</object>
-							</object>
-							<reference key="NSPreviousConnector" ref="768561544"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5638</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled3: selection.isRunningSearch</string>
-						<reference key="source" ref="339025995"/>
-						<reference key="destination" ref="347664034"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="339025995"/>
-							<reference key="NSDestination" ref="347664034"/>
-							<string key="NSLabel">enabled3: selection.isRunningSearch</string>
-							<string key="NSBinding">enabled3</string>
-							<string key="NSKeyPath">selection.isRunningSearch</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-									<string>NSValueTransformerName</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<string>NSNegateBoolean</string>
-								</object>
-							</object>
-							<reference key="NSPreviousConnector" ref="336356976"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5639</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled2: selection.isSearchStarted</string>
-						<reference key="source" ref="893200922"/>
-						<reference key="destination" ref="347664034"/>
-						<object class="NSNibBindingConnector" key="connector" id="750230262">
-							<reference key="NSSource" ref="893200922"/>
-							<reference key="NSDestination" ref="347664034"/>
-							<string key="NSLabel">enabled2: selection.isSearchStarted</string>
-							<string key="NSBinding">enabled2</string>
-							<string key="NSKeyPath">selection.isSearchStarted</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-								</object>
-							</object>
-							<reference key="NSPreviousConnector" ref="714029089"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5640</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled3: selection.isRunningSearch</string>
-						<reference key="source" ref="893200922"/>
-						<reference key="destination" ref="347664034"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="893200922"/>
-							<reference key="NSDestination" ref="347664034"/>
-							<string key="NSLabel">enabled3: selection.isRunningSearch</string>
-							<string key="NSBinding">enabled3</string>
-							<string key="NSKeyPath">selection.isRunningSearch</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-									<string>NSValueTransformerName</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<string>NSNegateBoolean</string>
-								</object>
-							</object>
-							<reference key="NSPreviousConnector" ref="750230262"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5641</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled2: selection.isSearchStarted</string>
-						<reference key="source" ref="803326444"/>
-						<reference key="destination" ref="347664034"/>
-						<object class="NSNibBindingConnector" key="connector" id="509595548">
-							<reference key="NSSource" ref="803326444"/>
-							<reference key="NSDestination" ref="347664034"/>
-							<string key="NSLabel">enabled2: selection.isSearchStarted</string>
-							<string key="NSBinding">enabled2</string>
-							<string key="NSKeyPath">selection.isSearchStarted</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-								</object>
-							</object>
-							<reference key="NSPreviousConnector" ref="596885615"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5642</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled3: selection.isRunningSearch</string>
-						<reference key="source" ref="803326444"/>
-						<reference key="destination" ref="347664034"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="803326444"/>
-							<reference key="NSDestination" ref="347664034"/>
-							<string key="NSLabel">enabled3: selection.isRunningSearch</string>
-							<string key="NSBinding">enabled3</string>
-							<string key="NSKeyPath">selection.isRunningSearch</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-									<string>NSValueTransformerName</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<string>NSNegateBoolean</string>
-								</object>
-							</object>
-							<reference key="NSPreviousConnector" ref="509595548"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5643</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled2: selection.isSearchStarted</string>
 						<reference key="source" ref="493042311"/>
 						<reference key="destination" ref="347664034"/>
 						<object class="NSNibBindingConnector" key="connector" id="470660491">
@@ -26038,40 +25214,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled3: selection.isRomLoaded</string>
-						<reference key="source" ref="493042311"/>
-						<reference key="destination" ref="573159313"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="493042311"/>
-							<reference key="NSDestination" ref="573159313"/>
-							<string key="NSLabel">enabled3: selection.isRomLoaded</string>
-							<string key="NSBinding">enabled3</string>
-							<string key="NSKeyPath">selection.isRomLoaded</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-								</object>
-							</object>
-							<reference key="NSPreviousConnector" ref="470660491"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">5645</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: values.Advanscene_AutoDetectRomSaveType</string>
 						<reference key="source" ref="361866954"/>
 						<reference key="destination" ref="178548672"/>
@@ -28204,42 +27346,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">enabled2: values.R4Cheat_DatabasePath</string>
-						<reference key="source" ref="817986733"/>
-						<reference key="destination" ref="178548672"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="817986733"/>
-							<reference key="NSDestination" ref="178548672"/>
-							<string key="NSLabel">enabled2: values.R4Cheat_DatabasePath</string>
-							<string key="NSBinding">enabled2</string>
-							<string key="NSKeyPath">values.R4Cheat_DatabasePath</string>
-							<object class="NSDictionary" key="NSOptions">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSArray" key="dict.sortedKeys">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<string>NSMultipleValuesPlaceholder</string>
-									<string>NSNoSelectionPlaceholder</string>
-									<string>NSNotApplicablePlaceholder</string>
-									<string>NSNullPlaceholder</string>
-									<string>NSValueTransformerName</string>
-								</object>
-								<object class="NSMutableArray" key="dict.values">
-									<bool key="EncodedWithXMLCoder">YES</bool>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<integer value="-1"/>
-									<string>NSIsNotNil</string>
-								</object>
-							</object>
-							<reference key="NSPreviousConnector" ref="1026931816"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">6106</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
 						<string key="label">selectedTag: values.Input_AudioInputMode</string>
 						<reference key="source" ref="249356746"/>
 						<reference key="destination" ref="178548672"/>
@@ -30291,6 +29397,942 @@
 					</object>
 					<int key="connectionID">6826</int>
 				</object>

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4540
          http://desmume.svn.sourceforge.net/desmume/?rev=4540&view=rev
Author:   rogerman
Date:     2013-02-19 01:31:04 +0000 (Tue, 19 Feb 2013)
Log Message:
-----------
Cocoa Port:
- New feature: Add support for multiple display windows. Use the File > New Display Window menu option!
- Add menu option File > Close Window (Command-W).
- The menu option File > Unload ROM keyboard shortcut has been changed to Command-Option-W.
- Rename menu option View > Show Video Output Settings... to View > Show Display Video Settings..., and also change its position in the menu.
- Obsolete and remove the following classes: EmuWindowDelegate, DisplayViewDelegate, ImageDisplayView, OpenGLDisplayView. (Their functionality has been incorporated into DisplayWindowController and DisplayView.)
- Obsolete and remove the following protocols: DisplayViewDelegate. (The new DisplayView class uses the CocoaDSDisplayVideoDelegate protocol directly.)
- Fix several bugs with thread handling and cleanup.
- Do heavy code cleanup of EmuControllerDelegate.

Modified Paths:
--------------
    trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj
    trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj
    trunk/desmume/src/cocoa/cocoa_core.h
    trunk/desmume/src/cocoa/cocoa_core.mm
    trunk/desmume/src/cocoa/cocoa_globals.h
    trunk/desmume/src/cocoa/cocoa_output.h
    trunk/desmume/src/cocoa/cocoa_output.mm
    trunk/desmume/src/cocoa/cocoa_util.h
    trunk/desmume/src/cocoa/cocoa_util.mm
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.strings
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
    trunk/desmume/src/cocoa/userinterface/EmuControllerDelegate.h
    trunk/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm
    trunk/desmume/src/cocoa/userinterface/appDelegate.h
    trunk/desmume/src/cocoa/userinterface/appDelegate.mm
    trunk/desmume/src/cocoa/userinterface/preferencesWindowDelegate.h
    trunk/desmume/src/cocoa/userinterface/preferencesWindowDelegate.mm

Added Paths:
-----------
    trunk/desmume/src/cocoa/translations/English.lproj/DisplayWindow.xib
    trunk/desmume/src/cocoa/userinterface/DisplayWindowController.h
    trunk/desmume/src/cocoa/userinterface/DisplayWindowController.mm

Removed Paths:
-------------
    trunk/desmume/src/cocoa/userinterface/displayView.h
    trunk/desmume/src/cocoa/userinterface/displayView.mm
    trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.h
    trunk/desmume/src/cocoa/userinterface/emuWindowDelegate.mm

Modified: trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj
===================================================================
--- trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj	2013-02-18 19:44:06 UTC (rev 4539)
+++ trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj	2013-02-19 01:31:04 UTC (rev 4540)
@@ -261,8 +261,6 @@
 		AB2F3C2A15CF9C6000858373 /* OGLRender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC11345AC8400AF11D1 /* OGLRender.cpp */; };
 		AB2F3C2B15CF9C6000858373 /* appDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6714C2361100D7D192 /* appDelegate.mm */; };
 		AB2F3C2C15CF9C6000858373 /* cheatWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6914C2361100D7D192 /* cheatWindowDelegate.mm */; };
-		AB2F3C2D15CF9C6000858373 /* displayView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6B14C2361100D7D192 /* displayView.mm */; };
-		AB2F3C2E15CF9C6000858373 /* emuWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6D14C2361100D7D192 /* emuWindowDelegate.mm */; };
 		AB2F3C2F15CF9C6000858373 /* inputPrefsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6F14C2361100D7D192 /* inputPrefsView.mm */; };
 		AB2F3C3015CF9C6000858373 /* preferencesWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB7114C2361100D7D192 /* preferencesWindowDelegate.mm */; };
 		AB2F3C3115CF9C6000858373 /* 2xsai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE14FA14C92FF5005D6699 /* 2xsai.cpp */; };
@@ -283,8 +281,6 @@
 		AB2F3C4115CF9C6000858373 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AB0A0D1914AACA9600E83E91 /* libz.dylib */; };
 		AB3ACB7814C2361100D7D192 /* appDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6714C2361100D7D192 /* appDelegate.mm */; };
 		AB3ACB7914C2361100D7D192 /* cheatWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6914C2361100D7D192 /* cheatWindowDelegate.mm */; };
-		AB3ACB7A14C2361100D7D192 /* displayView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6B14C2361100D7D192 /* displayView.mm */; };
-		AB3ACB7B14C2361100D7D192 /* emuWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6D14C2361100D7D192 /* emuWindowDelegate.mm */; };
 		AB3ACB7C14C2361100D7D192 /* inputPrefsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6F14C2361100D7D192 /* inputPrefsView.mm */; };
 		AB3ACB7D14C2361100D7D192 /* preferencesWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB7114C2361100D7D192 /* preferencesWindowDelegate.mm */; };
 		AB3ACC4414C24D5400D7D192 /* AUTHORS in Resources */ = {isa = PBXBuildFile; fileRef = AB3ACC3814C24D5400D7D192 /* AUTHORS */; };
@@ -300,6 +296,14 @@
 		AB6A198416CAD66900384EED /* cocoa_GPU.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB6A198216CAD66900384EED /* cocoa_GPU.mm */; };
 		AB6A198516CAD66900384EED /* cocoa_GPU.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB6A198216CAD66900384EED /* cocoa_GPU.mm */; };
 		AB6A198616CAD66900384EED /* cocoa_GPU.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB6A198216CAD66900384EED /* cocoa_GPU.mm */; };
+		AB700DBA16CDDBC400FBD336 /* DisplayWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB700DB816CDDBC400FBD336 /* DisplayWindow.xib */; };
+		AB700DBB16CDDBC400FBD336 /* DisplayWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB700DB816CDDBC400FBD336 /* DisplayWindow.xib */; };
+		AB700DBC16CDDBC400FBD336 /* DisplayWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB700DB816CDDBC400FBD336 /* DisplayWindow.xib */; };
+		AB700DBD16CDDBC400FBD336 /* DisplayWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB700DB816CDDBC400FBD336 /* DisplayWindow.xib */; };
+		AB700DDE16CDE4C300FBD336 /* DisplayWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB700DDD16CDE4C300FBD336 /* DisplayWindowController.mm */; };
+		AB700DDF16CDE4C300FBD336 /* DisplayWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB700DDD16CDE4C300FBD336 /* DisplayWindowController.mm */; };
+		AB700DE016CDE4C300FBD336 /* DisplayWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB700DDD16CDE4C300FBD336 /* DisplayWindowController.mm */; };
+		AB700DE116CDE4C300FBD336 /* DisplayWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB700DDD16CDE4C300FBD336 /* DisplayWindowController.mm */; };
 		AB711ED21481C35F009011C8 /* KeyNames.plist in Resources */ = {isa = PBXBuildFile; fileRef = AB02475B13886BF300E9F9AB /* KeyNames.plist */; };
 		AB711ED31481C35F009011C8 /* DefaultKeyMappings.plist in Resources */ = {isa = PBXBuildFile; fileRef = ABC719E1138CB25E002827A9 /* DefaultKeyMappings.plist */; };
 		AB711ED81481C35F009011C8 /* DefaultUserPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = ABBC0F8C1394B1AA0028B6BD /* DefaultUserPrefs.plist */; };
@@ -578,8 +582,6 @@
 		AB73AA181507C9F500A310C8 /* OGLRender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC11345AC8400AF11D1 /* OGLRender.cpp */; };
 		AB73AA191507C9F500A310C8 /* appDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6714C2361100D7D192 /* appDelegate.mm */; };
 		AB73AA1A1507C9F500A310C8 /* cheatWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6914C2361100D7D192 /* cheatWindowDelegate.mm */; };
-		AB73AA1B1507C9F500A310C8 /* displayView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6B14C2361100D7D192 /* displayView.mm */; };
-		AB73AA1C1507C9F500A310C8 /* emuWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6D14C2361100D7D192 /* emuWindowDelegate.mm */; };
 		AB73AA1D1507C9F500A310C8 /* inputPrefsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6F14C2361100D7D192 /* inputPrefsView.mm */; };
 		AB73AA1E1507C9F500A310C8 /* preferencesWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB7114C2361100D7D192 /* preferencesWindowDelegate.mm */; };
 		AB73AA1F1507C9F500A310C8 /* 2xsai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE14FA14C92FF5005D6699 /* 2xsai.cpp */; };
@@ -772,8 +774,6 @@
 		ABAD102015ACE7A00000EC47 /* OGLRender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEC11345AC8400AF11D1 /* OGLRender.cpp */; };
 		ABAD102115ACE7A00000EC47 /* appDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6714C2361100D7D192 /* appDelegate.mm */; };
 		ABAD102215ACE7A00000EC47 /* cheatWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6914C2361100D7D192 /* cheatWindowDelegate.mm */; };
-		ABAD102315ACE7A00000EC47 /* displayView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6B14C2361100D7D192 /* displayView.mm */; };
-		ABAD102415ACE7A00000EC47 /* emuWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6D14C2361100D7D192 /* emuWindowDelegate.mm */; };
 		ABAD102515ACE7A00000EC47 /* inputPrefsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6F14C2361100D7D192 /* inputPrefsView.mm */; };
 		ABAD102615ACE7A00000EC47 /* preferencesWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB7114C2361100D7D192 /* preferencesWindowDelegate.mm */; };
 		ABAD102715ACE7A00000EC47 /* 2xsai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE14FA14C92FF5005D6699 /* 2xsai.cpp */; };
@@ -957,10 +957,6 @@
 		AB3ACB6714C2361100D7D192 /* appDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = appDelegate.mm; sourceTree = "<group>"; };
 		AB3ACB6814C2361100D7D192 /* cheatWindowDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cheatWindowDelegate.h; sourceTree = "<group>"; };
 		AB3ACB6914C2361100D7D192 /* cheatWindowDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cheatWindowDelegate.mm; sourceTree = "<group>"; };
-		AB3ACB6A14C2361100D7D192 /* displayView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = displayView.h; sourceTree = "<group>"; };
-		AB3ACB6B14C2361100D7D192 /* displayView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = displayView.mm; sourceTree = "<group>"; };
-		AB3ACB6C14C2361100D7D192 /* emuWindowDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = emuWindowDelegate.h; sourceTree = "<group>"; };
-		AB3ACB6D14C2361100D7D192 /* emuWindowDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = emuWindowDelegate.mm; sourceTree = "<group>"; };
 		AB3ACB6E14C2361100D7D192 /* inputPrefsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inputPrefsView.h; sourceTree = "<group>"; };
 		AB3ACB6F14C2361100D7D192 /* inputPrefsView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = inputPrefsView.mm; sourceTree = "<group>"; };
 		AB3ACB7014C2361100D7D192 /* preferencesWindowDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = preferencesWindowDelegate.h; sourceTree = "<group>"; };
@@ -980,6 +976,9 @@
 		AB6A198116CAD66900384EED /* cocoa_GPU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_GPU.h; sourceTree = "<group>"; };
 		AB6A198216CAD66900384EED /* cocoa_GPU.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_GPU.mm; sourceTree = "<group>"; };
 		AB6FBEF5139B6258007BB045 /* slot1_retail_nand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = slot1_retail_nand.cpp; sourceTree = "<group>"; };
+		AB700DB916CDDBC400FBD336 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = translations/English.lproj/DisplayWindow.xib; sourceTree = "<group>"; };
+		AB700DDC16CDE4C300FBD336 /* DisplayWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DisplayWindowController.h; sourceTree = "<group>"; };
+		AB700DDD16CDE4C300FBD336 /* DisplayWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DisplayWindowController.mm; sourceTree = "<group>"; };
 		AB711F7F1481C35F009011C8 /* DeSmuME.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DeSmuME.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		AB73AA331507C9F500A310C8 /* DeSmuME.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DeSmuME.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		AB75226D14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = AppIcon_FirmwareConfig.icns; sourceTree = "<group>"; };
@@ -1458,6 +1457,7 @@
 			children = (
 				ABC2ECD613B1C87000FAAA2A /* Images */,
 				AB00E87C14205EBC00DE561F /* MainMenu.xib */,
+				AB700DB816CDDBC400FBD336 /* DisplayWindow.xib */,
 				AB350D3A147A1D93007165AC /* HID_usage_strings.plist */,
 				8D1107310486CEB800E47090 /* Info.plist */,
 				AB02791814415E4C0075E58C /* Info (Debug).plist */,
@@ -1490,17 +1490,15 @@
 			children = (
 				AB3ACB6614C2361100D7D192 /* appDelegate.h */,
 				AB3ACB6814C2361100D7D192 /* cheatWindowDelegate.h */,
-				AB3ACB6A14C2361100D7D192 /* displayView.h */,
+				AB700DDC16CDE4C300FBD336 /* DisplayWindowController.h */,
 				AB6A187A16C9951C00384EED /* EmuControllerDelegate.h */,
-				AB3ACB6C14C2361100D7D192 /* emuWindowDelegate.h */,
 				AB3ACB6E14C2361100D7D192 /* inputPrefsView.h */,
 				AB3ACB7014C2361100D7D192 /* preferencesWindowDelegate.h */,
 				ABA0356E169127BB00817C69 /* troubleshootingWindowDelegate.h */,
 				AB3ACB6714C2361100D7D192 /* appDelegate.mm */,
 				AB3ACB6914C2361100D7D192 /* cheatWindowDelegate.mm */,
-				AB3ACB6B14C2361100D7D192 /* displayView.mm */,
+				AB700DDD16CDE4C300FBD336 /* DisplayWindowController.mm */,
 				AB6A187B16C9951C00384EED /* EmuControllerDelegate.mm */,
-				AB3ACB6D14C2361100D7D192 /* emuWindowDelegate.mm */,
 				AB3ACB6F14C2361100D7D192 /* inputPrefsView.mm */,
 				AB3ACB7114C2361100D7D192 /* preferencesWindowDelegate.mm */,
 				ABA0356F169127C000817C69 /* troubleshootingWindowDelegate.mm */,
@@ -2165,6 +2163,7 @@
 				AB2F3BC115CF9C6000858373 /* README in Resources */,
 				AB2F3BC215CF9C6000858373 /* README.MAC in Resources */,
 				AB2F3BC315CF9C6000858373 /* AppIcon_FirmwareConfig.icns in Resources */,
+				AB700DBA16CDDBC400FBD336 /* DisplayWindow.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2243,6 +2242,7 @@
 				AB3ACC4714C24D5400D7D192 /* README in Resources */,
 				AB3ACC4914C24D5400D7D192 /* README.MAC in Resources */,
 				AB75226F14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns in Resources */,
+				AB700DBB16CDDBC400FBD336 /* DisplayWindow.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2321,6 +2321,7 @@
 				AB73A9AE1507C9F500A310C8 /* README in Resources */,
 				AB73A9B01507C9F500A310C8 /* README.MAC in Resources */,
 				AB73A9B11507C9F500A310C8 /* AppIcon_FirmwareConfig.icns in Resources */,
+				AB700DBD16CDDBC400FBD336 /* DisplayWindow.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2399,6 +2400,7 @@
 				ABAD0FB715ACE7A00000EC47 /* README in Resources */,
 				ABAD0FB815ACE7A00000EC47 /* README.MAC in Resources */,
 				ABAD0FB915ACE7A00000EC47 /* AppIcon_FirmwareConfig.icns in Resources */,
+				AB700DBC16CDDBC400FBD336 /* DisplayWindow.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2622,8 +2624,6 @@
 				AB2F3C2A15CF9C6000858373 /* OGLRender.cpp in Sources */,
 				AB2F3C2B15CF9C6000858373 /* appDelegate.mm in Sources */,
 				AB2F3C2C15CF9C6000858373 /* cheatWindowDelegate.mm in Sources */,
-				AB2F3C2D15CF9C6000858373 /* displayView.mm in Sources */,
-				AB2F3C2E15CF9C6000858373 /* emuWindowDelegate.mm in Sources */,
 				AB2F3C2F15CF9C6000858373 /* inputPrefsView.mm in Sources */,
 				AB2F3C3015CF9C6000858373 /* preferencesWindowDelegate.mm in Sources */,
 				AB2F3C3115CF9C6000858373 /* 2xsai.cpp in Sources */,
@@ -2649,6 +2649,7 @@
 				AB279D6E16A4E6DE00ECC692 /* TDStretch.cpp in Sources */,
 				AB6A187C16C9951C00384EED /* EmuControllerDelegate.mm in Sources */,
 				AB6A198316CAD66900384EED /* cocoa_GPU.mm in Sources */,
+				AB700DDF16CDE4C300FBD336 /* DisplayWindowController.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2750,8 +2751,6 @@
 				AB711F6E1481C35F009011C8 /* cocoa_videofilter.mm in Sources */,
 				AB3ACB7814C2361100D7D192 /* appDelegate.mm in Sources */,
 				AB3ACB7914C2361100D7D192 /* cheatWindowDelegate.mm in Sources */,
-				AB3ACB7A14C2361100D7D192 /* displayView.mm in Sources */,
-				AB3ACB7B14C2361100D7D192 /* emuWindowDelegate.mm in Sources */,
 				AB3ACB7C14C2361100D7D192 /* inputPrefsView.mm in Sources */,
 				AB3ACB7D14C2361100D7D192 /* preferencesWindowDelegate.mm in Sources */,
 				ABFE150F14C92FF5005D6699 /* 2xsai.cpp in Sources */,
@@ -2807,6 +2806,7 @@
 				AB279D7916A4E6DE00ECC692 /* TDStretch.cpp in Sources */,
 				AB6A187E16C9951C00384EED /* EmuControllerDelegate.mm in Sources */,
 				AB6A198516CAD66900384EED /* cocoa_GPU.mm in Sources */,
+				AB700DE116CDE4C300FBD336 /* DisplayWindowController.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2908,8 +2908,6 @@
 				AB73AA181507C9F500A310C8 /* OGLRender.cpp in Sources */,
 				AB73AA191507C9F500A310C8 /* appDelegate.mm in Sources */,
 				AB73AA1A1507C9F500A310C8 /* cheatWindowDelegate.mm in Sources */,
-				AB73AA1B1507C9F500A310C8 /* displayView.mm in Sources */,
-				AB73AA1C1507C9F500A310C8 /* emuWindowDelegate.mm in Sources */,
 				AB73AA1D1507C9F500A310C8 /* inputPrefsView.mm in Sources */,
 				AB73AA1E1507C9F500A310C8 /* preferencesWindowDelegate.mm in Sources */,
 				AB73AA1F1507C9F500A310C8 /* 2xsai.cpp in Sources */,
@@ -2965,6 +2963,7 @@
 				AB279D6316A4E6DE00ECC692 /* TDStretch.cpp in Sources */,
 				AB6A187F16C9951C00384EED /* EmuControllerDelegate.mm in Sources */,
 				AB6A198616CAD66900384EED /* cocoa_GPU.mm in Sources */,
+				AB700DDE16CDE4C300FBD336 /* DisplayWindowController.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3066,8 +3065,6 @@
 				ABAD102015ACE7A00000EC47 /* OGLRender.cpp in Sources */,
 				ABAD102115ACE7A00000EC47 /* appDelegate.mm in Sources */,
 				ABAD102215ACE7A00000EC47 /* cheatWindowDelegate.mm in Sources */,
-				ABAD102315ACE7A00000EC47 /* displayView.mm in Sources */,
-				ABAD102415ACE7A00000EC47 /* emuWindowDelegate.mm in Sources */,
 				ABAD102515ACE7A00000EC47 /* inputPrefsView.mm in Sources */,
 				ABAD102615ACE7A00000EC47 /* preferencesWindowDelegate.mm in Sources */,
 				ABAD102715ACE7A00000EC47 /* 2xsai.cpp in Sources */,
@@ -3093,6 +3090,7 @@
 				AB279D8416A4E6DE00ECC692 /* TDStretch.cpp in Sources */,
 				AB6A187D16C9951C00384EED /* EmuControllerDelegate.mm in Sources */,
 				AB6A198416CAD66900384EED /* cocoa_GPU.mm in Sources */,
+				AB700DE016CDE4C300FBD336 /* DisplayWindowController.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3123,6 +3121,14 @@
 			name = HID_usage_strings.plist;
 			sourceTree = "<group>";
 		};
+		AB700DB816CDDBC400FBD336 /* DisplayWindow.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				AB700DB916CDDBC400FBD336 /* English */,
+			);
+			name = DisplayWindow.xib;
+			sourceTree = "<group>";
+		};
 		AB901BDD1420706100348EEC /* Localizable.strings */ = {
 			isa = PBXVariantGroup;
 			children = (

Modified: trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj
===================================================================
--- trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj	2013-02-18 19:44:06 UTC (rev 4539)
+++ trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj	2013-02-19 01:31:04 UTC (rev 4540)
@@ -77,8 +77,6 @@
 		AB3A656316CC5438001F5D4A /* cocoa_GPU.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3A656016CC5438001F5D4A /* cocoa_GPU.mm */; };
 		AB3ACB7214C2361100D7D192 /* appDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6714C2361100D7D192 /* appDelegate.mm */; };
 		AB3ACB7314C2361100D7D192 /* cheatWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6914C2361100D7D192 /* cheatWindowDelegate.mm */; };
-		AB3ACB7414C2361100D7D192 /* displayView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6B14C2361100D7D192 /* displayView.mm */; };
-		AB3ACB7514C2361100D7D192 /* emuWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6D14C2361100D7D192 /* emuWindowDelegate.mm */; };
 		AB3ACB7614C2361100D7D192 /* inputPrefsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6F14C2361100D7D192 /* inputPrefsView.mm */; };
 		AB3ACB7714C2361100D7D192 /* preferencesWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB7114C2361100D7D192 /* preferencesWindowDelegate.mm */; };
 		AB3ACC3E14C24D5400D7D192 /* AUTHORS in Resources */ = {isa = PBXBuildFile; fileRef = AB3ACC3814C24D5400D7D192 /* AUTHORS */; };
@@ -360,8 +358,6 @@
 		AB796D5415CDCBA200C59155 /* cocoa_videofilter.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE5DFE4143FB1DA00835AD8 /* cocoa_videofilter.mm */; };
 		AB796D5515CDCBA200C59155 /* appDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6714C2361100D7D192 /* appDelegate.mm */; };
 		AB796D5615CDCBA200C59155 /* cheatWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6914C2361100D7D192 /* cheatWindowDelegate.mm */; };
-		AB796D5715CDCBA200C59155 /* displayView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6B14C2361100D7D192 /* displayView.mm */; };
-		AB796D5815CDCBA200C59155 /* emuWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6D14C2361100D7D192 /* emuWindowDelegate.mm */; };
 		AB796D5915CDCBA200C59155 /* inputPrefsView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB6F14C2361100D7D192 /* inputPrefsView.mm */; };
 		AB796D5A15CDCBA200C59155 /* preferencesWindowDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3ACB7114C2361100D7D192 /* preferencesWindowDelegate.mm */; };
 		AB796D5B15CDCBA200C59155 /* 2xsai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABFE14FA14C92FF5005D6699 /* 2xsai.cpp */; };
@@ -382,6 +378,10 @@
 		AB796D6B15CDCBA200C59155 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABC570D4134431DA00E7B0B1 /* OpenGL.framework */; };
 		AB796D6C15CDCBA200C59155 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AB0A0D1914AACA9600E83E91 /* libz.dylib */; };
 		AB80E04D142BC4A800A52038 /* cocoa_util.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB80E04C142BC4A800A52038 /* cocoa_util.mm */; };
+		AB8967D916D2ED0700F826F1 /* DisplayWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB8967D816D2ED0700F826F1 /* DisplayWindowController.mm */; };
+		AB8967DA16D2ED0700F826F1 /* DisplayWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB8967D816D2ED0700F826F1 /* DisplayWindowController.mm */; };
+		AB8967DD16D2ED2700F826F1 /* DisplayWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB8967DB16D2ED2700F826F1 /* DisplayWindow.xib */; };
+		AB8967DE16D2ED2700F826F1 /* DisplayWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = AB8967DB16D2ED2700F826F1 /* DisplayWindow.xib */; };
 		AB901BDE1420706100348EEC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = AB901BDD1420706100348EEC /* Localizable.strings */; };
 		AB91D46B13BD013800462471 /* fs-linux.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ABD1FEB21345AC8400AF11D1 /* fs-linux.cpp */; };
 		ABA6574B14511EC90077E5E9 /* cocoa_cheat.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABA6574A14511EC90077E5E9 /* cocoa_cheat.mm */; };
@@ -692,10 +692,6 @@
 		AB3ACB6714C2361100D7D192 /* appDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = appDelegate.mm; sourceTree = "<group>"; };
 		AB3ACB6814C2361100D7D192 /* cheatWindowDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cheatWindowDelegate.h; sourceTree = "<group>"; };
 		AB3ACB6914C2361100D7D192 /* cheatWindowDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cheatWindowDelegate.mm; sourceTree = "<group>"; };
-		AB3ACB6A14C2361100D7D192 /* displayView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = displayView.h; sourceTree = "<group>"; };
-		AB3ACB6B14C2361100D7D192 /* displayView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = displayView.mm; sourceTree = "<group>"; };
-		AB3ACB6C14C2361100D7D192 /* emuWindowDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = emuWindowDelegate.h; sourceTree = "<group>"; };
-		AB3ACB6D14C2361100D7D192 /* emuWindowDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = emuWindowDelegate.mm; sourceTree = "<group>"; };
 		AB3ACB6E14C2361100D7D192 /* inputPrefsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inputPrefsView.h; sourceTree = "<group>"; };
 		AB3ACB6F14C2361100D7D192 /* inputPrefsView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = inputPrefsView.mm; sourceTree = "<group>"; };
 		AB3ACB7014C2361100D7D192 /* preferencesWindowDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = preferencesWindowDelegate.h; sourceTree = "<group>"; };
@@ -791,6 +787,9 @@
 		AB80E050142BC4FA00A52038 /* cocoa_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_util.h; sourceTree = "<group>"; };
 		AB817A34143EE2DB00A7DFE9 /* videofilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = videofilter.h; sourceTree = "<group>"; };
 		AB817A35143EE2DB00A7DFE9 /* videofilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = videofilter.cpp; sourceTree = "<group>"; };
+		AB8967D716D2ED0700F826F1 /* DisplayWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DisplayWindowController.h; sourceTree = "<group>"; };
+		AB8967D816D2ED0700F826F1 /* DisplayWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DisplayWindowController.mm; sourceTree = "<group>"; };
+		AB8967DC16D2ED2700F826F1 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = translations/English.lproj/DisplayWindow.xib; sourceTree = "<group>"; };
 		AB901BDF1420706B00348EEC /* Japanese */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = Japanese; path = translations/Japanese.lproj/Localizable.strings; sourceTree = "<group>"; };
 		AB901BE01420706F00348EEC /* French */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = French; path = translations/French.lproj/Localizable.strings; sourceTree = "<group>"; };
 		AB901BE11420707400348EEC /* Italian */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; lineEnding = 0; name = Italian; path = translations/Italian.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -1202,6 +1201,7 @@
 			children = (
 				ABC2ECD613B1C87000FAAA2A /* Images */,
 				AB00E87C14205EBC00DE561F /* MainMenu.xib */,
+				AB8967DB16D2ED2700F826F1 /* DisplayWindow.xib */,
 				AB350D3A147A1D93007165AC /* HID_usage_strings.plist */,
 				8D1107310486CEB800E47090 /* Info.plist */,
 				AB02791814415E4C0075E58C /* Info (Debug).plist */,
@@ -1234,17 +1234,15 @@
 			children = (
 				AB3ACB6614C2361100D7D192 /* appDelegate.h */,
 				AB3ACB6814C2361100D7D192 /* cheatWindowDelegate.h */,
-				AB3ACB6A14C2361100D7D192 /* displayView.h */,
+				AB8967D716D2ED0700F826F1 /* DisplayWindowController.h */,
 				AB3A655C16CC5416001F5D4A /* EmuControllerDelegate.h */,
-				AB3ACB6C14C2361100D7D192 /* emuWindowDelegate.h */,
 				AB3ACB6E14C2361100D7D192 /* inputPrefsView.h */,
 				AB3ACB7014C2361100D7D192 /* preferencesWindowDelegate.h */,
 				ABF2B9F81690412A000FF7C0 /* troubleshootingWindowDelegate.h */,
 				AB3ACB6714C2361100D7D192 /* appDelegate.mm */,
 				AB3ACB6914C2361100D7D192 /* cheatWindowDelegate.mm */,
-				AB3ACB6B14C2361100D7D192 /* displayView.mm */,
+				AB8967D816D2ED0700F826F1 /* DisplayWindowController.mm */,
 				AB3A655D16CC5421001F5D4A /* EmuControllerDelegate.mm */,
-				AB3ACB6D14C2361100D7D192 /* emuWindowDelegate.mm */,
 				AB3ACB6F14C2361100D7D192 /* inputPrefsView.mm */,
 				AB3ACB7114C2361100D7D192 /* preferencesWindowDelegate.mm */,
 				ABF2B9FA16904133000FF7C0 /* troubleshootingWindowDelegate.mm */,
@@ -1903,6 +1901,7 @@
 				AB3ACC4114C24D5400D7D192 /* README in Resources */,
 				AB3ACC4314C24D5400D7D192 /* README.MAC in Resources */,
 				AB75226E14C7BB51009B97B3 /* AppIcon_FirmwareConfig.icns in Resources */,
+				AB8967DE16D2ED2700F826F1 /* DisplayWindow.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1981,6 +1980,7 @@
 				AB796CEB15CDCBA200C59155 /* README in Resources */,
 				AB796CEC15CDCBA200C59155 /* README.MAC in Resources */,
 				AB796CED15CDCBA200C59155 /* AppIcon_FirmwareConfig.icns in Resources */,
+				AB8967DD16D2ED2700F826F1 /* DisplayWindow.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2192,8 +2192,6 @@
 				AB0F291D14BE6F4A009ABC6F /* OGLRender.cpp in Sources */,
 				AB3ACB7214C2361100D7D192 /* appDelegate.mm in Sources */,
 				AB3ACB7314C2361100D7D192 /* cheatWindowDelegate.mm in Sources */,
-				AB3ACB7414C2361100D7D192 /* displayView.mm in Sources */,
-				AB3ACB7514C2361100D7D192 /* emuWindowDelegate.mm in Sources */,
 				AB3ACB7614C2361100D7D192 /* inputPrefsView.mm in Sources */,
 				AB3ACB7714C2361100D7D192 /* preferencesWindowDelegate.mm in Sources */,
 				ABFE150714C92FF5005D6699 /* 2xsai.cpp in Sources */,
@@ -2240,6 +2238,7 @@
 				AB23567516C2FAD800DA782E /* OGLRender_3_2.cpp in Sources */,
 				AB3A655F16CC5421001F5D4A /* EmuControllerDelegate.mm in Sources */,
 				AB3A656216CC5438001F5D4A /* cocoa_GPU.mm in Sources */,
+				AB8967DA16D2ED0700F826F1 /* DisplayWindowController.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2351,8 +2350,6 @@
 				AB796D5415CDCBA200C59155 /* cocoa_videofilter.mm in Sources */,
 				AB796D5515CDCBA200C59155 /* appDelegate.mm in Sources */,
 				AB796D5615CDCBA200C59155 /* cheatWindowDelegate.mm in Sources */,
-				AB796D5715CDCBA200C59155 /* displayView.mm in Sources */,
-				AB796D5815CDCBA200C59155 /* emuWindowDelegate.mm in Sources */,
 				AB796D5915CDCBA200C59155 /* inputPrefsView.mm in Sources */,
 				AB796D5A15CDCBA200C59155 /* preferencesWindowDelegate.mm in Sources */,
 				AB796D5B15CDCBA200C59155 /* 2xsai.cpp in Sources */,
@@ -2398,6 +2395,7 @@
 				AB26D87C16B5253D00A2305C /* OGLRender_3_2.cpp in Sources */,
 				AB3A655E16CC5421001F5D4A /* EmuControllerDelegate.mm in Sources */,
 				AB3A656116CC5438001F5D4A /* cocoa_GPU.mm in Sources */,
+				AB8967D916D2ED0700F826F1 /* DisplayWindowController.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2573,6 +2571,14 @@
 			name = HID_usage_strings.plist;
 			sourceTree = "<group>";
 		};
+		AB8967DB16D2ED2700F826F1 /* DisplayWindow.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				AB8967DC16D2ED2700F826F1 /* English */,
+			);
+			name = DisplayWindow.xib;
+			sourceTree = "<group>";
+		};
 		AB901BDD1420706100348EEC /* Localizable.strings */ = {
 			isa = PBXVariantGroup;
 			children = (

Modified: trunk/desmume/src/cocoa/cocoa_core.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_core.h	2013-02-18 19:44:06 UTC (rev 4539)
+++ trunk/desmume/src/cocoa/cocoa_core.h	2013-02-19 01:31:04 UTC (rev 4540)
@@ -37,7 +37,8 @@
 	unsigned int framesToSkip;
 	uint64_t timeBudgetMachAbsTime;
 	bool exitThread;
-	pthread_mutex_t *mutexCoreExecute;
+	pthread_mutex_t mutexCoreExecute;
+	pthread_mutex_t mutexOutputList;
 	pthread_mutex_t mutexThreadExecute;
 	pthread_cond_t condThreadExecute;
 } CoreThreadParam;
@@ -68,7 +69,6 @@
 	BOOL emuFlagEmulateEnsata;
 	NSInteger cpuEmulationEngine;
 	
-	pthread_mutex_t *mutexCoreExecute;
 	OSSpinLock spinlockCdsController;
 	OSSpinLock spinlockMasterExecute;
 	OSSpinLock spinlockExecutionChange;

Modified: trunk/desmume/src/cocoa/cocoa_core.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_core.mm	2013-02-18 19:44:06 UTC (rev 4539)
+++ trunk/desmume/src/cocoa/cocoa_core.mm	2013-02-19 01:31:04 UTC (rev 4540)
@@ -66,7 +66,7 @@
 @dynamic arm7ImageURL;
 @dynamic firmwareImageURL;
 
-@... mutexCoreExecute;
+@dynamic mutexCoreExecute;
 
 static BOOL isCoreStarted = NO;
 
@@ -94,8 +94,6 @@
 	emuFlagDebugConsole = NO;
 	emuFlagEmulateEnsata = NO;
 	
-	mutexCoreExecute = (pthread_mutex_t *)malloc(sizeof(pthread_mutex_t));
-	pthread_mutex_init(mutexCoreExecute, NULL);
 	spinlockMasterExecute = OS_SPINLOCK_INIT;
 	spinlockCdsController = OS_SPINLOCK_INIT;
 	spinlockExecutionChange = OS_SPINLOCK_INIT;
@@ -119,12 +117,13 @@
 	threadParam.timeBudgetMachAbsTime = *(uint64_t *)&timeBudgetAbsTime;
 	
 	threadParam.exitThread = false;
-	threadParam.mutexCoreExecute = mutexCoreExecute;
+	pthread_mutex_init(&threadParam.mutexCoreExecute, NULL);
+	pthread_mutex_init(&threadParam.mutexOutputList, NULL);
 	pthread_mutex_init(&threadParam.mutexThreadExecute, NULL);
 	pthread_cond_init(&threadParam.condThreadExecute, NULL);
 	pthread_create(&coreThread, NULL, &RunCoreThread, &threadParam);
 	
-	[cdsGPU setMutexProducer:mutexCoreExecute];
+	[cdsGPU setMutexProducer:self.mutexCoreExecute];
 	
 	return self;
 }
@@ -155,10 +154,6 @@
 	pthread_mutex_destroy(&threadParam.mutexThreadExecute);
 	pthread_cond_destroy(&threadParam.condThreadExecute);
 	
-	pthread_mutex_destroy(self.mutexCoreExecute);
-	free(self.mutexCoreExecute);
-	mutexCoreExecute = nil;
-	
 	self.cdsController = nil;
 	self.cdsFirmware = nil;
 	self.cdsGPU = nil;
@@ -166,6 +161,9 @@
 	[self removeAllOutputs];
 	[cdsOutputList release];
 	
+	pthread_mutex_destroy(&threadParam.mutexOutputList);
+	pthread_mutex_destroy(&threadParam.mutexCoreExecute);
+	
 	[super dealloc];
 }
 
@@ -337,7 +335,7 @@
 	emulationFlags = theFlags;
 	OSSpinLockUnlock(&spinlockEmulationFlags);
 	
-	pthread_mutex_lock(self.mutexCoreExecute);
+	pthread_mutex_lock(&threadParam.mutexCoreExecute);
 	
 	if (theFlags & EMULATION_ADVANCED_BUS_LEVEL_TIMING_MASK)
 	{
@@ -438,7 +436,7 @@
 		CommonSettings.DebugConsole = false;
 	}
 	
-	pthread_mutex_unlock(self.mutexCoreExecute);
+	pthread_mutex_unlock(&threadParam.mutexCoreExecute);
 }
 
 - (NSUInteger) emulationFlags
@@ -548,6 +546,11 @@
 	return [NSURL fileURLWithPath:[NSString stringWithCString:CommonSettings.Firmware encoding:NSUTF8StringEncoding]];
 }
 
+- (pthread_mutex_t *) mutexCoreExecute
+{
+	return &threadParam.mutexCoreExecute;
+}
+
 - (void) setEjectCardFlag
 {
 	if (nds.cardEjected)
@@ -572,9 +575,9 @@
 
 - (void) changeRomSaveType:(NSInteger)saveTypeID
 {
-	pthread_mutex_lock(self.mutexCoreExecute);
+	pthread_mutex_lock(&threadParam.mutexCoreExecute);
 	[CocoaDSRom changeRomSaveType:saveTypeID];
-	pthread_mutex_unlock(self.mutexCoreExecute);
+	pthread_mutex_unlock(&threadParam.mutexCoreExecute);
 }
 
 - (void) changeExecutionSpeed
@@ -648,18 +651,24 @@
 
 - (void) addOutput:(CocoaDSOutput *)theOutput
 {
+	pthread_mutex_lock(&threadParam.mutexOutputList);
 	theOutput.mutexProducer = self.mutexCoreExecute;
 	[self.cdsOutputList addObject:theOutput];
+	pthread_mutex_unlock(&threadParam.mutexOutputList);
 }
 
 - (void) removeOutput:(CocoaDSOutput *)theOutput
 {
+	pthread_mutex_lock(&threadParam.mutexOutputList);
 	[self.cdsOutputList removeObject:theOutput];
+	pthread_mutex_unlock(&threadParam.mutexOutputList);
 }
 
 - (void) removeAllOutputs
 {
+	pthread_mutex_lock(&threadParam.mutexOutputList);
 	[self.cdsOutputList removeAllObjects];
+	pthread_mutex_unlock(&threadParam.mutexOutputList);
 }
 
 - (void) runThread:(id)object
@@ -709,9 +718,9 @@
 		NDS_endProcessingInput();
 		
 		// Execute the frame and increment the frame counter.
-		pthread_mutex_lock(param->mutexCoreExecute);
+		pthread_mutex_lock(&param->mutexCoreExecute);
 		NDS_exec<false>();
-		pthread_mutex_unlock(param->mutexCoreExecute);
+		pthread_mutex_unlock(&param->mutexCoreExecute);
 		
 		// Check if an internal execution error occurred that halted the emulation.
 		if (!execute)
@@ -727,6 +736,7 @@
 			param->frameCount++;
 		}
 		
+		pthread_mutex_lock(&param->mutexOutputList);
 		for(CocoaDSOutput *cdsOutput in cdsOutputList)
 		{
 			if (param->framesToSkip > 0 && [cdsOutput isMemberOfClass:[CocoaDSDisplay class]])
@@ -736,6 +746,7 @@
 			
 			[cdsOutput doCoreEmuFrame];
 		}
+		pthread_mutex_unlock(&param->mutexOutputList);
 		
 		// Determine the number of frames to skip based on how much time "debt"
 		// we owe on timeBudget.

Modified: trunk/desmume/src/cocoa/cocoa_globals.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_globals.h	2013-02-18 19:44:06 UTC (rev 4539)
+++ trunk/desmume/src/cocoa/cocoa_globals.h	2013-02-19 01:31:04 UTC (rev 4540)
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2013 DeSmuME team
+	Copyright (C) 2012-2013 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -48,6 +48,8 @@
 #define NSSTRING_TITLE_ENABLE_HUD					NSLocalizedString(@"Enable HUD", nil)
 #define NSSTRING_TITLE_HIDE_STATUS_BAR				NSLocalizedString(@"Hide Status Bar", nil)
 #define NSSTRING_TITLE_SHOW_STATUS_BAR				NSLocalizedString(@"Show Status Bar", nil)
+#define NSSTRING_TITLE_HIDE_TOOLBAR					NSLocalizedString(@"Hide Toolbar", nil)
+#define NSSTRING_TITLE_SHOW_TOOLBAR					NSLocalizedString(@"Show Toolbar", nil)
 #define NSSTRING_TITLE_SPEED_1X						NSLocalizedString(@"Speed 1x", nil)
 #define NSSTRING_TITLE_SPEED_2X						NSLocalizedString(@"Speed 2x", nil)
 #define NSSTRING_TITLE_SLOT_NUMBER					NSLocalizedString(@"Slot %ld", nil)

Modified: trunk/desmume/src/cocoa/cocoa_output.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_output.h	2013-02-18 19:44:06 UTC (rev 4539)
+++ trunk/desmume/src/cocoa/cocoa_output.h	2013-02-19 01:31:04 UTC (rev 4540)
@@ -117,7 +117,6 @@
 @required
 - (void) doDisplayModeChanged:(NSInteger)displayModeID;
 
-@... (retain) NSPort *sendPortDisplay;
 @property (assign) BOOL isHudEnabled;
 @property (assign) BOOL isHudEditingModeEnabled;
 

Modified: trunk/desmume/src/cocoa/cocoa_output.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_output.mm	2013-02-18 19:44:06 UTC (rev 4539)
+++ trunk/desmume/src/cocoa/cocoa_output.mm	2013-02-19 01:31:04 UTC (rev 4540)
@@ -43,7 +43,7 @@
 
 - (id)init
 {
-	self = [super init];
+	self = [super initWithAutoreleaseInterval:0.1];
 	if (self == nil)
 	{
 		return self;
@@ -65,17 +65,8 @@
 
 - (void)dealloc
 {
-	// Exit the thread.
-	if (self.thread != nil)
-	{
-		self.threadExit = YES;
-		
-		// Wait until the thread has shut down.
-		while (self.thread != nil)
-		{
-			[NSThread sleepUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.01]];
-		}
-	}
+	// Force the thread to exit now so that we can safely release other resources.
+	[self forceThreadExit];
 	
 	self.frameData = nil;
 	self.frameAttributesData = nil;
@@ -474,7 +465,6 @@
 	if (theDelegate != nil)
 	{
 		[theDelegate retain];
-		[theDelegate setSendPortDisplay:self.receivePort];
 	}
 	
 	[delegate release];
@@ -822,7 +812,6 @@
 	if (theDelegate != nil)
 	{
 		[theDelegate retain];
-		[theDelegate setSendPortDisplay:self.receivePort];
 	}
 	
 	[videoDelegate release];

Modified: trunk/desmume/src/cocoa/cocoa_util.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_util.h	2013-02-18 19:44:06 UTC (rev 4539)
+++ trunk/desmume/src/cocoa/cocoa_util.h	2013-02-19 01:31:04 UTC (rev 4540)
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2012 DeSmuME team
+	Copyright (C) 2012-2013 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -67,14 +67,15 @@
 	NSPort *receivePort;	
 }
 
-@... (retain) NSThread *thread;
+@property (assign) NSThread *thread;
 @property (assign) BOOL threadExit;
 @property (assign) NSTimeInterval autoreleaseInterval;
-@... (retain) NSPort *sendPort;
-@... (readonly) NSPort *receivePort;
+@property (assign) NSPort *sendPort;
+@property (assign) NSPort *receivePort;
 
 - (id) initWithAutoreleaseInterval:(NSTimeInterval)interval;
 - (void) runThread:(id)object;
+- (void) forceThreadExit;
 
 @end
 

Modified: trunk/desmume/src/cocoa/cocoa_util.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_util.mm	2013-02-18 19:44:06 UTC (rev 4539)
+++ trunk/desmume/src/cocoa/cocoa_util.mm	2013-02-19 01:31:04 UTC (rev 4540)
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2013 DeSmuME team
+	Copyright (C) 2012-2013 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -35,6 +35,11 @@
 
 + (void) messageSendOneWay:(NSPort *)sendPort msgID:(NSInteger)msgID
 {
+	if (sendPort == nil || ![sendPort isValid])
+	{
+		return;
+	}
+	
 	NSPortMessage *message = [[NSPortMessage alloc] initWithSendPort:sendPort receivePort:nil components:nil];
 	[message setMsgid:msgID];
 	[message sendBeforeDate:distantFutureDate];
@@ -43,6 +48,11 @@
 
 + (void) messageSendOneWayWithMessageComponents:(NSPort *)sendPort msgID:(NSInteger)msgID array:(NSArray *)msgDataArray
 {
+	if (sendPort == nil || ![sendPort isValid])
+	{
+		return;
+	}
+	
 	NSPortMessage *message = [[NSPortMessage alloc] initWithSendPort:sendPort receivePort:nil components:msgDataArray];
 	[message setMsgid:msgID];
 	[message sendBeforeDate:distantFutureDate];
@@ -51,6 +61,11 @@
 
 + (void) messageSendOneWayWithData:(NSPort *)sendPort msgID:(NSInteger)msgID data:(NSData *)msgData
 {
+	if (sendPort == nil || ![sendPort isValid])
+	{
+		return;
+	}
+	
 	NSArray *messageComponents = [[NSArray alloc] initWithObjects:msgData, nil];
 	[CocoaDSUtil messageSendOneWayWithMessageComponents:sendPort msgID:msgID array:messageComponents];
 	[messageComponents release];
@@ -58,6 +73,11 @@
 
 + (void) messageSendOneWayWithInteger:(NSPort *)sendPort msgID:(NSInteger)msgID integerValue:(NSInteger)integerValue
 {
+	if (sendPort == nil || ![sendPort isValid])
+	{
+		return;
+	}
+	
 	NSData *messageData = [[NSData alloc] initWithBytes:&integerValue length:sizeof(NSInteger)];
 	[CocoaDSUtil messageSendOneWayWithData:sendPort msgID:msgID data:messageData];
 	[messageData release];
@@ -65,6 +85,11 @@
 
 + (void) messageSendOneWayWithFloat:(NSPort *)sendPort msgID:(NSInteger)msgID floatValue:(float)floatValue
 {
+	if (sendPort == nil || ![sendPort isValid])
+	{
+		return;
+	}
+	
 	NSData *messageData = [[NSData alloc] initWithBytes:&floatValue length:sizeof(float)];
 	[CocoaDSUtil messageSendOneWayWithData:sendPort msgID:msgID data:messageData];
 	[messageData release];
@@ -72,6 +97,11 @@
 
 + (void) messageSendOneWayWithBool:(NSPort *)sendPort msgID:(NSInteger)msgID boolValue:(BOOL)boolValue
 {
+	if (sendPort == nil || ![sendPort isValid])
+	{
+		return;
+	}
+	
 	NSData *messageData = [[NSData alloc] initWithBytes:&boolValue length:sizeof(BOOL)];
 	[CocoaDSUtil messageSendOneWayWithData:sendPort msgID:msgID data:messageData];
 	[messageData release];
@@ -79,6 +109,11 @@
 
 + (void) messageSendOneWayWithRect:(NSPort *)sendPort msgID:(NSInteger)msgID rect:(NSRect)rect
 {
+	if (sendPort == nil || ![sendPort isValid])
+	{
+		return;
+	}
+	
 	NSData *messageData = [[NSData alloc] initWithBytes:&rect length:sizeof(NSRect)];
 	[CocoaDSUtil messageSendOneWayWithData:sendPort msgID:msgID data:messageData];
 	[messageData release];
@@ -239,48 +274,58 @@
 
 - (void)dealloc
 {
-	// Exit the thread.
-	if (self.thread != nil)
-	{
-		// Tell the thread to shut down.
-		self.threadExit = YES;
-		
-		// Wait until the thread has shut down.
-		while (self.thread != nil)
-		{
-			[NSThread sleepUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.01]];
-		}
-	}
+	[self forceThreadExit];
 	
-	self.sendPort = nil;
-	[receivePort release];
-	
 	[super dealloc];
 }
 
 - (void) runThread:(id)object
 {
 	NSAutoreleasePool *threadPool = [[NSAutoreleasePool alloc] init];
-	NSRunLoop *runLoop = [[NSRunLoop currentRunLoop] retain];
+	NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
 	
-	[runLoop addPort:self.receivePort forMode:NSDefaultRunLoopMode];
-	self.thread = [NSThread currentThread];
+	[runLoop addPort:[self receivePort] forMode:NSDefaultRunLoopMode];
+	[self setThread:[NSThread currentThread]];
 	
 	do
 	{
 		NSAutoreleasePool *runLoopPool = [[NSAutoreleasePool alloc] init];
-		NSDate *runDate = [[NSDate alloc] initWithTimeIntervalSinceNow:self.autoreleaseInterval];
+		NSDate *runDate = [[NSDate alloc] initWithTimeIntervalSinceNow:[self autoreleaseInterval]];
 		[runLoop runUntilDate:runDate];
 		[runDate release];
 		[runLoopPool release];
-	} while (!self.threadExit);
+	} while (![self threadExit]);
 	
-	self.thread = nil;
-	[runLoop release];
+	NSPort *tempSendPort = [self sendPort];
+	[self setSendPort:nil];
+	[tempSendPort invalidate];
+	[tempSendPort release];
 	
+	NSPort *tempReceivePort = [self receivePort];
+	[self setReceivePort:nil];
+	[tempReceivePort invalidate];
+	[tempReceivePort release];
+	
 	[threadPool release];
+	[self setThread:nil];
 }
 
+- (void) forceThreadExit
+{
+	if ([self thread] == nil)
+	{
+		return;
+	}
+	
+	[self setThreadExit:YES];
+	
+	// Wait until the thread has shut down.
+	while ([self thread] != nil)
+	{
+		[NSThread sleepUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.01]];
+	}
+}
+
 - (void)handlePortMessage:(NSPortMessage *)portMessage
 {
 	NSInteger message = (NSInteger)[portMessage msgid];
@@ -288,7 +333,7 @@
 	switch (message)
 	{
 		case MESSAGE_EXIT_THREAD:
-			self.threadExit = YES;
+			[self setThreadExit:YES];
 			break;
 			
 		default:

Added: trunk/desmume/src/cocoa/translations/English.lproj/DisplayWindow.xib
===================================================================
--- trunk/desmume/src/cocoa/translations/English.lproj/DisplayWindow.xib	                        (rev 0)
+++ trunk/desmume/src/cocoa/translations/English.lproj/DisplayWindow.xib	2013-02-19 01:31:04 UTC (rev 4540)
@@ -0,0 +1,1900 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
+	<data>
+		<int key="IBDocument.SystemTarget">1060</int>
+		<string key="IBDocument.SystemVersion">10K549</string>
+		<string key="IBDocument.InterfaceBuilderVersion">851</string>
+		<string key="IBDocument.AppKitVersion">1038.36</string>
+		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">851</string>
+		</object>
+		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="5"/>
+		</object>
+		<object class="NSArray" key="IBDocument.PluginDependencies">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys" id="0">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
+			<object class="NSMutableArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
+		</object>
+		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSCustomObject" id="1001">
+				<string key="NSClassName">DisplayWindowController</string>
+			</object>
+			<object class="NSCustomObject" id="1003">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1004">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="418996424">
+				<int key="NSWindowStyleMask">271</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{830, 370}, {256, 408}}</string>
+				<int key="NSWTFlags">74973184</int>
+				<string key="NSWindowTitle">DeSmuME</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<object class="NSToolbar" key="NSViewClass" id="321775728">
+					<object class="NSMutableString" key="NSToolbarIdentifier">
+						<characters key="NS.bytes">D5552DCE-722B-4ECB-8E0A-8B7CF76EAC70</characters>
+					</object>
+					<nil key="NSToolbarDelegate"/>
+					<bool key="NSToolbarPrefersToBeShown">YES</bool>
+					<bool key="NSToolbarShowsBaselineSeparator">YES</bool>
+					<bool key="NSToolbarAllowsUserCustomization">YES</bool>
+					<bool key="NSToolbarAutosavesConfiguration">YES</bool>
+					<int key="NSToolbarDisplayMode">1</int>
+					<int key="NSToolbarSizeMode">2</int>
+					<object class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>0135754F-463F-4625-9D27-DEF701AEF50E</string>
+							<string>2E728430-6055-404B-944F-25594ACBEC39</string>
+							<string>321036F9-6034-47B1-9CC5-2461D98700F0</string>
+							<string>41A299FB-4A95-4FA3-9982-8523FF04ACDE</string>
+							<string>C626F2C1-4353-4288-AD59-40FB7F4C1A58</string>
+							<string>EDBFD998-E031-4AC5-A86A-7114D66FF847</string>
+							<string>NSToolbarFlexibleSpaceItem</string>
+							<string>NSToolbarSpaceItem</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="NSToolbarItem" id="127287125">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">0135754F-463F-4625-9D27-DEF701AEF50E</characters>
+								</object>
+								<string key="NSToolbarItemLabel">Open ROM</string>
+								<string key="NSToolbarItemPaletteLabel">Open ROM</string>
+								<string key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSCustomResource" key="NSToolbarItemImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">Icon_OpenROM_420x420</string>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
+							<object class="NSToolbarItem" id="298859108">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">2E728430-6055-404B-944F-25594ACBEC39</characters>
+								</object>
+								<string key="NSToolbarItemLabel">Execute</string>
+								<string key="NSToolbarItemPaletteLabel">Execute/Pause</string>
+								<string key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSCustomResource" key="NSToolbarItemImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">Icon_Execute_420x420</string>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
+							<object class="NSToolbarItem" id="281439290">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">321036F9-6034-47B1-9CC5-2461D98700F0</characters>
+								</object>
+								<string key="NSToolbarItemLabel">Reset</string>
+								<string key="NSToolbarItemPaletteLabel">Reset</string>
+								<string key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSCustomResource" key="NSToolbarItemImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">Icon_Reset_420x420</string>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
+							<object class="NSToolbarItem" id="668087633">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">41A299FB-4A95-4FA3-9982-8523FF04ACDE</characters>
+								</object>
+								<string key="NSToolbarItemLabel">Rotate Right</string>
+								<string key="NSToolbarItemPaletteLabel">Rotate Right</string>
+								<string key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSCustomResource" key="NSToolbarItemImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">Icon_RotateCW_420x420</string>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">90</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
+							<object class="NSToolbarItem" id="843588223">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">C626F2C1-4353-4288-AD59-40FB7F4C1A58</characters>
+								</object>
+								<string key="NSToolbarItemLabel">Rotate Left</string>
+								<string key="NSToolbarItemPaletteLabel">Rotate Left</string>
+								<string key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSCustomResource" key="NSToolbarItemImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">Icon_RotateCCW_420x420</string>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-90</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
+							<object class="NSToolbarItem" id="137384193">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">EDBFD998-E031-4AC5-A86A-7114D66FF847</characters>
+								</object>
+								<string key="NSToolbarItemLabel">Speed 2x</string>
+								<string key="NSToolbarItemPaletteLabel">Speed 1x/2x</string>
+								<string key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSCustomResource" key="NSToolbarItemImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">Icon_Speed2x_420x420</string>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">200</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
+							<object class="NSToolbarFlexibleSpaceItem" id="69604475">
+								<string key="NSToolbarItemIdentifier">NSToolbarFlexibleSpaceItem</string>
+								<string key="NSToolbarItemLabel"/>
+								<string key="NSToolbarItemPaletteLabel">Flexible Space</string>
+								<nil key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<nil key="NSToolbarItemImage"/>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{1, 5}</string>
+								<string key="NSToolbarItemMaxSize">{20000, 32}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+								<object class="NSMenuItem" key="NSToolbarItemMenuFormRepresentation">
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<object class="NSCustomResource" key="NSOnImage" id="332695261">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">NSMenuCheckmark</string>
+									</object>
+									<object class="NSCustomResource" key="NSMixedImage" id="541356577">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">NSMenuMixedState</string>
+									</object>
+								</object>
+							</object>
+							<object class="NSToolbarSpaceItem" id="522097277">
+								<string key="NSToolbarItemIdentifier">NSToolbarSpaceItem</string>
+								<string key="NSToolbarItemLabel"/>
+								<string key="NSToolbarItemPaletteLabel">Space</string>
+								<nil key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<nil key="NSToolbarItemImage"/>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{32, 5}</string>
+								<string key="NSToolbarItemMaxSize">{32, 32}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+								<object class="NSMenuItem" key="NSToolbarItemMenuFormRepresentation">
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="332695261"/>
+									<reference key="NSMixedImage" ref="541356577"/>
+								</object>
+							</object>
+						</object>
+					</object>
+					<object class="NSArray" key="NSToolbarIBAllowedItems">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<reference ref="298859108"/>
+						<reference ref="137384193"/>
+						<reference ref="281439290"/>
+						<reference ref="843588223"/>
+						<reference ref="668087633"/>
+						<reference ref="127287125"/>
+						<reference ref="522097277"/>
+						<reference ref="69604475"/>
+					</object>
+					<object class="NSMutableArray" key="NSToolbarIBDefaultItems">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<reference ref="298859108"/>
+						<reference ref="137384193"/>
+						<reference ref="281439290"/>
+						<reference ref="843588223"/>
+						<reference ref="668087633"/>
+						<reference ref="69604475"/>
+					</object>
+					<reference key="NSToolbarIBSelectableItems" ref="0"/>
+				</object>
+				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+				<string key="NSWindowContentMinSize">{256, 408}</string>
+				<object class="NSView" key="NSWindowView" id="1027645320">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<object class="NSMutableArray" key="NSSubviews">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSProgressIndicator" id="963885183">
+							<reference key="NSNextResponder" ref="1027645320"/>
+							<int key="NSvFlags">5156</int>
+							<object class="NSPSMatrix" key="NSDrawMatrix"/>
+							<string key="NSFrame">{{2, 3}, {16, 16}}</string>
+							<reference key="NSSuperview" ref="1027645320"/>
+							<int key="NSpiFlags">28938</int>
+							<double key="NSMaxValue">100</double>
+						</object>
+						<object class="NSImageView" id="323138602">
+							<reference key="NSNextResponder" ref="1027645320"/>
+							<int key="NSvFlags">289</int>
+							<object class="NSMutableSet" key="NSDragTypes">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSArray" key="set.sortedObjects">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<string>Apple PDF pasteboard type</string>
+									<string>Apple PICT pasteboard type</string>
+									<string>Apple PNG pasteboard type</string>
+									<string>NSFilenamesPboardType</string>
+									<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+									<string>NeXT TIFF v4.0 pasteboard type</string>
+								</object>
+							</object>
+							<string key="NSFrame">{{160, 1}, {20, 20}}</string>
+							<reference key="NSSuperview" ref="1027645320"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSImageCell" key="NSCell" id="1028721215">
+								<int key="NSCellFlags">130560</int>
+								<int key="NSCellFlags2">33554432</int>
+								<object class="NSCustomResource" key="NSContents">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">Icon_VolumeFull_16x16</string>
+								</object>
+								<int key="NSAlign">0</int>
+								<int key="NSScale">2</int>
+								<int key="NSStyle">0</int>
+								<bool key="NSAnimates">YES</bool>
+							</object>
+							<bool key="NSEditable">YES</bool>
+						</object>
+						<object class="NSTextField" id="731708450">
+							<reference key="NSNextResponder" ref="1027645320"/>
+							<int key="NSvFlags">294</int>
+							<string key="NSFrame">{{17, 5}, {137, 14}}</string>
+							<reference key="NSSuperview" ref="1027645320"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="644649254">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272634880</int>
+								<string key="NSContents"/>
+								<object class="NSFont" key="NSSupport">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">11</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<string key="NSPlaceholderString">Status Text</string>
+								<reference key="NSControlView" ref="731708450"/>
+								<object class="NSColor" key="NSBackgroundColor" id="949245653">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+									</object>
+								</object>
+								<object class="NSColor" key="NSTextColor" id="434655141">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlTextColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MAA</bytes>
+									</object>
+								</object>
+							</object>
+						</object>
+						<object class="NSCustomView" id="740908585">
+							<reference key="NSNextResponder" ref="1027645320"/>
+							<int key="NSvFlags">45</int>
+							<string key="NSFrame">{{0, 24}, {256, 384}}</string>
+							<reference key="NSSuperview" ref="1027645320"/>
+							<bool key="NSViewCanDrawConcurrently">YES</bool>
+							<string key="NSClassName">DisplayView</string>
+						</object>
+						<object class="NSSlider" id="710507134">
+							<reference key="NSNextResponder" ref="1027645320"/>
+							<int key="NSvFlags">289</int>
+							<string key="NSFrame">{{180, 3}, {56, 15}}</string>
+							<reference key="NSSuperview" ref="1027645320"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSSliderCell" key="NSCell" id="62495840">
+								<int key="NSCellFlags">-2079981824</int>
+								<int key="NSCellFlags2">131072</int>
+								<string key="NSContents"/>
+								<reference key="NSControlView" ref="710507134"/>
+								<double key="NSMaxValue">100</double>
+								<double key="NSMinValue">0.0</double>
+								<double key="NSValue">100</double>
+								<double key="NSAltIncValue">0.0</double>
+								<int key="NSNumberOfTickMarks">0</int>
+								<int key="NSTickMarkPosition">1</int>
+								<bool key="NSAllowsTickMarkValuesOnly">NO</bool>
+								<bool key="NSVertical">NO</bool>
+							</object>
+						</object>
+					</object>
+					<string key="NSFrameSize">{256, 408}</string>
+					<reference key="NSSuperview"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
+				<string key="NSMinSize">{256, 476}</string>
+				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+			</object>
+			<object class="NSCustomView" id="365545800">
+				<nil key="NSNextResponder"/>
+				<int key="NSvFlags">268</int>
+				<object class="NSMutableArray" key="NSSubviews">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="NSPopUpButton" id="753953961">
+						<reference key="NSNextResponder" ref="365545800"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{176, 5}, {126, 26}}</string>
+						<reference key="NSSuperview" ref="365545800"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSPopUpButtonCell" key="NSCell" id="820027893">
+							<int key="NSCellFlags">-2076049856</int>
+							<int key="NSCellFlags2">2048</int>
+							<object class="NSFont" key="NSSupport" id="844216569">
+								<string key="NSName">LucidaGrande</string>
+								<double key="NSSize">13</double>
+								<int key="NSfFlags">1044</int>
+							</object>
+							<reference key="NSControlView" ref="753953961"/>
+							<int key="NSButtonFlags">109199615</int>
+							<int key="NSButtonFlags2">1</int>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">400</int>
+							<int key="NSPeriodicInterval">75</int>
+							<object class="NSMenuItem" key="NSMenuItem" id="560548382">
+								<reference key="NSMenu" ref="225068659"/>
+								<string key="NSTitle">TIFF</string>
+								<string key="NSKeyEquiv"/>
+								<int key="NSMnemonicLoc">2147483647</int>
+								<int key="NSState">1</int>
+								<reference key="NSOnImage" ref="332695261"/>
+								<reference key="NSMixedImage" ref="541356577"/>
+								<string key="NSAction">_popUpItemAction:</string>
+								<reference key="NSTarget" ref="820027893"/>
+							</object>
+							<bool key="NSMenuItemRespectAlignment">YES</bool>
+							<object class="NSMenu" key="NSMenu" id="225068659">
+								<string key="NSTitle">OtherViews</string>
+								<object class="NSMutableArray" key="NSMenuItems">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<reference ref="560548382"/>
+									<object class="NSMenuItem" id="894816474">
+										<reference key="NSMenu" ref="225068659"/>
+										<string key="NSTitle">BMP</string>
+										<string key="NSKeyEquiv"/>
+										<int key="NSMnemonicLoc">2147483647</int>
+										<reference key="NSOnImage" ref="332695261"/>
+										<reference key="NSMixedImage" ref="541356577"/>
+										<string key="NSAction">_popUpItemAction:</string>
+										<int key="NSTag">1</int>
+										<reference key="NSTarget" ref="820027893"/>
+									</object>
+									<object class="NSMenuItem" id="916410908">
+										<reference key="NSMenu" ref="225068659"/>
+										<string key="NSTitle">GIF</string>
+										<string key="NSKeyEquiv"/>
+										<int key="NSMnemonicLoc">2147483647</int>
+										<reference key="NSOnImage" ref="332695261"/>
+										<reference key="NSMixedImage" ref="541356577"/>
+										<string key="NSAction">_popUpItemAction:</string>
+										<int key="NSTag">2</int>
+										<reference key="NSTarget" ref="820027893"/>
+									</object>
+									<object class="NSMenuItem" id="142902327">
+										<reference key="NSMenu" ref="225068659"/>
+										<string key="NSTitle">JPEG</string>
+										<string key="NSKeyEquiv"/>
+										<int key="NSMnemonicLoc">2147483647</int>
+										<reference key="NSOnImage" ref="332695261"/>
+										<reference key="NSMixedImage" ref="541356577"/>
+										<string key="NSAction">_popUpItemAction:</string>
+										<int key="NSTag">3</int>
+										<reference key="NSTarget" ref="820027893"/>
+									</object>
+									<object class="NSMenuItem" id="428843260">
+										<reference key="NSMenu" ref="225068659"/>
+										<string key="NSTitle">PNG</string>
+										<string key="NSKeyEquiv"/>
+										<int key="NSMnemonicLoc">2147483647</int>
+										<reference key="NSOnImage" ref="332695261"/>
+										<reference key="NSMixedImage" ref="541356577"/>
+										<string key="NSAction">_popUpItemAction:</string>
+										<int key="NSTag">4</int>
+										<reference key="NSTarget" ref="820027893"/>
+									</object>
+									<object class="NSMenuItem" id="742527020">
+										<reference key="NSMenu" ref="225068659"/>
+										<string key="NSTitle">JPEG 2000</string>
+										<string key="NSKeyEquiv"/>
+										<int key="NSMnemonicLoc">2147483647</int>
+										<reference key="NSOnImage" ref="332695261"/>
+										<reference key="NSMixedImage" ref="541356577"/>
+										<string key="NSAction">_popUpItemAction:</string>
+										<int key="NSTag">5</int>
+										<reference key="NSTarget" ref="820027893"/>
+									</object>
+								</object>
+								<reference key="NSMenuFont" ref="844216569"/>
+							</object>
+							<int key="NSPreferredEdge">1</int>
+							<bool key="NSUsesItemFromMenu">YES</bool>
+							<bool key="NSAltersState">YES</bool>
+							<int key="NSArrowPosition">2</int>
+						</object>
+					</object>
+					<object class="NSTextField" id="519006720">
+						<reference key="NSNextResponder" ref="365545800"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{38, 11}, {136, 17}}</string>
+						<reference key="NSSuperview" ref="365545800"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="31654353">
+							<int key="NSCellFlags">68288064</int>
+							<int key="NSCellFlags2">71304192</int>
+							<string key="NSContents">Select Image Format:</string>
+							<reference key="NSSupport" ref="844216569"/>
+							<reference key="NSControlView" ref="519006720"/>
+							<reference key="NSBackgroundColor" ref="949245653"/>
+							<reference key="NSTextColor" ref="434655141"/>
+						</object>
+					</object>
+				</object>
+				<string key="NSFrameSize">{350, 35}</string>
+				<string key="NSClassName">NSView</string>
+			</object>
+		</object>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<object class="NSMutableArray" key="connectionRecords">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="418996424"/>
+					</object>
+					<int key="connectionID">22</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">hidden: isShowingStatusBar</string>
+						<reference key="source" ref="323138602"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="323138602"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">hidden: isShowingStatusBar</string>
+							<string key="NSBinding">hidden</string>
+							<string key="NSKeyPath">isShowingStatusBar</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValueTransformerName</string>
+								<string key="NS.object.0">NSNegateBoolean</string>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">52</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: isShowingStatusBar</string>
+						<reference key="source" ref="731708450"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="731708450"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">enabled: isShowingStatusBar</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">isShowingStatusBar</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValueTransformerName</string>
+								<string key="NS.object.0">NSNegateBoolean</string>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">53</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">hidden: isShowingStatusBar</string>
+						<reference key="source" ref="963885183"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="963885183"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">hidden: isShowingStatusBar</string>
+							<string key="NSBinding">hidden</string>
+							<string key="NSKeyPath">isShowingStatusBar</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValueTransformerName</string>
+								<string key="NS.object.0">NSNegateBoolean</string>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">54</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">changeCoreSpeed:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="137384193"/>
+					</object>
+					<int key="connectionID">56</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">changeRotationRelative:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="843588223"/>
+					</object>
+					<int key="connectionID">57</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">changeRotationRelative:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="668087633"/>
+					</object>
+					<int key="connectionID">58</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">executeCoreToggle:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="298859108"/>
+					</object>
+					<int key="connectionID">59</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">openRom:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="127287125"/>
+					</object>
+					<int key="connectionID">60</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">resetCore:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="281439290"/>
+					</object>
+					<int key="connectionID">61</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="418996424"/>
+						<reference key="destination" ref="1001"/>
+					</object>
+					<int key="connectionID">62</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="740908585"/>
+					</object>
+					<int key="connectionID">64</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: emuControl.currentVolumeIcon</string>
+						<reference key="source" ref="323138602"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="323138602"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">value: emuControl.currentVolumeIcon</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">emuControl.currentVolumeIcon</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">65</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: emuControl.statusText</string>
+						<reference key="source" ref="731708450"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="731708450"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">value: emuControl.statusText</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">emuControl.statusText</string>
+							<object class="NSDictionary" key="NSOptions">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSArray" key="dict.sortedKeys">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<string>NSAllowsEditingMultipleValuesSelection</string>
+									<string>NSRaisesForNotApplicableKeys</string>
+									<string>NSValidatesImmediately</string>
+								</object>
+								<object class="NSMutableArray" key="dict.values">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<boolean value="NO"/>
+									<boolean value="NO"/>
+									<boolean value="YES"/>
+								</object>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">67</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">animate: emuControl.isWorking</string>
+						<reference key="source" ref="963885183"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="963885183"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">animate: emuControl.isWorking</string>
+							<string key="NSBinding">animate</string>
+							<string key="NSKeyPath">emuControl.isWorking</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">68</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: emuControl.currentVolumeValue</string>
+						<reference key="source" ref="710507134"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="710507134"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">value: emuControl.currentVolumeValue</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">emuControl.currentVolumeValue</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">88</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">changeVolume:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="710507134"/>
+					</object>
+					<int key="connectionID">89</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">hidden: isShowingStatusBar</string>
+						<reference key="source" ref="710507134"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="710507134"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">hidden: isShowingStatusBar</string>
+							<string key="NSBinding">hidden</string>
+							<string key="NSKeyPath">isShowingStatusBar</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSValueTransformerName</string>
+								<string key="NS.object.0">NSNegateBoolean</string>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">92</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">saveScreenshotPanelAccessoryView</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="365545800"/>
+					</object>
+					<int key="connectionID">105</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">selectedTag: screenshotFileFormat</string>
+						<reference key="source" ref="753953961"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="753953961"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">selectedTag: screenshotFileFormat</string>
+							<string key="NSBinding">selectedTag</string>
+							<string key="NSKeyPath">screenshotFileFormat</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">106</int>
+				</object>
+			</object>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<object class="NSArray" key="orderedObjects">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<reference key="object" ref="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1001"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1003"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1004"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3</int>
+						<reference key="object" ref="418996424"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="321775728"/>
+							<reference ref="1027645320"/>
+						</object>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="321775728"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="843588223"/>
+							<reference ref="668087633"/>
+							<reference ref="522097277"/>
+							<reference ref="69604475"/>
+							<reference ref="127287125"/>
+							<reference ref="298859108"/>
+							<reference ref="137384193"/>
+							<reference ref="281439290"/>
+						</object>
+						<reference key="parent" ref="418996424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="1027645320"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="731708450"/>
+							<reference ref="323138602"/>
+							<reference ref="963885183"/>
+							<reference ref="740908585"/>
+							<reference ref="710507134"/>
+						</object>
+						<reference key="parent" ref="418996424"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="731708450"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="644649254"/>
+						</object>
+						<reference key="parent" ref="1027645320"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">8</int>
+						<reference key="object" ref="323138602"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1028721215"/>
+						</object>
+						<reference key="parent" ref="1027645320"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10</int>
+						<reference key="object" ref="963885183"/>
+						<reference key="parent" ref="1027645320"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">12</int>
+						<reference key="object" ref="1028721215"/>
+						<reference key="parent" ref="323138602"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">13</int>
+						<reference key="object" ref="644649254"/>
+						<reference key="parent" ref="731708450"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">14</int>
+						<reference key="object" ref="843588223"/>
+						<reference key="parent" ref="321775728"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="668087633"/>
+						<reference key="parent" ref="321775728"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">16</int>
+						<reference key="object" ref="522097277"/>
+						<reference key="parent" ref="321775728"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">17</int>
+						<reference key="object" ref="69604475"/>
+						<reference key="parent" ref="321775728"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">18</int>
+						<reference key="object" ref="127287125"/>
+						<reference key="parent" ref="321775728"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="298859108"/>
+						<reference key="parent" ref="321775728"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">20</int>
+						<reference key="object" ref="137384193"/>
+						<reference key="parent" ref="321775728"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">21</int>
+						<reference key="object" ref="281439290"/>
+						<reference key="parent" ref="321775728"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">63</int>
+						<reference key="object" ref="740908585"/>
+						<reference key="parent" ref="1027645320"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">84</int>
+						<reference key="object" ref="710507134"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="62495840"/>
+						</object>
+						<reference key="parent" ref="1027645320"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">85</int>
+						<reference key="object" ref="62495840"/>
+						<reference key="parent" ref="710507134"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">93</int>
+						<reference key="object" ref="365545800"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="753953961"/>
+							<reference ref="519006720"/>
+						</object>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Screenshot Save Panel Accessory</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">94</int>
+						<reference key="object" ref="753953961"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="820027893"/>
+						</object>
+						<reference key="parent" ref="365545800"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">95</int>
+						<reference key="object" ref="519006720"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="31654353"/>
+						</object>
+						<reference key="parent" ref="365545800"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">96</int>
+						<reference key="object" ref="31654353"/>
+						<reference key="parent" ref="519006720"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">97</int>
+						<reference key="object" ref="820027893"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="225068659"/>
+						</object>
+						<reference key="parent" ref="753953961"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">98</int>
+						<reference key="object" ref="225068659"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="894816474"/>
+							<reference ref="142902327"/>
+							<reference ref="916410908"/>
+							<reference ref="560548382"/>
+							<reference ref="428843260"/>
+							<reference ref="742527020"/>
+						</object>
+						<reference key="parent" ref="820027893"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">99</int>
+						<reference key="object" ref="894816474"/>
+						<reference key="parent" ref="225068659"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100</int>
+						<reference key="object" ref="142902327"/>
+						<reference key="parent" ref="225068659"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">101</int>
+						<reference key="object" ref="916410908"/>
+						<reference key="parent" ref="225068659"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">102</int>
+						<reference key="object" ref="560548382"/>
+						<reference key="parent" ref="225068659"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">103</int>
+						<reference key="object" ref="428843260"/>
+						<reference key="parent" ref="225068659"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">104</int>
+						<reference key="object" ref="742527020"/>
+						<reference key="parent" ref="225068659"/>
+					</object>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="flattenedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="NSArray" key="dict.sortedKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>-1.IBPluginDependency</string>
+					<string>-2.IBPluginDependency</string>
+					<string>-3.IBPluginDependency</string>
+					<string>10.IBPluginDependency</string>
+					<string>10.IBViewBoundsToFrameTransform</string>
+					<string>100.IBPluginDependency</string>
+					<string>101.IBPluginDependency</string>
+					<string>102.IBPluginDependency</string>
+					<string>103.IBPluginDependency</string>
+					<string>104.IBPluginDependency</string>
+					<string>13.IBPluginDependency</string>
+					<string>14.IBPluginDependency</string>
+					<string>15.IBPluginDependency</string>
+					<string>16.IBPluginDependency</string>
+					<string>17.IBPluginDependency</string>
+					<string>18.IBPluginDependency</string>
+					<string>19.IBPluginDependency</string>
+					<string>20.IBPluginDependency</string>
+					<string>21.IBPluginDependency</string>
+					<string>3.IBEditorWindowLastContentRect</string>
+					<string>3.IBPluginDependency</string>
+					<string>3.IBWindowTemplateEditedContentRect</string>
+					<string>3.NSWindowTemplate.visibleAtLaunch</string>
+					<string>3.editorWindowContentRectSynchronizationRect</string>
+					<string>3.windowTemplate.hasMinSize</string>
+					<string>3.windowTemplate.maxSize</string>
+					<string>3.windowTemplate.minSize</string>
+					<string>4.IBEditorWindowLastContentRect</string>
+					<string>4.IBPluginDependency</string>
+					<string>5.IBPluginDependency</string>
+					<string>6.IBPluginDependency</string>
+					<string>6.IBViewBoundsToFrameTransform</string>
+					<string>63.IBPluginDependency</string>
+					<string>63.IBViewBoundsToFrameTransform</string>
+					<string>8.IBViewBoundsToFrameTransform</string>
+					<string>84.IBPluginDependency</string>
+					<string>84.IBViewBoundsToFrameTransform</string>
+					<string>85.IBPluginDependency</string>
+					<string>93.IBEditorWindowLastContentRect</string>
+					<string>93.IBPluginDependency</string>
+					<string>93.IBViewBoundsToFrameTransform</string>
+					<string>94.IBPluginDependency</string>
+					<string>94.IBViewBoundsToFrameTransform</string>
+					<string>95.IBPluginDependency</string>
+					<string>95.IBViewBoundsToFrameTransform</string>
+					<string>96.IBPluginDependency</string>
+					<string>97.IBPluginDependency</string>
+					<string>98.IBEditorWindowLastContentRect</string>
+					<string>98.IBPluginDependency</string>
+					<string>99.IBPluginDependency</string>
+				</object>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABAQAAAwjAAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{1316, 313}, {256, 408}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{1316, 313}, {256, 408}}</string>
+					<boolean value="NO"/>
+					<string>{{33, 99}, {480, 360}}</string>
+					<boolean value="YES"/>
+					<string>{3.40282e+38, 3.40282e+38}</string>
+					<string>{256, 408}</string>
+					<string>{{1056, 575}, {616, 0}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBiAAAwYgAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">AQAAAABDnAAAA</bytes>
+					</object>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">AULcAAA/gAAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABCwAAAwZAAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{1220, 906}, {350, 35}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDMAAAwegAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABCGAAAwgwAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{1185, 897}, {126, 123}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="unlocalizedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<reference key="dict.sortedKeys" ref="0"/>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+			</object>
+			<nil key="activeLocalization"/>
+			<object class="NSMutableDictionary" key="localizations">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<reference key="dict.sortedKeys" ref="0"/>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+			</object>
+			<nil key="sourceID"/>
+			<int key="maxID">106</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">DisplayView</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="891642995">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">userinterface/DisplayWindowController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">DisplayWindowController</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>changeCoreSpeed:</string>
+							<string>changeRotationRelative:</string>
+							<string>changeVolume:</string>
+							<string>copy:</string>
+							<string>executeCoreToggle:</string>
+							<string>openRom:</string>
+							<string>resetCore:</string>
+							<string>saveScreenshotAs:</string>
+							<string>toggleKeepMinDisplaySizeAtNormal:</string>
+							<string>toggleStatusBar:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>changeCoreSpeed:</string>
+							<string>changeRotationRelative:</string>
+							<string>changeVolume:</string>
+							<string>copy:</string>
+							<string>executeCoreToggle:</string>

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4541
          http://desmume.svn.sourceforge.net/desmume/?rev=4541&view=rev
Author:   rogerman
Date:     2013-02-20 01:50:43 +0000 (Wed, 20 Feb 2013)
Log Message:
-----------
Cocoa Port:
- Do some Cocoa bindings cleanup.

Modified Paths:
--------------
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
    trunk/desmume/src/cocoa/userinterface/EmuControllerDelegate.h
    trunk/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm

Modified: trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
===================================================================
--- trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib	2013-02-19 01:31:04 UTC (rev 4540)
+++ trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib	2013-02-20 01:50:43 UTC (rev 4541)
@@ -13,7 +13,6 @@
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<integer value="81"/>
-			<integer value="3786"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -15062,7 +15061,7 @@
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="729561310">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -15963,7 +15962,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{284, 560}</string>
-					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -20172,6 +20170,7 @@
 					<string>mainWindow.useBilinearOutput</string>
 					<string>mainWindow.useVerticalSync</string>
 					<string>mainWindow.screenshotFileFormat</string>
+					<string>selectedExportRomSaveID</string>
 				</object>
 				<string key="NSObjectClassName">EmuControllerDelegate</string>
 				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
@@ -27416,30 +27415,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">selectExportRomSaveFormat:</string>
-						<reference key="source" ref="231770064"/>
-						<reference key="destination" ref="98187887"/>
-					</object>
-					<int key="connectionID">6720</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">selectExportRomSaveFormat:</string>
-						<reference key="source" ref="231770064"/>
-						<reference key="destination" ref="839916386"/>
-					</object>
-					<int key="connectionID">6721</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">selectExportRomSaveFormat:</string>
-						<reference key="source" ref="231770064"/>
-						<reference key="destination" ref="472661265"/>
-					</object>
-					<int key="connectionID">6722</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
 						<string key="label">changeCoreEmuFlags:</string>
 						<reference key="source" ref="231770064"/>
 						<reference key="destination" ref="858194736"/>
@@ -29237,6 +29212,22 @@
 					</object>
 					<int key="connectionID">7000</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">selectedTag: selection.selectedExportRomSaveID</string>
+						<reference key="source" ref="996525585"/>
+						<reference key="destination" ref="258098641"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="996525585"/>
+							<reference key="NSDestination" ref="258098641"/>
+							<string key="NSLabel">selectedTag: selection.selectedExportRomSaveID</string>
+							<string key="NSBinding">selectedTag</string>
+							<string key="NSKeyPath">selection.selectedExportRomSaveID</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">7001</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -46650,7 +46641,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">7000</int>
+			<int key="maxID">7001</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">

Modified: trunk/desmume/src/cocoa/userinterface/EmuControllerDelegate.h
===================================================================
--- trunk/desmume/src/cocoa/userinterface/EmuControllerDelegate.h	2013-02-19 01:31:04 UTC (rev 4540)
+++ trunk/desmume/src/cocoa/userinterface/EmuControllerDelegate.h	2013-02-20 01:50:43 UTC (rev 4541)
@@ -49,7 +49,6 @@
 	NSView *exportRomSavePanelAccessoryView;
 	
 	BOOL isSaveStateEdited;
-	NSInteger selectedExportRomSaveID;
 	
 	BOOL isWorking;
 	BOOL isRomLoading;
@@ -60,6 +59,7 @@
 	BOOL isShowingFileMigrationDialog;
 	BOOL isUserInterfaceBlockingExecution;
 	NSURL *currentSaveStateURL;
+	NSInteger selectedExportRomSaveID;
 	NSInteger selectedRomSaveTypeID;
 	
 	NSImage *iconVolumeFull;
@@ -114,6 +114,7 @@
 @property (assign) BOOL isShowingFileMigrationDialog;
 @property (assign) BOOL isUserInterfaceBlockingExecution;
 @property (retain) NSURL *currentSaveStateURL;
+@property (assign) NSInteger selectedExportRomSaveID;
 @property (assign) NSInteger selectedRomSaveTypeID;
 
 @property (assign) NSInteger render3DRenderingEngine;
@@ -142,7 +143,6 @@
 - (IBAction) saveEmuSaveStateSlot:(id)sender;
 - (IBAction) importRomSave:(id)sender;
 - (IBAction) exportRomSave:(id)sender;
-- (IBAction) selectExportRomSaveFormat:(id)sender;
 
 // Edit Menu
 - (IBAction) copy:(id)sender;

Modified: trunk/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm
===================================================================
--- trunk/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm	2013-02-19 01:31:04 UTC (rev 4540)
+++ trunk/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm	2013-02-20 01:50:43 UTC (rev 4541)
@@ -69,6 +69,7 @@
 @synthesize isUserInterfaceBlockingExecution;
 
 @synthesize currentSaveStateURL;
+@synthesize selectedExportRomSaveID;
 @synthesize selectedRomSaveTypeID;
 
 @dynamic render3DRenderingEngine;
@@ -110,8 +111,8 @@
 	isUserInterfaceBlockingExecution = NO;
 	
 	currentSaveStateURL = nil;
-	selectedExportRomSaveID = 0;
 	selectedRomSaveTypeID = ROMSAVETYPE_AUTOMATIC;
+	selectedExportRomSaveID = 0;
 	
 	iconExecute = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Execute_420x420" ofType:@"png"]];
 	iconPause = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Pause_420x420" ofType:@"png"]];
@@ -749,7 +750,7 @@
 		NSURL *romSaveURL = [CocoaDSFile fileURLFromRomURL:[[self currentRom] fileURL] toKind:@"ROM Save"];
 		if (romSaveURL != nil)
 		{
-			const BOOL isRomSaveExported = [CocoaDSFile exportRomSaveToURL:[panel URL] romSaveURL:romSaveURL fileType:selectedExportRomSaveID];
+			const BOOL isRomSaveExported = [CocoaDSFile exportRomSaveToURL:[panel URL] romSaveURL:romSaveURL fileType:[self selectedExportRomSaveID]];
 			[self setStatusText:(isRomSaveExported) ? NSSTRING_STATUS_ROM_SAVE_EXPORTED : NSSTRING_STATUS_ROM_SAVE_EXPORT_FAILED];
 		}
 	}
@@ -757,11 +758,6 @@
 	[self restoreCoreState];
 }
 
-- (IBAction) selectExportRomSaveFormat:(id)sender
-{
-	selectedExportRomSaveID = [CocoaDSUtil getIBActionSenderTag:sender];
-}
-
 - (IBAction) copy:(id)sender
 {
 	[mainWindow copy:sender];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4548
          http://desmume.svn.sourceforge.net/desmume/?rev=4548&view=rev
Author:   rogerman
Date:     2013-03-01 23:41:03 +0000 (Fri, 01 Mar 2013)
Log Message:
-----------
Cocoa Port:
- Completely reimplement the input handling architecture to be simpler, more efficient, and more extensible.
- Decouple the high level input handling code from the lower level emulation interfacing code.
- Obsolete and remove the following classes: CocoaDSInput, CocoaHIDManager, CocoaHIDDevice. (Their functionality has been superseded by InputManager, InputHIDManager and InputHIDDevice, respectively.)

Modified Paths:
--------------
    trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj
    trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj
    trunk/desmume/src/cocoa/DefaultKeyMappings.plist
    trunk/desmume/src/cocoa/cocoa_core.mm
    trunk/desmume/src/cocoa/cocoa_input.h
    trunk/desmume/src/cocoa/cocoa_input.mm
    trunk/desmume/src/cocoa/cocoa_mic.mm
    trunk/desmume/src/cocoa/translations/English.lproj/DisplayWindow.xib
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
    trunk/desmume/src/cocoa/userinterface/DisplayWindowController.h
    trunk/desmume/src/cocoa/userinterface/DisplayWindowController.mm
    trunk/desmume/src/cocoa/userinterface/EmuControllerDelegate.h
    trunk/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm
    trunk/desmume/src/cocoa/userinterface/appDelegate.h
    trunk/desmume/src/cocoa/userinterface/appDelegate.mm
    trunk/desmume/src/cocoa/userinterface/inputPrefsView.h
    trunk/desmume/src/cocoa/userinterface/inputPrefsView.mm
    trunk/desmume/src/cocoa/userinterface/preferencesWindowDelegate.h
    trunk/desmume/src/cocoa/userinterface/preferencesWindowDelegate.mm

Added Paths:
-----------
    trunk/desmume/src/cocoa/userinterface/InputManager.h
    trunk/desmume/src/cocoa/userinterface/InputManager.mm

Removed Paths:
-------------
    trunk/desmume/src/cocoa/cocoa_hid.h
    trunk/desmume/src/cocoa/cocoa_hid.mm

Modified: trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj
===================================================================
--- trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj	2013-02-27 08:44:52 UTC (rev 4547)
+++ trunk/desmume/src/cocoa/DeSmuME (XCode 3).xcodeproj/project.pbxproj	2013-03-01 23:41:03 UTC (rev 4548)
@@ -251,7 +251,6 @@
 		AB2F3C2015CF9C6000858373 /* cocoa_core.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD104121346652500AF11D1 /* cocoa_core.mm */; };
 		AB2F3C2115CF9C6000858373 /* cocoa_file.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB58F32C1364F44B0074C376 /* cocoa_file.mm */; };
 		AB2F3C2215CF9C6000858373 /* cocoa_firmware.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE7F53D13EE1C7900FD3A71 /* cocoa_firmware.mm */; };
-		AB2F3C2315CF9C6000858373 /* cocoa_hid.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB350B691478A5B3007165AC /* cocoa_hid.mm */; };
 		AB2F3C2415CF9C6000858373 /* cocoa_input.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD104111346652500AF11D1 /* cocoa_input.mm */; };
 		AB2F3C2515CF9C6000858373 /* cocoa_mic.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD9A46413DB99B300777194 /* cocoa_mic.mm */; };
 		AB2F3C2615CF9C6000858373 /* cocoa_output.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3E34C8134AF4500056477A /* cocoa_output.mm */; };
@@ -288,6 +287,10 @@
 		AB3ACC4614C24D5400D7D192 /* COPYING in Resources */ = {isa = PBXBuildFile; fileRef = AB3ACC3A14C24D5400D7D192 /* COPYING */; };
 		AB3ACC4714C24D5400D7D192 /* README in Resources */ = {isa = PBXBuildFile; fileRef = AB3ACC3B14C24D5400D7D192 /* README */; };
 		AB3ACC4914C24D5400D7D192 /* README.MAC in Resources */ = {isa = PBXBuildFile; fileRef = AB3ACC3D14C24D5400D7D192 /* README.MAC */; };
+		AB5A795816D5A56000ED84B7 /* InputManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB5A795716D5A56000ED84B7 /* InputManager.mm */; };
+		AB5A795916D5A56000ED84B7 /* InputManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB5A795716D5A56000ED84B7 /* InputManager.mm */; };
+		AB5A795A16D5A56000ED84B7 /* InputManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB5A795716D5A56000ED84B7 /* InputManager.mm */; };
+		AB5A795B16D5A56000ED84B7 /* InputManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB5A795716D5A56000ED84B7 /* InputManager.mm */; };
 		AB6A187C16C9951C00384EED /* EmuControllerDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB6A187B16C9951C00384EED /* EmuControllerDelegate.mm */; };
 		AB6A187D16C9951C00384EED /* EmuControllerDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB6A187B16C9951C00384EED /* EmuControllerDelegate.mm */; };
 		AB6A187E16C9951C00384EED /* EmuControllerDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB6A187B16C9951C00384EED /* EmuControllerDelegate.mm */; };
@@ -410,7 +413,6 @@
 		AB711F6D1481C35F009011C8 /* videofilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB817A35143EE2DB00A7DFE9 /* videofilter.cpp */; };
 		AB711F6E1481C35F009011C8 /* cocoa_videofilter.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE5DFE4143FB1DA00835AD8 /* cocoa_videofilter.mm */; };
 		AB711F701481C35F009011C8 /* cocoa_cheat.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABA6574A14511EC90077E5E9 /* cocoa_cheat.mm */; };
-		AB711F721481C35F009011C8 /* cocoa_hid.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB350B691478A5B3007165AC /* cocoa_hid.mm */; };
 		AB711F741481C35F009011C8 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
 		AB711F751481C35F009011C8 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABC570D0134431CE00E7B0B1 /* AudioUnit.framework */; };
 		AB711F761481C35F009011C8 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ABC570D4134431DA00E7B0B1 /* OpenGL.framework */; };
@@ -572,7 +574,6 @@
 		AB73AA0E1507C9F500A310C8 /* cocoa_core.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD104121346652500AF11D1 /* cocoa_core.mm */; };
 		AB73AA0F1507C9F500A310C8 /* cocoa_file.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB58F32C1364F44B0074C376 /* cocoa_file.mm */; };
 		AB73AA101507C9F500A310C8 /* cocoa_firmware.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE7F53D13EE1C7900FD3A71 /* cocoa_firmware.mm */; };
-		AB73AA111507C9F500A310C8 /* cocoa_hid.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB350B691478A5B3007165AC /* cocoa_hid.mm */; };
 		AB73AA121507C9F500A310C8 /* cocoa_input.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD104111346652500AF11D1 /* cocoa_input.mm */; };
 		AB73AA131507C9F500A310C8 /* cocoa_mic.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD9A46413DB99B300777194 /* cocoa_mic.mm */; };
 		AB73AA141507C9F500A310C8 /* cocoa_output.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3E34C8134AF4500056477A /* cocoa_output.mm */; };
@@ -764,7 +765,6 @@
 		ABAD101615ACE7A00000EC47 /* cocoa_core.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD104121346652500AF11D1 /* cocoa_core.mm */; };
 		ABAD101715ACE7A00000EC47 /* cocoa_file.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB58F32C1364F44B0074C376 /* cocoa_file.mm */; };
 		ABAD101815ACE7A00000EC47 /* cocoa_firmware.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE7F53D13EE1C7900FD3A71 /* cocoa_firmware.mm */; };
-		ABAD101915ACE7A00000EC47 /* cocoa_hid.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB350B691478A5B3007165AC /* cocoa_hid.mm */; };
 		ABAD101A15ACE7A00000EC47 /* cocoa_input.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD104111346652500AF11D1 /* cocoa_input.mm */; };
 		ABAD101B15ACE7A00000EC47 /* cocoa_mic.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD9A46413DB99B300777194 /* cocoa_mic.mm */; };
 		ABAD101C15ACE7A00000EC47 /* cocoa_output.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3E34C8134AF4500056477A /* cocoa_output.mm */; };
@@ -949,8 +949,6 @@
 		AB279D5716A4E6DE00ECC692 /* sse_optimized.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sse_optimized.cpp; sourceTree = "<group>"; };
 		AB279D5816A4E6DE00ECC692 /* TDStretch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TDStretch.cpp; sourceTree = "<group>"; };
 		AB2F3C4515CF9C6000858373 /* DeSmuME (PPC).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DeSmuME (PPC).app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		AB350B681478A5B3007165AC /* cocoa_hid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_hid.h; sourceTree = "<group>"; };
-		AB350B691478A5B3007165AC /* cocoa_hid.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_hid.mm; sourceTree = "<group>"; };
 		AB350BA41478AC96007165AC /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		AB350D38147A1D8D007165AC /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = English; path = translations/English.lproj/HID_usage_strings.plist; sourceTree = "<group>"; };
 		AB3ACB6614C2361100D7D192 /* appDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = appDelegate.h; sourceTree = "<group>"; };
@@ -970,6 +968,8 @@
 		AB3E34C8134AF4500056477A /* cocoa_output.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_output.mm; sourceTree = "<group>"; };
 		AB58F32B1364F44B0074C376 /* cocoa_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_file.h; sourceTree = "<group>"; };
 		AB58F32C1364F44B0074C376 /* cocoa_file.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_file.mm; sourceTree = "<group>"; };
+		AB5A795616D5A56000ED84B7 /* InputManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputManager.h; sourceTree = "<group>"; };
+		AB5A795716D5A56000ED84B7 /* InputManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = InputManager.mm; sourceTree = "<group>"; };
 		AB64987B13ECC73800EE7DD2 /* FileTypeInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = FileTypeInfo.plist; sourceTree = "<group>"; };
 		AB6A187A16C9951C00384EED /* EmuControllerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmuControllerDelegate.h; sourceTree = "<group>"; };
 		AB6A187B16C9951C00384EED /* EmuControllerDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EmuControllerDelegate.mm; sourceTree = "<group>"; };
@@ -1371,7 +1371,6 @@
 				ABE7F53C13EE1C7900FD3A71 /* cocoa_firmware.h */,
 				AB9971CE134EDA0800531BA7 /* cocoa_globals.h */,
 				AB6A198116CAD66900384EED /* cocoa_GPU.h */,
-				AB350B681478A5B3007165AC /* cocoa_hid.h */,
 				ABD103FF1346652500AF11D1 /* cocoa_input.h */,
 				ABD9A46313DB99B300777194 /* cocoa_mic.h */,
 				AB3E34C7134AF4500056477A /* cocoa_output.h */,
@@ -1386,7 +1385,6 @@
 				AB58F32C1364F44B0074C376 /* cocoa_file.mm */,
 				ABE7F53D13EE1C7900FD3A71 /* cocoa_firmware.mm */,
 				AB6A198216CAD66900384EED /* cocoa_GPU.mm */,
-				AB350B691478A5B3007165AC /* cocoa_hid.mm */,
 				ABD104111346652500AF11D1 /* cocoa_input.mm */,
 				ABD9A46413DB99B300777194 /* cocoa_mic.mm */,
 				AB3E34C8134AF4500056477A /* cocoa_output.mm */,
@@ -1492,6 +1490,7 @@
 				AB3ACB6814C2361100D7D192 /* cheatWindowDelegate.h */,
 				AB700DDC16CDE4C300FBD336 /* DisplayWindowController.h */,
 				AB6A187A16C9951C00384EED /* EmuControllerDelegate.h */,
+				AB5A795616D5A56000ED84B7 /* InputManager.h */,
 				AB3ACB6E14C2361100D7D192 /* inputPrefsView.h */,
 				AB3ACB7014C2361100D7D192 /* preferencesWindowDelegate.h */,
 				ABA0356E169127BB00817C69 /* troubleshootingWindowDelegate.h */,
@@ -1499,6 +1498,7 @@
 				AB3ACB6914C2361100D7D192 /* cheatWindowDelegate.mm */,
 				AB700DDD16CDE4C300FBD336 /* DisplayWindowController.mm */,
 				AB6A187B16C9951C00384EED /* EmuControllerDelegate.mm */,
+				AB5A795716D5A56000ED84B7 /* InputManager.mm */,
 				AB3ACB6F14C2361100D7D192 /* inputPrefsView.mm */,
 				AB3ACB7114C2361100D7D192 /* preferencesWindowDelegate.mm */,
 				ABA0356F169127C000817C69 /* troubleshootingWindowDelegate.mm */,
@@ -2614,7 +2614,6 @@
 				AB2F3C2015CF9C6000858373 /* cocoa_core.mm in Sources */,
 				AB2F3C2115CF9C6000858373 /* cocoa_file.mm in Sources */,
 				AB2F3C2215CF9C6000858373 /* cocoa_firmware.mm in Sources */,
-				AB2F3C2315CF9C6000858373 /* cocoa_hid.mm in Sources */,
 				AB2F3C2415CF9C6000858373 /* cocoa_input.mm in Sources */,
 				AB2F3C2515CF9C6000858373 /* cocoa_mic.mm in Sources */,
 				AB2F3C2615CF9C6000858373 /* cocoa_output.mm in Sources */,
@@ -2650,6 +2649,7 @@
 				AB6A187C16C9951C00384EED /* EmuControllerDelegate.mm in Sources */,
 				AB6A198316CAD66900384EED /* cocoa_GPU.mm in Sources */,
 				AB700DDF16CDE4C300FBD336 /* DisplayWindowController.mm in Sources */,
+				AB5A795B16D5A56000ED84B7 /* InputManager.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2742,7 +2742,6 @@
 				AB711F471481C35F009011C8 /* cocoa_core.mm in Sources */,
 				AB711F4E1481C35F009011C8 /* cocoa_file.mm in Sources */,
 				AB711F601481C35F009011C8 /* cocoa_firmware.mm in Sources */,
-				AB711F721481C35F009011C8 /* cocoa_hid.mm in Sources */,
 				AB711F461481C35F009011C8 /* cocoa_input.mm in Sources */,
 				AB711F5E1481C35F009011C8 /* cocoa_mic.mm in Sources */,
 				AB711F4C1481C35F009011C8 /* cocoa_output.mm in Sources */,
@@ -2807,6 +2806,7 @@
 				AB6A187E16C9951C00384EED /* EmuControllerDelegate.mm in Sources */,
 				AB6A198516CAD66900384EED /* cocoa_GPU.mm in Sources */,
 				AB700DE116CDE4C300FBD336 /* DisplayWindowController.mm in Sources */,
+				AB5A795916D5A56000ED84B7 /* InputManager.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2898,7 +2898,6 @@
 				AB73AA0E1507C9F500A310C8 /* cocoa_core.mm in Sources */,
 				AB73AA0F1507C9F500A310C8 /* cocoa_file.mm in Sources */,
 				AB73AA101507C9F500A310C8 /* cocoa_firmware.mm in Sources */,
-				AB73AA111507C9F500A310C8 /* cocoa_hid.mm in Sources */,
 				AB73AA121507C9F500A310C8 /* cocoa_input.mm in Sources */,
 				AB73AA131507C9F500A310C8 /* cocoa_mic.mm in Sources */,
 				AB73AA141507C9F500A310C8 /* cocoa_output.mm in Sources */,
@@ -2964,6 +2963,7 @@
 				AB6A187F16C9951C00384EED /* EmuControllerDelegate.mm in Sources */,
 				AB6A198616CAD66900384EED /* cocoa_GPU.mm in Sources */,
 				AB700DDE16CDE4C300FBD336 /* DisplayWindowController.mm in Sources */,
+				AB5A795A16D5A56000ED84B7 /* InputManager.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3055,7 +3055,6 @@
 				ABAD101615ACE7A00000EC47 /* cocoa_core.mm in Sources */,
 				ABAD101715ACE7A00000EC47 /* cocoa_file.mm in Sources */,
 				ABAD101815ACE7A00000EC47 /* cocoa_firmware.mm in Sources */,
-				ABAD101915ACE7A00000EC47 /* cocoa_hid.mm in Sources */,
 				ABAD101A15ACE7A00000EC47 /* cocoa_input.mm in Sources */,
 				ABAD101B15ACE7A00000EC47 /* cocoa_mic.mm in Sources */,
 				ABAD101C15ACE7A00000EC47 /* cocoa_output.mm in Sources */,
@@ -3091,6 +3090,7 @@
 				AB6A187D16C9951C00384EED /* EmuControllerDelegate.mm in Sources */,
 				AB6A198416CAD66900384EED /* cocoa_GPU.mm in Sources */,
 				AB700DE016CDE4C300FBD336 /* DisplayWindowController.mm in Sources */,
+				AB5A795816D5A56000ED84B7 /* InputManager.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Modified: trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj
===================================================================
--- trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj	2013-02-27 08:44:52 UTC (rev 4547)
+++ trunk/desmume/src/cocoa/DeSmuME (XCode 4).xcodeproj/project.pbxproj	2013-03-01 23:41:03 UTC (rev 4548)
@@ -67,7 +67,8 @@
 		AB23567416C2F6F400DA782E /* macosx_10_5_compat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB23567216C2F6F400DA782E /* macosx_10_5_compat.cpp */; };
 		AB23567516C2FAD800DA782E /* OGLRender_3_2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB68A0DA16B139BC00DE0546 /* OGLRender_3_2.cpp */; };
 		AB26D87C16B5253D00A2305C /* OGLRender_3_2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB68A0DA16B139BC00DE0546 /* OGLRender_3_2.cpp */; };
-		AB350B6A1478A5B3007165AC /* cocoa_hid.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB350B691478A5B3007165AC /* cocoa_hid.mm */; };
+		AB29B33116D4BEBF000EF671 /* InputManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB29B33016D4BEBF000EF671 /* InputManager.mm */; };
+		AB29B33216D4BEBF000EF671 /* InputManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB29B33016D4BEBF000EF671 /* InputManager.mm */; };
 		AB350BA51478AC96007165AC /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB350BA41478AC96007165AC /* IOKit.framework */; };
 		AB350D3B147A1D93007165AC /* HID_usage_strings.plist in Resources */ = {isa = PBXBuildFile; fileRef = AB350D3A147A1D93007165AC /* HID_usage_strings.plist */; };
 		AB3A655E16CC5421001F5D4A /* EmuControllerDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3A655D16CC5421001F5D4A /* EmuControllerDelegate.mm */; };
@@ -349,7 +350,6 @@
 		AB796D4B15CDCBA200C59155 /* cocoa_core.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD104121346652500AF11D1 /* cocoa_core.mm */; };
 		AB796D4C15CDCBA200C59155 /* cocoa_file.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB58F32C1364F44B0074C376 /* cocoa_file.mm */; };
 		AB796D4D15CDCBA200C59155 /* cocoa_firmware.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABE7F53D13EE1C7900FD3A71 /* cocoa_firmware.mm */; };
-		AB796D4E15CDCBA200C59155 /* cocoa_hid.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB350B691478A5B3007165AC /* cocoa_hid.mm */; };
 		AB796D4F15CDCBA200C59155 /* cocoa_input.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD104111346652500AF11D1 /* cocoa_input.mm */; };
 		AB796D5015CDCBA200C59155 /* cocoa_mic.mm in Sources */ = {isa = PBXBuildFile; fileRef = ABD9A46413DB99B300777194 /* cocoa_mic.mm */; };
 		AB796D5115CDCBA200C59155 /* cocoa_output.mm in Sources */ = {isa = PBXBuildFile; fileRef = AB3E34C8134AF4500056477A /* cocoa_output.mm */; };
@@ -680,8 +680,8 @@
 		AB1B9E611501A78000464647 /* coreaudiosound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coreaudiosound.h; sourceTree = SOURCE_ROOT; };
 		AB1B9E621501A78000464647 /* ringbuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ringbuffer.h; sourceTree = SOURCE_ROOT; };
 		AB23567216C2F6F400DA782E /* macosx_10_5_compat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = macosx_10_5_compat.cpp; sourceTree = "<group>"; };
-		AB350B681478A5B3007165AC /* cocoa_hid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_hid.h; sourceTree = "<group>"; };
-		AB350B691478A5B3007165AC /* cocoa_hid.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoa_hid.mm; sourceTree = "<group>"; };
+		AB29B32F16D4BEBF000EF671 /* InputManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputManager.h; sourceTree = "<group>"; };
+		AB29B33016D4BEBF000EF671 /* InputManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = InputManager.mm; sourceTree = "<group>"; };
 		AB350BA41478AC96007165AC /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		AB350D38147A1D8D007165AC /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = English; path = translations/English.lproj/HID_usage_strings.plist; sourceTree = "<group>"; };
 		AB3A655C16CC5416001F5D4A /* EmuControllerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmuControllerDelegate.h; sourceTree = "<group>"; };
@@ -1115,7 +1115,6 @@
 				ABE7F53C13EE1C7900FD3A71 /* cocoa_firmware.h */,
 				AB9971CE134EDA0800531BA7 /* cocoa_globals.h */,
 				AB3A656416CC5442001F5D4A /* cocoa_GPU.h */,
-				AB350B681478A5B3007165AC /* cocoa_hid.h */,
 				ABD103FF1346652500AF11D1 /* cocoa_input.h */,
 				ABD9A46313DB99B300777194 /* cocoa_mic.h */,
 				AB3E34C7134AF4500056477A /* cocoa_output.h */,
@@ -1130,7 +1129,6 @@
 				AB58F32C1364F44B0074C376 /* cocoa_file.mm */,
 				ABE7F53D13EE1C7900FD3A71 /* cocoa_firmware.mm */,
 				AB3A656016CC5438001F5D4A /* cocoa_GPU.mm */,
-				AB350B691478A5B3007165AC /* cocoa_hid.mm */,
 				ABD104111346652500AF11D1 /* cocoa_input.mm */,
 				ABD9A46413DB99B300777194 /* cocoa_mic.mm */,
 				AB3E34C8134AF4500056477A /* cocoa_output.mm */,
@@ -1236,6 +1234,7 @@
 				AB3ACB6814C2361100D7D192 /* cheatWindowDelegate.h */,
 				AB8967D716D2ED0700F826F1 /* DisplayWindowController.h */,
 				AB3A655C16CC5416001F5D4A /* EmuControllerDelegate.h */,
+				AB29B32F16D4BEBF000EF671 /* InputManager.h */,
 				AB3ACB6E14C2361100D7D192 /* inputPrefsView.h */,
 				AB3ACB7014C2361100D7D192 /* preferencesWindowDelegate.h */,
 				ABF2B9F81690412A000FF7C0 /* troubleshootingWindowDelegate.h */,
@@ -1243,6 +1242,7 @@
 				AB3ACB6914C2361100D7D192 /* cheatWindowDelegate.mm */,
 				AB8967D816D2ED0700F826F1 /* DisplayWindowController.mm */,
 				AB3A655D16CC5421001F5D4A /* EmuControllerDelegate.mm */,
+				AB29B33016D4BEBF000EF671 /* InputManager.mm */,
 				AB3ACB6F14C2361100D7D192 /* inputPrefsView.mm */,
 				AB3ACB7114C2361100D7D192 /* preferencesWindowDelegate.mm */,
 				ABF2B9FA16904133000FF7C0 /* troubleshootingWindowDelegate.mm */,
@@ -2182,7 +2182,6 @@
 				ABD1041D1346652500AF11D1 /* cocoa_core.mm in Sources */,
 				AB58F32D1364F44B0074C376 /* cocoa_file.mm in Sources */,
 				ABE7F53E13EE1C7900FD3A71 /* cocoa_firmware.mm in Sources */,
-				AB350B6A1478A5B3007165AC /* cocoa_hid.mm in Sources */,
 				ABD1041C1346652500AF11D1 /* cocoa_input.mm in Sources */,
 				ABD9A46513DB99B300777194 /* cocoa_mic.mm in Sources */,
 				AB3E34C9134AF4500056477A /* cocoa_output.mm in Sources */,
@@ -2239,6 +2238,7 @@
 				AB3A655F16CC5421001F5D4A /* EmuControllerDelegate.mm in Sources */,
 				AB3A656216CC5438001F5D4A /* cocoa_GPU.mm in Sources */,
 				AB8967DA16D2ED0700F826F1 /* DisplayWindowController.mm in Sources */,
+				AB29B33216D4BEBF000EF671 /* InputManager.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2341,7 +2341,6 @@
 				AB796D4B15CDCBA200C59155 /* cocoa_core.mm in Sources */,
 				AB796D4C15CDCBA200C59155 /* cocoa_file.mm in Sources */,
 				AB796D4D15CDCBA200C59155 /* cocoa_firmware.mm in Sources */,
-				AB796D4E15CDCBA200C59155 /* cocoa_hid.mm in Sources */,
 				AB796D4F15CDCBA200C59155 /* cocoa_input.mm in Sources */,
 				AB796D5015CDCBA200C59155 /* cocoa_mic.mm in Sources */,
 				AB796D5115CDCBA200C59155 /* cocoa_output.mm in Sources */,
@@ -2396,6 +2395,7 @@
 				AB3A655E16CC5421001F5D4A /* EmuControllerDelegate.mm in Sources */,
 				AB3A656116CC5438001F5D4A /* cocoa_GPU.mm in Sources */,
 				AB8967D916D2ED0700F826F1 /* DisplayWindowController.mm in Sources */,
+				AB29B33116D4BEBF000EF671 /* InputManager.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Modified: trunk/desmume/src/cocoa/DefaultKeyMappings.plist
===================================================================
--- trunk/desmume/src/cocoa/DefaultKeyMappings.plist	2013-02-27 08:44:52 UTC (rev 4547)
+++ trunk/desmume/src/cocoa/DefaultKeyMappings.plist	2013-03-01 23:41:03 UTC (rev 4548)
@@ -229,10 +229,6 @@
 			<string>-</string>
 			<key>floatValue</key>
 			<string>0.5</string>
-			<key>selector</key>
-			<string>toggleHoldSpeedHalf:</string>
-			<key>paramType</key>
-			<string>floatValue</string>
 		</dict>
 	</array>
 	<key>Speed Double</key>
@@ -248,10 +244,6 @@
 			<string>=</string>
 			<key>floatValue</key>
 			<integer>2</integer>
-			<key>selector</key>
-			<string>toggleHoldSpeedDouble:</string>
-			<key>paramType</key>
-			<string>floatValue</string>
 		</dict>
 	</array>
 	<key>HUD</key>
@@ -265,8 +257,6 @@
 			<string>4</string>
 			<key>elementName</key>
 			<string>H</string>
-			<key>selector</key>
-			<string>toggleHoldHUD</string>
 		</dict>
 	</array>
 	<key>Execute</key>
@@ -280,8 +270,6 @@
 			<string>117</string>
 			<key>elementName</key>
 			<string>Forward Delete</string>
-			<key>selector</key>
-			<string>execute</string>
 		</dict>
 	</array>
 	<key>Pause</key>
@@ -295,8 +283,6 @@
 			<string>119</string>
 			<key>elementName</key>
 			<string>End</string>
-			<key>selector</key>
-			<string>pause</string>
 		</dict>
 	</array>
 	<key>Reset</key>
@@ -310,8 +296,6 @@
 			<string>121</string>
 			<key>elementName</key>
 			<string>Page Down</string>
-			<key>selector</key>
-			<string>reset</string>
 		</dict>
 	</array>
 	<key>Mute</key>
@@ -325,8 +309,6 @@
 			<string>71</string>
 			<key>elementName</key>
 			<string>Numpad Clear</string>
-			<key>selector</key>
-			<string>mute</string>
 		</dict>
 	</array>
 </dict>

Modified: trunk/desmume/src/cocoa/cocoa_core.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_core.mm	2013-02-27 08:44:52 UTC (rev 4547)
+++ trunk/desmume/src/cocoa/cocoa_core.mm	2013-03-01 23:41:03 UTC (rev 4548)
@@ -710,7 +710,7 @@
 		
 		// Get the user's input, execute a single emulation frame, and generate
 		// the frame output.
-		[(CocoaDSController *)param->cdsController update];
+		[(CocoaDSController *)param->cdsController flush];
 		
 		NDS_beginProcessingInput();
 		// Shouldn't need to do any special processing steps in between.

Deleted: trunk/desmume/src/cocoa/cocoa_hid.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_hid.h	2013-02-27 08:44:52 UTC (rev 4547)
+++ trunk/desmume/src/cocoa/cocoa_hid.h	2013-03-01 23:41:03 UTC (rev 4548)
@@ -1,72 +0,0 @@
-/*
-	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2012 DeSmuME team
-
-	This file is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 2 of the License, or
-	(at your option) any later version.
-
-	This file is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#import <Cocoa/Cocoa.h>
-#include <libkern/OSAtomic.h>
-#include <IOKit/hid/IOHIDManager.h>
-
-
-@... CocoaHIDDevice : NSObject
-{
-	IOHIDDeviceRef hidDeviceRef;
-	IOHIDQueueRef hidQueueRef;
-	NSRunLoop *runLoop;
-	OSSpinLock spinlockRunLoop;
-}
-
-@... (readonly) IOHIDDeviceRef hidDeviceRef;
-@... (retain) NSRunLoop *runLoop;
-
-- (id) initWithDevice:(IOHIDDeviceRef)theDevice;
-
-- (void) start;
-- (void) stop;
-
-- (NSString *) manufacturerName;
-- (NSString *) productName;
-- (NSString *) serialNumber;
-
-+ (NSString *) manufacturerNameFromHIDDevice:(CocoaHIDDevice *)hidDevice;
-+ (NSString *) productNameFromHIDDevice:(CocoaHIDDevice *)hidDevice;
-+ (NSString *) serialNumberFromHIDDevice:(CocoaHIDDevice *)hidDevice;
-
-+ (NSMutableArray *) inputArrayFromHIDValue:(IOHIDValueRef)hidValueRef;
-+ (NSDictionary *) inputAttributesOfHIDValue:(IOHIDValueRef)hidValueRef altElementCode:(NSString *)altElementCode altElementName:(NSString *)altElementName inputState:(NSNumber *)altOnState;
-+ (NSMutableArray *) inputArrayFromHatSwitchValue:(IOHIDValueRef)hidValueRef useEightDirection:(BOOL)useEightDirection;
-+ (BOOL) onStateFromHIDValue:(IOHIDValueRef)hidValueRef;
-
-@...
-
-
-@... CocoaHIDManager : NSObject
-{
-	IOHIDManagerRef hidManagerRef;
-	NSRunLoop *runLoop;
-	NSMutableSet *deviceList;
-	OSSpinLock spinlockRunLoop;
-}
-
-@... (readonly) IOHIDManagerRef hidManagerRef;
-@... (readonly) NSMutableSet *deviceList;
-@... (retain) NSRunLoop *runLoop;
-
-@...
-
-void HandleDeviceMatchingCallback(void *inContext, IOReturn inResult, void *inSender, IOHIDDeviceRef inIOHIDDeviceRef);
-void HandleDeviceRemovalCallback(void *inContext, IOReturn inResult, void *inSender, IOHIDDeviceRef inIOHIDDeviceRef);
-void HandleQueueValueAvailableCallback(void *inContext, IOReturn inResult, void *inSender);

Deleted: trunk/desmume/src/cocoa/cocoa_hid.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_hid.mm	2013-02-27 08:44:52 UTC (rev 4547)
+++ trunk/desmume/src/cocoa/cocoa_hid.mm	2013-03-01 23:41:03 UTC (rev 4548)
@@ -1,888 +0,0 @@
-/*
-	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2012 DeSmuME team
-
-	This file is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 2 of the License, or
-	(at your option) any later version.
-
-	This file is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#import "cocoa_hid.h"
-#import "cocoa_util.h"
-
-/*
- Get the symbols for UpdateSystemActivity().
- 
- For some reason, in Mac OS v10.5 and earlier, UpdateSystemActivity() is not
- defined for 64-bit, even though it does work on 64-bit systems. So we're going
- to copy the symbols from OSServices/Power.h so that we can use them. This
- solution is better than making an absolute path to the Power.h file, since
- we can't assume that the header file will always be in the same location.
- 
- Note that this isn't a problem on 32-bit, or if the target SDK is Mac OS v10.6
- or later.
- */
-
-#if !__LP64__ || MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
-
-#include <CoreServices/CoreServices.h>
-
-#else
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-	
-	extern OSErr UpdateSystemActivity(UInt8 activity);
-	
-	enum
-	{
-		OverallAct		= 0,
-		UsrActivity		= 1,
-		NetActivity		= 2,
-		HDActivity		= 3,
-		IdleActivity	= 4
-	};
-	
-#ifdef __cplusplus
-}
-#endif
-	
-#endif // !__LP64__ || MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
-
-@... CocoaHIDDevice
-
-@... hidDeviceRef;
-@... runLoop;
-
-static NSDictionary *hidUsageTable = nil;
-
-- (id)init
-{
-	return [self initWithDevice:nil];
-}
-
-- (id) initWithDevice:(IOHIDDeviceRef)theDevice
-{
-	self = [super init];
-	if(self == nil)
-	{
-		return self;
-	}
-	
-	if (hidUsageTable == nil)
-	{
-		hidUsageTable = [[NSDictionary alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"HID_usage_strings" ofType:@"plist"]];
-	}
-	
-	hidDeviceRef = theDevice;
-	
-	hidQueueRef = IOHIDQueueCreate(kCFAllocatorDefault, hidDeviceRef, 10, kIOHIDOptionsTypeNone);
-	if (hidQueueRef == NULL)
-	{
-		[self release];
-		return nil;
-	}
-	
-	CFArrayRef elementArray = IOHIDDeviceCopyMatchingElements(hidDeviceRef, NULL, kIOHIDOptionsTypeNone);
-	NSEnumerator *enumerator = [(NSArray *)elementArray objectEnumerator];
-	IOHIDElementRef hidElement = NULL;
-	
-	while ((hidElement = (IOHIDElementRef)[enumerator nextObject]))
-	{
-		IOHIDQueueAddElement(hidQueueRef, hidElement);
-	}
-	
-    CFRelease(elementArray);
-	
-	spinlockRunLoop = OS_SPINLOCK_INIT;
-	[self setRunLoop:[NSRunLoop currentRunLoop]];
-	
-	return self;
-}
-
-- (void)dealloc
-{
-	[self stop];
-	
-	self.runLoop = nil;
-	
-	if (hidQueueRef != NULL)
-	{
-		CFRelease(hidQueueRef);
-		hidQueueRef = NULL;
-	}
-	
-	[super dealloc];
-}
-
-- (void) setRunLoop:(NSRunLoop *)theRunLoop
-{
-	OSSpinLockLock(&spinlockRunLoop);
-	
-	if (theRunLoop == runLoop)
-	{
-		OSSpinLockUnlock(&spinlockRunLoop);
-		return;
-	}
-	
-	if (theRunLoop == nil)
-	{
-		IOHIDQueueRegisterValueAvailableCallback(hidQueueRef, NULL, NULL);
-		IOHIDQueueUnscheduleFromRunLoop(hidQueueRef, [runLoop getCFRunLoop], kCFRunLoopDefaultMode);
-	}
-	else
-	{
-		[theRunLoop retain];
-		IOHIDQueueScheduleWithRunLoop(hidQueueRef, [theRunLoop getCFRunLoop], kCFRunLoopDefaultMode);
-		IOHIDQueueRegisterValueAvailableCallback(hidQueueRef, HandleQueueValueAvailableCallback, self);
-	}
-	
-	[runLoop release];
-	runLoop = theRunLoop;
-	
-	OSSpinLockUnlock(&spinlockRunLoop);
-}
-
-- (NSRunLoop *) runLoop
-{
-	OSSpinLockLock(&spinlockRunLoop);
-	NSRunLoop *theRunLoop = runLoop;
-	OSSpinLockUnlock(&spinlockRunLoop);
-	
-	return theRunLoop;
-}
-
-- (void) start
-{
-	IOHIDQueueStart(hidQueueRef);
-}
-
-- (void) stop
-{
-	IOHIDQueueStop(hidQueueRef);
-}
-
-- (NSString *) manufacturerName
-{
-	return [CocoaHIDDevice manufacturerNameFromHIDDevice:self];
-}
-
-- (NSString *) productName
-{
-	return [CocoaHIDDevice productNameFromHIDDevice:self];
-}
-
-- (NSString *) serialNumber
-{
-	return [CocoaHIDDevice serialNumberFromHIDDevice:self];
-}
-
-/********************************************************************************************
-	inputAttributesOfHIDValue:altElementCode:altElementName:inputState:
-
-	Parses an IOHIDValueRef to return an input attributes NSDictionary.
-
-	Takes:
-		hidValueRef - The IOHIDValueRef to parse.
-		altElementCode - An NSString that overrides the default element code.
-		altElementName - An NSString that overrides the default element name.
-		altOnState - An NSNumber that overrides the default on state.
-
-	Returns:
-		An input attributes NSDictionary.
-
-	Details:
-		None.
- ********************************************************************************************/
-+ (NSDictionary *) inputAttributesOfHIDValue:(IOHIDValueRef)hidValueRef altElementCode:(NSString *)altElementCode altElementName:(NSString *)altElementName inputState:(NSNumber *)altOnState
-{
-	if (hidValueRef == NULL)
-	{
-		return nil;
-	}
-	
-	IOHIDElementRef hidElementRef = IOHIDValueGetElement(hidValueRef);
-	NSInteger elementUsagePage = IOHIDElementGetUsagePage(hidElementRef);
-	NSInteger elementUsage = IOHIDElementGetUsage(hidElementRef);
-	
-	NSString *elementCode = nil;
-	if (altElementCode == nil)
-	{
-		elementCode = [NSString stringWithFormat:@"0x%04lX/0x%04lX", (long)elementUsagePage, (long)elementUsage];
-	}
-	else
-	{
-		elementCode = altElementCode;
-	}
-	
-	NSString *elementName = nil;
-	if (altElementName == nil)
-	{
-		
-		CFStringRef cfElementName = IOHIDElementGetName(hidElementRef);
-		if (cfElementName == nil)
-		{
-			if (elementUsagePage == kHIDPage_Button)
-			{
-				elementName = [NSString stringWithFormat:@"Button %li", (long)elementUsage];
-			}
-			else if (elementUsagePage == kHIDPage_VendorDefinedStart)
-			{
-				elementName = [NSString stringWithFormat:@"VendorDefined %li", (long)elementUsage];
-			}
-			else
-			{
-				NSDictionary *elementUsagePageDict = (NSDictionary *)[hidUsageTable valueForKey:[NSString stringWithFormat:@"0x%04lX", (long)elementUsagePage]];
-				elementName = (NSString *)[elementUsagePageDict valueForKey:[NSString stringWithFormat:@"0x%04lX", (long)elementUsage]];
-			}
-		}
-		else
-		{
-			elementName = [NSString stringWithString:(NSString *)cfElementName];
-		}
-	}
-	else
-	{
-		elementName = altElementName;
-	}
-	
-	IOHIDDeviceRef hidDeviceRef = IOHIDElementGetDevice(hidElementRef);
-	
-	CFNumberRef cfVendorIDNumber = (CFNumberRef)IOHIDDeviceGetProperty(hidDeviceRef, CFSTR(kIOHIDVendorIDKey));
-	CFNumberRef cfProductIDNumber = (CFNumberRef)IOHIDDeviceGetProperty(hidDeviceRef, CFSTR(kIOHIDProductIDKey));
-	UInt32 vendorID = [(NSNumber *)cfVendorIDNumber integerValue];
-	UInt32 productID = [(NSNumber *)cfProductIDNumber integerValue];
-	
-	NSString *deviceCode = [NSString stringWithFormat:@"%d/%d/", vendorID, productID];
-	CFStringRef cfDeviceCode = (CFStringRef)IOHIDDeviceGetProperty(hidDeviceRef, CFSTR(kIOHIDSerialNumberKey));
-	if (cfDeviceCode == nil)
-	{
-		CFNumberRef cfLocationIDNumber = (CFNumberRef)IOHIDDeviceGetProperty(hidDeviceRef, CFSTR(kIOHIDLocationIDKey));
-		UInt32 locationID = [(NSNumber *)cfLocationIDNumber integerValue];
-		deviceCode = [deviceCode stringByAppendingFormat:@"0x%08X", locationID];
-	}
-	else
-	{
-		deviceCode = [deviceCode stringByAppendingString:(NSString *)cfDeviceCode];
-	}
-	
-	NSString *deviceName = nil;
-	CFStringRef cfDeviceName = (CFStringRef)IOHIDDeviceGetProperty(hidDeviceRef, CFSTR(kIOHIDProductKey));
-	if (cfDeviceName == nil)
-	{
-		deviceName = deviceCode;
-	}
-	else
-	{
-		deviceName = [NSString stringWithString:(NSString *)cfDeviceName];
-	}
-	
-	NSNumber *onState = nil;
-	if (altOnState == nil)
-	{
-		onState = [NSNumber numberWithBool:[CocoaHIDDevice onStateFromHIDValue:hidValueRef]];
-	}
-	else
-	{
-		onState = altOnState;
-	}
-	
-	NSInteger logicalValue = IOHIDValueGetIntegerValue(hidValueRef);
-	
-	return [NSDictionary dictionaryWithObjectsAndKeys:
-			deviceCode, @"deviceCode",
-			deviceName, @"deviceName",
-			elementCode, @"elementCode",
-			elementName, @"elementName",
-			onState, @"on",
-			[NSNumber numberWithInteger:logicalValue], @"integerValue",
-			[NSNumber numberWithFloat:(float)logicalValue], @"floatValue",
-			nil];
-}
-
-+ (NSString *) manufacturerNameFromHIDDevice:(CocoaHIDDevice *)hidDevice
-{
-	return (NSString *)IOHIDDeviceGetProperty(hidDevice.hidDeviceRef, CFSTR(kIOHIDManufacturerKey));
-}
-
-+ (NSString *) productNameFromHIDDevice:(CocoaHIDDevice *)hidDevice
-{
-	return (NSString *)IOHIDDeviceGetProperty(hidDevice.hidDeviceRef, CFSTR(kIOHIDProductKey));
-}
-
-+ (NSString *) serialNumberFromHIDDevice:(CocoaHIDDevice *)hidDevice
-{
-	return (NSString *)IOHIDDeviceGetProperty(hidDevice.hidDeviceRef, CFSTR(kIOHIDSerialNumberKey));
-}
-
-+ (NSMutableArray *) inputArrayFromHIDValue:(IOHIDValueRef)hidValueRef
-{
-	NSMutableArray *inputAttributesList = nil;
-	
-	if (hidValueRef == NULL)
-	{
-		return inputAttributesList;
-	}
-	
-	IOHIDElementRef hidElementRef = IOHIDValueGetElement(hidValueRef);
-	NSInteger elementUsagePage = IOHIDElementGetUsagePage(hidElementRef);
-	NSInteger elementUsage = IOHIDElementGetUsage(hidElementRef);
-	
-	// IOHIDValueGetIntegerValue() will crash if the value length is too large.
-	// Do a bounds check here to prevent crashing. This workaround makes the PS3
-	// controller usable, since it returns a length of 39 on some elements.
-	if(IOHIDValueGetLength(hidValueRef) > 2)
-	{
-		return inputAttributesList;
-	}
-	
-	NSInteger logicalValue = IOHIDValueGetIntegerValue(hidValueRef);
-	NSInteger logicalMin = IOHIDElementGetLogicalMin(hidElementRef);
-	NSInteger logicalMax = IOHIDElementGetLogicalMax(hidElementRef);
-	
-	inputAttributesList = [NSMutableArray arrayWithCapacity:2];
-	
-	if (logicalMin == 0 && logicalMax == 1)
-	{
-		[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:nil altElementName:nil inputState:nil]];
-	}
-	else
-	{
-		NSInteger lowerThreshold = ((logicalMax - logicalMin) / 3) + logicalMin;
-		NSInteger upperThreshold = (((logicalMax - logicalMin) * 2) / 3) + logicalMin;
-		NSNumber *onState = [NSNumber numberWithBool:YES];
-		NSNumber *offState = [NSNumber numberWithBool:NO];
-		NSString *elementCodeLowerThreshold = [NSString stringWithFormat:@"0x%04lX/0x%04lX/LowerThreshold", (long)elementUsagePage, (long)elementUsage];
-		NSString *elementCodeUpperThreshold = [NSString stringWithFormat:@"0x%04lX/0x%04lX/UpperThreshold", (long)elementUsagePage, (long)elementUsage];
-		
-		if (logicalValue <= lowerThreshold)
-		{
-			[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeLowerThreshold altElementName:nil inputState:onState]];
-			[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeUpperThreshold altElementName:nil inputState:offState]];
-		}
-		else if (logicalValue >= upperThreshold)
-		{
-			[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeLowerThreshold altElementName:nil inputState:offState]];
-			[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeUpperThreshold altElementName:nil inputState:onState]];
-		}
-		else
-		{
-			[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeLowerThreshold altElementName:nil inputState:offState]];
-			[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeUpperThreshold altElementName:nil inputState:offState]];
-		}
-	}
-	
-	return inputAttributesList;
-}
-
-+ (NSMutableArray *) inputArrayFromHatSwitchValue:(IOHIDValueRef)hidValueRef useEightDirection:(BOOL)useEightDirection
-{
-	NSMutableArray *inputAttributesList = nil;
-	
-	if (hidValueRef == NULL)
-	{
-		return inputAttributesList;
-	}
-	
-	IOHIDElementRef hidElementRef = IOHIDValueGetElement(hidValueRef);
-	NSInteger elementUsagePage = IOHIDElementGetUsagePage(hidElementRef);
-	NSInteger elementUsage = IOHIDElementGetUsage(hidElementRef);
-	
-	if (elementUsage != kHIDUsage_GD_Hatswitch)
-	{
-		return inputAttributesList;
-	}
-	
-	inputAttributesList = [NSMutableArray arrayWithCapacity:8];
-	NSInteger logicalMax = IOHIDElementGetLogicalMax(hidElementRef);
-	NSInteger logicalValue = IOHIDValueGetIntegerValue(hidValueRef);
-	
-	NSNumber *onState = [NSNumber numberWithBool:YES];
-	NSNumber *offState = [NSNumber numberWithBool:NO];
-	NSString *elementCodeFourWayUp = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-FourDirection", (long)elementUsagePage, (long)elementUsage, 0];
-	NSString *elementCodeFourWayRight = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-FourDirection", (long)elementUsagePage, (long)elementUsage, 1];
-	NSString *elementCodeFourWayDown = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-FourDirection", (long)elementUsagePage, (long)elementUsage, 2];
-	NSString *elementCodeFourWayLeft = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-FourDirection", (long)elementUsagePage, (long)elementUsage, 3];
-	NSString *elementCodeEightWayUp = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-EightDirection", (long)elementUsagePage, (long)elementUsage, 0];
-	NSString *elementCodeEightWayUpRight = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-EightDirection", (long)elementUsagePage, (long)elementUsage, 1];
-	NSString *elementCodeEightWayRight = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-EightDirection", (long)elementUsagePage, (long)elementUsage, 2];
-	NSString *elementCodeEightWayDownRight = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-EightDirection", (long)elementUsagePage, (long)elementUsage, 3];
-	NSString *elementCodeEightWayDown = [NSString stringWithFormat:@"0x%04lXX/0x%04lX/%d-EightDirection",(long) (long)elementUsagePage, (long)elementUsage, 4];
-	NSString *elementCodeEightWayDownLeft = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-EightDirection", (long)elementUsagePage, (long)elementUsage, 5];
-	NSString *elementCodeEightWayLeft = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-EightDirection", (long)elementUsagePage, (long)elementUsage, 6];
-	NSString *elementCodeEightWayUpLeft = [NSString stringWithFormat:@"0x%04lX/0x%04lX/%d-EightDirection", (long)elementUsagePage, (long)elementUsage, 7];
-	
-	if (logicalMax == 3)
-	{
-		switch (logicalValue)
-		{
-			case 0:
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayUp altElementName:@"Hatswitch - Up" inputState:onState]];
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayRight altElementName:@"Hatswitch - Right" inputState:offState]];
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayDown altElementName:@"Hatswitch - Down" inputState:offState]];
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayLeft altElementName:@"Hatswitch - Left" inputState:offState]];
-				break;
-				
-			case 1:
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayUp altElementName:@"Hatswitch - Up" inputState:offState]];
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayRight altElementName:@"Hatswitch - Right" inputState:onState]];
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayDown altElementName:@"Hatswitch - Down" inputState:offState]];
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayLeft altElementName:@"Hatswitch - Left" inputState:offState]];
-				break;
-				
-			case 2:
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayUp altElementName:@"Hatswitch - Up" inputState:offState]];
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayRight altElementName:@"Hatswitch - Right" inputState:offState]];
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayDown altElementName:@"Hatswitch - Down" inputState:onState]];
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayLeft altElementName:@"Hatswitch - Left" inputState:offState]];
-				break;
-				
-			case 3:
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayUp altElementName:@"Hatswitch - Up" inputState:offState]];
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayRight altElementName:@"Hatswitch - Right" inputState:offState]];
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayDown altElementName:@"Hatswitch - Down" inputState:offState]];
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayLeft altElementName:@"Hatswitch - Left" inputState:onState]];
-				break;
-				
-			default:
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayUp altElementName:@"Hatswitch - Up" inputState:offState]];
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayRight altElementName:@"Hatswitch - Right" inputState:offState]];
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayDown altElementName:@"Hatswitch - Down" inputState:offState]];
-				[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeFourWayLeft altElementName:@"Hatswitch - Left" inputState:offState]];
-				break;
-		}
-	}
-	else if (logicalMax == 7)
-	{
-		if (useEightDirection)
-		{
-			switch (logicalValue)
-			{
-				case 0:
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUp altElementName:@"Hatswitch - Up" inputState:onState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUpRight altElementName:@"Hatswitch - Up/Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayRight altElementName:@"Hatswitch - Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDownRight altElementName:@"Hatswitch - Down/Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDown altElementName:@"Hatswitch - Down" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDownLeft altElementName:@"Hatswitch - Down/Left" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayLeft altElementName:@"Hatswitch - Left" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUpLeft altElementName:@"Hatswitch - Up/Left" inputState:offState]];
-					break;
-					
-				case 1:
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUp altElementName:@"Hatswitch - Up" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUpRight altElementName:@"Hatswitch - Up/Right" inputState:onState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayRight altElementName:@"Hatswitch - Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDownRight altElementName:@"Hatswitch - Down/Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDown altElementName:@"Hatswitch - Down" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDownLeft altElementName:@"Hatswitch - Down/Left" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayLeft altElementName:@"Hatswitch - Left" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUpLeft altElementName:@"Hatswitch - Up/Left" inputState:offState]];
-					break;
-					
-				case 2:
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUp altElementName:@"Hatswitch - Up" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUpRight altElementName:@"Hatswitch - Up/Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayRight altElementName:@"Hatswitch - Right" inputState:onState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDownRight altElementName:@"Hatswitch - Down/Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDown altElementName:@"Hatswitch - Down" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDownLeft altElementName:@"Hatswitch - Down/Left" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayLeft altElementName:@"Hatswitch - Left" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUpLeft altElementName:@"Hatswitch - Up/Left" inputState:offState]];
-					break;
-					
-				case 3:
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUp altElementName:@"Hatswitch - Up" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUpRight altElementName:@"Hatswitch - Up/Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayRight altElementName:@"Hatswitch - Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDownRight altElementName:@"Hatswitch - Down/Right" inputState:onState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDown altElementName:@"Hatswitch - Down" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDownLeft altElementName:@"Hatswitch - Down/Left" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayLeft altElementName:@"Hatswitch - Left" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUpLeft altElementName:@"Hatswitch - Up/Left" inputState:offState]];
-					break;
-					
-				case 4:
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUp altElementName:@"Hatswitch - Up" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUpRight altElementName:@"Hatswitch - Up/Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayRight altElementName:@"Hatswitch - Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDownRight altElementName:@"Hatswitch - Down/Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDown altElementName:@"Hatswitch - Down" inputState:onState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDownLeft altElementName:@"Hatswitch - Down/Left" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayLeft altElementName:@"Hatswitch - Left" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUpLeft altElementName:@"Hatswitch - Up/Left" inputState:offState]];
-					break;
-					
-				case 5:
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUp altElementName:@"Hatswitch - Up" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUpRight altElementName:@"Hatswitch - Up/Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayRight altElementName:@"Hatswitch - Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDownRight altElementName:@"Hatswitch - Down/Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDown altElementName:@"Hatswitch - Down" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDownLeft altElementName:@"Hatswitch - Down/Left" inputState:onState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayLeft altElementName:@"Hatswitch - Left" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUpLeft altElementName:@"Hatswitch - Up/Left" inputState:offState]];
-					break;
-					
-				case 6:
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUp altElementName:@"Hatswitch - Up" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUpRight altElementName:@"Hatswitch - Up/Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayRight altElementName:@"Hatswitch - Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDownRight altElementName:@"Hatswitch - Down/Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDown altElementName:@"Hatswitch - Down" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDownLeft altElementName:@"Hatswitch - Down/Left" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayLeft altElementName:@"Hatswitch - Left" inputState:onState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUpLeft altElementName:@"Hatswitch - Up/Left" inputState:offState]];
-					break;
-					
-				case 7:
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUp altElementName:@"Hatswitch - Up" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUpRight altElementName:@"Hatswitch - Up/Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayRight altElementName:@"Hatswitch - Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDownRight altElementName:@"Hatswitch - Down/Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDown altElementName:@"Hatswitch - Down" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDownLeft altElementName:@"Hatswitch - Down/Left" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayLeft altElementName:@"Hatswitch - Left" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUpLeft altElementName:@"Hatswitch - Up/Left" inputState:onState]];
-					break;
-					
-				default:
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUp altElementName:@"Hatswitch - Up" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUpRight altElementName:@"Hatswitch - Up/Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayRight altElementName:@"Hatswitch - Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDownRight altElementName:@"Hatswitch - Down/Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDown altElementName:@"Hatswitch - Down" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDownLeft altElementName:@"Hatswitch - Down/Left" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayLeft altElementName:@"Hatswitch - Left" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUpLeft altElementName:@"Hatswitch - Up/Left" inputState:offState]];
-					break;
-			}
-		}
-		else
-		{
-			switch (logicalValue)
-			{
-				case 0:
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUp altElementName:@"Hatswitch - Up" inputState:onState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayRight altElementName:@"Hatswitch - Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDown altElementName:@"Hatswitch - Down" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayLeft altElementName:@"Hatswitch - Left" inputState:offState]];
-					break;
-					
-				case 1:
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUp altElementName:@"Hatswitch - Up" inputState:onState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayRight altElementName:@"Hatswitch - Right" inputState:onState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDown altElementName:@"Hatswitch - Down" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayLeft altElementName:@"Hatswitch - Left" inputState:offState]];
-					break;
-					
-				case 2:
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUp altElementName:@"Hatswitch - Up" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayRight altElementName:@"Hatswitch - Right" inputState:onState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDown altElementName:@"Hatswitch - Down" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayLeft altElementName:@"Hatswitch - Left" inputState:offState]];
-					break;
-					
-				case 3:
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUp altElementName:@"Hatswitch - Up" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayRight altElementName:@"Hatswitch - Right" inputState:onState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDown altElementName:@"Hatswitch - Down" inputState:onState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayLeft altElementName:@"Hatswitch - Left" inputState:offState]];
-					break;
-					
-				case 4:
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUp altElementName:@"Hatswitch - Up" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayRight altElementName:@"Hatswitch - Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDown altElementName:@"Hatswitch - Down" inputState:onState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayLeft altElementName:@"Hatswitch - Left" inputState:offState]];
-					break;
-					
-				case 5:
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUp altElementName:@"Hatswitch - Up" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayRight altElementName:@"Hatswitch - Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDown altElementName:@"Hatswitch - Down" inputState:onState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayLeft altElementName:@"Hatswitch - Left" inputState:onState]];
-					break;
-					
-				case 6:
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUp altElementName:@"Hatswitch - Up" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayRight altElementName:@"Hatswitch - Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDown altElementName:@"Hatswitch - Down" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayLeft altElementName:@"Hatswitch - Left" inputState:onState]];
-					break;
-					
-				case 7:
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUp altElementName:@"Hatswitch - Up" inputState:onState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayRight altElementName:@"Hatswitch - Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDown altElementName:@"Hatswitch - Down" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayLeft altElementName:@"Hatswitch - Left" inputState:onState]];
-					break;
-					
-				default:
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayUp altElementName:@"Hatswitch - Up" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayRight altElementName:@"Hatswitch - Right" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayDown altElementName:@"Hatswitch - Down" inputState:offState]];
-					[inputAttributesList addObject:[CocoaHIDDevice inputAttributesOfHIDValue:hidValueRef altElementCode:elementCodeEightWayLeft altElementName:@"Hatswitch - Left" inputState:offState]];
-					break;
-			}
-		}
-	}
-	
-	return inputAttributesList;
-}
-
-+ (BOOL) onStateFromHIDValue:(IOHIDValueRef)hidValueRef
-{
-	BOOL onState = NO;
-	
-	if (hidValueRef == nil)
-	{
-		return onState;
-	}
-	
-	IOHIDElementRef hidElementRef = IOHIDValueGetElement(hidValueRef);
-	NSInteger logicalValue = IOHIDValueGetIntegerValue(hidValueRef);
-	NSInteger logicalMin = IOHIDElementGetLogicalMin(hidElementRef);
-	NSInteger logicalMax = IOHIDElementGetLogicalMax(hidElementRef);
-	NSInteger lowerThreshold = ((logicalMax - logicalMin) / 4) + logicalMin;
-	NSInteger upperThreshold = (((logicalMax - logicalMin) * 3) / 4) + logicalMin;
-	
-	NSInteger elementType = IOHIDElementGetType(hidElementRef);
-	switch (elementType)
-	{
-		case kIOHIDElementTypeInput_Misc:
-		{
-			if (logicalMin == 0 && logicalMax == 1)
-			{
-				if (logicalValue == 1)
-				{
-					onState = YES;
-				}
-			}
-			else
-			{
-				if (logicalValue <= lowerThreshold || logicalValue >= upperThreshold)
-				{
-					onState = YES;
-				}
-			}
-			break;
-		}
-			
-		case kIOHIDElementTypeInput_Button:
-		{
-			if (logicalValue == 1)
-			{
-				onState = YES;
-			}
-			break;
-		}
-			
-		case kIOHIDElementTypeInput_Axis:
-		{
-			if (logicalMin == 0 && logicalMax == 1)
-			{
-				if (logicalValue == 1)
-				{
-					onState = YES;
-				}
-			}
-			else
-			{
-				if (logicalValue <= lowerThreshold || logicalValue >= upperThreshold)
-				{
-					onState = YES;
-				}
-			}
-			break;
-		}
-			
-		default:
-			break;
-	}
-	
-	return onState;
-}
-
-@...
-
-
-@... CocoaHIDManager
-
-@... hidManagerRef;
-@... deviceList;
-@... runLoop;
-
-- (id)init
-{
-	self = [super init];
-	if(self == nil)
-	{
-		return self;
-	}
-	
-	hidManagerRef = IOHIDManagerCreate(kCFAllocatorDefault, kIOHIDOptionsTypeNone);
-	if (hidManagerRef == NULL)
-	{
-		[self release];
-		return nil;
-	}
-	
-	deviceList = [[NSMutableSet alloc] initWithCapacity:32];
-	
-	CFMutableDictionaryRef cfJoystickMatcher = CFDictionaryCreateMutable(kCFAllocatorDefault, 2, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
-	CFDictionarySetValue(cfJoystickMatcher, CFSTR(kIOHIDDeviceUsagePageKey), (CFNumberRef)[NSNumber numberWithInteger:kHIDPage_GenericDesktop]);
-	CFDictionarySetValue(cfJoystickMatcher, CFSTR(kIOHIDDeviceUsageKey), (CFNumberRef)[NSNumber numberWithInteger:kHIDUsage_GD_Joystick]);
-	
-	CFMutableDictionaryRef cfGamepadMatcher = CFDictionaryCreateMutable(kCFAllocatorDefault, 2, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
-	CFDictionarySetValue(cfGamepadMatcher, CFSTR(kIOHIDDeviceUsagePageKey), (CFNumberRef)[NSNumber numberWithInteger:kHIDPage_GenericDesktop]);
-	CFDictionarySetValue(cfGamepadMatcher, CFSTR(kIOHIDDeviceUsageKey), (CFNumberRef)[NSNumber numberWithInteger:kHIDUsage_GD_GamePad]);
-	
-	NSArray *matcherArray = [[NSArray alloc] initWithObjects:(NSMutableDictionary *)cfJoystickMatcher, (NSMutableDictionary *)cfGamepadMatcher, nil];
-	
-	IOHIDManagerSetDeviceMatchingMultiple(hidManagerRef, (CFArrayRef)matcherArray);
-	
-	[matcherArray release];
-	CFRelease(cfJoystickMatcher);
-	CFRelease(cfGamepadMatcher);
-	
-	spinlockRunLoop = OS_SPINLOCK_INIT;
-	[self setRunLoop:[NSRunLoop currentRunLoop]];
-	
-	IOReturn result = IOHIDManagerOpen(hidManagerRef, kIOHIDOptionsTypeNone);
-	if (result != kIOReturnSuccess)
-	{
-		[self release];
-		return nil;
-	}
-			
-	return self;
-}
-
-- (void)dealloc
-{
-	self.runLoop = nil;
-	[deviceList release];
-	
-	if (hidManagerRef != NULL)
-	{
-		IOHIDManagerClose(hidManagerRef, 0);
-		CFRelease(hidManagerRef);
-		hidManagerRef = NULL;
-	}
-	
-	[super dealloc];
-}
-
-- (void) setRunLoop:(NSRunLoop *)theRunLoop
-{
-	OSSpinLockLock(&spinlockRunLoop);
-	
-	if (theRunLoop == runLoop)
-	{
-		OSSpinLockUnlock(&spinlockRunLoop);
-		return;
-	}
-	
-	if (theRunLoop == nil)
-	{
-		IOHIDManagerRegisterDeviceMatchingCallback(hidManagerRef, NULL, NULL);
-		IOHIDManagerRegisterDeviceRemovalCallback(hidManagerRef, NULL, NULL);
-		IOHIDManagerUnscheduleFromRunLoop(hidManagerRef, [runLoop getCFRunLoop], kCFRunLoopDefaultMode);
-	}
-	else
-	{
-		[theRunLoop retain];
-		IOHIDManagerScheduleWithRunLoop(hidManagerRef, [theRunLoop getCFRunLoop], kCFRunLoopDefaultMode);
-		IOHIDManagerRegisterDeviceMatchingCallback(hidManagerRef, HandleDeviceMatchingCallback, self);
-		IOHIDManagerRegisterDeviceRemovalCallback(hidManagerRef, HandleDeviceRemovalCallback, self);
-	}
-	
-	[runLoop release];
-	runLoop = theRunLoop;
-	
-	OSSpinLockUnlock(&spinlockRunLoop);
-}
-
-- (NSRunLoop *) runLoop
-{
-	OSSpinLockLock(&spinlockRunLoop);
-	NSRunLoop *theRunLoop = runLoop;
-	OSSpinLockUnlock(&spinlockRunLoop);
-	
-	return theRunLoop;
-}
-
-@...
-
-void HandleDeviceMatchingCallback(void *inContext, IOReturn inResult, void *inSender, IOHIDDeviceRef inIOHIDDeviceRef)
-{
-	CocoaHIDManager *hidManager = (CocoaHIDManager *)inContext;
-	CocoaHIDDevice *newDevice = [[[CocoaHIDDevice alloc] initWithDevice:inIOHIDDeviceRef] autorelease];
-	[hidManager.deviceList addObject:newDevice];
-	[newDevice start];
-}
-
-void HandleDeviceRemovalCallback(void *inContext, IOReturn inResult, void *inSender, IOHIDDeviceRef inIOHIDDeviceRef)
-{
-	CocoaHIDManager *hidManager = (CocoaHIDManager *)inContext;
-	
-	for (CocoaHIDDevice *hidDevice in hidManager.deviceList)
-	{
-		if (hidDevice.hidDeviceRef == inIOHIDDeviceRef)
-		{
-			[hidManager.deviceList removeObject:hidDevice];
-			break;
-		}
-	}
-}
-
-void HandleQueueValueAvailableCallback(void *inContext, IOReturn inResult, void *inSender)
-{
-	IOHIDQueueRef hidQueue = (IOHIDQueueRef)inSender;
-	NSMutableArray *inputAttributesList = nil;
-	NSAutoreleasePool *hidPool = [[NSAutoreleasePool alloc] init];
-	
-	do
-	{
-		IOHIDValueRef hidValueRef = IOHIDQueueCopyNextValueWithTimeout(hidQueue, 0.0);
-		if (hidValueRef == NULL)
-		{
-			break;
-		}
-		
-		NSMutableArray *hatSwitchInput = [CocoaHIDDevice inputArrayFromHatSwitchValue:hidValueRef useEightDirection:NO];
-		if (hatSwitchInput != nil)
-		{
-			inputAttributesList = hatSwitchInput;
-		}
-		else
-		{
-			inputAttributesList = [CocoaHIDDevice inputArrayFromHIDValue:hidValueRef];
-		}
-		
-		if (inputAttributesList != nil)
-		{
-			// HID input devices don't register events, so we need to manually prevent
-			// sleep and screensaver whenever we detect an input.
-			UpdateSystemActivity(UsrActivity);
-			
-			[[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"org.desmume.DeSmuME.hidInputDetected" object:inputAttributesList userInfo:nil];
-		}
-		
-		CFRelease(hidValueRef);
-	} while (1);
-	
-	[hidPool release];
-}

Modified: trunk/desmume/src/cocoa/cocoa_input.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_input.h	2013-02-27 08:44:52 UTC (rev 4547)
+++ trunk/desmume/src/cocoa/cocoa_input.h	2013-03-01 23:41:03 UTC (rev 4548)
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2012 DeSmuME team
+	Copyright (C) 2012-2013 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -17,75 +17,49 @@
 */
 
 #import <Cocoa/Cocoa.h>
-#include <pthread.h>
+#include <libkern/OSAtomic.h>
 
 @class CocoaDSMic;
 
-
-@... CocoaDSInput : NSObject
+enum
 {
-	NSMutableDictionary *map;
-	NSString *deviceCode;
-	NSString *deviceName;
-}
+	DSControllerState_Right = 0,
+	DSControllerState_Left,
+	DSControllerState_Down,
+	DSControllerState_Up,
+	DSControllerState_Select,
+	DSControllerState_Start,
+	DSControllerState_B,
+	DSControllerState_A,
+	DSControllerState_Y,
+	DSControllerState_X,
+	DSControllerState_L,
+	DSControllerState_R,
+	DSControllerState_Debug,
+	DSControllerState_Lid,
+	
+	DSControllerState_Touch,
+	DSControllerState_Microphone,
+	
+	DSControllerState_StatesCount
+};
 
-@... (retain) NSMutableDictionary *map;
-@... (copy) NSString *deviceCode;
-@... (copy) NSString *deviceName;
-
-- (id) initWithDeviceCode:(NSString *)theCode name:(NSString *)theName;
-
-- (void) set:(NSString *)elementCode attributes:(NSDictionary *)mappingAttributes;
-- (NSDictionary *) mappingByElementCode:(NSString *)elementCode;
-- (void) removeByElementCode:(NSString *)elementCode;
-- (void) removeMapping:(NSString *)mappingName;
-
-+ (NSDictionary *) dictionaryWithMappingAttributes:(NSString *)mappingName
-								   useDeviceValues:(BOOL)useDeviceValues
-											xPoint:(CGFloat)xPoint
-											yPoint:(CGFloat)yPoint
-									  integerValue:(NSInteger)integerValue
-										floatValue:(float)floatValue
-											  data:(NSData *)data
-										  selector:(NSString *)selectorString
-										 paramType:(NSString *)paramTypeKey;
-
-@...
-
-
 @interface CocoaDSController : NSObject
 {
-	NSMutableDictionary *states;
 	CocoaDSMic *cdsMic;
-	pthread_mutex_t *mutexControllerUpdate;
-	NSMutableDictionary *inputs;
+	NSPoint touchLocation;
+	bool controllerState[DSControllerState_StatesCount];
+	
+	OSSpinLock spinlockControllerState;
 }
 
-@... (readonly) NSMutableDictionary *states;
 @property (retain) CocoaDSMic *cdsMic;
-@... (readonly) NSMutableDictionary *inputs;
-@... (readonly) pthread_mutex_t *mutexControllerUpdate;
 
 - (id) initWithMic:(CocoaDSMic *)theMic;
 
-- (void) initDefaultMappings;
-- (BOOL) initUserDefaultMappings;
-- (void) initControllerMap;
-
-- (void) addMapping:(NSString *)controlName deviceInfo:(NSDictionary *)deviceInfo;
-
-- (BOOL) setStateWithInput:(NSDictionary *)inputAttributes;
-- (BOOL) setStateWithMultipleInputs:(NSArray *)inputAttributesList;
-- (NSDictionary *) mappingByEvent:(NSEvent *)event;
-- (BOOL) updateController:(NSArray *)inputStates;
-
-- (NSDate *) inputTime:(NSString *)controlName;
-- (bool) isInputPressed:(NSString *)controlName;
-- (NSPoint) inputLocation:(NSString *)controlName;
-- (unsigned char) inputSoundSample:(NSString *)controlName;
-
 - (void) setSoundInputMode:(NSInteger)inputMode;
-- (void) update;
-- (void) handleHIDInput:(NSNotification *)aNotification;
+- (void) setControllerState:(BOOL)theState controlID:(NSUInteger)controlID;
+- (void) setTouchState:(BOOL)theState location:(NSPoint)theLocation;
+- (void) flush;
 
 @end

Modified: trunk/desmume/src/cocoa/cocoa_input.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_input.mm	2013-02-27 08:44:52 UTC (rev 4547)
+++ trunk/desmume/src/cocoa/cocoa_input.mm	2013-03-01 23:41:03 UTC (rev 4548)
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2012 DeSmuME team
+	Copyright (C) 2012-2013 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -25,160 +25,9 @@
 #undef BOOL
 
 
-@... CocoaDSInput
-
-@... map;
-@... deviceCode;
-@... deviceName;
-
-- (id)init
-{
-	return [self initWithDeviceCode:nil name:nil];
-}
-
-- (id) initWithDeviceCode:(NSString *)theCode name:(NSString *)theName
-{
-	self = [super init];
-	if (self == nil)
-	{
-		return self;
-	}
-	
-	map = [[NSMutableDictionary alloc] initWithCapacity:32];
-	
-	if (theCode == nil)
-	{
-		deviceCode = [[NSString stringWithFormat:@"0x%08X", arc4random()] retain];
-	}
-	else
-	{
-		deviceCode = [theCode copy];
-	}
-	
-	if (theName == nil)
-	{
-		deviceName = @"Unknown Device ";
-		deviceName = [[deviceName stringByAppendingString:deviceCode] retain];
-	}
-	else
-	{
-		deviceName = [theName copy];
-	}
-
-	
-	return self;
-}
-
-- (void)dealloc
-{
-	self.map = nil;
-	self.deviceCode = nil;
-	self.deviceName = nil;
-	
-	[super dealloc];
-}
-
-- (void) set:(NSString *)elementCode attributes:(NSDictionary *)mappingAttributes
-{
-	NSString *keyString = [[self.deviceCode stringByAppendingString:@":"] stringByAppendingString:elementCode];
-	
-	// Remove any input mappings with the same DS control name as the new mapping.
-	// We're doing this check since the current UI doesn't support multiple bindings per control at this time.
-	// When the UI is updated to support multiple bindings per control, this check will need to be removed.
-	NSArray *mappingKeys = [self.map allKeys];
-	for (NSString *key in mappingKeys)
-	{
-		NSDictionary *inputMapping = (NSDictionary *)[self.map valueForKey:key];
-		NSString *dsControlName = (NSString *)[inputMapping valueForKey:@"name"];
-		if ([dsControlName isEqualToString:(NSString *)[mappingAttributes valueForKey:@"name"]])
-		{
-			[self.map setValue:nil forKey:key];
-		}
-	}
-	
-	[self.map setValue:mappingAttributes forKey:keyString];
-}
-
-- (NSDictionary *) mappingByElementCode:(NSString *)elementCode
-{
-	NSString *keyString = [[self.deviceCode stringByAppendingString:@":"] stringByAppendingString:elementCode];
-	return [self.map valueForKey:keyString];
-}
-
-- (void) removeByElementCode:(NSString *)elementCode
-{
-	NSString *keyString = [[self.deviceCode stringByAppendingString:@":"] stringByAppendingString:elementCode];
-	[self.map setValue:nil forKey:keyString];
-}
-
-- (void) removeMapping:(NSString *)mappingName
-{
-	NSArray *mapKeys = [self.map allKeys];
-	for(NSString *key in mapKeys)
-	{
-		if ([(NSString *)[(NSDictionary *)[self.map valueForKey:key] valueForKey:@"name"] isEqual:mappingName])
-		{
-			[self.map removeObjectForKey:key];
-		}
-	}
-}
-
-+ (NSDictionary *) dictionaryWithMappingAttributes:(NSString *)mappingName
-								   useDeviceValues:(BOOL)useDeviceValues
-											xPoint:(CGFloat)xPoint
-											yPoint:(CGFloat)yPoint
-									  integerValue:(NSInteger)integerValue
-										floatValue:(float)floatValue
-											  data:(NSData *)data
-										  selector:(NSString *)selectorString
-										 paramType:(NSString *)paramTypeKey
-{
-	NSDictionary *attributes = nil;
-	
-	if (mappingName == nil)
-	{
-		return attributes;
-	}
-	
-	if (useDeviceValues)
-	{
-		attributes = [NSDictionary dictionaryWithObjectsAndKeys:
-					  mappingName, @"name",
-					  [NSNumber numberWithBool:useDeviceValues], @"useDeviceValues",
-					  nil];
-	}
-	else
-	{
-		NSData *tempData = data;
-		if (tempData == nil)
-		{
-			tempData = [NSData data];
-		}
-		
-		attributes = [NSDictionary dictionaryWithObjectsAndKeys:
-					  mappingName, @"name",
-					  [NSNumber numberWithBool:useDeviceValues], @"useDeviceValues",
-					  [NSNumber numberWithFloat:xPoint], @"xPoint",
-					  [NSNumber numberWithFloat:yPoint], @"yPoint",
-					  [NSNumber numberWithInteger:integerValue], @"integerValue",
-					  [NSNumber numberWithFloat:floatValue], @"floatValue",
-					  tempData, @"data",
-					  selectorString, @"selector",
-					  paramTypeKey, @"paramType",
-					  nil];
-	}
-	
-	return attributes;
-}
-
-@...
-
 @implementation CocoaDSController
 
-@... states;
 @synthesize cdsMic;
-@... inputs;
-@... mutexControllerUpdate;
 
 - (id)init
 {
@@ -193,447 +42,91 @@
 		return self;
 	}
 	
-	mutexControllerUpdate = (pthread_mutex_t *)malloc(sizeof(pthread_mutex_t));
-	pthread_mutex_init(mutexControllerUpdate, NULL);
+	for (unsigned int i = 0; i < DSControllerState_StatesCount; i++)
+	{
+		controllerState[i] = false;
+	}
 	
+	spinlockControllerState = OS_SPINLOCK_INIT;
+	
 	cdsMic = [theMic retain];
-	states = [[NSMutableDictionary alloc] init];
-	inputs = [[NSMutableDictionary alloc] initWithCapacity:10];
+	touchLocation = NSMakePoint(0.0f, 0.0f);
 	
-	[self initDefaultMappings];
-	
-	[[NSNotificationCenter defaultCenter] addObserver:self
-											 selector:@selector(handleHIDInput:)
-												 name:@"org.desmume.DeSmuME.hidInputDetected"
-											   object:nil];
-	
 	return self;
 }
 
 - (void)dealloc
 {
-	[[NSNotificationCenter defaultCenter] removeObserver:self];
-	
 	self.cdsMic = nil;
-	[states release];
-	[inputs release];
 	
-	pthread_mutex_destroy(self.mutexControllerUpdate);
-	free(self.mutexControllerUpdate);
-	mutexControllerUpdate = nil;
-	
 	[super dealloc];
 }
 
-- (void) initDefaultMappings
-{	
-	[self initUserDefaultMappings];
-	[self initControllerMap];
-}
-
-- (BOOL) initUserDefaultMappings
+- (void) setSoundInputMode:(NSInteger)inputMode
 {
-	BOOL didChange = NO;
-	
-	// Check to see if the DefaultKeyMappings.plist files exists.
-	NSDictionary *defaultMappings = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"DefaultKeyMappings" ofType:@"plist"]];
-	if (defaultMappings == nil)
-	{
-		return didChange;
-	}
-	
-	// If the input mappings does not exist in the user's preferences file, then copy all the mappings from the
-	// DefaultKeyMappings.plist file to the preferences file. Then we're done.
-	NSDictionary *userMappings = [[NSUserDefaults standardUserDefaults] dictionaryForKey:@"Input_ControllerMappings"];
-	if (userMappings == nil)
-	{
-		[[NSUserDefaults standardUserDefaults] setObject:defaultMappings forKey:@"Input_ControllerMappings"];
-		didChange = YES;
-		return didChange;
-	}
-	
-	// At this point, we need to check every key in the user's preference file and make sure that all the keys
-	// exist. The keys that must exist are all listed in the DefaultKeyMappings.plist file.
-	NSMutableDictionary *tempUserMappings = [NSMutableDictionary dictionaryWithDictionary:userMappings];
-	
-	NSArray *inputKeys = [defaultMappings allKeys];
-	for(NSString *inputString in inputKeys)
-	{
-		if ([tempUserMappings objectForKey:inputString] == nil)
-		{
-			[tempUserMappings setValue:[defaultMappings valueForKey:inputString] forKey:inputString];
-			didChange = YES;
-		}
-	}
-	
-	// If we had to add a missing key, then we need to copy our temporary dictionary back to the
-	// user's preferences file.
-	if (didChange)
-	{
-		[[NSUserDefaults standardUserDefaults] setObject:tempUserMappings forKey:@"Input_ControllerMappings"];
-	}
-	
-	// And we're done.
-	return didChange;
+	OSSpinLockLock(&spinlockControllerState);
+	self.cdsMic.mode = inputMode;
+	OSSpinLockUnlock(&spinlockControllerState);
 }
 
-- (void) initControllerMap
+- (void) setControllerState:(BOOL)theState controlID:(NSUInteger)controlID 
 {
-	NSDictionary *defaultMappings = [NSDictionary dictionaryWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"DefaultKeyMappings" ofType:@"plist"]];
-	if (defaultMappings == nil)
+	if (controlID >= DSControllerState_StatesCount)
 	{
 		return;
 	}
 	
-	NSDictionary *userMappings = [[NSUserDefaults standardUserDefaults] dictionaryForKey:@"Input_ControllerMappings"];
-	if (userMappings == nil)
-	{
-		[self initUserDefaultMappings];
-	}
-	
-	NSArray *controlNameList = [defaultMappings allKeys];
-	for(NSString *controlName in controlNameList)
-	{
-		[self.states setValue:[NSMutableDictionary dictionaryWithCapacity:64] forKey:controlName];
-		
-		NSArray *deviceInfoList = (NSArray *)[userMappings valueForKey:controlName];
-		for(NSDictionary *deviceInfo in deviceInfoList)
-		{
-			[self addMapping:controlName deviceInfo:deviceInfo];
-		}
-	}
+	OSSpinLockLock(&spinlockControllerState);
+	controllerState[controlID] = (theState) ? true : false;
+	OSSpinLockUnlock(&spinlockControllerState);
 }
 
-- (void) addMapping:(NSString *)controlName deviceInfo:(NSDictionary *)deviceInfo
+- (void) setTouchState:(BOOL)theState location:(NSPoint)theLocation
 {
-	if (controlName == nil)
-	{
-		return;
-	}
-	
-	NSString *deviceCode = (NSString *)[deviceInfo valueForKey:@"deviceCode"];
-	NSString *elementCode = (NSString *)[deviceInfo valueForKey:@"elementCode"];
-	
-	if (deviceCode == nil || elementCode == nil)
-	{
-		return;
-	}
-	
-	NSDictionary *mappingAttributes = [CocoaDSInput dictionaryWithMappingAttributes:controlName
-																	useDeviceValues:[(NSNumber *)[deviceInfo valueForKey:@"useDeviceValues"] boolValue]
-																			 xPoint:[(NSNumber *)[deviceInfo valueForKey:@"xPoint"] floatValue]
-																			 yPoint:[(NSNumber *)[deviceInfo valueForKey:@"yPoint"] floatValue]
-																	   integerValue:[(NSNumber *)[deviceInfo valueForKey:@"integerValue"] integerValue]
-																		 floatValue:[(NSNumber *)[deviceInfo valueForKey:@"floatValue"] floatValue]
-																			   data:(NSData *)[deviceInfo valueForKey:@"data"]
-																		   selector:(NSString *)[deviceInfo valueForKey:@"selector"]
-																		  paramType:(NSString *)[deviceInfo valueForKey:@"paramType"]];
-	
-	if (mappingAttributes == nil)
-	{
-		return;
-	}
-	
-	CocoaDSInput *input = (CocoaDSInput *)[self.inputs valueForKey:deviceCode];
-	if (input == nil)
-	{
-		NSString *deviceName = (NSString *)[deviceInfo valueForKey:@"deviceName"];
-		if (deviceName == nil)
-		{
-			deviceName = deviceCode;
-		}
-		
-		input = [[[CocoaDSInput alloc] initWithDeviceCode:deviceCode name:deviceName] autorelease];
-		[self.inputs setValue:input forKey:deviceCode];
-	}
-	
-	[input set:elementCode attributes:mappingAttributes];
+	OSSpinLockLock(&spinlockControllerState);
+	controllerState[DSControllerState_Touch] = (theState) ? true : false;
+	touchLocation = theLocation;
+	OSSpinLockUnlock(&spinlockControllerState);
 }
 
-- (BOOL) setStateWithInput:(NSDictionary *)inputAttributes
+- (void) flush
 {
-	BOOL inputChanged = NO;
+	OSSpinLockLock(&spinlockControllerState);
 	
-	if (inputAttributes == nil)
-	{
-		return inputChanged;
-	}
+	NSPoint theLocation = touchLocation;
+	NSInteger micMode = cdsMic.mode;
+	bool flushedStates[DSControllerState_StatesCount] = {0};
 	
-	NSMutableArray *attributesList = [NSMutableArray arrayWithObject:inputAttributes];
-	
-	return [self setStateWithMultipleInputs:attributesList];
-}
-
-- (BOOL) setStateWithMultipleInputs:(NSArray *)inputAttributesList
-{
-	BOOL inputChanged = NO;
-	NSMutableArray *inputStates = [NSMutableArray arrayWithCapacity:8];
-	
-	if (inputAttributesList == nil || [inputAttributesList count] <= 0)
+	for (unsigned int i = 0; i < DSControllerState_StatesCount; i++)
 	{
-		return inputChanged;
+		flushedStates[i] = controllerState[i];
 	}
 	
-	for (NSDictionary *attr in inputAttributesList)
-	{
-		NSString *deviceCode = (NSString *)[attr valueForKey:@"deviceCode"];
-		if (deviceCode == nil)
-		{
-			continue;
-		}
-		
-		NSString *elementCode = (NSString *)[attr valueForKey:@"elementCode"];
-		if (elementCode == nil)
-		{
-			continue;
-		}
-		
-		CocoaDSInput *input = (CocoaDSInput *)[self.inputs valueForKey:deviceCode];
-		if (input == nil)
-		{
-			continue;
-		}
-		
-		NSDictionary *mappingAttributes = [input mappingByElementCode:elementCode];
-		if (mappingAttributes == nil)
-		{
-			continue;
-		}
-		
-		NSString *controlName = (NSString *)[mappingAttributes valueForKey:@"name"];
-		if (controlName == nil)
-		{
-			continue;
-		}
-		
-		NSMutableDictionary *inputState = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-										   controlName, @"name",
-										   [attr valueForKey:@"on"], @"on",
-										   nil];
-		
-		NSNumber *xPointNumber = nil;
-		NSNumber *yPointNumber = nil;
-		NSNumber *integerNumber = nil;
-		NSNumber *floatNumber = nil;
-		NSData *inputData = nil;
-		NSString *selectorString = nil;
-		NSString *paramTypeKey = nil;
-		
-		NSNumber *useDeviceValuesNumber = (NSNumber *)[mappingAttributes valueForKey:@"useDeviceValues"];
-		if (useDeviceValuesNumber == nil || ![useDeviceValuesNumber boolValue]) // Not reading from device values, use values from mapping attributes
-		{
-			xPointNumber = (NSNumber *)[mappingAttributes valueForKey:@"pointX"];
-			yPointNumber = (NSNumber *)[mappingAttributes valueForKey:@"pointY"];
-			integerNumber = (NSNumber *)[mappingAttributes valueForKey:@"integerValue"];
-			floatNumber = (NSNumber *)[mappingAttributes valueForKey:@"floatValue"];
-			inputData = (NSData *)[mappingAttributes valueForKey:@"data"];
-			selectorString = (NSString *)[mappingAttributes valueForKey:@"selector"];
-			paramTypeKey = (NSString *)[mappingAttributes valueForKey:@"paramType"];
-		}
-		else // Reading from device values, use values from input attributes
-		{
-			xPointNumber = (NSNumber *)[attr valueForKey:@"pointX"];
-			yPointNumber = (NSNumber *)[attr valueForKey:@"pointY"];
-			integerNumber = (NSNumber *)[attr valueForKey:@"integerValue"];
-			floatNumber = (NSNumber *)[attr valueForKey:@"floatValue"];
-			inputData = (NSData *)[attr valueForKey:@"data"];
-		}
-		
-		if (xPointNumber == nil)
-		{
-			xPointNumber = [NSNumber numberWithFloat:0.0f];
-		}
-		
-		if (yPointNumber == nil)
-		{
-			yPointNumber = [NSNumber numberWithFloat:0.0f];
-		}
-		
-		if (integerNumber == nil)
-		{
-			integerNumber = [NSNumber numberWithInteger:0];
-		}
-		
-		if (floatNumber == nil)
-		{
-			floatNumber = [NSNumber numberWithFloat:0.0f];
-		}
-		
-		[inputState setValue:xPointNumber forKey:@"pointX"];
-		[inputState setValue:yPointNumber forKey:@"pointY"];
-		[inputState setValue:integerNumber forKey:@"integerValue"];
-		[inputState setValue:floatNumber forKey:@"floatValue"];
-		[inputState setValue:inputData forKey:@"data"];
-		
-		[inputStates addObject:inputState];
-	}
+	OSSpinLockUnlock(&spinlockControllerState);
 	
-	inputChanged = [self updateController:inputStates];
+	bool isTouchDown = flushedStates[DSControllerState_Touch];
+	bool isMicPressed = flushedStates[DSControllerState_Microphone];
 	
-	return inputChanged;
-}
-
-- (NSDictionary *) mappingByEvent:(NSEvent *)event
-{
-	CocoaDSInput *input = nil;
-	NSString *elementCode = nil;
-	NSEventType eventType = [event type];
-	
-	switch (eventType)
-	{
-		case NSKeyDown:
-		case NSKeyUp:
-			input = (CocoaDSInput *)[self.inputs valueForKey:@"NSEventKeyboard"];
-			elementCode = [NSString stringWithFormat:@"%d", [event keyCode]];
-			break;
-			
-		case NSLeftMouseDown:
-		case NSRightMouseDown:
-		case NSOtherMouseDown:
-		case NSLeftMouseUp:
-		case NSRightMouseUp:
-		case NSOtherMouseUp:
-		case NSLeftMouseDragged:
-		case NSRightMouseDragged:
-		case NSOtherMouseDragged:
-			input = (CocoaDSInput *)[self.inputs valueForKey:@"NSEventMouse"];
-			elementCode = [NSString stringWithFormat:@"%li", (long)[event buttonNumber]];
-			break;
-			
-		default:
-			break;
-	}
-	
-	return [input mappingByElementCode:elementCode];
-}
-
-- (BOOL) updateController:(NSArray *)inputStates
-{
-	BOOL result = NO;
-	
-	if (inputStates == nil)
-	{
-		return result;
-	}
-	
-	pthread_mutex_lock(self.mutexControllerUpdate);
-	
-	for (NSDictionary *iState in inputStates)
-	{
-		NSString *controlName = (NSString *)[iState valueForKey:@"name"];
-		if (controlName == nil)
-		{
-			continue;
-		}
-		
-		NSMutableDictionary *controlState = (NSMutableDictionary *)[self.states valueForKey:controlName];
-		[controlState setDictionary:iState];
-		[controlState setValue:[NSDate date] forKey:@"time"];
-		
-		result = YES;
-	}
-	
-	pthread_mutex_unlock(self.mutexControllerUpdate);
-	
-	return result;
-}
-
-- (NSDate *) inputTime:(NSString *)controlName
-{
-	NSDate *inputTime = nil;
-	
-	NSMutableDictionary *properties = [self.states objectForKey:controlName];
-	inputTime = [properties objectForKey:@"time"];
-	if (inputTime == nil)
-	{
-		return inputTime;
-	}
-	
-	return inputTime;
-}
-
-- (bool) isInputPressed:(NSString *)controlName
-{
-	bool result = false;
-	
-	NSMutableDictionary *controlState = (NSMutableDictionary *)[self.states valueForKey:controlName];
-	NSNumber *pressValue = (NSNumber *)[controlState valueForKey:@"on"];
-	if (pressValue == nil)
-	{
-		return result;
-	}
-	
-	result = [pressValue boolValue];
-	
-	return result;
-}
-
-- (NSPoint) inputLocation:(NSString *)controlName
-{
-	NSPoint outPoint = {0.0f, 0.0f};
-	NSMutableDictionary *properties = [self.states objectForKey:controlName];
-	
-	NSNumber *xValue = [properties objectForKey:@"pointX"];
-	if (xValue != nil)
-	{
-		outPoint.x = [xValue floatValue];
-	}
-	
-	NSNumber *yValue = [properties objectForKey:@"pointY"];
-	if (yValue != nil)
-	{
-		outPoint.y = [yValue floatValue];
-	}
-	
-	return outPoint;
-}
-
-- (unsigned char) inputSoundSample:(NSString *)controlName
-{
-	unsigned char sampleValue = 0;
-	
-	NSMutableDictionary *properties = [self.states objectForKey:controlName];
-	NSNumber *sampleValueObj = [properties objectForKey:@"Sound Sample"];
-	if (sampleValueObj == nil)
-	{
-		return sampleValue;
-	}
-	
-	sampleValue = [sampleValueObj unsignedCharValue];
-	
-	return sampleValue;
-}
-
-- (void) setSoundInputMode:(NSInteger)inputMode
-{
-	self.cdsMic.mode = inputMode;
-}
-
-- (void) update
-{
-	pthread_mutex_lock(self.mutexControllerUpdate);
-	
 	// Setup the DS pad.
-	NDS_setPad([self isInputPressed:@"Right"],
-			   [self isInputPressed:@"Left"],
-			   [self isInputPressed:@"Down"],
-			   [self isInputPressed:@"Up"],
-			   [self isInputPressed:@"Select"],
-			   [self isInputPressed:@"Start"],
-			   [self isInputPressed:@"B"],
-			   [self isInputPressed:@"A"],
-			   [self isInputPressed:@"Y"],
-			   [self isInputPressed:@"X"],
-			   [self isInputPressed:@"L"],
-			   [self isInputPressed:@"R"],
-			   [self isInputPressed:@"Debug"],
-			   [self isInputPressed:@"Lid"]);
+	NDS_setPad(flushedStates[DSControllerState_Right],
+			   flushedStates[DSControllerState_Left],
+			   flushedStates[DSControllerState_Down],
+			   flushedStates[DSControllerState_Up],
+			   flushedStates[DSControllerState_Select],
+			   flushedStates[DSControllerState_Start],
+			   flushedStates[DSControllerState_B],
+			   flushedStates[DSControllerState_A],
+			   flushedStates[DSControllerState_Y],
+			   flushedStates[DSControllerState_X],
+			   flushedStates[DSControllerState_L],
+			   flushedStates[DSControllerState_R],
+			   flushedStates[DSControllerState_Debug],
+			   flushedStates[DSControllerState_Lid]);
 	
 	// Setup the DS touch pad.
-	if ([self isInputPressed:@"Touch"])
+	if (isTouchDown)
 	{
-		NSPoint touchLocation = [self inputLocation:@"Touch"];
-		NDS_setTouchPos((u16)touchLocation.x, (u16)touchLocation.y);
+		NDS_setTouchPos((u16)theLocation.x, (u16)theLocation.y);
 	}
 	else
 	{
@@ -641,37 +134,27 @@
 	}
 	
 	// Setup the DS mic.
-	bool isMicPressed = [self isInputPressed:@"Microphone"];
 	NDS_setMic(isMicPressed);
 	
-	pthread_mutex_unlock(self.mutexControllerUpdate);
-	
 	if (isMicPressed)
 	{
-		if (self.cdsMic.mode == MICMODE_NONE)
+		if (micMode == MICMODE_NONE)
 		{
 			[self.cdsMic fillWithNullSamples];
 		}
-		else if (self.cdsMic.mode == MICMODE_INTERNAL_NOISE)
+		else if (micMode == MICMODE_INTERNAL_NOISE)
 		{
 			[self.cdsMic fillWithInternalNoise];
 		}
-		else if (self.cdsMic.mode == MICMODE_WHITE_NOISE)
+		else if (micMode == MICMODE_WHITE_NOISE)
 		{
 			[self.cdsMic fillWithWhiteNoise];
 		}
-		else if (self.cdsMic.mode == MICMODE_SOUND_FILE)
+		else if (micMode == MICMODE_SOUND_FILE)
 		{
 			// TODO: Need to implement. Does nothing for now.
 		}
 	}
 }
 
-- (void) handleHIDInput:(NSNotification *)aNotification
-{
-	NSArray *inputPropertiesList = (NSArray *)[aNotification object];
-	
-	[self setStateWithMultipleInputs:inputPropertiesList];
-}
-
 @end

Modified: trunk/desmume/src/cocoa/cocoa_mic.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_mic.mm	2013-02-27 08:44:52 UTC (rev 4547)
+++ trunk/desmume/src/cocoa/cocoa_mic.mm	2013-03-01 23:41:03 UTC (rev 4548)
@@ -1,6 +1,6 @@
 /*
 	Copyright (C) 2011 Roger Manuel
-	Copyright (C) 2012 DeSmuME team
+	Copyright (C) 2012-2013 DeSmuME team
 
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
 @synthesize writePosition;
 @synthesize fillCount;
 @synthesize needsActivate;
-@... mode;
+@dynamic mode;
 
 - (id)init
 {
@@ -73,8 +73,13 @@
 	[super dealloc];
 }
 
-- (void) mode:(NSInteger)theMode
+- (NSInteger) mode
 {
+	return mode;
+}
+
+- (void) setMode:(NSInteger)theMode
+{
 	switch (theMode)
 	{
 		case MICMODE_NONE:
@@ -100,6 +105,8 @@
 		default:
 			break;
 	}
+	
+	mode = theMode;
 }
 
 - (void) clear

Modified: trunk/desmume/src/cocoa/translations/English.lproj/DisplayWindow.xib
===================================================================
--- trunk/desmume/src/cocoa/translations/English.lproj/DisplayWindow.xib	2013-02-27 08:44:52 UTC (rev 4547)
+++ trunk/desmume/src/cocoa/translations/English.lproj/DisplayWindow.xib	2013-03-01 23:41:03 UTC (rev 4548)
@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="5"/>
+			<integer value="4"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -634,14 +634,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">executeCoreToggle:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="298859108"/>
-					</object>
-					<int key="connectionID">59</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
 						<string key="label">openRom:</string>
 						<reference key="source" ref="1001"/>
 						<reference key="destination" ref="127287125"/>
@@ -649,14 +641,6 @@
 					<int key="connectionID">60</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">resetCore:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="281439290"/>
-					</object>
-					<int key="connectionID">61</int>
-				</object>
-				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
 						<reference key="source" ref="418996424"/>
@@ -803,6 +787,22 @@
 					</object>
 					<int key="connectionID">106</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">reset:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="281439290"/>
+					</object>
+					<int key="connectionID">107</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleExecutePause:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="298859108"/>
+					</object>
+					<int key="connectionID">108</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1137,7 +1137,7 @@
 					<boolean value="YES"/>
 					<string>{3.40282e+38, 3.40282e+38}</string>
 					<string>{256, 408}</string>
-					<string>{{1056, 575}, {616, 0}}</string>
+					<string>{{1136, 494}, {616, 227}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4553
          http://desmume.svn.sourceforge.net/desmume/?rev=4553&view=rev
Author:   rogerman
Date:     2013-03-12 09:13:29 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
Cocoa Port:
- Users can now take advantage of the new input handling system with a completely redesigned user interface. Check it out in the input preferences!
- New feature: Touch input can be mapped to any input device. In addition, touch coordinates can now be user-defined.
- New feature: Multiple inputs may be assigned to the same command at the same time.
- Enhancement: It is now possible to remove all input mappings from a command.
- Also, many new commands are available for mapping. They are: Execute/Pause, Reset, Mute/Unmute, Load State Slot, Save State Slot, Copy Screen, Set Speed, Enable/Disable Speed Limiter, Enable/Disable Auto Frame Skip, Enable/Disable Cheats, and Enable/Disable GPU State.

Modified Paths:
--------------
    trunk/desmume/src/cocoa/DefaultKeyMappings.plist
    trunk/desmume/src/cocoa/DefaultUserPrefs.plist
    trunk/desmume/src/cocoa/KeyNames.plist
    trunk/desmume/src/cocoa/cocoa_input.h
    trunk/desmume/src/cocoa/cocoa_input.mm
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.strings
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
    trunk/desmume/src/cocoa/userinterface/DisplayWindowController.mm
    trunk/desmume/src/cocoa/userinterface/EmuControllerDelegate.h
    trunk/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm
    trunk/desmume/src/cocoa/userinterface/InputManager.h
    trunk/desmume/src/cocoa/userinterface/InputManager.mm
    trunk/desmume/src/cocoa/userinterface/appDelegate.h
    trunk/desmume/src/cocoa/userinterface/appDelegate.mm
    trunk/desmume/src/cocoa/userinterface/inputPrefsView.h
    trunk/desmume/src/cocoa/userinterface/inputPrefsView.mm
    trunk/desmume/src/cocoa/userinterface/preferencesWindowDelegate.h
    trunk/desmume/src/cocoa/userinterface/preferencesWindowDelegate.mm

Modified: trunk/desmume/src/cocoa/DefaultKeyMappings.plist
===================================================================
--- trunk/desmume/src/cocoa/DefaultKeyMappings.plist	2013-03-11 02:05:28 UTC (rev 4552)
+++ trunk/desmume/src/cocoa/DefaultKeyMappings.plist	2013-03-12 09:13:29 UTC (rev 4553)
@@ -2,314 +2,343 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>Up</key>
+	<key>CommandTagList</key>
 	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>126</string>
-			<key>elementName</key>
-			<string>Up Arrow</string>
-		</dict>
+		<string>Up</string>
+		<string>Down</string>
+		<string>Left</string>
+		<string>Right</string>
+		<string>A</string>
+		<string>B</string>
+		<string>X</string>
+		<string>Y</string>
+		<string>L</string>
+		<string>R</string>
+		<string>Start</string>
+		<string>Select</string>
+		<string>Touch</string>
+		<string>Microphone</string>
+		<string>Lid</string>
+		<string>Debug</string>
+		<string>Execute/Pause</string>
+		<string>Reset</string>
+		<string>Mute/Unmute</string>
+		<string>Load State Slot</string>
+		<string>Save State Slot</string>
+		<string>Copy Screen</string>
+		<string>Set Speed</string>
+		<string>Enable/Disable Speed Limiter</string>
+		<string>Enable/Disable Auto Frame Skip</string>
+		<string>Enable/Disable Cheats</string>
+		<string>Enable/Disable GPU State</string>
 	</array>
-	<key>Down</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>125</string>
-			<key>elementName</key>
-			<string>Down Arrow</string>
-		</dict>
-	</array>
-	<key>Left</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>123</string>
-			<key>elementName</key>
-			<string>Left Arrow</string>
-		</dict>
-	</array>
-	<key>Right</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>124</string>
-			<key>elementName</key>
-			<string>Right Arrow</string>
-		</dict>
-	</array>
-	<key>A</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>7</string>
-			<key>elementName</key>
-			<string>X</string>
-		</dict>
-	</array>
-	<key>B</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>6</string>
-			<key>elementName</key>
-			<string>Z</string>
-		</dict>
-	</array>
-	<key>X</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>1</string>
-			<key>elementName</key>
-			<string>S</string>
-		</dict>
-	</array>
-	<key>Y</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>0</string>
-			<key>elementName</key>
-			<string>A</string>
-		</dict>
-	</array>
-	<key>L</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>12</string>
-			<key>elementName</key>
-			<string>Q</string>
-		</dict>
-	</array>
-	<key>R</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>13</string>
-			<key>elementName</key>
-			<string>W</string>
-		</dict>
-	</array>
-	<key>Start</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>36</string>
-			<key>elementName</key>
-			<string>Return</string>
-		</dict>
-	</array>
-	<key>Select</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>48</string>
-			<key>elementName</key>
-			<string>Tab</string>
-		</dict>
-	</array>
-	<key>Touch</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventMouse</string>
-			<key>deviceName</key>
-			<string>Mouse</string>
-			<key>elementCode</key>
-			<string>0</string>
-			<key>elementName</key>
-			<string>Primary Button</string>
-			<key>useDeviceValues</key>
-			<true/>
-			<key>pointX</key>
-			<integer>0</integer>
-			<key>pointY</key>
-			<real>0</real>
-		</dict>
-	</array>
-	<key>Microphone</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>50</string>
-			<key>elementName</key>
-			<string>`</string>
-		</dict>
-	</array>
-	<key>Debug</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>42</string>
-			<key>elementName</key>
-			<string>\</string>
-		</dict>
-	</array>
-	<key>Lid</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>51</string>
-			<key>elementName</key>
-			<string>Delete (Backspace)</string>
-		</dict>
-	</array>
-	<key>Speed Half</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>27</string>
-			<key>elementName</key>
-			<string>-</string>
-			<key>floatValue</key>
-			<string>0.5</string>
-		</dict>
-	</array>
-	<key>Speed Double</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>24</string>
-			<key>elementName</key>
-			<string>=</string>
-			<key>floatValue</key>
-			<integer>2</integer>
-		</dict>
-	</array>
-	<key>HUD</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>4</string>
-			<key>elementName</key>
-			<string>H</string>
-		</dict>
-	</array>
-	<key>Execute</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>117</string>
-			<key>elementName</key>
-			<string>Forward Delete</string>
-		</dict>
-	</array>
-	<key>Pause</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>119</string>
-			<key>elementName</key>
-			<string>End</string>
-		</dict>
-	</array>
-	<key>Reset</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>121</string>
-			<key>elementName</key>
-			<string>Page Down</string>
-		</dict>
-	</array>
-	<key>Mute</key>
-	<array>
-		<dict>
-			<key>deviceCode</key>
-			<string>NSEventKeyboard</string>
-			<key>deviceName</key>
-			<string>Keyboard</string>
-			<key>elementCode</key>
-			<string>71</string>
-			<key>elementName</key>
-			<string>Numpad Clear</string>
-		</dict>
-	</array>
+	<key>DefaultInputMappings</key>
+	<dict>
+		<key>Up</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>126</string>
+				<key>elementName</key>
+				<string>Up Arrow</string>
+			</dict>
+		</array>
+		<key>Down</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>125</string>
+				<key>elementName</key>
+				<string>Down Arrow</string>
+			</dict>
+		</array>
+		<key>Left</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>123</string>
+				<key>elementName</key>
+				<string>Left Arrow</string>
+			</dict>
+		</array>
+		<key>Right</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>124</string>
+				<key>elementName</key>
+				<string>Right Arrow</string>
+			</dict>
+		</array>
+		<key>A</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>7</string>
+				<key>elementName</key>
+				<string>X</string>
+			</dict>
+		</array>
+		<key>B</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>6</string>
+				<key>elementName</key>
+				<string>Z</string>
+			</dict>
+		</array>
+		<key>X</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>1</string>
+				<key>elementName</key>
+				<string>S</string>
+			</dict>
+		</array>
+		<key>Y</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>0</string>
+				<key>elementName</key>
+				<string>A</string>
+			</dict>
+		</array>
+		<key>L</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>12</string>
+				<key>elementName</key>
+				<string>Q</string>
+			</dict>
+		</array>
+		<key>R</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>13</string>
+				<key>elementName</key>
+				<string>W</string>
+			</dict>
+		</array>
+		<key>Start</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>36</string>
+				<key>elementName</key>
+				<string>Return</string>
+			</dict>
+		</array>
+		<key>Select</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>48</string>
+				<key>elementName</key>
+				<string>Tab</string>
+			</dict>
+		</array>
+		<key>Touch</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventMouse</string>
+				<key>deviceName</key>
+				<string>Mouse</string>
+				<key>elementCode</key>
+				<string>0</string>
+				<key>elementName</key>
+				<string>Primary Button</string>
+				<key>useInputForIntCoord</key>
+				<true/>
+			</dict>
+		</array>
+		<key>Microphone</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>50</string>
+				<key>elementName</key>
+				<string>` (Accent)</string>
+				<key>intValue1</key>
+				<string>1</string>
+			</dict>
+		</array>
+		<key>Lid</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>51</string>
+				<key>elementName</key>
+				<string>Delete (Backspace)</string>
+			</dict>
+		</array>
+		<key>Debug</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>42</string>
+				<key>elementName</key>
+				<string>\</string>
+			</dict>
+		</array>
+		<key>HUD</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>4</string>
+				<key>elementName</key>
+				<string>H</string>
+			</dict>
+		</array>
+		<key>Execute/Pause</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>117</string>
+				<key>elementName</key>
+				<string>Forward Delete</string>
+			</dict>
+		</array>
+		<key>Reset</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>121</string>
+				<key>elementName</key>
+				<string>Page Down</string>
+			</dict>
+		</array>
+		<key>Mute/Unmute</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>71</string>
+				<key>elementName</key>
+				<string>Numpad Clear</string>
+			</dict>
+		</array>
+		<key>Load State Slot</key>
+		<array/>
+		<key>Save State Slot</key>
+		<array/>
+		<key>Copy Screen</key>
+		<array/>
+		<key>Set Speed</key>
+		<array>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>27</string>
+				<key>elementName</key>
+				<string>-</string>
+				<key>floatValue0</key>
+				<string>0.5</string>
+			</dict>
+			<dict>
+				<key>deviceCode</key>
+				<string>NSEventKeyboard</string>
+				<key>deviceName</key>
+				<string>Keyboard</string>
+				<key>elementCode</key>
+				<string>24</string>
+				<key>elementName</key>
+				<string>=</string>
+				<key>floatValue0</key>
+				<integer>2</integer>
+			</dict>
+		</array>
+		<key>Enable/Disable Speed Limiter</key>
+		<array/>
+		<key>Enable/Disable Auto Frame Skip</key>
+		<array/>
+		<key>Enable/Disable Cheats</key>
+		<array/>
+		<key>Enable/Disable GPU State</key>
+		<array/>
+	</dict>
 </dict>
 </plist>

Modified: trunk/desmume/src/cocoa/DefaultUserPrefs.plist
===================================================================
--- trunk/desmume/src/cocoa/DefaultUserPrefs.plist	2013-03-11 02:05:28 UTC (rev 4552)
+++ trunk/desmume/src/cocoa/DefaultUserPrefs.plist	2013-03-12 09:13:29 UTC (rev 4553)
@@ -1,55 +1,55 @@
 bplist00\xDF7

Revision: 4554
          http://desmume.svn.sourceforge.net/desmume/?rev=4554&view=rev
Author:   rogerman
Date:     2013-03-12 21:14:34 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
Cocoa Port:
- Fix a crashing bug that can sometimes occur when removing an input mapping.
- Make command names and input setting strings localizable.
- Do some minor code cleanup.

Modified Paths:
--------------
    trunk/desmume/src/cocoa/cocoa_globals.h
    trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
    trunk/desmume/src/cocoa/userinterface/InputManager.h
    trunk/desmume/src/cocoa/userinterface/InputManager.mm
    trunk/desmume/src/cocoa/userinterface/inputPrefsView.mm

Modified: trunk/desmume/src/cocoa/cocoa_globals.h
===================================================================
--- trunk/desmume/src/cocoa/cocoa_globals.h	2013-03-12 09:13:29 UTC (rev 4553)
+++ trunk/desmume/src/cocoa/cocoa_globals.h	2013-03-12 21:14:34 UTC (rev 4554)
@@ -101,6 +101,17 @@
 #define NSSTRING_DISPLAYMODE_TOUCH					NSLocalizedString(@"Touch", nil)
 #define NSSTRING_DISPLAYMODE_COMBO					NSLocalizedString(@"Combo", nil)
 
+#define NSSTRING_INPUTPREF_NUM_INPUTS_MAPPED		NSLocalizedString(@"%ld Input Mapped", nil)
+#define NSSTRING_INPUTPREF_NUM_INPUTS_MAPPED_PLURAL	NSLocalizedString(@"%ld Inputs Mapped", nil)
+
+#define NSSTRING_INPUTPREF_USE_DEVICE_COORDINATES	NSLocalizedString(@"Use Device Coordinates", nil)
+#define NSSTRING_INPUTPREF_MIC_NONE					NSLocalizedString(@"None", nil)
+#define NSSTRING_INPUTPREF_MIC_INTERNAL_NOISE		NSLocalizedString(@"Internal Noise Samples", nil)
+#define NSSTRING_INPUTPREF_MIC_WHITE_NOISE			NSLocalizedString(@"White Noise", nil)
+#define NSSTRING_INPUTPREF_SPEED_SCALAR				NSLocalizedString(@"%1.2fx Speed", nil)
+#define NSSTRING_INPUTPREF_GPU_STATE_ALL_MAIN		NSLocalizedString(@"Main GPU - All Layers", nil)
+#define NSSTRING_INPUTPREF_GPU_STATE_ALL_SUB		NSLocalizedString(@"Sub GPU - All Layers", nil)
+
 // LEGACY STRINGS
 #define NSSTRING_TITLE_OPEN_ROM_PANEL_LEGACY		NSLocalizedString(@"Open ROM...", nil)
 #define NSSTRING_TITLE_OPEN_STATE_FILE_PANEL_LEGACY	NSLocalizedString(@"Load State From...", nil)
@@ -452,35 +463,3 @@
 	MICMODE_WHITE_NOISE,
 	MICMODE_PHYSICAL
 };
-
-/*
- CONTROL TAGS FOR PREFERENCE WINDOW INPUT CONFIG BUTTONS
- */
-enum
-{
-	PREF_INPUT_BUTTON_UP = 1000,
-	PREF_INPUT_BUTTON_DOWN,
-	PREF_INPUT_BUTTON_LEFT,
-	PREF_INPUT_BUTTON_RIGHT,
-	PREF_INPUT_BUTTON_A,
-	PREF_INPUT_BUTTON_B,
-	PREF_INPUT_BUTTON_X,
-	PREF_INPUT_BUTTON_Y,
-	PREF_INPUT_BUTTON_L,
-	PREF_INPUT_BUTTON_R,
-	PREF_INPUT_BUTTON_START,
-	PREF_INPUT_BUTTON_SELECT,
-	
-	PREF_INPUT_BUTTON_SIM_MIC = 2000,
-	
-	PREF_INPUT_BUTTON_LID = 3000,
-	PREF_INPUT_BUTTON_DEBUG,
-	PREF_INPUT_BUTTON_SPEED_HALF,
-	PREF_INPUT_BUTTON_SPEED_DOUBLE,
-	PREF_INPUT_BUTTON_TOGGLE_HUD,
-	PREF_INPUT_BUTTON_EXECUTE,
-	PREF_INPUT_BUTTON_PAUSE,
-	PREF_INPUT_BUTTON_RESET,
-	
-	PREF_INPUT_BUTTON_TOUCH = 4000
-};
\ No newline at end of file

Modified: trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
===================================================================
--- trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib	2013-03-12 09:13:29 UTC (rev 4553)
+++ trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.xib	2013-03-12 21:14:34 UTC (rev 4554)
@@ -3198,6 +3198,7 @@
 								<string key="NSFrame">{{1, 17}, {638, 437}}</string>
 								<reference key="NSSuperview" ref="908217942"/>
 								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="66039540"/>
 								<reference key="NSDocView" ref="66039540"/>
 								<reference key="NSBGColor" ref="856317944"/>
 								<int key="NScvFlags">4</int>
@@ -3233,6 +3234,7 @@
 								<string key="NSFrame">{{1, 0}, {638, 17}}</string>
 								<reference key="NSSuperview" ref="908217942"/>
 								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="23831683"/>
 								<reference key="NSDocView" ref="23831683"/>
 								<reference key="NSBGColor" ref="856317944"/>
 								<int key="NScvFlags">4</int>
@@ -3242,6 +3244,7 @@
 						<string key="NSFrame">{{0, 42}, {640, 455}}</string>
 						<reference key="NSSuperview" ref="842545935"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="7331472"/>
 						<int key="NSsFlags">562</int>
 						<reference key="NSVScroller" ref="1008919647"/>
 						<reference key="NSHScroller" ref="656486530"/>
@@ -6002,7 +6005,7 @@
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="748902585">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -6021,7 +6024,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{18, 14}, {165, 38}}</string>
 										<reference key="NSSuperview" ref="16233"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<int key="NSNumRows">2</int>
 										<int key="NSNumCols">1</int>
@@ -6212,12 +6214,10 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {494, 62}}</string>
 								<reference key="NSSuperview" ref="1034534989"/>
-								<reference key="NSWindow"/>
 							</object>
 						</object>
 						<string key="NSFrame">{{17, 454}, {496, 78}}</string>
 						<reference key="NSSuperview" ref="748902585"/>
-						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -6251,7 +6251,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{16, 12}, {462, 18}}</string>
 										<reference key="NSSuperview" ref="675831467"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSButtonCell" key="NSCell" id="830122320">
 											<int key="NSCellFlags">-2080244224</int>
@@ -6272,12 +6271,10 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {494, 38}}</string>
 								<reference key="NSSuperview" ref="808054783"/>
-								<reference key="NSWindow"/>
 							</object>
 						</object>
 						<string key="NSFrame">{{17, 16}, {496, 54}}</string>
 						<reference key="NSSuperview" ref="748902585"/>
-						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -6311,7 +6308,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{16, 32}, {145, 18}}</string>
 										<reference key="NSSuperview" ref="808083999"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSButtonCell" key="NSCell" id="340220192">
 											<int key="NSCellFlags">67239424</int>
@@ -6334,7 +6330,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{16, 12}, {118, 18}}</string>
 										<reference key="NSSuperview" ref="808083999"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSButtonCell" key="NSCell" id="16571944">
 											<int key="NSCellFlags">67239424</int>
@@ -6355,12 +6350,10 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {494, 58}}</string>
 								<reference key="NSSuperview" ref="337932383"/>
-								<reference key="NSWindow"/>
 							</object>
 						</object>
 						<string key="NSFrame">{{17, 74}, {496, 74}}</string>
 						<reference key="NSSuperview" ref="748902585"/>
-						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -6394,7 +6387,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{16, 61}, {205, 18}}</string>
 										<reference key="NSSuperview" ref="400774933"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSButtonCell" key="NSCell" id="337267081">
 											<int key="NSCellFlags">604110336</int>
@@ -6417,7 +6409,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{140, 33}, {240, 22}}</string>
 										<reference key="NSSuperview" ref="400774933"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSTextFieldCell" key="NSCell" id="764651405">
 											<int key="NSCellFlags">-2070806976</int>
@@ -6436,7 +6427,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{15, 37}, {120, 17}}</string>
 										<reference key="NSSuperview" ref="400774933"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSTextFieldCell" key="NSCell" id="1028152583">
 											<int key="NSCellFlags">68288064</int>
@@ -6453,7 +6443,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{382, 27}, {100, 32}}</string>
 										<reference key="NSSuperview" ref="400774933"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSButtonCell" key="NSCell" id="820292401">
 											<int key="NSCellFlags">67239424</int>
@@ -6474,7 +6463,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{16, 12}, {149, 18}}</string>
 										<reference key="NSSuperview" ref="400774933"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSButtonCell" key="NSCell" id="975896369">
 											<int key="NSCellFlags">604110336</int>
@@ -6497,7 +6485,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{12, 81}, {229, 32}}</string>
 										<reference key="NSSuperview" ref="400774933"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSButtonCell" key="NSCell" id="1052182945">
 											<int key="NSCellFlags">67239424</int>
@@ -6516,12 +6503,10 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {494, 119}}</string>
 								<reference key="NSSuperview" ref="269747406"/>
-								<reference key="NSWindow"/>
 							</object>
 						</object>
 						<string key="NSFrame">{{17, 152}, {496, 135}}</string>
 						<reference key="NSSuperview" ref="748902585"/>
-						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -6555,7 +6540,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{16, 117}, {182, 18}}</string>
 										<reference key="NSSuperview" ref="583474551"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSButtonCell" key="NSCell" id="469931880">
 											<int key="NSCellFlags">67239424</int>
@@ -6578,7 +6562,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{140, 86}, {240, 22}}</string>
 										<reference key="NSSuperview" ref="583474551"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSTextFieldCell" key="NSCell" id="173370867">
 											<int key="NSCellFlags">-2070806976</int>
@@ -6597,7 +6580,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{15, 89}, {120, 17}}</string>
 										<reference key="NSSuperview" ref="583474551"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSTextFieldCell" key="NSCell" id="553485788">
 											<int key="NSCellFlags">68288064</int>
@@ -6614,7 +6596,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{382, 80}, {100, 32}}</string>
 										<reference key="NSSuperview" ref="583474551"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSButtonCell" key="NSCell" id="1066457191">
 											<int key="NSCellFlags">67239424</int>
@@ -6635,7 +6616,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{140, 59}, {240, 22}}</string>
 										<reference key="NSSuperview" ref="583474551"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSTextFieldCell" key="NSCell" id="910485558">
 											<int key="NSCellFlags">-2070806976</int>
@@ -6654,7 +6634,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{15, 62}, {120, 17}}</string>
 										<reference key="NSSuperview" ref="583474551"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSTextFieldCell" key="NSCell" id="1063888642">
 											<int key="NSCellFlags">68288064</int>
@@ -6671,7 +6650,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{382, 53}, {100, 32}}</string>
 										<reference key="NSSuperview" ref="583474551"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSButtonCell" key="NSCell" id="582159211">
 											<int key="NSCellFlags">67239424</int>
@@ -6692,7 +6670,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{16, 32}, {230, 18}}</string>
 										<reference key="NSSuperview" ref="583474551"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSButtonCell" key="NSCell" id="850204688">
 											<int key="NSCellFlags">-1543373312</int>
@@ -6715,7 +6692,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{16, 12}, {236, 18}}</string>
 										<reference key="NSSuperview" ref="583474551"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSButtonCell" key="NSCell" id="573619370">
 											<int key="NSCellFlags">604110336</int>
@@ -6736,12 +6712,10 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {494, 143}}</string>
 								<reference key="NSSuperview" ref="1013462952"/>
-								<reference key="NSWindow"/>
 							</object>
 						</object>
 						<string key="NSFrame">{{17, 291}, {496, 159}}</string>
 						<reference key="NSSuperview" ref="748902585"/>
-						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -6775,7 +6749,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{16, 32}, {197, 18}}</string>
 										<reference key="NSSuperview" ref="330186328"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSButtonCell" key="NSCell" id="152711854">
 											<int key="NSCellFlags">-2080244224</int>
@@ -6798,7 +6771,6 @@
 										<int key="NSvFlags">268</int>
 										<string key="NSFrame">{{16, 12}, {217, 18}}</string>
 										<reference key="NSSuperview" ref="330186328"/>
-										<reference key="NSWindow"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="NSButtonCell" key="NSCell" id="683227590">
 											<int key="NSCellFlags">67239424</int>
@@ -6819,12 +6791,10 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {494, 58}}</string>
 								<reference key="NSSuperview" ref="699930286"/>
-								<reference key="NSWindow"/>
 							</object>
 						</object>
 						<string key="NSFrame">{{17, 536}, {496, 74}}</string>
 						<reference key="NSSuperview" ref="748902585"/>
-						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -6845,8 +6815,6 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{530, 630}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomObject" id="660705428">
@@ -6860,8 +6828,9 @@
 				<string key="NSWindowTitle">InputSettingsMicrophone</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
+				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="705283056">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -6880,7 +6849,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{18, 69}, {528, 18}}</string>
 											<reference key="NSSuperview" ref="207062740"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSLevelIndicatorCell" key="NSCell" id="956037968">
 												<int key="NSCellFlags">537001472</int>
@@ -6897,7 +6865,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{16, 39}, {532, 25}}</string>
 											<reference key="NSSuperview" ref="207062740"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSSliderCell" key="NSCell" id="808608894">
 												<int key="NSCellFlags">-1543373312</int>
@@ -6919,7 +6886,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{247, 14}, {70, 17}}</string>
 											<reference key="NSSuperview" ref="207062740"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="849362003">
 												<int key="NSCellFlags">605158976</int>
@@ -6936,7 +6902,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 109}, {54, 17}}</string>
 											<reference key="NSSuperview" ref="207062740"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="435481696">
 												<int key="NSCellFlags">605158976</int>
@@ -6953,7 +6918,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{71, 103}, {478, 26}}</string>
 											<reference key="NSSuperview" ref="207062740"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSPopUpButtonCell" key="NSCell" id="255570878">
 												<int key="NSCellFlags">-1539178944</int>
@@ -6996,12 +6960,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {564, 137}}</string>
 									<reference key="NSSuperview" ref="542347562"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{17, 56}, {566, 153}}</string>
 							<reference key="NSSuperview" ref="705283056"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -7035,7 +6997,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{18, 14}, {290, 78}}</string>
 											<reference key="NSSuperview" ref="620417532"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<int key="NSNumRows">4</int>
 											<int key="NSNumCols">1</int>
@@ -7256,7 +7217,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{130, 12}, {324, 21}}</string>
 											<reference key="NSSuperview" ref="620417532"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="565031755">
 												<int key="NSCellFlags">612499008</int>
@@ -7275,7 +7235,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{456, 5}, {96, 32}}</string>
 											<reference key="NSSuperview" ref="620417532"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="189809655">
 												<int key="NSCellFlags">604110336</int>
@@ -7294,12 +7253,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {564, 102}}</string>
 									<reference key="NSSuperview" ref="531436272"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{17, 213}, {566, 118}}</string>
 							<reference key="NSSuperview" ref="705283056"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -7323,7 +7280,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{490, 12}, {96, 32}}</string>
 							<reference key="NSSuperview" ref="705283056"/>
-							<reference key="NSWindow"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="23472213">
@@ -7345,7 +7301,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{394, 12}, {96, 32}}</string>
 							<reference key="NSSuperview" ref="705283056"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="565213794">
 								<int key="NSCellFlags">67239424</int>
@@ -7366,7 +7321,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 339}, {566, 17}}</string>
 							<reference key="NSSuperview" ref="705283056"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="702563390">
 								<int key="NSCellFlags">70385217</int>
@@ -7381,8 +7335,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{600, 376}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -7395,8 +7347,9 @@
 				<string key="NSWindowTitle">InputSettingsTouch</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
+				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="610546577">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -7415,7 +7368,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{97, 44}, {17, 17}}</string>
 											<reference key="NSSuperview" ref="455796709"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="489311433">
 												<int key="NSCellFlags">68288064</int>
@@ -7432,7 +7384,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{119, 42}, {96, 22}}</string>
 											<reference key="NSSuperview" ref="455796709"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="975814414">
 												<int key="NSCellFlags">-1804468671</int>
@@ -7512,7 +7463,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{97, 16}, {17, 17}}</string>
 											<reference key="NSSuperview" ref="455796709"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="734523060">
 												<int key="NSCellFlags">68288064</int>
@@ -7529,7 +7479,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{119, 14}, {96, 22}}</string>
 											<reference key="NSSuperview" ref="455796709"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="156657804">
 												<int key="NSCellFlags">-1804468671</int>
@@ -7607,12 +7556,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {314, 74}}</string>
 									<reference key="NSSuperview" ref="970127964"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{17, 56}, {316, 90}}</string>
 							<reference key="NSSuperview" ref="610546577"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -7636,7 +7583,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{240, 12}, {96, 32}}</string>
 							<reference key="NSSuperview" ref="610546577"/>
-							<reference key="NSWindow"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="385928825">
@@ -7658,7 +7604,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{18, 202}, {314, 18}}</string>
 							<reference key="NSSuperview" ref="610546577"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="16218308">
 								<int key="NSCellFlags">67239424</int>
@@ -7681,7 +7626,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 154}, {316, 42}}</string>
 							<reference key="NSSuperview" ref="610546577"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="856864245">
 								<int key="NSCellFlags">67239424</int>
@@ -7698,7 +7642,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{144, 12}, {96, 32}}</string>
 							<reference key="NSSuperview" ref="610546577"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="595300775">
 								<int key="NSCellFlags">67239424</int>
@@ -7719,7 +7662,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 226}, {316, 17}}</string>
 							<reference key="NSSuperview" ref="610546577"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="1069209172">
 								<int key="NSCellFlags">70385217</int>
@@ -7734,8 +7676,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{350, 263}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -7748,8 +7688,9 @@
 				<string key="NSWindowTitle">InputSettingsLoadStateSlot</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
+				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="1046430475">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -7758,7 +7699,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{121, 56}, {212, 26}}</string>
 							<reference key="NSSuperview" ref="1046430475"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="577975014">
 								<int key="NSCellFlags">-2076049856</int>
@@ -7901,7 +7841,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 62}, {102, 17}}</string>
 							<reference key="NSSuperview" ref="1046430475"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="336949376">
 								<int key="NSCellFlags">68288064</int>
@@ -7918,7 +7857,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{240, 12}, {96, 32}}</string>
 							<reference key="NSSuperview" ref="1046430475"/>
-							<reference key="NSWindow"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="197001455">
@@ -7940,7 +7878,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{144, 12}, {96, 32}}</string>
 							<reference key="NSSuperview" ref="1046430475"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="927144884">
 								<int key="NSCellFlags">67239424</int>
@@ -7961,7 +7898,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 88}, {316, 17}}</string>
 							<reference key="NSSuperview" ref="1046430475"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="488931819">
 								<int key="NSCellFlags">70385217</int>
@@ -7976,8 +7912,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{350, 125}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -7990,6 +7924,7 @@
 				<string key="NSWindowTitle">InputSettingsSaveStateSlot</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
+				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="597169410">
 					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
@@ -8225,6 +8160,7 @@
 				<string key="NSWindowTitle">InputSettingsSpeedLimit</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
+				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="355191055">
 					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
@@ -8537,8 +8473,9 @@
 				<string key="NSWindowTitle">InputSettingsGPUState</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
+				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="54800959">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -8557,7 +8494,6 @@
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{18, 14}, {444, 142}}</string>
 											<reference key="NSSuperview" ref="276953246"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<int key="NSNumRows">6</int>
 											<int key="NSNumCols">2</int>
@@ -8878,12 +8814,10 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {480, 166}}</string>
 									<reference key="NSSuperview" ref="373476480"/>
-									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{17, 56}, {482, 182}}</string>
 							<reference key="NSSuperview" ref="54800959"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -8907,7 +8841,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{406, 12}, {96, 32}}</string>
 							<reference key="NSSuperview" ref="54800959"/>
-							<reference key="NSWindow"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="106879082">
@@ -8929,7 +8862,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{310, 12}, {96, 32}}</string>
 							<reference key="NSSuperview" ref="54800959"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="813841397">
 								<int key="NSCellFlags">67239424</int>
@@ -8950,7 +8882,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 246}, {482, 17}}</string>
 							<reference key="NSSuperview" ref="54800959"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="1054405573">
 								<int key="NSCellFlags">70385217</int>
@@ -8965,8 +8896,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{516, 283}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -8981,7 +8910,7 @@
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="738688999">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -8990,7 +8919,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{119, 300}, {166, 22}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="850036257">
 								<int key="NSCellFlags">-1804468671</int>
@@ -9009,7 +8937,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{119, 246}, {166, 44}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="194394292">
 								<int key="NSCellFlags">-1805517311</int>
@@ -9028,7 +8955,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 302}, {71, 17}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="229258194">
 								<int key="NSCellFlags">68288064</int>
@@ -9045,7 +8971,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 270}, {63, 17}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="626803626">
 								<int key="NSCellFlags">68288064</int>
@@ -9062,7 +8987,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 220}, {97, 17}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="293778518">
 								<int key="NSCellFlags">68288064</int>
@@ -9079,7 +9003,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 178}, {60, 17}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="46788551">
 								<int key="NSCellFlags">68288064</int>
@@ -9096,7 +9019,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 150}, {69, 17}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="352113877">
 								<int key="NSCellFlags">68288064</int>
@@ -9113,7 +9035,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{119, 176}, {169, 27}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSDatePickerCell" key="NSCell" id="1068024499">
 								<int key="NSCellFlags">71433728</int>
@@ -9134,7 +9055,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{116, 144}, {172, 26}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="846364979">
 								<int key="NSCellFlags">-2076049856</int>
@@ -9234,7 +9154,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{116, 214}, {172, 26}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="852518189">
 								<int key="NSCellFlags">-2076049856</int>
@@ -9507,7 +9426,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 55}, {271, 85}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="764736196">
 								<int key="NSCellFlags">67239424</int>
@@ -9524,7 +9442,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{104, 12}, {96, 32}}</string>
 							<reference key="NSSuperview" ref="738688999"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="702699067">
 								<int key="NSCellFlags">67239424</int>
@@ -9542,8 +9459,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{305, 339}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -9559,7 +9474,7 @@
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<string key="NSWindowContentMinSize">{700, 250}</string>
 				<object class="NSView" key="NSWindowView" id="744235317">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -9568,7 +9483,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 310}, {666, 34}}</string>
 							<reference key="NSSuperview" ref="744235317"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="779344339">
 								<int key="NSCellFlags">67239424</int>
@@ -9585,7 +9499,6 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{362, 12}, {162, 32}}</string>
 							<reference key="NSSuperview" ref="744235317"/>
-							<reference key="NSWindow"/>
 							<int key="NSTag">2</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="258533086">
@@ -9607,7 +9520,6 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{200, 12}, {162, 32}}</string>
 							<reference key="NSSuperview" ref="744235317"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="597655813">
 								<int key="NSCellFlags">67239424</int>
@@ -9628,7 +9540,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 274}, {666, 28}}</string>
 							<reference key="NSSuperview" ref="744235317"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="229271955">
 								<int key="NSCellFlags">67239424</int>
@@ -9649,7 +9560,6 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{18, 21}, {182, 18}}</string>
 							<reference key="NSSuperview" ref="744235317"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="845859732">
 								<int key="NSCellFlags">67239424</int>
@@ -9672,7 +9582,6 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{524, 12}, {162, 32}}</string>
 							<reference key="NSSuperview" ref="744235317"/>
-							<reference key="NSWindow"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="861554098">
@@ -9704,14 +9613,12 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrameSize">{700, 195}</string>
 											<reference key="NSSuperview" ref="105498168"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="410961279">
 												<reference key="NSNextResponder" ref="163187225"/>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrameSize">{700, 17}</string>
 												<reference key="NSSuperview" ref="163187225"/>
-												<reference key="NSWindow"/>
 												<reference key="NSTableView" ref="253463434"/>
 											</object>
 											<object class="_NSCornerView" key="NSCornerView" id="2083">
@@ -9719,7 +9626,6 @@
 												<int key="NSvFlags">-2147483392</int>
 												<string key="NSFrame">{{544, 0}, {16, 17}}</string>
 												<reference key="NSSuperview" ref="728474876"/>
-												<reference key="NSWindow"/>
 											</object>
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
@@ -9875,7 +9781,6 @@
 									</object>
 									<string key="NSFrame">{{1, 17}, {700, 195}}</string>
 									<reference key="NSSuperview" ref="728474876"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="253463434"/>
 									<reference key="NSDocView" ref="253463434"/>
 									<reference key="NSBGColor" ref="856317944"/>
@@ -9886,7 +9791,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{544, 17}, {15, 180}}</string>
 									<reference key="NSSuperview" ref="728474876"/>
-									<reference key="NSWindow"/>
 									<reference key="NSTarget" ref="728474876"/>
 									<string key="NSAction">_doScroller:</string>
 									<double key="NSPercent">0.92307692307692313</double>
@@ -9896,7 +9800,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{1, 197}, {598, 15}}</string>
 									<reference key="NSSuperview" ref="728474876"/>
-									<reference key="NSWindow"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="728474876"/>
 									<string key="NSAction">_doScroller:</string>
@@ -9911,7 +9814,6 @@
 									</object>
 									<string key="NSFrame">{{1, 0}, {700, 17}}</string>
 									<reference key="NSSuperview" ref="728474876"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="410961279"/>
 									<reference key="NSDocView" ref="410961279"/>
 									<reference key="NSBGColor" ref="856317944"/>
@@ -9921,7 +9823,6 @@
 							</object>
 							<string key="NSFrame">{{-1, 53}, {702, 213}}</string>
 							<reference key="NSSuperview" ref="744235317"/>
-							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="105498168"/>
 							<int key="NSsFlags">562</int>
 							<reference key="NSVScroller" ref="153897110"/>
@@ -9933,8 +9834,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{700, 364}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{700, 272}</string>
@@ -9950,7 +9849,7 @@
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="969118530">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -9959,7 +9858,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 112}, {346, 68}}</string>
 							<reference key="NSSuperview" ref="969118530"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="347248029">
 								<int key="NSCellFlags">67239424</int>
@@ -9976,7 +9874,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{270, 12}, {96, 32}}</string>
 							<reference key="NSSuperview" ref="969118530"/>
-							<reference key="NSWindow"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="104907490">
@@ -9998,7 +9895,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{144, 12}, {126, 32}}</string>
 							<reference key="NSSuperview" ref="969118530"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="139852298">
 								<int key="NSCellFlags">67239424</int>
@@ -10019,7 +9915,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 48}, {346, 56}}</string>
 							<reference key="NSSuperview" ref="969118530"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="289371983">
 								<int key="NSCellFlags">67239424</int>
@@ -10033,8 +9928,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{380, 200}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -13741,7 +13634,7 @@
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="1004755540">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -13750,7 +13643,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{18, 174}, {158, 18}}</string>
 							<reference key="NSSuperview" ref="1004755540"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="954076959">
 								<int key="NSCellFlags">-2080244224</int>
@@ -13773,7 +13665,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{18, 154}, {158, 18}}</string>
 							<reference key="NSSuperview" ref="1004755540"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="160348149">
 								<int key="NSCellFlags">-2080244224</int>
@@ -13796,7 +13687,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{18, 134}, {158, 18}}</string>
 							<reference key="NSSuperview" ref="1004755540"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="769061633">
 								<int key="NSCellFlags">-2080244224</int>
@@ -13819,7 +13709,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{18, 114}, {158, 18}}</string>
 							<reference key="NSSuperview" ref="1004755540"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="408515625">
 								<int key="NSCellFlags">-2080244224</int>
@@ -13842,7 +13731,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{18, 94}, {158, 18}}</string>
 							<reference key="NSSuperview" ref="1004755540"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="541291923">
 								<int key="NSCellFlags">-2080244224</int>
@@ -13865,7 +13753,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{18, 74}, {158, 18}}</string>
 							<reference key="NSSuperview" ref="1004755540"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="659108982">
 								<int key="NSCellFlags">-2080244224</int>
@@ -13888,7 +13775,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{18, 54}, {158, 18}}</string>
 							<reference key="NSSuperview" ref="1004755540"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="975096499">
 								<int key="NSCellFlags">-2080244224</int>
@@ -13911,7 +13797,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{20, 18}, {154, 19}}</string>
 							<reference key="NSSuperview" ref="1004755540"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="480403001">
 								<int key="NSCellFlags">-2080244224</int>
@@ -13932,7 +13817,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{18, 205}, {158, 18}}</string>
 							<reference key="NSSuperview" ref="1004755540"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="654468506">
 								<int key="NSCellFlags">-2080244224</int>
@@ -13955,7 +13839,6 @@
 							<int key="NSvFlags">12</int>
 							<string key="NSFrame">{{21, 196}, {153, 5}}</string>
 							<reference key="NSSuperview" ref="1004755540"/>
-							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -13975,8 +13858,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{194, 241}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -17704,7 +17585,7 @@
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="186498688">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -17713,7 +17594,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{30, 43}, {411, 26}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSSliderCell" key="NSCell" id="173171109">
 								<int key="NSCellFlags">-2079981824</int>
@@ -17735,7 +17615,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{20, 70}, {38, 17}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="693364134">
 								<int key="NSCellFlags">68288064</int>
@@ -17752,7 +17631,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{412, 70}, {38, 17}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="588852667">
 								<int key="NSCellFlags">68288064</int>
@@ -17769,7 +17647,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{98, 70}, {38, 17}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="159905866">
 								<int key="NSCellFlags">68288064</int>
@@ -17786,7 +17663,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{177, 70}, {38, 17}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="298527919">
 								<int key="NSCellFlags">68288064</int>
@@ -17803,7 +17679,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{255, 70}, {38, 17}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="615451230">
 								<int key="NSCellFlags">68288064</int>
@@ -17820,7 +17695,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{335, 70}, {38, 17}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="678116475">
 								<int key="NSCellFlags">68288064</int>
@@ -17837,7 +17711,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{32, 18}, {133, 19}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<int key="NSTag">100</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="181573003">
@@ -17859,7 +17732,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{260, 21}, {123, 17}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="305690556">
 								<int key="NSCellFlags">68288064</int>
@@ -17876,7 +17748,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{385, 21}, {57, 17}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="62614240">
 								<int key="NSCellFlags">68288064</int>
@@ -17957,7 +17828,6 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{158, 93}, {154, 18}}</string>
 							<reference key="NSSuperview" ref="186498688"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="835222530">
 								<int key="NSCellFlags">-2080244224</int>
@@ -17977,8 +17847,6 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{467, 128}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -18328,18 +18196,16 @@
 				<string key="NSWindowContentMaxSize">{580, 592}</string>
 				<string key="NSWindowContentMinSize">{580, 592}</string>
 				<object class="NSView" key="NSWindowView" id="5992307">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<string key="NSFrameSize">{580, 592}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{580, 614}</string>
 				<string key="NSMaxSize">{580, 614}</string>
 			</object>
 			<object class="NSCustomView" id="688926332">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -18381,7 +18247,6 @@
 										</object>
 										<string key="NSFrame">{{0, 69}, {523, 133}}</string>
 										<reference key="NSSuperview" ref="909629174"/>
-										<reference key="NSWindow"/>
 										<object class="NSTextContainer" key="NSTextContainer" id="558063868">
 											<object class="NSLayoutManager" key="NSLayoutManager">
 												<object class="NSTextStorage" key="NSTextStorage">
@@ -18445,7 +18310,6 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {523, 202}}</string>
 								<reference key="NSSuperview" ref="865252730"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="343414037"/>
 								<reference key="NSDocView" ref="343414037"/>
 								<reference key="NSBGColor" ref="991462592"/>
@@ -18457,7 +18321,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{524, 1}, {15, 202}}</string>
 								<reference key="NSSuperview" ref="865252730"/>
-								<reference key="NSWindow"/>
 								<reference key="NSTarget" ref="865252730"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSPercent">0.99248120300751874</double>
@@ -18467,7 +18330,6 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 								<reference key="NSSuperview" ref="865252730"/>
-								<reference key="NSWindow"/>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="865252730"/>
 								<string key="NSAction">_doScroller:</string>
@@ -18477,7 +18339,6 @@
 						</object>
 						<string key="NSFrame">{{20, 61}, {540, 204}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="909629174"/>
 						<int key="NSsFlags">18</int>
 						<reference key="NSVScroller" ref="69605143"/>
@@ -18489,7 +18350,6 @@
 						<int key="NSvFlags">265</int>
 						<string key="NSFrame">{{397, 342}, {166, 28}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="1047843512">
 							<int key="NSCellFlags">69336577</int>
@@ -18518,7 +18378,6 @@
 						</object>
 						<string key="NSFrame">{{365, 340}, {30, 30}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSImageCell" key="NSCell" id="771097799">
 							<int key="NSCellFlags">130560</int>
@@ -18536,7 +18395,6 @@
 						<int key="NSvFlags">288</int>
 						<string key="NSFrame">{{125, 16}, {438, 28}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="266901347">
 							<int key="NSCellFlags">67239424</int>
@@ -18553,7 +18411,6 @@
 						<int key="NSvFlags">34</int>
 						<string key="NSFrame">{{12, 50}, {556, 5}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -18576,7 +18433,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 273}, {546, 28}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="1043590873">
 							<int key="NSCellFlags">67239424</int>
@@ -18593,7 +18449,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 309}, {546, 17}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="828350814">
 							<int key="NSCellFlags">68288064</int>
@@ -18610,7 +18465,6 @@
 						<int key="NSvFlags">10</int>
 						<string key="NSFrame">{{12, 332}, {556, 5}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -18633,7 +18487,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 489}, {546, 42}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="973004211">
 							<int key="NSCellFlags">67239424</int>
@@ -18650,7 +18503,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 539}, {546, 17}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="36139863">
 							<int key="NSCellFlags">68288064</int>
@@ -18667,7 +18519,6 @@
 						<int key="NSvFlags">10</int>
 						<string key="NSFrame">{{12, 478}, {556, 5}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -18690,7 +18541,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 455}, {546, 17}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="71825134">
 							<int key="NSCellFlags">68288064</int>
@@ -18707,7 +18557,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 405}, {546, 42}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="764006935">
 							<int key="NSCellFlags">67239424</int>
@@ -18724,7 +18573,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 347}, {77, 17}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="996430230">
 							<int key="NSCellFlags">68288064</int>
@@ -18741,7 +18589,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 377}, {78, 17}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="917904438">
 							<int key="NSCellFlags">68288064</int>
@@ -18758,7 +18605,6 @@
 						<int key="NSvFlags">266</int>
 						<string key="NSFrame">{{100, 345}, {256, 22}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="464497415">
 							<int key="NSCellFlags">-1804468671</int>
@@ -18776,7 +18622,6 @@
 						<int key="NSvFlags">266</int>
 						<string key="NSFrame">{{100, 375}, {256, 22}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="200930878">
 							<int key="NSCellFlags">-1804468671</int>
@@ -18794,7 +18639,6 @@
 						<int key="NSvFlags">265</int>
 						<string key="NSFrame">{{358, 370}, {209, 32}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="587710438">
 							<int key="NSCellFlags">67239424</int>
@@ -18815,7 +18659,6 @@
 						<int key="NSvFlags">288</int>
 						<string key="NSFrame">{{14, 12}, {112, 32}}</string>
 						<reference key="NSSuperview" ref="688926332"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="1005178133">
 							<int key="NSCellFlags">67239424</int>
@@ -18833,12 +18676,10 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{580, 567}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="528865158">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -18880,7 +18721,6 @@
 										</object>
 										<string key="NSFrame">{{0, 18}, {524, 62}}</string>
 										<reference key="NSSuperview" ref="158641684"/>
-										<reference key="NSWindow"/>
 										<object class="NSTextContainer" key="NSTextContainer" id="259965128">
 											<object class="NSLayoutManager" key="NSLayoutManager">
 												<object class="NSTextStorage" key="NSTextStorage">
@@ -18944,7 +18784,6 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {524, 80}}</string>
 								<reference key="NSSuperview" ref="894001553"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="70543453"/>
 								<reference key="NSDocView" ref="70543453"/>
 								<reference key="NSBGColor" ref="991462592"/>
@@ -18956,7 +18795,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{525, 1}, {15, 80}}</string>
 								<reference key="NSSuperview" ref="894001553"/>
-								<reference key="NSWindow"/>
 								<reference key="NSTarget" ref="894001553"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSPercent">0.99248120300751874</double>
@@ -18966,7 +18804,6 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 								<reference key="NSSuperview" ref="894001553"/>
-								<reference key="NSWindow"/>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="894001553"/>
 								<string key="NSAction">_doScroller:</string>
@@ -18976,7 +18813,6 @@
 						</object>
 						<string key="NSFrame">{{20, 61}, {541, 82}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="158641684"/>
 						<int key="NSsFlags">18</int>
 						<reference key="NSVScroller" ref="1016206682"/>
@@ -19021,7 +18857,6 @@
 										</object>
 										<string key="NSFrame">{{0, 6}, {523, 65}}</string>
 										<reference key="NSSuperview" ref="631391189"/>
-										<reference key="NSWindow"/>
 										<object class="NSTextContainer" key="NSTextContainer" id="680249763">
 											<object class="NSLayoutManager" key="NSLayoutManager">
 												<object class="NSTextStorage" key="NSTextStorage">
@@ -19085,7 +18920,6 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {523, 80}}</string>
 								<reference key="NSSuperview" ref="1056928026"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="892813377"/>
 								<reference key="NSDocView" ref="892813377"/>
 								<reference key="NSBGColor" ref="991462592"/>
@@ -19097,7 +18931,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{524, 1}, {15, 80}}</string>
 								<reference key="NSSuperview" ref="1056928026"/>
-								<reference key="NSWindow"/>
 								<reference key="NSTarget" ref="1056928026"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSPercent">0.99248120300751874</double>
@@ -19107,7 +18940,6 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 								<reference key="NSSuperview" ref="1056928026"/>
-								<reference key="NSWindow"/>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="1056928026"/>
 								<string key="NSAction">_doScroller:</string>
@@ -19117,7 +18949,6 @@
 						</object>
 						<string key="NSFrame">{{20, 167}, {540, 82}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="631391189"/>
 						<int key="NSsFlags">18</int>
 						<reference key="NSVScroller" ref="115711234"/>
@@ -19129,7 +18960,6 @@
 						<int key="NSvFlags">265</int>
 						<string key="NSFrame">{{397, 342}, {166, 28}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="87023810">
 							<int key="NSCellFlags">69336577</int>
@@ -19158,7 +18988,6 @@
 						</object>
 						<string key="NSFrame">{{365, 340}, {30, 30}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSImageCell" key="NSCell" id="853203050">
 							<int key="NSCellFlags">130560</int>
@@ -19176,7 +19005,6 @@
 						<int key="NSvFlags">288</int>
 						<string key="NSFrame">{{125, 16}, {438, 28}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="835354879">
 							<int key="NSCellFlags">67239424</int>
@@ -19193,7 +19021,6 @@
 						<int key="NSvFlags">34</int>
 						<string key="NSFrame">{{12, 50}, {556, 5}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -19216,7 +19043,6 @@
 						<int key="NSvFlags">256</int>
 						<string key="NSFrame">{{17, 145}, {206, 14}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="696270217">
 							<int key="NSCellFlags">68288064</int>
@@ -19233,7 +19059,6 @@
 						<int key="NSvFlags">256</int>
 						<string key="NSFrame">{{17, 251}, {206, 14}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="652273172">
 							<int key="NSCellFlags">68288064</int>
@@ -19250,7 +19075,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 273}, {546, 28}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="247645440">
 							<int key="NSCellFlags">67239424</int>
@@ -19267,7 +19091,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 309}, {546, 17}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="764833909">
 							<int key="NSCellFlags">68288064</int>
@@ -19284,7 +19107,6 @@
 						<int key="NSvFlags">10</int>
 						<string key="NSFrame">{{12, 332}, {556, 5}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -19307,7 +19129,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 489}, {546, 42}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="814010567">
 							<int key="NSCellFlags">67239424</int>
@@ -19324,7 +19145,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 539}, {546, 17}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="349066047">
 							<int key="NSCellFlags">68288064</int>
@@ -19341,7 +19161,6 @@
 						<int key="NSvFlags">10</int>
 						<string key="NSFrame">{{12, 478}, {556, 5}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<string key="NSOffsets">{0, 0}</string>
 						<object class="NSTextFieldCell" key="NSTitleCell">
 							<int key="NSCellFlags">67239424</int>
@@ -19364,7 +19183,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 455}, {546, 17}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="861186381">
 							<int key="NSCellFlags">68288064</int>
@@ -19381,7 +19199,6 @@
 						<int key="NSvFlags">269</int>
 						<string key="NSFrame">{{17, 405}, {546, 42}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="808019260">
 							<int key="NSCellFlags">67239424</int>
@@ -19398,7 +19215,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 347}, {77, 17}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="536962846">
 							<int key="NSCellFlags">68288064</int>
@@ -19415,7 +19231,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 377}, {78, 17}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="281005532">
 							<int key="NSCellFlags">68288064</int>
@@ -19432,7 +19247,6 @@
 						<int key="NSvFlags">266</int>
 						<string key="NSFrame">{{100, 345}, {255, 22}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="428210772">
 							<int key="NSCellFlags">-1804468671</int>
@@ -19450,7 +19264,6 @@
 						<int key="NSvFlags">266</int>
 						<string key="NSFrame">{{100, 375}, {255, 22}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="841784751">
 							<int key="NSCellFlags">-1804468671</int>
@@ -19468,7 +19281,6 @@
 						<int key="NSvFlags">265</int>
 						<string key="NSFrame">{{358, 370}, {209, 32}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="966834598">
 							<int key="NSCellFlags">67239424</int>
@@ -19489,7 +19301,6 @@
 						<int key="NSvFlags">288</int>
 						<string key="NSFrame">{{14, 12}, {112, 32}}</string>
 						<reference key="NSSuperview" ref="528865158"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="444752351">
 							<int key="NSCellFlags">67239424</int>
@@ -19507,12 +19318,10 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{580, 567}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="209000274">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -19521,7 +19330,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{342, 55}, {224, 32}}</string>
 						<reference key="NSSuperview" ref="209000274"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="751339628">
 							<int key="NSCellFlags">67239424</int>
@@ -19542,7 +19350,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 52}, {326, 42}}</string>
 						<reference key="NSSuperview" ref="209000274"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="851027747">
 							<int key="NSCellFlags">67239424</int>
@@ -19559,7 +19366,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{342, 12}, {224, 32}}</string>
 						<reference key="NSSuperview" ref="209000274"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="775891456">
 							<int key="NSCellFlags">67239424</int>
@@ -19580,7 +19386,6 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{14, 12}, {112, 32}}</string>
 						<reference key="NSSuperview" ref="209000274"/>
-						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="679515494">
 							<int key="NSCellFlags">67239424</int>
@@ -19611,7 +19416,6 @@
 										<int key="NSvFlags">2322</int>
 										<string key="NSFrame">{{0, 157}, {523, 14}}</string>
 										<reference key="NSSuperview" ref="310103818"/>
-										<reference key="NSWindow"/>
 										<object class="NSTextContainer" key="NSTextContainer" id="831487841">
 											<object class="NSLayoutManager" key="NSLayoutManager">
 												<object class="NSTextStorage" key="NSTextStorage">
@@ -19675,7 +19479,6 @@
 								</object>
 								<string key="NSFrame">{{1, 1}, {523, 443}}</string>
 								<reference key="NSSuperview" ref="4253638"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1061178666"/>
 								<reference key="NSDocView" ref="1061178666"/>
 								<reference key="NSBGColor" ref="991462592"/>
@@ -19687,7 +19490,6 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{524, 1}, {15, 443}}</string>
 								<reference key="NSSuperview" ref="4253638"/>
-								<reference key="NSWindow"/>
 								<reference key="NSTarget" ref="4253638"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSCurValue">1</double>
@@ -19698,7 +19500,6 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 								<reference key="NSSuperview" ref="4253638"/>
-								<reference key="NSWindow"/>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="4253638"/>
 								<string key="NSAction">_doScroller:</string>
@@ -19708,7 +19509,6 @@
 						</object>
 						<string key="NSFrame">{{20, 102}, {540, 445}}</string>
 						<reference key="NSSuperview" ref="209000274"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="310103818"/>
 						<int key="NSsFlags">18</int>
 						<reference key="NSVScroller" ref="941492009"/>
@@ -19717,8 +19517,6 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{580, 567}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomObject" id="1057202244">
@@ -27836,14 +27634,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">inputPrefsOutlineView</string>
-						<reference key="source" ref="755412424"/>
-						<reference key="destination" ref="66039540"/>
-					</object>
-					<int key="connectionID">7157</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
 						<string key="label">dataSource</string>
 						<reference key="source" ref="66039540"/>
 						<reference key="destination" ref="842545935"/>

Modified: trunk/desmume/src/cocoa/userinterface/InputManager.h
===================================================================
--- trunk/desmume/src/cocoa/userinterface/InputManager.h	2013-03-12 09:13:29 UTC (rev 4553)
+++ trunk/desmume/src/cocoa/userinterface/InputManager.h	2013-03-12 21:14:34 UTC (rev 4554)
@@ -144,7 +144,6 @@
 @interface InputManager : NSObject
 {
 	EmuControllerDelegate *emuControl;
-	NSOutlineView *inputPrefsOutlineView;
 	id<InputHIDManagerTarget> hidInputTarget;
 	InputHIDManager *hidManager;
 	NSMutableDictionary *inputMappings;
@@ -155,7 +154,6 @@
 }
 
 @property (readonly) IBOutlet EmuControllerDelegate *emuControl;
-@... (readonly) IBOutlet NSOutlineView *inputPrefsOutlineView;
 @property (retain) id<InputHIDManagerTarget> hidInputTarget;
 @property (retain) NSMutableDictionary *inputMappings;
 

Modified: trunk/desmume/src/cocoa/userinterface/InputManager.mm
===================================================================
--- trunk/desmume/src/cocoa/userinterface/InputManager.mm	2013-03-12 09:13:29 UTC (rev 4553)
+++ trunk/desmume/src/cocoa/userinterface/InputManager.mm	2013-03-12 21:14:34 UTC (rev 4554)
@@ -795,7 +795,6 @@
 @implementation InputManager
 
 @synthesize emuControl;
-@... inputPrefsOutlineView;
 @dynamic hidInputTarget;
 @synthesize inputMappings;
 
@@ -1146,9 +1145,9 @@
 		commandMap.erase(it);
 	}
 	
-	for (NSString *inputCommandTag in [self inputMappings])
+	for (NSString *inputCommandTag in inputMappings)
 	{
-		NSMutableArray *inputList = (NSMutableArray *)[[self inputMappings] valueForKey:inputCommandTag];
+		NSMutableArray *inputList = (NSMutableArray *)[inputMappings valueForKey:inputCommandTag];
 		NSMutableArray *inputRemovalList = [NSMutableArray arrayWithCapacity:1];
 		
 		for (NSDictionary *inputDeviceInfo in inputList)
@@ -1164,10 +1163,7 @@
 			}
 		}
 		
-		for (NSDictionary *inputDeviceInfoToRemove in inputRemovalList)
-		{
-			[inputList removeObject:inputDeviceInfoToRemove];
-		}
+		[inputList removeObjectsInArray:inputRemovalList];
 	}
 }
 
@@ -1304,7 +1300,7 @@
 		const BOOL useInputForIntCoord = [(NSNumber *)[deviceInfo valueForKey:@"useInputForIntCoord"] boolValue];
 		if (useInputForIntCoord)
 		{
-			inputSummary = @"Use Device Coordinates";
+			inputSummary = NSSTRING_INPUTPREF_USE_DEVICE_COORDINATES;
 		}
 		else
 		{
@@ -1319,11 +1315,11 @@
 		switch (micMode)
 		{
 			case MICMODE_NONE:
-				inputSummary = @"None";
+				inputSummary = NSSTRING_INPUTPREF_MIC_NONE;
 				break;
 				
 			case MICMODE_INTERNAL_NOISE:
-				inputSummary = @"Internal Noise Samples";
+				inputSummary = NSSTRING_INPUTPREF_MIC_INTERNAL_NOISE;
 				break;
 				
 			case MICMODE_SOUND_FILE:
@@ -1331,7 +1327,7 @@
 				break;
 				
 			case MICMODE_WHITE_NOISE:
-				inputSummary = @"White Noise";
+				inputSummary = NSSTRING_INPUTPREF_MIC_WHITE_NOISE;
 				break;
 				
 			case MICMODE_PHYSICAL:
@@ -1355,7 +1351,7 @@
 	else if (strncmp(commandTag, "Set Speed", INPUT_HANDLER_STRING_LENGTH) == 0)
 	{
 		const float speedScalar = [(NSNumber *)[deviceInfo valueForKey:@"floatValue0"] floatValue];
-		inputSummary = [NSString stringWithFormat:@"%1.2fx Speed", speedScalar];
+		inputSummary = [NSString stringWithFormat:NSSTRING_INPUTPREF_SPEED_SCALAR, speedScalar];
 	}
 	else if (strncmp(commandTag, "Enable/Disable GPU State", INPUT_HANDLER_STRING_LENGTH) == 0)
 	{
@@ -1363,7 +1359,7 @@
 		switch (gpuStateID)
 		{
 			case 0:
-				inputSummary = @"Main GPU - All Layers";
+				inputSummary = NSSTRING_INPUTPREF_GPU_STATE_ALL_MAIN;
 				break;
 				
 			case 1:
@@ -1387,7 +1383,7 @@
 				break;
 				
 			case 6:
-				inputSummary = @"Sub GPU - All Layers";
+				inputSummary = NSSTRING_INPUTPREF_GPU_STATE_ALL_SUB;
 				break;
 				
 			case 7:

Modified: trunk/desmume/src/cocoa/userinterface/inputPrefsView.mm
===================================================================
--- trunk/desmume/src/cocoa/userinterface/inputPrefsView.mm	2013-03-12 09:13:29 UTC (rev 4553)
+++ trunk/desmume/src/cocoa/userinterface/inputPrefsView.mm	2013-03-12 21:14:34 UTC (rev 4554)
@@ -372,7 +372,7 @@
 					buttonImage = (NSImage *)[inputPrefProperties valueForKey:@"UNKNOWN COMMAND"];
 				}
 				
-				[outCell setTitle:commandTag];
+				[outCell setTitle:NSLocalizedString(commandTag, nil)];
 				[outCell setImage:buttonImage];
 			}
 			else
@@ -483,7 +483,7 @@
 		if ([item isKindOfClass:[NSArray class]])
 		{
 			const unsigned long inputCount = (unsigned long)[(NSArray *)item count];
-			return [NSString stringWithFormat:(inputCount != 1) ? @"%ld Inputs Mapped" : @"%ld Input Mapped", inputCount];
+			return [NSString stringWithFormat:(inputCount != 1) ? NSSTRING_INPUTPREF_NUM_INPUTS_MAPPED_PLURAL : NSSTRING_INPUTPREF_NUM_INPUTS_MAPPED, inputCount];
 		}
 		else if ([item isKindOfClass:[NSDictionary class]])
 		{
@@ -626,13 +626,12 @@
 	const NSInteger rowNumber = [outlineView clickedRow];
 	
 	NSDictionary *deviceInfo = (NSDictionary *)[outlineView itemAtRow:rowNumber];
-	[inputManager removeMappingUsingDeviceCode:[(NSString *)[deviceInfo valueForKey:@"deviceCode"] cStringUsingEncoding:NSUTF8StringEncoding] elementCode:[(NSString *)[deviceInfo valueForKey:@"elementCode"] cStringUsingEncoding:NSUTF8StringEncoding]];
-	
 	NSMutableArray *inputList = (NSMutableArray *)[outlineView parentForItem:deviceInfo];
-	[inputList removeObject:deviceInfo];
 	
-	[outlineView reloadItem:inputList reloadChildren:YES];
+	[inputManager removeMappingUsingDeviceCode:[(NSString *)[deviceInfo valueForKey:@"deviceCode"] cStringUsingEncoding:NSUTF8StringEncoding] elementCode:[(NSString *)[deviceInfo valueForKey:@"elementCode"] cStringUsingEncoding:NSUTF8StringEncoding]];
 	[inputManager writeDefaultsInputMappings];
+	
+	[outlineView reloadItem:inputList reloadChildren:YES];
 }
 
 - (IBAction) changeSpeed:(id)sender

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4555
          http://desmume.svn.sourceforge.net/desmume/?rev=4555&view=rev
Author:   rogerman
Date:     2013-03-13 05:04:12 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------
Cocoa Port:
- Fix a performance bug where CocoaDSDisplay objects weren't properly frameskipping.
- Fix compiling when building on a machine running Leopard.

Modified Paths:
--------------
    trunk/desmume/src/cocoa/cocoa_core.mm
    trunk/desmume/src/cocoa/userinterface/inputPrefsView.h

Modified: trunk/desmume/src/cocoa/cocoa_core.mm
===================================================================
--- trunk/desmume/src/cocoa/cocoa_core.mm	2013-03-12 21:14:34 UTC (rev 4554)
+++ trunk/desmume/src/cocoa/cocoa_core.mm	2013-03-13 05:04:12 UTC (rev 4555)
@@ -739,7 +739,7 @@
 		pthread_mutex_lock(&param->mutexOutputList);
 		for(CocoaDSOutput *cdsOutput in cdsOutputList)
 		{
-			if (param->framesToSkip > 0 && [cdsOutput isMemberOfClass:[CocoaDSDisplay class]])
+			if (param->framesToSkip > 0 && [cdsOutput isKindOfClass:[CocoaDSDisplay class]])
 			{
 				continue;
 			}

Modified: trunk/desmume/src/cocoa/userinterface/inputPrefsView.h
===================================================================
--- trunk/desmume/src/cocoa/userinterface/inputPrefsView.h	2013-03-12 21:14:34 UTC (rev 4554)
+++ trunk/desmume/src/cocoa/userinterface/inputPrefsView.h	2013-03-13 05:04:12 UTC (rev 4555)
@@ -38,7 +38,11 @@
 
 #pragma mark -
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
 @interface InputPrefsView : NSView <InputHIDManagerTarget, NSOutlineViewDelegate, NSOutlineViewDataSource>
+#else
+@interface InputPrefsView : NSView <InputHIDManagerTarget>
+#endif
 {
 	NSWindow *prefWindow;
 	NSOutlineView *inputPrefOutlineView;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.