From ca0e292dd4553d078393d626444c2b88922f5b62 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Mon, 6 Aug 2012 22:41:30 +0200
Subject: [PATCH 001/352] Replace the shader uid system with a new one which
 quasi-automatically generates uids for shaders. Currently used in the vertex
 shader only (had to fork lighting shaders for now).

---
 Source/Core/VideoCommon/Src/Debugger.cpp      |   2 +-
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  | 609 +++++++++++-------
 Source/Core/VideoCommon/Src/VertexShaderGen.h | 124 ++--
 .../Plugin_VideoOGL/Src/VertexShaderCache.cpp |  17 +-
 .../Plugin_VideoOGL/Src/VertexShaderCache.h   |   6 +-
 5 files changed, 464 insertions(+), 294 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/Debugger.cpp b/Source/Core/VideoCommon/Src/Debugger.cpp
index 4aa25b72be..005f81c8e6 100644
--- a/Source/Core/VideoCommon/Src/Debugger.cpp
+++ b/Source/Core/VideoCommon/Src/Debugger.cpp
@@ -131,7 +131,7 @@ void GFXDebuggerBase::DumpVertexShader(const char* path)
 	sprintf(filename, "%sdump_vs.txt", path);
 
 	File::CreateEmptyFile(filename);
-	File::WriteStringToFile(true, GenerateVertexShaderCode(g_nativeVertexFmt->m_components, g_ActiveConfig.backend_info.APIType), filename);
+///	File::WriteStringToFile(true, GenerateVertexShaderCode(g_nativeVertexFmt->m_components, g_ActiveConfig.backend_info.APIType), filename);
 }
 
 void GFXDebuggerBase::DumpPixelShaderConstants(const char* path)
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index cad117c2c8..d7134b6dcb 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -26,149 +26,260 @@
 #include "VertexShaderGen.h"
 #include "VideoConfig.h"
 
-// Mash together all the inputs that contribute to the code of a generated vertex shader into
-// a unique identifier, basically containing all the bits. Yup, it's a lot ....
-void GetVertexShaderId(VERTEXSHADERUID *uid, u32 components)
+static char text[16768];
+
+enum GenOutput
 {
-	memset(uid->values, 0, sizeof(uid->values));
-	uid->values[0] = components |
-		(xfregs.numTexGen.numTexGens << 23) |
-		(xfregs.numChan.numColorChans << 27) |
-		(xfregs.dualTexTrans.enabled << 29);
-
-	// TODO: If pixel lighting is enabled, do we even have to bother about storing lighting related registers here?
-	GetLightingShaderId(&uid->values[1]);
-
-	uid->values[2] |= (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting) << 31;
-	u32 *pcurvalue = &uid->values[3];
-	for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) {
-		TexMtxInfo tinfo = xfregs.texMtxInfo[i];
-		if (tinfo.texgentype != XF_TEXGEN_EMBOSS_MAP)
-			tinfo.hex &= 0x7ff;
-		if (tinfo.texgentype != XF_TEXGEN_REGULAR)
-			tinfo.projection = 0;
-
-		u32 val = ((tinfo.hex >> 1) & 0x1ffff);
-		if (xfregs.dualTexTrans.enabled && tinfo.texgentype == XF_TEXGEN_REGULAR) {
-			// rewrite normalization and post index
-			val |= ((u32)xfregs.postMtxInfo[i].index << 17) | ((u32)xfregs.postMtxInfo[i].normalize << 23);
-		}
-
-		switch (i & 3) {
-			case 0: pcurvalue[0] |= val; break;
-			case 1: pcurvalue[0] |= val << 24; pcurvalue[1] = val >> 8; ++pcurvalue; break;
-			case 2: pcurvalue[0] |= val << 16; pcurvalue[1] = val >> 16; ++pcurvalue; break;
-			case 3: pcurvalue[0] |= val << 8; ++pcurvalue; break;
-		}
-	}
-}
-
-void GetSafeVertexShaderId(VERTEXSHADERUIDSAFE *uid, u32 components)
+	GO_ShaderCode,
+	GO_ShaderUid,
+};
+// TODO: Check if something goes wrong if the cached shaders used pixel lighting but it's disabled later??
+template<class T>
+void GenerateVSOutputStruct(T& object, u32 components, API_TYPE api_type)
 {
-	// Just store all used registers here without caring whether we need all bits or less.
-	memset(uid->values, 0, sizeof(uid->values));
-	u32* ptr = uid->values;
-	*ptr++ = components;
-	*ptr++ = xfregs.numTexGen.hex;
-	*ptr++ = xfregs.numChan.hex;
-	*ptr++ = xfregs.dualTexTrans.hex;
+	object.Write("struct VS_OUTPUT {\n");
+	object.Write("  float4 pos : POSITION;\n");
+	object.Write("  float4 colors_0 : COLOR0;\n");
+	object.Write("  float4 colors_1 : COLOR1;\n");
 
-	for (int i = 0; i < 2; ++i) {
-		*ptr++ = xfregs.color[i].hex;
-		*ptr++ = xfregs.alpha[i].hex;
-	}
-	*ptr++ = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting;
-	for (unsigned int i = 0; i < 8; ++i) {
-		*ptr++ = xfregs.texMtxInfo[i].hex;
-		*ptr++ = xfregs.postMtxInfo[i].hex;
-	}
-	_assert_((ptr - uid->values) == uid->GetNumValues());
-}
-
-
-void ValidateVertexShaderIDs(API_TYPE api, VERTEXSHADERUIDSAFE old_id, const std::string& old_code, u32 components)
-{
-	if (!g_ActiveConfig.bEnableShaderDebugging)
-		return;
-
-	VERTEXSHADERUIDSAFE new_id;
-	GetSafeVertexShaderId(&new_id, components);
-
-	if (!(old_id == new_id))
+	if (xfregs.numTexGen.numTexGens < 7)
 	{
-		std::string new_code(GenerateVertexShaderCode(components, api));
-		if (old_code != new_code)
+		for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
+			object.Write("  float3 tex%d : TEXCOORD%d;\n", i, i);
+
+		object.Write("  float4 clipPos : TEXCOORD%d;\n", xfregs.numTexGen.numTexGens);
+///		if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
+///			object.Write("  float4 Normal : TEXCOORD%d;\n", xfregs.numTexGen.numTexGens + 1);
+	}
+	else
+	{
+		// clip position is in w of first 4 texcoords
+///		if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
+///		{
+///			for (int i = 0; i < 8; ++i)
+///				object.Write("  float4 tex%d : TEXCOORD%d;\n", i, i);
+///		}
+///		else
 		{
-			_assert_(old_id.GetNumValues() == new_id.GetNumValues());
-
-			char msg[8192];
-			char* ptr = msg;
-			ptr += sprintf(ptr, "Vertex shader IDs matched but unique IDs did not!\nUnique IDs (old <-> new):\n");
-			const int N = new_id.GetNumValues();
-			for (int i = 0; i < N/2; ++i)
-				ptr += sprintf(ptr, "%02d, %08X  %08X  |  %08X  %08X\n", 2*i, old_id.values[2*i], old_id.values[2*i+1],
-																			new_id.values[2*i], new_id.values[2*i+1]);
-			if (N % 2)
-				ptr += sprintf(ptr, "%02d, %08X  |  %08X\n", N-1, old_id.values[N-1], new_id.values[N-1]);
-				
-			static int num_failures = 0;
-			char szTemp[MAX_PATH];
-			sprintf(szTemp, "%svsuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
-			std::ofstream file(szTemp);
-			file << msg;
-			file << "\n\nOld shader code:\n" << old_code;
-			file << "\n\nNew shader code:\n" << new_code;
-			file.close();
-
-			PanicAlert("Unique pixel shader ID mismatch!\n\nReport this to the devs, along with the contents of %s.", szTemp);
+			for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
+				object.Write("  float%d tex%d : TEXCOORD%d;\n", i < 4 ? 4 : 3 , i, i);
 		}
 	}
+	object.Write("};\n");
 }
 
-
-static char text[16384];
-
-#define WRITE p+=sprintf
-
-char* GenerateVSOutputStruct(char* p, u32 components, API_TYPE api_type)
+template<class T, GenOutput type>
+void _GenerateLightShader(T& object, int index, int litchan_index, const char* lightsName, int coloralpha)
 {
-	WRITE(p, "struct VS_OUTPUT {\n");
-	WRITE(p, "  float4 pos : POSITION;\n");
-	WRITE(p, "  float4 colors_0 : COLOR0;\n");
-	WRITE(p, "  float4 colors_1 : COLOR1;\n");
+#define SetUidField(name, value) if (type == GO_ShaderUid) { object.GetUidData().name = value; };
+	const LitChannel& chan = (litchan_index > 1) ? xfregs.alpha[litchan_index-2] : xfregs.color[litchan_index];
+	const char* swizzle = "xyzw";
+	if (coloralpha == 1 ) swizzle = "xyz";
+	else if (coloralpha == 2 ) swizzle = "w";
 
-	if (xfregs.numTexGen.numTexGens < 7) {
-		for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
-			WRITE(p, "  float3 tex%d : TEXCOORD%d;\n", i, i);
-		WRITE(p, "  float4 clipPos : TEXCOORD%d;\n", xfregs.numTexGen.numTexGens);
-		if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-			WRITE(p, "  float4 Normal : TEXCOORD%d;\n", xfregs.numTexGen.numTexGens + 1);
-	} else {
-		// clip position is in w of first 4 texcoords
-		if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
+	SetUidField(lit_chans[litchan_index].attnfunc, chan.attnfunc);
+	SetUidField(lit_chans[litchan_index].diffusefunc, chan.diffusefunc);
+	if (!(chan.attnfunc & 1)) {
+		// atten disabled
+		switch (chan.diffusefunc) {
+			case LIGHTDIF_NONE:
+				object.Write("lacc.%s += %s.lights[%d].col.%s;\n", swizzle, lightsName, index, swizzle);
+				break;
+			case LIGHTDIF_SIGN:
+			case LIGHTDIF_CLAMP:
+				object.Write("ldir = normalize(%s.lights[%d].pos.xyz - pos.xyz);\n", lightsName, index);
+				object.Write("lacc.%s += %sdot(ldir, _norm0)) * %s.lights[%d].col.%s;\n",
+					swizzle, chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(", lightsName, index, swizzle);
+				break;
+			default: _assert_(0);
+		}
+	}
+	else { // spec and spot
+
+		if (chan.attnfunc == 3)
+		{ // spot
+			object.Write("ldir = %s.lights[%d].pos.xyz - pos.xyz;\n", lightsName, index);
+			object.Write("dist2 = dot(ldir, ldir);\n"
+						"dist = sqrt(dist2);\n"
+						"ldir = ldir / dist;\n"
+						"attn = max(0.0f, dot(ldir, %s.lights[%d].dir.xyz));\n", lightsName, index);
+			object.Write("attn = max(0.0f, dot(%s.lights[%d].cosatt.xyz, float3(1.0f, attn, attn*attn))) / dot(%s.lights[%d].distatt.xyz, float3(1.0f,dist,dist2));\n", lightsName, index, lightsName, index);
+		}
+		else if (chan.attnfunc == 1)
+		{ // specular
+			object.Write("ldir = normalize(%s.lights[%d].pos.xyz);\n", lightsName, index);
+			object.Write("attn = (dot(_norm0,ldir) >= 0.0f) ? max(0.0f, dot(_norm0, %s.lights[%d].dir.xyz)) : 0.0f;\n", lightsName, index);
+			object.Write("attn = max(0.0f, dot(%s.lights[%d].cosatt.xyz, float3(1,attn,attn*attn))) / dot(%s.lights[%d].distatt.xyz, float3(1,attn,attn*attn));\n", lightsName, index, lightsName, index);
+		}
+
+		switch (chan.diffusefunc)
 		{
-			for (int i = 0; i < 8; ++i)
-				WRITE(p, "  float4 tex%d : TEXCOORD%d;\n", i, i);
+			case LIGHTDIF_NONE:
+				object.Write("lacc.%s += attn * %s.lights[%d].col.%s;\n", swizzle, lightsName, index, swizzle);
+				break;
+			case LIGHTDIF_SIGN:
+			case LIGHTDIF_CLAMP:
+				object.Write("lacc.%s += attn * %sdot(ldir, _norm0)) * %s.lights[%d].col.%s;\n",
+					swizzle,
+					chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(",
+					lightsName,
+					index,
+					swizzle);
+				break;
+			default: _assert_(0);
+		}
+	}
+	object.Write("\n");
+}
+
+// vertex shader
+// lights/colors
+// materials name is I_MATERIALS in vs and I_PMATERIALS in ps
+// inColorName is color in vs and colors_ in ps
+// dest is o.colors_ in vs and colors_ in ps
+template<class T, GenOutput type>
+void _GenerateLightingShader(T& object, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest)
+{
+	for (unsigned int j = 0; j < xfregs.numChan.numColorChans; j++)
+	{
+		const LitChannel& color = xfregs.color[j];
+		const LitChannel& alpha = xfregs.alpha[j];
+
+		object.Write("{\n");
+
+		SetUidField(lit_chans[j].matsource, xfregs.color[j].matsource);
+		if (color.matsource) {// from vertex
+			if (components & (VB_HAS_COL0 << j))
+				object.Write("mat = %s%d;\n", inColorName, j);
+			else if (components & VB_HAS_COL0)
+				object.Write("mat = %s0;\n", inColorName);
+			else
+				object.Write("mat = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
+		}
+		else // from color
+			object.Write("mat = %s.C%d;\n", materialsName, j+2);
+
+		SetUidField(lit_chans[j].enablelighting, xfregs.color[j].enablelighting);
+		if (color.enablelighting) {
+			SetUidField(lit_chans[j].ambsource, xfregs.color[j].ambsource);
+			if (color.ambsource) { // from vertex
+				if (components & (VB_HAS_COL0<<j) )
+					object.Write("lacc = %s%d;\n", inColorName, j);
+				else if (components & VB_HAS_COL0 )
+					object.Write("lacc = %s0;\n", inColorName);
+				else
+					object.Write("lacc = float4(0.0f, 0.0f, 0.0f, 0.0f);\n");
+			}
+			else // from color
+				object.Write("lacc = %s.C%d;\n", materialsName, j);
 		}
 		else
 		{
-			for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
-				WRITE(p, "  float%d tex%d : TEXCOORD%d;\n", i < 4 ? 4 : 3 , i, i);
+			object.Write("lacc = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
 		}
-	}	
-	WRITE(p, "};\n");
 
-	return p;
+		// check if alpha is different
+		SetUidField(lit_chans[j+2].matsource, xfregs.alpha[j].matsource);
+		if (alpha.matsource != color.matsource) {
+			if (alpha.matsource) {// from vertex
+				if (components & (VB_HAS_COL0<<j))
+					object.Write("mat.w = %s%d.w;\n", inColorName, j);
+				else if (components & VB_HAS_COL0)
+					object.Write("mat.w = %s0.w;\n", inColorName);
+				else object.Write("mat.w = 1.0f;\n");
+			}
+			else // from color
+				object.Write("mat.w = %s.C%d.w;\n", materialsName, j+2);
+		}
+
+		SetUidField(lit_chans[j+2].enablelighting, xfregs.alpha[j].enablelighting);
+		if (alpha.enablelighting)
+		{
+			SetUidField(lit_chans[j+2].ambsource, xfregs.alpha[j].ambsource);
+			if (alpha.ambsource) {// from vertex
+				if (components & (VB_HAS_COL0<<j) )
+					object.Write("lacc.w = %s%d.w;\n", inColorName, j);
+				else if (components & VB_HAS_COL0 )
+					object.Write("lacc.w = %s0.w;\n", inColorName);
+				else
+					object.Write("lacc.w = 0.0f;\n");
+			}
+			else // from color
+				object.Write("lacc.w = %s.C%d.w;\n", materialsName, j);
+		}
+		else
+		{
+			object.Write("lacc.w = 1.0f;\n");
+		}
+
+		if(color.enablelighting && alpha.enablelighting)
+		{
+			// both have lighting, test if they use the same lights
+			int mask = 0;
+			SetUidField(lit_chans[j].attnfunc, color.attnfunc);
+			SetUidField(lit_chans[j+2].attnfunc, alpha.attnfunc);
+			SetUidField(lit_chans[j].diffusefunc, color.diffusefunc);
+			SetUidField(lit_chans[j+2].diffusefunc, alpha.diffusefunc);
+			SetUidField(lit_chans[j].light_mask, color.GetFullLightMask());
+			SetUidField(lit_chans[j+2].light_mask, alpha.GetFullLightMask());
+			if(color.lightparams == alpha.lightparams)
+			{
+				mask = color.GetFullLightMask() & alpha.GetFullLightMask();
+				if(mask)
+				{
+					for (int i = 0; i < 8; ++i)
+					{
+						if (mask & (1<<i))
+						{
+							_GenerateLightShader<T,type>(object, i, j, lightsName, 3);
+						}
+					}
+				}
+			}
+
+			// no shared lights
+			for (int i = 0; i < 8; ++i)
+			{
+				if (!(mask&(1<<i)) && (color.GetFullLightMask() & (1<<i)))
+					_GenerateLightShader<T,type>(object, i, j, lightsName, 1);
+				if (!(mask&(1<<i)) && (alpha.GetFullLightMask() & (1<<i)))
+					_GenerateLightShader<T,type>(object, i, j+2, lightsName, 2);
+			}
+		}
+		else if (color.enablelighting || alpha.enablelighting)
+		{
+			// lights are disabled on one channel so process only the active ones
+			const LitChannel& workingchannel = color.enablelighting ? color : alpha;
+			const int lit_index = color.enablelighting ? j : (j+2);
+			int coloralpha = color.enablelighting ? 1 : 2;
+
+			SetUidField(lit_chans[lit_index].light_mask, workingchannel.GetFullLightMask());
+			for (int i = 0; i < 8; ++i)
+			{
+				if (workingchannel.GetFullLightMask() & (1<<i))
+					_GenerateLightShader<T,type>(object, i, lit_index, lightsName, coloralpha);
+			}
+		}
+		object.Write("%s%d = mat * saturate(lacc);\n", dest, j);
+		object.Write("}\n");
+	}
 }
 
-const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type)
+// TODO: Problem: this one uses copy constructors or sth for uids when returning...
+template<class T, GenOutput type>
+void GenerateShader(T& out, u32 components, API_TYPE api_type)
 {
-	setlocale(LC_NUMERIC, "C"); // Reset locale for compilation
-	text[sizeof(text) - 1] = 0x7C;  // canary
+#undef SetUidField
+#define SetUidField(name, value) if (type == GO_ShaderUid) {out.GetUidData().name = value; };
+
+	if (type == GO_ShaderCode)
+	{
+		out.SetBuffer(text);
+		setlocale(LC_NUMERIC, "C"); // Reset locale for compilation
+	}
+
+	///	text[sizeof(text) - 1] = 0x7C;  // canary
 
-	_assert_(bpmem.genMode.numtexgens == xfregs.numTexGen.numTexGens);
-	_assert_(bpmem.genMode.numcolchans == xfregs.numChan.numColorChans);
-	
 	bool is_d3d = (api_type & API_D3D9 || api_type == API_D3D11);
 	u32 lightMask = 0;
 	if (xfregs.numChan.numColorChans > 0)
@@ -176,141 +287,146 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type)
 	if (xfregs.numChan.numColorChans > 1)
 		lightMask |= xfregs.color[1].GetFullLightMask() | xfregs.alpha[1].GetFullLightMask();
 
-	char *p = text;
-	WRITE(p, "//Vertex Shader: comp:%x, \n", components);
-	WRITE(p, "typedef struct { float4 T0, T1, T2; float4 N0, N1, N2; } s_" I_POSNORMALMATRIX";\n"
-		"typedef struct { float4 t; } FLT4;\n"
-		"typedef struct { FLT4 T[24]; } s_" I_TEXMATRICES";\n"
-		"typedef struct { FLT4 T[64]; } s_" I_TRANSFORMMATRICES";\n"
-		"typedef struct { FLT4 T[32]; } s_" I_NORMALMATRICES";\n"
-		"typedef struct { FLT4 T[64]; } s_" I_POSTTRANSFORMMATRICES";\n"
-		"typedef struct { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; } Light;\n"
-		"typedef struct { Light lights[8]; } s_" I_LIGHTS";\n"
-		"typedef struct { float4 C0, C1, C2, C3; } s_" I_MATERIALS";\n"
-		"typedef struct { float4 T0, T1, T2, T3; } s_" I_PROJECTION";\n"
-		);
+	out.Write("//Vertex Shader: comp:%x, \n", components);
+	out.Write("typedef struct { float4 T0, T1, T2; float4 N0, N1, N2; } s_" I_POSNORMALMATRIX";\n"
+			"typedef struct { float4 t; } FLT4;\n"
+			"typedef struct { FLT4 T[24]; } s_" I_TEXMATRICES";\n"
+			"typedef struct { FLT4 T[64]; } s_" I_TRANSFORMMATRICES";\n"
+			"typedef struct { FLT4 T[32]; } s_" I_NORMALMATRICES";\n"
+			"typedef struct { FLT4 T[64]; } s_" I_POSTTRANSFORMMATRICES";\n"
+			"typedef struct { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; } Light;\n"
+			"typedef struct { Light lights[8]; } s_" I_LIGHTS";\n"
+			"typedef struct { float4 C0, C1, C2, C3; } s_" I_MATERIALS";\n"
+			"typedef struct { float4 T0, T1, T2, T3; } s_" I_PROJECTION";\n"
+			);
 
-	p = GenerateVSOutputStruct(p, components, api_type);
+///	p = GenerateVSOutputStruct(p, components, api_type);
+	GenerateVSOutputStruct(out, components, api_type);
 
 	// uniforms
 
-	WRITE(p, "uniform s_" I_TRANSFORMMATRICES" " I_TRANSFORMMATRICES" : register(c%d);\n", C_TRANSFORMMATRICES);
-	WRITE(p, "uniform s_" I_TEXMATRICES" " I_TEXMATRICES" : register(c%d);\n", C_TEXMATRICES); // also using tex matrices
-	WRITE(p, "uniform s_" I_NORMALMATRICES" " I_NORMALMATRICES" : register(c%d);\n", C_NORMALMATRICES);
-	WRITE(p, "uniform s_" I_POSNORMALMATRIX" " I_POSNORMALMATRIX" : register(c%d);\n", C_POSNORMALMATRIX);
-	WRITE(p, "uniform s_" I_POSTTRANSFORMMATRICES" " I_POSTTRANSFORMMATRICES" : register(c%d);\n", C_POSTTRANSFORMMATRICES);
-	WRITE(p, "uniform s_" I_LIGHTS" " I_LIGHTS" : register(c%d);\n", C_LIGHTS);
-	WRITE(p, "uniform s_" I_MATERIALS" " I_MATERIALS" : register(c%d);\n", C_MATERIALS);
-	WRITE(p, "uniform s_" I_PROJECTION" " I_PROJECTION" : register(c%d);\n", C_PROJECTION);
-	WRITE(p, "uniform float4 " I_DEPTHPARAMS" : register(c%d);\n", C_DEPTHPARAMS);
+	out.Write("uniform s_" I_TRANSFORMMATRICES" " I_TRANSFORMMATRICES" : register(c%d);\n", C_TRANSFORMMATRICES);
+	out.Write("uniform s_" I_TEXMATRICES" " I_TEXMATRICES" : register(c%d);\n", C_TEXMATRICES);
+	out.Write("uniform s_" I_NORMALMATRICES" " I_NORMALMATRICES" : register(c%d);\n", C_NORMALMATRICES);
+	out.Write("uniform s_" I_POSNORMALMATRIX" " I_POSNORMALMATRIX" : register(c%d);\n", C_POSNORMALMATRIX);
+	out.Write("uniform s_" I_POSTTRANSFORMMATRICES" " I_POSTTRANSFORMMATRICES" : register(c%d);\n", C_POSTTRANSFORMMATRICES);
+	out.Write("uniform s_" I_LIGHTS" " I_LIGHTS" : register(c%d);\n", C_LIGHTS);
+	out.Write("uniform s_" I_MATERIALS" " I_MATERIALS" : register(c%d);\n", C_MATERIALS);
+	out.Write("uniform s_" I_PROJECTION" " I_PROJECTION" : register(c%d);\n", C_PROJECTION);
+	out.Write("uniform float4 " I_DEPTHPARAMS" : register(c%d);\n", C_DEPTHPARAMS);
 
-	WRITE(p, "VS_OUTPUT main(\n");	
-	
+	out.Write("VS_OUTPUT main(\n");
+
+	SetUidField(numTexGens, xfregs.numTexGen.numTexGens);
+	SetUidField(components, components);
 	// inputs
 	if (components & VB_HAS_NRM0)
-		WRITE(p, "  float3 rawnorm0 : NORMAL0,\n");
-	if (components & VB_HAS_NRM1) {
+		out.Write("  float3 rawnorm0 : NORMAL0,\n");
+	if (components & VB_HAS_NRM1)
+	{
 		if (is_d3d)
-			WRITE(p, "  float3 rawnorm1 : NORMAL1,\n");
+			out.Write("  float3 rawnorm1 : NORMAL1,\n");
 		else
-			WRITE(p, "  float3 rawnorm1 : ATTR%d,\n", SHADER_NORM1_ATTRIB);
+			out.Write("  float3 rawnorm1 : ATTR%d,\n", SHADER_NORM1_ATTRIB);
 	}
-	if (components & VB_HAS_NRM2) {
+	if (components & VB_HAS_NRM2)
+	{
 		if (is_d3d)
-			WRITE(p, "  float3 rawnorm2 : NORMAL2,\n");
+			out.Write("  float3 rawnorm2 : NORMAL2,\n");
 		else
-			WRITE(p, "  float3 rawnorm2 : ATTR%d,\n", SHADER_NORM2_ATTRIB);
+			out.Write("  float3 rawnorm2 : ATTR%d,\n", SHADER_NORM2_ATTRIB);
 	}
 	if (components & VB_HAS_COL0)
-		WRITE(p, "  float4 color0 : COLOR0,\n");
+		out.Write("  float4 color0 : COLOR0,\n");
 	if (components & VB_HAS_COL1)
-		WRITE(p, "  float4 color1 : COLOR1,\n");
+		out.Write("  float4 color1 : COLOR1,\n");
 	for (int i = 0; i < 8; ++i) {
 		u32 hastexmtx = (components & (VB_HAS_TEXMTXIDX0<<i));
 		if ((components & (VB_HAS_UV0<<i)) || hastexmtx)
-			WRITE(p, "  float%d tex%d : TEXCOORD%d,\n", hastexmtx ? 3 : 2, i, i);
+			out.Write("  float%d tex%d : TEXCOORD%d,\n", hastexmtx ? 3 : 2, i, i);
 	}
 	if (components & VB_HAS_POSMTXIDX) {
 		if (is_d3d)
 		{
-			WRITE(p, "  float4 blend_indices : BLENDINDICES,\n");
+			out.Write("  float4 blend_indices : BLENDINDICES,\n");
 		}
 		else
-			WRITE(p, "  float fposmtx : ATTR%d,\n", SHADER_POSMTX_ATTRIB);
+			out.Write("  float fposmtx : ATTR%d,\n", SHADER_POSMTX_ATTRIB);
 	}
-	WRITE(p, "  float4 rawpos : POSITION) {\n");
-	WRITE(p, "VS_OUTPUT o;\n");	
+	out.Write("  float4 rawpos : POSITION) {\n");
+	out.Write("VS_OUTPUT o;\n");
 
 	// transforms
 	if (components & VB_HAS_POSMTXIDX)
 	{
 		if (api_type & API_D3D9)
 		{
-			WRITE(p, "int4 indices = D3DCOLORtoUBYTE4(blend_indices);\n");
-			WRITE(p, "int posmtx = indices.x;\n");
+			out.Write("int4 indices = D3DCOLORtoUBYTE4(blend_indices);\n");
+			out.Write("int posmtx = indices.x;\n");
 		}
 		else if (api_type == API_D3D11)
 		{
-			WRITE(p, "int posmtx = blend_indices.x * 255.0f;\n");
+			out.Write("int posmtx = blend_indices.x * 255.0f;\n");
 		}
 		else
 		{
-			WRITE(p, "int posmtx = fposmtx;\n");
+			out.Write("int posmtx = fposmtx;\n");
 		}
 
-		WRITE(p, "float4 pos = float4(dot(" I_TRANSFORMMATRICES".T[posmtx].t, rawpos), dot(" I_TRANSFORMMATRICES".T[posmtx+1].t, rawpos), dot(" I_TRANSFORMMATRICES".T[posmtx+2].t, rawpos), 1);\n");		
+		out.Write("float4 pos = float4(dot(" I_TRANSFORMMATRICES".T[posmtx].t, rawpos), dot(" I_TRANSFORMMATRICES".T[posmtx+1].t, rawpos), dot(" I_TRANSFORMMATRICES".T[posmtx+2].t, rawpos), 1);\n");
 
 		if (components & VB_HAS_NRMALL) {
-			WRITE(p, "int normidx = posmtx >= 32 ? (posmtx-32) : posmtx;\n");
-			WRITE(p, "float3 N0 = " I_NORMALMATRICES".T[normidx].t.xyz, N1 = " I_NORMALMATRICES".T[normidx+1].t.xyz, N2 = " I_NORMALMATRICES".T[normidx+2].t.xyz;\n");
+			out.Write("int normidx = posmtx >= 32 ? (posmtx-32) : posmtx;\n");
+			out.Write("float3 N0 = " I_NORMALMATRICES".T[normidx].t.xyz, N1 = " I_NORMALMATRICES".T[normidx+1].t.xyz, N2 = " I_NORMALMATRICES".T[normidx+2].t.xyz;\n");
 		}
 
 		if (components & VB_HAS_NRM0)
-			WRITE(p, "float3 _norm0 = normalize(float3(dot(N0, rawnorm0), dot(N1, rawnorm0), dot(N2, rawnorm0)));\n");
+			out.Write("float3 _norm0 = normalize(float3(dot(N0, rawnorm0), dot(N1, rawnorm0), dot(N2, rawnorm0)));\n");
 		if (components & VB_HAS_NRM1)
-			WRITE(p, "float3 _norm1 = float3(dot(N0, rawnorm1), dot(N1, rawnorm1), dot(N2, rawnorm1));\n");
+			out.Write("float3 _norm1 = float3(dot(N0, rawnorm1), dot(N1, rawnorm1), dot(N2, rawnorm1));\n");
 		if (components & VB_HAS_NRM2)
-			WRITE(p, "float3 _norm2 = float3(dot(N0, rawnorm2), dot(N1, rawnorm2), dot(N2, rawnorm2));\n");
+			out.Write("float3 _norm2 = float3(dot(N0, rawnorm2), dot(N1, rawnorm2), dot(N2, rawnorm2));\n");
 	}
 	else
 	{
-		WRITE(p, "float4 pos = float4(dot(" I_POSNORMALMATRIX".T0, rawpos), dot(" I_POSNORMALMATRIX".T1, rawpos), dot(" I_POSNORMALMATRIX".T2, rawpos), 1.0f);\n");
+		out.Write("float4 pos = float4(dot(" I_POSNORMALMATRIX".T0, rawpos), dot(" I_POSNORMALMATRIX".T1, rawpos), dot(" I_POSNORMALMATRIX".T2, rawpos), 1.0f);\n");
 		if (components & VB_HAS_NRM0)
-			WRITE(p, "float3 _norm0 = normalize(float3(dot(" I_POSNORMALMATRIX".N0.xyz, rawnorm0), dot(" I_POSNORMALMATRIX".N1.xyz, rawnorm0), dot(" I_POSNORMALMATRIX".N2.xyz, rawnorm0)));\n");
+			out.Write("float3 _norm0 = normalize(float3(dot(" I_POSNORMALMATRIX".N0.xyz, rawnorm0), dot(" I_POSNORMALMATRIX".N1.xyz, rawnorm0), dot(" I_POSNORMALMATRIX".N2.xyz, rawnorm0)));\n");
 		if (components & VB_HAS_NRM1)
-			WRITE(p, "float3 _norm1 = float3(dot(" I_POSNORMALMATRIX".N0.xyz, rawnorm1), dot(" I_POSNORMALMATRIX".N1.xyz, rawnorm1), dot(" I_POSNORMALMATRIX".N2.xyz, rawnorm1));\n");
+			out.Write("float3 _norm1 = float3(dot(" I_POSNORMALMATRIX".N0.xyz, rawnorm1), dot(" I_POSNORMALMATRIX".N1.xyz, rawnorm1), dot(" I_POSNORMALMATRIX".N2.xyz, rawnorm1));\n");
 		if (components & VB_HAS_NRM2)
-			WRITE(p, "float3 _norm2 = float3(dot(" I_POSNORMALMATRIX".N0.xyz, rawnorm2), dot(" I_POSNORMALMATRIX".N1.xyz, rawnorm2), dot(" I_POSNORMALMATRIX".N2.xyz, rawnorm2));\n");
+			out.Write("float3 _norm2 = float3(dot(" I_POSNORMALMATRIX".N0.xyz, rawnorm2), dot(" I_POSNORMALMATRIX".N1.xyz, rawnorm2), dot(" I_POSNORMALMATRIX".N2.xyz, rawnorm2));\n");
 	}
 
 	if (!(components & VB_HAS_NRM0))
-		WRITE(p, "float3 _norm0 = float3(0.0f, 0.0f, 0.0f);\n");
+		out.Write("float3 _norm0 = float3(0.0f, 0.0f, 0.0f);\n");
 
-	
 
-	WRITE(p, "o.pos = float4(dot(" I_PROJECTION".T0, pos), dot(" I_PROJECTION".T1, pos), dot(" I_PROJECTION".T2, pos), dot(" I_PROJECTION".T3, pos));\n");
 
-	WRITE(p, "float4 mat, lacc;\n"
-	"float3 ldir, h;\n"
-	"float dist, dist2, attn;\n");
+	out.Write("o.pos = float4(dot(" I_PROJECTION".T0, pos), dot(" I_PROJECTION".T1, pos), dot(" I_PROJECTION".T2, pos), dot(" I_PROJECTION".T3, pos));\n");
 
+	out.Write("float4 mat, lacc;\n"
+			"float3 ldir, h;\n"
+			"float dist, dist2, attn;\n");
+
+	SetUidField(numColorChans, xfregs.numChan.numColorChans);
 	if(xfregs.numChan.numColorChans == 0)
 	{
 		if (components & VB_HAS_COL0)
-			WRITE(p, "o.colors_0 = color0;\n");
+			out.Write("o.colors_0 = color0;\n");
 		else
-			WRITE(p, "o.colors_0 = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");		
+			out.Write("o.colors_0 = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
 	}
 
 	// TODO: This probably isn't necessary if pixel lighting is enabled.
-	p = GenerateLightingShader(p, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_");
+	_GenerateLightingShader<T,type>(out, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_");
 
 	if(xfregs.numChan.numColorChans < 2)
 	{
 		if (components & VB_HAS_COL1)
-			WRITE(p, "o.colors_1 = color1;\n");
+			out.Write("o.colors_1 = color1;\n");
 		else
-			WRITE(p, "o.colors_1 = o.colors_0;\n");		
+			out.Write("o.colors_1 = o.colors_0;\n");
 	}
 	// special case if only pos and tex coord 0 and tex coord input is AB11
 	// donko - this has caused problems in some games. removed for now.
@@ -322,21 +438,22 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type)
 		*/
 
 	// transform texcoords
-	WRITE(p, "float4 coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n");
+	out.Write("float4 coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n");
 	for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) {
 		TexMtxInfo& texinfo = xfregs.texMtxInfo[i];
 
-		WRITE(p, "{\n");
-		WRITE(p, "coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n");
+		out.Write("{\n");
+		out.Write("coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n");
+		SetUidField(texMtxInfo[i].sourcerow, xfregs.texMtxInfo[i].sourcerow);
 		switch (texinfo.sourcerow) {
 		case XF_SRCGEOM_INROW:
 			_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
-			WRITE(p, "coord = rawpos;\n"); // pos.w is 1
+			out.Write("coord = rawpos;\n"); // pos.w is 1
 			break;
 		case XF_SRCNORMAL_INROW:
 			if (components & VB_HAS_NRM0) {
 				_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
-				WRITE(p, "coord = float4(rawnorm0.xyz, 1.0f);\n");
+				out.Write("coord = float4(rawnorm0.xyz, 1.0f);\n");
 			}
 			break;
 		case XF_SRCCOLORS_INROW:
@@ -345,72 +462,79 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type)
 		case XF_SRCBINORMAL_T_INROW:
 			if (components & VB_HAS_NRM1) {
 				_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
-				WRITE(p, "coord = float4(rawnorm1.xyz, 1.0f);\n");
+				out.Write("coord = float4(rawnorm1.xyz, 1.0f);\n");
 			}
 			break;
 		case XF_SRCBINORMAL_B_INROW:
 			if (components & VB_HAS_NRM2) {
 				_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
-				WRITE(p, "coord = float4(rawnorm2.xyz, 1.0f);\n");
+				out.Write("coord = float4(rawnorm2.xyz, 1.0f);\n");
 			}
 			break;
 		default:
 			_assert_(texinfo.sourcerow <= XF_SRCTEX7_INROW);
 			if (components & (VB_HAS_UV0<<(texinfo.sourcerow - XF_SRCTEX0_INROW)) )
-				WRITE(p, "coord = float4(tex%d.x, tex%d.y, 1.0f, 1.0f);\n", texinfo.sourcerow - XF_SRCTEX0_INROW, texinfo.sourcerow - XF_SRCTEX0_INROW);
+				out.Write("coord = float4(tex%d.x, tex%d.y, 1.0f, 1.0f);\n", texinfo.sourcerow - XF_SRCTEX0_INROW, texinfo.sourcerow - XF_SRCTEX0_INROW);
 			break;
 		}
 
 		// first transformation
+		SetUidField(texMtxInfo[i].texgentype, xfregs.texMtxInfo[i].texgentype);
 		switch (texinfo.texgentype) {
 			case XF_TEXGEN_EMBOSS_MAP: // calculate tex coords into bump map
 
 				if (components & (VB_HAS_NRM1|VB_HAS_NRM2)) {
 					// transform the light dir into tangent space
-					WRITE(p, "ldir = normalize(" I_LIGHTS".lights[%d].pos.xyz - pos.xyz);\n", texinfo.embosslightshift);
-					WRITE(p, "o.tex%d.xyz = o.tex%d.xyz + float3(dot(ldir, _norm1), dot(ldir, _norm2), 0.0f);\n", i, texinfo.embosssourceshift);
+					SetUidField(texMtxInfo[i].embosslightshift, xfregs.texMtxInfo[i].embosslightshift);
+					SetUidField(texMtxInfo[i].embosssourceshift, xfregs.texMtxInfo[i].embosssourceshift);
+					out.Write("ldir = normalize(" I_LIGHTS".lights[%d].pos.xyz - pos.xyz);\n", texinfo.embosslightshift);
+					out.Write("o.tex%d.xyz = o.tex%d.xyz + float3(dot(ldir, _norm1), dot(ldir, _norm2), 0.0f);\n", i, texinfo.embosssourceshift);
 				}
 				else
 				{
 					_assert_(0); // should have normals
-					WRITE(p, "o.tex%d.xyz = o.tex%d.xyz;\n", i, texinfo.embosssourceshift);
+					SetUidField(texMtxInfo[i].embosssourceshift, xfregs.texMtxInfo[i].embosssourceshift);
+					out.Write("o.tex%d.xyz = o.tex%d.xyz;\n", i, texinfo.embosssourceshift);
 				}
 
 				break;
 			case XF_TEXGEN_COLOR_STRGBC0:
 				_assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
-				WRITE(p, "o.tex%d.xyz = float3(o.colors_0.x, o.colors_0.y, 1);\n", i);
+				out.Write("o.tex%d.xyz = float3(o.colors_0.x, o.colors_0.y, 1);\n", i);
 				break;
 			case XF_TEXGEN_COLOR_STRGBC1:
 				_assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
-				WRITE(p, "o.tex%d.xyz = float3(o.colors_1.x, o.colors_1.y, 1);\n", i);
+				out.Write("o.tex%d.xyz = float3(o.colors_1.x, o.colors_1.y, 1);\n", i);
 				break;
 			case XF_TEXGEN_REGULAR:
 			default:
+				SetUidField(texMtxInfo[i].projection, xfregs.texMtxInfo[i].projection);
 				if (components & (VB_HAS_TEXMTXIDX0<<i)) {
 					if (texinfo.projection == XF_TEXPROJ_STQ)
-						WRITE(p, "o.tex%d.xyz = float3(dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z].t), dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z+1].t), dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z+2].t));\n", i, i, i, i);
+						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z].t), dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z+1].t), dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z+2].t));\n", i, i, i, i);
 					else {
-						WRITE(p, "o.tex%d.xyz = float3(dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z].t), dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z+1].t), 1);\n", i, i, i);
+						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z].t), dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z+1].t), 1);\n", i, i, i);
 					}
 				}
 				else {
 					if (texinfo.projection == XF_TEXPROJ_STQ)
-						WRITE(p, "o.tex%d.xyz = float3(dot(coord, " I_TEXMATRICES".T[%d].t), dot(coord, " I_TEXMATRICES".T[%d].t), dot(coord, " I_TEXMATRICES".T[%d].t));\n", i, 3*i, 3*i+1, 3*i+2);
+						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TEXMATRICES".T[%d].t), dot(coord, " I_TEXMATRICES".T[%d].t), dot(coord, " I_TEXMATRICES".T[%d].t));\n", i, 3*i, 3*i+1, 3*i+2);
 					else
-						WRITE(p, "o.tex%d.xyz = float3(dot(coord, " I_TEXMATRICES".T[%d].t), dot(coord, " I_TEXMATRICES".T[%d].t), 1);\n", i, 3*i, 3*i+1);
+						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TEXMATRICES".T[%d].t), dot(coord, " I_TEXMATRICES".T[%d].t), 1);\n", i, 3*i, 3*i+1);
 				}
 				break;
 		}
 
+		SetUidField(dualTexTrans.enabled, xfregs.dualTexTrans.enabled);
 		if (xfregs.dualTexTrans.enabled && texinfo.texgentype == XF_TEXGEN_REGULAR) { // only works for regular tex gen types?
 			const PostMtxInfo& postInfo = xfregs.postMtxInfo[i];
 
+			SetUidField(postMtxInfo[i].index, xfregs.postMtxInfo[i].index);
 			int postidx = postInfo.index;
-			WRITE(p, "float4 P0 = " I_POSTTRANSFORMMATRICES".T[%d].t;\n"
-				"float4 P1 = " I_POSTTRANSFORMMATRICES".T[%d].t;\n"
-				"float4 P2 = " I_POSTTRANSFORMMATRICES".T[%d].t;\n",
-				postidx&0x3f, (postidx+1)&0x3f, (postidx+2)&0x3f);
+			out.Write("float4 P0 = " I_POSTTRANSFORMMATRICES".T[%d].t;\n"
+					"float4 P1 = " I_POSTTRANSFORMMATRICES".T[%d].t;\n"
+					"float4 P2 = " I_POSTTRANSFORMMATRICES".T[%d].t;\n",
+					postidx&0x3f, (postidx+1)&0x3f, (postidx+2)&0x3f);
 
 			if (texGenSpecialCase) {
 				// no normalization
@@ -418,70 +542,71 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type)
 				// q of output is unknown
 
 				// multiply by postmatrix
-				WRITE(p, "o.tex%d.xyz = float3(dot(P0.xy, o.tex%d.xy) + P0.z + P0.w, dot(P1.xy, o.tex%d.xy) + P1.z + P1.w, 0.0f);\n", i, i, i);
+				out.Write("o.tex%d.xyz = float3(dot(P0.xy, o.tex%d.xy) + P0.z + P0.w, dot(P1.xy, o.tex%d.xy) + P1.z + P1.w, 0.0f);\n", i, i, i);
 			}
 			else
 			{
+				SetUidField(postMtxInfo[i].normalize, xfregs.postMtxInfo[i].normalize);
 				if (postInfo.normalize)
-					WRITE(p, "o.tex%d.xyz = normalize(o.tex%d.xyz);\n", i, i);
+					out.Write("o.tex%d.xyz = normalize(o.tex%d.xyz);\n", i, i);
 
 				// multiply by postmatrix
-				WRITE(p, "o.tex%d.xyz = float3(dot(P0.xyz, o.tex%d.xyz) + P0.w, dot(P1.xyz, o.tex%d.xyz) + P1.w, dot(P2.xyz, o.tex%d.xyz) + P2.w);\n", i, i, i, i);
+				out.Write("o.tex%d.xyz = float3(dot(P0.xyz, o.tex%d.xyz) + P0.w, dot(P1.xyz, o.tex%d.xyz) + P1.w, dot(P2.xyz, o.tex%d.xyz) + P2.w);\n", i, i, i, i);
 			}
 		}
 
-		WRITE(p, "}\n");
+		out.Write("}\n");
 	}
 
 	// clipPos/w needs to be done in pixel shader, not here
 	if (xfregs.numTexGen.numTexGens < 7) {
-		WRITE(p, "o.clipPos = float4(pos.x,pos.y,o.pos.z,o.pos.w);\n");
+		out.Write("o.clipPos = float4(pos.x,pos.y,o.pos.z,o.pos.w);\n");
 	} else {
-		WRITE(p, "o.tex0.w = pos.x;\n");
-		WRITE(p, "o.tex1.w = pos.y;\n");
-		WRITE(p, "o.tex2.w = o.pos.z;\n");
-		WRITE(p, "o.tex3.w = o.pos.w;\n");
+		out.Write("o.tex0.w = pos.x;\n");
+		out.Write("o.tex1.w = pos.y;\n");
+		out.Write("o.tex2.w = o.pos.z;\n");
+		out.Write("o.tex3.w = o.pos.w;\n");
 	}
 
-	if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
+/*	if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
 	{
 		if (xfregs.numTexGen.numTexGens < 7) {
-			WRITE(p, "o.Normal = float4(_norm0.x,_norm0.y,_norm0.z,pos.z);\n");
+			out.Write("o.Normal = float4(_norm0.x,_norm0.y,_norm0.z,pos.z);\n");
 		} else {
-			WRITE(p, "o.tex4.w = _norm0.x;\n");
-			WRITE(p, "o.tex5.w = _norm0.y;\n");
-			WRITE(p, "o.tex6.w = _norm0.z;\n");
+			out.Write("o.tex4.w = _norm0.x;\n");
+			out.Write("o.tex5.w = _norm0.y;\n");
+			out.Write("o.tex6.w = _norm0.z;\n");
 			if (xfregs.numTexGen.numTexGens < 8)
-				WRITE(p, "o.tex7 = pos.xyzz;\n");
+				out.Write("o.tex7 = pos.xyzz;\n");
 			else
-				WRITE(p, "o.tex7.w = pos.z;\n");
-		}		
+				out.Write("o.tex7.w = pos.z;\n");
+		}
 		if (components & VB_HAS_COL0)
-			WRITE(p, "o.colors_0 = color0;\n");		
+			out.Write("o.colors_0 = color0;\n");
 
 		if (components & VB_HAS_COL1)
-			WRITE(p, "o.colors_1 = color1;\n");
-	}
+			out.Write("o.colors_1 = color1;\n");
+	}*/
 
 	//write the true depth value, if the game uses depth textures pixel shaders will override with the correct values
 	//if not early z culling will improve speed
 	// TODO: Can probably be dropped?
 	if (is_d3d)
 	{
-		WRITE(p, "o.pos.z = " I_DEPTHPARAMS".x * o.pos.w + o.pos.z * " I_DEPTHPARAMS".y;\n");
+		out.Write("o.pos.z = " I_DEPTHPARAMS".x * o.pos.w + o.pos.z * " I_DEPTHPARAMS".y;\n");
 	}
 	else
 	{
 	    // this results in a scale from -1..0 to -1..1 after perspective
 	    // divide
-	    WRITE(p, "o.pos.z = o.pos.w + o.pos.z * 2.0f;\n");
+	    out.Write("o.pos.z = o.pos.w + o.pos.z * 2.0f;\n");
 
 	    // Sonic Unleashed puts its final rendering at the near or
 	    // far plane of the viewing frustrum(actually box, they use
 	    // orthogonal projection for that), and we end up putting it
 	    // just beyond, and the rendering gets clipped away. (The
 	    // primitive gets dropped)
-	    WRITE(p, "o.pos.z = o.pos.z * 1048575.0f/1048576.0f;\n");
+	    out.Write("o.pos.z = o.pos.z * 1048575.0f/1048576.0f;\n");
 
 	    // the next steps of the OGL pipeline are:
 	    // (x_c,y_c,z_c,w_c) = o.pos  //switch to OGL spec terminology
@@ -489,7 +614,7 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type)
 	    // (x_d,y_d,z_d) = (x_c,y_c,z_c)/w_c//perspective divide
 	    // z_w = (f-n)/2*z_d + (n+f)/2
 	    // z_w now contains the value to go to the 0..1 depth buffer
-	    
+
 	    //trying to get the correct semantic while not using glDepthRange
 	    //seems to get rather complicated
 	}
@@ -498,14 +623,24 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type)
 	{
 		// D3D9 is addressing pixel centers instead of pixel boundaries in clip space.
 		// Thus we need to offset the final position by half a pixel
-		WRITE(p, "o.pos = o.pos + float4(" I_DEPTHPARAMS".z, " I_DEPTHPARAMS".w, 0.f, 0.f);\n");
+		out.Write("o.pos = o.pos + float4(" I_DEPTHPARAMS".z, " I_DEPTHPARAMS".w, 0.f, 0.f);\n");
 	}
 
-	WRITE(p, "return o;\n}\n");
+	out.Write("return o;\n}\n");
 
 
-	if (text[sizeof(text) - 1] != 0x7C)
-		PanicAlert("VertexShader generator - buffer too small, canary has been eaten!");
-	setlocale(LC_NUMERIC, ""); // restore locale
-	return text;
+///	if (text[sizeof(text) - 1] != 0x7C)
+///		PanicAlert("VertexShader generator - buffer too small, canary has been eaten!");
+	if (type == GO_ShaderCode)
+		setlocale(LC_NUMERIC, ""); // restore locale
+}
+
+void GenerateShaderUid(ShaderUid& object, u32 components, API_TYPE api_type)
+{
+	return GenerateShader<ShaderUid, GO_ShaderUid>(object, components, api_type);
+}
+
+void GenerateShaderCode(ShaderCode& object, u32 components, API_TYPE api_type)
+{
+	return GenerateShader<ShaderCode, GO_ShaderCode>(object, components, api_type);
 }
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h
index cb253a9b6c..11bb5c29f6 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h
@@ -18,6 +18,7 @@
 #ifndef GCOGL_VERTEXSHADER_H
 #define GCOGL_VERTEXSHADER_H
 
+#include <stdarg.h>
 #include "XFMemory.h"
 #include "VideoCommon.h"
 
@@ -48,71 +49,106 @@
 #define C_DEPTHPARAMS           (C_POSTTRANSFORMMATRICES + 64)
 #define C_VENVCONST_END			(C_DEPTHPARAMS + 4)
 
-template<bool safe>
-class _VERTEXSHADERUID
+// TODO: Need packing?
+struct uid_data
+{
+	u32 components;
+	u32 numColorChans : 2;
+	u32 numTexGens : 4;
+
+	struct {
+		u32 projection : 1; // XF_TEXPROJ_X
+		u32 inputform : 2; // XF_TEXINPUT_X
+		u32 texgentype : 3; // XF_TEXGEN_X
+		u32 sourcerow : 5; // XF_SRCGEOM_X
+		u32 embosssourceshift : 3; // what generated texcoord to use
+		u32 embosslightshift : 3; // light index that is used
+	} texMtxInfo[8];
+	struct {
+		u32 index : 6; // base row of dual transform matrix
+		u32 normalize : 1; // normalize before send operation
+	} postMtxInfo[8];
+	struct {
+		u32 enabled : 1;
+	} dualTexTrans;
+	struct {
+		u32 matsource : 1;
+		u32 enablelighting : 1;
+		u32 ambsource : 1;
+        u32 diffusefunc : 2;
+        u32 attnfunc : 2;
+		u32 light_mask : 8;
+	} lit_chans[4];
+};
+
+
+class ShaderUid
 {
-#define NUM_VSUID_VALUES_SAFE 25
 public:
-	u32 values[safe ? NUM_VSUID_VALUES_SAFE : 9];
-
-	_VERTEXSHADERUID()
+	ShaderUid()
 	{
+		memset(values, 0, sizeof(values));
 	}
 
-	_VERTEXSHADERUID(const _VERTEXSHADERUID& r)
+	void Write(const char* fmt, ...) {}
+	const char* GetBuffer() { return NULL; }
+	void SetBuffer(char* buffer) { }
+
+	bool operator == (const ShaderUid& obj) const
 	{
-		for (size_t i = 0; i < sizeof(values) / sizeof(u32); ++i) 
-			values[i] = r.values[i]; 
+		return memcmp(this->values, obj.values, sizeof(values)) == 0;
 	}
 
-	int GetNumValues() const 
+	// TODO: Store last frame used and order by that? makes much more sense anyway...
+	bool operator < (const ShaderUid& obj) const
 	{
-		if (safe) return NUM_VSUID_VALUES_SAFE;
-		else return (((values[0] >> 23) & 0xf) * 3 + 3) / 4 + 3; // numTexGens*3/4+1
-	}
-
-	bool operator <(const _VERTEXSHADERUID& _Right) const
-	{
-		if (values[0] < _Right.values[0])
-			return true;
-		else if (values[0] > _Right.values[0])
-			return false;
-		int N = GetNumValues();
-		for (int i = 1; i < N; ++i) 
+		for (int i = 0; i < 24; ++i)
 		{
-			if (values[i] < _Right.values[i])
+			if (this->values[i] < obj.values[i])
 				return true;
-			else if (values[i] > _Right.values[i])
+			else if (this->values[i] > obj.values[i])
 				return false;
 		}
 		return false;
 	}
 
-	bool operator ==(const _VERTEXSHADERUID& _Right) const
+	uid_data& GetUidData() { return data; }
+
+private:
+	union
 	{
-		if (values[0] != _Right.values[0])
-			return false;
-		int N = GetNumValues();
-		for (int i = 1; i < N; ++i)
-		{
-			if (values[i] != _Right.values[i])
-				return false;
-		}
-		return true;
-	}
+		uid_data data;
+		u32 values[24]; // TODO: Length?
+	};
 };
-typedef _VERTEXSHADERUID<false> VERTEXSHADERUID;
-typedef _VERTEXSHADERUID<true> VERTEXSHADERUIDSAFE;
 
+class ShaderCode
+{
+public:
+	ShaderCode() : buf(NULL), write_ptr(NULL)
+	{
 
-// components is included in the uid.
-char* GenerateVSOutputStruct(char* p, u32 components, API_TYPE api_type);
-const char *GenerateVertexShaderCode(u32 components, API_TYPE api_type);
+	}
 
-void GetVertexShaderId(VERTEXSHADERUID *uid, u32 components);
-void GetSafeVertexShaderId(VERTEXSHADERUIDSAFE *uid, u32 components);
+	void Write(const char* fmt, ...)
+	{
+		va_list arglist;
+		va_start(arglist, fmt);
+		write_ptr += vsprintf(write_ptr, fmt, arglist);
+		va_end(arglist);
+	}
+
+	const char* GetBuffer() { return buf; }
+	void SetBuffer(char* buffer) { buf = buffer; write_ptr = buffer; }
+	uid_data& GetUidData() { return *(uid_data*)NULL; }
+
+private:
+	const char* buf;
+	char* write_ptr;
+};
+
+void GenerateShaderUid(ShaderUid& object, u32 components, API_TYPE api_type);
+void GenerateShaderCode(ShaderCode& object, u32 components, API_TYPE api_type);
 
-// Used to make sure that our optimized vertex shader IDs don't lose any possible shader code changes
-void ValidateVertexShaderIDs(API_TYPE api, VERTEXSHADERUIDSAFE old_id, const std::string& old_code, u32 components);
 
 #endif // GCOGL_VERTEXSHADER_H
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
index dbbb7ee29b..7eaf1546da 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
@@ -42,7 +42,7 @@ GLuint VertexShaderCache::CurrentShader;
 bool VertexShaderCache::ShaderEnabled;
 
 VertexShaderCache::VSCacheEntry* VertexShaderCache::last_entry = NULL;
-VERTEXSHADERUID VertexShaderCache::last_uid;
+ShaderUid VertexShaderCache::last_uid;
 
 static int s_nMaxVertexInstructions;
 
@@ -74,14 +74,14 @@ void VertexShaderCache::Shutdown()
 
 VERTEXSHADER* VertexShaderCache::SetShader(u32 components)
 {
-	VERTEXSHADERUID uid;
-	GetVertexShaderId(&uid, components);
+	// Possible optimization: Don't always generate the shader uid, but keep track of changes in BPStructs instead
+	ShaderUid uid;
+	GenerateShaderUid(uid, components, API_OPENGL);
 	if (last_entry)
 	{
 		if (uid == last_uid)
 		{
 			GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
-			ValidateVertexShaderIDs(API_OPENGL, vshaders[uid].safe_uid, vshaders[uid].shader.strprog, components);
 			return &last_entry->shader;
 		}
 	}
@@ -95,15 +95,14 @@ VERTEXSHADER* VertexShaderCache::SetShader(u32 components)
 		last_entry = &entry;
 
 		GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
-		ValidateVertexShaderIDs(API_OPENGL, entry.safe_uid, entry.shader.strprog, components);
 		return &last_entry->shader;
 	}
 
 	// Make an entry in the table
 	VSCacheEntry& entry = vshaders[uid];
 	last_entry = &entry;
-	const char *code = GenerateVertexShaderCode(components, API_OPENGL);
-	GetSafeVertexShaderId(&entry.safe_uid, components);
+	ShaderCode code;
+	GenerateShaderCode(code, components, API_OPENGL);
 
 #if defined(_DEBUG) || defined(DEBUGFAST)
 	if (g_ActiveConfig.iLog & CONF_SAVESHADERS && code) {
@@ -111,11 +110,11 @@ VERTEXSHADER* VertexShaderCache::SetShader(u32 components)
 		char szTemp[MAX_PATH];
 		sprintf(szTemp, "%svs_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++);
 
-		SaveData(szTemp, code);
+		SaveData(szTemp, code.GetBuffer());
 	}
 #endif
 
-	if (!code || !VertexShaderCache::CompileVertexShader(entry.shader, code)) {
+	if (!code.GetBuffer() || !VertexShaderCache::CompileVertexShader(entry.shader, code.GetBuffer())) {
 		GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true);
 		return NULL;
 	}
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
index 6f4cbe25c2..f3831b3f7b 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
@@ -40,7 +40,7 @@ class VertexShaderCache
 	struct VSCacheEntry
 	{ 
 		VERTEXSHADER shader;
-		VERTEXSHADERUIDSAFE safe_uid;
+		ShaderUid safe_uid;
 		VSCacheEntry() {}
 		void Destroy() {
 			// printf("Destroying vs %i\n", shader.glprogid);
@@ -49,12 +49,12 @@ class VertexShaderCache
 		}
 	};
 
-	typedef std::map<VERTEXSHADERUID, VSCacheEntry> VSCache;
+	typedef std::map<ShaderUid, VSCacheEntry> VSCache;
 
 	static VSCache vshaders;
 
 	static VSCacheEntry* last_entry;
-	static VERTEXSHADERUID last_uid;
+	static ShaderUid last_uid; // TODO: Use reference instead..
 
 	static GLuint CurrentShader;
 	static bool ShaderEnabled;

From 3c8df842bba1067ce8f7f41dd1c13cb4f047fc90 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Mon, 6 Aug 2012 23:09:43 +0200
Subject: [PATCH 002/352] Moved some of the new shader uid stuff to a common
 header file.

---
 Source/Core/VideoCommon/Src/ShaderGenCommon.h |  94 +++
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  |  10 +-
 .../Core/VideoCommon/Src/VertexShaderGen.cpp~ | 645 ++++++++++++++++++
 Source/Core/VideoCommon/Src/VertexShaderGen.h |  72 +-
 .../Core/VideoCommon/Src/VertexShaderGen.h~   |  92 +++
 .../Plugin_VideoOGL/Src/VertexShaderCache.cpp |  10 +-
 .../Src/VertexShaderCache.cpp~                | 271 ++++++++
 .../Plugin_VideoOGL/Src/VertexShaderCache.h   |   6 +-
 .../Plugin_VideoOGL/Src/VertexShaderCache.h~  |  76 +++
 9 files changed, 1196 insertions(+), 80 deletions(-)
 create mode 100644 Source/Core/VideoCommon/Src/ShaderGenCommon.h
 create mode 100644 Source/Core/VideoCommon/Src/VertexShaderGen.cpp~
 create mode 100644 Source/Core/VideoCommon/Src/VertexShaderGen.h~
 create mode 100644 Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp~
 create mode 100644 Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h~

diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
new file mode 100644
index 0000000000..28fb8e8956
--- /dev/null
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -0,0 +1,94 @@
+// Copyright (C) 2003 Dolphin Project.
+
+// This program 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, version 2.0.
+
+// This program 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 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#ifndef _SHADERGENCOMMON_H
+#define _SHADERGENCOMMON_H
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include "CommonTypes.h"
+
+template<class uid_data>
+class ShaderUid
+{
+public:
+	ShaderUid()
+	{
+		memset(values, 0, sizeof(values));
+	}
+
+	void Write(const char* fmt, ...) {}
+	const char* GetBuffer() { return NULL; }
+	void SetBuffer(char* buffer) { }
+
+	bool operator == (const ShaderUid& obj) const
+	{
+		return memcmp(this->values, obj.values, sizeof(values)) == 0;
+	}
+
+	// TODO: Store last frame used and order by that? makes much more sense anyway...
+	bool operator < (const ShaderUid& obj) const
+	{
+		for (int i = 0; i < sizeof(uid_data) / sizeof(u32); ++i)
+		{
+			if (this->values[i] < obj.values[i])
+				return true;
+			else if (this->values[i] > obj.values[i])
+				return false;
+		}
+		return false;
+	}
+
+	uid_data& GetUidData() { return data; }
+
+private:
+	union
+	{
+		uid_data data;
+		u32 values[sizeof(uid_data) / sizeof(u32)];
+	};
+};
+
+// Needs to be a template for hacks...
+template<class uid_data>
+class ShaderCode
+{
+public:
+	ShaderCode() : buf(NULL), write_ptr(NULL)
+	{
+
+	}
+
+	void Write(const char* fmt, ...)
+	{
+		va_list arglist;
+		va_start(arglist, fmt);
+		write_ptr += vsprintf(write_ptr, fmt, arglist);
+		va_end(arglist);
+	}
+
+	const char* GetBuffer() { return buf; }
+	void SetBuffer(char* buffer) { buf = buffer; write_ptr = buffer; }
+	uid_data& GetUidData() { return *(uid_data*)NULL; }
+
+private:
+	const char* buf;
+	char* write_ptr;
+};
+
+#endif // _SHADERGENCOMMON_H
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index d7134b6dcb..acc89c6a54 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -267,7 +267,7 @@ void _GenerateLightingShader(T& object, int components, const char* materialsNam
 
 // TODO: Problem: this one uses copy constructors or sth for uids when returning...
 template<class T, GenOutput type>
-void GenerateShader(T& out, u32 components, API_TYPE api_type)
+void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 {
 #undef SetUidField
 #define SetUidField(name, value) if (type == GO_ShaderUid) {out.GetUidData().name = value; };
@@ -635,12 +635,12 @@ void GenerateShader(T& out, u32 components, API_TYPE api_type)
 		setlocale(LC_NUMERIC, ""); // restore locale
 }
 
-void GenerateShaderUid(ShaderUid& object, u32 components, API_TYPE api_type)
+void GetVertexShaderUid(VertexShaderUid& object, u32 components, API_TYPE api_type)
 {
-	return GenerateShader<ShaderUid, GO_ShaderUid>(object, components, api_type);
+	GenerateVertexShader<VertexShaderUid, GO_ShaderUid>(object, components, api_type);
 }
 
-void GenerateShaderCode(ShaderCode& object, u32 components, API_TYPE api_type)
+void GenerateVertexShaderCode(VertexShaderCode& object, u32 components, API_TYPE api_type)
 {
-	return GenerateShader<ShaderCode, GO_ShaderCode>(object, components, api_type);
+	GenerateVertexShader<VertexShaderCode, GO_ShaderCode>(object, components, api_type);
 }
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp~ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp~
new file mode 100644
index 0000000000..be57103918
--- /dev/null
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp~
@@ -0,0 +1,645 @@
+// Copyright (C) 2003 Dolphin Project.
+
+// This program 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, version 2.0.
+
+// This program 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 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#include <math.h>
+#include <locale.h>
+
+#include "NativeVertexFormat.h"
+
+#include "BPMemory.h"
+#include "CPMemory.h"
+#include "LightingShaderGen.h"
+#include "VertexShaderGen.h"
+#include "VideoConfig.h"
+
+static char text[16768];
+
+enum GenOutput
+{
+	GO_ShaderCode,
+	GO_ShaderUid,
+};
+// TODO: Check if something goes wrong if the cached shaders used pixel lighting but it's disabled later??
+template<class T>
+void GenerateVSOutputStruct(T& object, u32 components, API_TYPE api_type)
+{
+	object.Write("struct VS_OUTPUT {\n");
+	object.Write("  float4 pos : POSITION;\n");
+	object.Write("  float4 colors_0 : COLOR0;\n");
+	object.Write("  float4 colors_1 : COLOR1;\n");
+
+	if (xfregs.numTexGen.numTexGens < 7)
+	{
+		for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
+			object.Write("  float3 tex%d : TEXCOORD%d;\n", i, i);
+
+		object.Write("  float4 clipPos : TEXCOORD%d;\n", xfregs.numTexGen.numTexGens);
+///		if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
+///			object.Write("  float4 Normal : TEXCOORD%d;\n", xfregs.numTexGen.numTexGens + 1);
+	}
+	else
+	{
+		// clip position is in w of first 4 texcoords
+///		if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
+///		{
+///			for (int i = 0; i < 8; ++i)
+///				object.Write("  float4 tex%d : TEXCOORD%d;\n", i, i);
+///		}
+///		else
+		{
+			for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
+				object.Write("  float%d tex%d : TEXCOORD%d;\n", i < 4 ? 4 : 3 , i, i);
+		}
+	}
+	object.Write("};\n");
+}
+
+template<class T, GenOutput type>
+void _GenerateLightShader(T& object, int index, int litchan_index, const char* lightsName, int coloralpha)
+{
+#define SetUidField(name, value) if (type == GO_ShaderUid) { object.GetUidData().name = value; };
+	const LitChannel& chan = (litchan_index > 1) ? xfregs.alpha[litchan_index-2] : xfregs.color[litchan_index];
+	const char* swizzle = "xyzw";
+	if (coloralpha == 1 ) swizzle = "xyz";
+	else if (coloralpha == 2 ) swizzle = "w";
+
+	SetUidField(lit_chans[litchan_index].attnfunc, chan.attnfunc);
+	SetUidField(lit_chans[litchan_index].diffusefunc, chan.diffusefunc);
+	if (!(chan.attnfunc & 1)) {
+		// atten disabled
+		switch (chan.diffusefunc) {
+			case LIGHTDIF_NONE:
+				object.Write("lacc.%s += %s.lights[%d].col.%s;\n", swizzle, lightsName, index, swizzle);
+				break;
+			case LIGHTDIF_SIGN:
+			case LIGHTDIF_CLAMP:
+				object.Write("ldir = normalize(%s.lights[%d].pos.xyz - pos.xyz);\n", lightsName, index);
+				object.Write("lacc.%s += %sdot(ldir, _norm0)) * %s.lights[%d].col.%s;\n",
+					swizzle, chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(", lightsName, index, swizzle);
+				break;
+			default: _assert_(0);
+		}
+	}
+	else { // spec and spot
+
+		if (chan.attnfunc == 3)
+		{ // spot
+			object.Write("ldir = %s.lights[%d].pos.xyz - pos.xyz;\n", lightsName, index);
+			object.Write("dist2 = dot(ldir, ldir);\n"
+						"dist = sqrt(dist2);\n"
+						"ldir = ldir / dist;\n"
+						"attn = max(0.0f, dot(ldir, %s.lights[%d].dir.xyz));\n", lightsName, index);
+			object.Write("attn = max(0.0f, dot(%s.lights[%d].cosatt.xyz, float3(1.0f, attn, attn*attn))) / dot(%s.lights[%d].distatt.xyz, float3(1.0f,dist,dist2));\n", lightsName, index, lightsName, index);
+		}
+		else if (chan.attnfunc == 1)
+		{ // specular
+			object.Write("ldir = normalize(%s.lights[%d].pos.xyz);\n", lightsName, index);
+			object.Write("attn = (dot(_norm0,ldir) >= 0.0f) ? max(0.0f, dot(_norm0, %s.lights[%d].dir.xyz)) : 0.0f;\n", lightsName, index);
+			object.Write("attn = max(0.0f, dot(%s.lights[%d].cosatt.xyz, float3(1,attn,attn*attn))) / dot(%s.lights[%d].distatt.xyz, float3(1,attn,attn*attn));\n", lightsName, index, lightsName, index);
+		}
+
+		switch (chan.diffusefunc)
+		{
+			case LIGHTDIF_NONE:
+				object.Write("lacc.%s += attn * %s.lights[%d].col.%s;\n", swizzle, lightsName, index, swizzle);
+				break;
+			case LIGHTDIF_SIGN:
+			case LIGHTDIF_CLAMP:
+				object.Write("lacc.%s += attn * %sdot(ldir, _norm0)) * %s.lights[%d].col.%s;\n",
+					swizzle,
+					chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(",
+					lightsName,
+					index,
+					swizzle);
+				break;
+			default: _assert_(0);
+		}
+	}
+	object.Write("\n");
+}
+
+// vertex shader
+// lights/colors
+// materials name is I_MATERIALS in vs and I_PMATERIALS in ps
+// inColorName is color in vs and colors_ in ps
+// dest is o.colors_ in vs and colors_ in ps
+template<class T, GenOutput type>
+void _GenerateLightingShader(T& object, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest)
+{
+	for (unsigned int j = 0; j < xfregs.numChan.numColorChans; j++)
+	{
+		const LitChannel& color = xfregs.color[j];
+		const LitChannel& alpha = xfregs.alpha[j];
+
+		object.Write("{\n");
+
+		SetUidField(lit_chans[j].matsource, xfregs.color[j].matsource);
+		if (color.matsource) {// from vertex
+			if (components & (VB_HAS_COL0 << j))
+				object.Write("mat = %s%d;\n", inColorName, j);
+			else if (components & VB_HAS_COL0)
+				object.Write("mat = %s0;\n", inColorName);
+			else
+				object.Write("mat = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
+		}
+		else // from color
+			object.Write("mat = %s.C%d;\n", materialsName, j+2);
+
+		SetUidField(lit_chans[j].enablelighting, xfregs.color[j].enablelighting);
+		if (color.enablelighting) {
+			SetUidField(lit_chans[j].ambsource, xfregs.color[j].ambsource);
+			if (color.ambsource) { // from vertex
+				if (components & (VB_HAS_COL0<<j) )
+					object.Write("lacc = %s%d;\n", inColorName, j);
+				else if (components & VB_HAS_COL0 )
+					object.Write("lacc = %s0;\n", inColorName);
+				else
+					object.Write("lacc = float4(0.0f, 0.0f, 0.0f, 0.0f);\n");
+			}
+			else // from color
+				object.Write("lacc = %s.C%d;\n", materialsName, j);
+		}
+		else
+		{
+			object.Write("lacc = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
+		}
+
+		// check if alpha is different
+		SetUidField(lit_chans[j+2].matsource, xfregs.alpha[j].matsource);
+		if (alpha.matsource != color.matsource) {
+			if (alpha.matsource) {// from vertex
+				if (components & (VB_HAS_COL0<<j))
+					object.Write("mat.w = %s%d.w;\n", inColorName, j);
+				else if (components & VB_HAS_COL0)
+					object.Write("mat.w = %s0.w;\n", inColorName);
+				else object.Write("mat.w = 1.0f;\n");
+			}
+			else // from color
+				object.Write("mat.w = %s.C%d.w;\n", materialsName, j+2);
+		}
+
+		SetUidField(lit_chans[j+2].enablelighting, xfregs.alpha[j].enablelighting);
+		if (alpha.enablelighting)
+		{
+			SetUidField(lit_chans[j+2].ambsource, xfregs.alpha[j].ambsource);
+			if (alpha.ambsource) {// from vertex
+				if (components & (VB_HAS_COL0<<j) )
+					object.Write("lacc.w = %s%d.w;\n", inColorName, j);
+				else if (components & VB_HAS_COL0 )
+					object.Write("lacc.w = %s0.w;\n", inColorName);
+				else
+					object.Write("lacc.w = 0.0f;\n");
+			}
+			else // from color
+				object.Write("lacc.w = %s.C%d.w;\n", materialsName, j);
+		}
+		else
+		{
+			object.Write("lacc.w = 1.0f;\n");
+		}
+
+		if(color.enablelighting && alpha.enablelighting)
+		{
+			// both have lighting, test if they use the same lights
+			int mask = 0;
+			SetUidField(lit_chans[j].attnfunc, color.attnfunc);
+			SetUidField(lit_chans[j+2].attnfunc, alpha.attnfunc);
+			SetUidField(lit_chans[j].diffusefunc, color.diffusefunc);
+			SetUidField(lit_chans[j+2].diffusefunc, alpha.diffusefunc);
+			SetUidField(lit_chans[j].light_mask, color.GetFullLightMask());
+			SetUidField(lit_chans[j+2].light_mask, alpha.GetFullLightMask());
+			if(color.lightparams == alpha.lightparams)
+			{
+				mask = color.GetFullLightMask() & alpha.GetFullLightMask();
+				if(mask)
+				{
+					for (int i = 0; i < 8; ++i)
+					{
+						if (mask & (1<<i))
+						{
+							_GenerateLightShader<T,type>(object, i, j, lightsName, 3);
+						}
+					}
+				}
+			}
+
+			// no shared lights
+			for (int i = 0; i < 8; ++i)
+			{
+				if (!(mask&(1<<i)) && (color.GetFullLightMask() & (1<<i)))
+					_GenerateLightShader<T,type>(object, i, j, lightsName, 1);
+				if (!(mask&(1<<i)) && (alpha.GetFullLightMask() & (1<<i)))
+					_GenerateLightShader<T,type>(object, i, j+2, lightsName, 2);
+			}
+		}
+		else if (color.enablelighting || alpha.enablelighting)
+		{
+			// lights are disabled on one channel so process only the active ones
+			const LitChannel& workingchannel = color.enablelighting ? color : alpha;
+			const int lit_index = color.enablelighting ? j : (j+2);
+			int coloralpha = color.enablelighting ? 1 : 2;
+
+			SetUidField(lit_chans[lit_index].light_mask, workingchannel.GetFullLightMask());
+			for (int i = 0; i < 8; ++i)
+			{
+				if (workingchannel.GetFullLightMask() & (1<<i))
+					_GenerateLightShader<T,type>(object, i, lit_index, lightsName, coloralpha);
+			}
+		}
+		object.Write("%s%d = mat * saturate(lacc);\n", dest, j);
+		object.Write("}\n");
+	}
+}
+
+// TODO: Problem: this one uses copy constructors or sth for uids when returning...
+template<class T, GenOutput type>
+void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
+{
+#undef SetUidField
+#define SetUidField(name, value) if (type == GO_ShaderUid) {out.GetUidData().name = value; };
+
+	if (type == GO_ShaderCode)
+	{
+		out.SetBuffer(text);
+		setlocale(LC_NUMERIC, "C"); // Reset locale for compilation
+	}
+
+	///	text[sizeof(text) - 1] = 0x7C;  // canary
+
+	bool is_d3d = (api_type & API_D3D9 || api_type == API_D3D11);
+	u32 lightMask = 0;
+	if (xfregs.numChan.numColorChans > 0)
+		lightMask |= xfregs.color[0].GetFullLightMask() | xfregs.alpha[0].GetFullLightMask();
+	if (xfregs.numChan.numColorChans > 1)
+		lightMask |= xfregs.color[1].GetFullLightMask() | xfregs.alpha[1].GetFullLightMask();
+
+	out.Write("//Vertex Shader: comp:%x, \n", components);
+	out.Write("typedef struct { float4 T0, T1, T2; float4 N0, N1, N2; } s_" I_POSNORMALMATRIX";\n"
+			"typedef struct { float4 t; } FLT4;\n"
+			"typedef struct { FLT4 T[24]; } s_" I_TEXMATRICES";\n"
+			"typedef struct { FLT4 T[64]; } s_" I_TRANSFORMMATRICES";\n"
+			"typedef struct { FLT4 T[32]; } s_" I_NORMALMATRICES";\n"
+			"typedef struct { FLT4 T[64]; } s_" I_POSTTRANSFORMMATRICES";\n"
+			"typedef struct { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; } Light;\n"
+			"typedef struct { Light lights[8]; } s_" I_LIGHTS";\n"
+			"typedef struct { float4 C0, C1, C2, C3; } s_" I_MATERIALS";\n"
+			"typedef struct { float4 T0, T1, T2, T3; } s_" I_PROJECTION";\n"
+			);
+
+///	p = GenerateVSOutputStruct(p, components, api_type);
+	GenerateVSOutputStruct(out, components, api_type);
+
+	// uniforms
+
+	out.Write("uniform s_" I_TRANSFORMMATRICES" " I_TRANSFORMMATRICES" : register(c%d);\n", C_TRANSFORMMATRICES);
+	out.Write("uniform s_" I_TEXMATRICES" " I_TEXMATRICES" : register(c%d);\n", C_TEXMATRICES);
+	out.Write("uniform s_" I_NORMALMATRICES" " I_NORMALMATRICES" : register(c%d);\n", C_NORMALMATRICES);
+	out.Write("uniform s_" I_POSNORMALMATRIX" " I_POSNORMALMATRIX" : register(c%d);\n", C_POSNORMALMATRIX);
+	out.Write("uniform s_" I_POSTTRANSFORMMATRICES" " I_POSTTRANSFORMMATRICES" : register(c%d);\n", C_POSTTRANSFORMMATRICES);
+	out.Write("uniform s_" I_LIGHTS" " I_LIGHTS" : register(c%d);\n", C_LIGHTS);
+	out.Write("uniform s_" I_MATERIALS" " I_MATERIALS" : register(c%d);\n", C_MATERIALS);
+	out.Write("uniform s_" I_PROJECTION" " I_PROJECTION" : register(c%d);\n", C_PROJECTION);
+	out.Write("uniform float4 " I_DEPTHPARAMS" : register(c%d);\n", C_DEPTHPARAMS);
+
+	out.Write("VS_OUTPUT main(\n");
+
+	SetUidField(numTexGens, xfregs.numTexGen.numTexGens);
+	SetUidField(components, components);
+	// inputs
+	if (components & VB_HAS_NRM0)
+		out.Write("  float3 rawnorm0 : NORMAL0,\n");
+	if (components & VB_HAS_NRM1)
+	{
+		if (is_d3d)
+			out.Write("  float3 rawnorm1 : NORMAL1,\n");
+		else
+			out.Write("  float3 rawnorm1 : ATTR%d,\n", SHADER_NORM1_ATTRIB);
+	}
+	if (components & VB_HAS_NRM2)
+	{
+		if (is_d3d)
+			out.Write("  float3 rawnorm2 : NORMAL2,\n");
+		else
+			out.Write("  float3 rawnorm2 : ATTR%d,\n", SHADER_NORM2_ATTRIB);
+	}
+	if (components & VB_HAS_COL0)
+		out.Write("  float4 color0 : COLOR0,\n");
+	if (components & VB_HAS_COL1)
+		out.Write("  float4 color1 : COLOR1,\n");
+	for (int i = 0; i < 8; ++i) {
+		u32 hastexmtx = (components & (VB_HAS_TEXMTXIDX0<<i));
+		if ((components & (VB_HAS_UV0<<i)) || hastexmtx)
+			out.Write("  float%d tex%d : TEXCOORD%d,\n", hastexmtx ? 3 : 2, i, i);
+	}
+	if (components & VB_HAS_POSMTXIDX) {
+		if (is_d3d)
+		{
+			out.Write("  float4 blend_indices : BLENDINDICES,\n");
+		}
+		else
+			out.Write("  float fposmtx : ATTR%d,\n", SHADER_POSMTX_ATTRIB);
+	}
+	out.Write("  float4 rawpos : POSITION) {\n");
+	out.Write("VS_OUTPUT o;\n");
+
+	// transforms
+	if (components & VB_HAS_POSMTXIDX)
+	{
+		if (api_type & API_D3D9)
+		{
+			out.Write("int4 indices = D3DCOLORtoUBYTE4(blend_indices);\n");
+			out.Write("int posmtx = indices.x;\n");
+		}
+		else if (api_type == API_D3D11)
+		{
+			out.Write("int posmtx = blend_indices.x * 255.0f;\n");
+		}
+		else
+		{
+			out.Write("int posmtx = fposmtx;\n");
+		}
+
+		out.Write("float4 pos = float4(dot(" I_TRANSFORMMATRICES".T[posmtx].t, rawpos), dot(" I_TRANSFORMMATRICES".T[posmtx+1].t, rawpos), dot(" I_TRANSFORMMATRICES".T[posmtx+2].t, rawpos), 1);\n");
+
+		if (components & VB_HAS_NRMALL) {
+			out.Write("int normidx = posmtx >= 32 ? (posmtx-32) : posmtx;\n");
+			out.Write("float3 N0 = " I_NORMALMATRICES".T[normidx].t.xyz, N1 = " I_NORMALMATRICES".T[normidx+1].t.xyz, N2 = " I_NORMALMATRICES".T[normidx+2].t.xyz;\n");
+		}
+
+		if (components & VB_HAS_NRM0)
+			out.Write("float3 _norm0 = normalize(float3(dot(N0, rawnorm0), dot(N1, rawnorm0), dot(N2, rawnorm0)));\n");
+		if (components & VB_HAS_NRM1)
+			out.Write("float3 _norm1 = float3(dot(N0, rawnorm1), dot(N1, rawnorm1), dot(N2, rawnorm1));\n");
+		if (components & VB_HAS_NRM2)
+			out.Write("float3 _norm2 = float3(dot(N0, rawnorm2), dot(N1, rawnorm2), dot(N2, rawnorm2));\n");
+	}
+	else
+	{
+		out.Write("float4 pos = float4(dot(" I_POSNORMALMATRIX".T0, rawpos), dot(" I_POSNORMALMATRIX".T1, rawpos), dot(" I_POSNORMALMATRIX".T2, rawpos), 1.0f);\n");
+		if (components & VB_HAS_NRM0)
+			out.Write("float3 _norm0 = normalize(float3(dot(" I_POSNORMALMATRIX".N0.xyz, rawnorm0), dot(" I_POSNORMALMATRIX".N1.xyz, rawnorm0), dot(" I_POSNORMALMATRIX".N2.xyz, rawnorm0)));\n");
+		if (components & VB_HAS_NRM1)
+			out.Write("float3 _norm1 = float3(dot(" I_POSNORMALMATRIX".N0.xyz, rawnorm1), dot(" I_POSNORMALMATRIX".N1.xyz, rawnorm1), dot(" I_POSNORMALMATRIX".N2.xyz, rawnorm1));\n");
+		if (components & VB_HAS_NRM2)
+			out.Write("float3 _norm2 = float3(dot(" I_POSNORMALMATRIX".N0.xyz, rawnorm2), dot(" I_POSNORMALMATRIX".N1.xyz, rawnorm2), dot(" I_POSNORMALMATRIX".N2.xyz, rawnorm2));\n");
+	}
+
+	if (!(components & VB_HAS_NRM0))
+		out.Write("float3 _norm0 = float3(0.0f, 0.0f, 0.0f);\n");
+
+
+
+	out.Write("o.pos = float4(dot(" I_PROJECTION".T0, pos), dot(" I_PROJECTION".T1, pos), dot(" I_PROJECTION".T2, pos), dot(" I_PROJECTION".T3, pos));\n");
+
+	out.Write("float4 mat, lacc;\n"
+			"float3 ldir, h;\n"
+			"float dist, dist2, attn;\n");
+
+	SetUidField(numColorChans, xfregs.numChan.numColorChans);
+	if(xfregs.numChan.numColorChans == 0)
+	{
+		if (components & VB_HAS_COL0)
+			out.Write("o.colors_0 = color0;\n");
+		else
+			out.Write("o.colors_0 = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
+	}
+
+	// TODO: This probably isn't necessary if pixel lighting is enabled.
+	_GenerateLightingShader<T,type>(out, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_");
+
+	if(xfregs.numChan.numColorChans < 2)
+	{
+		if (components & VB_HAS_COL1)
+			out.Write("o.colors_1 = color1;\n");
+		else
+			out.Write("o.colors_1 = o.colors_0;\n");
+	}
+	// special case if only pos and tex coord 0 and tex coord input is AB11
+	// donko - this has caused problems in some games. removed for now.
+	bool texGenSpecialCase = false;
+	/*bool texGenSpecialCase =
+		((g_VtxDesc.Hex & 0x60600L) == g_VtxDesc.Hex) && // only pos and tex coord 0
+		(g_VtxDesc.Tex0Coord != NOT_PRESENT) &&
+		(xfregs.texcoords[0].texmtxinfo.inputform == XF_TEXINPUT_AB11);
+		*/
+
+	// transform texcoords
+	out.Write("float4 coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n");
+	for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) {
+		TexMtxInfo& texinfo = xfregs.texMtxInfo[i];
+
+		out.Write("{\n");
+		out.Write("coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n");
+		SetUidField(texMtxInfo[i].sourcerow, xfregs.texMtxInfo[i].sourcerow);
+		switch (texinfo.sourcerow) {
+		case XF_SRCGEOM_INROW:
+			_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
+			out.Write("coord = rawpos;\n"); // pos.w is 1
+			break;
+		case XF_SRCNORMAL_INROW:
+			if (components & VB_HAS_NRM0) {
+				_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
+				out.Write("coord = float4(rawnorm0.xyz, 1.0f);\n");
+			}
+			break;
+		case XF_SRCCOLORS_INROW:
+			_assert_( texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC0 || texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC1 );
+			break;
+		case XF_SRCBINORMAL_T_INROW:
+			if (components & VB_HAS_NRM1) {
+				_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
+				out.Write("coord = float4(rawnorm1.xyz, 1.0f);\n");
+			}
+			break;
+		case XF_SRCBINORMAL_B_INROW:
+			if (components & VB_HAS_NRM2) {
+				_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
+				out.Write("coord = float4(rawnorm2.xyz, 1.0f);\n");
+			}
+			break;
+		default:
+			_assert_(texinfo.sourcerow <= XF_SRCTEX7_INROW);
+			if (components & (VB_HAS_UV0<<(texinfo.sourcerow - XF_SRCTEX0_INROW)) )
+				out.Write("coord = float4(tex%d.x, tex%d.y, 1.0f, 1.0f);\n", texinfo.sourcerow - XF_SRCTEX0_INROW, texinfo.sourcerow - XF_SRCTEX0_INROW);
+			break;
+		}
+
+		// first transformation
+		SetUidField(texMtxInfo[i].texgentype, xfregs.texMtxInfo[i].texgentype);
+		switch (texinfo.texgentype) {
+			case XF_TEXGEN_EMBOSS_MAP: // calculate tex coords into bump map
+
+				if (components & (VB_HAS_NRM1|VB_HAS_NRM2)) {
+					// transform the light dir into tangent space
+					SetUidField(texMtxInfo[i].embosslightshift, xfregs.texMtxInfo[i].embosslightshift);
+					SetUidField(texMtxInfo[i].embosssourceshift, xfregs.texMtxInfo[i].embosssourceshift);
+					out.Write("ldir = normalize(" I_LIGHTS".lights[%d].pos.xyz - pos.xyz);\n", texinfo.embosslightshift);
+					out.Write("o.tex%d.xyz = o.tex%d.xyz + float3(dot(ldir, _norm1), dot(ldir, _norm2), 0.0f);\n", i, texinfo.embosssourceshift);
+				}
+				else
+				{
+					_assert_(0); // should have normals
+					SetUidField(texMtxInfo[i].embosssourceshift, xfregs.texMtxInfo[i].embosssourceshift);
+					out.Write("o.tex%d.xyz = o.tex%d.xyz;\n", i, texinfo.embosssourceshift);
+				}
+
+				break;
+			case XF_TEXGEN_COLOR_STRGBC0:
+				_assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
+				out.Write("o.tex%d.xyz = float3(o.colors_0.x, o.colors_0.y, 1);\n", i);
+				break;
+			case XF_TEXGEN_COLOR_STRGBC1:
+				_assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
+				out.Write("o.tex%d.xyz = float3(o.colors_1.x, o.colors_1.y, 1);\n", i);
+				break;
+			case XF_TEXGEN_REGULAR:
+			default:
+				SetUidField(texMtxInfo[i].projection, xfregs.texMtxInfo[i].projection);
+				if (components & (VB_HAS_TEXMTXIDX0<<i)) {
+					if (texinfo.projection == XF_TEXPROJ_STQ)
+						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z].t), dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z+1].t), dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z+2].t));\n", i, i, i, i);
+					else {
+						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z].t), dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z+1].t), 1);\n", i, i, i);
+					}
+				}
+				else {
+					if (texinfo.projection == XF_TEXPROJ_STQ)
+						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TEXMATRICES".T[%d].t), dot(coord, " I_TEXMATRICES".T[%d].t), dot(coord, " I_TEXMATRICES".T[%d].t));\n", i, 3*i, 3*i+1, 3*i+2);
+					else
+						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TEXMATRICES".T[%d].t), dot(coord, " I_TEXMATRICES".T[%d].t), 1);\n", i, 3*i, 3*i+1);
+				}
+				break;
+		}
+
+		SetUidField(dualTexTrans.enabled, xfregs.dualTexTrans.enabled);
+		if (xfregs.dualTexTrans.enabled && texinfo.texgentype == XF_TEXGEN_REGULAR) { // only works for regular tex gen types?
+			const PostMtxInfo& postInfo = xfregs.postMtxInfo[i];
+
+			SetUidField(postMtxInfo[i].index, xfregs.postMtxInfo[i].index);
+			int postidx = postInfo.index;
+			out.Write("float4 P0 = " I_POSTTRANSFORMMATRICES".T[%d].t;\n"
+					"float4 P1 = " I_POSTTRANSFORMMATRICES".T[%d].t;\n"
+					"float4 P2 = " I_POSTTRANSFORMMATRICES".T[%d].t;\n",
+					postidx&0x3f, (postidx+1)&0x3f, (postidx+2)&0x3f);
+
+			if (texGenSpecialCase) {
+				// no normalization
+				// q of input is 1
+				// q of output is unknown
+
+				// multiply by postmatrix
+				out.Write("o.tex%d.xyz = float3(dot(P0.xy, o.tex%d.xy) + P0.z + P0.w, dot(P1.xy, o.tex%d.xy) + P1.z + P1.w, 0.0f);\n", i, i, i);
+			}
+			else
+			{
+				SetUidField(postMtxInfo[i].normalize, xfregs.postMtxInfo[i].normalize);
+				if (postInfo.normalize)
+					out.Write("o.tex%d.xyz = normalize(o.tex%d.xyz);\n", i, i);
+
+				// multiply by postmatrix
+				out.Write("o.tex%d.xyz = float3(dot(P0.xyz, o.tex%d.xyz) + P0.w, dot(P1.xyz, o.tex%d.xyz) + P1.w, dot(P2.xyz, o.tex%d.xyz) + P2.w);\n", i, i, i, i);
+			}
+		}
+
+		out.Write("}\n");
+	}
+
+	// clipPos/w needs to be done in pixel shader, not here
+	if (xfregs.numTexGen.numTexGens < 7) {
+		out.Write("o.clipPos = float4(pos.x,pos.y,o.pos.z,o.pos.w);\n");
+	} else {
+		out.Write("o.tex0.w = pos.x;\n");
+		out.Write("o.tex1.w = pos.y;\n");
+		out.Write("o.tex2.w = o.pos.z;\n");
+		out.Write("o.tex3.w = o.pos.w;\n");
+	}
+
+/*	if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
+	{
+		if (xfregs.numTexGen.numTexGens < 7) {
+			out.Write("o.Normal = float4(_norm0.x,_norm0.y,_norm0.z,pos.z);\n");
+		} else {
+			out.Write("o.tex4.w = _norm0.x;\n");
+			out.Write("o.tex5.w = _norm0.y;\n");
+			out.Write("o.tex6.w = _norm0.z;\n");
+			if (xfregs.numTexGen.numTexGens < 8)
+				out.Write("o.tex7 = pos.xyzz;\n");
+			else
+				out.Write("o.tex7.w = pos.z;\n");
+		}
+		if (components & VB_HAS_COL0)
+			out.Write("o.colors_0 = color0;\n");
+
+		if (components & VB_HAS_COL1)
+			out.Write("o.colors_1 = color1;\n");
+	}*/
+
+	//write the true depth value, if the game uses depth textures pixel shaders will override with the correct values
+	//if not early z culling will improve speed
+	if (is_d3d)
+	{
+		out.Write("o.pos.z = " I_DEPTHPARAMS".x * o.pos.w + o.pos.z * " I_DEPTHPARAMS".y;\n");
+	}
+	else
+	{
+	    // this results in a scale from -1..0 to -1..1 after perspective
+	    // divide
+	    out.Write("o.pos.z = o.pos.w + o.pos.z * 2.0f;\n");
+
+	    // Sonic Unleashed puts its final rendering at the near or
+	    // far plane of the viewing frustrum(actually box, they use
+	    // orthogonal projection for that), and we end up putting it
+	    // just beyond, and the rendering gets clipped away. (The
+	    // primitive gets dropped)
+	    out.Write("o.pos.z = o.pos.z * 1048575.0f/1048576.0f;\n");
+
+	    // the next steps of the OGL pipeline are:
+	    // (x_c,y_c,z_c,w_c) = o.pos  //switch to OGL spec terminology
+	    // clipping to -w_c <= (x_c,y_c,z_c) <= w_c
+	    // (x_d,y_d,z_d) = (x_c,y_c,z_c)/w_c//perspective divide
+	    // z_w = (f-n)/2*z_d + (n+f)/2
+	    // z_w now contains the value to go to the 0..1 depth buffer
+
+	    //trying to get the correct semantic while not using glDepthRange
+	    //seems to get rather complicated
+	}
+
+	if (api_type & API_D3D9)
+	{
+		// D3D9 is addressing pixel centers instead of pixel boundaries in clip space.
+		// Thus we need to offset the final position by half a pixel
+		out.Write("o.pos = o.pos + float4(" I_DEPTHPARAMS".z, " I_DEPTHPARAMS".w, 0.f, 0.f);\n");
+	}
+
+	out.Write("return o;\n}\n");
+
+
+///	if (text[sizeof(text) - 1] != 0x7C)
+///		PanicAlert("VertexShader generator - buffer too small, canary has been eaten!");
+	if (type == GO_ShaderCode)
+		setlocale(LC_NUMERIC, ""); // restore locale
+}
+
+void GetVertexShaderUid(VertexShaderUid& object, u32 components, API_TYPE api_type)
+{
+	GenerateVertexShader<ShaderUid, GO_ShaderUid>(object, components, api_type);
+}
+
+void GenerateVertexShaderCode(VertexShaderCode& object, u32 components, API_TYPE api_type)
+{
+	GenerateVertexShader<ShaderCode, GO_ShaderCode>(object, components, api_type);
+}
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h
index 11bb5c29f6..32d3eff91b 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h
@@ -21,6 +21,7 @@
 #include <stdarg.h>
 #include "XFMemory.h"
 #include "VideoCommon.h"
+#include "ShaderGenCommon.h"
 
 #define SHADER_POSMTX_ATTRIB 1
 #define SHADER_NORM1_ATTRIB  6
@@ -81,74 +82,11 @@ struct uid_data
 	} lit_chans[4];
 };
 
+typedef ShaderUid<uid_data> VertexShaderUid;
+typedef ShaderCode<uid_data> VertexShaderCode;
 
-class ShaderUid
-{
-public:
-	ShaderUid()
-	{
-		memset(values, 0, sizeof(values));
-	}
-
-	void Write(const char* fmt, ...) {}
-	const char* GetBuffer() { return NULL; }
-	void SetBuffer(char* buffer) { }
-
-	bool operator == (const ShaderUid& obj) const
-	{
-		return memcmp(this->values, obj.values, sizeof(values)) == 0;
-	}
-
-	// TODO: Store last frame used and order by that? makes much more sense anyway...
-	bool operator < (const ShaderUid& obj) const
-	{
-		for (int i = 0; i < 24; ++i)
-		{
-			if (this->values[i] < obj.values[i])
-				return true;
-			else if (this->values[i] > obj.values[i])
-				return false;
-		}
-		return false;
-	}
-
-	uid_data& GetUidData() { return data; }
-
-private:
-	union
-	{
-		uid_data data;
-		u32 values[24]; // TODO: Length?
-	};
-};
-
-class ShaderCode
-{
-public:
-	ShaderCode() : buf(NULL), write_ptr(NULL)
-	{
-
-	}
-
-	void Write(const char* fmt, ...)
-	{
-		va_list arglist;
-		va_start(arglist, fmt);
-		write_ptr += vsprintf(write_ptr, fmt, arglist);
-		va_end(arglist);
-	}
-
-	const char* GetBuffer() { return buf; }
-	void SetBuffer(char* buffer) { buf = buffer; write_ptr = buffer; }
-	uid_data& GetUidData() { return *(uid_data*)NULL; }
-
-private:
-	const char* buf;
-	char* write_ptr;
-};
-
-void GenerateShaderUid(ShaderUid& object, u32 components, API_TYPE api_type);
-void GenerateShaderCode(ShaderCode& object, u32 components, API_TYPE api_type);
+void GetVertexShaderUid(VertexShaderUid& object, u32 components, API_TYPE api_type);
+void GenerateVertexShaderCode(VertexShaderCode& object, u32 components, API_TYPE api_type);
 
 
 #endif // GCOGL_VERTEXSHADER_H
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h~ b/Source/Core/VideoCommon/Src/VertexShaderGen.h~
new file mode 100644
index 0000000000..050ed76649
--- /dev/null
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h~
@@ -0,0 +1,92 @@
+// Copyright (C) 2003 Dolphin Project.
+
+// This program 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, version 2.0.
+
+// This program 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 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#ifndef GCOGL_VERTEXSHADER_H
+#define GCOGL_VERTEXSHADER_H
+
+#include <stdarg.h>
+#include "XFMemory.h"
+#include "VideoCommon.h"
+#include "ShaderGenCommon.h"
+
+#define SHADER_POSMTX_ATTRIB 1
+#define SHADER_NORM1_ATTRIB  6
+#define SHADER_NORM2_ATTRIB  7
+
+
+// shader variables
+#define I_POSNORMALMATRIX       "cpnmtx"
+#define I_PROJECTION            "cproj"
+#define I_MATERIALS             "cmtrl"
+#define I_LIGHTS                "clights"
+#define I_TEXMATRICES           "ctexmtx"
+#define I_TRANSFORMMATRICES     "ctrmtx"
+#define I_NORMALMATRICES        "cnmtx"
+#define I_POSTTRANSFORMMATRICES "cpostmtx"
+#define I_DEPTHPARAMS           "cDepth" // farZ, zRange, scaled viewport width, scaled viewport height
+
+#define C_POSNORMALMATRIX        0
+#define C_PROJECTION            (C_POSNORMALMATRIX + 6)
+#define C_MATERIALS             (C_PROJECTION + 4)
+#define C_LIGHTS                (C_MATERIALS + 4)
+#define C_TEXMATRICES           (C_LIGHTS + 40)
+#define C_TRANSFORMMATRICES     (C_TEXMATRICES + 24)
+#define C_NORMALMATRICES        (C_TRANSFORMMATRICES + 64)
+#define C_POSTTRANSFORMMATRICES (C_NORMALMATRICES + 32)
+#define C_DEPTHPARAMS           (C_POSTTRANSFORMMATRICES + 64)
+#define C_VENVCONST_END			(C_DEPTHPARAMS + 4)
+
+// TODO: Need packing?
+struct uid_data
+{
+	u32 components;
+	u32 numColorChans : 2;
+	u32 numTexGens : 4;
+
+	struct {
+		u32 projection : 1; // XF_TEXPROJ_X
+		u32 inputform : 2; // XF_TEXINPUT_X
+		u32 texgentype : 3; // XF_TEXGEN_X
+		u32 sourcerow : 5; // XF_SRCGEOM_X
+		u32 embosssourceshift : 3; // what generated texcoord to use
+		u32 embosslightshift : 3; // light index that is used
+	} texMtxInfo[8];
+	struct {
+		u32 index : 6; // base row of dual transform matrix
+		u32 normalize : 1; // normalize before send operation
+	} postMtxInfo[8];
+	struct {
+		u32 enabled : 1;
+	} dualTexTrans;
+	struct {
+		u32 matsource : 1;
+		u32 enablelighting : 1;
+		u32 ambsource : 1;
+        u32 diffusefunc : 2;
+        u32 attnfunc : 2;
+		u32 light_mask : 8;
+	} lit_chans[4];
+};
+
+typedef ShaderUid<uid_data, 24> VertexShaderUid;
+typedef ShaderCode<uid_data> VertexShaderCode;
+
+void GetVertexShaderUid(VertexShaderUid& object, u32 components, API_TYPE api_type);
+void GenerateVertexShaderCode(VertexShaderCode& object, u32 components, API_TYPE api_type);
+
+
+#endif // GCOGL_VERTEXSHADER_H
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
index 7eaf1546da..29dd76fe6d 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
@@ -42,7 +42,7 @@ GLuint VertexShaderCache::CurrentShader;
 bool VertexShaderCache::ShaderEnabled;
 
 VertexShaderCache::VSCacheEntry* VertexShaderCache::last_entry = NULL;
-ShaderUid VertexShaderCache::last_uid;
+VertexShaderUid VertexShaderCache::last_uid;
 
 static int s_nMaxVertexInstructions;
 
@@ -75,8 +75,8 @@ void VertexShaderCache::Shutdown()
 VERTEXSHADER* VertexShaderCache::SetShader(u32 components)
 {
 	// Possible optimization: Don't always generate the shader uid, but keep track of changes in BPStructs instead
-	ShaderUid uid;
-	GenerateShaderUid(uid, components, API_OPENGL);
+	VertexShaderUid uid;
+	GetVertexShaderUid(uid, components, API_OPENGL);
 	if (last_entry)
 	{
 		if (uid == last_uid)
@@ -101,8 +101,8 @@ VERTEXSHADER* VertexShaderCache::SetShader(u32 components)
 	// Make an entry in the table
 	VSCacheEntry& entry = vshaders[uid];
 	last_entry = &entry;
-	ShaderCode code;
-	GenerateShaderCode(code, components, API_OPENGL);
+	VertexShaderCode code;
+	GenerateVertexShaderCode(code, components, API_OPENGL);
 
 #if defined(_DEBUG) || defined(DEBUGFAST)
 	if (g_ActiveConfig.iLog & CONF_SAVESHADERS && code) {
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp~ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp~
new file mode 100644
index 0000000000..f42cf09581
--- /dev/null
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp~
@@ -0,0 +1,271 @@
+// Copyright (C) 2003 Dolphin Project.
+
+// This program 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, version 2.0.
+
+// This program 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 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#include <math.h>
+
+#include "Globals.h"
+#include "VideoConfig.h"
+#include "Statistics.h"
+
+#include "GLUtil.h"
+
+#include "Render.h"
+#include "VertexShaderGen.h"
+#include "VertexShaderManager.h"
+#include "VertexShaderCache.h"
+#include "VertexManager.h"
+#include "VertexLoader.h"
+#include "XFMemory.h"
+#include "ImageWrite.h"
+#include "FileUtil.h"
+#include "Debugger.h"
+
+namespace OGL
+{
+
+VertexShaderCache::VSCache VertexShaderCache::vshaders;
+GLuint VertexShaderCache::CurrentShader;
+bool VertexShaderCache::ShaderEnabled;
+
+VertexShaderCache::VSCacheEntry* VertexShaderCache::last_entry = NULL;
+VertexShaderUid VertexShaderCache::last_uid;
+
+static int s_nMaxVertexInstructions;
+
+
+void VertexShaderCache::Init()
+{
+	glEnable(GL_VERTEX_PROGRAM_ARB);
+	ShaderEnabled = true;
+	CurrentShader = 0;
+	last_entry = NULL;
+
+	glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB, (GLint *)&s_nMaxVertexInstructions);		
+	if (strstr((const char*)glGetString(GL_VENDOR), "Humper") != NULL) s_nMaxVertexInstructions = 4096;
+#if CG_VERSION_NUM == 2100
+	if (strstr((const char*)glGetString(GL_VENDOR), "ATI") != NULL)
+	{
+		s_nMaxVertexInstructions = 4096;
+	}
+#endif
+}
+
+void VertexShaderCache::Shutdown()
+{
+	for (VSCache::iterator iter = vshaders.begin(); iter != vshaders.end(); ++iter)
+		iter->second.Destroy();
+	vshaders.clear();
+}
+
+
+VERTEXSHADER* VertexShaderCache::SetShader(u32 components)
+{
+	// Possible optimization: Don't always generate the shader uid, but keep track of changes in BPStructs instead
+	VertexShaderUid uid;
+	GetVertexShaderUid(uid, components, API_OPENGL);
+	if (last_entry)
+	{
+		if (uid == last_uid)
+		{
+			GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
+			return &last_entry->shader;
+		}
+	}
+
+	last_uid = uid;
+
+	VSCache::iterator iter = vshaders.find(uid);
+	if (iter != vshaders.end())
+	{
+		VSCacheEntry &entry = iter->second;
+		last_entry = &entry;
+
+		GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
+		return &last_entry->shader;
+	}
+
+	// Make an entry in the table
+	VSCacheEntry& entry = vshaders[uid];
+	last_entry = &entry;
+	ShaderCode code;
+	GenerateShaderCode(code, components, API_OPENGL);
+
+#if defined(_DEBUG) || defined(DEBUGFAST)
+	if (g_ActiveConfig.iLog & CONF_SAVESHADERS && code) {
+		static int counter = 0;
+		char szTemp[MAX_PATH];
+		sprintf(szTemp, "%svs_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++);
+
+		SaveData(szTemp, code.GetBuffer());
+	}
+#endif
+
+	if (!code.GetBuffer() || !VertexShaderCache::CompileVertexShader(entry.shader, code.GetBuffer())) {
+		GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true);
+		return NULL;
+	}
+
+	INCSTAT(stats.numVertexShadersCreated);
+	SETSTAT(stats.numVertexShadersAlive, vshaders.size());
+	GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
+	return &last_entry->shader;
+}
+
+bool VertexShaderCache::CompileVertexShader(VERTEXSHADER& vs, const char* pstrprogram)
+{
+	// Reset GL error before compiling shaders. Yeah, we need to investigate the causes of these.
+	GLenum err = GL_REPORT_ERROR();
+	if (err != GL_NO_ERROR)
+	{
+		ERROR_LOG(VIDEO, "glError %08x before VS!", err);
+	}
+
+#if defined HAVE_CG && HAVE_CG
+	char stropt[64];
+	sprintf(stropt, "MaxLocalParams=256,MaxInstructions=%d", s_nMaxVertexInstructions);
+	const char *opts[] = {"-profileopts", stropt, "-O2", "-q", NULL};
+	CGprogram tempprog = cgCreateProgram(g_cgcontext, CG_SOURCE, pstrprogram, g_cgvProf, "main", opts);
+	if (!cgIsProgram(tempprog)) {
+		static int num_failures = 0;
+		char szTemp[MAX_PATH];
+		sprintf(szTemp, "%sbad_vs_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
+		std::ofstream file(szTemp);
+		file << pstrprogram;
+		file.close();
+
+		PanicAlert("Failed to compile vertex shader!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%d):\n%s",
+						szTemp,
+						g_cgfProf,
+						cgGetLastListing(g_cgcontext));
+
+        cgDestroyProgram(tempprog);
+		ERROR_LOG(VIDEO, "Failed to load vs %s:", cgGetLastListing(g_cgcontext));
+		ERROR_LOG(VIDEO, "%s", pstrprogram);
+		return false;
+	}
+
+	if (cgGetError() != CG_NO_ERROR)
+	{
+		WARN_LOG(VIDEO, "Failed to load vs %s:", cgGetLastListing(g_cgcontext));
+		WARN_LOG(VIDEO, "%s", pstrprogram);
+	}
+
+	// This looks evil - we modify the program through the const char * we got from cgGetProgramString!
+	// It SHOULD not have any nasty side effects though - but you never know...
+	char *pcompiledprog = (char*)cgGetProgramString(tempprog, CG_COMPILED_PROGRAM);
+	char *plocal = strstr(pcompiledprog, "program.local");
+	while (plocal != NULL) {
+		const char* penv = "  program.env";
+		memcpy(plocal, penv, 13);
+		plocal = strstr(plocal + 13, "program.local");
+	}
+	glGenProgramsARB(1, &vs.glprogid);
+	SetCurrentShader(vs.glprogid);
+
+	glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, (GLsizei)strlen(pcompiledprog), pcompiledprog);	
+	err = GL_REPORT_ERROR();
+	if (err != GL_NO_ERROR) {
+		ERROR_LOG(VIDEO, "%s", pstrprogram);
+		ERROR_LOG(VIDEO, "%s", pcompiledprog);
+	}
+
+	cgDestroyProgram(tempprog);
+#endif
+
+	if (g_ActiveConfig.bEnableShaderDebugging)
+		vs.strprog = pstrprogram;
+
+	return true;
+}
+
+void VertexShaderCache::DisableShader()
+{
+	if (ShaderEnabled)
+	{
+		glDisable(GL_VERTEX_PROGRAM_ARB);
+		ShaderEnabled = false;
+	}
+}
+
+
+void VertexShaderCache::SetCurrentShader(GLuint Shader)
+{
+	if (!ShaderEnabled)
+	{
+		glEnable(GL_VERTEX_PROGRAM_ARB);
+		ShaderEnabled= true;
+	}
+	if (CurrentShader != Shader)
+	{
+		if(Shader != 0)
+			CurrentShader = Shader;
+		glBindProgramARB(GL_VERTEX_PROGRAM_ARB, CurrentShader);
+	}
+}
+
+void Renderer::SetVSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4)
+{
+	glProgramEnvParameter4fARB(GL_VERTEX_PROGRAM_ARB, const_number, f1, f2, f3, f4);
+}
+
+void Renderer::SetVSConstant4fv(unsigned int const_number, const float *f)
+{
+	glProgramEnvParameter4fvARB(GL_VERTEX_PROGRAM_ARB, const_number, f);
+}
+
+void Renderer::SetMultiVSConstant4fv(unsigned int const_number, unsigned int count, const float *f)
+{
+    if(GLEW_EXT_gpu_program_parameters)
+    {
+       glProgramEnvParameters4fvEXT(GL_VERTEX_PROGRAM_ARB, const_number, count, f);
+    }
+    else
+    {
+        for (unsigned int i = 0; i < count; i++,f+=4)
+            glProgramEnvParameter4fvARB(GL_VERTEX_PROGRAM_ARB, const_number + i, f);
+    }
+}
+
+void Renderer::SetMultiVSConstant3fv(unsigned int const_number, unsigned int count, const float *f)
+{
+   if(GLEW_EXT_gpu_program_parameters)
+	{
+        float buf[4 * C_VENVCONST_END];
+        for (unsigned int i = 0; i < count; i++)
+	    {
+		    buf[4*i  ] = *f++;
+    		buf[4*i+1] = *f++;
+	    	buf[4*i+2] = *f++;
+	    	buf[4*i+3] = 0.f;
+	    }
+        glProgramEnvParameters4fvEXT(GL_VERTEX_PROGRAM_ARB, const_number, count, buf);
+    }
+    else
+    {
+        for (unsigned int i = 0; i < count; i++)
+	    {
+		    float buf[4];
+		    buf[0] = *f++;
+		    buf[1] = *f++;
+		    buf[2] = *f++;
+		    buf[3] = 0.f;
+		    glProgramEnvParameter4fvARB(GL_VERTEX_PROGRAM_ARB, const_number + i, buf);
+	    }
+    }
+}
+
+}  // namespace OGL
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
index f3831b3f7b..019abf6b6f 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
@@ -40,7 +40,7 @@ class VertexShaderCache
 	struct VSCacheEntry
 	{ 
 		VERTEXSHADER shader;
-		ShaderUid safe_uid;
+		VertexShaderUid safe_uid;
 		VSCacheEntry() {}
 		void Destroy() {
 			// printf("Destroying vs %i\n", shader.glprogid);
@@ -49,12 +49,12 @@ class VertexShaderCache
 		}
 	};
 
-	typedef std::map<ShaderUid, VSCacheEntry> VSCache;
+	typedef std::map<VertexShaderUid, VSCacheEntry> VSCache;
 
 	static VSCache vshaders;
 
 	static VSCacheEntry* last_entry;
-	static ShaderUid last_uid; // TODO: Use reference instead..
+	static VertexShaderUid last_uid; // TODO: Use reference instead..
 
 	static GLuint CurrentShader;
 	static bool ShaderEnabled;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h~ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h~
new file mode 100644
index 0000000000..859645c59a
--- /dev/null
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h~
@@ -0,0 +1,76 @@
+// Copyright (C) 2003 Dolphin Project.
+
+// This program 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, version 2.0.
+
+// This program 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 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#ifndef _VERTEXSHADERCACHE_H_
+#define _VERTEXSHADERCACHE_H_
+
+#include <map>
+#include <string>
+
+#include "BPMemory.h"
+#include "VertexShaderGen.h"
+
+namespace OGL
+{
+
+struct VERTEXSHADER
+{
+	VERTEXSHADER() : glprogid(0) {}
+	GLuint glprogid; // opengl program id
+
+	std::string strprog;
+};
+
+class VertexShaderCache
+{
+	struct VSCacheEntry
+	{ 
+		VERTEXSHADER shader;
+		VertexShaderUid safe_uid;
+		VSCacheEntry() {}
+		void Destroy() {
+			// printf("Destroying vs %i\n", shader.glprogid);
+			glDeleteProgramsARB(1, &shader.glprogid);
+			shader.glprogid = 0;
+		}
+	};
+
+	typedef std::map<ShaderUid, VSCacheEntry> VSCache;
+
+	static VSCache vshaders;
+
+	static VSCacheEntry* last_entry;
+	static ShaderUid last_uid; // TODO: Use reference instead..
+
+	static GLuint CurrentShader;
+	static bool ShaderEnabled;
+
+public:
+	static void Init();
+	static void Shutdown();
+
+	static VERTEXSHADER* SetShader(u32 components);
+	static bool CompileVertexShader(VERTEXSHADER& ps, const char* pstrprogram);
+
+	static void SetCurrentShader(GLuint Shader);
+	static void DisableShader();
+	
+};
+
+}  // namespace OGL
+
+#endif // _VERTEXSHADERCACHE_H_

From dc0f470215b4b8268c3d60cfdfc1aa07cec99277 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Tue, 7 Aug 2012 01:02:04 +0200
Subject: [PATCH 003/352] Added new shader cache uids for pixel shader gen.

---
 Source/Core/VideoCommon/Src/Debugger.cpp      |   8 +-
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 670 +++++++-----------
 Source/Core/VideoCommon/Src/PixelShaderGen.h  | 112 ++-
 Source/Core/VideoCommon/Src/ShaderGenCommon.h |   8 +-
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  |   5 -
 .../Core/VideoCommon/Src/VertexShaderGen.cpp~ | 645 -----------------
 Source/Core/VideoCommon/Src/VertexShaderGen.h |   6 +-
 .../Core/VideoCommon/Src/VertexShaderGen.h~   |   2 +-
 Source/Core/VideoCommon/Src/VideoConfig.h     |   2 +-
 .../Plugin_VideoOGL/Src/PixelShaderCache.cpp  |  24 +-
 .../Plugin_VideoOGL/Src/PixelShaderCache.h    |   7 +-
 11 files changed, 318 insertions(+), 1171 deletions(-)
 delete mode 100644 Source/Core/VideoCommon/Src/VertexShaderGen.cpp~

diff --git a/Source/Core/VideoCommon/Src/Debugger.cpp b/Source/Core/VideoCommon/Src/Debugger.cpp
index 005f81c8e6..e0024db655 100644
--- a/Source/Core/VideoCommon/Src/Debugger.cpp
+++ b/Source/Core/VideoCommon/Src/Debugger.cpp
@@ -103,21 +103,21 @@ void GFXDebuggerBase::DumpPixelShader(const char* path)
 	if (!useDstAlpha)
 	{
 		output = "Destination alpha disabled:\n";
-		output += GeneratePixelShaderCode(DSTALPHA_NONE, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
+///		output += GeneratePixelShaderCode(DSTALPHA_NONE, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
 	}
 	else
 	{
 		if(g_ActiveConfig.backend_info.bSupportsDualSourceBlend)
 		{
 			output = "Using dual source blending for destination alpha:\n";
-			output += GeneratePixelShaderCode(DSTALPHA_DUAL_SOURCE_BLEND, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
+///			output += GeneratePixelShaderCode(DSTALPHA_DUAL_SOURCE_BLEND, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
 		}
 		else
 		{
 			output = "Using two passes for emulating destination alpha:\n";
-			output += GeneratePixelShaderCode(DSTALPHA_NONE, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
+///			output += GeneratePixelShaderCode(DSTALPHA_NONE, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
 			output += "\n\nDestination alpha pass shader:\n";
-			output += GeneratePixelShaderCode(DSTALPHA_ALPHA_PASS, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
+///			output += GeneratePixelShaderCode(DSTALPHA_ALPHA_PASS, g_ActiveConfig.backend_info.APIType, g_nativeVertexFmt->m_components);
 		}
 	}
 
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 448501aad0..5ee95848b5 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -28,241 +28,6 @@
 #include "NativeVertexFormat.h"
 
 
-static void StageHash(u32 stage, u32* out)
-{
-	out[0] |= bpmem.combiners[stage].colorC.hex & 0xFFFFFF; // 24
-	u32 alphaC = bpmem.combiners[stage].alphaC.hex & 0xFFFFF0; // 24, strip out tswap and rswap for now
-	out[0] |= (alphaC&0xF0) << 24; // 8
-	out[1] |= alphaC >> 8; // 16
-
-	// reserve 3 bits for bpmem.tevorders[stage/2].getTexMap
-	out[1] |= bpmem.tevorders[stage/2].getTexCoord(stage&1) << 19; // 3
-	out[1] |= bpmem.tevorders[stage/2].getEnable(stage&1) << 22; // 1
-	// reserve 3 bits for bpmem.tevorders[stage/2].getColorChan
-
-	bool bHasIndStage = bpmem.tevind[stage].IsActive() && bpmem.tevind[stage].bt < bpmem.genMode.numindstages;
-	out[2] |= bHasIndStage << 2; // 1
-
-	bool needstexcoord = false;
-
-	if (bHasIndStage)
-	{
-		out[2] |= (bpmem.tevind[stage].hex & 0x17FFFF) << 3; // 21, TODO: needs an explanation
-		needstexcoord = true;
-	}
-
-
-	TevStageCombiner::ColorCombiner& cc = bpmem.combiners[stage].colorC;
-	TevStageCombiner::AlphaCombiner& ac = bpmem.combiners[stage].alphaC;
-
-	if(cc.a == TEVCOLORARG_RASA || cc.a == TEVCOLORARG_RASC
-		|| cc.b == TEVCOLORARG_RASA || cc.b == TEVCOLORARG_RASC
-		|| cc.c == TEVCOLORARG_RASA || cc.c == TEVCOLORARG_RASC
-		|| cc.d == TEVCOLORARG_RASA || cc.d == TEVCOLORARG_RASC
-		|| ac.a == TEVALPHAARG_RASA || ac.b == TEVALPHAARG_RASA
-		|| ac.c == TEVALPHAARG_RASA || ac.d == TEVALPHAARG_RASA)
-	{
-		out[0] |= bpmem.combiners[stage].alphaC.rswap;
-		out[2] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.rswap*2].swap1 << 24; // 2
-		out[2] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.rswap*2].swap2 << 26; // 2
-		out[2] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.rswap*2+1].swap1 << 28; // 2
-		out[2] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.rswap*2+1].swap2 << 30; // 2
-		out[1] |= (bpmem.tevorders[stage/2].getColorChan(stage&1)&1) << 23;
-		out[2] |= (bpmem.tevorders[stage/2].getColorChan(stage&1)&0x6) >> 1;
-	}
-
-	out[3] |= bpmem.tevorders[stage/2].getEnable(stage&1);
-	if (bpmem.tevorders[stage/2].getEnable(stage&1))
-	{
-		if (bHasIndStage) needstexcoord = true;
-
-		out[0] |= bpmem.combiners[stage].alphaC.tswap;
-		out[3] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.tswap*2].swap1 << 1; // 2
-		out[3] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.tswap*2].swap2 << 3; // 2
-		out[3] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.tswap*2+1].swap1 << 5; // 2
-		out[3] |= bpmem.tevksel[bpmem.combiners[stage].alphaC.tswap*2+1].swap2 << 7; // 2
-		out[1] |= bpmem.tevorders[stage/2].getTexMap(stage&1) << 16;
-	}
-
-	if (cc.a == TEVCOLORARG_KONST || cc.b == TEVCOLORARG_KONST || cc.c == TEVCOLORARG_KONST || cc.d == TEVCOLORARG_KONST
-		|| ac.a == TEVALPHAARG_KONST || ac.b == TEVALPHAARG_KONST || ac.c == TEVALPHAARG_KONST || ac.d == TEVALPHAARG_KONST)
-	{
-		out[3] |= bpmem.tevksel[stage/2].getKC(stage&1) << 9; // 5
-		out[3] |= bpmem.tevksel[stage/2].getKA(stage&1) << 14; // 5
-	}
-
-	if (needstexcoord)
-	{
-		out[1] |= bpmem.tevorders[stage/2].getTexCoord(stage&1) << 16;
-	}
-}
-
-// Mash together all the inputs that contribute to the code of a generated pixel shader into
-// a unique identifier, basically containing all the bits. Yup, it's a lot ....
-// It would likely be a lot more efficient to build this incrementally as the attributes
-// are set...
-void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 components)
-{
-	memset(uid->values, 0, sizeof(uid->values));
-	uid->values[0] |= bpmem.genMode.numtevstages; // 4
-	uid->values[0] |= bpmem.genMode.numtexgens << 4; // 4
-	uid->values[0] |= dstAlphaMode << 8; // 2
-
-	bool enablePL = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting;
-	uid->values[0] |= enablePL << 10; // 1
-
-	if (!enablePL) uid->values[0] |= xfregs.numTexGen.numTexGens << 11; // 4
-
-	AlphaTest::TEST_RESULT alphaPreTest = bpmem.alpha_test.TestResult();
-	uid->values[0] |= alphaPreTest << 15; // 2
-
-	// numtexgens should be <= 8
-	for (unsigned int i = 0; i < bpmem.genMode.numtexgens; ++i)
-		uid->values[0] |= xfregs.texMtxInfo[i].projection << (17+i); // 1
-
-	uid->values[1] = bpmem.genMode.numindstages; // 3
-	u32 indirectStagesUsed = 0;
-	for (unsigned int i = 0; i < bpmem.genMode.numindstages; ++i)
-		if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages)
-			indirectStagesUsed |= (1 << bpmem.tevind[i].bt);
-
-	assert(indirectStagesUsed == (indirectStagesUsed & 0xF));
-
-	uid->values[1] |= indirectStagesUsed << 3; // 4;
-
-	for (unsigned int i = 0; i < bpmem.genMode.numindstages; ++i)
-	{
-		if (indirectStagesUsed & (1 << i))
-		{
-			uid->values[1] |= (bpmem.tevindref.getTexCoord(i) < bpmem.genMode.numtexgens) << (7 + 3*i); // 1
-			if (bpmem.tevindref.getTexCoord(i) < bpmem.genMode.numtexgens)
-				uid->values[1] |= bpmem.tevindref.getTexCoord(i) << (8 + 3*i); // 2
-		}
-	}
-
-	u32* ptr = &uid->values[2];
-	for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1u; ++i)
-	{
-		StageHash(i, ptr);
-		ptr += 4; // max: ptr = &uid->values[66]
-	}
-
-	ptr[0] |= bpmem.alpha_test.comp0; // 3
-	ptr[0] |= bpmem.alpha_test.comp1 << 3; // 3
-	ptr[0] |= bpmem.alpha_test.logic << 6; // 2
-
-	ptr[0] |= bpmem.ztex2.op << 8; // 2
-	ptr[0] |= bpmem.zcontrol.early_ztest << 10; // 1
-	ptr[0] |= bpmem.zmode.testenable << 11; // 1
-	ptr[0] |= bpmem.zmode.updateenable << 12; // 1
-
-	if (dstAlphaMode != DSTALPHA_ALPHA_PASS)
-	{
-		ptr[0] |= bpmem.fog.c_proj_fsel.fsel << 13; // 3
-		if (bpmem.fog.c_proj_fsel.fsel != 0)
-		{
-			ptr[0] |= bpmem.fog.c_proj_fsel.proj << 16; // 1
-			ptr[0] |= bpmem.fogRange.Base.Enabled << 17; // 1
-		}
-	}
-
-	++ptr;
-	if (enablePL)
-	{
-		ptr += GetLightingShaderId(ptr);
-		*ptr++ = components;
-	}
-
-	uid->num_values = ptr - uid->values;
-}
-
-void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode, u32 components)
-{
-	memset(uid->values, 0, sizeof(uid->values));
-	u32* ptr = uid->values;
-	*ptr++ = dstAlphaMode; // 0
-	*ptr++ = bpmem.genMode.hex; // 1
-	*ptr++ = bpmem.ztex2.hex; // 2
-	*ptr++ = bpmem.zcontrol.hex; // 3
-	*ptr++ = bpmem.zmode.hex; // 4
-	*ptr++ = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; // 5
-	*ptr++ = xfregs.numTexGen.hex; // 6
-
-	if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-	{
-		*ptr++ = xfregs.color[0].hex;
-		*ptr++ = xfregs.alpha[0].hex;
-		*ptr++ = xfregs.color[1].hex;
-		*ptr++ = xfregs.alpha[1].hex;
-		*ptr++ = components;
-	}
-
-	for (unsigned int i = 0; i < 8; ++i)
-		*ptr++ = xfregs.texMtxInfo[i].hex; // 7-14
-
-	for (unsigned int i = 0; i < 16; ++i)
-		*ptr++ = bpmem.tevind[i].hex; // 15-30
-
-	*ptr++ = bpmem.tevindref.hex; // 31
-
-	for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1u; ++i) // up to 16 times
-	{
-		*ptr++ = bpmem.combiners[i].colorC.hex; // 32+5*i
-		*ptr++ = bpmem.combiners[i].alphaC.hex; // 33+5*i
-		*ptr++ = bpmem.tevind[i].hex; // 34+5*i
-		*ptr++ = bpmem.tevksel[i/2].hex; // 35+5*i
-		*ptr++ = bpmem.tevorders[i/2].hex; // 36+5*i
-	}
-
-	ptr = &uid->values[112];
-
-	*ptr++ = bpmem.alpha_test.hex; // 112
-
-	*ptr++ = bpmem.fog.c_proj_fsel.hex; // 113
-	*ptr++ = bpmem.fogRange.Base.hex; // 114
-
-	_assert_((ptr - uid->values) == uid->GetNumValues());
-}
-
-void ValidatePixelShaderIDs(API_TYPE api, PIXELSHADERUIDSAFE old_id, const std::string& old_code, DSTALPHA_MODE dstAlphaMode, u32 components)
-{
-	if (!g_ActiveConfig.bEnableShaderDebugging)
-		return;
-
-	PIXELSHADERUIDSAFE new_id;
-	GetSafePixelShaderId(&new_id, dstAlphaMode, components);
-
-	if (!(old_id == new_id))
-	{
-		std::string new_code(GeneratePixelShaderCode(dstAlphaMode, api, components));
-		if (old_code != new_code)
-		{
-			_assert_(old_id.GetNumValues() == new_id.GetNumValues());
-
-			char msg[8192];
-			char* ptr = msg;
-			ptr += sprintf(ptr, "Pixel shader IDs matched but unique IDs did not!\nUnique IDs (old <-> new):\n");
-			const int N = new_id.GetNumValues();
-			for (int i = 0; i < N/2; ++i)
-				ptr += sprintf(ptr, "%02d, %08X  %08X  |  %08X  %08X\n", 2*i, old_id.values[2*i], old_id.values[2*i+1],
-																			new_id.values[2*i], new_id.values[2*i+1]);
-			if (N % 2)
-				ptr += sprintf(ptr, "%02d, %08X  |  %08X\n", N-1, old_id.values[N-1], new_id.values[N-1]);
-	
-			static int num_failures = 0;
-			char szTemp[MAX_PATH];
-			sprintf(szTemp, "%spsuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
-			std::ofstream file(szTemp);
-			file << msg;
-			file << "\n\nOld shader code:\n" << old_code;
-			file << "\n\nNew shader code:\n" << new_code;
-			file.close();
-
-			PanicAlert("Unique pixel shader ID mismatch!\n\nReport this to the devs, along with the contents of %s.", szTemp);
-		}
-	}
-}
-
 //   old tev->pixelshader notes
 //
 //   color for this stage (alpha, color) is given by bpmem.tevorders[0].colorchan0
@@ -272,11 +37,11 @@ void ValidatePixelShaderIDs(API_TYPE api, PIXELSHADERUIDSAFE old_id, const std::
 //   output is given by .outreg
 //   tevtemp is set according to swapmodetables and
 
-static void WriteStage(char *&p, int n, API_TYPE ApiType);
-static void SampleTexture(char *&p, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType);
+template<class T, GenOutput type> static void WriteStage(char *&p, int n, API_TYPE ApiType);
+template<class T, GenOutput type> static void SampleTexture(T& out, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType);
 // static void WriteAlphaCompare(char *&p, int num, int comp);
-static void WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode);
-static void WriteFog(char *&p);
+template<class T, GenOutput type> static void WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode);
+template<class T, GenOutput type> static void WriteFog(char *&p);
 
 static const char *tevKSelTableC[] = // KCSEL
 {
@@ -456,8 +221,6 @@ static const char *tevIndBiasAdd[]    = {"-128.0f", "1.0f", "1.0f", "1.0f" }; //
 static const char *tevIndWrapStart[]  = {"0.0f", "256.0f", "128.0f", "64.0f", "32.0f", "16.0f", "0.001f" };
 static const char *tevIndFmtScale[]   = {"255.0f", "31.0f", "15.0f", "7.0f" };
 
-#define WRITE p+=sprintf
-
 static char swapModeTable[4][5];
 
 static char text[16384];
@@ -484,105 +247,109 @@ static void BuildSwapModeTable()
 	}
 }
 
-const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
+template<class T, GenOutput type>
+void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
-	setlocale(LC_NUMERIC, "C"); // Reset locale for compilation
-	text[sizeof(text) - 1] = 0x7C;  // canary
+#define SetUidField(name, value) if (type == GO_ShaderUid) {out.GetUidData().name = value; };
+	if (type == GO_ShaderCode)
+	{
+		setlocale(LC_NUMERIC, "C"); // Reset locale for compilation
+		out.SetBuffer(text);
+	}
+///	text[sizeof(text) - 1] = 0x7C;  // canary
 
+	/// TODO: Uids!
 	BuildSwapModeTable(); // Needed for WriteStage
-	int numStages = bpmem.genMode.numtevstages + 1;
-	int numTexgen = bpmem.genMode.numtexgens;
+	unsigned int numStages = bpmem.genMode.numtevstages + 1;
+	unsigned int numTexgen = bpmem.genMode.numtexgens;
 
 	char *p = text;
-	WRITE(p, "//Pixel Shader for TEV stages\n");
-	WRITE(p, "//%i TEV stages, %i texgens, XXX IND stages\n",
+	out.Write("//Pixel Shader for TEV stages\n");
+	out.Write("//%i TEV stages, %i texgens, XXX IND stages\n",
 		numStages, numTexgen/*, bpmem.genMode.numindstages*/);
 
-	int nIndirectStagesUsed = 0;
-	if (bpmem.genMode.numindstages > 0)
-	{
-		for (int i = 0; i < numStages; ++i)
-		{
-			if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages)
-				nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt;
-		}
-	}
-	// Declare samplers
+	SetUidField(components, components);
+	SetUidField(dstAlphaMode, dstAlphaMode);
 
+	SetUidField(genMode.numindstages, bpmem.genMode.numindstages);
+	SetUidField(genMode.numtevstages, bpmem.genMode.numtevstages);
+	SetUidField(genMode.numtexgens, bpmem.genMode.numtexgens);
+
+	// Declare samplers
 	if(ApiType != API_D3D11)
 	{
-		WRITE(p, "uniform sampler2D ");
+		out.Write("uniform sampler2D ");
 	}
 	else
 	{
-		WRITE(p, "sampler ");
+		out.Write("sampler ");
 	}
 
 	bool bfirst = true;
 	for (int i = 0; i < 8; ++i)
 	{
-		WRITE(p, "%s samp%d : register(s%d)", bfirst?"":",", i, i);
+		out.Write("%s samp%d : register(s%d)", bfirst?"":",", i, i);
 		bfirst = false;
 	}
-	WRITE(p, ";\n");
+	out.Write(";\n");
 	if(ApiType == API_D3D11)
 	{
-		WRITE(p, "Texture2D ");
+		out.Write("Texture2D ");
 		bfirst = true;
 		for (int i = 0; i < 8; ++i)
 		{
-			WRITE(p, "%s Tex%d : register(t%d)", bfirst?"":",", i, i);
+			out.Write("%s Tex%d : register(t%d)", bfirst?"":",", i, i);
 			bfirst = false;
 		}
-		WRITE(p, ";\n");
+		out.Write(";\n");
 	}
 
-	WRITE(p, "\n");
+	out.Write("\n");
 
-	WRITE(p, "uniform float4 " I_COLORS"[4] : register(c%d);\n", C_COLORS);
-	WRITE(p, "uniform float4 " I_KCOLORS"[4] : register(c%d);\n", C_KCOLORS);
-	WRITE(p, "uniform float4 " I_ALPHA"[1] : register(c%d);\n", C_ALPHA);
-	WRITE(p, "uniform float4 " I_TEXDIMS"[8] : register(c%d);\n", C_TEXDIMS);
-	WRITE(p, "uniform float4 " I_ZBIAS"[2] : register(c%d);\n", C_ZBIAS);
-	WRITE(p, "uniform float4 " I_INDTEXSCALE"[2] : register(c%d);\n", C_INDTEXSCALE);
-	WRITE(p, "uniform float4 " I_INDTEXMTX"[6] : register(c%d);\n", C_INDTEXMTX);
-	WRITE(p, "uniform float4 " I_FOG"[3] : register(c%d);\n", C_FOG);
+	out.Write("uniform float4 " I_COLORS"[4] : register(c%d);\n", C_COLORS);
+	out.Write("uniform float4 " I_KCOLORS"[4] : register(c%d);\n", C_KCOLORS);
+	out.Write("uniform float4 " I_ALPHA"[1] : register(c%d);\n", C_ALPHA);
+	out.Write("uniform float4 " I_TEXDIMS"[8] : register(c%d);\n", C_TEXDIMS);
+	out.Write("uniform float4 " I_ZBIAS"[2] : register(c%d);\n", C_ZBIAS);
+	out.Write("uniform float4 " I_INDTEXSCALE"[2] : register(c%d);\n", C_INDTEXSCALE);
+	out.Write("uniform float4 " I_INDTEXMTX"[6] : register(c%d);\n", C_INDTEXMTX);
+	out.Write("uniform float4 " I_FOG"[3] : register(c%d);\n", C_FOG);
 
 	if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
 	{
-		WRITE(p,"typedef struct { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; } Light;\n");
-		WRITE(p,"typedef struct { Light lights[8]; } s_" I_PLIGHTS";\n");
-		WRITE(p, "uniform s_" I_PLIGHTS" " I_PLIGHTS" : register(c%d);\n", C_PLIGHTS);
-		WRITE(p, "typedef struct { float4 C0, C1, C2, C3; } s_" I_PMATERIALS";\n");
-		WRITE(p, "uniform s_" I_PMATERIALS" " I_PMATERIALS" : register(c%d);\n", C_PMATERIALS);
+		out.Write("typedef struct { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; } Light;\n");
+		out.Write("typedef struct { Light lights[8]; } s_" I_PLIGHTS";\n");
+		out.Write("uniform s_" I_PLIGHTS" " I_PLIGHTS" : register(c%d);\n", C_PLIGHTS);
+		out.Write("typedef struct { float4 C0, C1, C2, C3; } s_" I_PMATERIALS";\n");
+		out.Write("uniform s_" I_PMATERIALS" " I_PMATERIALS" : register(c%d);\n", C_PMATERIALS);
 	}
 
-	WRITE(p, "void main(\n");
+	out.Write("void main(\n");
 	if(ApiType != API_D3D11)
 	{
-		WRITE(p, "  out float4 ocol0 : COLOR0,%s%s\n  in float4 rawpos : %s,\n",
+		out.Write("  out float4 ocol0 : COLOR0,%s%s\n  in float4 rawpos : %s,\n",
 			dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND ? "\n  out float4 ocol1 : COLOR1," : "",
 			"\n  out float depth : DEPTH,",
 			ApiType & API_OPENGL ? "WPOS" : ApiType & API_D3D9_SM20 ? "POSITION" : "VPOS");
 	}
 	else
 	{
-		WRITE(p, "  out float4 ocol0 : SV_Target0,%s%s\n  in float4 rawpos : SV_Position,\n",
+		out.Write("  out float4 ocol0 : SV_Target0,%s%s\n  in float4 rawpos : SV_Position,\n",
 			dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND ? "\n  out float4 ocol1 : SV_Target1," : "",
 			"\n  out float depth : SV_Depth,");
 	}
 
-	WRITE(p, "  in float4 colors_0 : COLOR0,\n");
-	WRITE(p, "  in float4 colors_1 : COLOR1");
+	out.Write("  in float4 colors_0 : COLOR0,\n");
+	out.Write("  in float4 colors_1 : COLOR1");
 
 	// compute window position if needed because binding semantic WPOS is not widely supported
 	if (numTexgen < 7)
 	{
-		for (int i = 0; i < numTexgen; ++i)
-			WRITE(p, ",\n  in float3 uv%d : TEXCOORD%d", i, i);
-		WRITE(p, ",\n  in float4 clipPos : TEXCOORD%d", numTexgen);
+		for (unsigned int i = 0; i < numTexgen; ++i)
+			out.Write(",\n  in float3 uv%d : TEXCOORD%d", i, i);
+		out.Write(",\n  in float4 clipPos : TEXCOORD%d", numTexgen);
 		if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-			WRITE(p, ",\n  in float4 Normal : TEXCOORD%d", numTexgen + 1);
+			out.Write(",\n  in float4 Normal : TEXCOORD%d", numTexgen + 1);
 	}
 	else
 	{
@@ -590,17 +357,18 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 		if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
 		{
 			for (int i = 0; i < 8; ++i)
-				WRITE(p, ",\n  in float4 uv%d : TEXCOORD%d", i, i);
+				out.Write(",\n  in float4 uv%d : TEXCOORD%d", i, i);
 		}
 		else
 		{
+			/// TODO: Set numTexGen used
 			for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
-				WRITE(p, ",\n  in float%d uv%d : TEXCOORD%d", i < 4 ? 4 : 3 , i, i);
+				out.Write(",\n  in float%d uv%d : TEXCOORD%d", i < 4 ? 4 : 3 , i, i);
 		}
 	}
-	WRITE(p, "        ) {\n");
+	out.Write("        ) {\n");
 
-	WRITE(p, "  float4 c0 = " I_COLORS"[1], c1 = " I_COLORS"[2], c2 = " I_COLORS"[3], prev = float4(0.0f, 0.0f, 0.0f, 0.0f), textemp = float4(0.0f, 0.0f, 0.0f, 0.0f), rastemp = float4(0.0f, 0.0f, 0.0f, 0.0f), konsttemp = float4(0.0f, 0.0f, 0.0f, 0.0f);\n"
+	out.Write("  float4 c0 = " I_COLORS"[1], c1 = " I_COLORS"[2], c2 = " I_COLORS"[3], prev = float4(0.0f, 0.0f, 0.0f, 0.0f), textemp = float4(0.0f, 0.0f, 0.0f, 0.0f), rastemp = float4(0.0f, 0.0f, 0.0f, 0.0f), konsttemp = float4(0.0f, 0.0f, 0.0f, 0.0f);\n"
 			"  float3 comp16 = float3(1.0f, 255.0f, 0.0f), comp24 = float3(1.0f, 255.0f, 255.0f*255.0f);\n"
 			"  float4 alphabump=float4(0.0f,0.0f,0.0f,0.0f);\n"
 			"  float3 tevcoord=float3(0.0f, 0.0f, 0.0f);\n"
@@ -613,63 +381,96 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 	{
 		if (xfregs.numTexGen.numTexGens < 7)
 		{
-			WRITE(p,"float3 _norm0 = normalize(Normal.xyz);\n\n");
-			WRITE(p,"float3 pos = float3(clipPos.x,clipPos.y,Normal.w);\n");
+			out.Write("float3 _norm0 = normalize(Normal.xyz);\n\n");
+			out.Write("float3 pos = float3(clipPos.x,clipPos.y,Normal.w);\n");
 		}
 		else
 		{
-			WRITE(p,"  float3 _norm0 = normalize(float3(uv4.w,uv5.w,uv6.w));\n\n");
-			WRITE(p,"float3 pos = float3(uv0.w,uv1.w,uv7.w);\n");
+			out.Write("  float3 _norm0 = normalize(float3(uv4.w,uv5.w,uv6.w));\n\n");
+			out.Write("float3 pos = float3(uv0.w,uv1.w,uv7.w);\n");
 		}
 
 
-		WRITE(p, "float4 mat, lacc;\n"
+		out.Write("float4 mat, lacc;\n"
 		"float3 ldir, h;\n"
 		"float dist, dist2, attn;\n");
 
-		p = GenerateLightingShader(p, components, I_PMATERIALS, I_PLIGHTS, "colors_", "colors_");
+///		p = GenerateLightingShader(p, components, I_PMATERIALS, I_PLIGHTS, "colors_", "colors_");
 	}
 
 	if (numTexgen < 7)
-		WRITE(p, "clipPos = float4(rawpos.x, rawpos.y, clipPos.z, clipPos.w);\n");
+		out.Write("clipPos = float4(rawpos.x, rawpos.y, clipPos.z, clipPos.w);\n");
 	else
-		WRITE(p, "float4 clipPos = float4(rawpos.x, rawpos.y, uv2.w, uv3.w);\n");
+		out.Write("float4 clipPos = float4(rawpos.x, rawpos.y, uv2.w, uv3.w);\n");
 
 	// HACK to handle cases where the tex gen is not enabled
 	if (numTexgen == 0)
 	{
-		WRITE(p, "float3 uv0 = float3(0.0f, 0.0f, 0.0f);\n");
+		out.Write("float3 uv0 = float3(0.0f, 0.0f, 0.0f);\n");
 	}
 	else
 	{
-		for (int i = 0; i < numTexgen; ++i)
+		for (unsigned int i = 0; i < numTexgen; ++i)
 		{
 			// optional perspective divides
+			SetUidField(texMtxInfo[i].projection, xfregs.texMtxInfo[i].projection);
 			if (xfregs.texMtxInfo[i].projection == XF_TEXPROJ_STQ)
 			{
-				WRITE(p, "if (uv%d.z)", i);
-				WRITE(p, "	uv%d.xy = uv%d.xy / uv%d.z;\n", i, i, i);
+				out.Write("if (uv%d.z)", i);
+				out.Write("	uv%d.xy = uv%d.xy / uv%d.z;\n", i, i, i);
 			}
 
-			WRITE(p, "uv%d.xy = uv%d.xy * " I_TEXDIMS"[%d].zw;\n", i, i, i);
+			out.Write("uv%d.xy = uv%d.xy * " I_TEXDIMS"[%d].zw;\n", i, i, i);
 		}
 	}
 
 	// indirect texture map lookup
+	int nIndirectStagesUsed = 0;
+	if (bpmem.genMode.numindstages > 0)
+	{
+		for (unsigned int i = 0; i < numStages; ++i)
+		{
+			/// Ignoring this for now, handled in WriteStage.
+			if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages)
+				nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt;
+		}
+	}
+	SetUidField(nIndirectStagesUsed, nIndirectStagesUsed);
 	for(u32 i = 0; i < bpmem.genMode.numindstages; ++i)
 	{
 		if (nIndirectStagesUsed & (1<<i))
 		{
 			int texcoord = bpmem.tevindref.getTexCoord(i);
+			int texmap = bpmem.tevindref.getTexMap(i);
 
-			if (texcoord < numTexgen)
-				WRITE(p, "tempcoord = uv%d.xy * " I_INDTEXSCALE"[%d].%s;\n", texcoord, i/2, (i&1)?"zw":"xy");
+			if (i == 0)
+			{
+				SetUidField(tevindref.bc0, texcoord);
+				SetUidField(tevindref.bi0, texmap);
+			}
+			else if (i == 1)
+			{
+				SetUidField(tevindref.bc1, texcoord);
+				SetUidField(tevindref.bi1, texmap);
+			}
+			else if (i == 2)
+			{
+				SetUidField(tevindref.bc3, texcoord);
+				SetUidField(tevindref.bi2, texmap);
+			}
 			else
-				WRITE(p, "tempcoord = float2(0.0f, 0.0f);\n");
+			{
+				SetUidField(tevindref.bc4, texcoord);
+				SetUidField(tevindref.bi4, texmap);
+			}
+			if (texcoord < numTexgen)
+				out.Write("tempcoord = uv%d.xy * " I_INDTEXSCALE"[%d].%s;\n", texcoord, i/2, (i&1)?"zw":"xy");
+			else
+				out.Write("tempcoord = float2(0.0f, 0.0f);\n");
 
 			char buffer[32];
 			sprintf(buffer, "float3 indtex%d", i);
-			SampleTexture(p, buffer, "tempcoord", "abg", bpmem.tevindref.getTexMap(i), ApiType);
+			SampleTexture<T, type>(out, buffer, "tempcoord", "abg", texmap, ApiType);
 		}
 	}
 
@@ -683,8 +484,8 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 		RegisterStates[i].AuxStored = false;
 	}
 
-	for (int i = 0; i < numStages; i++)
-		WriteStage(p, i, ApiType); //build the equation for this stage
+	for (unsigned int i = 0; i < numStages; i++)
+		WriteStage<T, type>(out, i, ApiType); //build the equation for this stage
 
 	if(numStages)
 	{
@@ -692,48 +493,49 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 		// regardless of the used destination register
 		if(bpmem.combiners[numStages - 1].colorC.dest != 0)
 		{
+///			SetUidField(combiners[numStages-1].colorC.dest, bpmem.combiners[numStages-1].colorC.dest);
 			bool retrieveFromAuxRegister = !RegisterStates[bpmem.combiners[numStages - 1].colorC.dest].ColorNeedOverflowControl && RegisterStates[bpmem.combiners[numStages - 1].colorC.dest].AuxStored;
-			WRITE(p, "prev.rgb = %s%s;\n", retrieveFromAuxRegister ? "c" : "" , tevCOutputTable[bpmem.combiners[numStages - 1].colorC.dest]);
+			out.Write("prev.rgb = %s%s;\n", retrieveFromAuxRegister ? "c" : "" , tevCOutputTable[bpmem.combiners[numStages - 1].colorC.dest]);
 			RegisterStates[0].ColorNeedOverflowControl = RegisterStates[bpmem.combiners[numStages - 1].colorC.dest].ColorNeedOverflowControl;
 		}
 		if(bpmem.combiners[numStages - 1].alphaC.dest != 0)
 		{
 			bool retrieveFromAuxRegister = !RegisterStates[bpmem.combiners[numStages - 1].alphaC.dest].AlphaNeedOverflowControl && RegisterStates[bpmem.combiners[numStages - 1].alphaC.dest].AuxStored;
-			WRITE(p, "prev.a = %s%s;\n", retrieveFromAuxRegister ? "c" : "" , tevAOutputTable[bpmem.combiners[numStages - 1].alphaC.dest]);
+			out.Write("prev.a = %s%s;\n", retrieveFromAuxRegister ? "c" : "" , tevAOutputTable[bpmem.combiners[numStages - 1].alphaC.dest]);
 			RegisterStates[0].AlphaNeedOverflowControl = RegisterStates[bpmem.combiners[numStages - 1].alphaC.dest].AlphaNeedOverflowControl;
 		}
 	}
 	// emulation of unsigned 8 overflow when casting if needed
 	if(RegisterStates[0].AlphaNeedOverflowControl || RegisterStates[0].ColorNeedOverflowControl)
-		WRITE(p, "prev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n");
+		out.Write("prev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n");
 
 	AlphaTest::TEST_RESULT Pretest = bpmem.alpha_test.TestResult();
 	if (Pretest == AlphaTest::UNDETERMINED)
-		WriteAlphaTest(p, ApiType, dstAlphaMode);
+		WriteAlphaTest<T, type>(out, ApiType, dstAlphaMode);
 
 	// the screen space depth value = far z + (clip z / clip w) * z range
-	WRITE(p, "float zCoord = " I_ZBIAS"[1].x + (clipPos.z / clipPos.w) * " I_ZBIAS"[1].y;\n");
+	out.Write("float zCoord = " I_ZBIAS"[1].x + (clipPos.z / clipPos.w) * " I_ZBIAS"[1].y;\n");
 
 	// Note: depth textures are disabled if early depth test is enabled
 	if (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable)
 	{
 		// use the texture input of the last texture stage (textemp), hopefully this has been read and is in correct format...
-		WRITE(p, "zCoord = dot(" I_ZBIAS"[0].xyzw, textemp.xyzw) + " I_ZBIAS"[1].w %s;\n",
+		out.Write("zCoord = dot(" I_ZBIAS"[0].xyzw, textemp.xyzw) + " I_ZBIAS"[1].w %s;\n",
 									(bpmem.ztex2.op == ZTEXTURE_ADD) ? "+ zCoord" : "");
 
 		// scale to make result from frac correct
-		WRITE(p, "zCoord = zCoord * (16777215.0f/16777216.0f);\n");
-		WRITE(p, "zCoord = frac(zCoord);\n");
-		WRITE(p, "zCoord = zCoord * (16777216.0f/16777215.0f);\n");
+		out.Write("zCoord = zCoord * (16777215.0f/16777216.0f);\n");
+		out.Write("zCoord = frac(zCoord);\n");
+		out.Write("zCoord = zCoord * (16777216.0f/16777215.0f);\n");
 	}
-	WRITE(p, "depth = zCoord;\n");
+	out.Write("depth = zCoord;\n");
 
 	if (dstAlphaMode == DSTALPHA_ALPHA_PASS)
-		WRITE(p, "  ocol0 = float4(prev.rgb, " I_ALPHA"[0].a);\n");
+		out.Write("  ocol0 = float4(prev.rgb, " I_ALPHA"[0].a);\n");
 	else
 	{
-		WriteFog(p);
-		WRITE(p, "  ocol0 = prev;\n");
+		WriteFog<T, type>(out);
+		out.Write("  ocol0 = prev;\n");
 	}
 
 	// On D3D11, use dual-source color blending to perform dst alpha in a
@@ -741,17 +543,16 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 	if (dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND)
 	{
 		// Colors will be blended against the alpha from ocol1...
-		WRITE(p, "  ocol1 = ocol0;\n");
+		out.Write("  ocol1 = ocol0;\n");
 		// ...and the alpha from ocol0 will be written to the framebuffer.
-		WRITE(p, "  ocol0.a = " I_ALPHA"[0].a;\n");
+		out.Write("  ocol0.a = " I_ALPHA"[0].a;\n");
 	}
 	
-	WRITE(p, "}\n");
-	if (text[sizeof(text) - 1] != 0x7C)
-		PanicAlert("PixelShader generator - buffer too small, canary has been eaten!");
+	out.Write("}\n");
+///	if (text[sizeof(text) - 1] != 0x7C)
+///		PanicAlert("PixelShader generator - buffer too small, canary has been eaten!");
 
 	setlocale(LC_NUMERIC, ""); // restore locale
-	return text;
 }
 
 
@@ -800,7 +601,8 @@ static const char *TEVCMPAlphaOPTable[16] =
 };
 
 
-static void WriteStage(char *&p, int n, API_TYPE ApiType)
+template<class T, GenOutput type>
+static void WriteStage(T& out, int n, API_TYPE ApiType)
 {
 	int texcoord = bpmem.tevorders[n/2].getTexCoord(n&1);
 	bool bHasTexCoord = (u32)texcoord < bpmem.genMode.numtexgens;
@@ -810,25 +612,25 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 	if (!bHasTexCoord)
 		texcoord = 0;
 
-	WRITE(p, "// TEV stage %d\n", n);
+	out.Write("// TEV stage %d\n", n);
 
 	if (bHasIndStage)
 	{
-		WRITE(p, "// indirect op\n");
+		out.Write("// indirect op\n");
 		// perform the indirect op on the incoming regular coordinates using indtex%d as the offset coords
 		if (bpmem.tevind[n].bs != ITBA_OFF)
 		{
-			WRITE(p, "alphabump = indtex%d.%s %s;\n",
+			out.Write("alphabump = indtex%d.%s %s;\n",
 					bpmem.tevind[n].bt,
 					tevIndAlphaSel[bpmem.tevind[n].bs],
 					tevIndAlphaScale[bpmem.tevind[n].fmt]);
 		}
 		// format
-		WRITE(p, "float3 indtevcrd%d = indtex%d * %s;\n", n, bpmem.tevind[n].bt, tevIndFmtScale[bpmem.tevind[n].fmt]);
+		out.Write("float3 indtevcrd%d = indtex%d * %s;\n", n, bpmem.tevind[n].bt, tevIndFmtScale[bpmem.tevind[n].fmt]);
 
 		// bias
 		if (bpmem.tevind[n].bias != ITB_NONE )
-			WRITE(p, "indtevcrd%d.%s += %s;\n", n, tevIndBiasField[bpmem.tevind[n].bias], tevIndBiasAdd[bpmem.tevind[n].fmt]);
+			out.Write("indtevcrd%d.%s += %s;\n", n, tevIndBiasField[bpmem.tevind[n].bias], tevIndBiasAdd[bpmem.tevind[n].fmt]);
 
 		// multiply by offset matrix and scale
 		if (bpmem.tevind[n].mid != 0)
@@ -836,26 +638,26 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 			if (bpmem.tevind[n].mid <= 3)
 			{
 				int mtxidx = 2*(bpmem.tevind[n].mid-1);
-				WRITE(p, "float2 indtevtrans%d = float2(dot(" I_INDTEXMTX"[%d].xyz, indtevcrd%d), dot(" I_INDTEXMTX"[%d].xyz, indtevcrd%d));\n",
+				out.Write("float2 indtevtrans%d = float2(dot(" I_INDTEXMTX"[%d].xyz, indtevcrd%d), dot(" I_INDTEXMTX"[%d].xyz, indtevcrd%d));\n",
 					n, mtxidx, n, mtxidx+1, n);
 			}
 			else if (bpmem.tevind[n].mid <= 7 && bHasTexCoord)
 			{ // s matrix
 				_assert_(bpmem.tevind[n].mid >= 5);
 				int mtxidx = 2*(bpmem.tevind[n].mid-5);
-				WRITE(p, "float2 indtevtrans%d = " I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.xx;\n", n, mtxidx, texcoord, n);
+				out.Write("float2 indtevtrans%d = " I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.xx;\n", n, mtxidx, texcoord, n);
 			}
 			else if (bpmem.tevind[n].mid <= 11 && bHasTexCoord)
 			{ // t matrix
 				_assert_(bpmem.tevind[n].mid >= 9);
 				int mtxidx = 2*(bpmem.tevind[n].mid-9);
-				WRITE(p, "float2 indtevtrans%d = " I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.yy;\n", n, mtxidx, texcoord, n);
+				out.Write("float2 indtevtrans%d = " I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.yy;\n", n, mtxidx, texcoord, n);
 			}
 			else
-				WRITE(p, "float2 indtevtrans%d = 0;\n", n);
+				out.Write("float2 indtevtrans%d = 0;\n", n);
 		}
 		else
-			WRITE(p, "float2 indtevtrans%d = 0;\n", n);
+			out.Write("float2 indtevtrans%d = 0;\n", n);
 
 		// ---------
 		// Wrapping
@@ -863,24 +665,24 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 
 		// wrap S
 		if (bpmem.tevind[n].sw == ITW_OFF)
-			WRITE(p, "wrappedcoord.x = uv%d.x;\n", texcoord);
+			out.Write("wrappedcoord.x = uv%d.x;\n", texcoord);
 		else if (bpmem.tevind[n].sw == ITW_0)
-			WRITE(p, "wrappedcoord.x = 0.0f;\n");
+			out.Write("wrappedcoord.x = 0.0f;\n");
 		else
-			WRITE(p, "wrappedcoord.x = fmod( uv%d.x, %s );\n", texcoord, tevIndWrapStart[bpmem.tevind[n].sw]);
+			out.Write("wrappedcoord.x = fmod( uv%d.x, %s );\n", texcoord, tevIndWrapStart[bpmem.tevind[n].sw]);
 
 		// wrap T
 		if (bpmem.tevind[n].tw == ITW_OFF)
-			WRITE(p, "wrappedcoord.y = uv%d.y;\n", texcoord);
+			out.Write("wrappedcoord.y = uv%d.y;\n", texcoord);
 		else if (bpmem.tevind[n].tw == ITW_0)
-			WRITE(p, "wrappedcoord.y = 0.0f;\n");
+			out.Write("wrappedcoord.y = 0.0f;\n");
 		else
-			WRITE(p, "wrappedcoord.y = fmod( uv%d.y, %s );\n", texcoord, tevIndWrapStart[bpmem.tevind[n].tw]);
+			out.Write("wrappedcoord.y = fmod( uv%d.y, %s );\n", texcoord, tevIndWrapStart[bpmem.tevind[n].tw]);
 
 		if (bpmem.tevind[n].fb_addprev) // add previous tevcoord
-			WRITE(p, "tevcoord.xy += wrappedcoord + indtevtrans%d;\n", n);
+			out.Write("tevcoord.xy += wrappedcoord + indtevtrans%d;\n", n);
 		else
-			WRITE(p, "tevcoord.xy = wrappedcoord + indtevtrans%d;\n", n);
+			out.Write("tevcoord.xy = wrappedcoord + indtevtrans%d;\n", n);
 	}
 
 	TevStageCombiner::ColorCombiner &cc = bpmem.combiners[n].colorC;
@@ -894,8 +696,8 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 		|| ac.c == TEVALPHAARG_RASA || ac.d == TEVALPHAARG_RASA)
 	{
 		char *rasswap = swapModeTable[bpmem.combiners[n].alphaC.rswap];
-		WRITE(p, "rastemp = %s.%s;\n", tevRasTable[bpmem.tevorders[n / 2].getColorChan(n & 1)], rasswap);
-		WRITE(p, "crastemp = frac(rastemp * (255.0f/256.0f)) * (256.0f/255.0f);\n");
+		out.Write("rastemp = %s.%s;\n", tevRasTable[bpmem.tevorders[n / 2].getColorChan(n & 1)], rasswap);
+		out.Write("crastemp = frac(rastemp * (255.0f/256.0f)) * (256.0f/255.0f);\n");
 	}
 
 
@@ -905,17 +707,17 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 		{
 			// calc tevcord
 			if(bHasTexCoord)
-				WRITE(p, "tevcoord.xy = uv%d.xy;\n", texcoord);
+				out.Write("tevcoord.xy = uv%d.xy;\n", texcoord);
 			else
-				WRITE(p, "tevcoord.xy = float2(0.0f, 0.0f);\n");
+				out.Write("tevcoord.xy = float2(0.0f, 0.0f);\n");
 		}
 
 		char *texswap = swapModeTable[bpmem.combiners[n].alphaC.tswap];
 		int texmap = bpmem.tevorders[n/2].getTexMap(n&1);
-		SampleTexture(p, "textemp", "tevcoord", texswap, texmap, ApiType);
+		SampleTexture<T, type>(out, "textemp", "tevcoord", texswap, texmap, ApiType);
 	}
 	else
-		WRITE(p, "textemp = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
+		out.Write("textemp = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
 
 
 	if (cc.a == TEVCOLORARG_KONST || cc.b == TEVCOLORARG_KONST || cc.c == TEVCOLORARG_KONST || cc.d == TEVCOLORARG_KONST
@@ -923,14 +725,14 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 	{
 		int kc = bpmem.tevksel[n / 2].getKC(n & 1);
 		int ka = bpmem.tevksel[n / 2].getKA(n & 1);
-		WRITE(p, "konsttemp = float4(%s, %s);\n", tevKSelTableC[kc], tevKSelTableA[ka]);
+		out.Write("konsttemp = float4(%s, %s);\n", tevKSelTableC[kc], tevKSelTableA[ka]);
 		if(kc > 7 || ka > 7)
 		{
-			WRITE(p, "ckonsttemp = frac(konsttemp * (255.0f/256.0f)) * (256.0f/255.0f);\n");
+			out.Write("ckonsttemp = frac(konsttemp * (255.0f/256.0f)) * (256.0f/255.0f);\n");
 		}
 		else
 		{
-			WRITE(p, "ckonsttemp = konsttemp;\n");
+			out.Write("ckonsttemp = konsttemp;\n");
 		}
 	}
 
@@ -941,13 +743,13 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 	{
 		if(RegisterStates[0].AlphaNeedOverflowControl || RegisterStates[0].ColorNeedOverflowControl)
 		{
-			WRITE(p, "cprev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n");
+			out.Write("cprev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n");
 			RegisterStates[0].AlphaNeedOverflowControl = false;
 			RegisterStates[0].ColorNeedOverflowControl = false;
 		}
 		else
 		{
-			WRITE(p, "cprev = prev;\n");
+			out.Write("cprev = prev;\n");
 		}
 		RegisterStates[0].AuxStored = true;
 	}
@@ -959,13 +761,13 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 	{
 		if(RegisterStates[1].AlphaNeedOverflowControl || RegisterStates[1].ColorNeedOverflowControl)
 		{
-			WRITE(p, "cc0 = frac(c0 * (255.0f/256.0f)) * (256.0f/255.0f);\n");
+			out.Write("cc0 = frac(c0 * (255.0f/256.0f)) * (256.0f/255.0f);\n");
 			RegisterStates[1].AlphaNeedOverflowControl = false;
 			RegisterStates[1].ColorNeedOverflowControl = false;
 		}
 		else
 		{
-			WRITE(p, "cc0 = c0;\n");
+			out.Write("cc0 = c0;\n");
 		}
 		RegisterStates[1].AuxStored = true;
 	}
@@ -977,13 +779,13 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 	{
 		if(RegisterStates[2].AlphaNeedOverflowControl || RegisterStates[2].ColorNeedOverflowControl)
 		{
-			WRITE(p, "cc1 = frac(c1 * (255.0f/256.0f)) * (256.0f/255.0f);\n");
+			out.Write("cc1 = frac(c1 * (255.0f/256.0f)) * (256.0f/255.0f);\n");
 			RegisterStates[2].AlphaNeedOverflowControl = false;
 			RegisterStates[2].ColorNeedOverflowControl = false;
 		}
 		else
 		{
-			WRITE(p, "cc1 = c1;\n");
+			out.Write("cc1 = c1;\n");
 		}
 		RegisterStates[2].AuxStored = true;
 	}
@@ -995,13 +797,13 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 	{
 		if(RegisterStates[3].AlphaNeedOverflowControl || RegisterStates[3].ColorNeedOverflowControl)
 		{
-			WRITE(p, "cc2 = frac(c2 * (255.0f/256.0f)) * (256.0f/255.0f);\n");
+			out.Write("cc2 = frac(c2 * (255.0f/256.0f)) * (256.0f/255.0f);\n");
 			RegisterStates[3].AlphaNeedOverflowControl = false;
 			RegisterStates[3].ColorNeedOverflowControl = false;
 		}
 		else
 		{
-			WRITE(p, "cc2 = c2;\n");
+			out.Write("cc2 = c2;\n");
 		}
 		RegisterStates[3].AuxStored = true;
 	}
@@ -1009,117 +811,116 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 	RegisterStates[cc.dest].ColorNeedOverflowControl = (cc.clamp == 0);
 	RegisterStates[cc.dest].AuxStored = false;
 
-	// combine the color channel
-	WRITE(p, "// color combine\n");
+	out.Write("// color combine\n");
 	if (cc.clamp)
-		WRITE(p, "%s = saturate(", tevCOutputTable[cc.dest]);
+		out.Write("%s = saturate(", tevCOutputTable[cc.dest]);
 	else
-		WRITE(p, "%s = ", tevCOutputTable[cc.dest]);
+		out.Write("%s = ", tevCOutputTable[cc.dest]);
 
 	// combine the color channel
 	if (cc.bias != TevBias_COMPARE) // if not compare
 	{
 		//normal color combiner goes here
 		if (cc.shift > TEVSCALE_1)
-			WRITE(p, "%s*(", tevScaleTable[cc.shift]);
+			out.Write("%s*(", tevScaleTable[cc.shift]);
 
 		if(!(cc.d == TEVCOLORARG_ZERO && cc.op == TEVOP_ADD))
-			WRITE(p, "%s%s", tevCInputTable[cc.d], tevOpTable[cc.op]);
+			out.Write("%s%s", tevCInputTable[cc.d], tevOpTable[cc.op]);
 
 		if (cc.a == cc.b)
-			WRITE(p, "%s", tevCInputTable[cc.a + 16]);
+			out.Write("%s", tevCInputTable[cc.a + 16]);
 		else if (cc.c == TEVCOLORARG_ZERO)
-			WRITE(p, "%s", tevCInputTable[cc.a + 16]);
+			out.Write("%s", tevCInputTable[cc.a + 16]);
 		else if (cc.c == TEVCOLORARG_ONE)
-			WRITE(p, "%s", tevCInputTable[cc.b + 16]);
+			out.Write("%s", tevCInputTable[cc.b + 16]);
 		else if (cc.a == TEVCOLORARG_ZERO)
-			WRITE(p, "%s*%s", tevCInputTable[cc.b + 16], tevCInputTable[cc.c + 16]);
+			out.Write("%s*%s", tevCInputTable[cc.b + 16], tevCInputTable[cc.c + 16]);
 		else if (cc.b == TEVCOLORARG_ZERO)
-			WRITE(p, "%s*(float3(1.0f, 1.0f, 1.0f)-%s)", tevCInputTable[cc.a + 16], tevCInputTable[cc.c + 16]);
+			out.Write("%s*(float3(1.0f, 1.0f, 1.0f)-%s)", tevCInputTable[cc.a + 16], tevCInputTable[cc.c + 16]);
 		else
-			WRITE(p, "lerp(%s, %s, %s)", tevCInputTable[cc.a + 16], tevCInputTable[cc.b + 16], tevCInputTable[cc.c + 16]);
+			out.Write("lerp(%s, %s, %s)", tevCInputTable[cc.a + 16], tevCInputTable[cc.b + 16], tevCInputTable[cc.c + 16]);
 
-		WRITE(p, "%s", tevBiasTable[cc.bias]);
+		out.Write("%s", tevBiasTable[cc.bias]);
 
 		if (cc.shift > TEVSCALE_1)
-			WRITE(p, ")");
+			out.Write(")");
 	}
 	else
 	{
 		int cmp = (cc.shift<<1)|cc.op|8; // comparemode stored here
-		WRITE(p, TEVCMPColorOPTable[cmp],//lookup the function from the op table
+		out.Write(TEVCMPColorOPTable[cmp],//lookup the function from the op table
 				tevCInputTable[cc.d],
 				tevCInputTable[cc.a + 16],
 				tevCInputTable[cc.b + 16],
 				tevCInputTable[cc.c + 16]);
 	}
 	if (cc.clamp)
-		WRITE(p, ")");
-	WRITE(p,";\n");
+		out.Write(")");
+	out.Write(";\n");
 
 	RegisterStates[ac.dest].AlphaNeedOverflowControl = (ac.clamp == 0);
 	RegisterStates[ac.dest].AuxStored = false;
 
-	// combine the alpha channel
-	WRITE(p, "// alpha combine\n");
+	out.Write("// alpha combine\n");
 	if (ac.clamp)
-		WRITE(p, "%s = saturate(", tevAOutputTable[ac.dest]);
+		out.Write("%s = saturate(", tevAOutputTable[ac.dest]);
 	else
-		WRITE(p, "%s = ", tevAOutputTable[ac.dest]);
+		out.Write("%s = ", tevAOutputTable[ac.dest]);
 
 	if (ac.bias != TevBias_COMPARE) // if not compare
 	{
 		//normal alpha combiner goes here
 		if (ac.shift > TEVSCALE_1)
-			WRITE(p, "%s*(", tevScaleTable[ac.shift]);
+			out.Write("%s*(", tevScaleTable[ac.shift]);
 
 		if(!(ac.d == TEVALPHAARG_ZERO && ac.op == TEVOP_ADD))
-			WRITE(p, "%s.a%s", tevAInputTable[ac.d], tevOpTable[ac.op]);
+			out.Write("%s.a%s", tevAInputTable[ac.d], tevOpTable[ac.op]);
 
 		if (ac.a == ac.b)
-			WRITE(p, "%s.a", tevAInputTable[ac.a + 8]);
+			out.Write("%s.a", tevAInputTable[ac.a + 8]);
 		else if (ac.c == TEVALPHAARG_ZERO)
-			WRITE(p, "%s.a", tevAInputTable[ac.a + 8]);
+			out.Write("%s.a", tevAInputTable[ac.a + 8]);
 		else if (ac.a == TEVALPHAARG_ZERO)
-			WRITE(p, "%s.a*%s.a", tevAInputTable[ac.b + 8], tevAInputTable[ac.c + 8]);
+			out.Write("%s.a*%s.a", tevAInputTable[ac.b + 8], tevAInputTable[ac.c + 8]);
 		else if (ac.b == TEVALPHAARG_ZERO)
-			WRITE(p, "%s.a*(1.0f-%s.a)", tevAInputTable[ac.a + 8], tevAInputTable[ac.c + 8]);
+			out.Write("%s.a*(1.0f-%s.a)", tevAInputTable[ac.a + 8], tevAInputTable[ac.c + 8]);
 		else
-			WRITE(p, "lerp(%s.a, %s.a, %s.a)", tevAInputTable[ac.a + 8], tevAInputTable[ac.b + 8], tevAInputTable[ac.c + 8]);
+			out.Write("lerp(%s.a, %s.a, %s.a)", tevAInputTable[ac.a + 8], tevAInputTable[ac.b + 8], tevAInputTable[ac.c + 8]);
 
-		WRITE(p, "%s",tevBiasTable[ac.bias]);
+		out.Write("%s",tevBiasTable[ac.bias]);
 
 		if (ac.shift>0)
-			WRITE(p, ")");
+			out.Write(")");
 
 	}
 	else
 	{
 		//compare alpha combiner goes here
 		int cmp = (ac.shift<<1)|ac.op|8; // comparemode stored here
-		WRITE(p, TEVCMPAlphaOPTable[cmp],
+		out.Write(TEVCMPAlphaOPTable[cmp],
 				tevAInputTable[ac.d],
 				tevAInputTable[ac.a + 8],
 				tevAInputTable[ac.b + 8],
 				tevAInputTable[ac.c + 8]);
 	}
 	if (ac.clamp)
-		WRITE(p, ")");
-	WRITE(p, ";\n\n");
-	WRITE(p, "// TEV done\n");
+		out.Write(")");
+	out.Write(";\n\n");
+	out.Write("// TEV done\n");
 }
 
-void SampleTexture(char *&p, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType)
+template<class T, GenOutput type>
+void SampleTexture(T& out, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType)
 {
 	if (ApiType == API_D3D11)
-		WRITE(p, "%s=Tex%d.Sample(samp%d,%s.xy * " I_TEXDIMS"[%d].xy).%s;\n", destination, texmap,texmap, texcoords, texmap, texswap);
+		out.Write("%s=Tex%d.Sample(samp%d,%s.xy * " I_TEXDIMS"[%d].xy).%s;\n", destination, texmap,texmap, texcoords, texmap, texswap);
 	else
-		WRITE(p, "%s=tex2D(samp%d,%s.xy * " I_TEXDIMS"[%d].xy).%s;\n", destination, texmap, texcoords, texmap, texswap);
+		out.Write("%s=tex2D(samp%d,%s.xy * " I_TEXDIMS"[%d].xy).%s;\n", destination, texmap, texcoords, texmap, texswap);
 }
 
 static const char *tevAlphaFuncsTable[] =
 {
-	"(false)",									//ALPHACMP_NEVER 0
+	"(false)",									//ALPHACMP_NEVER 0, TODO: Not safe?
 	"(prev.a <= %s - (0.25f/255.0f))",			//ALPHACMP_LESS 1
 	"(abs( prev.a - %s ) < (0.5f/255.0f))",		//ALPHACMP_EQUAL 2
 	"(prev.a < %s + (0.25f/255.0f))",			//ALPHACMP_LEQUAL 3
@@ -1137,7 +938,8 @@ static const char *tevAlphaFunclogicTable[] =
 	" == "  // xnor
 };
 
-static void WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode)
+template<class T, GenOutput type>
+static void WriteAlphaTest(T& out, API_TYPE ApiType, DSTALPHA_MODE dstAlphaMode)
 {
 	static const char *alphaRef[2] =
 	{
@@ -1146,21 +948,21 @@ static void WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode
 	};	
 
 	// using discard then return works the same in cg and dx9 but not in dx11
-	WRITE(p, "if(!( ");
+	out.Write("if(!( ");
 
 	int compindex = bpmem.alpha_test.comp0;
-	WRITE(p, tevAlphaFuncsTable[compindex],alphaRef[0]);//lookup the first component from the alpha function table
+	out.Write(tevAlphaFuncsTable[compindex],alphaRef[0]);//lookup the first component from the alpha function table
 
-	WRITE(p, "%s", tevAlphaFunclogicTable[bpmem.alpha_test.logic]);//lookup the logic op
+	out.Write("%s", tevAlphaFunclogicTable[bpmem.alpha_test.logic]);//lookup the logic op
 
 	compindex = bpmem.alpha_test.comp1;
-	WRITE(p, tevAlphaFuncsTable[compindex],alphaRef[1]);//lookup the second component from the alpha function table
-	WRITE(p, ")) {\n");
+	out.Write(tevAlphaFuncsTable[compindex],alphaRef[1]);//lookup the second component from the alpha function table
+	out.Write(")) {\n");
 
-	WRITE(p, "ocol0 = 0;\n");
+	out.Write("ocol0 = 0;\n");
 	if (dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND)
-		WRITE(p, "ocol1 = 0;\n");
-	WRITE(p, "depth = 1.f;\n");
+		out.Write("ocol1 = 0;\n");
+	out.Write("depth = 1.f;\n");
 
 	// HAXX: zcomploc (aka early_ztest) is a way to control whether depth test is done before
 	// or after texturing and alpha test. PC GPUs have no way to support this
@@ -1174,12 +976,12 @@ static void WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode
 	// we don't have a choice.
 	if (!(bpmem.zcontrol.early_ztest && bpmem.zmode.updateenable))
 	{
-		WRITE(p, "discard;\n");
+		out.Write("discard;\n");
 		if (ApiType != API_D3D11)
-			WRITE(p, "return;\n");
+			out.Write("return;\n");
 	}
 
-	WRITE(p, "}\n");
+	out.Write("}\n");
 }
 
 static const char *tevFogFuncsTable[] =
@@ -1194,38 +996,40 @@ static const char *tevFogFuncsTable[] =
 	"  fog = 1.0f - fog;\n   fog = pow(2.0f, -8.0f * fog * fog);\n"	//backward exp2
 };
 
-static void WriteFog(char *&p)
+template<class T, GenOutput type>
+static void WriteFog(T& out)
 {
-	if(bpmem.fog.c_proj_fsel.fsel == 0)return;//no Fog
+	if(bpmem.fog.c_proj_fsel.fsel == 0)
+		return; //no Fog
 
 	if (bpmem.fog.c_proj_fsel.proj == 0)
 	{
 		// perspective
 		// ze = A/(B - (Zs >> B_SHF)
-		WRITE (p, "  float ze = " I_FOG"[1].x / (" I_FOG"[1].y - (zCoord / " I_FOG"[1].w));\n");
+		out.Write("  float ze = " I_FOG"[1].x / (" I_FOG"[1].y - (zCoord / " I_FOG"[1].w));\n");
 	}
 	else
 	{
 		// orthographic
 		// ze = a*Zs	(here, no B_SHF)
-		WRITE (p, "  float ze = " I_FOG"[1].x * zCoord;\n");
+		out.Write("  float ze = " I_FOG"[1].x * zCoord;\n");
 	}
 
 	// x_adjust = sqrt((x-center)^2 + k^2)/k
 	// ze *= x_adjust
-	//this is complitly teorical as the real hard seems to use a table intead of calculate the values.
+	// this is completely theoretical as the real hardware seems to use a table intead of calculating the values.
 	if(bpmem.fogRange.Base.Enabled)
 	{
-		WRITE (p, "  float x_adjust = (2.0f * (clipPos.x / " I_FOG"[2].y)) - 1.0f - " I_FOG"[2].x;\n");
-		WRITE (p, "  x_adjust = sqrt(x_adjust * x_adjust + " I_FOG"[2].z * " I_FOG"[2].z) / " I_FOG"[2].z;\n");
-		WRITE (p, "  ze *= x_adjust;\n");
+		out.Write("  float x_adjust = (2.0f * (clipPos.x / " I_FOG"[2].y)) - 1.0f - " I_FOG"[2].x;\n");
+		out.Write("  x_adjust = sqrt(x_adjust * x_adjust + " I_FOG"[2].z * " I_FOG"[2].z) / " I_FOG"[2].z;\n");
+		out.Write("  ze *= x_adjust;\n");
 	}
 
-	WRITE (p, "  float fog = saturate(ze - " I_FOG"[1].z);\n");
+	out.Write("float fog = saturate(ze - " I_FOG"[1].z);\n");
 
 	if(bpmem.fog.c_proj_fsel.fsel > 3)
 	{
-		WRITE(p, "%s", tevFogFuncsTable[bpmem.fog.c_proj_fsel.fsel]);
+		out.Write("%s", tevFogFuncsTable[bpmem.fog.c_proj_fsel.fsel]);
 	}
 	else
 	{
@@ -1233,7 +1037,15 @@ static void WriteFog(char *&p)
 			WARN_LOG(VIDEO, "Unknown Fog Type! %08x", bpmem.fog.c_proj_fsel.fsel);
 	}
 
-	WRITE(p, "  prev.rgb = lerp(prev.rgb," I_FOG"[0].rgb,fog);\n");
-
-
+	out.Write("  prev.rgb = lerp(prev.rgb," I_FOG"[0].rgb,fog);\n");
+}
+
+void GetPixelShaderId(PixelShaderUid& object, DSTALPHA_MODE dst_alpha_mode, API_TYPE ApiType, u32 components)
+{
+	GeneratePixelShader<PixelShaderUid, GO_ShaderUid>(object, dst_alpha_mode, ApiType, components);
+}
+
+void GeneratePixelShaderCode(PixelShaderCode& object, DSTALPHA_MODE dst_alpha_mode, API_TYPE ApiType, u32 components)
+{
+	GeneratePixelShader<PixelShaderCode, GO_ShaderCode>(object, dst_alpha_mode, ApiType, components);
 }
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 9c8bfce256..61be98aa6e 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -19,6 +19,7 @@
 #define GCOGL_PIXELSHADER_H
 
 #include "VideoCommon.h"
+#include "ShaderGenCommon.h"
 
 #define I_COLORS      "color"
 #define I_KCOLORS     "k"
@@ -44,66 +45,6 @@
 #define C_PLIGHTS		(C_FOG + 3)
 #define C_PMATERIALS	(C_PLIGHTS + 40)
 #define C_PENVCONST_END (C_PMATERIALS + 4)
-#define PIXELSHADERUID_MAX_VALUES 70
-#define PIXELSHADERUID_MAX_VALUES_SAFE 115
-
-// DO NOT make anything in this class virtual.
-template<bool safe>
-class _PIXELSHADERUID
-{
-public:
-	u32 values[safe ? PIXELSHADERUID_MAX_VALUES_SAFE : PIXELSHADERUID_MAX_VALUES];
-	int num_values;
-
-	_PIXELSHADERUID()
-	{
-	}
-
-	_PIXELSHADERUID(const _PIXELSHADERUID& r)
-	{
-		num_values = r.num_values;
-		if (safe) memcpy(values, r.values, PIXELSHADERUID_MAX_VALUES_SAFE);
-		else memcpy(values, r.values, r.GetNumValues() * sizeof(values[0]));
-	}
-
-	int GetNumValues() const
-	{
-		if (safe) return (sizeof(values) / sizeof(u32));
-		else return num_values;
-	}
-
-	bool operator <(const _PIXELSHADERUID& _Right) const
-	{
-		int N = GetNumValues();
-		if (N < _Right.GetNumValues())
-			return true;
-		else if (N > _Right.GetNumValues())
-			return false;
-		for (int i = 0; i < N; ++i)
-		{
-			if (values[i] < _Right.values[i])
-				return true;
-			else if (values[i] > _Right.values[i])
-				return false;
-		}
-		return false;
-	}
-
-	bool operator ==(const _PIXELSHADERUID& _Right) const
-	{
-		int N = GetNumValues();
-		if (N != _Right.GetNumValues())
-			return false;
-		for (int i = 0; i < N; ++i)
-		{
-			if (values[i] != _Right.values[i])
-				return false;
-		}
-		return true;
-	}
-};
-typedef _PIXELSHADERUID<false> PIXELSHADERUID;
-typedef _PIXELSHADERUID<true> PIXELSHADERUIDSAFE;
 
 // Different ways to achieve rendering with destination alpha
 enum DSTALPHA_MODE
@@ -113,12 +54,53 @@ enum DSTALPHA_MODE
 	DSTALPHA_DUAL_SOURCE_BLEND // Use dual-source blending
 };
 
-const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
+enum ALPHA_PRETEST_RESULT
+{
+	ALPHAPT_UNDEFINED, // AlphaTest Result is not defined
+	ALPHAPT_ALWAYSFAIL, // Alpha test alway Fail
+	ALPHAPT_ALWAYSPASS // Alpha test alway Pass
+};
 
-void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 components);
-void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode, u32 components);
+struct pixel_shader_uid_data
+{
+	u32 components;
+	DSTALPHA_MODE dstAlphaMode; // TODO: as u32 :2
+	ALPHA_PRETEST_RESULT Pretest; // TODO: As :2
+	u32 nIndirectStagesUsed : 8;
+	struct {
+        u32 numtexgens : 4;
+        u32 numtevstages : 4;
+		u32 numindstages : 3;
+	} genMode;
+	u32 fogc_proj_fselfsel : 3;
+	struct
+	{
+		u32 unknown : 1;
+		u32 projection : 1; // XF_TEXPROJ_X
+		u32 inputform : 2; // XF_TEXINPUT_X
+		u32 texgentype : 3; // XF_TEXGEN_X
+		u32 sourcerow : 5; // XF_SRCGEOM_X
+		u32 embosssourceshift : 3; // what generated texcoord to use
+		u32 embosslightshift : 3; // light index that is used
+	} texMtxInfo[8];
+	struct
+	{
+        u32 bi0 : 3; // indirect tex stage 0 ntexmap
+        u32 bc0 : 3; // indirect tex stage 0 ntexcoord
+        u32 bi1 : 3;
+        u32 bc1 : 3;
+        u32 bi2 : 3;
+        u32 bc3 : 3;
+        u32 bi4 : 3;
+        u32 bc4 : 3;
+	} tevindref;
+};
 
-// Used to make sure that our optimized pixel shader IDs don't lose any possible shader code changes
-void ValidatePixelShaderIDs(API_TYPE api, PIXELSHADERUIDSAFE old_id, const std::string& old_code, DSTALPHA_MODE dstAlphaMode, u32 components);
+typedef ShaderUid<pixel_shader_uid_data> PixelShaderUid;
+typedef ShaderCode<pixel_shader_uid_data> PixelShaderCode;
+
+
+void GeneratePixelShaderCode(PixelShaderCode& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
+void GetPixelShaderId(PixelShaderUid& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
 
 #endif // GCOGL_PIXELSHADER_H
diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index 28fb8e8956..090fb24b57 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -44,7 +44,7 @@ public:
 	// TODO: Store last frame used and order by that? makes much more sense anyway...
 	bool operator < (const ShaderUid& obj) const
 	{
-		for (int i = 0; i < sizeof(uid_data) / sizeof(u32); ++i)
+		for (unsigned int i = 0; i < sizeof(uid_data) / sizeof(u32); ++i)
 		{
 			if (this->values[i] < obj.values[i])
 				return true;
@@ -91,4 +91,10 @@ private:
 	char* write_ptr;
 };
 
+enum GenOutput
+{
+	GO_ShaderCode,
+	GO_ShaderUid,
+};
+
 #endif // _SHADERGENCOMMON_H
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index acc89c6a54..db4946a49f 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -28,11 +28,6 @@
 
 static char text[16768];
 
-enum GenOutput
-{
-	GO_ShaderCode,
-	GO_ShaderUid,
-};
 // TODO: Check if something goes wrong if the cached shaders used pixel lighting but it's disabled later??
 template<class T>
 void GenerateVSOutputStruct(T& object, u32 components, API_TYPE api_type)
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp~ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp~
deleted file mode 100644
index be57103918..0000000000
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp~
+++ /dev/null
@@ -1,645 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program 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, version 2.0.
-
-// This program 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 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include <math.h>
-#include <locale.h>
-
-#include "NativeVertexFormat.h"
-
-#include "BPMemory.h"
-#include "CPMemory.h"
-#include "LightingShaderGen.h"
-#include "VertexShaderGen.h"
-#include "VideoConfig.h"
-
-static char text[16768];
-
-enum GenOutput
-{
-	GO_ShaderCode,
-	GO_ShaderUid,
-};
-// TODO: Check if something goes wrong if the cached shaders used pixel lighting but it's disabled later??
-template<class T>
-void GenerateVSOutputStruct(T& object, u32 components, API_TYPE api_type)
-{
-	object.Write("struct VS_OUTPUT {\n");
-	object.Write("  float4 pos : POSITION;\n");
-	object.Write("  float4 colors_0 : COLOR0;\n");
-	object.Write("  float4 colors_1 : COLOR1;\n");
-
-	if (xfregs.numTexGen.numTexGens < 7)
-	{
-		for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
-			object.Write("  float3 tex%d : TEXCOORD%d;\n", i, i);
-
-		object.Write("  float4 clipPos : TEXCOORD%d;\n", xfregs.numTexGen.numTexGens);
-///		if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-///			object.Write("  float4 Normal : TEXCOORD%d;\n", xfregs.numTexGen.numTexGens + 1);
-	}
-	else
-	{
-		// clip position is in w of first 4 texcoords
-///		if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-///		{
-///			for (int i = 0; i < 8; ++i)
-///				object.Write("  float4 tex%d : TEXCOORD%d;\n", i, i);
-///		}
-///		else
-		{
-			for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
-				object.Write("  float%d tex%d : TEXCOORD%d;\n", i < 4 ? 4 : 3 , i, i);
-		}
-	}
-	object.Write("};\n");
-}
-
-template<class T, GenOutput type>
-void _GenerateLightShader(T& object, int index, int litchan_index, const char* lightsName, int coloralpha)
-{
-#define SetUidField(name, value) if (type == GO_ShaderUid) { object.GetUidData().name = value; };
-	const LitChannel& chan = (litchan_index > 1) ? xfregs.alpha[litchan_index-2] : xfregs.color[litchan_index];
-	const char* swizzle = "xyzw";
-	if (coloralpha == 1 ) swizzle = "xyz";
-	else if (coloralpha == 2 ) swizzle = "w";
-
-	SetUidField(lit_chans[litchan_index].attnfunc, chan.attnfunc);
-	SetUidField(lit_chans[litchan_index].diffusefunc, chan.diffusefunc);
-	if (!(chan.attnfunc & 1)) {
-		// atten disabled
-		switch (chan.diffusefunc) {
-			case LIGHTDIF_NONE:
-				object.Write("lacc.%s += %s.lights[%d].col.%s;\n", swizzle, lightsName, index, swizzle);
-				break;
-			case LIGHTDIF_SIGN:
-			case LIGHTDIF_CLAMP:
-				object.Write("ldir = normalize(%s.lights[%d].pos.xyz - pos.xyz);\n", lightsName, index);
-				object.Write("lacc.%s += %sdot(ldir, _norm0)) * %s.lights[%d].col.%s;\n",
-					swizzle, chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(", lightsName, index, swizzle);
-				break;
-			default: _assert_(0);
-		}
-	}
-	else { // spec and spot
-
-		if (chan.attnfunc == 3)
-		{ // spot
-			object.Write("ldir = %s.lights[%d].pos.xyz - pos.xyz;\n", lightsName, index);
-			object.Write("dist2 = dot(ldir, ldir);\n"
-						"dist = sqrt(dist2);\n"
-						"ldir = ldir / dist;\n"
-						"attn = max(0.0f, dot(ldir, %s.lights[%d].dir.xyz));\n", lightsName, index);
-			object.Write("attn = max(0.0f, dot(%s.lights[%d].cosatt.xyz, float3(1.0f, attn, attn*attn))) / dot(%s.lights[%d].distatt.xyz, float3(1.0f,dist,dist2));\n", lightsName, index, lightsName, index);
-		}
-		else if (chan.attnfunc == 1)
-		{ // specular
-			object.Write("ldir = normalize(%s.lights[%d].pos.xyz);\n", lightsName, index);
-			object.Write("attn = (dot(_norm0,ldir) >= 0.0f) ? max(0.0f, dot(_norm0, %s.lights[%d].dir.xyz)) : 0.0f;\n", lightsName, index);
-			object.Write("attn = max(0.0f, dot(%s.lights[%d].cosatt.xyz, float3(1,attn,attn*attn))) / dot(%s.lights[%d].distatt.xyz, float3(1,attn,attn*attn));\n", lightsName, index, lightsName, index);
-		}
-
-		switch (chan.diffusefunc)
-		{
-			case LIGHTDIF_NONE:
-				object.Write("lacc.%s += attn * %s.lights[%d].col.%s;\n", swizzle, lightsName, index, swizzle);
-				break;
-			case LIGHTDIF_SIGN:
-			case LIGHTDIF_CLAMP:
-				object.Write("lacc.%s += attn * %sdot(ldir, _norm0)) * %s.lights[%d].col.%s;\n",
-					swizzle,
-					chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(",
-					lightsName,
-					index,
-					swizzle);
-				break;
-			default: _assert_(0);
-		}
-	}
-	object.Write("\n");
-}
-
-// vertex shader
-// lights/colors
-// materials name is I_MATERIALS in vs and I_PMATERIALS in ps
-// inColorName is color in vs and colors_ in ps
-// dest is o.colors_ in vs and colors_ in ps
-template<class T, GenOutput type>
-void _GenerateLightingShader(T& object, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest)
-{
-	for (unsigned int j = 0; j < xfregs.numChan.numColorChans; j++)
-	{
-		const LitChannel& color = xfregs.color[j];
-		const LitChannel& alpha = xfregs.alpha[j];
-
-		object.Write("{\n");
-
-		SetUidField(lit_chans[j].matsource, xfregs.color[j].matsource);
-		if (color.matsource) {// from vertex
-			if (components & (VB_HAS_COL0 << j))
-				object.Write("mat = %s%d;\n", inColorName, j);
-			else if (components & VB_HAS_COL0)
-				object.Write("mat = %s0;\n", inColorName);
-			else
-				object.Write("mat = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
-		}
-		else // from color
-			object.Write("mat = %s.C%d;\n", materialsName, j+2);
-
-		SetUidField(lit_chans[j].enablelighting, xfregs.color[j].enablelighting);
-		if (color.enablelighting) {
-			SetUidField(lit_chans[j].ambsource, xfregs.color[j].ambsource);
-			if (color.ambsource) { // from vertex
-				if (components & (VB_HAS_COL0<<j) )
-					object.Write("lacc = %s%d;\n", inColorName, j);
-				else if (components & VB_HAS_COL0 )
-					object.Write("lacc = %s0;\n", inColorName);
-				else
-					object.Write("lacc = float4(0.0f, 0.0f, 0.0f, 0.0f);\n");
-			}
-			else // from color
-				object.Write("lacc = %s.C%d;\n", materialsName, j);
-		}
-		else
-		{
-			object.Write("lacc = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
-		}
-
-		// check if alpha is different
-		SetUidField(lit_chans[j+2].matsource, xfregs.alpha[j].matsource);
-		if (alpha.matsource != color.matsource) {
-			if (alpha.matsource) {// from vertex
-				if (components & (VB_HAS_COL0<<j))
-					object.Write("mat.w = %s%d.w;\n", inColorName, j);
-				else if (components & VB_HAS_COL0)
-					object.Write("mat.w = %s0.w;\n", inColorName);
-				else object.Write("mat.w = 1.0f;\n");
-			}
-			else // from color
-				object.Write("mat.w = %s.C%d.w;\n", materialsName, j+2);
-		}
-
-		SetUidField(lit_chans[j+2].enablelighting, xfregs.alpha[j].enablelighting);
-		if (alpha.enablelighting)
-		{
-			SetUidField(lit_chans[j+2].ambsource, xfregs.alpha[j].ambsource);
-			if (alpha.ambsource) {// from vertex
-				if (components & (VB_HAS_COL0<<j) )
-					object.Write("lacc.w = %s%d.w;\n", inColorName, j);
-				else if (components & VB_HAS_COL0 )
-					object.Write("lacc.w = %s0.w;\n", inColorName);
-				else
-					object.Write("lacc.w = 0.0f;\n");
-			}
-			else // from color
-				object.Write("lacc.w = %s.C%d.w;\n", materialsName, j);
-		}
-		else
-		{
-			object.Write("lacc.w = 1.0f;\n");
-		}
-
-		if(color.enablelighting && alpha.enablelighting)
-		{
-			// both have lighting, test if they use the same lights
-			int mask = 0;
-			SetUidField(lit_chans[j].attnfunc, color.attnfunc);
-			SetUidField(lit_chans[j+2].attnfunc, alpha.attnfunc);
-			SetUidField(lit_chans[j].diffusefunc, color.diffusefunc);
-			SetUidField(lit_chans[j+2].diffusefunc, alpha.diffusefunc);
-			SetUidField(lit_chans[j].light_mask, color.GetFullLightMask());
-			SetUidField(lit_chans[j+2].light_mask, alpha.GetFullLightMask());
-			if(color.lightparams == alpha.lightparams)
-			{
-				mask = color.GetFullLightMask() & alpha.GetFullLightMask();
-				if(mask)
-				{
-					for (int i = 0; i < 8; ++i)
-					{
-						if (mask & (1<<i))
-						{
-							_GenerateLightShader<T,type>(object, i, j, lightsName, 3);
-						}
-					}
-				}
-			}
-
-			// no shared lights
-			for (int i = 0; i < 8; ++i)
-			{
-				if (!(mask&(1<<i)) && (color.GetFullLightMask() & (1<<i)))
-					_GenerateLightShader<T,type>(object, i, j, lightsName, 1);
-				if (!(mask&(1<<i)) && (alpha.GetFullLightMask() & (1<<i)))
-					_GenerateLightShader<T,type>(object, i, j+2, lightsName, 2);
-			}
-		}
-		else if (color.enablelighting || alpha.enablelighting)
-		{
-			// lights are disabled on one channel so process only the active ones
-			const LitChannel& workingchannel = color.enablelighting ? color : alpha;
-			const int lit_index = color.enablelighting ? j : (j+2);
-			int coloralpha = color.enablelighting ? 1 : 2;
-
-			SetUidField(lit_chans[lit_index].light_mask, workingchannel.GetFullLightMask());
-			for (int i = 0; i < 8; ++i)
-			{
-				if (workingchannel.GetFullLightMask() & (1<<i))
-					_GenerateLightShader<T,type>(object, i, lit_index, lightsName, coloralpha);
-			}
-		}
-		object.Write("%s%d = mat * saturate(lacc);\n", dest, j);
-		object.Write("}\n");
-	}
-}
-
-// TODO: Problem: this one uses copy constructors or sth for uids when returning...
-template<class T, GenOutput type>
-void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
-{
-#undef SetUidField
-#define SetUidField(name, value) if (type == GO_ShaderUid) {out.GetUidData().name = value; };
-
-	if (type == GO_ShaderCode)
-	{
-		out.SetBuffer(text);
-		setlocale(LC_NUMERIC, "C"); // Reset locale for compilation
-	}
-
-	///	text[sizeof(text) - 1] = 0x7C;  // canary
-
-	bool is_d3d = (api_type & API_D3D9 || api_type == API_D3D11);
-	u32 lightMask = 0;
-	if (xfregs.numChan.numColorChans > 0)
-		lightMask |= xfregs.color[0].GetFullLightMask() | xfregs.alpha[0].GetFullLightMask();
-	if (xfregs.numChan.numColorChans > 1)
-		lightMask |= xfregs.color[1].GetFullLightMask() | xfregs.alpha[1].GetFullLightMask();
-
-	out.Write("//Vertex Shader: comp:%x, \n", components);
-	out.Write("typedef struct { float4 T0, T1, T2; float4 N0, N1, N2; } s_" I_POSNORMALMATRIX";\n"
-			"typedef struct { float4 t; } FLT4;\n"
-			"typedef struct { FLT4 T[24]; } s_" I_TEXMATRICES";\n"
-			"typedef struct { FLT4 T[64]; } s_" I_TRANSFORMMATRICES";\n"
-			"typedef struct { FLT4 T[32]; } s_" I_NORMALMATRICES";\n"
-			"typedef struct { FLT4 T[64]; } s_" I_POSTTRANSFORMMATRICES";\n"
-			"typedef struct { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; } Light;\n"
-			"typedef struct { Light lights[8]; } s_" I_LIGHTS";\n"
-			"typedef struct { float4 C0, C1, C2, C3; } s_" I_MATERIALS";\n"
-			"typedef struct { float4 T0, T1, T2, T3; } s_" I_PROJECTION";\n"
-			);
-
-///	p = GenerateVSOutputStruct(p, components, api_type);
-	GenerateVSOutputStruct(out, components, api_type);
-
-	// uniforms
-
-	out.Write("uniform s_" I_TRANSFORMMATRICES" " I_TRANSFORMMATRICES" : register(c%d);\n", C_TRANSFORMMATRICES);
-	out.Write("uniform s_" I_TEXMATRICES" " I_TEXMATRICES" : register(c%d);\n", C_TEXMATRICES);
-	out.Write("uniform s_" I_NORMALMATRICES" " I_NORMALMATRICES" : register(c%d);\n", C_NORMALMATRICES);
-	out.Write("uniform s_" I_POSNORMALMATRIX" " I_POSNORMALMATRIX" : register(c%d);\n", C_POSNORMALMATRIX);
-	out.Write("uniform s_" I_POSTTRANSFORMMATRICES" " I_POSTTRANSFORMMATRICES" : register(c%d);\n", C_POSTTRANSFORMMATRICES);
-	out.Write("uniform s_" I_LIGHTS" " I_LIGHTS" : register(c%d);\n", C_LIGHTS);
-	out.Write("uniform s_" I_MATERIALS" " I_MATERIALS" : register(c%d);\n", C_MATERIALS);
-	out.Write("uniform s_" I_PROJECTION" " I_PROJECTION" : register(c%d);\n", C_PROJECTION);
-	out.Write("uniform float4 " I_DEPTHPARAMS" : register(c%d);\n", C_DEPTHPARAMS);
-
-	out.Write("VS_OUTPUT main(\n");
-
-	SetUidField(numTexGens, xfregs.numTexGen.numTexGens);
-	SetUidField(components, components);
-	// inputs
-	if (components & VB_HAS_NRM0)
-		out.Write("  float3 rawnorm0 : NORMAL0,\n");
-	if (components & VB_HAS_NRM1)
-	{
-		if (is_d3d)
-			out.Write("  float3 rawnorm1 : NORMAL1,\n");
-		else
-			out.Write("  float3 rawnorm1 : ATTR%d,\n", SHADER_NORM1_ATTRIB);
-	}
-	if (components & VB_HAS_NRM2)
-	{
-		if (is_d3d)
-			out.Write("  float3 rawnorm2 : NORMAL2,\n");
-		else
-			out.Write("  float3 rawnorm2 : ATTR%d,\n", SHADER_NORM2_ATTRIB);
-	}
-	if (components & VB_HAS_COL0)
-		out.Write("  float4 color0 : COLOR0,\n");
-	if (components & VB_HAS_COL1)
-		out.Write("  float4 color1 : COLOR1,\n");
-	for (int i = 0; i < 8; ++i) {
-		u32 hastexmtx = (components & (VB_HAS_TEXMTXIDX0<<i));
-		if ((components & (VB_HAS_UV0<<i)) || hastexmtx)
-			out.Write("  float%d tex%d : TEXCOORD%d,\n", hastexmtx ? 3 : 2, i, i);
-	}
-	if (components & VB_HAS_POSMTXIDX) {
-		if (is_d3d)
-		{
-			out.Write("  float4 blend_indices : BLENDINDICES,\n");
-		}
-		else
-			out.Write("  float fposmtx : ATTR%d,\n", SHADER_POSMTX_ATTRIB);
-	}
-	out.Write("  float4 rawpos : POSITION) {\n");
-	out.Write("VS_OUTPUT o;\n");
-
-	// transforms
-	if (components & VB_HAS_POSMTXIDX)
-	{
-		if (api_type & API_D3D9)
-		{
-			out.Write("int4 indices = D3DCOLORtoUBYTE4(blend_indices);\n");
-			out.Write("int posmtx = indices.x;\n");
-		}
-		else if (api_type == API_D3D11)
-		{
-			out.Write("int posmtx = blend_indices.x * 255.0f;\n");
-		}
-		else
-		{
-			out.Write("int posmtx = fposmtx;\n");
-		}
-
-		out.Write("float4 pos = float4(dot(" I_TRANSFORMMATRICES".T[posmtx].t, rawpos), dot(" I_TRANSFORMMATRICES".T[posmtx+1].t, rawpos), dot(" I_TRANSFORMMATRICES".T[posmtx+2].t, rawpos), 1);\n");
-
-		if (components & VB_HAS_NRMALL) {
-			out.Write("int normidx = posmtx >= 32 ? (posmtx-32) : posmtx;\n");
-			out.Write("float3 N0 = " I_NORMALMATRICES".T[normidx].t.xyz, N1 = " I_NORMALMATRICES".T[normidx+1].t.xyz, N2 = " I_NORMALMATRICES".T[normidx+2].t.xyz;\n");
-		}
-
-		if (components & VB_HAS_NRM0)
-			out.Write("float3 _norm0 = normalize(float3(dot(N0, rawnorm0), dot(N1, rawnorm0), dot(N2, rawnorm0)));\n");
-		if (components & VB_HAS_NRM1)
-			out.Write("float3 _norm1 = float3(dot(N0, rawnorm1), dot(N1, rawnorm1), dot(N2, rawnorm1));\n");
-		if (components & VB_HAS_NRM2)
-			out.Write("float3 _norm2 = float3(dot(N0, rawnorm2), dot(N1, rawnorm2), dot(N2, rawnorm2));\n");
-	}
-	else
-	{
-		out.Write("float4 pos = float4(dot(" I_POSNORMALMATRIX".T0, rawpos), dot(" I_POSNORMALMATRIX".T1, rawpos), dot(" I_POSNORMALMATRIX".T2, rawpos), 1.0f);\n");
-		if (components & VB_HAS_NRM0)
-			out.Write("float3 _norm0 = normalize(float3(dot(" I_POSNORMALMATRIX".N0.xyz, rawnorm0), dot(" I_POSNORMALMATRIX".N1.xyz, rawnorm0), dot(" I_POSNORMALMATRIX".N2.xyz, rawnorm0)));\n");
-		if (components & VB_HAS_NRM1)
-			out.Write("float3 _norm1 = float3(dot(" I_POSNORMALMATRIX".N0.xyz, rawnorm1), dot(" I_POSNORMALMATRIX".N1.xyz, rawnorm1), dot(" I_POSNORMALMATRIX".N2.xyz, rawnorm1));\n");
-		if (components & VB_HAS_NRM2)
-			out.Write("float3 _norm2 = float3(dot(" I_POSNORMALMATRIX".N0.xyz, rawnorm2), dot(" I_POSNORMALMATRIX".N1.xyz, rawnorm2), dot(" I_POSNORMALMATRIX".N2.xyz, rawnorm2));\n");
-	}
-
-	if (!(components & VB_HAS_NRM0))
-		out.Write("float3 _norm0 = float3(0.0f, 0.0f, 0.0f);\n");
-
-
-
-	out.Write("o.pos = float4(dot(" I_PROJECTION".T0, pos), dot(" I_PROJECTION".T1, pos), dot(" I_PROJECTION".T2, pos), dot(" I_PROJECTION".T3, pos));\n");
-
-	out.Write("float4 mat, lacc;\n"
-			"float3 ldir, h;\n"
-			"float dist, dist2, attn;\n");
-
-	SetUidField(numColorChans, xfregs.numChan.numColorChans);
-	if(xfregs.numChan.numColorChans == 0)
-	{
-		if (components & VB_HAS_COL0)
-			out.Write("o.colors_0 = color0;\n");
-		else
-			out.Write("o.colors_0 = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
-	}
-
-	// TODO: This probably isn't necessary if pixel lighting is enabled.
-	_GenerateLightingShader<T,type>(out, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_");
-
-	if(xfregs.numChan.numColorChans < 2)
-	{
-		if (components & VB_HAS_COL1)
-			out.Write("o.colors_1 = color1;\n");
-		else
-			out.Write("o.colors_1 = o.colors_0;\n");
-	}
-	// special case if only pos and tex coord 0 and tex coord input is AB11
-	// donko - this has caused problems in some games. removed for now.
-	bool texGenSpecialCase = false;
-	/*bool texGenSpecialCase =
-		((g_VtxDesc.Hex & 0x60600L) == g_VtxDesc.Hex) && // only pos and tex coord 0
-		(g_VtxDesc.Tex0Coord != NOT_PRESENT) &&
-		(xfregs.texcoords[0].texmtxinfo.inputform == XF_TEXINPUT_AB11);
-		*/
-
-	// transform texcoords
-	out.Write("float4 coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n");
-	for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i) {
-		TexMtxInfo& texinfo = xfregs.texMtxInfo[i];
-
-		out.Write("{\n");
-		out.Write("coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n");
-		SetUidField(texMtxInfo[i].sourcerow, xfregs.texMtxInfo[i].sourcerow);
-		switch (texinfo.sourcerow) {
-		case XF_SRCGEOM_INROW:
-			_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
-			out.Write("coord = rawpos;\n"); // pos.w is 1
-			break;
-		case XF_SRCNORMAL_INROW:
-			if (components & VB_HAS_NRM0) {
-				_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
-				out.Write("coord = float4(rawnorm0.xyz, 1.0f);\n");
-			}
-			break;
-		case XF_SRCCOLORS_INROW:
-			_assert_( texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC0 || texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC1 );
-			break;
-		case XF_SRCBINORMAL_T_INROW:
-			if (components & VB_HAS_NRM1) {
-				_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
-				out.Write("coord = float4(rawnorm1.xyz, 1.0f);\n");
-			}
-			break;
-		case XF_SRCBINORMAL_B_INROW:
-			if (components & VB_HAS_NRM2) {
-				_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
-				out.Write("coord = float4(rawnorm2.xyz, 1.0f);\n");
-			}
-			break;
-		default:
-			_assert_(texinfo.sourcerow <= XF_SRCTEX7_INROW);
-			if (components & (VB_HAS_UV0<<(texinfo.sourcerow - XF_SRCTEX0_INROW)) )
-				out.Write("coord = float4(tex%d.x, tex%d.y, 1.0f, 1.0f);\n", texinfo.sourcerow - XF_SRCTEX0_INROW, texinfo.sourcerow - XF_SRCTEX0_INROW);
-			break;
-		}
-
-		// first transformation
-		SetUidField(texMtxInfo[i].texgentype, xfregs.texMtxInfo[i].texgentype);
-		switch (texinfo.texgentype) {
-			case XF_TEXGEN_EMBOSS_MAP: // calculate tex coords into bump map
-
-				if (components & (VB_HAS_NRM1|VB_HAS_NRM2)) {
-					// transform the light dir into tangent space
-					SetUidField(texMtxInfo[i].embosslightshift, xfregs.texMtxInfo[i].embosslightshift);
-					SetUidField(texMtxInfo[i].embosssourceshift, xfregs.texMtxInfo[i].embosssourceshift);
-					out.Write("ldir = normalize(" I_LIGHTS".lights[%d].pos.xyz - pos.xyz);\n", texinfo.embosslightshift);
-					out.Write("o.tex%d.xyz = o.tex%d.xyz + float3(dot(ldir, _norm1), dot(ldir, _norm2), 0.0f);\n", i, texinfo.embosssourceshift);
-				}
-				else
-				{
-					_assert_(0); // should have normals
-					SetUidField(texMtxInfo[i].embosssourceshift, xfregs.texMtxInfo[i].embosssourceshift);
-					out.Write("o.tex%d.xyz = o.tex%d.xyz;\n", i, texinfo.embosssourceshift);
-				}
-
-				break;
-			case XF_TEXGEN_COLOR_STRGBC0:
-				_assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
-				out.Write("o.tex%d.xyz = float3(o.colors_0.x, o.colors_0.y, 1);\n", i);
-				break;
-			case XF_TEXGEN_COLOR_STRGBC1:
-				_assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
-				out.Write("o.tex%d.xyz = float3(o.colors_1.x, o.colors_1.y, 1);\n", i);
-				break;
-			case XF_TEXGEN_REGULAR:
-			default:
-				SetUidField(texMtxInfo[i].projection, xfregs.texMtxInfo[i].projection);
-				if (components & (VB_HAS_TEXMTXIDX0<<i)) {
-					if (texinfo.projection == XF_TEXPROJ_STQ)
-						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z].t), dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z+1].t), dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z+2].t));\n", i, i, i, i);
-					else {
-						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z].t), dot(coord, " I_TRANSFORMMATRICES".T[tex%d.z+1].t), 1);\n", i, i, i);
-					}
-				}
-				else {
-					if (texinfo.projection == XF_TEXPROJ_STQ)
-						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TEXMATRICES".T[%d].t), dot(coord, " I_TEXMATRICES".T[%d].t), dot(coord, " I_TEXMATRICES".T[%d].t));\n", i, 3*i, 3*i+1, 3*i+2);
-					else
-						out.Write("o.tex%d.xyz = float3(dot(coord, " I_TEXMATRICES".T[%d].t), dot(coord, " I_TEXMATRICES".T[%d].t), 1);\n", i, 3*i, 3*i+1);
-				}
-				break;
-		}
-
-		SetUidField(dualTexTrans.enabled, xfregs.dualTexTrans.enabled);
-		if (xfregs.dualTexTrans.enabled && texinfo.texgentype == XF_TEXGEN_REGULAR) { // only works for regular tex gen types?
-			const PostMtxInfo& postInfo = xfregs.postMtxInfo[i];
-
-			SetUidField(postMtxInfo[i].index, xfregs.postMtxInfo[i].index);
-			int postidx = postInfo.index;
-			out.Write("float4 P0 = " I_POSTTRANSFORMMATRICES".T[%d].t;\n"
-					"float4 P1 = " I_POSTTRANSFORMMATRICES".T[%d].t;\n"
-					"float4 P2 = " I_POSTTRANSFORMMATRICES".T[%d].t;\n",
-					postidx&0x3f, (postidx+1)&0x3f, (postidx+2)&0x3f);
-
-			if (texGenSpecialCase) {
-				// no normalization
-				// q of input is 1
-				// q of output is unknown
-
-				// multiply by postmatrix
-				out.Write("o.tex%d.xyz = float3(dot(P0.xy, o.tex%d.xy) + P0.z + P0.w, dot(P1.xy, o.tex%d.xy) + P1.z + P1.w, 0.0f);\n", i, i, i);
-			}
-			else
-			{
-				SetUidField(postMtxInfo[i].normalize, xfregs.postMtxInfo[i].normalize);
-				if (postInfo.normalize)
-					out.Write("o.tex%d.xyz = normalize(o.tex%d.xyz);\n", i, i);
-
-				// multiply by postmatrix
-				out.Write("o.tex%d.xyz = float3(dot(P0.xyz, o.tex%d.xyz) + P0.w, dot(P1.xyz, o.tex%d.xyz) + P1.w, dot(P2.xyz, o.tex%d.xyz) + P2.w);\n", i, i, i, i);
-			}
-		}
-
-		out.Write("}\n");
-	}
-
-	// clipPos/w needs to be done in pixel shader, not here
-	if (xfregs.numTexGen.numTexGens < 7) {
-		out.Write("o.clipPos = float4(pos.x,pos.y,o.pos.z,o.pos.w);\n");
-	} else {
-		out.Write("o.tex0.w = pos.x;\n");
-		out.Write("o.tex1.w = pos.y;\n");
-		out.Write("o.tex2.w = o.pos.z;\n");
-		out.Write("o.tex3.w = o.pos.w;\n");
-	}
-
-/*	if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-	{
-		if (xfregs.numTexGen.numTexGens < 7) {
-			out.Write("o.Normal = float4(_norm0.x,_norm0.y,_norm0.z,pos.z);\n");
-		} else {
-			out.Write("o.tex4.w = _norm0.x;\n");
-			out.Write("o.tex5.w = _norm0.y;\n");
-			out.Write("o.tex6.w = _norm0.z;\n");
-			if (xfregs.numTexGen.numTexGens < 8)
-				out.Write("o.tex7 = pos.xyzz;\n");
-			else
-				out.Write("o.tex7.w = pos.z;\n");
-		}
-		if (components & VB_HAS_COL0)
-			out.Write("o.colors_0 = color0;\n");
-
-		if (components & VB_HAS_COL1)
-			out.Write("o.colors_1 = color1;\n");
-	}*/
-
-	//write the true depth value, if the game uses depth textures pixel shaders will override with the correct values
-	//if not early z culling will improve speed
-	if (is_d3d)
-	{
-		out.Write("o.pos.z = " I_DEPTHPARAMS".x * o.pos.w + o.pos.z * " I_DEPTHPARAMS".y;\n");
-	}
-	else
-	{
-	    // this results in a scale from -1..0 to -1..1 after perspective
-	    // divide
-	    out.Write("o.pos.z = o.pos.w + o.pos.z * 2.0f;\n");
-
-	    // Sonic Unleashed puts its final rendering at the near or
-	    // far plane of the viewing frustrum(actually box, they use
-	    // orthogonal projection for that), and we end up putting it
-	    // just beyond, and the rendering gets clipped away. (The
-	    // primitive gets dropped)
-	    out.Write("o.pos.z = o.pos.z * 1048575.0f/1048576.0f;\n");
-
-	    // the next steps of the OGL pipeline are:
-	    // (x_c,y_c,z_c,w_c) = o.pos  //switch to OGL spec terminology
-	    // clipping to -w_c <= (x_c,y_c,z_c) <= w_c
-	    // (x_d,y_d,z_d) = (x_c,y_c,z_c)/w_c//perspective divide
-	    // z_w = (f-n)/2*z_d + (n+f)/2
-	    // z_w now contains the value to go to the 0..1 depth buffer
-
-	    //trying to get the correct semantic while not using glDepthRange
-	    //seems to get rather complicated
-	}
-
-	if (api_type & API_D3D9)
-	{
-		// D3D9 is addressing pixel centers instead of pixel boundaries in clip space.
-		// Thus we need to offset the final position by half a pixel
-		out.Write("o.pos = o.pos + float4(" I_DEPTHPARAMS".z, " I_DEPTHPARAMS".w, 0.f, 0.f);\n");
-	}
-
-	out.Write("return o;\n}\n");
-
-
-///	if (text[sizeof(text) - 1] != 0x7C)
-///		PanicAlert("VertexShader generator - buffer too small, canary has been eaten!");
-	if (type == GO_ShaderCode)
-		setlocale(LC_NUMERIC, ""); // restore locale
-}
-
-void GetVertexShaderUid(VertexShaderUid& object, u32 components, API_TYPE api_type)
-{
-	GenerateVertexShader<ShaderUid, GO_ShaderUid>(object, components, api_type);
-}
-
-void GenerateVertexShaderCode(VertexShaderCode& object, u32 components, API_TYPE api_type)
-{
-	GenerateVertexShader<ShaderCode, GO_ShaderCode>(object, components, api_type);
-}
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h
index 32d3eff91b..e2c96b972a 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h
@@ -51,7 +51,7 @@
 #define C_VENVCONST_END			(C_DEPTHPARAMS + 4)
 
 // TODO: Need packing?
-struct uid_data
+struct vertex_shader_uid_data
 {
 	u32 components;
 	u32 numColorChans : 2;
@@ -82,8 +82,8 @@ struct uid_data
 	} lit_chans[4];
 };
 
-typedef ShaderUid<uid_data> VertexShaderUid;
-typedef ShaderCode<uid_data> VertexShaderCode;
+typedef ShaderUid<vertex_shader_uid_data> VertexShaderUid;
+typedef ShaderCode<vertex_shader_uid_data> VertexShaderCode;
 
 void GetVertexShaderUid(VertexShaderUid& object, u32 components, API_TYPE api_type);
 void GenerateVertexShaderCode(VertexShaderCode& object, u32 components, API_TYPE api_type);
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h~ b/Source/Core/VideoCommon/Src/VertexShaderGen.h~
index 050ed76649..32d3eff91b 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.h~
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h~
@@ -82,7 +82,7 @@ struct uid_data
 	} lit_chans[4];
 };
 
-typedef ShaderUid<uid_data, 24> VertexShaderUid;
+typedef ShaderUid<uid_data> VertexShaderUid;
 typedef ShaderCode<uid_data> VertexShaderCode;
 
 void GetVertexShaderUid(VertexShaderUid& object, u32 components, API_TYPE api_type);
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h
index 4364bea6ea..7fef0cac3c 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.h
+++ b/Source/Core/VideoCommon/Src/VideoConfig.h
@@ -144,7 +144,7 @@ struct VideoConfig
 	int iAdapter;
 
 	// Debugging
-	bool bEnableShaderDebugging;
+	bool bEnableShaderDebugging; // TODO: Obsolete?
 
 	// Static config per API
 	// TODO: Move this out of VideoConfig
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
index 61e41008b3..cdd5d6e044 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
@@ -39,13 +39,13 @@ static int s_nMaxPixelInstructions;
 static GLuint s_ColorMatrixProgram = 0;
 static GLuint s_DepthMatrixProgram = 0;
 PixelShaderCache::PSCache PixelShaderCache::PixelShaders;
-PIXELSHADERUID PixelShaderCache::s_curuid;
+PixelShaderUid PixelShaderCache::s_curuid;
 bool PixelShaderCache::s_displayCompileAlert;
 GLuint PixelShaderCache::CurrentShader;
 bool PixelShaderCache::ShaderEnabled;
 
 PixelShaderCache::PSCacheEntry* PixelShaderCache::last_entry = NULL;
-PIXELSHADERUID PixelShaderCache::last_uid;
+PixelShaderUid PixelShaderCache::last_uid;
 
 GLuint PixelShaderCache::GetDepthMatrixProgram()
 {
@@ -183,16 +183,15 @@ void PixelShaderCache::Shutdown()
 
 FRAGMENTSHADER* PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
 {
-	PIXELSHADERUID uid;
-	GetPixelShaderId(&uid, dstAlphaMode, components);
-	
+	PixelShaderUid uid;
+	GetPixelShaderId(uid, dstAlphaMode, API_OPENGL, components);
+
 	// Check if the shader is already set
 	if (last_entry)
 	{
 		if (uid == last_uid)
 		{
 			GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true);
-			ValidatePixelShaderIDs(API_OPENGL, last_entry->safe_uid, last_entry->shader.strprog, dstAlphaMode, components);
 			return &last_entry->shader;
 		}
 	}
@@ -206,19 +205,18 @@ FRAGMENTSHADER* PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 comp
 		last_entry = &entry;
 
 		GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true);
-		ValidatePixelShaderIDs(API_OPENGL, entry.safe_uid, entry.shader.strprog, dstAlphaMode, components);
 		return &last_entry->shader;
 	}
 
 	// Make an entry in the table
 	PSCacheEntry& newentry = PixelShaders[uid];
 	last_entry = &newentry;
-	const char *code = GeneratePixelShaderCode(dstAlphaMode, API_OPENGL, components);
+	PixelShaderCode code;
+	GeneratePixelShaderCode(code, dstAlphaMode, API_OPENGL, components);
 
-	if (g_ActiveConfig.bEnableShaderDebugging && code)
+	if (g_ActiveConfig.bEnableShaderDebugging)
 	{
-		GetSafePixelShaderId(&newentry.safe_uid, dstAlphaMode, components);
-		newentry.shader.strprog = code;
+		newentry.shader.strprog = code.GetBuffer();
 	}
 
 #if defined(_DEBUG) || defined(DEBUGFAST)
@@ -227,11 +225,11 @@ FRAGMENTSHADER* PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 comp
 		char szTemp[MAX_PATH];
 		sprintf(szTemp, "%sps_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++);
 		
-		SaveData(szTemp, code);
+		SaveData(szTemp, code.GetBuffer()); /// XXX
 	}
 #endif
 
-	if (!code || !CompilePixelShader(newentry.shader, code)) {
+	if (!code.GetBuffer() || !CompilePixelShader(newentry.shader, code.GetBuffer())) {
 		GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true);
 		return NULL;
 	}
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h
index f528eeb35b..aff1b49fcb 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h
@@ -53,20 +53,19 @@ class PixelShaderCache
 		{
 			shader.Destroy();
 		}
-		PIXELSHADERUIDSAFE safe_uid;
 	};
 
-	typedef std::map<PIXELSHADERUID, PSCacheEntry> PSCache;
+	typedef std::map<PixelShaderUid, PSCacheEntry> PSCache;
 
 	static PSCache PixelShaders;
 
-	static PIXELSHADERUID s_curuid; // the current pixel shader uid (progressively changed as memory is written)
+	static PixelShaderUid s_curuid; // the current pixel shader uid (progressively changed as memory is written)
 
     static bool s_displayCompileAlert;
 
 	static GLuint CurrentShader;
 	static PSCacheEntry* last_entry;
-	static PIXELSHADERUID last_uid;
+	static PixelShaderUid last_uid;
 
 	static bool ShaderEnabled;
 

From b519d371286e8c5fa614167cc0652e16789a699c Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Tue, 7 Aug 2012 01:16:02 +0200
Subject: [PATCH 004/352] Move new lighting shader uids to LightingShaderGen.h

---
 .../VideoCommon/Src/LightingShaderGen.cpp     | 195 -----------------
 .../Core/VideoCommon/Src/LightingShaderGen.h  | 204 +++++++++++++++++-
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   |   4 +-
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  | 199 +----------------
 4 files changed, 204 insertions(+), 398 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.cpp b/Source/Core/VideoCommon/Src/LightingShaderGen.cpp
index f32e5dfeee..963b2c529a 100644
--- a/Source/Core/VideoCommon/Src/LightingShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/LightingShaderGen.cpp
@@ -18,198 +18,3 @@
 #include "LightingShaderGen.h"
 #include "NativeVertexFormat.h"
 #include "XFMemory.h"
-
-#define WRITE p+=sprintf
-
-int GetLightingShaderId(u32* out)
-{
-	for (u32 i = 0; i < xfregs.numChan.numColorChans; ++i)
-	{
-		out[i] = xfregs.color[i].enablelighting ?
-			(u32)xfregs.color[i].hex :
-			(u32)xfregs.color[i].matsource;
-		out[i] |= (xfregs.alpha[i].enablelighting ?
-			(u32)xfregs.alpha[i].hex :
-			(u32)xfregs.alpha[i].matsource) << 15;
-	}
-	_assert_(xfregs.numChan.numColorChans <= 2);
-	return xfregs.numChan.numColorChans;
-}
-
-// coloralpha - 1 if color, 2 if alpha
-char *GenerateLightShader(char *p, int index, const LitChannel& chan, const char* lightsName, int coloralpha)
-{
-	const char* swizzle = "xyzw";
-	if (coloralpha == 1 ) swizzle = "xyz";
-	else if (coloralpha == 2 ) swizzle = "w";
-
-	if (!(chan.attnfunc & 1)) {
-		// atten disabled
-		switch (chan.diffusefunc) {
-			case LIGHTDIF_NONE:
-				WRITE(p, "lacc.%s += %s.lights[%d].col.%s;\n", swizzle, lightsName, index, swizzle);
-				break;
-			case LIGHTDIF_SIGN:
-			case LIGHTDIF_CLAMP:
-				WRITE(p, "ldir = normalize(%s.lights[%d].pos.xyz - pos.xyz);\n", lightsName, index);
-				WRITE(p, "lacc.%s += %sdot(ldir, _norm0)) * %s.lights[%d].col.%s;\n",
-					swizzle, chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(", lightsName, index, swizzle);
-				break;
-			default: _assert_(0);
-		}
-	}
-	else { // spec and spot
-		
-		if (chan.attnfunc == 3) 
-		{ // spot
-			WRITE(p, "ldir = %s.lights[%d].pos.xyz - pos.xyz;\n", lightsName, index);
-			WRITE(p, "dist2 = dot(ldir, ldir);\n"
-				"dist = sqrt(dist2);\n"
-				"ldir = ldir / dist;\n"
-				"attn = max(0.0f, dot(ldir, %s.lights[%d].dir.xyz));\n", lightsName, index);
-			WRITE(p, "attn = max(0.0f, dot(%s.lights[%d].cosatt.xyz, float3(1.0f, attn, attn*attn))) / dot(%s.lights[%d].distatt.xyz, float3(1.0f,dist,dist2));\n", lightsName, index, lightsName, index);
-		}
-		else if (chan.attnfunc == 1) 
-		{ // specular
-			WRITE(p, "ldir = normalize(%s.lights[%d].pos.xyz);\n", lightsName, index);
-			WRITE(p, "attn = (dot(_norm0,ldir) >= 0.0f) ? max(0.0f, dot(_norm0, %s.lights[%d].dir.xyz)) : 0.0f;\n", lightsName, index);
-			WRITE(p, "attn = max(0.0f, dot(%s.lights[%d].cosatt.xyz, float3(1,attn,attn*attn))) / dot(%s.lights[%d].distatt.xyz, float3(1,attn,attn*attn));\n", lightsName, index, lightsName, index);
-		}
-
-		switch (chan.diffusefunc)
-		{
-			case LIGHTDIF_NONE:
-				WRITE(p, "lacc.%s += attn * %s.lights[%d].col.%s;\n", swizzle, lightsName, index, swizzle);
-				break;
-			case LIGHTDIF_SIGN:
-			case LIGHTDIF_CLAMP:
-				WRITE(p, "lacc.%s += attn * %sdot(ldir, _norm0)) * %s.lights[%d].col.%s;\n",
-					swizzle, 
-					chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(",
-					lightsName,
-					index, 
-					swizzle);
-				break;
-			default: _assert_(0);
-		}
-	}
-	WRITE(p, "\n");	
-	return p;
-}
-
-// vertex shader
-// lights/colors
-// materials name is I_MATERIALS in vs and I_PMATERIALS in ps
-// inColorName is color in vs and colors_ in ps
-// dest is o.colors_ in vs and colors_ in ps
-char *GenerateLightingShader(char *p, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest)
-{
-	for (unsigned int j = 0; j < xfregs.numChan.numColorChans; j++)
-	{
-		const LitChannel& color = xfregs.color[j];
-		const LitChannel& alpha = xfregs.alpha[j];
-
-		WRITE(p, "{\n");
-		
-		if (color.matsource) {// from vertex
-			if (components & (VB_HAS_COL0 << j))
-				WRITE(p, "mat = %s%d;\n", inColorName, j);
-			else if (components & VB_HAS_COL0)
-				WRITE(p, "mat = %s0;\n", inColorName);
-			else
-				WRITE(p, "mat = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
-		}
-		else // from color
-			WRITE(p, "mat = %s.C%d;\n", materialsName, j+2);
-
-		if (color.enablelighting) {
-			if (color.ambsource) { // from vertex
-				if (components & (VB_HAS_COL0<<j) )
-					WRITE(p, "lacc = %s%d;\n", inColorName, j);
-				else if (components & VB_HAS_COL0 )
-					WRITE(p, "lacc = %s0;\n", inColorName);
-				else
-					WRITE(p, "lacc = float4(0.0f, 0.0f, 0.0f, 0.0f);\n");
-			}
-			else // from color
-				WRITE(p, "lacc = %s.C%d;\n", materialsName, j);
-		}
-		else
-		{
-			WRITE(p, "lacc = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
-		}
-
-		// check if alpha is different
-		if (alpha.matsource != color.matsource) {
-			if (alpha.matsource) {// from vertex
-				if (components & (VB_HAS_COL0<<j))
-					WRITE(p, "mat.w = %s%d.w;\n", inColorName, j);
-				else if (components & VB_HAS_COL0)
-					WRITE(p, "mat.w = %s0.w;\n", inColorName);
-				else WRITE(p, "mat.w = 1.0f;\n");
-			}
-			else // from color
-				WRITE(p, "mat.w = %s.C%d.w;\n", materialsName, j+2);
-		}
-
-		if (alpha.enablelighting)
-		{
-			if (alpha.ambsource) {// from vertex
-				if (components & (VB_HAS_COL0<<j) )
-					WRITE(p, "lacc.w = %s%d.w;\n", inColorName, j);
-				else if (components & VB_HAS_COL0 )
-					WRITE(p, "lacc.w = %s0.w;\n", inColorName);
-				else
-					WRITE(p, "lacc.w = 0.0f;\n");
-			}
-			else // from color
-				WRITE(p, "lacc.w = %s.C%d.w;\n", materialsName, j);
-		}
-		else
-		{
-			WRITE(p, "lacc.w = 1.0f;\n");
-		}	
-		
-		if(color.enablelighting && alpha.enablelighting)
-		{
-			// both have lighting, test if they use the same lights
-			int mask = 0;
-			if(color.lightparams == alpha.lightparams)
-			{
-				mask = color.GetFullLightMask() & alpha.GetFullLightMask();
-				if(mask)
-				{
-					for (int i = 0; i < 8; ++i)
-					{
-						if (mask & (1<<i))
-							p = GenerateLightShader(p, i, color, lightsName, 3);
-					}
-				}
-			}
-
-			// no shared lights
-			for (int i = 0; i < 8; ++i)
-			{
-				if (!(mask&(1<<i)) && (color.GetFullLightMask() & (1<<i)))
-					p = GenerateLightShader(p, i, color, lightsName, 1);
-				if (!(mask&(1<<i)) && (alpha.GetFullLightMask() & (1<<i)))
-					p = GenerateLightShader(p, i, alpha, lightsName, 2);
-			}
-		}
-		else if (color.enablelighting || alpha.enablelighting)
-		{
-			// lights are disabled on one channel so process only the active ones
-			const LitChannel& workingchannel = color.enablelighting ? color : alpha;
-			int coloralpha = color.enablelighting ? 1 : 2;
-			for (int i = 0; i < 8; ++i)
-			{
-				if (workingchannel.GetFullLightMask() & (1<<i))
-					p = GenerateLightShader(p, i, workingchannel, lightsName, coloralpha);
-			}
-		}
-		WRITE(p, "%s%d = mat * saturate(lacc);\n", dest, j);
-		WRITE(p, "}\n");
-	}
-
-	return p;
-}
diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.h b/Source/Core/VideoCommon/Src/LightingShaderGen.h
index e72623a4d2..c4fedcff91 100644
--- a/Source/Core/VideoCommon/Src/LightingShaderGen.h
+++ b/Source/Core/VideoCommon/Src/LightingShaderGen.h
@@ -18,9 +18,207 @@
 #ifndef _LIGHTINGSHADERGEN_H_
 #define _LIGHTINGSHADERGEN_H_
 
-#include "CommonTypes.h"
+#include "ShaderGenCommon.h"
+#include "NativeVertexFormat.h"
+#include "XFMemory.h"
 
-int GetLightingShaderId(u32* out);
-char *GenerateLightingShader(char *p, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest);
+// T.uid_data needs to have a struct named lighting_uid
+template<class T, GenOutput type>
+void GenerateLightShader(T& object, int index, int litchan_index, const char* lightsName, int coloralpha)
+{
+#define SetUidField(name, value) if (type == GO_ShaderUid) { object.GetUidData().name = value; };
+	const LitChannel& chan = (litchan_index > 1) ? xfregs.alpha[litchan_index-2] : xfregs.color[litchan_index];
+	const char* swizzle = "xyzw";
+	if (coloralpha == 1 ) swizzle = "xyz";
+	else if (coloralpha == 2 ) swizzle = "w";
+
+	SetUidField(lit_chans[litchan_index].attnfunc, chan.attnfunc);
+	SetUidField(lit_chans[litchan_index].diffusefunc, chan.diffusefunc);
+	if (!(chan.attnfunc & 1)) {
+		// atten disabled
+		switch (chan.diffusefunc) {
+			case LIGHTDIF_NONE:
+				object.Write("lacc.%s += %s.lights[%d].col.%s;\n", swizzle, lightsName, index, swizzle);
+				break;
+			case LIGHTDIF_SIGN:
+			case LIGHTDIF_CLAMP:
+				object.Write("ldir = normalize(%s.lights[%d].pos.xyz - pos.xyz);\n", lightsName, index);
+				object.Write("lacc.%s += %sdot(ldir, _norm0)) * %s.lights[%d].col.%s;\n",
+					swizzle, chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(", lightsName, index, swizzle);
+				break;
+			default: _assert_(0);
+		}
+	}
+	else { // spec and spot
+
+		if (chan.attnfunc == 3)
+		{ // spot
+			object.Write("ldir = %s.lights[%d].pos.xyz - pos.xyz;\n", lightsName, index);
+			object.Write("dist2 = dot(ldir, ldir);\n"
+						"dist = sqrt(dist2);\n"
+						"ldir = ldir / dist;\n"
+						"attn = max(0.0f, dot(ldir, %s.lights[%d].dir.xyz));\n", lightsName, index);
+			object.Write("attn = max(0.0f, dot(%s.lights[%d].cosatt.xyz, float3(1.0f, attn, attn*attn))) / dot(%s.lights[%d].distatt.xyz, float3(1.0f,dist,dist2));\n", lightsName, index, lightsName, index);
+		}
+		else if (chan.attnfunc == 1)
+		{ // specular
+			object.Write("ldir = normalize(%s.lights[%d].pos.xyz);\n", lightsName, index);
+			object.Write("attn = (dot(_norm0,ldir) >= 0.0f) ? max(0.0f, dot(_norm0, %s.lights[%d].dir.xyz)) : 0.0f;\n", lightsName, index);
+			object.Write("attn = max(0.0f, dot(%s.lights[%d].cosatt.xyz, float3(1,attn,attn*attn))) / dot(%s.lights[%d].distatt.xyz, float3(1,attn,attn*attn));\n", lightsName, index, lightsName, index);
+		}
+
+		switch (chan.diffusefunc)
+		{
+			case LIGHTDIF_NONE:
+				object.Write("lacc.%s += attn * %s.lights[%d].col.%s;\n", swizzle, lightsName, index, swizzle);
+				break;
+			case LIGHTDIF_SIGN:
+			case LIGHTDIF_CLAMP:
+				object.Write("lacc.%s += attn * %sdot(ldir, _norm0)) * %s.lights[%d].col.%s;\n",
+					swizzle,
+					chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(",
+					lightsName,
+					index,
+					swizzle);
+				break;
+			default: _assert_(0);
+		}
+	}
+	object.Write("\n");
+}
+
+// vertex shader
+// lights/colors
+// materials name is I_MATERIALS in vs and I_PMATERIALS in ps
+// inColorName is color in vs and colors_ in ps
+// dest is o.colors_ in vs and colors_ in ps
+template<class T, GenOutput type>
+void GenerateLightingShader(T& object, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest)
+{
+	for (unsigned int j = 0; j < xfregs.numChan.numColorChans; j++)
+	{
+		const LitChannel& color = xfregs.color[j];
+		const LitChannel& alpha = xfregs.alpha[j];
+
+		object.Write("{\n");
+
+		SetUidField(lit_chans[j].matsource, xfregs.color[j].matsource);
+		if (color.matsource) {// from vertex
+			if (components & (VB_HAS_COL0 << j))
+				object.Write("mat = %s%d;\n", inColorName, j);
+			else if (components & VB_HAS_COL0)
+				object.Write("mat = %s0;\n", inColorName);
+			else
+				object.Write("mat = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
+		}
+		else // from color
+			object.Write("mat = %s.C%d;\n", materialsName, j+2);
+
+		SetUidField(lit_chans[j].enablelighting, xfregs.color[j].enablelighting);
+		if (color.enablelighting) {
+			SetUidField(lit_chans[j].ambsource, xfregs.color[j].ambsource);
+			if (color.ambsource) { // from vertex
+				if (components & (VB_HAS_COL0<<j) )
+					object.Write("lacc = %s%d;\n", inColorName, j);
+				else if (components & VB_HAS_COL0 )
+					object.Write("lacc = %s0;\n", inColorName);
+				else
+					object.Write("lacc = float4(0.0f, 0.0f, 0.0f, 0.0f);\n");
+			}
+			else // from color
+				object.Write("lacc = %s.C%d;\n", materialsName, j);
+		}
+		else
+		{
+			object.Write("lacc = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
+		}
+
+		// check if alpha is different
+		SetUidField(lit_chans[j+2].matsource, xfregs.alpha[j].matsource);
+		if (alpha.matsource != color.matsource) {
+			if (alpha.matsource) {// from vertex
+				if (components & (VB_HAS_COL0<<j))
+					object.Write("mat.w = %s%d.w;\n", inColorName, j);
+				else if (components & VB_HAS_COL0)
+					object.Write("mat.w = %s0.w;\n", inColorName);
+				else object.Write("mat.w = 1.0f;\n");
+			}
+			else // from color
+				object.Write("mat.w = %s.C%d.w;\n", materialsName, j+2);
+		}
+
+		SetUidField(lit_chans[j+2].enablelighting, xfregs.alpha[j].enablelighting);
+		if (alpha.enablelighting)
+		{
+			SetUidField(lit_chans[j+2].ambsource, xfregs.alpha[j].ambsource);
+			if (alpha.ambsource) {// from vertex
+				if (components & (VB_HAS_COL0<<j) )
+					object.Write("lacc.w = %s%d.w;\n", inColorName, j);
+				else if (components & VB_HAS_COL0 )
+					object.Write("lacc.w = %s0.w;\n", inColorName);
+				else
+					object.Write("lacc.w = 0.0f;\n");
+			}
+			else // from color
+				object.Write("lacc.w = %s.C%d.w;\n", materialsName, j);
+		}
+		else
+		{
+			object.Write("lacc.w = 1.0f;\n");
+		}
+
+		if(color.enablelighting && alpha.enablelighting)
+		{
+			// both have lighting, test if they use the same lights
+			int mask = 0;
+			SetUidField(lit_chans[j].attnfunc, color.attnfunc);
+			SetUidField(lit_chans[j+2].attnfunc, alpha.attnfunc);
+			SetUidField(lit_chans[j].diffusefunc, color.diffusefunc);
+			SetUidField(lit_chans[j+2].diffusefunc, alpha.diffusefunc);
+			SetUidField(lit_chans[j].light_mask, color.GetFullLightMask());
+			SetUidField(lit_chans[j+2].light_mask, alpha.GetFullLightMask());
+			if(color.lightparams == alpha.lightparams)
+			{
+				mask = color.GetFullLightMask() & alpha.GetFullLightMask();
+				if(mask)
+				{
+					for (int i = 0; i < 8; ++i)
+					{
+						if (mask & (1<<i))
+						{
+							GenerateLightShader<T,type>(object, i, j, lightsName, 3);
+						}
+					}
+				}
+			}
+
+			// no shared lights
+			for (int i = 0; i < 8; ++i)
+			{
+				if (!(mask&(1<<i)) && (color.GetFullLightMask() & (1<<i)))
+					GenerateLightShader<T,type>(object, i, j, lightsName, 1);
+				if (!(mask&(1<<i)) && (alpha.GetFullLightMask() & (1<<i)))
+					GenerateLightShader<T,type>(object, i, j+2, lightsName, 2);
+			}
+		}
+		else if (color.enablelighting || alpha.enablelighting)
+		{
+			// lights are disabled on one channel so process only the active ones
+			const LitChannel& workingchannel = color.enablelighting ? color : alpha;
+			const int lit_index = color.enablelighting ? j : (j+2);
+			int coloralpha = color.enablelighting ? 1 : 2;
+
+			SetUidField(lit_chans[lit_index].light_mask, workingchannel.GetFullLightMask());
+			for (int i = 0; i < 8; ++i)
+			{
+				if (workingchannel.GetFullLightMask() & (1<<i))
+					GenerateLightShader<T,type>(object, i, lit_index, lightsName, coloralpha);
+			}
+		}
+		object.Write("%s%d = mat * saturate(lacc);\n", dest, j);
+		object.Write("}\n");
+	}
+}
+#undef SetUidField
 
 #endif // _LIGHTINGSHADERGEN_H_
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 5ee95848b5..d52ed1ac0a 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -440,8 +440,8 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	{
 		if (nIndirectStagesUsed & (1<<i))
 		{
-			int texcoord = bpmem.tevindref.getTexCoord(i);
-			int texmap = bpmem.tevindref.getTexMap(i);
+			unsigned int texcoord = bpmem.tevindref.getTexCoord(i);
+			unsigned int texmap = bpmem.tevindref.getTexMap(i);
 
 			if (i == 0)
 			{
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index db4946a49f..1667250f7f 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -63,204 +63,7 @@ void GenerateVSOutputStruct(T& object, u32 components, API_TYPE api_type)
 	object.Write("};\n");
 }
 
-template<class T, GenOutput type>
-void _GenerateLightShader(T& object, int index, int litchan_index, const char* lightsName, int coloralpha)
-{
-#define SetUidField(name, value) if (type == GO_ShaderUid) { object.GetUidData().name = value; };
-	const LitChannel& chan = (litchan_index > 1) ? xfregs.alpha[litchan_index-2] : xfregs.color[litchan_index];
-	const char* swizzle = "xyzw";
-	if (coloralpha == 1 ) swizzle = "xyz";
-	else if (coloralpha == 2 ) swizzle = "w";
 
-	SetUidField(lit_chans[litchan_index].attnfunc, chan.attnfunc);
-	SetUidField(lit_chans[litchan_index].diffusefunc, chan.diffusefunc);
-	if (!(chan.attnfunc & 1)) {
-		// atten disabled
-		switch (chan.diffusefunc) {
-			case LIGHTDIF_NONE:
-				object.Write("lacc.%s += %s.lights[%d].col.%s;\n", swizzle, lightsName, index, swizzle);
-				break;
-			case LIGHTDIF_SIGN:
-			case LIGHTDIF_CLAMP:
-				object.Write("ldir = normalize(%s.lights[%d].pos.xyz - pos.xyz);\n", lightsName, index);
-				object.Write("lacc.%s += %sdot(ldir, _norm0)) * %s.lights[%d].col.%s;\n",
-					swizzle, chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(", lightsName, index, swizzle);
-				break;
-			default: _assert_(0);
-		}
-	}
-	else { // spec and spot
-
-		if (chan.attnfunc == 3)
-		{ // spot
-			object.Write("ldir = %s.lights[%d].pos.xyz - pos.xyz;\n", lightsName, index);
-			object.Write("dist2 = dot(ldir, ldir);\n"
-						"dist = sqrt(dist2);\n"
-						"ldir = ldir / dist;\n"
-						"attn = max(0.0f, dot(ldir, %s.lights[%d].dir.xyz));\n", lightsName, index);
-			object.Write("attn = max(0.0f, dot(%s.lights[%d].cosatt.xyz, float3(1.0f, attn, attn*attn))) / dot(%s.lights[%d].distatt.xyz, float3(1.0f,dist,dist2));\n", lightsName, index, lightsName, index);
-		}
-		else if (chan.attnfunc == 1)
-		{ // specular
-			object.Write("ldir = normalize(%s.lights[%d].pos.xyz);\n", lightsName, index);
-			object.Write("attn = (dot(_norm0,ldir) >= 0.0f) ? max(0.0f, dot(_norm0, %s.lights[%d].dir.xyz)) : 0.0f;\n", lightsName, index);
-			object.Write("attn = max(0.0f, dot(%s.lights[%d].cosatt.xyz, float3(1,attn,attn*attn))) / dot(%s.lights[%d].distatt.xyz, float3(1,attn,attn*attn));\n", lightsName, index, lightsName, index);
-		}
-
-		switch (chan.diffusefunc)
-		{
-			case LIGHTDIF_NONE:
-				object.Write("lacc.%s += attn * %s.lights[%d].col.%s;\n", swizzle, lightsName, index, swizzle);
-				break;
-			case LIGHTDIF_SIGN:
-			case LIGHTDIF_CLAMP:
-				object.Write("lacc.%s += attn * %sdot(ldir, _norm0)) * %s.lights[%d].col.%s;\n",
-					swizzle,
-					chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(",
-					lightsName,
-					index,
-					swizzle);
-				break;
-			default: _assert_(0);
-		}
-	}
-	object.Write("\n");
-}
-
-// vertex shader
-// lights/colors
-// materials name is I_MATERIALS in vs and I_PMATERIALS in ps
-// inColorName is color in vs and colors_ in ps
-// dest is o.colors_ in vs and colors_ in ps
-template<class T, GenOutput type>
-void _GenerateLightingShader(T& object, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest)
-{
-	for (unsigned int j = 0; j < xfregs.numChan.numColorChans; j++)
-	{
-		const LitChannel& color = xfregs.color[j];
-		const LitChannel& alpha = xfregs.alpha[j];
-
-		object.Write("{\n");
-
-		SetUidField(lit_chans[j].matsource, xfregs.color[j].matsource);
-		if (color.matsource) {// from vertex
-			if (components & (VB_HAS_COL0 << j))
-				object.Write("mat = %s%d;\n", inColorName, j);
-			else if (components & VB_HAS_COL0)
-				object.Write("mat = %s0;\n", inColorName);
-			else
-				object.Write("mat = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
-		}
-		else // from color
-			object.Write("mat = %s.C%d;\n", materialsName, j+2);
-
-		SetUidField(lit_chans[j].enablelighting, xfregs.color[j].enablelighting);
-		if (color.enablelighting) {
-			SetUidField(lit_chans[j].ambsource, xfregs.color[j].ambsource);
-			if (color.ambsource) { // from vertex
-				if (components & (VB_HAS_COL0<<j) )
-					object.Write("lacc = %s%d;\n", inColorName, j);
-				else if (components & VB_HAS_COL0 )
-					object.Write("lacc = %s0;\n", inColorName);
-				else
-					object.Write("lacc = float4(0.0f, 0.0f, 0.0f, 0.0f);\n");
-			}
-			else // from color
-				object.Write("lacc = %s.C%d;\n", materialsName, j);
-		}
-		else
-		{
-			object.Write("lacc = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
-		}
-
-		// check if alpha is different
-		SetUidField(lit_chans[j+2].matsource, xfregs.alpha[j].matsource);
-		if (alpha.matsource != color.matsource) {
-			if (alpha.matsource) {// from vertex
-				if (components & (VB_HAS_COL0<<j))
-					object.Write("mat.w = %s%d.w;\n", inColorName, j);
-				else if (components & VB_HAS_COL0)
-					object.Write("mat.w = %s0.w;\n", inColorName);
-				else object.Write("mat.w = 1.0f;\n");
-			}
-			else // from color
-				object.Write("mat.w = %s.C%d.w;\n", materialsName, j+2);
-		}
-
-		SetUidField(lit_chans[j+2].enablelighting, xfregs.alpha[j].enablelighting);
-		if (alpha.enablelighting)
-		{
-			SetUidField(lit_chans[j+2].ambsource, xfregs.alpha[j].ambsource);
-			if (alpha.ambsource) {// from vertex
-				if (components & (VB_HAS_COL0<<j) )
-					object.Write("lacc.w = %s%d.w;\n", inColorName, j);
-				else if (components & VB_HAS_COL0 )
-					object.Write("lacc.w = %s0.w;\n", inColorName);
-				else
-					object.Write("lacc.w = 0.0f;\n");
-			}
-			else // from color
-				object.Write("lacc.w = %s.C%d.w;\n", materialsName, j);
-		}
-		else
-		{
-			object.Write("lacc.w = 1.0f;\n");
-		}
-
-		if(color.enablelighting && alpha.enablelighting)
-		{
-			// both have lighting, test if they use the same lights
-			int mask = 0;
-			SetUidField(lit_chans[j].attnfunc, color.attnfunc);
-			SetUidField(lit_chans[j+2].attnfunc, alpha.attnfunc);
-			SetUidField(lit_chans[j].diffusefunc, color.diffusefunc);
-			SetUidField(lit_chans[j+2].diffusefunc, alpha.diffusefunc);
-			SetUidField(lit_chans[j].light_mask, color.GetFullLightMask());
-			SetUidField(lit_chans[j+2].light_mask, alpha.GetFullLightMask());
-			if(color.lightparams == alpha.lightparams)
-			{
-				mask = color.GetFullLightMask() & alpha.GetFullLightMask();
-				if(mask)
-				{
-					for (int i = 0; i < 8; ++i)
-					{
-						if (mask & (1<<i))
-						{
-							_GenerateLightShader<T,type>(object, i, j, lightsName, 3);
-						}
-					}
-				}
-			}
-
-			// no shared lights
-			for (int i = 0; i < 8; ++i)
-			{
-				if (!(mask&(1<<i)) && (color.GetFullLightMask() & (1<<i)))
-					_GenerateLightShader<T,type>(object, i, j, lightsName, 1);
-				if (!(mask&(1<<i)) && (alpha.GetFullLightMask() & (1<<i)))
-					_GenerateLightShader<T,type>(object, i, j+2, lightsName, 2);
-			}
-		}
-		else if (color.enablelighting || alpha.enablelighting)
-		{
-			// lights are disabled on one channel so process only the active ones
-			const LitChannel& workingchannel = color.enablelighting ? color : alpha;
-			const int lit_index = color.enablelighting ? j : (j+2);
-			int coloralpha = color.enablelighting ? 1 : 2;
-
-			SetUidField(lit_chans[lit_index].light_mask, workingchannel.GetFullLightMask());
-			for (int i = 0; i < 8; ++i)
-			{
-				if (workingchannel.GetFullLightMask() & (1<<i))
-					_GenerateLightShader<T,type>(object, i, lit_index, lightsName, coloralpha);
-			}
-		}
-		object.Write("%s%d = mat * saturate(lacc);\n", dest, j);
-		object.Write("}\n");
-	}
-}
-
-// TODO: Problem: this one uses copy constructors or sth for uids when returning...
 template<class T, GenOutput type>
 void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 {
@@ -414,7 +217,7 @@ void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 	}
 
 	// TODO: This probably isn't necessary if pixel lighting is enabled.
-	_GenerateLightingShader<T,type>(out, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_");
+	GenerateLightingShader<T,type>(out, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_");
 
 	if(xfregs.numChan.numColorChans < 2)
 	{

From 8902c6e38b68ab3327fd25183425c37c3445e9d1 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Tue, 7 Aug 2012 14:36:56 +0200
Subject: [PATCH 005/352] Some cleanups, add more fields to pixel shader uid.

---
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 73 ++++++++++++-------
 Source/Core/VideoCommon/Src/PixelShaderGen.h  | 59 +++++++++++++++
 Source/Core/VideoCommon/Src/ShaderGenCommon.h |  1 +
 3 files changed, 107 insertions(+), 26 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index d52ed1ac0a..9aad5556aa 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -243,7 +243,7 @@ static void BuildSwapModeTable()
 		swapModeTable[i][1] = swapColors[bpmem.tevksel[i*2].swap2];
 		swapModeTable[i][2] = swapColors[bpmem.tevksel[i*2+1].swap1];
 		swapModeTable[i][3] = swapColors[bpmem.tevksel[i*2+1].swap2];
-		swapModeTable[i][4] = 0;
+		swapModeTable[i][4] = '\0';
 	}
 }
 
@@ -251,6 +251,7 @@ template<class T, GenOutput type>
 void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
 #define SetUidField(name, value) if (type == GO_ShaderUid) {out.GetUidData().name = value; };
+#define OR_UidField(name, value) if (type == GO_ShaderUid) {out.GetUidData().name |= value; };
 	if (type == GO_ShaderCode)
 	{
 		setlocale(LC_NUMERIC, "C"); // Reset locale for compilation
@@ -258,12 +259,9 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	}
 ///	text[sizeof(text) - 1] = 0x7C;  // canary
 
-	/// TODO: Uids!
-	BuildSwapModeTable(); // Needed for WriteStage
 	unsigned int numStages = bpmem.genMode.numtevstages + 1;
 	unsigned int numTexgen = bpmem.genMode.numtexgens;
 
-	char *p = text;
 	out.Write("//Pixel Shader for TEV stages\n");
 	out.Write("//%i TEV stages, %i texgens, XXX IND stages\n",
 		numStages, numTexgen/*, bpmem.genMode.numindstages*/);
@@ -276,31 +274,17 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	SetUidField(genMode.numtexgens, bpmem.genMode.numtexgens);
 
 	// Declare samplers
-	if(ApiType != API_D3D11)
-	{
-		out.Write("uniform sampler2D ");
-	}
-	else
-	{
-		out.Write("sampler ");
-	}
-
-	bool bfirst = true;
+	out.Write((ApiType != API_D3D11) ? "uniform sampler2D " : "sampler ");
 	for (int i = 0; i < 8; ++i)
-	{
-		out.Write("%s samp%d : register(s%d)", bfirst?"":",", i, i);
-		bfirst = false;
-	}
+		out.Write("%s samp%d : register(s%d)", (i==0)?"":",", i, i);
+
 	out.Write(";\n");
 	if(ApiType == API_D3D11)
 	{
 		out.Write("Texture2D ");
-		bfirst = true;
 		for (int i = 0; i < 8; ++i)
-		{
-			out.Write("%s Tex%d : register(t%d)", bfirst?"":",", i, i);
-			bfirst = false;
-		}
+			out.Write("%s Tex%d : register(t%d)", (i==0)?"":",", i, i);
+
 		out.Write(";\n");
 	}
 
@@ -484,6 +468,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 		RegisterStates[i].AuxStored = false;
 	}
 
+	BuildSwapModeTable(); // Uids set in WriteStage
 	for (unsigned int i = 0; i < numStages; i++)
 		WriteStage<T, type>(out, i, ApiType); //build the equation for this stage
 
@@ -491,6 +476,8 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	{
 		// The results of the last texenv stage are put onto the screen,
 		// regardless of the used destination register
+		SetUidField(combiners[numStages-1].colorC.dest, bpmem.combiners[numStages-1].colorC.dest);
+		SetUidField(combiners[numStages-1].alphaC.dest, bpmem.combiners[numStages-1].alphaC.dest);
 		if(bpmem.combiners[numStages - 1].colorC.dest != 0)
 		{
 ///			SetUidField(combiners[numStages-1].colorC.dest, bpmem.combiners[numStages-1].colorC.dest);
@@ -614,8 +601,15 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 
 	out.Write("// TEV stage %d\n", n);
 
+	OR_UidField(bHasIndStage, bHasIndStage << n);
+	if (n < 8) { OR_UidField(tevorders_n_texcoord1, texcoord << (3 * n)); }
+	else OR_UidField(tevorders_n_texcoord2, texcoord << (3 * n - 24));
 	if (bHasIndStage)
 	{
+		OR_UidField(tevind_n_bs, bpmem.tevind[n].bs << (2*n));
+		OR_UidField(tevind_n_bt, bpmem.tevind[n].bt << (2*n));
+		OR_UidField(tevind_n_fmt, bpmem.tevind[n].fmt << (2*n));
+
 		out.Write("// indirect op\n");
 		// perform the indirect op on the incoming regular coordinates using indtex%d as the offset coords
 		if (bpmem.tevind[n].bs != ITBA_OFF)
@@ -629,17 +623,21 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 		out.Write("float3 indtevcrd%d = indtex%d * %s;\n", n, bpmem.tevind[n].bt, tevIndFmtScale[bpmem.tevind[n].fmt]);
 
 		// bias
+		if (n < 8) { OR_UidField(tevind_n_bias1, bpmem.tevind[n].bias << (3*n)); } /// XXX: brackets?
+		else OR_UidField(tevind_n_bias2, bpmem.tevind[n].bias << (3*n - 24));
 		if (bpmem.tevind[n].bias != ITB_NONE )
 			out.Write("indtevcrd%d.%s += %s;\n", n, tevIndBiasField[bpmem.tevind[n].bias], tevIndBiasAdd[bpmem.tevind[n].fmt]);
 
 		// multiply by offset matrix and scale
+		if (n < 8) { OR_UidField(tevind_n_mid1, bpmem.tevind[n].mid << (4*n)); } /// XXX: brackets?
+		else OR_UidField(tevind_n_mid2, bpmem.tevind[n].mid << (4*n - 32));
 		if (bpmem.tevind[n].mid != 0)
 		{
 			if (bpmem.tevind[n].mid <= 3)
 			{
 				int mtxidx = 2*(bpmem.tevind[n].mid-1);
 				out.Write("float2 indtevtrans%d = float2(dot(" I_INDTEXMTX"[%d].xyz, indtevcrd%d), dot(" I_INDTEXMTX"[%d].xyz, indtevcrd%d));\n",
-					n, mtxidx, n, mtxidx+1, n);
+							n, mtxidx, n, mtxidx+1, n);
 			}
 			else if (bpmem.tevind[n].mid <= 7 && bHasTexCoord)
 			{ // s matrix
@@ -663,6 +661,11 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 		// Wrapping
 		// ---------
 
+		if (n < 8) { OR_UidField(tevorders_n_sw1, bpmem.tevind[n].sw << (3 * n)); }
+		else OR_UidField(tevorders_n_sw2, bpmem.tevind[n].sw << (3 * n - 24));
+		if (n < 8) { OR_UidField(tevorders_n_tw1, bpmem.tevind[n].tw << (3 * n)); }
+		else OR_UidField(tevorders_n_tw2, bpmem.tevind[n].tw << (3 * n - 24));
+
 		// wrap S
 		if (bpmem.tevind[n].sw == ITW_OFF)
 			out.Write("wrappedcoord.x = uv%d.x;\n", texcoord);
@@ -695,6 +698,12 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 		|| ac.a == TEVALPHAARG_RASA || ac.b == TEVALPHAARG_RASA
 		|| ac.c == TEVALPHAARG_RASA || ac.d == TEVALPHAARG_RASA)
 	{
+		const int i = bpmem.combiners[n].alphaC.rswap;
+		OR_UidField(tevksel_n_swap, bpmem.tevksel[i*2  ].swap1 << (i*2));
+		OR_UidField(tevksel_n_swap, bpmem.tevksel[i*2+1].swap1 << (i*2 + 1));
+		OR_UidField(tevksel_n_swap, bpmem.tevksel[i*2  ].swap2 << (i*2 + 16));
+		OR_UidField(tevksel_n_swap, bpmem.tevksel[i*2+1].swap2 << (i*2 + 17));
+
 		char *rasswap = swapModeTable[bpmem.combiners[n].alphaC.rswap];
 		out.Write("rastemp = %s.%s;\n", tevRasTable[bpmem.tevorders[n / 2].getColorChan(n & 1)], rasswap);
 		out.Write("crastemp = frac(rastemp * (255.0f/256.0f)) * (256.0f/255.0f);\n");
@@ -712,6 +721,12 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 				out.Write("tevcoord.xy = float2(0.0f, 0.0f);\n");
 		}
 
+		const int i = bpmem.combiners[n].alphaC.tswap;
+		OR_UidField(tevksel_n_swap, bpmem.tevksel[i*2  ].swap1 << (i*2));
+		OR_UidField(tevksel_n_swap, bpmem.tevksel[i*2+1].swap1 << (i*2 + 1));
+		OR_UidField(tevksel_n_swap, bpmem.tevksel[i*2  ].swap2 << (i*2 + 16));
+		OR_UidField(tevksel_n_swap, bpmem.tevksel[i*2+1].swap2 << (i*2 + 17));
+
 		char *texswap = swapModeTable[bpmem.combiners[n].alphaC.tswap];
 		int texmap = bpmem.tevorders[n/2].getTexMap(n&1);
 		SampleTexture<T, type>(out, "textemp", "tevcoord", texswap, texmap, ApiType);
@@ -950,13 +965,19 @@ static void WriteAlphaTest(T& out, API_TYPE ApiType, DSTALPHA_MODE dstAlphaMode)
 	// using discard then return works the same in cg and dx9 but not in dx11
 	out.Write("if(!( ");
 
+	SetUidField(alpha_test.comp0, bpmem.alpha_test.comp0);
+	SetUidField(alpha_test.logic, bpmem.alpha_test.comp1);
+	SetUidField(alpha_test.logic, bpmem.alpha_test.logic);
+
+	// Lookup the first component from the alpha function table
 	int compindex = bpmem.alpha_test.comp0;
-	out.Write(tevAlphaFuncsTable[compindex],alphaRef[0]);//lookup the first component from the alpha function table
+	out.Write(tevAlphaFuncsTable[compindex], alphaRef[0]);
 
 	out.Write("%s", tevAlphaFunclogicTable[bpmem.alpha_test.logic]);//lookup the logic op
 
+	// Lookup the second component from the alpha function table
 	compindex = bpmem.alpha_test.comp1;
-	out.Write(tevAlphaFuncsTable[compindex],alphaRef[1]);//lookup the second component from the alpha function table
+	out.Write(tevAlphaFuncsTable[compindex], alphaRef[1]);
 	out.Write(")) {\n");
 
 	out.Write("ocol0 = 0;\n");
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 61be98aa6e..994f70c9ea 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -94,6 +94,65 @@ struct pixel_shader_uid_data
         u32 bi4 : 3;
         u32 bc4 : 3;
 	} tevindref;
+
+	u32 tevorders_n_texcoord1 : 24; // 8 x 3 bit
+	u32 tevorders_n_texcoord2 : 24; // 8 x 3 bit
+	u32 tevorders_n_sw1 : 24; // 8 x 3 bit
+	u32 tevorders_n_sw2 : 24; // 8 x 3 bit
+	u32 tevorders_n_tw1 : 24; // 8 x 3 bit
+	u32 tevorders_n_tw2 : 24; // 8 x 3 bit
+
+	u32 tevind_n_bs : 32; // 16 x 2 bit
+	u32 tevind_n_fmt : 32; // 16 x 2 bit
+	u32 tevind_n_bt : 32; // 16 x 2 bit
+	u32 tevind_n_bias1 : 24; // 8 x 3 bit
+	u32 tevind_n_bias2 : 24; // 8 x 3 bit
+	u32 tevind_n_mid1 : 32; // 8 x 4 bit
+	u32 tevind_n_mid2 : 32; // 8 x 4 bit
+
+	u32 tevksel_n_swap : 32; // 8 x 2 bit (swap1) + 8 x 2 bit (swap2)
+	struct
+	{
+		struct  //abc=8bit,d=10bit
+		{
+			u32 d : 4; // TEVSELCC_X
+			u32 c : 4; // TEVSELCC_X
+			u32 b : 4; // TEVSELCC_X
+			u32 a : 4; // TEVSELCC_X
+
+			u32 bias : 2;
+			u32 op : 1;
+			u32 clamp : 1;
+
+			u32 shift : 2;
+			u32 dest : 2;  //1,2,3
+		} colorC;
+		struct
+		{
+			u32 rswap : 2;
+			u32 tswap : 2;
+			u32 d : 3; // TEVSELCA_
+			u32 c : 3; // TEVSELCA_
+			u32 b : 3; // TEVSELCA_
+			u32 a : 3; // TEVSELCA_
+
+			u32 bias : 2; //GXTevBias
+			u32 op : 1;
+			u32 clamp : 1;
+
+			u32 shift : 2;
+			u32 dest : 2;  //1,2,3
+		} alphaC;
+	} combiners[16];
+	struct
+	{
+		u32 comp0 : 3;
+		u32 comp1 : 3;
+		u32 logic : 2;
+		// TODO: ref???
+	} alpha_test;
+
+	u32 bHasIndStage : 16;
 };
 
 typedef ShaderUid<pixel_shader_uid_data> PixelShaderUid;
diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index 090fb24b57..39fcf13d95 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -29,6 +29,7 @@ class ShaderUid
 public:
 	ShaderUid()
 	{
+		// TODO: Move to Shadergen => can be optimized out
 		memset(values, 0, sizeof(values));
 	}
 

From 67be1e939a15fd881565e38c63a590dc94473bc7 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Sun, 2 Sep 2012 14:31:37 +0200
Subject: [PATCH 006/352] PixelShaderGen: Some more work...

---
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 47 ++++++++++---------
 Source/Core/VideoCommon/Src/PixelShaderGen.h  |  4 +-
 .../Plugin_VideoOGL/Src/PixelShaderCache.cpp  |  2 +-
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 9aad5556aa..8bfc3abd8a 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -40,8 +40,8 @@
 template<class T, GenOutput type> static void WriteStage(char *&p, int n, API_TYPE ApiType);
 template<class T, GenOutput type> static void SampleTexture(T& out, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType);
 // static void WriteAlphaCompare(char *&p, int num, int comp);
-template<class T, GenOutput type> static void WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode);
-template<class T, GenOutput type> static void WriteFog(char *&p);
+template<class T, GenOutput type> static void WriteAlphaTest(T& out, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode);
+template<class T, GenOutput type> static void WriteFog(T& out);
 
 static const char *tevKSelTableC[] = // KCSEL
 {
@@ -273,6 +273,16 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	SetUidField(genMode.numtevstages, bpmem.genMode.numtevstages);
 	SetUidField(genMode.numtexgens, bpmem.genMode.numtexgens);
 
+	int nIndirectStagesUsed = 0;
+	if (bpmem.genMode.numindstages > 0)
+	{
+		for (unsigned int i = 0; i < numStages; ++i)
+		{
+			if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages)
+				nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt;
+		}
+	}
+
 	// Declare samplers
 	out.Write((ApiType != API_D3D11) ? "uniform sampler2D " : "sampler ");
 	for (int i = 0; i < 8; ++i)
@@ -287,7 +297,6 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 
 		out.Write(";\n");
 	}
-
 	out.Write("\n");
 
 	out.Write("uniform float4 " I_COLORS"[4] : register(c%d);\n", C_COLORS);
@@ -326,6 +335,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	out.Write("  in float4 colors_0 : COLOR0,\n");
 	out.Write("  in float4 colors_1 : COLOR1");
 
+	// TODO: ... this looks like an incredibly ugly hack - is it still needed?
 	// compute window position if needed because binding semantic WPOS is not widely supported
 	if (numTexgen < 7)
 	{
@@ -345,7 +355,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 		}
 		else
 		{
-			/// TODO: Set numTexGen used
+			SetUidField(xfregs_numTexGen_numTexGens, xfregs.numTexGen.numTexGens);
 			for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
 				out.Write(",\n  in float%d uv%d : TEXCOORD%d", i < 4 ? 4 : 3 , i, i);
 		}
@@ -363,6 +373,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 
 	if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
 	{
+		SetUidField(xfregs_numTexGen_numTexGens, xfregs.numTexGen.numTexGens);
 		if (xfregs.numTexGen.numTexGens < 7)
 		{
 			out.Write("float3 _norm0 = normalize(Normal.xyz);\n\n");
@@ -378,7 +389,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 		out.Write("float4 mat, lacc;\n"
 		"float3 ldir, h;\n"
 		"float dist, dist2, attn;\n");
-
+/// TODO
 ///		p = GenerateLightingShader(p, components, I_PMATERIALS, I_PLIGHTS, "colors_", "colors_");
 	}
 
@@ -409,16 +420,6 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	}
 
 	// indirect texture map lookup
-	int nIndirectStagesUsed = 0;
-	if (bpmem.genMode.numindstages > 0)
-	{
-		for (unsigned int i = 0; i < numStages; ++i)
-		{
-			/// Ignoring this for now, handled in WriteStage.
-			if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages)
-				nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt;
-		}
-	}
 	SetUidField(nIndirectStagesUsed, nIndirectStagesUsed);
 	for(u32 i = 0; i < bpmem.genMode.numindstages; ++i)
 	{
@@ -427,6 +428,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 			unsigned int texcoord = bpmem.tevindref.getTexCoord(i);
 			unsigned int texmap = bpmem.tevindref.getTexMap(i);
 
+			/// TODO: Cleanup...
 			if (i == 0)
 			{
 				SetUidField(tevindref.bc0, texcoord);
@@ -468,15 +470,16 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 		RegisterStates[i].AuxStored = false;
 	}
 
-	BuildSwapModeTable(); // Uids set in WriteStage
+	// Uid fields for BuildSwapModeTable are set in WriteStage
+	BuildSwapModeTable();
 	for (unsigned int i = 0; i < numStages; i++)
-		WriteStage<T, type>(out, i, ApiType); //build the equation for this stage
+		WriteStage<T, type>(out, i, ApiType); // build the equation for this stage
 
 	if(numStages)
 	{
 		// The results of the last texenv stage are put onto the screen,
 		// regardless of the used destination register
-		SetUidField(combiners[numStages-1].colorC.dest, bpmem.combiners[numStages-1].colorC.dest);
+		SetUidField(combiners[numStages-1].colorC.dest, bpmem.combiners[numStages-1].colorC.dest); // TODO: These probably don't need to be set anymore here...
 		SetUidField(combiners[numStages-1].alphaC.dest, bpmem.combiners[numStages-1].alphaC.dest);
 		if(bpmem.combiners[numStages - 1].colorC.dest != 0)
 		{
@@ -1061,12 +1064,12 @@ static void WriteFog(T& out)
 	out.Write("  prev.rgb = lerp(prev.rgb," I_FOG"[0].rgb,fog);\n");
 }
 
-void GetPixelShaderId(PixelShaderUid& object, DSTALPHA_MODE dst_alpha_mode, API_TYPE ApiType, u32 components)
+void GetPixelShaderUid(PixelShaderUid& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
-	GeneratePixelShader<PixelShaderUid, GO_ShaderUid>(object, dst_alpha_mode, ApiType, components);
+	GeneratePixelShader<PixelShaderUid, GO_ShaderUid>(object, dstAlphaMode, ApiType, components);
 }
 
-void GeneratePixelShaderCode(PixelShaderCode& object, DSTALPHA_MODE dst_alpha_mode, API_TYPE ApiType, u32 components)
+void GeneratePixelShaderCode(PixelShaderCode& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
-	GeneratePixelShader<PixelShaderCode, GO_ShaderCode>(object, dst_alpha_mode, ApiType, components);
+	GeneratePixelShader<PixelShaderCode, GO_ShaderCode>(object, dstAlphaMode, ApiType, components);
 }
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 994f70c9ea..86fdd5dd82 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -153,6 +153,8 @@ struct pixel_shader_uid_data
 	} alpha_test;
 
 	u32 bHasIndStage : 16;
+
+	u32 xfregs_numTexGen_numTexGens : 4;
 };
 
 typedef ShaderUid<pixel_shader_uid_data> PixelShaderUid;
@@ -160,6 +162,6 @@ typedef ShaderCode<pixel_shader_uid_data> PixelShaderCode;
 
 
 void GeneratePixelShaderCode(PixelShaderCode& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
-void GetPixelShaderId(PixelShaderUid& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
+void GetPixelShaderUid(PixelShaderUid& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
 
 #endif // GCOGL_PIXELSHADER_H
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
index cdd5d6e044..81e1547c71 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
@@ -184,7 +184,7 @@ void PixelShaderCache::Shutdown()
 FRAGMENTSHADER* PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
 {
 	PixelShaderUid uid;
-	GetPixelShaderId(uid, dstAlphaMode, API_OPENGL, components);
+	GetPixelShaderUid(uid, dstAlphaMode, API_OPENGL, components);
 
 	// Check if the shader is already set
 	if (last_entry)

From 700cce9588fcd53b016161690f0d4c1fa5ccf3f3 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@googlemail.com>
Date: Sun, 2 Sep 2012 18:30:21 +0200
Subject: [PATCH 007/352] More work on making new pixel shader uids work

---
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 19 +++--
 Source/Core/VideoCommon/Src/PixelShaderGen.h  | 76 ++++++++++++-------
 2 files changed, 62 insertions(+), 33 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 8bfc3abd8a..01f7768fb1 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -39,7 +39,6 @@
 
 template<class T, GenOutput type> static void WriteStage(char *&p, int n, API_TYPE ApiType);
 template<class T, GenOutput type> static void SampleTexture(T& out, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType);
-// static void WriteAlphaCompare(char *&p, int num, int comp);
 template<class T, GenOutput type> static void WriteAlphaTest(T& out, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode);
 template<class T, GenOutput type> static void WriteFog(T& out);
 
@@ -250,6 +249,7 @@ static void BuildSwapModeTable()
 template<class T, GenOutput type>
 void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
+	// TODO: Can be optimized if using alpha pass
 #define SetUidField(name, value) if (type == GO_ShaderUid) {out.GetUidData().name = value; };
 #define OR_UidField(name, value) if (type == GO_ShaderUid) {out.GetUidData().name |= value; };
 	if (type == GO_ShaderCode)
@@ -664,10 +664,12 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 		// Wrapping
 		// ---------
 
-		if (n < 8) { OR_UidField(tevorders_n_sw1, bpmem.tevind[n].sw << (3 * n)); }
-		else OR_UidField(tevorders_n_sw2, bpmem.tevind[n].sw << (3 * n - 24));
-		if (n < 8) { OR_UidField(tevorders_n_tw1, bpmem.tevind[n].tw << (3 * n)); }
-		else OR_UidField(tevorders_n_tw2, bpmem.tevind[n].tw << (3 * n - 24));
+		if (n < 8) { OR_UidField(tevind_n_sw1, bpmem.tevind[n].sw << (3 * n)); }
+		else OR_UidField(tevind_n_sw2, bpmem.tevind[n].sw << (3 * n - 24));
+		if (n < 8) { OR_UidField(tevind_n_tw1, bpmem.tevind[n].tw << (3 * n)); }
+		else OR_UidField(tevind_n_tw2, bpmem.tevind[n].tw << (3 * n - 24));
+
+		OR_UidField(tevind_n_fb_addprev, bpmem.tevind[n].fb_addprev << n);
 
 		// wrap S
 		if (bpmem.tevind[n].sw == ITW_OFF)
@@ -694,6 +696,9 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 	TevStageCombiner::ColorCombiner &cc = bpmem.combiners[n].colorC;
 	TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[n].alphaC;
 
+	SetUidField(combiners[n].colorC.hex, cc.hex&0xFFFFFF);
+	SetUidField(combiners[n].alphaC.hex, ac.hex&0xFFFFFF);
+
 	if(cc.a == TEVCOLORARG_RASA || cc.a == TEVCOLORARG_RASC
 		|| cc.b == TEVCOLORARG_RASA || cc.b == TEVCOLORARG_RASC
 		|| cc.c == TEVCOLORARG_RASA || cc.c == TEVCOLORARG_RASC
@@ -1023,9 +1028,12 @@ static const char *tevFogFuncsTable[] =
 template<class T, GenOutput type>
 static void WriteFog(T& out)
 {
+	SetUidField(fog.fsel, bpmem.fog.c_proj_fsel.fsel);
 	if(bpmem.fog.c_proj_fsel.fsel == 0)
 		return; //no Fog
 
+	SetUidField(fog.proj, bpmem.fog.c_proj_fsel.proj);
+
 	if (bpmem.fog.c_proj_fsel.proj == 0)
 	{
 		// perspective
@@ -1042,6 +1050,7 @@ static void WriteFog(T& out)
 	// x_adjust = sqrt((x-center)^2 + k^2)/k
 	// ze *= x_adjust
 	// this is completely theoretical as the real hardware seems to use a table intead of calculating the values.
+	SetUidField(fog.RangeBaseEnabled, bpmem.fogRange.Base.Enabled);
 	if(bpmem.fogRange.Base.Enabled)
 	{
 		out.Write("  float x_adjust = (2.0f * (clipPos.x / " I_FOG"[2].y)) - 1.0f - " I_FOG"[2].x;\n");
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 86fdd5dd82..1476cb634d 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -97,10 +97,11 @@ struct pixel_shader_uid_data
 
 	u32 tevorders_n_texcoord1 : 24; // 8 x 3 bit
 	u32 tevorders_n_texcoord2 : 24; // 8 x 3 bit
-	u32 tevorders_n_sw1 : 24; // 8 x 3 bit
-	u32 tevorders_n_sw2 : 24; // 8 x 3 bit
-	u32 tevorders_n_tw1 : 24; // 8 x 3 bit
-	u32 tevorders_n_tw2 : 24; // 8 x 3 bit
+	u32 tevind_n_sw1 : 24; // 8 x 3 bit
+	u32 tevind_n_sw2 : 24; // 8 x 3 bit
+	u32 tevind_n_tw1 : 24; // 8 x 3 bit
+	u32 tevind_n_tw2 : 24; // 8 x 3 bit
+	u32 tevind_n_fb_addprev : 16; // 16 x 1 bit
 
 	u32 tevind_n_bs : 32; // 16 x 2 bit
 	u32 tevind_n_fmt : 32; // 16 x 2 bit
@@ -113,35 +114,41 @@ struct pixel_shader_uid_data
 	u32 tevksel_n_swap : 32; // 8 x 2 bit (swap1) + 8 x 2 bit (swap2)
 	struct
 	{
-		struct  //abc=8bit,d=10bit
-		{
-			u32 d : 4; // TEVSELCC_X
-			u32 c : 4; // TEVSELCC_X
-			u32 b : 4; // TEVSELCC_X
-			u32 a : 4; // TEVSELCC_X
+		union {
+			struct  //abc=8bit,d=10bit
+			{
+				u32 d : 4; // TEVSELCC_X
+				u32 c : 4; // TEVSELCC_X
+				u32 b : 4; // TEVSELCC_X
+				u32 a : 4; // TEVSELCC_X
 
-			u32 bias : 2;
-			u32 op : 1;
-			u32 clamp : 1;
+				u32 bias : 2;
+				u32 op : 1;
+				u32 clamp : 1;
 
-			u32 shift : 2;
-			u32 dest : 2;  //1,2,3
+				u32 shift : 2;
+				u32 dest : 2;  //1,2,3
+			};
+			u32 hex : 24;
 		} colorC;
-		struct
-		{
-			u32 rswap : 2;
-			u32 tswap : 2;
-			u32 d : 3; // TEVSELCA_
-			u32 c : 3; // TEVSELCA_
-			u32 b : 3; // TEVSELCA_
-			u32 a : 3; // TEVSELCA_
+		union {
+			struct
+			{
+				u32 rswap : 2;
+				u32 tswap : 2;
+				u32 d : 3; // TEVSELCA_
+				u32 c : 3; // TEVSELCA_
+				u32 b : 3; // TEVSELCA_
+				u32 a : 3; // TEVSELCA_
 
-			u32 bias : 2; //GXTevBias
-			u32 op : 1;
-			u32 clamp : 1;
+				u32 bias : 2; //GXTevBias
+				u32 op : 1;
+				u32 clamp : 1;
 
-			u32 shift : 2;
-			u32 dest : 2;  //1,2,3
+				u32 shift : 2;
+				u32 dest : 2;  //1,2,3
+			};
+			u32 hex : 24;
 		} alphaC;
 	} combiners[16];
 	struct
@@ -152,6 +159,17 @@ struct pixel_shader_uid_data
 		// TODO: ref???
 	} alpha_test;
 
+	union {
+		struct
+		{
+			u32 proj : 1; // 0 - perspective, 1 - orthographic
+			u32 fsel : 3; // 0 - off, 2 - linear, 4 - exp, 5 - exp2, 6 - backward exp, 7 - backward exp2
+			u32 RangeBaseEnabled : 1;
+		};
+		u32 hex : 4;
+	} fog;
+
+
 	u32 bHasIndStage : 16;
 
 	u32 xfregs_numTexGen_numTexGens : 4;
@@ -159,9 +177,11 @@ struct pixel_shader_uid_data
 
 typedef ShaderUid<pixel_shader_uid_data> PixelShaderUid;
 typedef ShaderCode<pixel_shader_uid_data> PixelShaderCode;
+//typedef ShaderConstantProfile<pixel_shader_uid_data> PixelShaderConstantProfile;
 
 
 void GeneratePixelShaderCode(PixelShaderCode& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
 void GetPixelShaderUid(PixelShaderUid& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
+//void GetPixelShaderConstantProfile(PixelShaderConstantProfile& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
 
 #endif // GCOGL_PIXELSHADER_H

From 0fdeb81038d9ef599d4741035245972c3d374be7 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@googlemail.com>
Date: Sun, 2 Sep 2012 20:00:15 +0200
Subject: [PATCH 008/352] Add some code for generating a shader constant usage
 profile.

---
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 62 +++++++++++-
 Source/Core/VideoCommon/Src/PixelShaderGen.h  |  5 +-
 .../VideoCommon/Src/PixelShaderManager.cpp    | 99 ++++++++++++-------
 .../Core/VideoCommon/Src/PixelShaderManager.h |  2 +-
 Source/Core/VideoCommon/Src/ShaderGenCommon.h | 35 ++++++-
 .../Plugin_VideoOGL/Src/VertexManager.cpp     |  2 +-
 6 files changed, 163 insertions(+), 42 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 01f7768fb1..a19eb1a27e 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -299,9 +299,9 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	}
 	out.Write("\n");
 
-	out.Write("uniform float4 " I_COLORS"[4] : register(c%d);\n", C_COLORS);
+	out.Write("uniform float4 " I_COLORS"[4] : register(c%d);\n", C_COLORS); // TODO: first element not used??
 	out.Write("uniform float4 " I_KCOLORS"[4] : register(c%d);\n", C_KCOLORS);
-	out.Write("uniform float4 " I_ALPHA"[1] : register(c%d);\n", C_ALPHA);
+	out.Write("uniform float4 " I_ALPHA"[1] : register(c%d);\n", C_ALPHA); // TODO: Why is this an array...-.-
 	out.Write("uniform float4 " I_TEXDIMS"[8] : register(c%d);\n", C_TEXDIMS);
 	out.Write("uniform float4 " I_ZBIAS"[2] : register(c%d);\n", C_ZBIAS);
 	out.Write("uniform float4 " I_INDTEXSCALE"[2] : register(c%d);\n", C_INDTEXSCALE);
@@ -390,6 +390,8 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 		"float3 ldir, h;\n"
 		"float dist, dist2, attn;\n");
 /// TODO
+		out.SetConstantsUsed(C_PLIGHTS, C_PLIGHTS+39); // TODO: Can be optimized further
+		out.SetConstantsUsed(C_PMATERIALS, C_PMATERIALS+3);
 ///		p = GenerateLightingShader(p, components, I_PMATERIALS, I_PLIGHTS, "colors_", "colors_");
 	}
 
@@ -405,6 +407,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	}
 	else
 	{
+		out.SetConstantsUsed(C_TEXDIMS, C_TEXDIMS+numTexgen-1);
 		for (unsigned int i = 0; i < numTexgen; ++i)
 		{
 			// optional perspective divides
@@ -450,7 +453,10 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 				SetUidField(tevindref.bi4, texmap);
 			}
 			if (texcoord < numTexgen)
+			{
+				out.SetConstantsUsed(C_INDTEXSCALE+i/2,C_INDTEXSCALE+i/2);
 				out.Write("tempcoord = uv%d.xy * " I_INDTEXSCALE"[%d].%s;\n", texcoord, i/2, (i&1)?"zw":"xy");
+			}
 			else
 				out.Write("tempcoord = float2(0.0f, 0.0f);\n");
 
@@ -504,12 +510,14 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 		WriteAlphaTest<T, type>(out, ApiType, dstAlphaMode);
 
 	// the screen space depth value = far z + (clip z / clip w) * z range
+	out.SetConstantsUsed(C_ZBIAS+1, C_ZBIAS+1);
 	out.Write("float zCoord = " I_ZBIAS"[1].x + (clipPos.z / clipPos.w) * " I_ZBIAS"[1].y;\n");
 
 	// Note: depth textures are disabled if early depth test is enabled
 	if (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable)
 	{
 		// use the texture input of the last texture stage (textemp), hopefully this has been read and is in correct format...
+		out.SetConstantsUsed(C_ZBIAS, C_ZBIAS+1);
 		out.Write("zCoord = dot(" I_ZBIAS"[0].xyzw, textemp.xyzw) + " I_ZBIAS"[1].w %s;\n",
 									(bpmem.ztex2.op == ZTEXTURE_ADD) ? "+ zCoord" : "");
 
@@ -521,7 +529,10 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	out.Write("depth = zCoord;\n");
 
 	if (dstAlphaMode == DSTALPHA_ALPHA_PASS)
+	{
+		out.SetConstantsUsed(C_ALPHA, C_ALPHA);
 		out.Write("  ocol0 = float4(prev.rgb, " I_ALPHA"[0].a);\n");
+	}
 	else
 	{
 		WriteFog<T, type>(out);
@@ -532,6 +543,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	// single pass
 	if (dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND)
 	{
+		out.SetConstantsUsed(C_ALPHA, C_ALPHA);
 		// Colors will be blended against the alpha from ocol1...
 		out.Write("  ocol1 = ocol0;\n");
 		// ...and the alpha from ocol0 will be written to the framebuffer.
@@ -639,6 +651,7 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 			if (bpmem.tevind[n].mid <= 3)
 			{
 				int mtxidx = 2*(bpmem.tevind[n].mid-1);
+				out.SetConstantsUsed(C_INDTEXMTX+mtxidx, C_INDTEXMTX+mtxidx);
 				out.Write("float2 indtevtrans%d = float2(dot(" I_INDTEXMTX"[%d].xyz, indtevcrd%d), dot(" I_INDTEXMTX"[%d].xyz, indtevcrd%d));\n",
 							n, mtxidx, n, mtxidx+1, n);
 			}
@@ -646,12 +659,14 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 			{ // s matrix
 				_assert_(bpmem.tevind[n].mid >= 5);
 				int mtxidx = 2*(bpmem.tevind[n].mid-5);
+				out.SetConstantsUsed(C_INDTEXMTX+mtxidx, C_INDTEXMTX+mtxidx);
 				out.Write("float2 indtevtrans%d = " I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.xx;\n", n, mtxidx, texcoord, n);
 			}
 			else if (bpmem.tevind[n].mid <= 11 && bHasTexCoord)
 			{ // t matrix
 				_assert_(bpmem.tevind[n].mid >= 9);
 				int mtxidx = 2*(bpmem.tevind[n].mid-9);
+				out.SetConstantsUsed(C_INDTEXMTX+mtxidx, C_INDTEXMTX+mtxidx);
 				out.Write("float2 indtevtrans%d = " I_INDTEXMTX"[%d].ww * uv%d.xy * indtevcrd%d.yy;\n", n, mtxidx, texcoord, n);
 			}
 			else
@@ -757,6 +772,10 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 		{
 			out.Write("ckonsttemp = konsttemp;\n");
 		}
+		if (kc > 7)
+			out.SetConstantsUsed(C_KCOLORS+((kc-0xc)%4),C_KCOLORS+((kc-0xc)%4));
+		if (ka > 7)
+			out.SetConstantsUsed(C_KCOLORS+((ka-0xc)%4),C_KCOLORS+((ka-0xc)%4));
 	}
 
 	if(cc.a == TEVCOLORARG_CPREV || cc.a == TEVCOLORARG_APREV
@@ -782,6 +801,8 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 	|| cc.c == TEVCOLORARG_C0 || cc.c == TEVCOLORARG_A0
 	|| ac.a == TEVALPHAARG_A0 || ac.b == TEVALPHAARG_A0 || ac.c == TEVALPHAARG_A0)
 	{
+		// TODO: WTF?
+		out.SetConstantsUsed(C_COLORS+1,C_COLORS+1);
 		if(RegisterStates[1].AlphaNeedOverflowControl || RegisterStates[1].ColorNeedOverflowControl)
 		{
 			out.Write("cc0 = frac(c0 * (255.0f/256.0f)) * (256.0f/255.0f);\n");
@@ -800,6 +821,7 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 	|| cc.c == TEVCOLORARG_C1 || cc.c == TEVCOLORARG_A1
 	|| ac.a == TEVALPHAARG_A1 || ac.b == TEVALPHAARG_A1 || ac.c == TEVALPHAARG_A1)
 	{
+		out.SetConstantsUsed(C_COLORS+2,C_COLORS+2);
 		if(RegisterStates[2].AlphaNeedOverflowControl || RegisterStates[2].ColorNeedOverflowControl)
 		{
 			out.Write("cc1 = frac(c1 * (255.0f/256.0f)) * (256.0f/255.0f);\n");
@@ -818,6 +840,7 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 	|| cc.c == TEVCOLORARG_C2 || cc.c == TEVCOLORARG_A2
 	|| ac.a == TEVALPHAARG_A2 || ac.b == TEVALPHAARG_A2 || ac.c == TEVALPHAARG_A2)
 	{
+		out.SetConstantsUsed(C_COLORS+3,C_COLORS+3);
 		if(RegisterStates[3].AlphaNeedOverflowControl || RegisterStates[3].ColorNeedOverflowControl)
 		{
 			out.Write("cc2 = frac(c2 * (255.0f/256.0f)) * (256.0f/255.0f);\n");
@@ -834,6 +857,28 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 	RegisterStates[cc.dest].ColorNeedOverflowControl = (cc.clamp == 0);
 	RegisterStates[cc.dest].AuxStored = false;
 
+/*	if (cc.d == TEVCOLORARG_C0 || cc.d == TEVCOLORARG_A0 || ac.d == TEVALPHAARG_A0)
+	{
+		out.SetConstantsUsed(C_COLORS+1,C_COLORS+1);
+		// TODO: 11 bit signed overflow..
+	}
+	if (cc.d == TEVCOLORARG_C1 || cc.d == TEVCOLORARG_A1 || ac.d == TEVALPHAARG_A1)
+	{
+		out.SetConstantsUsed(C_COLORS+2,C_COLORS+2);
+		// TODO: 11 bit signed overflow..
+	}
+	if (cc.d == TEVCOLORARG_C2 || cc.d == TEVCOLORARG_A2 || ac.d == TEVALPHAARG_A2)
+	{
+		out.SetConstantsUsed(C_COLORS+3,C_COLORS+3);
+		// TODO: 11 bit signed overflow..
+	}*/
+
+	// TODO: Are there enums for this?
+	if (cc.dest >= 1 && cc.dest <= 3)
+		out.SetConstantsUsed(C_COLORS+cc.dest, C_COLORS+cc.dest);
+	if (ac.dest >= 1 && ac.dest <= 3)
+		out.SetConstantsUsed(C_COLORS+ac.dest, C_COLORS+ac.dest);
+
 	out.Write("// color combine\n");
 	if (cc.clamp)
 		out.Write("%s = saturate(", tevCOutputTable[cc.dest]);
@@ -935,6 +980,7 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 template<class T, GenOutput type>
 void SampleTexture(T& out, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType)
 {
+	out.SetConstantsUsed(C_TEXDIMS+texmap,C_TEXDIMS+texmap);
 	if (ApiType == API_D3D11)
 		out.Write("%s=Tex%d.Sample(samp%d,%s.xy * " I_TEXDIMS"[%d].xy).%s;\n", destination, texmap,texmap, texcoords, texmap, texswap);
 	else
@@ -968,7 +1014,9 @@ static void WriteAlphaTest(T& out, API_TYPE ApiType, DSTALPHA_MODE dstAlphaMode)
 	{
 		I_ALPHA"[0].r",
 		I_ALPHA"[0].g"
-	};	
+	};
+
+	out.SetConstantsUsed(C_ALPHA, C_ALPHA);
 
 	// using discard then return works the same in cg and dx9 but not in dx11
 	out.Write("if(!( ");
@@ -1034,6 +1082,7 @@ static void WriteFog(T& out)
 
 	SetUidField(fog.proj, bpmem.fog.c_proj_fsel.proj);
 
+	out.SetConstantsUsed(C_FOG, C_FOG+1);
 	if (bpmem.fog.c_proj_fsel.proj == 0)
 	{
 		// perspective
@@ -1053,6 +1102,7 @@ static void WriteFog(T& out)
 	SetUidField(fog.RangeBaseEnabled, bpmem.fogRange.Base.Enabled);
 	if(bpmem.fogRange.Base.Enabled)
 	{
+		out.SetConstantsUsed(C_FOG+2, C_FOG+2);
 		out.Write("  float x_adjust = (2.0f * (clipPos.x / " I_FOG"[2].y)) - 1.0f - " I_FOG"[2].x;\n");
 		out.Write("  x_adjust = sqrt(x_adjust * x_adjust + " I_FOG"[2].z * " I_FOG"[2].z) / " I_FOG"[2].z;\n");
 		out.Write("  ze *= x_adjust;\n");
@@ -1082,3 +1132,9 @@ void GeneratePixelShaderCode(PixelShaderCode& object, DSTALPHA_MODE dstAlphaMode
 {
 	GeneratePixelShader<PixelShaderCode, GO_ShaderCode>(object, dstAlphaMode, ApiType, components);
 }
+
+void GetPixelShaderConstantProfile(PixelShaderConstantProfile& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
+{
+	GeneratePixelShader<PixelShaderConstantProfile, GO_ShaderCode>(object, dstAlphaMode, ApiType, components);
+}
+
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 1476cb634d..221b04612e 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -72,7 +72,6 @@ struct pixel_shader_uid_data
         u32 numtevstages : 4;
 		u32 numindstages : 3;
 	} genMode;
-	u32 fogc_proj_fselfsel : 3;
 	struct
 	{
 		u32 unknown : 1;
@@ -177,11 +176,11 @@ struct pixel_shader_uid_data
 
 typedef ShaderUid<pixel_shader_uid_data> PixelShaderUid;
 typedef ShaderCode<pixel_shader_uid_data> PixelShaderCode;
-//typedef ShaderConstantProfile<pixel_shader_uid_data> PixelShaderConstantProfile;
+typedef ShaderConstantProfile<pixel_shader_uid_data> PixelShaderConstantProfile;
 
 
 void GeneratePixelShaderCode(PixelShaderCode& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
 void GetPixelShaderUid(PixelShaderUid& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
-//void GetPixelShaderConstantProfile(PixelShaderConstantProfile& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
+void GetPixelShaderConstantProfile(PixelShaderConstantProfile& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
 
 #endif // GCOGL_PIXELSHADER_H
diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
index eaaf99fbc8..ffec7d64cb 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
@@ -83,39 +83,58 @@ void PixelShaderManager::Shutdown()
 
 }
 
-void PixelShaderManager::SetConstants()
+void PixelShaderManager::SetConstants(u32 components)
 {
-    for (int i = 0; i < 2; ++i)
+	PixelShaderConstantProfile constant_profile(C_PENVCONST_END);
+	/// TODO: dst alpha/api/components type parameter...
+	GetPixelShaderConstantProfile(constant_profile, DSTALPHA_DUAL_SOURCE_BLEND, API_OPENGL, components);
+
+	static int saved_updates = 0;
+	static int necessary_updates = 0;
+
+
+#define IncStuff() { \
+	saved_updates++; \
+	printf("Saved a constant update at line %d! Saved %d against %d now!\n", __LINE__, saved_updates, necessary_updates); }
+
+	for (int i = 0; i < 2; ++i)
 	{
-        if (s_nColorsChanged[i])
+		if (s_nColorsChanged[i])
 		{
-            int baseind = i ? C_KCOLORS : C_COLORS;
-            for (int j = 0; j < 4; ++j)
+			int baseind = i ? C_KCOLORS : C_COLORS;
+			for (int j = 0; j < 4; ++j)
 			{
-                if (s_nColorsChanged[i] & (1 << j))
-                    SetPSConstant4fv(baseind+j, &lastRGBAfull[i][j][0]);
-            }
-            s_nColorsChanged[i] = 0;
-        }
-    }
+				if ((s_nColorsChanged[i] & (1 << j)) && constant_profile.ConstantIsUsed(baseind+j))
+				{
+					SetPSConstant4fv(baseind+j, &lastRGBAfull[i][j][0]);
+					s_nColorsChanged[i] &= ~(1<<j);
+					++necessary_updates;
+				} else if ((s_nColorsChanged[i] & (1 << j))) IncStuff();
+			}
+		}
+	}
 
     if (s_nTexDimsChanged)
 	{
         for (int i = 0; i < 8; ++i)
 		{
-            if (s_nTexDimsChanged & (1<<i))
+            if (s_nTexDimsChanged & (1<<i) && constant_profile.ConstantIsUsed(C_TEXDIMS+i))
+			{
+					++necessary_updates;
 				SetPSTextureDims(i);
+				s_nTexDimsChanged &= ~(1<<i);
+			}else if (s_nTexDimsChanged & (1<<i)) IncStuff();
         }
-        s_nTexDimsChanged = 0;
     }
 
-    if (s_bAlphaChanged)
+    if (s_bAlphaChanged && constant_profile.ConstantIsUsed(C_ALPHA))
 	{
+					++necessary_updates;
 		SetPSConstant4f(C_ALPHA, (lastAlpha&0xff)/255.0f, ((lastAlpha>>8)&0xff)/255.0f, 0, ((lastAlpha>>16)&0xff)/255.0f);
 		s_bAlphaChanged = false;
-    }
+    } else if (s_bAlphaChanged) IncStuff();
 
-	if (s_bZTextureTypeChanged)
+	if (s_bZTextureTypeChanged && constant_profile.ConstantIsUsed(C_ZBIAS))
 	{
         float ftemp[4];
         switch (bpmem.ztex2.type)
@@ -133,11 +152,12 @@ void PixelShaderManager::SetConstants()
 				ftemp[0] = 16711680.0f/16777215.0f; ftemp[1] = 65280.0f/16777215.0f; ftemp[2] = 255.0f/16777215.0f; ftemp[3] = 0;
                 break;
         }
+					++necessary_updates;
 		SetPSConstant4fv(C_ZBIAS, ftemp);
 		s_bZTextureTypeChanged = false;
-	}
+	} else if (s_bZTextureTypeChanged) IncStuff();
 
-	if (s_bZBiasChanged || s_bDepthRangeChanged)
+	if ((s_bZBiasChanged || s_bDepthRangeChanged) && constant_profile.ConstantIsUsed(C_ZBIAS+1))
 	{
         // reversed gxsetviewport(xorig, yorig, width, height, nearz, farz)
 		// [0] = width/2
@@ -148,9 +168,10 @@ void PixelShaderManager::SetConstants()
 		// [5] = 16777215 * farz
 
 		//ERROR_LOG("pixel=%x,%x, bias=%x\n", bpmem.zcontrol.pixel_format, bpmem.ztex2.type, lastZBias);
+					++necessary_updates;
 		SetPSConstant4f(C_ZBIAS+1, xfregs.viewport.farZ / 16777216.0f, xfregs.viewport.zRange / 16777216.0f, 0, (float)(lastZBias)/16777215.0f);
 		s_bZBiasChanged = s_bDepthRangeChanged = false;
-    }
+    }else if ((s_bZBiasChanged || s_bDepthRangeChanged)) IncStuff();
 
     // indirect incoming texture scales
     if (s_nIndTexScaleChanged)
@@ -158,7 +179,7 @@ void PixelShaderManager::SetConstants()
 		// set as two sets of vec4s, each containing S and T of two ind stages.
         float f[8];
 
-        if (s_nIndTexScaleChanged & 0x03)
+        if ((s_nIndTexScaleChanged & 0x03) && constant_profile.ConstantIsUsed(C_INDTEXSCALE))
 		{
             for (u32 i = 0; i < 2; ++i)
 			{
@@ -166,26 +187,30 @@ void PixelShaderManager::SetConstants()
                 f[2 * i + 1] = bpmem.texscale[0].getScaleT(i & 1);
                 PRIM_LOG("tex indscale%d: %f %f\n", i, f[2 * i], f[2 * i + 1]);
             }
+					++necessary_updates;
 			SetPSConstant4fv(C_INDTEXSCALE, f);
+			s_nIndTexScaleChanged &= ~0x03;
         }
+        else if ((s_nIndTexScaleChanged & 0x03)) IncStuff();
 
-        if (s_nIndTexScaleChanged & 0x0c) {
+        if ((s_nIndTexScaleChanged & 0x0c) && constant_profile.ConstantIsUsed(C_INDTEXSCALE+1)) {
             for (u32 i = 2; i < 4; ++i) {
                 f[2 * i] = bpmem.texscale[1].getScaleS(i & 1);
                 f[2 * i + 1] = bpmem.texscale[1].getScaleT(i & 1);
                 PRIM_LOG("tex indscale%d: %f %f\n", i, f[2 * i], f[2 * i + 1]);
             }
+					++necessary_updates;
 			SetPSConstant4fv(C_INDTEXSCALE+1, &f[4]);
+			s_nIndTexScaleChanged &= ~0x0c;
         }
-
-        s_nIndTexScaleChanged = 0;
+        else if ((s_nIndTexScaleChanged & 0x0c)) IncStuff();
     }
 
     if (s_nIndTexMtxChanged)
 	{
         for (int i = 0; i < 3; ++i)
 		{
-            if (s_nIndTexMtxChanged & (1 << i))
+            if ((s_nIndTexMtxChanged & (1 << i)) && (constant_profile.ConstantIsUsed(C_INDTEXMTX+2*i) || constant_profile.ConstantIsUsed(C_INDTEXMTX+2*i+1)))
 			{
                 int scale = ((u32)bpmem.indmtx[i].col0.s0 << 0) |
 					        ((u32)bpmem.indmtx[i].col1.s1 << 2) |
@@ -195,6 +220,8 @@ void PixelShaderManager::SetConstants()
                 // xyz - static matrix
                 // TODO w - dynamic matrix scale / 256...... somehow / 4 works better
                 // rev 2972 - now using / 256.... verify that this works
+					++necessary_updates;
+					++necessary_updates;
 				SetPSConstant4f(C_INDTEXMTX + 2 * i,
                     bpmem.indmtx[i].col0.ma * fscale,
 					bpmem.indmtx[i].col1.mc * fscale,
@@ -210,19 +237,22 @@ void PixelShaderManager::SetConstants()
                 	i, 1024.0f*fscale,
                 	bpmem.indmtx[i].col0.ma * fscale, bpmem.indmtx[i].col1.mc * fscale, bpmem.indmtx[i].col2.me * fscale,
                 	bpmem.indmtx[i].col0.mb * fscale, bpmem.indmtx[i].col1.md * fscale, bpmem.indmtx[i].col2.mf * fscale);
-            }
+
+				s_nIndTexMtxChanged &= ~(1 << i);
+            }else if ((s_nIndTexMtxChanged & (1 << i))) {IncStuff();IncStuff();}
         }
-        s_nIndTexMtxChanged = 0;
     }
 
-    if (s_bFogColorChanged)
+    if (s_bFogColorChanged && constant_profile.ConstantIsUsed(C_FOG))
 	{
+					++necessary_updates;
 		SetPSConstant4f(C_FOG, bpmem.fog.color.r / 255.0f, bpmem.fog.color.g / 255.0f, bpmem.fog.color.b / 255.0f, 0);
 		s_bFogColorChanged = false;
-    }
+    }else if (s_bFogColorChanged) IncStuff();
 
-    if (s_bFogParamChanged)
+    if (s_bFogParamChanged && constant_profile.ConstantIsUsed(C_FOG+1))
 	{
+					++necessary_updates;
 		if(!g_ActiveConfig.bDisableFog)
 		{
 			//downscale magnitude to 0.24 bits
@@ -235,10 +265,11 @@ void PixelShaderManager::SetConstants()
 			SetPSConstant4f(C_FOG + 1, 0.0, 1.0, 0.0, 1.0);
 
         s_bFogParamChanged = false;
-    }
+    }else if ( s_bFogParamChanged) IncStuff();
 
-	if (s_bFogRangeAdjustChanged)
+	if (s_bFogRangeAdjustChanged && constant_profile.ConstantIsUsed(C_FOG+2))
 	{
+					++necessary_updates;
 		if(!g_ActiveConfig.bDisableFog && bpmem.fogRange.Base.Enabled == 1)
 		{
 			//bpmem.fogRange.Base.Center : center of the viewport in x axis. observation: bpmem.fogRange.Base.Center = realcenter + 342;
@@ -257,8 +288,9 @@ void PixelShaderManager::SetConstants()
 			SetPSConstant4f(C_FOG + 2, 0.0f, 1.0f, 1.0f, 0.0f); // Need to update these values for older hardware that fails to divide by zero in shaders.
 
 		s_bFogRangeAdjustChanged = false;
-	}
+	}else if ( s_bFogRangeAdjustChanged) IncStuff();
 
+	// TODO: use constant profile here!
 	if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)  // config check added because the code in here was crashing for me inside SetPSConstant4f
 	{
 		if (nLightsChanged[0] >= 0)
@@ -353,7 +385,8 @@ void PixelShaderManager::SetPSTextureDims(int texid)
 	SetPSConstant4fv(C_TEXDIMS + texid, fdims);
 }
 
-// This one is high in profiles (0.5%). TODO: Move conversion out, only store the raw color value
+// This one is high in profiles (0.5%).
+// TODO: Move conversion out, only store the raw color value
 // and update it when the shader constant is set, only.
 void PixelShaderManager::SetColorChanged(int type, int num, bool high)
 {
diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.h b/Source/Core/VideoCommon/Src/PixelShaderManager.h
index 12d749c871..348940f495 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderManager.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderManager.h
@@ -34,7 +34,7 @@ public:
 	static void Shutdown();
 	static void DoState(PointerWrap &p);
 
-	static void SetConstants(); // sets pixel shader constants
+	static void SetConstants(u32 components); // sets pixel shader constants
 
 	// constant management, should be called after memory is committed
 	static void SetColorChanged(int type, int index, bool high);
diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index 39fcf13d95..e052066628 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -23,6 +23,8 @@
 #include <string.h>
 #include "CommonTypes.h"
 
+#include <vector>
+
 template<class uid_data>
 class ShaderUid
 {
@@ -36,6 +38,7 @@ public:
 	void Write(const char* fmt, ...) {}
 	const char* GetBuffer() { return NULL; }
 	void SetBuffer(char* buffer) { }
+	inline void SetConstantsUsed(unsigned int first_index, unsigned int last_index) {}
 
 	bool operator == (const ShaderUid& obj) const
 	{
@@ -55,7 +58,7 @@ public:
 		return false;
 	}
 
-	uid_data& GetUidData() { return data; }
+	inline uid_data& GetUidData() { return data; }
 
 private:
 	union
@@ -86,16 +89,46 @@ public:
 	const char* GetBuffer() { return buf; }
 	void SetBuffer(char* buffer) { buf = buffer; write_ptr = buffer; }
 	uid_data& GetUidData() { return *(uid_data*)NULL; }
+	inline void SetConstantsUsed(unsigned int first_index, unsigned int last_index) {}
 
 private:
 	const char* buf;
 	char* write_ptr;
 };
 
+template<class uid_data>
+class ShaderConstantProfile
+{
+public:
+	ShaderConstantProfile(int num_constants) { constant_usage.resize(num_constants); }
+
+	void Write(const char* fmt, ...) {}
+	const char* GetBuffer() { return NULL; }
+	void SetBuffer(char* buffer) { }
+	uid_data& GetUidData() { return *(uid_data*)NULL; }
+
+	// has room for optimization (if it matters at all...)
+	void NumConstants() { return constant_usage.size(); }
+
+	inline void SetConstantsUsed(unsigned int first_index, unsigned int last_index)
+	{
+		for (unsigned int i = first_index; i < last_index+1; ++i)
+			constant_usage[i] = true;
+	}
+
+	inline bool ConstantIsUsed(unsigned int index)
+	{
+		return constant_usage[index];
+	}
+private:
+	std::vector<bool> constant_usage; // TODO: Is vector<bool> appropriate here?
+};
+
 enum GenOutput
 {
 	GO_ShaderCode,
 	GO_ShaderUid,
+	GO_ShaderConstantProfile,
 };
 
 #endif // _SHADERGENCOMMON_H
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
index ce33247d7c..d89f28ba5d 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
@@ -180,7 +180,7 @@ void VertexManager::vFlush()
 
 	// set global constants
 	VertexShaderManager::SetConstants();
-	PixelShaderManager::SetConstants();
+	PixelShaderManager::SetConstants(g_nativeVertexFmt->m_components);
 
 	bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate
 		&& bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;

From 9f1582843d03dbe9ee607ddcc8323699d408d693 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Sun, 2 Sep 2012 19:14:43 +0200
Subject: [PATCH 009/352] PixelShaderManager: Reduce number of redundant shader
 constant updates

---
 .../VideoCommon/Src/PixelShaderManager.cpp    | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
index ffec7d64cb..e458c5f1e1 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
@@ -42,19 +42,45 @@ static u32 lastTexDims[8]; // width | height << 16 | wrap_s << 28 | wrap_t << 30
 static u32 lastZBias;
 static int nMaterialsChanged;
 
+static float s_constant_cache[C_PENVCONST_END*4];
+
 inline void SetPSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4)
 {
+	if (s_constant_cache[const_number*4] == f1 && s_constant_cache[const_number*4+1] == f2 &&
+	    s_constant_cache[const_number*4+2] == f3 && s_constant_cache[const_number*4+3] == f4)
+		return;
+
 	g_renderer->SetPSConstant4f(const_number, f1, f2, f3, f4);
+	s_constant_cache[const_number*4] = f1;
+	s_constant_cache[const_number*4+1] = f2;
+	s_constant_cache[const_number*4+2] = f3;
+	s_constant_cache[const_number*4+3] = f4;
 }
 
 inline void SetPSConstant4fv(unsigned int const_number, const float *f)
 {
+	if (s_constant_cache[const_number*4] == f[0] && s_constant_cache[const_number*4+1] == f[1] &&
+	    s_constant_cache[const_number*4+2] == f[2] && s_constant_cache[const_number*4+3] == f[3])
+		return;
+
 	g_renderer->SetPSConstant4fv(const_number, f);
+	s_constant_cache[const_number*4] = f[0];
+	s_constant_cache[const_number*4+1] = f[1];
+	s_constant_cache[const_number*4+2] = f[2];
+	s_constant_cache[const_number*4+3] == f[3];
 }
 
 inline void SetMultiPSConstant4fv(unsigned int const_number, unsigned int count, const float *f)
 {
+	for (unsigned int i = 0; i < 4*count; ++i)
+		if (s_constant_cache[const_number*4+i] != f[i])
+			break;
+		else if (i == 4*count-1)
+			return;
+
 	g_renderer->SetMultiPSConstant4fv(const_number, count, f);
+	for (unsigned int i = 0; i < 4*count; ++i)
+		s_constant_cache[const_number*4+i] = f[i];
 }
 
 void PixelShaderManager::Init()
@@ -63,6 +89,7 @@ void PixelShaderManager::Init()
 	memset(lastTexDims, 0, sizeof(lastTexDims));
 	lastZBias = 0;
 	memset(lastRGBAfull, 0, sizeof(lastRGBAfull));
+	memset(s_constant_cache, 0, sizeof(s_constant_cache)); // TODO: Should reflect that on the GPU side....
 	Dirty();
 }
 
@@ -95,7 +122,7 @@ void PixelShaderManager::SetConstants(u32 components)
 
 #define IncStuff() { \
 	saved_updates++; \
-	printf("Saved a constant update at line %d! Saved %d against %d now!\n", __LINE__, saved_updates, necessary_updates); }
+	/*printf("Saved a constant update at line %d! Saved %d against %d now!\n", __LINE__, saved_updates, necessary_updates);*/ }
 
 	for (int i = 0; i < 2; ++i)
 	{

From 76148a52b82cae8e6cf11b6eeeeff55345b0f12e Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Mon, 28 Jan 2013 22:51:15 +0100
Subject: [PATCH 010/352] Fix a few other things

---
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 30 ++++++++++++-------
 Source/Core/VideoCommon/Src/PixelShaderGen.h  | 19 +++++++-----
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index a19eb1a27e..fa38075118 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -273,16 +273,6 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	SetUidField(genMode.numtevstages, bpmem.genMode.numtevstages);
 	SetUidField(genMode.numtexgens, bpmem.genMode.numtexgens);
 
-	int nIndirectStagesUsed = 0;
-	if (bpmem.genMode.numindstages > 0)
-	{
-		for (unsigned int i = 0; i < numStages; ++i)
-		{
-			if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages)
-				nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt;
-		}
-	}
-
 	// Declare samplers
 	out.Write((ApiType != API_D3D11) ? "uniform sampler2D " : "sampler ");
 	for (int i = 0; i < 8; ++i)
@@ -317,6 +307,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 		out.Write("uniform s_" I_PMATERIALS" " I_PMATERIALS" : register(c%d);\n", C_PMATERIALS);
 	}
 
+	// TODO: Somehow should put ApiType in the hash..
 	out.Write("void main(\n");
 	if(ApiType != API_D3D11)
 	{
@@ -355,6 +346,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 		}
 		else
 		{
+			// TODO: Not necessary...
 			SetUidField(xfregs_numTexGen_numTexGens, xfregs.numTexGen.numTexGens);
 			for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
 				out.Write(",\n  in float%d uv%d : TEXCOORD%d", i < 4 ? 4 : 3 , i, i);
@@ -423,10 +415,20 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	}
 
 	// indirect texture map lookup
+	int nIndirectStagesUsed = 0;
+	if (bpmem.genMode.numindstages > 0)
+	{
+		for (unsigned int i = 0; i < numStages; ++i)
+		{
+			if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages)
+				nIndirectStagesUsed |= 1 << bpmem.tevind[i].bt;
+		}
+	}
+
 	SetUidField(nIndirectStagesUsed, nIndirectStagesUsed);
 	for(u32 i = 0; i < bpmem.genMode.numindstages; ++i)
 	{
-		if (nIndirectStagesUsed & (1<<i))
+		if (nIndirectStagesUsed & (1 << i))
 		{
 			unsigned int texcoord = bpmem.tevindref.getTexCoord(i);
 			unsigned int texmap = bpmem.tevindref.getTexMap(i);
@@ -506,6 +508,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 		out.Write("prev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n");
 
 	AlphaTest::TEST_RESULT Pretest = bpmem.alpha_test.TestResult();
+	SetUidField(Pretest, Pretest);
 	if (Pretest == AlphaTest::UNDETERMINED)
 		WriteAlphaTest<T, type>(out, ApiType, dstAlphaMode);
 
@@ -514,8 +517,13 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	out.Write("float zCoord = " I_ZBIAS"[1].x + (clipPos.z / clipPos.w) * " I_ZBIAS"[1].y;\n");
 
 	// Note: depth textures are disabled if early depth test is enabled
+	SetUidField(Pretest, Pretest);
+	SetUidField(ztex.op, bpmem.ztex2.op);
+	SetUidField(early_z, bpmem.zcontrol.early_ztest);
+	SetUidField(ztestenable, bpmem.zmode.testenable);
 	if (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable)
 	{
+		// TODO: Implement type??
 		// use the texture input of the last texture stage (textemp), hopefully this has been read and is in correct format...
 		out.SetConstantsUsed(C_ZBIAS, C_ZBIAS+1);
 		out.Write("zCoord = dot(" I_ZBIAS"[0].xyzw, textemp.xyzw) + " I_ZBIAS"[1].w %s;\n",
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 221b04612e..c1c210dce6 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -20,6 +20,7 @@
 
 #include "VideoCommon.h"
 #include "ShaderGenCommon.h"
+#include "BPMemory.h"
 
 #define I_COLORS      "color"
 #define I_KCOLORS     "k"
@@ -54,18 +55,11 @@ enum DSTALPHA_MODE
 	DSTALPHA_DUAL_SOURCE_BLEND // Use dual-source blending
 };
 
-enum ALPHA_PRETEST_RESULT
-{
-	ALPHAPT_UNDEFINED, // AlphaTest Result is not defined
-	ALPHAPT_ALWAYSFAIL, // Alpha test alway Fail
-	ALPHAPT_ALWAYSPASS // Alpha test alway Pass
-};
-
 struct pixel_shader_uid_data
 {
 	u32 components;
 	DSTALPHA_MODE dstAlphaMode; // TODO: as u32 :2
-	ALPHA_PRETEST_RESULT Pretest; // TODO: As :2
+	AlphaTest::TEST_RESULT Pretest; // TODO: As :2
 	u32 nIndirectStagesUsed : 8;
 	struct {
         u32 numtexgens : 4;
@@ -168,6 +162,15 @@ struct pixel_shader_uid_data
 		u32 hex : 4;
 	} fog;
 
+	union {
+		struct {
+			u32 op : 2;
+		};
+		u32 hex : 2;
+	} ztex;
+
+	u32 early_z : 1;
+	u32 ztestenable : 1;
 
 	u32 bHasIndStage : 16;
 

From 30f1a4b4fe154bb6e58dda9d3d1c8bfb4bd822d7 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Tue, 26 Mar 2013 18:07:42 +0100
Subject: [PATCH 011/352] Partially revert "Now CG plays nice with this new
 stuff."

This reverts commit 3943840d5c422af45941a96e6d4407d59380b39d.

Suppport for old GLSL versions has been dropped, so to make things less ugly we can use a structure for lights again.
---
 .../VideoCommon/Src/LightingShaderGen.cpp     | 26 +++++++++----------
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   |  3 ++-
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  |  5 ++--
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.cpp b/Source/Core/VideoCommon/Src/LightingShaderGen.cpp
index 2b717bdba6..2cb52004a9 100644
--- a/Source/Core/VideoCommon/Src/LightingShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/LightingShaderGen.cpp
@@ -47,13 +47,13 @@ char *GenerateLightShader(char *p, int index, const LitChannel& chan, const char
 		// atten disabled
 		switch (chan.diffusefunc) {
 			case LIGHTDIF_NONE:
-				WRITE(p, "lacc.%s += %s[%d].%s;\n", swizzle, lightsName, index * 5, swizzle);
+				WRITE(p, "lacc.%s += %s[%d].col.%s;\n", swizzle, lightsName, index, swizzle);
 				break;
 			case LIGHTDIF_SIGN:
 			case LIGHTDIF_CLAMP:
-				WRITE(p, "ldir = normalize(%s[%d + 3].xyz - pos.xyz);\n", lightsName, index * 5);
-				WRITE(p, "lacc.%s += %sdot(ldir, _norm0)) * %s[%d].%s;\n",
-					swizzle, chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(", lightsName, index * 5, swizzle);
+				WRITE(p, "ldir = normalize(%s[%d].pos.xyz - pos.xyz);\n", lightsName, index);
+				WRITE(p, "lacc.%s += %sdot(ldir, _norm0)) * %s[%d].col.%s;\n",
+					swizzle, chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(", lightsName, index, swizzle);
 				break;
 			default: _assert_(0);
 		}
@@ -62,32 +62,32 @@ char *GenerateLightShader(char *p, int index, const LitChannel& chan, const char
 		
 		if (chan.attnfunc == 3) 
 		{ // spot
-			WRITE(p, "ldir = %s[%d + 3].xyz - pos.xyz;\n", lightsName, index * 5);
+			WRITE(p, "ldir = %s[%d].pos.xyz - pos.xyz;\n", lightsName, index);
 			WRITE(p, "dist2 = dot(ldir, ldir);\n"
 				"dist = sqrt(dist2);\n"
 				"ldir = ldir / dist;\n"
-				"attn = max(0.0f, dot(ldir, %s[%d + 4].xyz));\n", lightsName, index * 5);
-			WRITE(p, "attn = max(0.0f, dot(%s[%d + 1].xyz, float3(1.0f, attn, attn*attn))) / dot(%s[%d + 2].xyz, float3(1.0f,dist,dist2));\n", lightsName, index * 5, lightsName, index * 5);
+				"attn = max(0.0f, dot(ldir, %s[%d].dir.xyz));\n", lightsName, index);
+			WRITE(p, "attn = max(0.0f, dot(%s[%d].cosatt.xyz, float3(1.0f, attn, attn*attn))) / dot(%s[%d].distatt.xyz, float3(1.0f,dist,dist2));\n", lightsName, index, lightsName, index);
 		}
 		else if (chan.attnfunc == 1) 
 		{ // specular
-			WRITE(p, "ldir = normalize(%s[%d + 3].xyz);\n", lightsName, index * 5);
-			WRITE(p, "attn = (dot(_norm0,ldir) >= 0.0f) ? max(0.0f, dot(_norm0, %s[%d + 4].xyz)) : 0.0f;\n", lightsName, index * 5);
-			WRITE(p, "attn = max(0.0f, dot(%s[%d + 1].xyz, float3(1,attn,attn*attn))) / dot(%s[%d + 2].xyz, float3(1,attn,attn*attn));\n", lightsName, index * 5, lightsName, index * 5);
+			WRITE(p, "ldir = normalize(%s[%d].pos.xyz);\n", lightsName, index);
+			WRITE(p, "attn = (dot(_norm0,ldir) >= 0.0f) ? max(0.0f, dot(_norm0, %s[%d].dir.xyz)) : 0.0f;\n", lightsName, index);
+			WRITE(p, "attn = max(0.0f, dot(%s[%d].cosatt.xyz, float3(1,attn,attn*attn))) / dot(%s[%d].distatt.xyz, float3(1,attn,attn*attn));\n", lightsName, index, lightsName, index);
 		}
 
 		switch (chan.diffusefunc)
 		{
 			case LIGHTDIF_NONE:
-				WRITE(p, "lacc.%s += attn * %s[%d].%s;\n", swizzle, lightsName, index * 5, swizzle);
+				WRITE(p, "lacc.%s += attn * %s[%d].col.%s;\n", swizzle, lightsName, index, swizzle);
 				break;
 			case LIGHTDIF_SIGN:
 			case LIGHTDIF_CLAMP:
-				WRITE(p, "lacc.%s += attn * %sdot(ldir, _norm0)) * %s[%d].%s;\n",
+				WRITE(p, "lacc.%s += attn * %sdot(ldir, _norm0)) * %s[%d].col.%s;\n",
 					swizzle, 
 					chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(",
 					lightsName,
-					index * 5, 
+					index, 
 					swizzle);
 				break;
 			default: _assert_(0);
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index d863a6e0a9..d7e74a049d 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -590,7 +590,8 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 	WRITE(p, "\t%sfloat4 " I_FOG"[3] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_FOG));
 	
 	// For pixel lighting
-	WRITE(p, "\t%sfloat4 " I_PLIGHTS"[40] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_PLIGHTS));
+    WRITE(p, "struct Light { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; };\n");
+	WRITE(p, "\t%sLight " I_PLIGHTS"[8] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_PLIGHTS));
 	WRITE(p, "\t%sfloat4 " I_PMATERIALS"[4] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_PMATERIALS));
 		
 	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 2c0f5676ed..2410548397 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -192,7 +192,8 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE ApiType)
 	WRITE(p, "%sfloat4 " I_POSNORMALMATRIX"[6] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_POSNORMALMATRIX));
 	WRITE(p, "%sfloat4 " I_PROJECTION"[4] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_PROJECTION));	
 	WRITE(p, "%sfloat4 " I_MATERIALS"[4] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_MATERIALS));
-	WRITE(p, "%sfloat4 " I_LIGHTS"[40] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_LIGHTS));
+	WRITE(p, "struct Light { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; };\n");
+	WRITE(p, "%sLight " I_LIGHTS"[8] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_LIGHTS));
 	WRITE(p, "%sfloat4 " I_TEXMATRICES"[24] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_TEXMATRICES)); // also using tex matrices
 	WRITE(p, "%sfloat4 " I_TRANSFORMMATRICES"[64] %s;\n", WriteLocation(ApiType),WriteRegister(ApiType, "c", C_TRANSFORMMATRICES));
 	WRITE(p, "%sfloat4 " I_NORMALMATRICES"[32] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_NORMALMATRICES));
@@ -413,7 +414,7 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE ApiType)
 
 				if (components & (VB_HAS_NRM1|VB_HAS_NRM2)) {
 					// transform the light dir into tangent space
-					WRITE(p, "ldir = normalize(" I_LIGHTS"[%d + 3].xyz - pos.xyz);\n", texinfo.embosslightshift);
+					WRITE(p, "ldir = normalize(" I_LIGHTS"[%d].pos.xyz - pos.xyz);\n", texinfo.embosslightshift);
 					WRITE(p, "o.tex%d.xyz = o.tex%d.xyz + float3(dot(ldir, _norm1), dot(ldir, _norm2), 0.0f);\n", i, texinfo.embosssourceshift);
 				}
 				else

From b75a617d8a2e4307ed4af06669e92fc33f6af1df Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Tue, 26 Mar 2013 19:35:00 +0100
Subject: [PATCH 012/352] VertexShaderGen: De-uglify VS output structure
 writing

---
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  | 58 ++++++++++++-------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 2410548397..f647bd0280 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -131,33 +131,49 @@ static char text[16384];
 
 #define WRITE p+=sprintf
 
+char* DefineVSOutputStructMember(char* p, API_TYPE api_type, const char* type, const char* name, int var_index, const char* semantic, int semantic_index = -1)
+{
+	WRITE(p, "  %s %s", type, name);
+	if (var_index != -1)
+		WRITE(p, "%d", var_index);
+
+	if (api_type == API_OPENGL)
+		WRITE(p, ";\n");
+	else
+	{
+		if (semantic_index != -1)
+			WRITE(p, " : %s%d;\n", semantic, semantic_index);
+		else
+			WRITE(p, " : %s;\n", semantic);
+	}
+
+	return p;
+}
+
 char* GenerateVSOutputStruct(char* p, u32 components, API_TYPE ApiType)
 {
-	// GLSL makes this ugly
-	// TODO: Make pretty
 	WRITE(p, "struct VS_OUTPUT {\n");
-	WRITE(p, "  float4 pos %s POSITION;\n", ApiType == API_OPENGL ? ";//" : ":");
-	WRITE(p, "  float4 colors_0 %s COLOR0;\n", ApiType == API_OPENGL ? ";//" : ":");
-	WRITE(p, "  float4 colors_1 %s COLOR1;\n", ApiType == API_OPENGL ? ";//" : ":");
+	p = DefineVSOutputStructMember(p, ApiType, "float4", "pos", -1, "POSITION");
+	p = DefineVSOutputStructMember(p, ApiType, "float4", "colors_", 0, "COLOR", 0);
+	p = DefineVSOutputStructMember(p, ApiType, "float4", "colors_", 1, "COLOR", 1);
 
-	if (xfregs.numTexGen.numTexGens < 7) {
+	if (xfregs.numTexGen.numTexGens < 7)
+	{
 		for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
-			WRITE(p, "  float3 tex%d %s TEXCOORD%d;\n", i, ApiType == API_OPENGL ? ";//" : ":", i);
-		WRITE(p, "  float4 clipPos %s TEXCOORD%d;\n", ApiType == API_OPENGL ? ";//" : ":", xfregs.numTexGen.numTexGens);
+			p = DefineVSOutputStructMember(p, ApiType, "float3", "tex", i, "TEXCOORD", i);
+
+		p = DefineVSOutputStructMember(p, ApiType, "float4", "clipPos", -1, "TEXCOORD", xfregs.numTexGen.numTexGens);
+
 		if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-			WRITE(p, "  float4 Normal %s TEXCOORD%d;\n", ApiType == API_OPENGL ? ";//" : ":", xfregs.numTexGen.numTexGens + 1);
-	} else {
-		// clip position is in w of first 4 texcoords
-		if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
-		{
-			for (int i = 0; i < 8; ++i)
-				WRITE(p, "  float4 tex%d %s TEXCOORD%d;\n", i, ApiType == API_OPENGL? ";//" : ":", i);
-		}
-		else
-		{
-			for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
-				WRITE(p, "  float%d tex%d %s TEXCOORD%d;\n", i < 4 ? 4 : 3 , i, ApiType == API_OPENGL ? ";//" : ":", i);
-		}
+			p = DefineVSOutputStructMember(p, ApiType, "float4", "Normal", -1, "TEXCOORD", xfregs.numTexGen.numTexGens + 1);
+	}
+	else
+	{
+		// Store clip position in the w component of first 4 texcoords
+		bool ppl = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting;
+		int num_texcoords = ppl ? 8 : xfregs.numTexGen.numTexGens;
+		for (int i = 0; i < num_texcoords; ++i)
+			p = DefineVSOutputStructMember(p, ApiType, (ppl || i < 4) ? "float4" : "float3", "tex", i, "TEXCOORD", i);
 	}
 	WRITE(p, "};\n");
 

From 0e319432164ef0c906e947a2c54fa51739d00e7c Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Tue, 26 Mar 2013 23:03:10 +0100
Subject: [PATCH 013/352] ShaderGenCommon: Introduce a common shader generator
 interface to make stuff less confusing.

---
 Source/Core/VideoCommon/Src/ShaderGenCommon.h | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index e052066628..d02462360d 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -26,7 +26,18 @@
 #include <vector>
 
 template<class uid_data>
-class ShaderUid
+class ShaderGeneratorInterface
+{
+public:
+	void Write(const char* fmt, ...) {}
+	const char* GetBuffer() { return NULL; }
+	void SetBuffer(char* buffer) { }
+	inline void SetConstantsUsed(unsigned int first_index, unsigned int last_index) {}
+    uid_data& GetUidData() { return *(uid_data*)NULL; }
+};
+
+template<class uid_data>
+class ShaderUid : public ShaderGeneratorInterface<uid_data>
 {
 public:
 	ShaderUid()
@@ -35,11 +46,6 @@ public:
 		memset(values, 0, sizeof(values));
 	}
 
-	void Write(const char* fmt, ...) {}
-	const char* GetBuffer() { return NULL; }
-	void SetBuffer(char* buffer) { }
-	inline void SetConstantsUsed(unsigned int first_index, unsigned int last_index) {}
-
 	bool operator == (const ShaderUid& obj) const
 	{
 		return memcmp(this->values, obj.values, sizeof(values)) == 0;
@@ -70,7 +76,7 @@ private:
 
 // Needs to be a template for hacks...
 template<class uid_data>
-class ShaderCode
+class ShaderCode : public ShaderGeneratorInterface<uid_data>
 {
 public:
 	ShaderCode() : buf(NULL), write_ptr(NULL)
@@ -88,8 +94,6 @@ public:
 
 	const char* GetBuffer() { return buf; }
 	void SetBuffer(char* buffer) { buf = buffer; write_ptr = buffer; }
-	uid_data& GetUidData() { return *(uid_data*)NULL; }
-	inline void SetConstantsUsed(unsigned int first_index, unsigned int last_index) {}
 
 private:
 	const char* buf;
@@ -97,16 +101,11 @@ private:
 };
 
 template<class uid_data>
-class ShaderConstantProfile
+class ShaderConstantProfile : public ShaderGeneratorInterface<uid_data>
 {
 public:
 	ShaderConstantProfile(int num_constants) { constant_usage.resize(num_constants); }
 
-	void Write(const char* fmt, ...) {}
-	const char* GetBuffer() { return NULL; }
-	void SetBuffer(char* buffer) { }
-	uid_data& GetUidData() { return *(uid_data*)NULL; }
-
 	// has room for optimization (if it matters at all...)
 	void NumConstants() { return constant_usage.size(); }
 

From 364a5093d9e36a43de44c0aec735d0ee11e7a3bb Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Tue, 26 Mar 2013 23:21:08 +0100
Subject: [PATCH 014/352] ShaderGenCommon: Replace the GenOutput enum by using
 typeid instead.

---
 .../Core/VideoCommon/Src/LightingShaderGen.h  | 16 ++++----
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 41 ++++++++++---------
 Source/Core/VideoCommon/Src/ShaderGenCommon.h |  7 ----
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  | 15 +++----
 4 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.h b/Source/Core/VideoCommon/Src/LightingShaderGen.h
index 09b0cdc28f..5945bc09ca 100644
--- a/Source/Core/VideoCommon/Src/LightingShaderGen.h
+++ b/Source/Core/VideoCommon/Src/LightingShaderGen.h
@@ -18,15 +18,17 @@
 #ifndef _LIGHTINGSHADERGEN_H_
 #define _LIGHTINGSHADERGEN_H_
 
+#include <typeinfo>
+
 #include "ShaderGenCommon.h"
 #include "NativeVertexFormat.h"
 #include "XFMemory.h"
 
 // T.uid_data needs to have a struct named lighting_uid
-template<class T, GenOutput type>
+template<class T,class UidType>
 void GenerateLightShader(T& object, int index, int litchan_index, const char* lightsName, int coloralpha)
 {
-#define SetUidField(name, value) if (type == GO_ShaderUid) { object.GetUidData().name = value; };
+#define SetUidField(name, value) if (typeid(T) == typeid(UidType)) { object.GetUidData().name = value; };
 	const LitChannel& chan = (litchan_index > 1) ? xfregs.alpha[litchan_index-2] : xfregs.color[litchan_index];
 	const char* swizzle = "xyzw";
 	if (coloralpha == 1 ) swizzle = "xyz";
@@ -92,7 +94,7 @@ void GenerateLightShader(T& object, int index, int litchan_index, const char* li
 // materials name is I_MATERIALS in vs and I_PMATERIALS in ps
 // inColorName is color in vs and colors_ in ps
 // dest is o.colors_ in vs and colors_ in ps
-template<class T, GenOutput type>
+template<class T, class UidType>
 void GenerateLightingShader(T& object, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest)
 {
 	for (unsigned int j = 0; j < xfregs.numChan.numColorChans; j++)
@@ -186,7 +188,7 @@ void GenerateLightingShader(T& object, int components, const char* materialsName
 					{
 						if (mask & (1<<i))
 						{
-							GenerateLightShader<T,type>(object, i, j, lightsName, 3);
+							GenerateLightShader<T,UidType>(object, i, j, lightsName, 3);
 						}
 					}
 				}
@@ -196,9 +198,9 @@ void GenerateLightingShader(T& object, int components, const char* materialsName
 			for (int i = 0; i < 8; ++i)
 			{
 				if (!(mask&(1<<i)) && (color.GetFullLightMask() & (1<<i)))
-					GenerateLightShader<T,type>(object, i, j, lightsName, 1);
+					GenerateLightShader<T,UidType>(object, i, j, lightsName, 1);
 				if (!(mask&(1<<i)) && (alpha.GetFullLightMask() & (1<<i)))
-					GenerateLightShader<T,type>(object, i, j+2, lightsName, 2);
+					GenerateLightShader<T,UidType>(object, i, j+2, lightsName, 2);
 			}
 		}
 		else if (color.enablelighting || alpha.enablelighting)
@@ -212,7 +214,7 @@ void GenerateLightingShader(T& object, int components, const char* materialsName
 			for (int i = 0; i < 8; ++i)
 			{
 				if (workingchannel.GetFullLightMask() & (1<<i))
-					GenerateLightShader<T,type>(object, i, lit_index, lightsName, coloralpha);
+					GenerateLightShader<T,UidType>(object, i, lit_index, lightsName, coloralpha);
 			}
 		}
 		object.Write("%s%d = mat * saturate(lacc);\n", dest, j);
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 44023e2000..f22ef94c6d 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -19,6 +19,7 @@
 #include <cmath>
 #include <assert.h>
 #include <locale.h>
+#include <typeinfo>
 
 #include "LightingShaderGen.h"
 #include "PixelShaderGen.h"
@@ -37,10 +38,10 @@
 //   output is given by .outreg
 //   tevtemp is set according to swapmodetables and
 
-template<class T, GenOutput type> static void WriteStage(char *&p, int n, API_TYPE ApiType);
-template<class T, GenOutput type> static void SampleTexture(T& out, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType);
-template<class T, GenOutput type> static void WriteAlphaTest(T& out, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode, bool per_pixel_depth);
-template<class T, GenOutput type> static void WriteFog(T& out);
+template<class T> static void WriteStage(char *&p, int n, API_TYPE ApiType);
+template<class T> static void SampleTexture(T& out, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType);
+template<class T> static void WriteAlphaTest(T& out, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode, bool per_pixel_depth);
+template<class T> static void WriteFog(T& out);
 
 static const char *tevKSelTableC[] = // KCSEL
 {
@@ -266,13 +267,13 @@ const char *WriteLocation(API_TYPE ApiType)
 	return result;
 }
 
-template<class T, GenOutput type>
+template<class T>
 void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
 	// TODO: Can be optimized if using alpha pass
-#define SetUidField(name, value) if (type == GO_ShaderUid) {out.GetUidData().name = value; };
-#define OR_UidField(name, value) if (type == GO_ShaderUid) {out.GetUidData().name |= value; };
-	if (type == GO_ShaderCode)
+#define SetUidField(name, value) if (typeid(T) == typeid(PixelShaderUid)) {out.GetUidData().name = value; };
+#define OR_UidField(name, value) if (typeid(T) == typeid(PixelShaderUid)) {out.GetUidData().name |= value; };
+	if (typeid(T) == typeid(PixelShaderCode))
 	{
 		setlocale(LC_NUMERIC, "C"); // Reset locale for compilation
 		out.SetBuffer(text);
@@ -558,7 +559,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 
 			char buffer[32];
 			sprintf(buffer, "float3 indtex%d", i);
-			SampleTexture<T, type>(out, buffer, "tempcoord", "abg", texmap, ApiType);
+			SampleTexture<T>(out, buffer, "tempcoord", "abg", texmap, ApiType);
 		}
 	}
 
@@ -575,7 +576,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	// Uid fields for BuildSwapModeTable are set in WriteStage
 	BuildSwapModeTable();
 	for (unsigned int i = 0; i < numStages; i++)
-		WriteStage<T, type>(out, i, ApiType); // build the equation for this stage
+		WriteStage<T>(out, i, ApiType); // build the equation for this stage
 
 	if (numStages)
 	{
@@ -604,7 +605,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	AlphaTest::TEST_RESULT Pretest = bpmem.alpha_test.TestResult();
 	SetUidField(Pretest, Pretest);
 	if (Pretest == AlphaTest::UNDETERMINED)
-		WriteAlphaTest<T, type>(out, ApiType, dstAlphaMode, per_pixel_depth);
+		WriteAlphaTest<T>(out, ApiType, dstAlphaMode, per_pixel_depth);
 
 	
 	// the screen space depth value = far z + (clip z / clip w) * z range
@@ -648,7 +649,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	}
 	else
 	{
-		WriteFog<T, type>(out);
+		WriteFog<T>(out);
 		out.Write("\tocol0 = prev;\n");
 	}
 
@@ -716,7 +717,7 @@ static const char *TEVCMPAlphaOPTable[16] =
 };
 
 
-template<class T, GenOutput type>
+template<class T>
 static void WriteStage(T& out, int n, API_TYPE ApiType)
 {
 	int texcoord = bpmem.tevorders[n/2].getTexCoord(n&1);
@@ -865,7 +866,7 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 
 		char *texswap = swapModeTable[bpmem.combiners[n].alphaC.tswap];
 		int texmap = bpmem.tevorders[n/2].getTexMap(n&1);
-		SampleTexture<T, type>(out, "textemp", "tevcoord", texswap, texmap, ApiType);
+		SampleTexture<T>(out, "textemp", "tevcoord", texswap, texmap, ApiType);
 	}
 	else
 		out.Write("textemp = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
@@ -1090,7 +1091,7 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 	out.Write("// TEV done\n");
 }
 
-template<class T, GenOutput type>
+template<class T>
 void SampleTexture(T& out, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType)
 {
 	out.SetConstantsUsed(C_TEXDIMS+texmap,C_TEXDIMS+texmap);
@@ -1120,7 +1121,7 @@ static const char *tevAlphaFunclogicTable[] =
 	" == "  // xnor
 };
 
-template<class T, GenOutput type>
+template<class T>
 static void WriteAlphaTest(T& out, API_TYPE ApiType, DSTALPHA_MODE dstAlphaMode, bool per_pixel_depth)
 {
 	static const char *alphaRef[2] =
@@ -1188,7 +1189,7 @@ static const char *tevFogFuncsTable[] =
 	"\tfog = 1.0f - fog;\n   fog = pow(2.0f, -8.0f * fog * fog);\n"	//backward exp2
 };
 
-template<class T, GenOutput type>
+template<class T>
 static void WriteFog(T& out)
 {
 	SetUidField(fog.fsel, bpmem.fog.c_proj_fsel.fsel);
@@ -1240,16 +1241,16 @@ static void WriteFog(T& out)
 
 void GetPixelShaderUid(PixelShaderUid& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
-	GeneratePixelShader<PixelShaderUid, GO_ShaderUid>(object, dstAlphaMode, ApiType, components);
+	GeneratePixelShader<PixelShaderUid>(object, dstAlphaMode, ApiType, components);
 }
 
 void GeneratePixelShaderCode(PixelShaderCode& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
-	GeneratePixelShader<PixelShaderCode, GO_ShaderCode>(object, dstAlphaMode, ApiType, components);
+	GeneratePixelShader<PixelShaderCode>(object, dstAlphaMode, ApiType, components);
 }
 
 void GetPixelShaderConstantProfile(PixelShaderConstantProfile& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
-	GeneratePixelShader<PixelShaderConstantProfile, GO_ShaderCode>(object, dstAlphaMode, ApiType, components);
+	GeneratePixelShader<PixelShaderConstantProfile>(object, dstAlphaMode, ApiType, components);
 }
 
diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index d02462360d..8606a4e5b9 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -123,11 +123,4 @@ private:
 	std::vector<bool> constant_usage; // TODO: Is vector<bool> appropriate here?
 };
 
-enum GenOutput
-{
-	GO_ShaderCode,
-	GO_ShaderUid,
-	GO_ShaderConstantProfile,
-};
-
 #endif // _SHADERGENCOMMON_H
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 2ea5ef5d7f..3e2daf55d3 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -17,6 +17,7 @@
 
 #include <math.h>
 #include <locale.h>
+#include <typeinfo>
 
 #include "NativeVertexFormat.h"
 
@@ -80,13 +81,13 @@ void GenerateVSOutputStruct(T& object, u32 components, API_TYPE api_type)
 extern const char *WriteRegister(API_TYPE api_type, const char *prefix, const u32 num);
 extern const char *WriteLocation(API_TYPE api_type);
 
-template<class T, GenOutput type>
+template<class T>
 void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 {
 #undef SetUidField
-#define SetUidField(name, value) if (type == GO_ShaderUid) {out.GetUidData().name = value; };
+#define SetUidField(name, value) if (typeid(T) == typeid(VertexShaderUid)) {out.GetUidData().name = value; };
 
-	if (type == GO_ShaderCode)
+	if (typeid(T) == typeid(VertexShaderCode))
 	{
 		out.SetBuffer(text);
 		setlocale(LC_NUMERIC, "C"); // Reset locale for compilation
@@ -275,7 +276,7 @@ void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 	}
 
 	// TODO: This probably isn't necessary if pixel lighting is enabled.
-	GenerateLightingShader<T,type>(out, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_");
+	GenerateLightingShader<T,VertexShaderUid>(out, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_");
 
 	if (xfregs.numChan.numColorChans < 2)
 	{
@@ -522,16 +523,16 @@ void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 
 ///	if (text[sizeof(text) - 1] != 0x7C)
 ///		PanicAlert("VertexShader generator - buffer too small, canary has been eaten!");
-	if (type == GO_ShaderCode)
+	if (typeid(T) == typeid(VertexShaderCode))
 		setlocale(LC_NUMERIC, ""); // restore locale
 }
 
 void GetVertexShaderUid(VertexShaderUid& object, u32 components, API_TYPE api_type)
 {
-	GenerateVertexShader<VertexShaderUid, GO_ShaderUid>(object, components, api_type);
+	GenerateVertexShader<VertexShaderUid>(object, components, api_type);
 }
 
 void GenerateVertexShaderCode(VertexShaderCode& object, u32 components, API_TYPE api_type)
 {
-	GenerateVertexShader<VertexShaderCode, GO_ShaderCode>(object, components, api_type);
+	GenerateVertexShader<VertexShaderCode>(object, components, api_type);
 }

From 24ab51f9f618cea9260f5b432317f5ac95a538d6 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Tue, 26 Mar 2013 23:35:14 +0100
Subject: [PATCH 015/352] Fix Windows build, try 1.

---
 .../Plugin_VideoDX11/Src/PixelShaderCache.cpp | 23 +++++++-------
 .../Plugin_VideoDX11/Src/PixelShaderCache.h   |  7 ++---
 .../Src/VertexShaderCache.cpp                 | 24 +++++++--------
 .../Plugin_VideoDX11/Src/VertexShaderCache.h  |  7 ++---
 .../Plugin_VideoDX9/Src/PixelShaderCache.cpp  | 30 +++++++++----------
 .../Plugin_VideoDX9/Src/PixelShaderCache.h    |  7 ++---
 .../Plugin_VideoDX9/Src/VertexShaderCache.cpp | 25 ++++++++--------
 .../Plugin_VideoDX9/Src/VertexShaderCache.h   |  7 ++---
 8 files changed, 60 insertions(+), 70 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
index 56f3719057..f818c5df87 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
@@ -41,9 +41,9 @@ namespace DX11
 
 PixelShaderCache::PSCache PixelShaderCache::PixelShaders;
 const PixelShaderCache::PSCacheEntry* PixelShaderCache::last_entry;
-PIXELSHADERUID PixelShaderCache::last_uid;
+PixelShaderUid PixelShaderCache::last_uid;
 
-LinearDiskCache<PIXELSHADERUID, u8> g_ps_disk_cache;
+LinearDiskCache<PixelShaderUid, u8> g_ps_disk_cache;
 
 ID3D11PixelShader* s_ColorMatrixProgram[2] = {NULL};
 ID3D11PixelShader* s_ColorCopyProgram[2] = {NULL};
@@ -363,10 +363,10 @@ ID3D11Buffer* &PixelShaderCache::GetConstantBuffer()
 }
 
 // this class will load the precompiled shaders into our cache
-class PixelShaderCacheInserter : public LinearDiskCacheReader<PIXELSHADERUID, u8>
+class PixelShaderCacheInserter : public LinearDiskCacheReader<PixelShaderUid, u8>
 {
 public:
-	void Read(const PIXELSHADERUID &key, const u8 *value, u32 value_size)
+	void Read(const PixelShaderUid &key, const u8 *value, u32 value_size)
 	{
 		PixelShaderCache::InsertByteCode(key, value, value_size);
 	}
@@ -461,8 +461,8 @@ void PixelShaderCache::Shutdown()
 
 bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
 {
-	PIXELSHADERUID uid;
-	GetPixelShaderId(&uid, dstAlphaMode, components);
+	PixelShaderUid uid;
+	GetPixelShaderUid(uid, dstAlphaMode, components);
 
 	// Check if the shader is already set
 	if (last_entry)
@@ -470,7 +470,6 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
 		if (uid == last_uid)
 		{
 			GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE,true);
-			ValidatePixelShaderIDs(API_D3D11, last_entry->safe_uid, last_entry->code, dstAlphaMode, components);
 			return (last_entry->shader != NULL);
 		}
 	}
@@ -486,15 +485,15 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
 		last_entry = &entry;
 		
 		GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE,true);
-		ValidatePixelShaderIDs(API_D3D11, entry.safe_uid, entry.code, dstAlphaMode, components);
 		return (entry.shader != NULL);
 	}
 
 	// Need to compile a new shader
-	const char* code = GeneratePixelShaderCode(dstAlphaMode, API_D3D11, components);
+	PixelShaderCode code;
+	GeneratePixelShaderCode(code, dstAlphaMode, API_D3D11, components);
 
 	D3DBlob* pbytecode;
-	if (!D3D::CompilePixelShader(code, (unsigned int)strlen(code), &pbytecode))
+	if (!D3D::CompilePixelShader(code.GetBuffer(), (unsigned int)strlen(code.GetBuffer()), &pbytecode))
 	{
 		GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true);
 		return false;
@@ -508,7 +507,7 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
 
 	if (g_ActiveConfig.bEnableShaderDebugging && success)
 	{
-		PixelShaders[uid].code = code;
+		PixelShaders[uid].code = code.GetBuffer();
 		GetSafePixelShaderId(&PixelShaders[uid].safe_uid, dstAlphaMode, components);
 	}
 
@@ -516,7 +515,7 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
 	return success;
 }
 
-bool PixelShaderCache::InsertByteCode(const PIXELSHADERUID &uid, const void* bytecode, unsigned int bytecodelen)
+bool PixelShaderCache::InsertByteCode(const PixelShaderUid &uid, const void* bytecode, unsigned int bytecodelen)
 {
 	ID3D11PixelShader* shader = D3D::CreatePixelShaderFromByteCode(bytecode, bytecodelen);
 	if (shader == NULL)
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h
index 874a47e4c1..f08fa43142 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h
@@ -35,7 +35,7 @@ public:
 	static void Clear();
 	static void Shutdown();
 	static bool SetShader(DSTALPHA_MODE dstAlphaMode, u32 components); // TODO: Should be renamed to LoadShader
-	static bool InsertByteCode(const PIXELSHADERUID &uid, const void* bytecode, unsigned int bytecodelen);
+	static bool InsertByteCode(const PixelShaderUid &uid, const void* bytecode, unsigned int bytecodelen);
 
 	static ID3D11PixelShader* GetActiveShader() { return last_entry->shader; }
 	static ID3D11Buffer* &GetConstantBuffer();
@@ -54,18 +54,17 @@ private:
 	{
 		ID3D11PixelShader* shader;
 
-		PIXELSHADERUIDSAFE safe_uid;
 		std::string code;
 
 		PSCacheEntry() : shader(NULL) {}
 		void Destroy() { SAFE_RELEASE(shader); }
 	};
 
-	typedef std::map<PIXELSHADERUID, PSCacheEntry> PSCache;
+	typedef std::map<PixelShaderUid, PSCacheEntry> PSCache;
 
 	static PSCache PixelShaders;
 	static const PSCacheEntry* last_entry;
-	static PIXELSHADERUID last_uid;
+	static PixelShaderUid last_uid;
 };
 
 }  // namespace DX11
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp
index 6fdc815554..4ba720528e 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp
@@ -37,14 +37,14 @@ namespace DX11 {
 
 VertexShaderCache::VSCache VertexShaderCache::vshaders;
 const VertexShaderCache::VSCacheEntry *VertexShaderCache::last_entry;
-VERTEXSHADERUID VertexShaderCache::last_uid;
+VertexShaderUid VertexShaderCache::last_uid;
 
 static ID3D11VertexShader* SimpleVertexShader = NULL;
 static ID3D11VertexShader* ClearVertexShader = NULL;
 static ID3D11InputLayout* SimpleLayout = NULL;
 static ID3D11InputLayout* ClearLayout = NULL;
 
-LinearDiskCache<VERTEXSHADERUID, u8> g_vs_disk_cache;
+LinearDiskCache<VertexShaderUid, u8> g_vs_disk_cache;
 
 ID3D11VertexShader* VertexShaderCache::GetSimpleVertexShader() { return SimpleVertexShader; }
 ID3D11VertexShader* VertexShaderCache::GetClearVertexShader() { return ClearVertexShader; }
@@ -68,10 +68,10 @@ ID3D11Buffer* &VertexShaderCache::GetConstantBuffer()
 }
 
 // this class will load the precompiled shaders into our cache
-class VertexShaderCacheInserter : public LinearDiskCacheReader<VERTEXSHADERUID, u8>
+class VertexShaderCacheInserter : public LinearDiskCacheReader<VertexShaderUid, u8>
 {
 public:
-	void Read(const VERTEXSHADERUID &key, const u8 *value, u32 value_size)
+	void Read(const VertexShaderUid &key, const u8 *value, u32 value_size)
 	{
 		D3DBlob* blob = new D3DBlob(value_size, value);
 		VertexShaderCache::InsertByteCode(key, blob);
@@ -208,14 +208,13 @@ void VertexShaderCache::Shutdown()
 
 bool VertexShaderCache::SetShader(u32 components)
 {
-	VERTEXSHADERUID uid;
-	GetVertexShaderId(&uid, components);
+	VertexShaderUid uid;
+	GetVertexShaderUid(uid, components, API_D3D11);
 	if (last_entry)
 	{
 		if (uid == last_uid)
 		{
 			GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
-			ValidateVertexShaderIDs(API_D3D11, last_entry->safe_uid, last_entry->code, components);
 			return (last_entry->shader != NULL);
 		}
 	}
@@ -229,14 +228,14 @@ bool VertexShaderCache::SetShader(u32 components)
 		last_entry = &entry;
 
 		GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
-		ValidateVertexShaderIDs(API_D3D11, entry.safe_uid, entry.code, components);
 		return (entry.shader != NULL);
 	}
 
-	const char *code = GenerateVertexShaderCode(components, API_D3D11);
+	VertexShaderCode code;
+	GenerateVertexShaderCode(code, components, API_D3D11);
 
 	D3DBlob* pbytecode = NULL;
-	D3D::CompileVertexShader(code, (int)strlen(code), &pbytecode);
+	D3D::CompileVertexShader(code.GetBuffer(), (int)strlen(code.GetBuffer()), &pbytecode);
 
 	if (pbytecode == NULL)
 	{
@@ -250,15 +249,14 @@ bool VertexShaderCache::SetShader(u32 components)
 
 	if (g_ActiveConfig.bEnableShaderDebugging && success)
 	{
-		vshaders[uid].code = code;
-		GetSafeVertexShaderId(&vshaders[uid].safe_uid, components);
+		vshaders[uid].code = code.GetBuffer();
 	}
 
 	GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
 	return success;
 }
 
-bool VertexShaderCache::InsertByteCode(const VERTEXSHADERUID &uid, D3DBlob* bcodeblob)
+bool VertexShaderCache::InsertByteCode(const VertexShaderUid &uid, D3DBlob* bcodeblob)
 {
 	ID3D11VertexShader* shader = D3D::CreateVertexShaderFromByteCode(bcodeblob);
 	if (shader == NULL)
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h
index 6d9537606a..0c1dba790f 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h
@@ -44,7 +44,7 @@ public:
 	static ID3D11InputLayout* GetSimpleInputLayout();
 	static ID3D11InputLayout* GetClearInputLayout();
 
-	static bool VertexShaderCache::InsertByteCode(const VERTEXSHADERUID &uid, D3DBlob* bcodeblob);
+	static bool VertexShaderCache::InsertByteCode(const VertexShaderUid &uid, D3DBlob* bcodeblob);
 
 private:
 	struct VSCacheEntry
@@ -52,7 +52,6 @@ private:
 		ID3D11VertexShader* shader;
 		D3DBlob* bytecode; // needed to initialize the input layout
 
-		VERTEXSHADERUIDSAFE safe_uid;
 		std::string code;
 
 		VSCacheEntry() : shader(NULL), bytecode(NULL) {}
@@ -68,11 +67,11 @@ private:
 			SAFE_RELEASE(bytecode);
 		}
 	};
-	typedef std::map<VERTEXSHADERUID, VSCacheEntry> VSCache;
+	typedef std::map<VertexShaderUid, VSCacheEntry> VSCache;
 	
 	static VSCache vshaders;
 	static const VSCacheEntry* last_entry;
-	static VERTEXSHADERUID last_uid;
+	static VertexShaderUid last_uid;
 };
 
 }  // namespace DX11
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
index f66d096ab6..76beaa2c9f 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
@@ -43,9 +43,9 @@ namespace DX9
 
 PixelShaderCache::PSCache PixelShaderCache::PixelShaders;
 const PixelShaderCache::PSCacheEntry *PixelShaderCache::last_entry;
-PIXELSHADERUID PixelShaderCache::last_uid;
+PixelShaderUid PixelShaderCache::last_uid;
 
-static LinearDiskCache<PIXELSHADERUID, u8> g_ps_disk_cache;
+static LinearDiskCache<PixelShaderUid, u8> g_ps_disk_cache;
 static std::set<u32> unique_shaders;
 
 #define MAX_SSAA_SHADERS 3
@@ -67,10 +67,10 @@ static LPDIRECT3DPIXELSHADER9 s_ClearProgram = NULL;
 static LPDIRECT3DPIXELSHADER9 s_rgba6_to_rgb8 = NULL;
 static LPDIRECT3DPIXELSHADER9 s_rgb8_to_rgba6 = NULL;
 
-class PixelShaderCacheInserter : public LinearDiskCacheReader<PIXELSHADERUID, u8>
+class PixelShaderCacheInserter : public LinearDiskCacheReader<PixelShaderUid, u8>
 {
 public:
-	void Read(const PIXELSHADERUID &key, const u8 *value, u32 value_size)
+	void Read(const PixelShaderUid &key, const u8 *value, u32 value_size)
 	{
 		PixelShaderCache::InsertByteCode(key, value, value_size, false);
 	}
@@ -333,8 +333,8 @@ void PixelShaderCache::Shutdown()
 bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
 {
 	const API_TYPE api = ((D3D::GetCaps().PixelShaderVersion >> 8) & 0xFF) < 3 ? API_D3D9_SM20 : API_D3D9_SM30;
-	PIXELSHADERUID uid;
-	GetPixelShaderId(&uid, dstAlphaMode, components);
+	PixelShaderUid uid;
+	GetPixelShaderUid(uid, dstAlphaMode, components);
 
 	// Check if the shader is already set
 	if (last_entry)
@@ -342,7 +342,6 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
 		if (uid == last_uid)
 		{
 			GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true);
-			ValidatePixelShaderIDs(api, last_entry->safe_uid, last_entry->code, dstAlphaMode, components);
 			return last_entry->shader != NULL;
 		}
 	}
@@ -359,34 +358,34 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
 
 		if (entry.shader) D3D::SetPixelShader(entry.shader);
 		GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true);
-		ValidatePixelShaderIDs(api, entry.safe_uid, entry.code, dstAlphaMode, components);
 		return (entry.shader != NULL);
 	}
 
 
 	// Need to compile a new shader
-	const char *code = GeneratePixelShaderCode(dstAlphaMode, api, components);
+	PixelShaderCode code;
+	GeneratePixelShaderCode(code, dstAlphaMode, api, components);
 
 	if (g_ActiveConfig.bEnableShaderDebugging)
 	{
-		u32 code_hash = HashAdler32((const u8 *)code, strlen(code));
+		u32 code_hash = HashAdler32((const u8 *)code.GetBuffer(), strlen(code.GetBuffer()));
 		unique_shaders.insert(code_hash);
 		SETSTAT(stats.numUniquePixelShaders, unique_shaders.size());
 	}
 
 #if defined(_DEBUG) || defined(DEBUGFAST)
-	if (g_ActiveConfig.iLog & CONF_SAVESHADERS && code) {
+	if (g_ActiveConfig.iLog & CONF_SAVESHADERS) {
 		static int counter = 0;
 		char szTemp[MAX_PATH];
 		sprintf(szTemp, "%sps_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++);
 
-		SaveData(szTemp, code);
+		SaveData(szTemp, code.GetBuffer());
 	}
 #endif
 
 	u8 *bytecode = 0;
 	int bytecodelen = 0;
-	if (!D3D::CompilePixelShader(code, (int)strlen(code), &bytecode, &bytecodelen)) {
+	if (!D3D::CompilePixelShader(code.GetBuffer(), (int)strlen(code.GetBuffer()), &bytecode, &bytecodelen)) {
 		GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true);
 		return false;
 	}
@@ -400,15 +399,14 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
 
 	if (g_ActiveConfig.bEnableShaderDebugging && success)
 	{
-		PixelShaders[uid].code = code;
-		GetSafePixelShaderId(&PixelShaders[uid].safe_uid, dstAlphaMode, components);
+		PixelShaders[uid].code = code.GetBuffer();
 	}
 
 	GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true);
 	return success;
 }
 
-bool PixelShaderCache::InsertByteCode(const PIXELSHADERUID &uid, const u8 *bytecode, int bytecodelen, bool activate)
+bool PixelShaderCache::InsertByteCode(const PixelShaderUid &uid, const u8 *bytecode, int bytecodelen, bool activate)
 {
 	LPDIRECT3DPIXELSHADER9 shader = D3D::CreatePixelShaderFromByteCode(bytecode, bytecodelen);
 
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h
index c771984d36..96d2c29cd9 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h
@@ -41,7 +41,6 @@ private:
 		LPDIRECT3DPIXELSHADER9 shader;
 		bool owns_shader;
 
-		PIXELSHADERUIDSAFE safe_uid;
 		std::string code;
 
 		PSCacheEntry() : shader(NULL), owns_shader(true) {}
@@ -53,18 +52,18 @@ private:
 		}
 	};
 
-	typedef std::map<PIXELSHADERUID, PSCacheEntry> PSCache;
+	typedef std::map<PixelShaderUid, PSCacheEntry> PSCache;
 
 	static PSCache PixelShaders;
 	static const PSCacheEntry *last_entry;
-	static PIXELSHADERUID last_uid;
+	static PixelShaderUid last_uid;
 	static void Clear();
 
 public:
 	static void Init();
 	static void Shutdown();
 	static bool SetShader(DSTALPHA_MODE dstAlphaMode, u32 componets);
-	static bool InsertByteCode(const PIXELSHADERUID &uid, const u8 *bytecode, int bytecodelen, bool activate);
+	static bool InsertByteCode(const PixelShaderUid &uid, const u8 *bytecode, int bytecodelen, bool activate);
 	static LPDIRECT3DPIXELSHADER9 GetColorMatrixProgram(int SSAAMode);
 	static LPDIRECT3DPIXELSHADER9 GetColorCopyProgram(int SSAAMode);
 	static LPDIRECT3DPIXELSHADER9 GetDepthMatrixProgram(int SSAAMode, bool depthConversion);
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
index e392cf3de0..93685335ae 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
@@ -38,14 +38,14 @@ namespace DX9
 
 VertexShaderCache::VSCache VertexShaderCache::vshaders;
 const VertexShaderCache::VSCacheEntry *VertexShaderCache::last_entry;
-VERTEXSHADERUID VertexShaderCache::last_uid;
+VertexShaderUid VertexShaderCache::last_uid;
 
 #define MAX_SSAA_SHADERS 3
 
 static LPDIRECT3DVERTEXSHADER9 SimpleVertexShader[MAX_SSAA_SHADERS];
 static LPDIRECT3DVERTEXSHADER9 ClearVertexShader;
 
-LinearDiskCache<VERTEXSHADERUID, u8> g_vs_disk_cache;
+LinearDiskCache<VertexShaderUid, u8> g_vs_disk_cache;
 
 LPDIRECT3DVERTEXSHADER9 VertexShaderCache::GetSimpleVertexShader(int level)
 {
@@ -58,10 +58,10 @@ LPDIRECT3DVERTEXSHADER9 VertexShaderCache::GetClearVertexShader()
 }
 
 // this class will load the precompiled shaders into our cache
-class VertexShaderCacheInserter : public LinearDiskCacheReader<VERTEXSHADERUID, u8>
+class VertexShaderCacheInserter : public LinearDiskCacheReader<VertexShaderUid, u8>
 {
 public:
-	void Read(const VERTEXSHADERUID &key, const u8 *value, u32 value_size)
+	void Read(const VertexShaderUid &key, const u8 *value, u32 value_size)
 	{
 		VertexShaderCache::InsertByteCode(key, value, value_size, false);
 	}
@@ -188,14 +188,13 @@ void VertexShaderCache::Shutdown()
 
 bool VertexShaderCache::SetShader(u32 components)
 {
-	VERTEXSHADERUID uid;
-	GetVertexShaderId(&uid, components);
+	VertexShaderUid uid;
+	GetVertexShaderUid(uid, components);
 	if (last_entry)
 	{
 		if (uid == last_uid)
 		{
 			GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
-			ValidateVertexShaderIDs(API_D3D9, last_entry->safe_uid, last_entry->code, components);
 			return (last_entry->shader != NULL);
 		}
 	}
@@ -210,14 +209,15 @@ bool VertexShaderCache::SetShader(u32 components)
 
 		if (entry.shader) D3D::SetVertexShader(entry.shader);
 		GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
-		ValidateVertexShaderIDs(API_D3D9, entry.safe_uid, entry.code, components);
 		return (entry.shader != NULL);
 	}
 
-	const char *code = GenerateVertexShaderCode(components, API_D3D9);
+	VertexShaderCode code;
+	GenerateVertexShaderCode(code, components, API_D3D9);
+
 	u8 *bytecode;
 	int bytecodelen;
-	if (!D3D::CompileVertexShader(code, (int)strlen(code), &bytecode, &bytecodelen))
+	if (!D3D::CompileVertexShader(code.GetBuffer(), (int)strlen(code.GetBuffer()), &bytecode, &bytecodelen))
 	{
 		GFX_DEBUGGER_PAUSE_AT(NEXT_ERROR, true);
 		return false;
@@ -227,15 +227,14 @@ bool VertexShaderCache::SetShader(u32 components)
 	bool success = InsertByteCode(uid, bytecode, bytecodelen, true);
 	if (g_ActiveConfig.bEnableShaderDebugging && success)
 	{
-		vshaders[uid].code = code;
-		GetSafeVertexShaderId(&vshaders[uid].safe_uid, components);
+		vshaders[uid].code = code.GetBuffer();
 	}
 	delete [] bytecode;
 	GFX_DEBUGGER_PAUSE_AT(NEXT_VERTEX_SHADER_CHANGE, true);
 	return success;
 }
 
-bool VertexShaderCache::InsertByteCode(const VERTEXSHADERUID &uid, const u8 *bytecode, int bytecodelen, bool activate) {
+bool VertexShaderCache::InsertByteCode(const VertexShaderUid &uid, const u8 *bytecode, int bytecodelen, bool activate) {
 	LPDIRECT3DVERTEXSHADER9 shader = D3D::CreateVertexShaderFromByteCode(bytecode, bytecodelen);
 
 	// Make an entry in the table
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h
index c9c447e35b..9b6ff0d863 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h
@@ -36,7 +36,6 @@ private:
 		LPDIRECT3DVERTEXSHADER9 shader;
 
 		std::string code;
-		VERTEXSHADERUIDSAFE safe_uid;
 
 		VSCacheEntry() : shader(NULL) {}
 		void Destroy()
@@ -47,11 +46,11 @@ private:
 		}
 	};
 
-	typedef std::map<VERTEXSHADERUID, VSCacheEntry> VSCache;
+	typedef std::map<VertexShaderUid, VSCacheEntry> VSCache;
 
 	static VSCache vshaders;
 	static const VSCacheEntry *last_entry;
-	static VERTEXSHADERUID last_uid;
+	static VertexShaderUid last_uid;
 	static void Clear();
 
 public:
@@ -60,7 +59,7 @@ public:
 	static bool SetShader(u32 components);
 	static LPDIRECT3DVERTEXSHADER9 GetSimpleVertexShader(int level);
 	static LPDIRECT3DVERTEXSHADER9 GetClearVertexShader();	
-	static bool InsertByteCode(const VERTEXSHADERUID &uid, const u8 *bytecode, int bytecodelen, bool activate);
+	static bool InsertByteCode(const VertexShaderUid &uid, const u8 *bytecode, int bytecodelen, bool activate);
 
 	static std::string GetCurrentShaderCode();
 };

From 98362e5934d7c3dadbc8a4f5adc6dd523e535447 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Tue, 26 Mar 2013 23:44:41 +0100
Subject: [PATCH 016/352] Fix Windows build, try 2.

---
 Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp | 3 +--
 Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp    | 2 +-
 Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp  | 2 +-
 Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp     | 2 +-
 Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
index f818c5df87..7237603eab 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
@@ -462,7 +462,7 @@ void PixelShaderCache::Shutdown()
 bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
 {
 	PixelShaderUid uid;
-	GetPixelShaderUid(uid, dstAlphaMode, components);
+	GetPixelShaderUid(uid, dstAlphaMode, API_D3D11, components);
 
 	// Check if the shader is already set
 	if (last_entry)
@@ -508,7 +508,6 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
 	if (g_ActiveConfig.bEnableShaderDebugging && success)
 	{
 		PixelShaders[uid].code = code.GetBuffer();
-		GetSafePixelShaderId(&PixelShaders[uid].safe_uid, dstAlphaMode, components);
 	}
 
 	GFX_DEBUGGER_PAUSE_AT(NEXT_PIXEL_SHADER_CHANGE, true);
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
index da8c98e19e..36e2ed2a68 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
@@ -248,7 +248,7 @@ void VertexManager::vFlush()
 
 	// set global constants
 	VertexShaderManager::SetConstants();
-	PixelShaderManager::SetConstants();
+	PixelShaderManager::SetConstants(g_nativeVertexFmt->m_components);
 
 	bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate &&
 		bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
index 76beaa2c9f..7061ea8657 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
@@ -334,7 +334,7 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
 {
 	const API_TYPE api = ((D3D::GetCaps().PixelShaderVersion >> 8) & 0xFF) < 3 ? API_D3D9_SM20 : API_D3D9_SM30;
 	PixelShaderUid uid;
-	GetPixelShaderUid(uid, dstAlphaMode, components);
+	GetPixelShaderUid(uid, dstAlphaMode, API_D3D9, components);
 
 	// Check if the shader is already set
 	if (last_entry)
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
index 543a1b9ddc..d2fcd6164a 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
@@ -359,7 +359,7 @@ void VertexManager::vFlush()
 
 	// set global constants
 	VertexShaderManager::SetConstants();
-	PixelShaderManager::SetConstants();
+	PixelShaderManager::SetConstants(g_nativeVertexFmt->m_components);
 	u32 stride = g_nativeVertexFmt->GetVertexStride();
 	if (!PixelShaderCache::SetShader(DSTALPHA_NONE,g_nativeVertexFmt->m_components))
 	{
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
index 93685335ae..05e034cedf 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
@@ -189,7 +189,7 @@ void VertexShaderCache::Shutdown()
 bool VertexShaderCache::SetShader(u32 components)
 {
 	VertexShaderUid uid;
-	GetVertexShaderUid(uid, components);
+	GetVertexShaderUid(uid, components, API_D3D9);
 	if (last_entry)
 	{
 		if (uid == last_uid)

From f8d2936840482b9132a751466c3c056c5988fa9a Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Wed, 27 Mar 2013 00:13:23 +0100
Subject: [PATCH 017/352] Fix Windows build, try 3.

---
 .../Plugin_VideoDX11/Src/LineGeometryShader.cpp     | 13 +++++++------
 .../Plugin_VideoDX11/Src/PointGeometryShader.cpp    | 11 ++++++-----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp b/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp
index 3afd38a2e1..74c58e8d17 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp
@@ -182,11 +182,12 @@ bool LineGeometryShader::SetShader(u32 components, float lineWidth,
 	if (shaderIt == m_shaders.end())
 	{
 		// Generate new shader. Warning: not thread-safe.
-		static char code[16384];
-		char* p = code;
-		p = GenerateVSOutputStruct(p, components, API_D3D11);
-		p += sprintf(p, "\n%s", LINE_GS_COMMON);
-		
+		static char buffer[16384];
+		ShaderCode<u32> code;
+		code.SetBuffer(buffer);
+		GenerateVSOutputStruct(code, components, API_D3D11);
+		code.Write("\n%s", LINE_GS_COMMON);
+
 		std::stringstream numTexCoordsStream;
 		numTexCoordsStream << xfregs.numTexGen.numTexGens;
 		
@@ -198,7 +199,7 @@ bool LineGeometryShader::SetShader(u32 components, float lineWidth,
 			{ "NUM_TEXCOORDS", numTexCoordsStr.c_str() },
 			{ NULL, NULL }
 		};
-		ID3D11GeometryShader* newShader = D3D::CompileAndCreateGeometryShader(code, unsigned int(strlen(code)), macros);
+		ID3D11GeometryShader* newShader = D3D::CompileAndCreateGeometryShader(code.GetBuffer(), unsigned int(strlen(code.GetBuffer())), macros);
 		if (!newShader)
 		{
 			WARN_LOG(VIDEO, "Line geometry shader for components 0x%.08X failed to compile", components);
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp
index ad23786610..e6cea19ce9 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp
@@ -176,10 +176,11 @@ bool PointGeometryShader::SetShader(u32 components, float pointSize,
 	if (shaderIt == m_shaders.end())
 	{
 		// Generate new shader. Warning: not thread-safe.
-		static char code[16384];
-		char* p = code;
-		p = GenerateVSOutputStruct(p, components, API_D3D11);
-		p += sprintf(p, "\n%s", POINT_GS_COMMON);
+		static char buffer[16384];
+		ShaderCode<u32> code;
+		code.SetBuffer(buffer);
+		GenerateVSOutputStruct(code, components, API_D3D11);
+		code.Write("\n%s", POINT_GS_COMMON);
 		
 		std::stringstream numTexCoordsStream;
 		numTexCoordsStream << xfregs.numTexGen.numTexGens;
@@ -192,7 +193,7 @@ bool PointGeometryShader::SetShader(u32 components, float pointSize,
 			{ "NUM_TEXCOORDS", numTexCoordsStr.c_str() },
 			{ NULL, NULL }
 		};
-		ID3D11GeometryShader* newShader = D3D::CompileAndCreateGeometryShader(code, unsigned int(strlen(code)), macros);
+		ID3D11GeometryShader* newShader = D3D::CompileAndCreateGeometryShader(code.GetBuffer(), unsigned int(strlen(code.GetBuffer())), macros);
 		if (!newShader)
 		{
 			WARN_LOG(VIDEO, "Point geometry shader for components 0x%.08X failed to compile", components);

From 11fae2e1cbce03333bdceb613eb81953adae930b Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Wed, 27 Mar 2013 00:17:46 +0100
Subject: [PATCH 018/352] Fix Windows build, try 4.

---
 Source/Core/VideoCommon/Src/VertexShaderGen.cpp | 5 +++++
 Source/Core/VideoCommon/Src/VertexShaderGen.h   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 3e2daf55d3..88fe24f627 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -536,3 +536,8 @@ void GenerateVertexShaderCode(VertexShaderCode& object, u32 components, API_TYPE
 {
 	GenerateVertexShader<VertexShaderCode>(object, components, api_type);
 }
+
+void GenerateVSOutputStructForGS(ShaderCode<u32>& object, u32 components, API_TYPE api_type)
+{
+	GenerateVSOutputStruct<ShaderCode<u32> >(object, components, api_type);
+}
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h
index 3167229fe3..b6b176c806 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h
@@ -114,6 +114,6 @@ typedef ShaderCode<vertex_shader_uid_data> VertexShaderCode;
 
 void GetVertexShaderUid(VertexShaderUid& object, u32 components, API_TYPE api_type);
 void GenerateVertexShaderCode(VertexShaderCode& object, u32 components, API_TYPE api_type);
-
+void GenerateVSOutputStructForGS(ShaderCode<u32>& object, u32 components, API_TYPE api_type);
 
 #endif // GCOGL_VERTEXSHADER_H

From 45c70be83f2263c22377ac414809d85bb21e25cd Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Wed, 27 Mar 2013 00:20:25 +0100
Subject: [PATCH 019/352] Fix Windows build, try 5.

---
 Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp  | 2 +-
 Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp b/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp
index 74c58e8d17..f22ebef0df 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp
@@ -185,7 +185,7 @@ bool LineGeometryShader::SetShader(u32 components, float lineWidth,
 		static char buffer[16384];
 		ShaderCode<u32> code;
 		code.SetBuffer(buffer);
-		GenerateVSOutputStruct(code, components, API_D3D11);
+		GenerateVSOutputStructForGS(code, components, API_D3D11);
 		code.Write("\n%s", LINE_GS_COMMON);
 
 		std::stringstream numTexCoordsStream;
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp
index e6cea19ce9..5976c09ab9 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp
@@ -179,7 +179,7 @@ bool PointGeometryShader::SetShader(u32 components, float pointSize,
 		static char buffer[16384];
 		ShaderCode<u32> code;
 		code.SetBuffer(buffer);
-		GenerateVSOutputStruct(code, components, API_D3D11);
+		GenerateVSOutputStructForGS(code, components, API_D3D11);
 		code.Write("\n%s", POINT_GS_COMMON);
 		
 		std::stringstream numTexCoordsStream;

From a171525df6f0b0b43ebfc5330d9f21cfd6af298e Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Wed, 27 Mar 2013 01:33:27 +0100
Subject: [PATCH 020/352] Fix Windows crash.

---
 Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index f22ef94c6d..d20e6ca755 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -314,7 +314,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	{
 		// Declare samplers
 		for (int i = 0; i < 8; ++i)
-			out.Write("%s samp%d %s;\n", (ApiType == API_D3D11) ? "sampler" : "uniform sampler2D", (i==0)?"":",", i, WriteRegister(ApiType, "s", i));
+			out.Write("%s samp%d %s;\n", (ApiType == API_D3D11) ? "sampler" : "uniform sampler2D", i, WriteRegister(ApiType, "s", i));
 
 		if (ApiType == API_D3D11)
 		{

From f2a8fbb314aabb986e9f5711278272649a78b098 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Fri, 29 Mar 2013 14:51:54 +0100
Subject: [PATCH 021/352] PixelShaderGen: Slightly reduce the number of
 redundant shader compilations.

---
 Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 12 +++++++-----
 Source/Core/VideoCommon/Src/PixelShaderGen.h   |  5 ++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index d20e6ca755..6ee5a72994 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -289,7 +289,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	out.Write("//%i TEV stages, %i texgens, XXX IND stages\n",
 		numStages, numTexgen/*, bpmem.genMode.numindstages*/);
 
-	SetUidField(components, components);
+//	SetUidField(components, components); // TODO: Enable once per pixel lighting is implemented again
 	SetUidField(dstAlphaMode, dstAlphaMode);
 
 	SetUidField(genMode.numindstages, bpmem.genMode.numindstages);
@@ -620,8 +620,8 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 
 	// Note: depth textures are disabled if early depth test is enabled
 	SetUidField(ztex.op, bpmem.ztex2.op);
-	SetUidField(early_z, bpmem.zcontrol.early_ztest); // TODO: Should be per_pixel_depth instead...
-	SetUidField(ztestenable, bpmem.zmode.testenable); // TODO: Should be fog instead...
+	SetUidField(per_pixel_depth, per_pixel_depth);
+	SetUidField(fog.fsel, bpmem.fog.c_proj_fsel.fsel);
 
 	// depth texture can safely be ignored if the result won't be written to the depth buffer (early_ztest) and isn't used for fog either
 	bool skip_ztexture = !per_pixel_depth && !bpmem.fog.c_proj_fsel.fsel;
@@ -632,12 +632,13 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 		out.Write("zCoord = dot(" I_ZBIAS"[0].xyzw, textemp.xyzw) + " I_ZBIAS"[1].w %s;\n",
 									(bpmem.ztex2.op == ZTEXTURE_ADD) ? "+ zCoord" : "");
 
-		// scale to make result from frac correct
+		// U24 overflow emulation
 		out.Write("zCoord = zCoord * (16777215.0f/16777216.0f);\n");
 		out.Write("zCoord = frac(zCoord);\n");
 		out.Write("zCoord = zCoord * (16777216.0f/16777215.0f);\n");
+
 		// Note: depth texture output is only written to depth buffer if late depth test is used
-		// TODO: Should this be outside the ztex if-block?
+		// final depth value is used for fog calculation, though
 		if (per_pixel_depth)
 			out.Write("depth = zCoord;\n");
 	}
@@ -1167,6 +1168,7 @@ static void WriteAlphaTest(T& out, API_TYPE ApiType, DSTALPHA_MODE dstAlphaMode,
 	// when the alpha test fail. This is not a correct implementation because
 	// even if the depth test fails the fragment could be alpha blended, but
 	// we don't have a choice.
+	SetUidField(alpha_test.use_zcomploc_hack, bpmem.zcontrol.early_ztest && bpmem.zmode.updateenable);
 	if (!(bpmem.zcontrol.early_ztest && bpmem.zmode.updateenable))
 	{
 		out.Write("\t\tdiscard;\n");
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 4dc3e6c1e0..4f9cba0c37 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -163,6 +163,7 @@ struct pixel_shader_uid_data
 		u32 comp1 : 3;
 		u32 logic : 2;
 		// TODO: ref???
+		u32 use_zcomploc_hack : 1;
 	} alpha_test;
 
 	union {
@@ -182,9 +183,7 @@ struct pixel_shader_uid_data
 		u32 hex : 2;
 	} ztex;
 
-	u32 early_z : 1;
-	u32 ztestenable : 1;
-
+	u32 per_pixel_depth : 1;
 	u32 bHasIndStage : 16;
 
 	u32 xfregs_numTexGen_numTexGens : 4;

From 41c4108ce66d73b81c254165f18a23f72aabf09a Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Fri, 29 Mar 2013 14:54:44 +0100
Subject: [PATCH 022/352] OpenGL: Reimplement shader uid debugging.

---
 Source/Core/VideoCommon/Src/ShaderGenCommon.h |  5 ++
 .../Src/ProgramShaderCache.cpp                | 64 ++++++++++++++++++-
 2 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index 8606a4e5b9..d41a9c6c46 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -51,6 +51,11 @@ public:
 		return memcmp(this->values, obj.values, sizeof(values)) == 0;
 	}
 
+	bool operator != (const ShaderUid& obj) const
+	{
+		return memcmp(this->values, obj.values, sizeof(values)) != 0;
+	}
+
 	// TODO: Store last frame used and order by that? makes much more sense anyway...
 	bool operator < (const ShaderUid& obj) const
 	{
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index 53b0210919..6ce4e1e04c 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -23,6 +23,9 @@
 #include "ImageWrite.h"
 #include "Render.h"
 
+#include <algorithm>
+#include <type_traits>
+
 namespace OGL
 {
 
@@ -353,14 +356,71 @@ GLuint ProgramShaderCache::CompileSingleShader (GLuint type, const char* code )
 	return result;
 }
 
+template<class UidT> UidT GetPartialUid(const SHADERUID& uid);
+template<> PixelShaderUid GetPartialUid(const SHADERUID& uid) { return uid.puid; }
+template<> VertexShaderUid GetPartialUid(const SHADERUID& uid) { return uid.vuid; }
+
+template<class CodeT> const std::string& GetShaderCode(const SHADER& shader);
+template<> const std::string& GetShaderCode<PixelShaderCode>(const SHADER& shader) { return shader.strpprog; }
+template<> const std::string& GetShaderCode<VertexShaderCode>(const SHADER& shader) { return shader.strvprog; }
+
+template<class UidT, class CodeT>
+void CheckForUidMismatch(const ProgramShaderCache::PCache& cache, CodeT& new_code, const UidT& new_uid)
+{
+	static std::map<UidT,std::string> s_shaders;
+	static std::vector<UidT> s_uids;
+
+	bool uid_is_indexed = std::find(s_uids.begin(), s_uids.end(), new_uid) != s_uids.end();
+	if (!uid_is_indexed)
+	{
+		s_uids.push_back(new_uid);
+		s_shaders[new_uid] = new_code.GetBuffer();
+	}
+	else
+	{
+		// uid is already in the index => check if there's a shader with the same uid but different code
+		auto& old_code = s_shaders[new_uid];
+		if (strcmp(old_code.c_str(), new_code.GetBuffer()) != 0)
+		{
+			static int num_failures = 0;
+
+			char szTemp[MAX_PATH];
+			sprintf(szTemp, "%s%ssuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(),
+					std::is_same<UidT,PixelShaderUid>::value ? "p" : std::is_same<UidT,VertexShaderUid>::value ? "v" : "o",
+					++num_failures);
+
+			// TODO: Should also dump uids
+			std::ofstream file;
+			OpenFStream(file, szTemp, std::ios_base::out);
+			file << "Old shader code:\n" << old_code;
+			file << "\n\nNew shader code:\n" << new_code.GetBuffer();
+			file.close();
+
+			// TODO: Make this more idiot-proof
+			ERROR_LOG(VIDEO, "%s shader uid mismatch!",
+					  std::is_same<UidT,PixelShaderUid>::value ? "Pixel" : std::is_same<UidT,VertexShaderUid>::value ? "Vertex" : "Other");
+		}
+	}
+}
 
 
-void ProgramShaderCache::GetShaderId ( SHADERUID* uid, DSTALPHA_MODE dstAlphaMode, u32 components )
+void ProgramShaderCache::GetShaderId(SHADERUID* uid, DSTALPHA_MODE dstAlphaMode, u32 components)
 {
 	GetPixelShaderUid(uid->puid, dstAlphaMode, API_OPENGL, components);
 	GetVertexShaderUid(uid->vuid, components, API_OPENGL);
-}
 
+	if (g_ActiveConfig.bEnableShaderDebugging)
+	{
+		PixelShaderCode pcode;
+		VertexShaderCode vcode;
+
+		GeneratePixelShaderCode(pcode, dstAlphaMode, API_OPENGL, components);
+		GenerateVertexShaderCode(vcode, components, API_OPENGL);
+
+		CheckForUidMismatch<PixelShaderUid,PixelShaderCode>(pshaders, pcode, uid->puid);
+		CheckForUidMismatch<VertexShaderUid,VertexShaderCode>(pshaders, vcode, uid->vuid);
+	}
+}
 
 
 ProgramShaderCache::PCacheEntry ProgramShaderCache::GetShaderProgram(void)

From 4e9c3db545b2ff9dc4469f3440dc6caffd3f1832 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Fri, 29 Mar 2013 15:02:48 +0100
Subject: [PATCH 023/352] OSX build fix.

---
 Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index 6ce4e1e04c..79bcc1abbd 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -24,7 +24,7 @@
 #include "Render.h"
 
 #include <algorithm>
-#include <type_traits>
+#include <typeinfo>
 
 namespace OGL
 {
@@ -386,7 +386,7 @@ void CheckForUidMismatch(const ProgramShaderCache::PCache& cache, CodeT& new_cod
 
 			char szTemp[MAX_PATH];
 			sprintf(szTemp, "%s%ssuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(),
-					std::is_same<UidT,PixelShaderUid>::value ? "p" : std::is_same<UidT,VertexShaderUid>::value ? "v" : "o",
+					(typeid(UidT) == typeid(PixelShaderUid)) ? "p" : (typeid(UidT) == typeid(VertexShaderUid)) ? "v" : "o",
 					++num_failures);
 
 			// TODO: Should also dump uids
@@ -398,7 +398,7 @@ void CheckForUidMismatch(const ProgramShaderCache::PCache& cache, CodeT& new_cod
 
 			// TODO: Make this more idiot-proof
 			ERROR_LOG(VIDEO, "%s shader uid mismatch!",
-					  std::is_same<UidT,PixelShaderUid>::value ? "Pixel" : std::is_same<UidT,VertexShaderUid>::value ? "Vertex" : "Other");
+					  (typeid(UidT) == typeid(PixelShaderUid)) ? "Pixel" : (typeid(UidT) == typeid(VertexShaderUid)) ? "Vertex" : "Other");
 		}
 	}
 }

From b2517c0308e992c7e3c13e0fe17140e422ae770d Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Fri, 29 Mar 2013 15:08:00 +0100
Subject: [PATCH 024/352] More build fixes.

---
 Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h
index 615daa685d..b7b757172a 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h
@@ -90,6 +90,8 @@ public:
 		}
 	};
 
+	typedef std::map<SHADERUID, PCacheEntry> PCache;
+
 	static PCacheEntry GetShaderProgram(void);
 	static GLuint GetCurrentProgram(void);
 	static SHADER* SetShader(DSTALPHA_MODE dstAlphaMode, u32 components);
@@ -113,8 +115,6 @@ private:
 		void Read(const SHADERUID &key, const u8 *value, u32 value_size);
 	};
 
-	typedef std::map<SHADERUID, PCacheEntry> PCache;
-
 	static PCache pshaders;
 	static PCacheEntry* last_entry;
 	static SHADERUID last_uid;

From 3c02f227db1e02f233f3aac8dc42476bd0b17f7a Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Fri, 29 Mar 2013 20:33:28 +0100
Subject: [PATCH 025/352] PixelShaderManager: Disable constant cache (won't
 work in the non-UBO path of the opengl backend).

ShaderGen: Replace typeid usage with more general code.
---
 .../Core/VideoCommon/Src/LightingShaderGen.h  |  2 +-
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 15 ++++++------
 .../VideoCommon/Src/PixelShaderManager.cpp    | 24 +++++++++----------
 Source/Core/VideoCommon/Src/ShaderGenCommon.h |  5 ++--
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  | 12 ++++------
 .../Src/ProgramShaderCache.cpp                | 12 +++++-----
 6 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.h b/Source/Core/VideoCommon/Src/LightingShaderGen.h
index 5945bc09ca..a58809942a 100644
--- a/Source/Core/VideoCommon/Src/LightingShaderGen.h
+++ b/Source/Core/VideoCommon/Src/LightingShaderGen.h
@@ -28,7 +28,7 @@
 template<class T,class UidType>
 void GenerateLightShader(T& object, int index, int litchan_index, const char* lightsName, int coloralpha)
 {
-#define SetUidField(name, value) if (typeid(T) == typeid(UidType)) { object.GetUidData().name = value; };
+#define SetUidField(name, value) if (&object.GetUidData() != NULL) { object.GetUidData().name = value; };
 	const LitChannel& chan = (litchan_index > 1) ? xfregs.alpha[litchan_index-2] : xfregs.color[litchan_index];
 	const char* swizzle = "xyzw";
 	if (coloralpha == 1 ) swizzle = "xyz";
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 6ee5a72994..49b77274a8 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -19,7 +19,6 @@
 #include <cmath>
 #include <assert.h>
 #include <locale.h>
-#include <typeinfo>
 
 #include "LightingShaderGen.h"
 #include "PixelShaderGen.h"
@@ -271,13 +270,12 @@ template<class T>
 void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
 	// TODO: Can be optimized if using alpha pass
-#define SetUidField(name, value) if (typeid(T) == typeid(PixelShaderUid)) {out.GetUidData().name = value; };
-#define OR_UidField(name, value) if (typeid(T) == typeid(PixelShaderUid)) {out.GetUidData().name |= value; };
-	if (typeid(T) == typeid(PixelShaderCode))
-	{
+#define SetUidField(name, value) if (&out.GetUidData() != NULL) {out.GetUidData().name = value; };
+#define OR_UidField(name, value) if (&out.GetUidData() != NULL) {out.GetUidData().name |= value; };
+	out.SetBuffer(text);
+	if (out.GetBuffer() != NULL)
 		setlocale(LC_NUMERIC, "C"); // Reset locale for compilation
-		out.SetBuffer(text);
-	}
+
 ///	text[sizeof(text) - 1] = 0x7C;  // canary
 
 	unsigned int numStages = bpmem.genMode.numtevstages + 1;
@@ -669,7 +667,8 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 ///	if (text[sizeof(text) - 1] != 0x7C)
 ///		PanicAlert("PixelShader generator - buffer too small, canary has been eaten!");
 
-	setlocale(LC_NUMERIC, ""); // restore locale
+	if (out.GetBuffer() != NULL)
+		setlocale(LC_NUMERIC, ""); // restore locale
 }
 
 
diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
index 273d82ea7c..1aceafa17d 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
@@ -46,9 +46,9 @@ static float s_constant_cache[C_PENVCONST_END*4];
 
 inline void SetPSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4)
 {
-	if (s_constant_cache[const_number*4] == f1 && s_constant_cache[const_number*4+1] == f2 &&
-	    s_constant_cache[const_number*4+2] == f3 && s_constant_cache[const_number*4+3] == f4)
-		return;
+//	if (s_constant_cache[const_number*4] == f1 && s_constant_cache[const_number*4+1] == f2 &&
+//	    s_constant_cache[const_number*4+2] == f3 && s_constant_cache[const_number*4+3] == f4)
+//		return;
 
 	g_renderer->SetPSConstant4f(const_number, f1, f2, f3, f4);
 	s_constant_cache[const_number*4] = f1;
@@ -59,9 +59,9 @@ inline void SetPSConstant4f(unsigned int const_number, float f1, float f2, float
 
 inline void SetPSConstant4fv(unsigned int const_number, const float *f)
 {
-	if (s_constant_cache[const_number*4] == f[0] && s_constant_cache[const_number*4+1] == f[1] &&
-	    s_constant_cache[const_number*4+2] == f[2] && s_constant_cache[const_number*4+3] == f[3])
-		return;
+//	if (s_constant_cache[const_number*4] == f[0] && s_constant_cache[const_number*4+1] == f[1] &&
+//	    s_constant_cache[const_number*4+2] == f[2] && s_constant_cache[const_number*4+3] == f[3])
+//		return;
 
 	g_renderer->SetPSConstant4fv(const_number, f);
 	s_constant_cache[const_number*4] = f[0];
@@ -72,11 +72,11 @@ inline void SetPSConstant4fv(unsigned int const_number, const float *f)
 
 inline void SetMultiPSConstant4fv(unsigned int const_number, unsigned int count, const float *f)
 {
-	for (unsigned int i = 0; i < 4*count; ++i)
-		if (s_constant_cache[const_number*4+i] != f[i])
-			break;
-		else if (i == 4*count-1)
-			return;
+//	for (unsigned int i = 0; i < 4*count; ++i)
+//		if (s_constant_cache[const_number*4+i] != f[i])
+//			break;
+//		else if (i == 4*count-1)
+//			return;
 
 	g_renderer->SetMultiPSConstant4fv(const_number, count, f);
 	for (unsigned int i = 0; i < 4*count; ++i)
@@ -149,7 +149,7 @@ void PixelShaderManager::SetConstants(u32 components)
 	{
 		for (int i = 0; i < 8; ++i)
 		{
-            if (s_nTexDimsChanged & (1<<i) && constant_profile.ConstantIsUsed(C_TEXDIMS+i))
+            if ((s_nTexDimsChanged & (1<<i)) && constant_profile.ConstantIsUsed(C_TEXDIMS+i))
 			{
 				++necessary_updates;
 				SetPSTextureDims(i);
diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index d41a9c6c46..a2616e0a6c 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -33,7 +33,7 @@ public:
 	const char* GetBuffer() { return NULL; }
 	void SetBuffer(char* buffer) { }
 	inline void SetConstantsUsed(unsigned int first_index, unsigned int last_index) {}
-    uid_data& GetUidData() { return *(uid_data*)NULL; }
+	uid_data& GetUidData() { return *(uid_data*)NULL; } // TODO: can be moved out, just make this GetUidData<T> instead
 };
 
 template<class uid_data>
@@ -122,7 +122,8 @@ public:
 
 	inline bool ConstantIsUsed(unsigned int index)
 	{
-		return constant_usage[index];
+		return true;
+//		return constant_usage[index];
 	}
 private:
 	std::vector<bool> constant_usage; // TODO: Is vector<bool> appropriate here?
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 88fe24f627..869b84a4ed 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -17,7 +17,6 @@
 
 #include <math.h>
 #include <locale.h>
-#include <typeinfo>
 
 #include "NativeVertexFormat.h"
 
@@ -85,14 +84,11 @@ template<class T>
 void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 {
 #undef SetUidField
-#define SetUidField(name, value) if (typeid(T) == typeid(VertexShaderUid)) {out.GetUidData().name = value; };
+#define SetUidField(name, value) if (&out.GetUidData() != NULL) {out.GetUidData().name = value; };
 
-	if (typeid(T) == typeid(VertexShaderCode))
-	{
-		out.SetBuffer(text);
+	out.SetBuffer(text);
+	if (out.GetBuffer() != NULL)
 		setlocale(LC_NUMERIC, "C"); // Reset locale for compilation
-	}
-
 
 //	text[sizeof(text) - 1] = 0x7C;  // canary
 
@@ -523,7 +519,7 @@ void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 
 ///	if (text[sizeof(text) - 1] != 0x7C)
 ///		PanicAlert("VertexShader generator - buffer too small, canary has been eaten!");
-	if (typeid(T) == typeid(VertexShaderCode))
+	if (out.GetBuffer() != NULL)
 		setlocale(LC_NUMERIC, ""); // restore locale
 }
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index 79bcc1abbd..188145ebcf 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -201,9 +201,9 @@ SHADER* ProgramShaderCache::SetShader ( DSTALPHA_MODE dstAlphaMode, u32 componen
 			return &last_entry->shader;
 		}
 	}
-	
+
 	last_uid = uid;
-	
+
 	// Check if shader is already in cache
 	PCache::iterator iter = pshaders.find(uid);
 	if (iter != pshaders.end())
@@ -215,17 +215,17 @@ SHADER* ProgramShaderCache::SetShader ( DSTALPHA_MODE dstAlphaMode, u32 componen
 		last_entry->shader.Bind();
 		return &last_entry->shader;
 	}
-	
+
 	// Make an entry in the table
 	PCacheEntry& newentry = pshaders[uid];
 	last_entry = &newentry;
 	newentry.in_cache = 0;
-	
+
 	VertexShaderCode vcode;
 	PixelShaderCode pcode;
 	GenerateVertexShaderCode(vcode, components, API_OPENGL);
 	GeneratePixelShaderCode(pcode, dstAlphaMode, API_OPENGL, components);
-	
+
 	if (g_ActiveConfig.bEnableShaderDebugging)
 	{
 		newentry.shader.strvprog = vcode.GetBuffer();
@@ -260,7 +260,7 @@ bool ProgramShaderCache::CompileShader ( SHADER& shader, const char* vcode, cons
 {
 	GLuint vsid = CompileSingleShader(GL_VERTEX_SHADER, vcode);
 	GLuint psid = CompileSingleShader(GL_FRAGMENT_SHADER, pcode);
-	
+
 	if(!vsid || !psid)
 	{
 		glDeleteShader(vsid);

From 9eccd56ef08d1fd2d8a1e3b1d82d0c6f70347db2 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Fri, 29 Mar 2013 20:59:03 +0100
Subject: [PATCH 026/352] PixelShaderGen: Some cleanups.

---
 Source/Core/VideoCommon/Src/BPMemory.h        |  5 ++
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 47 ++++++++-----------
 .../VideoCommon/Src/PixelShaderManager.cpp    |  1 +
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/BPMemory.h b/Source/Core/VideoCommon/Src/BPMemory.h
index 1a29439b36..5154e2f5b0 100644
--- a/Source/Core/VideoCommon/Src/BPMemory.h
+++ b/Source/Core/VideoCommon/Src/BPMemory.h
@@ -157,6 +157,11 @@
 #define TEVALPHAARG_KONST 6
 #define TEVALPHAARG_ZERO 7
 
+#define GX_TEVPREV              0
+#define GX_TEVREG0              1
+#define GX_TEVREG1              2
+#define GX_TEVREG2              3
+
 #define ALPHACMP_NEVER 0
 #define ALPHACMP_LESS 1
 #define ALPHACMP_EQUAL 2
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 49b77274a8..982f139fea 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -269,7 +269,9 @@ const char *WriteLocation(API_TYPE ApiType)
 template<class T>
 void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
+	// TODO: Where does this TODO belong again...?
 	// TODO: Can be optimized if using alpha pass
+
 #define SetUidField(name, value) if (&out.GetUidData() != NULL) {out.GetUidData().name = value; };
 #define OR_UidField(name, value) if (&out.GetUidData() != NULL) {out.GetUidData().name |= value; };
 	out.SetBuffer(text);
@@ -915,7 +917,6 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 	|| cc.c == TEVCOLORARG_C0 || cc.c == TEVCOLORARG_A0
 	|| ac.a == TEVALPHAARG_A0 || ac.b == TEVALPHAARG_A0 || ac.c == TEVALPHAARG_A0)
 	{
-		// TODO: WTF?
 		out.SetConstantsUsed(C_COLORS+1,C_COLORS+1);
 		if(RegisterStates[1].AlphaNeedOverflowControl || RegisterStates[1].ColorNeedOverflowControl)
 		{
@@ -971,26 +972,19 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 	RegisterStates[cc.dest].ColorNeedOverflowControl = (cc.clamp == 0);
 	RegisterStates[cc.dest].AuxStored = false;
 
-/*	if (cc.d == TEVCOLORARG_C0 || cc.d == TEVCOLORARG_A0 || ac.d == TEVALPHAARG_A0)
-	{
+	if (cc.d == TEVCOLORARG_C0 || cc.d == TEVCOLORARG_A0 || ac.d == TEVALPHAARG_A0)
 		out.SetConstantsUsed(C_COLORS+1,C_COLORS+1);
-		// TODO: 11 bit signed overflow..
-	}
-	if (cc.d == TEVCOLORARG_C1 || cc.d == TEVCOLORARG_A1 || ac.d == TEVALPHAARG_A1)
-	{
-		out.SetConstantsUsed(C_COLORS+2,C_COLORS+2);
-		// TODO: 11 bit signed overflow..
-	}
-	if (cc.d == TEVCOLORARG_C2 || cc.d == TEVCOLORARG_A2 || ac.d == TEVALPHAARG_A2)
-	{
-		out.SetConstantsUsed(C_COLORS+3,C_COLORS+3);
-		// TODO: 11 bit signed overflow..
-	}*/
 
-	// TODO: Are there enums for this?
-	if (cc.dest >= 1 && cc.dest <= 3)
+	if (cc.d == TEVCOLORARG_C1 || cc.d == TEVCOLORARG_A1 || ac.d == TEVALPHAARG_A1)
+		out.SetConstantsUsed(C_COLORS+2,C_COLORS+2);
+
+	if (cc.d == TEVCOLORARG_C2 || cc.d == TEVCOLORARG_A2 || ac.d == TEVALPHAARG_A2)
+		out.SetConstantsUsed(C_COLORS+3,C_COLORS+3);
+
+	if (cc.dest >= GX_TEVREG0 && cc.dest <= GX_TEVREG2)
 		out.SetConstantsUsed(C_COLORS+cc.dest, C_COLORS+cc.dest);
-	if (ac.dest >= 1 && ac.dest <= 3)
+
+	if (ac.dest >= GX_TEVREG0 && ac.dest <= GX_TEVREG2)
 		out.SetConstantsUsed(C_COLORS+ac.dest, C_COLORS+ac.dest);
 
 	out.Write("// color combine\n");
@@ -1103,14 +1097,14 @@ void SampleTexture(T& out, const char *destination, const char *texcoords, const
 
 static const char *tevAlphaFuncsTable[] =
 {
-	"(false)",									//ALPHACMP_NEVER 0, TODO: Not safe?
-	"(prev.a <= %s - (0.25f/255.0f))",			//ALPHACMP_LESS 1
-	"(abs( prev.a - %s ) < (0.5f/255.0f))",		//ALPHACMP_EQUAL 2
-	"(prev.a < %s + (0.25f/255.0f))",			//ALPHACMP_LEQUAL 3
-	"(prev.a >= %s + (0.25f/255.0f))",			//ALPHACMP_GREATER 4
-	"(abs( prev.a - %s ) >= (0.5f/255.0f))",	//ALPHACMP_NEQUAL 5
-	"(prev.a > %s - (0.25f/255.0f))",			//ALPHACMP_GEQUAL 6
-	"(true)"									//ALPHACMP_ALWAYS 7
+	"(false)",									// NEVER
+	"(prev.a <= %s - (0.25f/255.0f))",			// LESS
+	"(abs( prev.a - %s ) < (0.5f/255.0f))",		// EQUAL
+	"(prev.a < %s + (0.25f/255.0f))",			// LEQUAL
+	"(prev.a >= %s + (0.25f/255.0f))",			// GREATER
+	"(abs( prev.a - %s ) >= (0.5f/255.0f))",	// NEQUAL
+	"(prev.a > %s - (0.25f/255.0f))",			// GEQUAL
+	"(true)"									// ALWAYS
 };
 
 static const char *tevAlphaFunclogicTable[] =
@@ -1132,7 +1126,6 @@ static void WriteAlphaTest(T& out, API_TYPE ApiType, DSTALPHA_MODE dstAlphaMode,
 
 	out.SetConstantsUsed(C_ALPHA, C_ALPHA);
 
-
 	// using discard then return works the same in cg and dx9 but not in dx11
 	out.Write("\tif(!( ");
 
diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
index 1aceafa17d..f63a1e59c6 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
@@ -419,6 +419,7 @@ void PixelShaderManager::SetPSTextureDims(int texid)
 // This one is high in profiles (0.5%).
 // TODO: Move conversion out, only store the raw color value
 // and update it when the shader constant is set, only.
+// TODO: Conversion should be checked in the context of tev_fixes..
 void PixelShaderManager::SetColorChanged(int type, int num, bool high)
 {
 	float *pf = &lastRGBAfull[type][num][0];

From e31c2aa6013d6a95358251610c15820a34e65a35 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Fri, 29 Mar 2013 21:53:57 +0100
Subject: [PATCH 027/352] ShaderGen: Cleanup uid data writing.

---
 .../Core/VideoCommon/Src/LightingShaderGen.h  |  50 +++----
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 141 +++++++++---------
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  |  38 ++---
 3 files changed, 116 insertions(+), 113 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.h b/Source/Core/VideoCommon/Src/LightingShaderGen.h
index a58809942a..e8b30d86a8 100644
--- a/Source/Core/VideoCommon/Src/LightingShaderGen.h
+++ b/Source/Core/VideoCommon/Src/LightingShaderGen.h
@@ -24,18 +24,17 @@
 #include "NativeVertexFormat.h"
 #include "XFMemory.h"
 
-// T.uid_data needs to have a struct named lighting_uid
-template<class T,class UidType>
-void GenerateLightShader(T& object, int index, int litchan_index, const char* lightsName, int coloralpha)
+// uid_data needs to have a struct named lighting_uid
+template<class T,class UidDataT>
+void GenerateLightShader(T& object, UidDataT& uid_data, int index, int litchan_index, const char* lightsName, int coloralpha)
 {
-#define SetUidField(name, value) if (&object.GetUidData() != NULL) { object.GetUidData().name = value; };
 	const LitChannel& chan = (litchan_index > 1) ? xfregs.alpha[litchan_index-2] : xfregs.color[litchan_index];
 	const char* swizzle = "xyzw";
 	if (coloralpha == 1 ) swizzle = "xyz";
 	else if (coloralpha == 2 ) swizzle = "w";
 
-	SetUidField(lit_chans[litchan_index].attnfunc, chan.attnfunc);
-	SetUidField(lit_chans[litchan_index].diffusefunc, chan.diffusefunc);
+	uid_data.lit_chans[litchan_index].attnfunc = chan.attnfunc;
+	uid_data.lit_chans[litchan_index].diffusefunc = chan.diffusefunc;
 	if (!(chan.attnfunc & 1)) {
 		// atten disabled
 		switch (chan.diffusefunc) {
@@ -94,8 +93,8 @@ void GenerateLightShader(T& object, int index, int litchan_index, const char* li
 // materials name is I_MATERIALS in vs and I_PMATERIALS in ps
 // inColorName is color in vs and colors_ in ps
 // dest is o.colors_ in vs and colors_ in ps
-template<class T, class UidType>
-void GenerateLightingShader(T& object, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest)
+template<class T, class UidDataT>
+void GenerateLightingShader(T& object, UidDataT& uid_data, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest)
 {
 	for (unsigned int j = 0; j < xfregs.numChan.numColorChans; j++)
 	{
@@ -104,7 +103,7 @@ void GenerateLightingShader(T& object, int components, const char* materialsName
 
 		object.Write("{\n");
 
-		SetUidField(lit_chans[j].matsource, xfregs.color[j].matsource);
+		uid_data.lit_chans[j].matsource = xfregs.color[j].matsource;
 		if (color.matsource) {// from vertex
 			if (components & (VB_HAS_COL0 << j))
 				object.Write("mat = %s%d;\n", inColorName, j);
@@ -116,9 +115,9 @@ void GenerateLightingShader(T& object, int components, const char* materialsName
 		else // from color
 			object.Write("mat = %s[%d];\n", materialsName, j+2);
 
-		SetUidField(lit_chans[j].enablelighting, xfregs.color[j].enablelighting);
+		uid_data.lit_chans[j].enablelighting = xfregs.color[j].enablelighting;
 		if (color.enablelighting) {
-			SetUidField(lit_chans[j].ambsource, xfregs.color[j].ambsource);
+			uid_data.lit_chans[j].ambsource = xfregs.color[j].ambsource;
 			if (color.ambsource) { // from vertex
 				if (components & (VB_HAS_COL0<<j) )
 					object.Write("lacc = %s%d;\n", inColorName, j);
@@ -136,7 +135,7 @@ void GenerateLightingShader(T& object, int components, const char* materialsName
 		}
 
 		// check if alpha is different
-		SetUidField(lit_chans[j+2].matsource, xfregs.alpha[j].matsource);
+		uid_data.lit_chans[j+2].matsource = xfregs.alpha[j].matsource;
 		if (alpha.matsource != color.matsource) {
 			if (alpha.matsource) {// from vertex
 				if (components & (VB_HAS_COL0<<j))
@@ -149,10 +148,10 @@ void GenerateLightingShader(T& object, int components, const char* materialsName
 				object.Write("mat.w = %s[%d].w;\n", materialsName, j+2);
 		}
 
-		SetUidField(lit_chans[j+2].enablelighting, xfregs.alpha[j].enablelighting);
+		uid_data.lit_chans[j+2].enablelighting = xfregs.alpha[j].enablelighting;
 		if (alpha.enablelighting)
 		{
-			SetUidField(lit_chans[j+2].ambsource, xfregs.alpha[j].ambsource);
+			uid_data.lit_chans[j+2].ambsource = xfregs.alpha[j].ambsource;
 			if (alpha.ambsource) {// from vertex
 				if (components & (VB_HAS_COL0<<j) )
 					object.Write("lacc.w = %s%d.w;\n", inColorName, j);
@@ -173,12 +172,12 @@ void GenerateLightingShader(T& object, int components, const char* materialsName
 		{
 			// both have lighting, test if they use the same lights
 			int mask = 0;
-			SetUidField(lit_chans[j].attnfunc, color.attnfunc);
-			SetUidField(lit_chans[j+2].attnfunc, alpha.attnfunc);
-			SetUidField(lit_chans[j].diffusefunc, color.diffusefunc);
-			SetUidField(lit_chans[j+2].diffusefunc, alpha.diffusefunc);
-			SetUidField(lit_chans[j].light_mask, color.GetFullLightMask());
-			SetUidField(lit_chans[j+2].light_mask, alpha.GetFullLightMask());
+			uid_data.lit_chans[j].attnfunc = color.attnfunc;
+			uid_data.lit_chans[j+2].attnfunc = alpha.attnfunc;
+			uid_data.lit_chans[j].diffusefunc = color.diffusefunc;
+			uid_data.lit_chans[j+2].diffusefunc = alpha.diffusefunc;
+			uid_data.lit_chans[j].light_mask = color.GetFullLightMask();
+			uid_data.lit_chans[j+2].light_mask = alpha.GetFullLightMask();
 			if(color.lightparams == alpha.lightparams)
 			{
 				mask = color.GetFullLightMask() & alpha.GetFullLightMask();
@@ -188,7 +187,7 @@ void GenerateLightingShader(T& object, int components, const char* materialsName
 					{
 						if (mask & (1<<i))
 						{
-							GenerateLightShader<T,UidType>(object, i, j, lightsName, 3);
+							GenerateLightShader<T,UidDataT>(object, uid_data, i, j, lightsName, 3);
 						}
 					}
 				}
@@ -198,9 +197,9 @@ void GenerateLightingShader(T& object, int components, const char* materialsName
 			for (int i = 0; i < 8; ++i)
 			{
 				if (!(mask&(1<<i)) && (color.GetFullLightMask() & (1<<i)))
-					GenerateLightShader<T,UidType>(object, i, j, lightsName, 1);
+					GenerateLightShader<T,UidDataT>(object, uid_data, i, j, lightsName, 1);
 				if (!(mask&(1<<i)) && (alpha.GetFullLightMask() & (1<<i)))
-					GenerateLightShader<T,UidType>(object, i, j+2, lightsName, 2);
+					GenerateLightShader<T,UidDataT>(object, uid_data, i, j+2, lightsName, 2);
 			}
 		}
 		else if (color.enablelighting || alpha.enablelighting)
@@ -210,17 +209,16 @@ void GenerateLightingShader(T& object, int components, const char* materialsName
 			const int lit_index = color.enablelighting ? j : (j+2);
 			int coloralpha = color.enablelighting ? 1 : 2;
 
-			SetUidField(lit_chans[lit_index].light_mask, workingchannel.GetFullLightMask());
+			uid_data.lit_chans[lit_index].light_mask = workingchannel.GetFullLightMask();
 			for (int i = 0; i < 8; ++i)
 			{
 				if (workingchannel.GetFullLightMask() & (1<<i))
-					GenerateLightShader<T,UidType>(object, i, lit_index, lightsName, coloralpha);
+					GenerateLightShader<T,UidDataT>(object, uid_data, i, lit_index, lightsName, coloralpha);
 			}
 		}
 		object.Write("%s%d = mat * saturate(lacc);\n", dest, j);
 		object.Write("}\n");
 	}
 }
-#undef SetUidField
 
 #endif // _LIGHTINGSHADERGEN_H_
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 982f139fea..d9d45902fe 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -37,10 +37,10 @@
 //   output is given by .outreg
 //   tevtemp is set according to swapmodetables and
 
-template<class T> static void WriteStage(char *&p, int n, API_TYPE ApiType);
+template<class T> static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE ApiType);
 template<class T> static void SampleTexture(T& out, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType);
-template<class T> static void WriteAlphaTest(T& out, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode, bool per_pixel_depth);
-template<class T> static void WriteFog(T& out);
+template<class T> static void WriteAlphaTest(T& out, pixel_shader_uid_data& uid_data, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode, bool per_pixel_depth);
+template<class T> static void WriteFog(T& out, pixel_shader_uid_data& uid_data);
 
 static const char *tevKSelTableC[] = // KCSEL
 {
@@ -272,13 +272,15 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	// TODO: Where does this TODO belong again...?
 	// TODO: Can be optimized if using alpha pass
 
-#define SetUidField(name, value) if (&out.GetUidData() != NULL) {out.GetUidData().name = value; };
-#define OR_UidField(name, value) if (&out.GetUidData() != NULL) {out.GetUidData().name |= value; };
+	// Non-uid template parameters will write to the dummy data (=> gets optimized out)
+	pixel_shader_uid_data dummy_data;
+	pixel_shader_uid_data& uid_data = (&out.GetUidData() != NULL) ? out.GetUidData() : dummy_data;
+
 	out.SetBuffer(text);
 	if (out.GetBuffer() != NULL)
 		setlocale(LC_NUMERIC, "C"); // Reset locale for compilation
 
-///	text[sizeof(text) - 1] = 0x7C;  // canary
+	text[sizeof(text) - 1] = 0x7C;  // canary
 
 	unsigned int numStages = bpmem.genMode.numtevstages + 1;
 	unsigned int numTexgen = bpmem.genMode.numtexgens;
@@ -289,12 +291,12 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	out.Write("//%i TEV stages, %i texgens, XXX IND stages\n",
 		numStages, numTexgen/*, bpmem.genMode.numindstages*/);
 
-//	SetUidField(components, components); // TODO: Enable once per pixel lighting is implemented again
-	SetUidField(dstAlphaMode, dstAlphaMode);
+//	uid_data.components = components; // TODO: Enable once per pixel lighting is implemented again
+	uid_data.dstAlphaMode = dstAlphaMode;
 
-	SetUidField(genMode.numindstages, bpmem.genMode.numindstages);
-	SetUidField(genMode.numtevstages, bpmem.genMode.numtevstages);
-	SetUidField(genMode.numtexgens, bpmem.genMode.numtexgens);
+	uid_data.genMode.numindstages = bpmem.genMode.numindstages;
+	uid_data.genMode.numtevstages = bpmem.genMode.numtevstages;
+	uid_data.genMode.numtexgens = bpmem.genMode.numtexgens;
 
 	if (ApiType == API_OPENGL)
 	{
@@ -461,7 +463,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 
 	if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
 	{
-		SetUidField(xfregs_numTexGen_numTexGens, xfregs.numTexGen.numTexGens);
+		uid_data.xfregs_numTexGen_numTexGens = xfregs.numTexGen.numTexGens;
 		if (xfregs.numTexGen.numTexGens < 7)
 		{
 			out.Write("\tfloat3 _norm0 = normalize(Normal.xyz);\n\n");
@@ -498,7 +500,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 		for (unsigned int i = 0; i < numTexgen; ++i)
 		{
 			// optional perspective divides
-			SetUidField(texMtxInfo[i].projection, xfregs.texMtxInfo[i].projection);
+			uid_data.texMtxInfo[i].projection = xfregs.texMtxInfo[i].projection;
 			if (xfregs.texMtxInfo[i].projection == XF_TEXPROJ_STQ)
 			{
 				out.Write("\tif (uv%d.z != 0.0f)", i);
@@ -520,7 +522,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 		}
 	}
 
-	SetUidField(nIndirectStagesUsed, nIndirectStagesUsed);
+	uid_data.nIndirectStagesUsed = nIndirectStagesUsed;
 	for (u32 i = 0; i < bpmem.genMode.numindstages; ++i)
 	{
 		if (nIndirectStagesUsed & (1 << i))
@@ -531,23 +533,23 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 			/// TODO: Cleanup...
 			if (i == 0)
 			{
-				SetUidField(tevindref.bc0, texcoord);
-				SetUidField(tevindref.bi0, texmap);
+				uid_data.tevindref.bc0 = texcoord;
+				uid_data.tevindref.bi0 = texmap;
 			}
 			else if (i == 1)
 			{
-				SetUidField(tevindref.bc1, texcoord);
-				SetUidField(tevindref.bi1, texmap);
+				uid_data.tevindref.bc1 = texcoord;
+				uid_data.tevindref.bi1 = texmap;
 			}
 			else if (i == 2)
 			{
-				SetUidField(tevindref.bc3, texcoord);
-				SetUidField(tevindref.bi2, texmap);
+				uid_data.tevindref.bc3 = texcoord;
+				uid_data.tevindref.bi2 = texmap;
 			}
 			else
 			{
-				SetUidField(tevindref.bc4, texcoord);
-				SetUidField(tevindref.bi4, texmap);
+				uid_data.tevindref.bc4 = texcoord;
+				uid_data.tevindref.bi4 = texmap;
 			}
 			if (texcoord < numTexgen)
 			{
@@ -576,17 +578,17 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	// Uid fields for BuildSwapModeTable are set in WriteStage
 	BuildSwapModeTable();
 	for (unsigned int i = 0; i < numStages; i++)
-		WriteStage<T>(out, i, ApiType); // build the equation for this stage
+		WriteStage<T>(out, uid_data, i, ApiType); // build the equation for this stage
 
 	if (numStages)
 	{
 		// The results of the last texenv stage are put onto the screen,
 		// regardless of the used destination register
-		SetUidField(combiners[numStages-1].colorC.dest, bpmem.combiners[numStages-1].colorC.dest); // TODO: These probably don't need to be set anymore here...
-		SetUidField(combiners[numStages-1].alphaC.dest, bpmem.combiners[numStages-1].alphaC.dest);
+		uid_data.combiners[numStages-1].colorC.dest = bpmem.combiners[numStages-1].colorC.dest; // TODO: These probably don't need to be set anymore here...
+		uid_data.combiners[numStages-1].alphaC.dest = bpmem.combiners[numStages-1].alphaC.dest;
 		if(bpmem.combiners[numStages - 1].colorC.dest != 0)
 		{
-///			SetUidField(combiners[numStages-1].colorC.dest, bpmem.combiners[numStages-1].colorC.dest);
+///			uid_data.combiners[numStages-1].colorC.dest = bpmem.combiners[numStages-1].colorC.dest;
 			bool retrieveFromAuxRegister = !RegisterStates[bpmem.combiners[numStages - 1].colorC.dest].ColorNeedOverflowControl && RegisterStates[bpmem.combiners[numStages - 1].colorC.dest].AuxStored;
 			out.Write("\tprev.rgb = %s%s;\n", retrieveFromAuxRegister ? "c" : "" , tevCOutputTable[bpmem.combiners[numStages - 1].colorC.dest]);
 			RegisterStates[0].ColorNeedOverflowControl = RegisterStates[bpmem.combiners[numStages - 1].colorC.dest].ColorNeedOverflowControl;
@@ -603,9 +605,9 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 		out.Write("\tprev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n");
 
 	AlphaTest::TEST_RESULT Pretest = bpmem.alpha_test.TestResult();
-	SetUidField(Pretest, Pretest);
+	uid_data.Pretest = Pretest;
 	if (Pretest == AlphaTest::UNDETERMINED)
-		WriteAlphaTest<T>(out, ApiType, dstAlphaMode, per_pixel_depth);
+		WriteAlphaTest<T>(out, uid_data, ApiType, dstAlphaMode, per_pixel_depth);
 
 	
 	// the screen space depth value = far z + (clip z / clip w) * z range
@@ -619,9 +621,9 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	}
 
 	// Note: depth textures are disabled if early depth test is enabled
-	SetUidField(ztex.op, bpmem.ztex2.op);
-	SetUidField(per_pixel_depth, per_pixel_depth);
-	SetUidField(fog.fsel, bpmem.fog.c_proj_fsel.fsel);
+	uid_data.ztex.op = bpmem.ztex2.op;
+	uid_data.per_pixel_depth = per_pixel_depth;
+	uid_data.fog.fsel = bpmem.fog.c_proj_fsel.fsel;
 
 	// depth texture can safely be ignored if the result won't be written to the depth buffer (early_ztest) and isn't used for fog either
 	bool skip_ztexture = !per_pixel_depth && !bpmem.fog.c_proj_fsel.fsel;
@@ -650,7 +652,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	}
 	else
 	{
-		WriteFog<T>(out);
+		WriteFog<T>(out, uid_data);
 		out.Write("\tocol0 = prev;\n");
 	}
 
@@ -666,8 +668,9 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	}
 	
 	out.Write("}\n");
-///	if (text[sizeof(text) - 1] != 0x7C)
-///		PanicAlert("PixelShader generator - buffer too small, canary has been eaten!");
+
+	if (text[sizeof(text) - 1] != 0x7C)
+		PanicAlert("PixelShader generator - buffer too small, canary has been eaten!");
 
 	if (out.GetBuffer() != NULL)
 		setlocale(LC_NUMERIC, ""); // restore locale
@@ -720,7 +723,7 @@ static const char *TEVCMPAlphaOPTable[16] =
 
 
 template<class T>
-static void WriteStage(T& out, int n, API_TYPE ApiType)
+static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE ApiType)
 {
 	int texcoord = bpmem.tevorders[n/2].getTexCoord(n&1);
 	bool bHasTexCoord = (u32)texcoord < bpmem.genMode.numtexgens;
@@ -732,14 +735,14 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 
 	out.Write("// TEV stage %d\n", n);
 
-	OR_UidField(bHasIndStage, bHasIndStage << n);
-	if (n < 8) { OR_UidField(tevorders_n_texcoord1, texcoord << (3 * n)); }
-	else OR_UidField(tevorders_n_texcoord2, texcoord << (3 * n - 24));
+	uid_data.bHasIndStage |= bHasIndStage << n;
+	if (n < 8) { uid_data.tevorders_n_texcoord1 |= texcoord << (3 * n); }
+	else uid_data.tevorders_n_texcoord2 |= texcoord << (3 * n - 24);
 	if (bHasIndStage)
 	{
-		OR_UidField(tevind_n_bs, bpmem.tevind[n].bs << (2*n));
-		OR_UidField(tevind_n_bt, bpmem.tevind[n].bt << (2*n));
-		OR_UidField(tevind_n_fmt, bpmem.tevind[n].fmt << (2*n));
+		uid_data.tevind_n_bs |= bpmem.tevind[n].bs << (2*n);
+		uid_data.tevind_n_bt |= bpmem.tevind[n].bt << (2*n);
+		uid_data.tevind_n_fmt |= bpmem.tevind[n].fmt << (2*n);
 
 		out.Write("// indirect op\n");
 		// perform the indirect op on the incoming regular coordinates using indtex%d as the offset coords
@@ -754,14 +757,14 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 		out.Write("float3 indtevcrd%d = indtex%d * %s;\n", n, bpmem.tevind[n].bt, tevIndFmtScale[bpmem.tevind[n].fmt]);
 
 		// bias
-		if (n < 8) { OR_UidField(tevind_n_bias1, bpmem.tevind[n].bias << (3*n)); } /// XXX: brackets?
-		else OR_UidField(tevind_n_bias2, bpmem.tevind[n].bias << (3*n - 24));
+		if (n < 8) { uid_data.tevind_n_bias1 |= bpmem.tevind[n].bias << (3*n); } /// XXX: brackets?
+		else uid_data.tevind_n_bias2 |= bpmem.tevind[n].bias << (3*n - 24);
 		if (bpmem.tevind[n].bias != ITB_NONE )
 			out.Write("indtevcrd%d.%s += %s;\n", n, tevIndBiasField[bpmem.tevind[n].bias], tevIndBiasAdd[bpmem.tevind[n].fmt]);
 
 		// multiply by offset matrix and scale
-		if (n < 8) { OR_UidField(tevind_n_mid1, bpmem.tevind[n].mid << (4*n)); } /// XXX: brackets?
-		else OR_UidField(tevind_n_mid2, bpmem.tevind[n].mid << (4*n - 32));
+		if (n < 8) { uid_data.tevind_n_mid1 |= bpmem.tevind[n].mid << (4*n); } /// XXX: brackets?
+		else uid_data.tevind_n_mid2 |= bpmem.tevind[n].mid << (4*n - 32);
 		if (bpmem.tevind[n].mid != 0)
 		{
 			if (bpmem.tevind[n].mid <= 3)
@@ -795,12 +798,12 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 		// Wrapping
 		// ---------
 
-		if (n < 8) { OR_UidField(tevind_n_sw1, bpmem.tevind[n].sw << (3 * n)); }
-		else OR_UidField(tevind_n_sw2, bpmem.tevind[n].sw << (3 * n - 24));
-		if (n < 8) { OR_UidField(tevind_n_tw1, bpmem.tevind[n].tw << (3 * n)); }
-		else OR_UidField(tevind_n_tw2, bpmem.tevind[n].tw << (3 * n - 24));
+		if (n < 8) { uid_data.tevind_n_sw1 |= bpmem.tevind[n].sw << (3 * n); }
+		else uid_data.tevind_n_sw2 |= bpmem.tevind[n].sw << (3 * n - 24);
+		if (n < 8) { uid_data.tevind_n_tw1 |= bpmem.tevind[n].tw << (3 * n); }
+		else uid_data.tevind_n_tw2 |= bpmem.tevind[n].tw << (3 * n - 24);
 
-		OR_UidField(tevind_n_fb_addprev, bpmem.tevind[n].fb_addprev << n);
+		uid_data.tevind_n_fb_addprev |= bpmem.tevind[n].fb_addprev << n;
 
 		// wrap S
 		if (bpmem.tevind[n].sw == ITW_OFF)
@@ -827,8 +830,8 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 	TevStageCombiner::ColorCombiner &cc = bpmem.combiners[n].colorC;
 	TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[n].alphaC;
 
-	SetUidField(combiners[n].colorC.hex, cc.hex&0xFFFFFF);
-	SetUidField(combiners[n].alphaC.hex, ac.hex&0xFFFFFF);
+	uid_data.combiners[n].colorC.hex = cc.hex & 0xFFFFFF;
+	uid_data.combiners[n].alphaC.hex = ac.hex & 0xFFFFFF;
 
 	if(cc.a == TEVCOLORARG_RASA || cc.a == TEVCOLORARG_RASC
 		|| cc.b == TEVCOLORARG_RASA || cc.b == TEVCOLORARG_RASC
@@ -838,10 +841,10 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 		|| ac.c == TEVALPHAARG_RASA || ac.d == TEVALPHAARG_RASA)
 	{
 		const int i = bpmem.combiners[n].alphaC.rswap;
-		OR_UidField(tevksel_n_swap, bpmem.tevksel[i*2  ].swap1 << (i*2));
-		OR_UidField(tevksel_n_swap, bpmem.tevksel[i*2+1].swap1 << (i*2 + 1));
-		OR_UidField(tevksel_n_swap, bpmem.tevksel[i*2  ].swap2 << (i*2 + 16));
-		OR_UidField(tevksel_n_swap, bpmem.tevksel[i*2+1].swap2 << (i*2 + 17));
+		uid_data.tevksel_n_swap |= bpmem.tevksel[i*2  ].swap1 << (i*2);
+		uid_data.tevksel_n_swap |= bpmem.tevksel[i*2+1].swap1 << (i*2 + 1);
+		uid_data.tevksel_n_swap |= bpmem.tevksel[i*2  ].swap2 << (i*2 + 16);
+		uid_data.tevksel_n_swap |= bpmem.tevksel[i*2+1].swap2 << (i*2 + 17);
 
 		char *rasswap = swapModeTable[bpmem.combiners[n].alphaC.rswap];
 		out.Write("rastemp = %s.%s;\n", tevRasTable[bpmem.tevorders[n / 2].getColorChan(n & 1)], rasswap);
@@ -861,10 +864,10 @@ static void WriteStage(T& out, int n, API_TYPE ApiType)
 		}
 
 		const int i = bpmem.combiners[n].alphaC.tswap;
-		OR_UidField(tevksel_n_swap, bpmem.tevksel[i*2  ].swap1 << (i*2));
-		OR_UidField(tevksel_n_swap, bpmem.tevksel[i*2+1].swap1 << (i*2 + 1));
-		OR_UidField(tevksel_n_swap, bpmem.tevksel[i*2  ].swap2 << (i*2 + 16));
-		OR_UidField(tevksel_n_swap, bpmem.tevksel[i*2+1].swap2 << (i*2 + 17));
+		uid_data.tevksel_n_swap |= bpmem.tevksel[i*2  ].swap1 << (i*2);
+		uid_data.tevksel_n_swap |= bpmem.tevksel[i*2+1].swap1 << (i*2 + 1);
+		uid_data.tevksel_n_swap |= bpmem.tevksel[i*2  ].swap2 << (i*2 + 16);
+		uid_data.tevksel_n_swap |= bpmem.tevksel[i*2+1].swap2 << (i*2 + 17);
 
 		char *texswap = swapModeTable[bpmem.combiners[n].alphaC.tswap];
 		int texmap = bpmem.tevorders[n/2].getTexMap(n&1);
@@ -1116,7 +1119,7 @@ static const char *tevAlphaFunclogicTable[] =
 };
 
 template<class T>
-static void WriteAlphaTest(T& out, API_TYPE ApiType, DSTALPHA_MODE dstAlphaMode, bool per_pixel_depth)
+static void WriteAlphaTest(T& out, pixel_shader_uid_data& uid_data, API_TYPE ApiType, DSTALPHA_MODE dstAlphaMode, bool per_pixel_depth)
 {
 	static const char *alphaRef[2] =
 	{
@@ -1129,9 +1132,9 @@ static void WriteAlphaTest(T& out, API_TYPE ApiType, DSTALPHA_MODE dstAlphaMode,
 	// using discard then return works the same in cg and dx9 but not in dx11
 	out.Write("\tif(!( ");
 
-	SetUidField(alpha_test.comp0, bpmem.alpha_test.comp0);
-	SetUidField(alpha_test.logic, bpmem.alpha_test.comp1);
-	SetUidField(alpha_test.logic, bpmem.alpha_test.logic);
+	uid_data.alpha_test.comp0 = bpmem.alpha_test.comp0;
+	uid_data.alpha_test.logic = bpmem.alpha_test.comp1;
+	uid_data.alpha_test.logic = bpmem.alpha_test.logic;
 
 	// Lookup the first component from the alpha function table
 	int compindex = bpmem.alpha_test.comp0;
@@ -1160,7 +1163,7 @@ static void WriteAlphaTest(T& out, API_TYPE ApiType, DSTALPHA_MODE dstAlphaMode,
 	// when the alpha test fail. This is not a correct implementation because
 	// even if the depth test fails the fragment could be alpha blended, but
 	// we don't have a choice.
-	SetUidField(alpha_test.use_zcomploc_hack, bpmem.zcontrol.early_ztest && bpmem.zmode.updateenable);
+	uid_data.alpha_test.use_zcomploc_hack = bpmem.zcontrol.early_ztest && bpmem.zmode.updateenable;
 	if (!(bpmem.zcontrol.early_ztest && bpmem.zmode.updateenable))
 	{
 		out.Write("\t\tdiscard;\n");
@@ -1184,13 +1187,13 @@ static const char *tevFogFuncsTable[] =
 };
 
 template<class T>
-static void WriteFog(T& out)
+static void WriteFog(T& out, pixel_shader_uid_data& uid_data)
 {
-	SetUidField(fog.fsel, bpmem.fog.c_proj_fsel.fsel);
+	uid_data.fog.fsel = bpmem.fog.c_proj_fsel.fsel;
 	if(bpmem.fog.c_proj_fsel.fsel == 0)
 		return; // no Fog
 
-	SetUidField(fog.proj, bpmem.fog.c_proj_fsel.proj);
+	uid_data.fog.proj = bpmem.fog.c_proj_fsel.proj;
 
 	out.SetConstantsUsed(C_FOG, C_FOG+1);
 	if (bpmem.fog.c_proj_fsel.proj == 0)
@@ -1209,7 +1212,7 @@ static void WriteFog(T& out)
 	// x_adjust = sqrt((x-center)^2 + k^2)/k
 	// ze *= x_adjust
 	// this is completely theoretical as the real hardware seems to use a table intead of calculating the values.
-	SetUidField(fog.RangeBaseEnabled, bpmem.fogRange.Base.Enabled);
+	uid_data.fog.RangeBaseEnabled = bpmem.fogRange.Base.Enabled;
 	if(bpmem.fogRange.Base.Enabled)
 	{
 		out.SetConstantsUsed(C_FOG+2, C_FOG+2);
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 869b84a4ed..5ed1a73569 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -83,14 +83,15 @@ extern const char *WriteLocation(API_TYPE api_type);
 template<class T>
 void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 {
-#undef SetUidField
-#define SetUidField(name, value) if (&out.GetUidData() != NULL) {out.GetUidData().name = value; };
+	// Non-uid template parameters will write to the dummy data (=> gets optimized out)
+	vertex_shader_uid_data dummy_data;
+	vertex_shader_uid_data& uid_data = (&out.GetUidData() != NULL) ? out.GetUidData() : dummy_data;
 
 	out.SetBuffer(text);
 	if (out.GetBuffer() != NULL)
 		setlocale(LC_NUMERIC, "C"); // Reset locale for compilation
 
-//	text[sizeof(text) - 1] = 0x7C;  // canary
+	text[sizeof(text) - 1] = 0x7C;  // canary
 
 	_assert_(bpmem.genMode.numtexgens == xfregs.numTexGen.numTexGens);
 	_assert_(bpmem.genMode.numcolchans == xfregs.numChan.numColorChans);
@@ -122,8 +123,8 @@ void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 
 	GenerateVSOutputStruct(out, components, api_type);
 
-	SetUidField(numTexGens, xfregs.numTexGen.numTexGens);
-	SetUidField(components, components);
+	uid_data.numTexGens = xfregs.numTexGen.numTexGens;
+	uid_data.components = components;
 
 	if(api_type == API_OPENGL)
 	{
@@ -262,7 +263,7 @@ void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 			"float3 ldir, h;\n"
 			"float dist, dist2, attn;\n");
 
-	SetUidField(numColorChans, xfregs.numChan.numColorChans);
+	uid_data.numColorChans = xfregs.numChan.numColorChans;
 	if (xfregs.numChan.numColorChans == 0)
 	{
 		if (components & VB_HAS_COL0)
@@ -272,7 +273,7 @@ void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 	}
 
 	// TODO: This probably isn't necessary if pixel lighting is enabled.
-	GenerateLightingShader<T,VertexShaderUid>(out, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_");
+	GenerateLightingShader<T,vertex_shader_uid_data>(out, uid_data, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_");
 
 	if (xfregs.numChan.numColorChans < 2)
 	{
@@ -297,7 +298,7 @@ void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 
 		out.Write("{\n");
 		out.Write("coord = float4(0.0f, 0.0f, 1.0f, 1.0f);\n");
-		SetUidField(texMtxInfo[i].sourcerow, xfregs.texMtxInfo[i].sourcerow);
+		uid_data.texMtxInfo[i].sourcerow = xfregs.texMtxInfo[i].sourcerow;
 		switch (texinfo.sourcerow) {
 		case XF_SRCGEOM_INROW:
 			_assert_( texinfo.inputform == XF_TEXINPUT_ABC1 );
@@ -332,21 +333,21 @@ void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 		}
 
 		// first transformation
-		SetUidField(texMtxInfo[i].texgentype, xfregs.texMtxInfo[i].texgentype);
+		uid_data.texMtxInfo[i].texgentype = xfregs.texMtxInfo[i].texgentype;
 		switch (texinfo.texgentype) {
 			case XF_TEXGEN_EMBOSS_MAP: // calculate tex coords into bump map
 
 				if (components & (VB_HAS_NRM1|VB_HAS_NRM2)) {
 					// transform the light dir into tangent space
-					SetUidField(texMtxInfo[i].embosslightshift, xfregs.texMtxInfo[i].embosslightshift);
-					SetUidField(texMtxInfo[i].embosssourceshift, xfregs.texMtxInfo[i].embosssourceshift);
+					uid_data.texMtxInfo[i].embosslightshift = xfregs.texMtxInfo[i].embosslightshift;
+					uid_data.texMtxInfo[i].embosssourceshift = xfregs.texMtxInfo[i].embosssourceshift;
 					out.Write("ldir = normalize(" I_LIGHTS"[%d].pos.xyz - pos.xyz);\n", texinfo.embosslightshift);
 					out.Write("o.tex%d.xyz = o.tex%d.xyz + float3(dot(ldir, _norm1), dot(ldir, _norm2), 0.0f);\n", i, texinfo.embosssourceshift);
 				}
 				else
 				{
 					_assert_(0); // should have normals
-					SetUidField(texMtxInfo[i].embosssourceshift, xfregs.texMtxInfo[i].embosssourceshift);
+					uid_data.texMtxInfo[i].embosssourceshift = xfregs.texMtxInfo[i].embosssourceshift;
 					out.Write("o.tex%d.xyz = o.tex%d.xyz;\n", i, texinfo.embosssourceshift);
 				}
 
@@ -361,7 +362,7 @@ void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 				break;
 			case XF_TEXGEN_REGULAR:
 			default:
-				SetUidField(texMtxInfo[i].projection, xfregs.texMtxInfo[i].projection);
+				uid_data.texMtxInfo[i].projection = xfregs.texMtxInfo[i].projection;
 				if (components & (VB_HAS_TEXMTXIDX0<<i))
 				{
 					out.Write("int tmp = int(tex%d.z);\n", i);
@@ -380,11 +381,11 @@ void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 				break;
 		}
 
-		SetUidField(dualTexTrans.enabled, xfregs.dualTexTrans.enabled);
+		uid_data.dualTexTrans.enabled = xfregs.dualTexTrans.enabled;
 		if (xfregs.dualTexTrans.enabled && texinfo.texgentype == XF_TEXGEN_REGULAR) { // only works for regular tex gen types?
 			const PostMtxInfo& postInfo = xfregs.postMtxInfo[i];
 
-			SetUidField(postMtxInfo[i].index, xfregs.postMtxInfo[i].index);
+			uid_data.postMtxInfo[i].index = xfregs.postMtxInfo[i].index;
 			int postidx = postInfo.index;
 			out.Write("float4 P0 = " I_POSTTRANSFORMMATRICES"[%d];\n"
 				"float4 P1 = " I_POSTTRANSFORMMATRICES"[%d];\n"
@@ -401,7 +402,7 @@ void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 			}
 			else
 			{
-				SetUidField(postMtxInfo[i].normalize, xfregs.postMtxInfo[i].normalize);
+				uid_data.postMtxInfo[i].normalize = xfregs.postMtxInfo[i].normalize;
 				if (postInfo.normalize)
 					out.Write("o.tex%d.xyz = normalize(o.tex%d.xyz);\n", i, i);
 
@@ -517,8 +518,9 @@ void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 	else
 		out.Write("return o;\n}\n");
 
-///	if (text[sizeof(text) - 1] != 0x7C)
-///		PanicAlert("VertexShader generator - buffer too small, canary has been eaten!");
+	if (text[sizeof(text) - 1] != 0x7C)
+		PanicAlert("VertexShader generator - buffer too small, canary has been eaten!");
+
 	if (out.GetBuffer() != NULL)
 		setlocale(LC_NUMERIC, ""); // restore locale
 }

From 2afd892e466e656a2dc623bb5d6574d0d6c5533a Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Fri, 29 Mar 2013 22:24:49 +0100
Subject: [PATCH 028/352] ShaderGen: More interface cleanups. Less wtfs :)

---
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   |  3 ++-
 Source/Core/VideoCommon/Src/PixelShaderGen.h  |  4 ++--
 Source/Core/VideoCommon/Src/ShaderGenCommon.h | 20 ++++++++-----------
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  |  7 ++++---
 Source/Core/VideoCommon/Src/VertexShaderGen.h |  4 ++--
 .../Src/LineGeometryShader.cpp                |  2 +-
 .../Src/PointGeometryShader.cpp               |  2 +-
 .../Src/ProgramShaderCache.cpp                |  6 +++---
 8 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index d9d45902fe..e534e2a6ca 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -274,7 +274,8 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 
 	// Non-uid template parameters will write to the dummy data (=> gets optimized out)
 	pixel_shader_uid_data dummy_data;
-	pixel_shader_uid_data& uid_data = (&out.GetUidData() != NULL) ? out.GetUidData() : dummy_data;
+	pixel_shader_uid_data& uid_data = (&out.template GetUidData<pixel_shader_uid_data>() != NULL)
+										? out.template GetUidData<pixel_shader_uid_data>() : dummy_data;
 
 	out.SetBuffer(text);
 	if (out.GetBuffer() != NULL)
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 4f9cba0c37..4881999206 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -190,8 +190,8 @@ struct pixel_shader_uid_data
 };
 
 typedef ShaderUid<pixel_shader_uid_data> PixelShaderUid;
-typedef ShaderCode<pixel_shader_uid_data> PixelShaderCode;
-typedef ShaderConstantProfile<pixel_shader_uid_data> PixelShaderConstantProfile;
+typedef ShaderCode PixelShaderCode; // TODO: Obsolete
+typedef ShaderConstantProfile PixelShaderConstantProfile; // TODO: Obsolete
 
 
 void GeneratePixelShaderCode(PixelShaderCode& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index a2616e0a6c..a904a8e635 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -25,7 +25,6 @@
 
 #include <vector>
 
-template<class uid_data>
 class ShaderGeneratorInterface
 {
 public:
@@ -33,11 +32,13 @@ public:
 	const char* GetBuffer() { return NULL; }
 	void SetBuffer(char* buffer) { }
 	inline void SetConstantsUsed(unsigned int first_index, unsigned int last_index) {}
-	uid_data& GetUidData() { return *(uid_data*)NULL; } // TODO: can be moved out, just make this GetUidData<T> instead
+
+	template<class uid_data>
+	uid_data& GetUidData() { return *(uid_data*)NULL; }
 };
 
 template<class uid_data>
-class ShaderUid : public ShaderGeneratorInterface<uid_data>
+class ShaderUid : public ShaderGeneratorInterface
 {
 public:
 	ShaderUid()
@@ -69,7 +70,8 @@ public:
 		return false;
 	}
 
-	inline uid_data& GetUidData() { return data; }
+	template<class T>
+	inline T& GetUidData() override { return data; }
 
 private:
 	union
@@ -79,9 +81,7 @@ private:
 	};
 };
 
-// Needs to be a template for hacks...
-template<class uid_data>
-class ShaderCode : public ShaderGeneratorInterface<uid_data>
+class ShaderCode : public ShaderGeneratorInterface
 {
 public:
 	ShaderCode() : buf(NULL), write_ptr(NULL)
@@ -105,15 +105,11 @@ private:
 	char* write_ptr;
 };
 
-template<class uid_data>
-class ShaderConstantProfile : public ShaderGeneratorInterface<uid_data>
+class ShaderConstantProfile : public ShaderGeneratorInterface
 {
 public:
 	ShaderConstantProfile(int num_constants) { constant_usage.resize(num_constants); }
 
-	// has room for optimization (if it matters at all...)
-	void NumConstants() { return constant_usage.size(); }
-
 	inline void SetConstantsUsed(unsigned int first_index, unsigned int last_index)
 	{
 		for (unsigned int i = first_index; i < last_index+1; ++i)
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 5ed1a73569..e27ced7b39 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -85,7 +85,8 @@ void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 {
 	// Non-uid template parameters will write to the dummy data (=> gets optimized out)
 	vertex_shader_uid_data dummy_data;
-	vertex_shader_uid_data& uid_data = (&out.GetUidData() != NULL) ? out.GetUidData() : dummy_data;
+	vertex_shader_uid_data& uid_data = (&out.template GetUidData<vertex_shader_uid_data>() != NULL)
+											? out.template GetUidData<vertex_shader_uid_data>() : dummy_data;
 
 	out.SetBuffer(text);
 	if (out.GetBuffer() != NULL)
@@ -535,7 +536,7 @@ void GenerateVertexShaderCode(VertexShaderCode& object, u32 components, API_TYPE
 	GenerateVertexShader<VertexShaderCode>(object, components, api_type);
 }
 
-void GenerateVSOutputStructForGS(ShaderCode<u32>& object, u32 components, API_TYPE api_type)
+void GenerateVSOutputStructForGS(ShaderCode& object, u32 components, API_TYPE api_type)
 {
-	GenerateVSOutputStruct<ShaderCode<u32> >(object, components, api_type);
+	GenerateVSOutputStruct<ShaderCode>(object, components, api_type);
 }
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h
index b6b176c806..33d27ecdf0 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h
@@ -110,10 +110,10 @@ struct vertex_shader_uid_data
 };
 
 typedef ShaderUid<vertex_shader_uid_data> VertexShaderUid;
-typedef ShaderCode<vertex_shader_uid_data> VertexShaderCode;
+typedef ShaderCode VertexShaderCode; // TODO: Obsolete..
 
 void GetVertexShaderUid(VertexShaderUid& object, u32 components, API_TYPE api_type);
 void GenerateVertexShaderCode(VertexShaderCode& object, u32 components, API_TYPE api_type);
-void GenerateVSOutputStructForGS(ShaderCode<u32>& object, u32 components, API_TYPE api_type);
+void GenerateVSOutputStructForGS(ShaderCode& object, u32 components, API_TYPE api_type);
 
 #endif // GCOGL_VERTEXSHADER_H
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp b/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp
index f22ebef0df..5d6b8eb5b5 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/LineGeometryShader.cpp
@@ -183,7 +183,7 @@ bool LineGeometryShader::SetShader(u32 components, float lineWidth,
 	{
 		// Generate new shader. Warning: not thread-safe.
 		static char buffer[16384];
-		ShaderCode<u32> code;
+		ShaderCode code;
 		code.SetBuffer(buffer);
 		GenerateVSOutputStructForGS(code, components, API_D3D11);
 		code.Write("\n%s", LINE_GS_COMMON);
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp
index 5976c09ab9..8f5300ff64 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/PointGeometryShader.cpp
@@ -177,7 +177,7 @@ bool PointGeometryShader::SetShader(u32 components, float pointSize,
 	{
 		// Generate new shader. Warning: not thread-safe.
 		static char buffer[16384];
-		ShaderCode<u32> code;
+		ShaderCode code;
 		code.SetBuffer(buffer);
 		GenerateVSOutputStructForGS(code, components, API_D3D11);
 		code.Write("\n%s", POINT_GS_COMMON);
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index 188145ebcf..81621d2d38 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -360,9 +360,9 @@ template<class UidT> UidT GetPartialUid(const SHADERUID& uid);
 template<> PixelShaderUid GetPartialUid(const SHADERUID& uid) { return uid.puid; }
 template<> VertexShaderUid GetPartialUid(const SHADERUID& uid) { return uid.vuid; }
 
-template<class CodeT> const std::string& GetShaderCode(const SHADER& shader);
-template<> const std::string& GetShaderCode<PixelShaderCode>(const SHADER& shader) { return shader.strpprog; }
-template<> const std::string& GetShaderCode<VertexShaderCode>(const SHADER& shader) { return shader.strvprog; }
+template<class UidT> const std::string& GetShaderCode(const SHADER& shader);
+template<> const std::string& GetShaderCode<PixelShaderUid>(const SHADER& shader) { return shader.strpprog; }
+template<> const std::string& GetShaderCode<VertexShaderUid>(const SHADER& shader) { return shader.strvprog; }
 
 template<class UidT, class CodeT>
 void CheckForUidMismatch(const ProgramShaderCache::PCache& cache, CodeT& new_code, const UidT& new_uid)

From cdddb26bbafce034143465da7d2e250cded5fd53 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Fri, 29 Mar 2013 22:29:37 +0100
Subject: [PATCH 029/352] Apparently override is less fun than I thought.

---
 Source/Core/VideoCommon/Src/ShaderGenCommon.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index a904a8e635..eabd6f7c07 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -71,7 +71,7 @@ public:
 	}
 
 	template<class T>
-	inline T& GetUidData() override { return data; }
+	inline T& GetUidData() { return data; }
 
 private:
 	union

From 248d56d930d8d6f7cae04efc0c1521c83676c074 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Sun, 31 Mar 2013 20:55:57 +0200
Subject: [PATCH 030/352] ShaderGen: Small optimization.

---
 .../Core/VideoCommon/Src/LightingShaderGen.h  |  4 +--
 Source/Core/VideoCommon/Src/ShaderGenCommon.h | 32 +++++++++++++++++--
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  | 28 +++++++---------
 Source/Core/VideoCommon/Src/VertexShaderGen.h |  4 ++-
 4 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.h b/Source/Core/VideoCommon/Src/LightingShaderGen.h
index e8b30d86a8..40a8fb2732 100644
--- a/Source/Core/VideoCommon/Src/LightingShaderGen.h
+++ b/Source/Core/VideoCommon/Src/LightingShaderGen.h
@@ -26,7 +26,7 @@
 
 // uid_data needs to have a struct named lighting_uid
 template<class T,class UidDataT>
-void GenerateLightShader(T& object, UidDataT& uid_data, int index, int litchan_index, const char* lightsName, int coloralpha)
+static void GenerateLightShader(T& object, UidDataT& uid_data, int index, int litchan_index, const char* lightsName, int coloralpha)
 {
 	const LitChannel& chan = (litchan_index > 1) ? xfregs.alpha[litchan_index-2] : xfregs.color[litchan_index];
 	const char* swizzle = "xyzw";
@@ -94,7 +94,7 @@ void GenerateLightShader(T& object, UidDataT& uid_data, int index, int litchan_i
 // inColorName is color in vs and colors_ in ps
 // dest is o.colors_ in vs and colors_ in ps
 template<class T, class UidDataT>
-void GenerateLightingShader(T& object, UidDataT& uid_data, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest)
+static void GenerateLightingShader(T& object, UidDataT& uid_data, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest)
 {
 	for (unsigned int j = 0; j < xfregs.numChan.numColorChans; j++)
 	{
diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index eabd6f7c07..ef88d411ea 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -21,10 +21,11 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-#include "CommonTypes.h"
-
 #include <vector>
 
+#include "CommonTypes.h"
+#include "VideoCommon.h"
+
 class ShaderGeneratorInterface
 {
 public:
@@ -125,4 +126,31 @@ private:
 	std::vector<bool> constant_usage; // TODO: Is vector<bool> appropriate here?
 };
 
+template<class T>
+static void WriteRegister(T& object, API_TYPE ApiType, const char *prefix, const u32 num)
+{
+	if (ApiType == API_OPENGL)
+		return; // Nothing to do here
+
+	object.Write(" : register(%s%d)", prefix, num);
+}
+
+template<class T>
+static void WriteLocation(T& object, API_TYPE ApiType, bool using_ubos)
+{
+	if (using_ubos)
+		return;
+
+	object.Write("uniform ");
+}
+
+template<class T>
+static void DeclareUniform(T& object, API_TYPE api_type, bool using_ubos, const u32 num, const char* type, const char* name)
+{
+	WriteLocation(object, api_type, using_ubos);
+	object.Write("%s %s ", type, name);
+	WriteRegister(object, api_type, "c", num);
+	object.Write(";\n");
+}
+
 #endif // _SHADERGENCOMMON_H
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index e27ced7b39..44bad82471 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -29,7 +29,7 @@
 static char text[16768];
 
 template<class T>
-void DefineVSOutputStructMember(T& object, API_TYPE api_type, const char* type, const char* name, int var_index, const char* semantic, int semantic_index = -1)
+static void DefineVSOutputStructMember(T& object, API_TYPE api_type, const char* type, const char* name, int var_index, const char* semantic, int semantic_index = -1)
 {
 	object.Write("  %s %s", type, name);
 	if (var_index != -1)
@@ -48,7 +48,7 @@ void DefineVSOutputStructMember(T& object, API_TYPE api_type, const char* type,
 
 // TODO: Check if something goes wrong if the cached shaders used pixel lighting but it's disabled later??
 template<class T>
-void GenerateVSOutputStruct(T& object, u32 components, API_TYPE api_type)
+static void GenerateVSOutputStruct(T& object, u32 components, API_TYPE api_type)
 {
 	object.Write("struct VS_OUTPUT {\n");
 	DefineVSOutputStructMember(object, api_type, "float4", "pos", -1, "POSITION");
@@ -76,12 +76,8 @@ void GenerateVSOutputStruct(T& object, u32 components, API_TYPE api_type)
 	object.Write("};\n");
 }
 
-// TODO: Seriously? -.-
-extern const char *WriteRegister(API_TYPE api_type, const char *prefix, const u32 num);
-extern const char *WriteLocation(API_TYPE api_type);
-
 template<class T>
-void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
+static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 {
 	// Non-uid template parameters will write to the dummy data (=> gets optimized out)
 	vertex_shader_uid_data dummy_data;
@@ -108,16 +104,16 @@ void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 		out.Write("layout(std140) uniform VSBlock {\n");
 
-	out.Write("%sfloat4 " I_POSNORMALMATRIX"[6] %s;\n", WriteLocation(api_type), WriteRegister(api_type, "c", C_POSNORMALMATRIX));
-	out.Write("%sfloat4 " I_PROJECTION"[4] %s;\n", WriteLocation(api_type), WriteRegister(api_type, "c", C_PROJECTION));	
-	out.Write("%sfloat4 " I_MATERIALS"[4] %s;\n", WriteLocation(api_type), WriteRegister(api_type, "c", C_MATERIALS));
+	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_POSNORMALMATRIX, "float4", I_POSNORMALMATRIX"[6]");
+	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_PROJECTION, "float4", I_PROJECTION"[4]");
+	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_MATERIALS, "float4", I_MATERIALS"[4]");
 	out.Write("struct Light { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; };\n");
-	out.Write("%sLight " I_LIGHTS"[8] %s;\n", WriteLocation(api_type), WriteRegister(api_type, "c", C_LIGHTS));
-	out.Write("%sfloat4 " I_TEXMATRICES"[24] %s;\n", WriteLocation(api_type), WriteRegister(api_type, "c", C_TEXMATRICES)); // also using tex matrices
-	out.Write("%sfloat4 " I_TRANSFORMMATRICES"[64] %s;\n", WriteLocation(api_type),WriteRegister(api_type, "c", C_TRANSFORMMATRICES));
-	out.Write("%sfloat4 " I_NORMALMATRICES"[32] %s;\n", WriteLocation(api_type), WriteRegister(api_type, "c", C_NORMALMATRICES));
-	out.Write("%sfloat4 " I_POSTTRANSFORMMATRICES"[64] %s;\n", WriteLocation(api_type), WriteRegister(api_type, "c", C_POSTTRANSFORMMATRICES));
-	out.Write("%sfloat4 " I_DEPTHPARAMS" %s;\n", WriteLocation(api_type), WriteRegister(api_type, "c", C_DEPTHPARAMS));
+	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_LIGHTS,  "Light", I_LIGHTS"[8]");
+	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_TEXMATRICES, "float4", I_TEXMATRICES"[24]");
+	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_TRANSFORMMATRICES, "float4", I_TRANSFORMMATRICES"[64]");
+	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_NORMALMATRICES, "float4", I_NORMALMATRICES"[32]");
+	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_POSTTRANSFORMMATRICES, "float4", I_POSTTRANSFORMMATRICES"[64]");
+	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_DEPTHPARAMS, "float4", I_DEPTHPARAMS);
 
 	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 		out.Write("};\n");
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h
index 33d27ecdf0..ea81aba468 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h
@@ -76,7 +76,8 @@ const s_svar VSVar_Loc[] = {  {I_POSNORMALMATRIX, C_POSNORMALMATRIX, 6 },
 						{I_DEPTHPARAMS, C_DEPTHPARAMS, 1 },
 						};                                            
 
-// TODO: Need packing?
+#pragma pack(4)
+
 struct vertex_shader_uid_data
 
 {
@@ -108,6 +109,7 @@ struct vertex_shader_uid_data
 		u32 light_mask : 8;
 	} lit_chans[4];
 };
+#pragma pack()
 
 typedef ShaderUid<vertex_shader_uid_data> VertexShaderUid;
 typedef ShaderCode VertexShaderCode; // TODO: Obsolete..

From f6d65a636ef9c8a75b410314b94384a2ae2d7e62 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Sun, 31 Mar 2013 23:29:33 +0200
Subject: [PATCH 031/352] ShaderGen: Fix per pixel lighting.

---
 .../Core/VideoCommon/Src/LightingShaderGen.h  | 19 ++++++++-----------
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 10 +++++-----
 Source/Core/VideoCommon/Src/PixelShaderGen.h  |  2 ++
 Source/Core/VideoCommon/Src/ShaderGenCommon.h | 13 +++++++++++++
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  |  2 +-
 Source/Core/VideoCommon/Src/VertexShaderGen.h | 11 ++---------
 Source/Core/VideoCommon/Src/VideoConfig.h     |  2 +-
 7 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.h b/Source/Core/VideoCommon/Src/LightingShaderGen.h
index 40a8fb2732..ff19b737f4 100644
--- a/Source/Core/VideoCommon/Src/LightingShaderGen.h
+++ b/Source/Core/VideoCommon/Src/LightingShaderGen.h
@@ -18,15 +18,12 @@
 #ifndef _LIGHTINGSHADERGEN_H_
 #define _LIGHTINGSHADERGEN_H_
 
-#include <typeinfo>
-
 #include "ShaderGenCommon.h"
 #include "NativeVertexFormat.h"
 #include "XFMemory.h"
 
-// uid_data needs to have a struct named lighting_uid
-template<class T,class UidDataT>
-static void GenerateLightShader(T& object, UidDataT& uid_data, int index, int litchan_index, const char* lightsName, int coloralpha)
+template<class T>
+static void GenerateLightShader(T& object, LightingUidData& uid_data, int index, int litchan_index, const char* lightsName, int coloralpha)
 {
 	const LitChannel& chan = (litchan_index > 1) ? xfregs.alpha[litchan_index-2] : xfregs.color[litchan_index];
 	const char* swizzle = "xyzw";
@@ -93,8 +90,8 @@ static void GenerateLightShader(T& object, UidDataT& uid_data, int index, int li
 // materials name is I_MATERIALS in vs and I_PMATERIALS in ps
 // inColorName is color in vs and colors_ in ps
 // dest is o.colors_ in vs and colors_ in ps
-template<class T, class UidDataT>
-static void GenerateLightingShader(T& object, UidDataT& uid_data, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest)
+template<class T>
+static void GenerateLightingShader(T& object, LightingUidData& uid_data, int components, const char* materialsName, const char* lightsName, const char* inColorName, const char* dest)
 {
 	for (unsigned int j = 0; j < xfregs.numChan.numColorChans; j++)
 	{
@@ -187,7 +184,7 @@ static void GenerateLightingShader(T& object, UidDataT& uid_data, int components
 					{
 						if (mask & (1<<i))
 						{
-							GenerateLightShader<T,UidDataT>(object, uid_data, i, j, lightsName, 3);
+							GenerateLightShader<T>(object, uid_data, i, j, lightsName, 3);
 						}
 					}
 				}
@@ -197,9 +194,9 @@ static void GenerateLightingShader(T& object, UidDataT& uid_data, int components
 			for (int i = 0; i < 8; ++i)
 			{
 				if (!(mask&(1<<i)) && (color.GetFullLightMask() & (1<<i)))
-					GenerateLightShader<T,UidDataT>(object, uid_data, i, j, lightsName, 1);
+					GenerateLightShader<T>(object, uid_data, i, j, lightsName, 1);
 				if (!(mask&(1<<i)) && (alpha.GetFullLightMask() & (1<<i)))
-					GenerateLightShader<T,UidDataT>(object, uid_data, i, j+2, lightsName, 2);
+					GenerateLightShader<T>(object, uid_data, i, j+2, lightsName, 2);
 			}
 		}
 		else if (color.enablelighting || alpha.enablelighting)
@@ -213,7 +210,7 @@ static void GenerateLightingShader(T& object, UidDataT& uid_data, int components
 			for (int i = 0; i < 8; ++i)
 			{
 				if (workingchannel.GetFullLightMask() & (1<<i))
-					GenerateLightShader<T,UidDataT>(object, uid_data, i, lit_index, lightsName, coloralpha);
+					GenerateLightShader<T>(object, uid_data, i, lit_index, lightsName, coloralpha);
 			}
 		}
 		object.Write("%s%d = mat * saturate(lacc);\n", dest, j);
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index e534e2a6ca..ceb2230684 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -341,12 +341,12 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	out.Write("\t%sfloat4 " I_INDTEXSCALE"[2] %s;\n", WriteLocation(ApiType),  WriteRegister(ApiType, "c", C_INDTEXSCALE));
 	out.Write("\t%sfloat4 " I_INDTEXMTX"[6] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_INDTEXMTX));
 	out.Write("\t%sfloat4 " I_FOG"[3] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_FOG));
-	
+
 	// For pixel lighting - TODO: Should only be defined when per pixel lighting is enabled!
     out.Write("struct Light { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; };\n");
 	out.Write("\t%sLight " I_PLIGHTS"[8] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_PLIGHTS));
 	out.Write("\t%sfloat4 " I_PMATERIALS"[4] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_PMATERIALS));
-		
+
 	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 		out.Write("};\n");
 
@@ -366,7 +366,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 		out.Write("float4 colors_1 = colors_12;\n");
 
 		// compute window position if needed because binding semantic WPOS is not widely supported
-				// Let's set up attributes
+		// Let's set up attributes
 		if (xfregs.numTexGen.numTexGens < 7)
 		{
 			for (int i = 0; i < 8; ++i)
@@ -479,10 +479,10 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 		out.Write("\tfloat4 mat, lacc;\n"
 				"\tfloat3 ldir, h;\n"
 				"\tfloat dist, dist2, attn;\n");
-/// TODO
+
 		out.SetConstantsUsed(C_PLIGHTS, C_PLIGHTS+39); // TODO: Can be optimized further
 		out.SetConstantsUsed(C_PMATERIALS, C_PMATERIALS+3);
-///		p = GenerateLightingShader(p, components, I_PMATERIALS, I_PLIGHTS, "colors_", "colors_");
+		GenerateLightingShader<T>(out, uid_data.lighting, components, I_PMATERIALS, I_PLIGHTS, "colors_", "colors_");
 	}
 
 	if (numTexgen < 7)
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 4881999206..98afec2c5b 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -187,6 +187,8 @@ struct pixel_shader_uid_data
 	u32 bHasIndStage : 16;
 
 	u32 xfregs_numTexGen_numTexGens : 4;
+
+	LightingUidData lighting;
 };
 
 typedef ShaderUid<pixel_shader_uid_data> PixelShaderUid;
diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index ef88d411ea..4d41cd62f1 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -153,4 +153,17 @@ static void DeclareUniform(T& object, API_TYPE api_type, bool using_ubos, const
 	object.Write(";\n");
 }
 
+struct LightingUidData
+{
+	struct
+	{
+		u32 matsource : 1;
+		u32 enablelighting : 1;
+		u32 ambsource : 1;
+		u32 diffusefunc : 2;
+		u32 attnfunc : 2;
+		u32 light_mask : 8;
+	} lit_chans[4];
+};
+
 #endif // _SHADERGENCOMMON_H
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 44bad82471..82e7a7fdce 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -270,7 +270,7 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 	}
 
 	// TODO: This probably isn't necessary if pixel lighting is enabled.
-	GenerateLightingShader<T,vertex_shader_uid_data>(out, uid_data, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_");
+	GenerateLightingShader<T>(out, uid_data.lighting, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_");
 
 	if (xfregs.numChan.numColorChans < 2)
 	{
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h
index ea81aba468..9c44ba0448 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h
@@ -79,7 +79,6 @@ const s_svar VSVar_Loc[] = {  {I_POSNORMALMATRIX, C_POSNORMALMATRIX, 6 },
 #pragma pack(4)
 
 struct vertex_shader_uid_data
-
 {
 	u32 components;
 	u32 numColorChans : 2;
@@ -100,14 +99,8 @@ struct vertex_shader_uid_data
 	struct {
 		u32 enabled : 1;
 	} dualTexTrans;
-	struct {
-		u32 matsource : 1;
-		u32 enablelighting : 1;
-		u32 ambsource : 1;
-        u32 diffusefunc : 2;
-        u32 attnfunc : 2;
-		u32 light_mask : 8;
-	} lit_chans[4];
+
+	LightingUidData lighting;
 };
 #pragma pack()
 
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h
index 99fff0d167..442e95f9bf 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.h
+++ b/Source/Core/VideoCommon/Src/VideoConfig.h
@@ -135,7 +135,7 @@ struct VideoConfig
 	int iAdapter;
 
 	// Debugging
-	bool bEnableShaderDebugging; // TODO: Obsolete?
+	bool bEnableShaderDebugging;
 
 	// Static config per API
 	// TODO: Move this out of VideoConfig

From f57b902d3369e1780d61283f0d04d0380923db2b Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Sun, 31 Mar 2013 23:53:46 +0200
Subject: [PATCH 032/352] PixelShaderGen: Cleanups.

---
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 47 +++-------------
 Source/Core/VideoCommon/Src/PixelShaderGen.h  | 55 +++++++++++++++----
 2 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index ceb2230684..8d1d268197 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -531,27 +531,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 			unsigned int texcoord = bpmem.tevindref.getTexCoord(i);
 			unsigned int texmap = bpmem.tevindref.getTexMap(i);
 
-			/// TODO: Cleanup...
-			if (i == 0)
-			{
-				uid_data.tevindref.bc0 = texcoord;
-				uid_data.tevindref.bi0 = texmap;
-			}
-			else if (i == 1)
-			{
-				uid_data.tevindref.bc1 = texcoord;
-				uid_data.tevindref.bi1 = texmap;
-			}
-			else if (i == 2)
-			{
-				uid_data.tevindref.bc3 = texcoord;
-				uid_data.tevindref.bi2 = texmap;
-			}
-			else
-			{
-				uid_data.tevindref.bc4 = texcoord;
-				uid_data.tevindref.bi4 = texmap;
-			}
+			uid_data.tevindref.SetValues(i, texcoord, texmap);
 			if (texcoord < numTexgen)
 			{
 				out.SetConstantsUsed(C_INDTEXSCALE+i/2,C_INDTEXSCALE+i/2);
@@ -585,11 +565,8 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	{
 		// The results of the last texenv stage are put onto the screen,
 		// regardless of the used destination register
-		uid_data.combiners[numStages-1].colorC.dest = bpmem.combiners[numStages-1].colorC.dest; // TODO: These probably don't need to be set anymore here...
-		uid_data.combiners[numStages-1].alphaC.dest = bpmem.combiners[numStages-1].alphaC.dest;
 		if(bpmem.combiners[numStages - 1].colorC.dest != 0)
 		{
-///			uid_data.combiners[numStages-1].colorC.dest = bpmem.combiners[numStages-1].colorC.dest;
 			bool retrieveFromAuxRegister = !RegisterStates[bpmem.combiners[numStages - 1].colorC.dest].ColorNeedOverflowControl && RegisterStates[bpmem.combiners[numStages - 1].colorC.dest].AuxStored;
 			out.Write("\tprev.rgb = %s%s;\n", retrieveFromAuxRegister ? "c" : "" , tevCOutputTable[bpmem.combiners[numStages - 1].colorC.dest]);
 			RegisterStates[0].ColorNeedOverflowControl = RegisterStates[bpmem.combiners[numStages - 1].colorC.dest].ColorNeedOverflowControl;
@@ -741,9 +718,9 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 	else uid_data.tevorders_n_texcoord2 |= texcoord << (3 * n - 24);
 	if (bHasIndStage)
 	{
-		uid_data.tevind_n_bs |= bpmem.tevind[n].bs << (2*n);
-		uid_data.tevind_n_bt |= bpmem.tevind[n].bt << (2*n);
-		uid_data.tevind_n_fmt |= bpmem.tevind[n].fmt << (2*n);
+		uid_data.tevind_n.bs |= bpmem.tevind[n].bs << (2*n);
+		uid_data.tevind_n.bt |= bpmem.tevind[n].bt << (2*n);
+		uid_data.tevind_n.fmt |= bpmem.tevind[n].fmt << (2*n);
 
 		out.Write("// indirect op\n");
 		// perform the indirect op on the incoming regular coordinates using indtex%d as the offset coords
@@ -758,14 +735,12 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		out.Write("float3 indtevcrd%d = indtex%d * %s;\n", n, bpmem.tevind[n].bt, tevIndFmtScale[bpmem.tevind[n].fmt]);
 
 		// bias
-		if (n < 8) { uid_data.tevind_n_bias1 |= bpmem.tevind[n].bias << (3*n); } /// XXX: brackets?
-		else uid_data.tevind_n_bias2 |= bpmem.tevind[n].bias << (3*n - 24);
+		uid_data.tevind_n.Set_bias(n, bpmem.tevind[n].bias);
 		if (bpmem.tevind[n].bias != ITB_NONE )
 			out.Write("indtevcrd%d.%s += %s;\n", n, tevIndBiasField[bpmem.tevind[n].bias], tevIndBiasAdd[bpmem.tevind[n].fmt]);
 
 		// multiply by offset matrix and scale
-		if (n < 8) { uid_data.tevind_n_mid1 |= bpmem.tevind[n].mid << (4*n); } /// XXX: brackets?
-		else uid_data.tevind_n_mid2 |= bpmem.tevind[n].mid << (4*n - 32);
+		uid_data.tevind_n.Set_mid(n, bpmem.tevind[n].mid);
 		if (bpmem.tevind[n].mid != 0)
 		{
 			if (bpmem.tevind[n].mid <= 3)
@@ -798,13 +773,9 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		// ---------
 		// Wrapping
 		// ---------
-
-		if (n < 8) { uid_data.tevind_n_sw1 |= bpmem.tevind[n].sw << (3 * n); }
-		else uid_data.tevind_n_sw2 |= bpmem.tevind[n].sw << (3 * n - 24);
-		if (n < 8) { uid_data.tevind_n_tw1 |= bpmem.tevind[n].tw << (3 * n); }
-		else uid_data.tevind_n_tw2 |= bpmem.tevind[n].tw << (3 * n - 24);
-
-		uid_data.tevind_n_fb_addprev |= bpmem.tevind[n].fb_addprev << n;
+		uid_data.tevind_n.Set_sw(n, bpmem.tevind[n].sw);
+		uid_data.tevind_n.Set_tw(n, bpmem.tevind[n].tw);
+		uid_data.tevind_n.fb_addprev |= bpmem.tevind[n].fb_addprev << n;
 
 		// wrap S
 		if (bpmem.tevind[n].sw == ITW_OFF)
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 98afec2c5b..3c6db3fa8f 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -99,23 +99,54 @@ struct pixel_shader_uid_data
         u32 bc3 : 3;
         u32 bi4 : 3;
         u32 bc4 : 3;
+		void SetValues(int index, u32 texcoord, u32 texmap)
+		{
+			if (index == 0) { bc0 = texcoord; bi0 = texmap; }
+			else if (index == 1) { bc1 = texcoord; bi1 = texmap; }
+			else if (index == 2) { bc3 = texcoord; bi2 = texmap; }
+			else if (index == 3) { bc4 = texcoord; bi4 = texmap; }
+		}
 	} tevindref;
 
 	u32 tevorders_n_texcoord1 : 24; // 8 x 3 bit
 	u32 tevorders_n_texcoord2 : 24; // 8 x 3 bit
-	u32 tevind_n_sw1 : 24; // 8 x 3 bit
-	u32 tevind_n_sw2 : 24; // 8 x 3 bit
-	u32 tevind_n_tw1 : 24; // 8 x 3 bit
-	u32 tevind_n_tw2 : 24; // 8 x 3 bit
-	u32 tevind_n_fb_addprev : 16; // 16 x 1 bit
+	struct
+	{
+		u32 sw1 : 24;        // 8 x 3 bit
+		u32 sw2 : 24;        // 8 x 3 bit
+		u32 tw1 : 24;        // 8 x 3 bit
+		u32 tw2 : 24;        // 8 x 3 bit
+		u32 fb_addprev : 16; // 16 x 1 bit
+		u32 bs : 32;         // 16 x 2 bit
+		u32 fmt : 32;        // 16 x 2 bit
+		u32 bt : 32;         // 16 x 2 bit
+		u32 bias1 : 24;      // 8 x 3 bit
+		u32 bias2 : 24;      // 8 x 3 bit
+		u32 mid1 : 32;       // 8 x 4 bit
+		u32 mid2 : 32;       // 8 x 4 bit
 
-	u32 tevind_n_bs : 32; // 16 x 2 bit
-	u32 tevind_n_fmt : 32; // 16 x 2 bit
-	u32 tevind_n_bt : 32; // 16 x 2 bit
-	u32 tevind_n_bias1 : 24; // 8 x 3 bit
-	u32 tevind_n_bias2 : 24; // 8 x 3 bit
-	u32 tevind_n_mid1 : 32; // 8 x 4 bit
-	u32 tevind_n_mid2 : 32; // 8 x 4 bit
+		// NOTE: These assume that the affected bits are zero before calling
+		void Set_sw(int index, u32 val)
+		{
+			if (index < 8) sw1 |= val << (3*index);
+			else sw2 |= val << (3*index - 24);
+		}
+		void Set_tw(int index, u32 val)
+		{
+			if (index < 8) tw1 |= val << (3*index);
+			else tw2 |= val << (3*index - 24);
+		}
+		void Set_bias(int index, u32 val)
+		{
+			if (index < 8) bias1 |= val << (3*index);
+			else bias2 |= val << (3*index - 24);
+		}
+		void Set_mid(int index, u32 val)
+		{
+			if (index < 8) mid1 |= val << (4*index);
+			else mid2 |= val << (4*index - 32);
+		}
+	} tevind_n;
 
 	u32 tevksel_n_swap : 32; // 8 x 2 bit (swap1) + 8 x 2 bit (swap2)
 	struct

From a60e1a3db8baae58b759b8b905436a1e52fb81e2 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Sun, 31 Mar 2013 23:57:39 +0200
Subject: [PATCH 033/352] ShaderGen: Remove some TODOs and fix an issue with
 per pixel lighting.

---
 Source/Core/VideoCommon/Src/PixelShaderGen.cpp  | 6 +-----
 Source/Core/VideoCommon/Src/VertexShaderGen.cpp | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 8d1d268197..69c096f002 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -269,9 +269,6 @@ const char *WriteLocation(API_TYPE ApiType)
 template<class T>
 void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
-	// TODO: Where does this TODO belong again...?
-	// TODO: Can be optimized if using alpha pass
-
 	// Non-uid template parameters will write to the dummy data (=> gets optimized out)
 	pixel_shader_uid_data dummy_data;
 	pixel_shader_uid_data& uid_data = (&out.template GetUidData<pixel_shader_uid_data>() != NULL)
@@ -292,9 +289,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	out.Write("//%i TEV stages, %i texgens, XXX IND stages\n",
 		numStages, numTexgen/*, bpmem.genMode.numindstages*/);
 
-//	uid_data.components = components; // TODO: Enable once per pixel lighting is implemented again
 	uid_data.dstAlphaMode = dstAlphaMode;
-
 	uid_data.genMode.numindstages = bpmem.genMode.numindstages;
 	uid_data.genMode.numtevstages = bpmem.genMode.numtevstages;
 	uid_data.genMode.numtexgens = bpmem.genMode.numtexgens;
@@ -482,6 +477,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 
 		out.SetConstantsUsed(C_PLIGHTS, C_PLIGHTS+39); // TODO: Can be optimized further
 		out.SetConstantsUsed(C_PMATERIALS, C_PMATERIALS+3);
+		uid_data.components = components;
 		GenerateLightingShader<T>(out, uid_data.lighting, components, I_PMATERIALS, I_PLIGHTS, "colors_", "colors_");
 	}
 
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 82e7a7fdce..48b09a9eac 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -46,7 +46,6 @@ static void DefineVSOutputStructMember(T& object, API_TYPE api_type, const char*
 	}
 }
 
-// TODO: Check if something goes wrong if the cached shaders used pixel lighting but it's disabled later??
 template<class T>
 static void GenerateVSOutputStruct(T& object, u32 components, API_TYPE api_type)
 {

From ec5f596b3175e06c8d27ae2053213813db3693ef Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Wed, 10 Apr 2013 12:17:28 +0200
Subject: [PATCH 034/352] VertexShaderGen: More per-pixel-lighting fixes.

---
 Source/Core/VideoCommon/Src/VertexShaderGen.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 48b09a9eac..452ee7fd3f 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -420,7 +420,7 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 		out.Write("o.tex3.w = o.pos.w;\n");
 	}
 
-/*	if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
+	if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
 	{
 		if (xfregs.numTexGen.numTexGens < 7) {
 			out.Write("o.Normal = float4(_norm0.x,_norm0.y,_norm0.z,pos.z);\n");
@@ -438,7 +438,7 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 
 		if (components & VB_HAS_COL1)
 			out.Write("o.colors_1 = color1;\n");
-	}*/
+	}
 
 	//write the true depth value, if the game uses depth textures pixel shaders will override with the correct values
 	//if not early z culling will improve speed

From ec08914905ca1c4fe3b2456a9cc037a3f7eedd49 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Wed, 10 Apr 2013 12:54:22 +0200
Subject: [PATCH 035/352] Move Shader UID mismatch checking to VideoCommon.

---
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   |  7 ++
 Source/Core/VideoCommon/Src/PixelShaderGen.h  |  1 -
 Source/Core/VideoCommon/Src/ShaderGenCommon.h | 47 ++++++++++++++
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  |  7 ++
 .../Src/ProgramShaderCache.cpp                | 64 -------------------
 5 files changed, 61 insertions(+), 65 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 69c096f002..2d9121856c 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -1207,6 +1207,13 @@ static void WriteFog(T& out, pixel_shader_uid_data& uid_data)
 void GetPixelShaderUid(PixelShaderUid& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
 	GeneratePixelShader<PixelShaderUid>(object, dstAlphaMode, ApiType, components);
+
+	if (g_ActiveConfig.bEnableShaderDebugging)
+	{
+		PixelShaderCode code;
+		GeneratePixelShaderCode(code, dstAlphaMode, API_OPENGL, components);
+		CheckForUidMismatch<PixelShaderUid,PixelShaderCode>(code, object);
+	}
 }
 
 void GeneratePixelShaderCode(PixelShaderCode& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 3c6db3fa8f..001ab53f0b 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -226,7 +226,6 @@ typedef ShaderUid<pixel_shader_uid_data> PixelShaderUid;
 typedef ShaderCode PixelShaderCode; // TODO: Obsolete
 typedef ShaderConstantProfile PixelShaderConstantProfile; // TODO: Obsolete
 
-
 void GeneratePixelShaderCode(PixelShaderCode& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
 void GetPixelShaderUid(PixelShaderUid& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
 void GetPixelShaderConstantProfile(PixelShaderConstantProfile& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components);
diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index 4d41cd62f1..07af93c295 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -22,6 +22,8 @@
 #include <stdarg.h>
 #include <string.h>
 #include <vector>
+#include <algorithm>
+#include <typeinfo>
 
 #include "CommonTypes.h"
 #include "VideoCommon.h"
@@ -166,4 +168,49 @@ struct LightingUidData
 	} lit_chans[4];
 };
 
+struct pixel_shader_uid_data;
+struct vertex_shader_uid_data;
+
+typedef ShaderUid<pixel_shader_uid_data> PixelShaderUid;
+typedef ShaderUid<vertex_shader_uid_data> VertexShaderUid;
+
+template<class UidT, class CodeT>
+void CheckForUidMismatch(CodeT& new_code, const UidT& new_uid)
+{
+	static std::map<UidT,std::string> s_shaders;
+	static std::vector<UidT> s_uids;
+
+	bool uid_is_indexed = std::find(s_uids.begin(), s_uids.end(), new_uid) != s_uids.end();
+	if (!uid_is_indexed)
+	{
+		s_uids.push_back(new_uid);
+		s_shaders[new_uid] = new_code.GetBuffer();
+	}
+	else
+	{
+		// uid is already in the index => check if there's a shader with the same uid but different code
+		auto& old_code = s_shaders[new_uid];
+		if (strcmp(old_code.c_str(), new_code.GetBuffer()) != 0)
+		{
+			static int num_failures = 0;
+
+			char szTemp[MAX_PATH];
+			sprintf(szTemp, "%s%ssuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(),
+					(typeid(UidT) == typeid(PixelShaderUid)) ? "p" : (typeid(UidT) == typeid(VertexShaderUid)) ? "v" : "o",
+					++num_failures);
+
+			// TODO: Should also dump uids
+			std::ofstream file;
+			OpenFStream(file, szTemp, std::ios_base::out);
+			file << "Old shader code:\n" << old_code;
+			file << "\n\nNew shader code:\n" << new_code.GetBuffer();
+			file.close();
+
+			// TODO: Make this more idiot-proof
+			ERROR_LOG(VIDEO, "%s shader uid mismatch!",
+					  (typeid(UidT) == typeid(PixelShaderUid)) ? "Pixel" : (typeid(UidT) == typeid(VertexShaderUid)) ? "Vertex" : "Other");
+		}
+	}
+}
+
 #endif // _SHADERGENCOMMON_H
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 452ee7fd3f..7c1553890b 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -524,6 +524,13 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 void GetVertexShaderUid(VertexShaderUid& object, u32 components, API_TYPE api_type)
 {
 	GenerateVertexShader<VertexShaderUid>(object, components, api_type);
+
+	if (g_ActiveConfig.bEnableShaderDebugging)
+	{
+		VertexShaderCode code;
+		GenerateVertexShaderCode(code, components, API_OPENGL);
+		CheckForUidMismatch<VertexShaderUid,VertexShaderCode>(code, object);
+	}
 }
 
 void GenerateVertexShaderCode(VertexShaderCode& object, u32 components, API_TYPE api_type)
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index 81621d2d38..0d571c29a9 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -23,9 +23,6 @@
 #include "ImageWrite.h"
 #include "Render.h"
 
-#include <algorithm>
-#include <typeinfo>
-
 namespace OGL
 {
 
@@ -356,73 +353,12 @@ GLuint ProgramShaderCache::CompileSingleShader (GLuint type, const char* code )
 	return result;
 }
 
-template<class UidT> UidT GetPartialUid(const SHADERUID& uid);
-template<> PixelShaderUid GetPartialUid(const SHADERUID& uid) { return uid.puid; }
-template<> VertexShaderUid GetPartialUid(const SHADERUID& uid) { return uid.vuid; }
-
-template<class UidT> const std::string& GetShaderCode(const SHADER& shader);
-template<> const std::string& GetShaderCode<PixelShaderUid>(const SHADER& shader) { return shader.strpprog; }
-template<> const std::string& GetShaderCode<VertexShaderUid>(const SHADER& shader) { return shader.strvprog; }
-
-template<class UidT, class CodeT>
-void CheckForUidMismatch(const ProgramShaderCache::PCache& cache, CodeT& new_code, const UidT& new_uid)
-{
-	static std::map<UidT,std::string> s_shaders;
-	static std::vector<UidT> s_uids;
-
-	bool uid_is_indexed = std::find(s_uids.begin(), s_uids.end(), new_uid) != s_uids.end();
-	if (!uid_is_indexed)
-	{
-		s_uids.push_back(new_uid);
-		s_shaders[new_uid] = new_code.GetBuffer();
-	}
-	else
-	{
-		// uid is already in the index => check if there's a shader with the same uid but different code
-		auto& old_code = s_shaders[new_uid];
-		if (strcmp(old_code.c_str(), new_code.GetBuffer()) != 0)
-		{
-			static int num_failures = 0;
-
-			char szTemp[MAX_PATH];
-			sprintf(szTemp, "%s%ssuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(),
-					(typeid(UidT) == typeid(PixelShaderUid)) ? "p" : (typeid(UidT) == typeid(VertexShaderUid)) ? "v" : "o",
-					++num_failures);
-
-			// TODO: Should also dump uids
-			std::ofstream file;
-			OpenFStream(file, szTemp, std::ios_base::out);
-			file << "Old shader code:\n" << old_code;
-			file << "\n\nNew shader code:\n" << new_code.GetBuffer();
-			file.close();
-
-			// TODO: Make this more idiot-proof
-			ERROR_LOG(VIDEO, "%s shader uid mismatch!",
-					  (typeid(UidT) == typeid(PixelShaderUid)) ? "Pixel" : (typeid(UidT) == typeid(VertexShaderUid)) ? "Vertex" : "Other");
-		}
-	}
-}
-
-
 void ProgramShaderCache::GetShaderId(SHADERUID* uid, DSTALPHA_MODE dstAlphaMode, u32 components)
 {
 	GetPixelShaderUid(uid->puid, dstAlphaMode, API_OPENGL, components);
 	GetVertexShaderUid(uid->vuid, components, API_OPENGL);
-
-	if (g_ActiveConfig.bEnableShaderDebugging)
-	{
-		PixelShaderCode pcode;
-		VertexShaderCode vcode;
-
-		GeneratePixelShaderCode(pcode, dstAlphaMode, API_OPENGL, components);
-		GenerateVertexShaderCode(vcode, components, API_OPENGL);
-
-		CheckForUidMismatch<PixelShaderUid,PixelShaderCode>(pshaders, pcode, uid->puid);
-		CheckForUidMismatch<VertexShaderUid,VertexShaderCode>(pshaders, vcode, uid->vuid);
-	}
 }
 
-
 ProgramShaderCache::PCacheEntry ProgramShaderCache::GetShaderProgram(void)
 {
 	return *last_entry;

From 31d2cab8d3a6344043e00731d9892670e490129d Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Wed, 10 Apr 2013 12:55:42 +0200
Subject: [PATCH 036/352] Add ShaderGenCommon to vcproj file list.

---
 Source/Core/VideoCommon/VideoCommon.vcxproj         | 1 +
 Source/Core/VideoCommon/VideoCommon.vcxproj.filters | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj
index f785cb5c84..1baf417797 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcxproj
+++ b/Source/Core/VideoCommon/VideoCommon.vcxproj
@@ -250,6 +250,7 @@
     <ClInclude Include="Src\PixelShaderGen.h" />
     <ClInclude Include="Src\PixelShaderManager.h" />
     <ClInclude Include="Src\RenderBase.h" />
+    <ClInclude Include="Src\ShaderGenCommon.h" />
     <ClInclude Include="Src\Statistics.h" />
     <ClInclude Include="Src\TextureCacheBase.h" />
     <ClInclude Include="Src\TextureConversionShader.h" />
diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters
index 330b23d370..e988d34e12 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters
+++ b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters
@@ -258,6 +258,9 @@
     <ClInclude Include="Src\FPSCounter.h">
       <Filter>Util</Filter>
     </ClInclude>
+    <ClInclude Include="Src\ShaderGenCommon.h">
+      <Filter>Shader Generators</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="CMakeLists.txt" />
@@ -291,4 +294,4 @@
       <UniqueIdentifier>{e2a527a2-ccc8-4ab8-a93e-dd2628c0f3b6}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file

From fab4f1d0a50c2c4c0a4e7e41b6ebe58118438dc0 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Wed, 10 Apr 2013 13:38:31 +0200
Subject: [PATCH 037/352] LightingShaderGen: Improve code flexibility.

---
 .../Core/VideoCommon/Src/LightingShaderGen.h  | 63 ++++++++++++++-----
 1 file changed, 48 insertions(+), 15 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.h b/Source/Core/VideoCommon/Src/LightingShaderGen.h
index ff19b737f4..2a354aaf8d 100644
--- a/Source/Core/VideoCommon/Src/LightingShaderGen.h
+++ b/Source/Core/VideoCommon/Src/LightingShaderGen.h
@@ -22,6 +22,41 @@
 #include "NativeVertexFormat.h"
 #include "XFMemory.h"
 
+static const char* LightCol(const char* lightsName, unsigned int index, const char* swizzle)
+{
+	static char result[16];
+	snprintf(result, sizeof(result), "%s[%d].col.%s", lightsName, index, swizzle);
+	return result;
+}
+
+static const char* LightCosAtt(const char* lightsName, unsigned int index)
+{
+	static char result[16];
+	snprintf(result, sizeof(result), "%s[%d].cosatt", lightsName, index);
+	return result;
+}
+
+static const char* LightDistAtt(const char* lightsName, unsigned int index)
+{
+	static char result[16];
+	snprintf(result, sizeof(result), "%s[%d].distatt", lightsName, index);
+	return result;
+}
+
+static const char* LightPos(const char* lightsName, unsigned int index)
+{
+	static char result[16];
+	snprintf(result, sizeof(result), "%s[%d].pos", lightsName, index);
+	return result;
+}
+
+static const char* LightDir(const char* lightsName, unsigned int index)
+{
+	static char result[16];
+	snprintf(result, sizeof(result), "%s[%d].dir", lightsName, index);
+	return result;
+}
+
 template<class T>
 static void GenerateLightShader(T& object, LightingUidData& uid_data, int index, int litchan_index, const char* lightsName, int coloralpha)
 {
@@ -36,13 +71,13 @@ static void GenerateLightShader(T& object, LightingUidData& uid_data, int index,
 		// atten disabled
 		switch (chan.diffusefunc) {
 			case LIGHTDIF_NONE:
-				object.Write("lacc.%s += %s[%d].col.%s;\n", swizzle, lightsName, index, swizzle);
+				object.Write("lacc.%s += %s;\n", swizzle, LightCol(lightsName, index, swizzle));
 				break;
 			case LIGHTDIF_SIGN:
 			case LIGHTDIF_CLAMP:
-				object.Write("ldir = normalize(%s[%d].pos.xyz - pos.xyz);\n", lightsName, index);
-				object.Write("lacc.%s += %sdot(ldir, _norm0)) * %s[%d].col.%s;\n",
-					swizzle, chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(", lightsName, index, swizzle);
+				object.Write("ldir = normalize(%s.xyz - pos.xyz);\n", LightPos(lightsName, index));
+				object.Write("lacc.%s += %sdot(ldir, _norm0)) * %s;\n",
+					swizzle, chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(", LightCol(lightsName, index, swizzle));
 				break;
 			default: _assert_(0);
 		}
@@ -51,33 +86,31 @@ static void GenerateLightShader(T& object, LightingUidData& uid_data, int index,
 
 		if (chan.attnfunc == 3)
 		{ // spot
-			object.Write("ldir = %s[%d].pos.xyz - pos.xyz;\n", lightsName, index);
+			object.Write("ldir = %s.xyz - pos.xyz;\n", LightPos(lightsName, index));
 			object.Write("dist2 = dot(ldir, ldir);\n"
 						"dist = sqrt(dist2);\n"
 						"ldir = ldir / dist;\n"
-						"attn = max(0.0f, dot(ldir, %s[%d].dir.xyz));\n", lightsName, index);
-			object.Write("attn = max(0.0f, dot(%s[%d].cosatt.xyz, float3(1.0f, attn, attn*attn))) / dot(%s[%d].distatt.xyz, float3(1.0f,dist,dist2));\n", lightsName, index, lightsName, index);
+						"attn = max(0.0f, dot(ldir, %s.xyz));\n", LightDir(lightsName, index));
+			object.Write("attn = max(0.0f, dot(%s.xyz, float3(1.0f, attn, attn*attn))) / dot(%s.xyz, float3(1.0f,dist,dist2));\n", LightCosAtt(lightsName, index), LightDistAtt(lightsName, index));
 		}
 		else if (chan.attnfunc == 1)
 		{ // specular
-			object.Write("ldir = normalize(%s[%d].pos.xyz);\n", lightsName, index);
-			object.Write("attn = (dot(_norm0,ldir) >= 0.0f) ? max(0.0f, dot(_norm0, %s[%d].dir.xyz)) : 0.0f;\n", lightsName, index);
-			object.Write("attn = max(0.0f, dot(%s[%d].cosatt.xyz, float3(1,attn,attn*attn))) / dot(%s[%d].distatt.xyz, float3(1,attn,attn*attn));\n", lightsName, index, lightsName, index);
+			object.Write("ldir = normalize(%s.xyz);\n", LightPos(lightsName, index));
+			object.Write("attn = (dot(_norm0,ldir) >= 0.0f) ? max(0.0f, dot(_norm0, %s.xyz)) : 0.0f;\n", LightDir(lightsName, index));
+			object.Write("attn = max(0.0f, dot(%s.xyz, float3(1,attn,attn*attn))) / dot(%s.xyz, float3(1,attn,attn*attn));\n", LightCosAtt(lightsName, index), LightDistAtt(lightsName, index));
 		}
 
 		switch (chan.diffusefunc)
 		{
 			case LIGHTDIF_NONE:
-				object.Write("lacc.%s += attn * %s[%d].col.%s;\n", swizzle, lightsName, index, swizzle);
+				object.Write("lacc.%s += attn * %s;\n", swizzle, LightCol(lightsName, index, swizzle));
 				break;
 			case LIGHTDIF_SIGN:
 			case LIGHTDIF_CLAMP:
-				object.Write("lacc.%s += attn * %sdot(ldir, _norm0)) * %s[%d].col.%s;\n",
+				object.Write("lacc.%s += attn * %sdot(ldir, _norm0)) * %s;\n",
 					swizzle,
 					chan.diffusefunc != LIGHTDIF_SIGN ? "max(0.0f," :"(",
-					lightsName,
-					index,
-					swizzle);
+					LightCol(lightsName, index, swizzle));
 				break;
 			default: _assert_(0);
 		}

From abde070f63f62a784dcb59fadd0e72013fa03acf Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Wed, 10 Apr 2013 14:25:18 +0200
Subject: [PATCH 038/352] LightingShaderGen: Use a float4 array for lights
 instead of a struct (uniform management in the non-UBO path is a mess
 otherwise). Also fix a small bug (cf. revision  154c533e7632).

---
 .../Core/VideoCommon/Src/LightingShaderGen.h  | 20 +++++++++----------
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   |  3 +--
 Source/Core/VideoCommon/Src/ShaderGenCommon.h |  2 +-
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  |  5 ++---
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.h b/Source/Core/VideoCommon/Src/LightingShaderGen.h
index 2a354aaf8d..b534d767cc 100644
--- a/Source/Core/VideoCommon/Src/LightingShaderGen.h
+++ b/Source/Core/VideoCommon/Src/LightingShaderGen.h
@@ -24,36 +24,36 @@
 
 static const char* LightCol(const char* lightsName, unsigned int index, const char* swizzle)
 {
-	static char result[16];
-	snprintf(result, sizeof(result), "%s[%d].col.%s", lightsName, index, swizzle);
+	static char result[32];
+	snprintf(result, sizeof(result), "%s[5*%d].%s", lightsName, index, swizzle);
 	return result;
 }
 
 static const char* LightCosAtt(const char* lightsName, unsigned int index)
 {
-	static char result[16];
-	snprintf(result, sizeof(result), "%s[%d].cosatt", lightsName, index);
+	static char result[32];
+	snprintf(result, sizeof(result), "%s[5*%d+1]", lightsName, index);
 	return result;
 }
 
 static const char* LightDistAtt(const char* lightsName, unsigned int index)
 {
-	static char result[16];
-	snprintf(result, sizeof(result), "%s[%d].distatt", lightsName, index);
+	static char result[32];
+	snprintf(result, sizeof(result), "%s[5*%d+2]", lightsName, index);
 	return result;
 }
 
 static const char* LightPos(const char* lightsName, unsigned int index)
 {
-	static char result[16];
-	snprintf(result, sizeof(result), "%s[%d].pos", lightsName, index);
+	static char result[32];
+	snprintf(result, sizeof(result), "%s[5*%d+3]", lightsName, index);
 	return result;
 }
 
 static const char* LightDir(const char* lightsName, unsigned int index)
 {
-	static char result[16];
-	snprintf(result, sizeof(result), "%s[%d].dir", lightsName, index);
+	static char result[32];
+	snprintf(result, sizeof(result), "%s[5*%d+4]", lightsName, index);
 	return result;
 }
 
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 2d9121856c..4dbb56b320 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -338,8 +338,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	out.Write("\t%sfloat4 " I_FOG"[3] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_FOG));
 
 	// For pixel lighting - TODO: Should only be defined when per pixel lighting is enabled!
-    out.Write("struct Light { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; };\n");
-	out.Write("\t%sLight " I_PLIGHTS"[8] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_PLIGHTS));
+	out.Write("\t%sfloat4 " I_PLIGHTS"[40] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_PLIGHTS));
 	out.Write("\t%sfloat4 " I_PMATERIALS"[4] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_PMATERIALS));
 
 	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index 07af93c295..8356b7defe 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-#include <string.h>
+#include <string>
 #include <vector>
 #include <algorithm>
 #include <typeinfo>
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 7c1553890b..52c3aeaf30 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -106,8 +106,7 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_POSNORMALMATRIX, "float4", I_POSNORMALMATRIX"[6]");
 	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_PROJECTION, "float4", I_PROJECTION"[4]");
 	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_MATERIALS, "float4", I_MATERIALS"[4]");
-	out.Write("struct Light { float4 col; float4 cosatt; float4 distatt; float4 pos; float4 dir; };\n");
-	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_LIGHTS,  "Light", I_LIGHTS"[8]");
+	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_LIGHTS,  "float4", I_LIGHTS"[40]");
 	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_TEXMATRICES, "float4", I_TEXMATRICES"[24]");
 	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_TRANSFORMMATRICES, "float4", I_TRANSFORMMATRICES"[64]");
 	DeclareUniform(out, api_type, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_NORMALMATRICES, "float4", I_NORMALMATRICES"[32]");
@@ -337,7 +336,7 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 					// transform the light dir into tangent space
 					uid_data.texMtxInfo[i].embosslightshift = xfregs.texMtxInfo[i].embosslightshift;
 					uid_data.texMtxInfo[i].embosssourceshift = xfregs.texMtxInfo[i].embosssourceshift;
-					out.Write("ldir = normalize(" I_LIGHTS"[%d].pos.xyz - pos.xyz);\n", texinfo.embosslightshift);
+					out.Write("ldir = normalize(%s.xyz - pos.xyz);\n", LightPos(I_LIGHTS, texinfo.embosslightshift));
 					out.Write("o.tex%d.xyz = o.tex%d.xyz + float3(dot(ldir, _norm1), dot(ldir, _norm2), 0.0f);\n", i, texinfo.embosssourceshift);
 				}
 				else

From e7a5847c304117c45cd1f9012101627043a58e95 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Wed, 10 Apr 2013 14:44:09 +0200
Subject: [PATCH 039/352] ShaderGen: Build fix.

---
 Source/Core/VideoCommon/Src/PixelShaderGen.cpp  | 2 +-
 Source/Core/VideoCommon/Src/ShaderGenCommon.h   | 7 +++----
 Source/Core/VideoCommon/Src/VertexShaderGen.cpp | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 4dbb56b320..918b8237d6 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -1211,7 +1211,7 @@ void GetPixelShaderUid(PixelShaderUid& object, DSTALPHA_MODE dstAlphaMode, API_T
 	{
 		PixelShaderCode code;
 		GeneratePixelShaderCode(code, dstAlphaMode, API_OPENGL, components);
-		CheckForUidMismatch<PixelShaderUid,PixelShaderCode>(code, object);
+		CheckForUidMismatch<PixelShaderUid,PixelShaderCode>(code, object, "Pixel", "p");
 	}
 }
 
diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index 8356b7defe..5ad20aa3c7 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -175,7 +175,7 @@ typedef ShaderUid<pixel_shader_uid_data> PixelShaderUid;
 typedef ShaderUid<vertex_shader_uid_data> VertexShaderUid;
 
 template<class UidT, class CodeT>
-void CheckForUidMismatch(CodeT& new_code, const UidT& new_uid)
+void CheckForUidMismatch(CodeT& new_code, const UidT& new_uid, const char* shader_type, const char* dump_prefix)
 {
 	static std::map<UidT,std::string> s_shaders;
 	static std::vector<UidT> s_uids;
@@ -196,7 +196,7 @@ void CheckForUidMismatch(CodeT& new_code, const UidT& new_uid)
 
 			char szTemp[MAX_PATH];
 			sprintf(szTemp, "%s%ssuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(),
-					(typeid(UidT) == typeid(PixelShaderUid)) ? "p" : (typeid(UidT) == typeid(VertexShaderUid)) ? "v" : "o",
+					dump_prefix,
 					++num_failures);
 
 			// TODO: Should also dump uids
@@ -207,8 +207,7 @@ void CheckForUidMismatch(CodeT& new_code, const UidT& new_uid)
 			file.close();
 
 			// TODO: Make this more idiot-proof
-			ERROR_LOG(VIDEO, "%s shader uid mismatch!",
-					  (typeid(UidT) == typeid(PixelShaderUid)) ? "Pixel" : (typeid(UidT) == typeid(VertexShaderUid)) ? "Vertex" : "Other");
+			ERROR_LOG(VIDEO, "%s shader uid mismatch!", shader_type);
 		}
 	}
 }
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 52c3aeaf30..294e363756 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -528,7 +528,7 @@ void GetVertexShaderUid(VertexShaderUid& object, u32 components, API_TYPE api_ty
 	{
 		VertexShaderCode code;
 		GenerateVertexShaderCode(code, components, API_OPENGL);
-		CheckForUidMismatch<VertexShaderUid,VertexShaderCode>(code, object);
+		CheckForUidMismatch<VertexShaderUid,VertexShaderCode>(code, object, "Vertex", "v");
 	}
 }
 

From 7480f5dfd678bd5bb6b05b309155c81cfa2c42f5 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Wed, 10 Apr 2013 14:55:46 +0200
Subject: [PATCH 040/352] ShaderGenCommon: Clean up.

---
 Source/Core/VideoCommon/Src/ShaderGenCommon.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index 5ad20aa3c7..e148fac54c 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -23,7 +23,6 @@
 #include <string>
 #include <vector>
 #include <algorithm>
-#include <typeinfo>
 
 #include "CommonTypes.h"
 #include "VideoCommon.h"
@@ -168,12 +167,6 @@ struct LightingUidData
 	} lit_chans[4];
 };
 
-struct pixel_shader_uid_data;
-struct vertex_shader_uid_data;
-
-typedef ShaderUid<pixel_shader_uid_data> PixelShaderUid;
-typedef ShaderUid<vertex_shader_uid_data> VertexShaderUid;
-
 template<class UidT, class CodeT>
 void CheckForUidMismatch(CodeT& new_code, const UidT& new_uid, const char* shader_type, const char* dump_prefix)
 {

From a03c35eb70ad88fecc69abb3605909ba1b8bb6fa Mon Sep 17 00:00:00 2001
From: skidau <skidau@gmail.com>
Date: Thu, 25 Apr 2013 10:33:57 +1000
Subject: [PATCH 041/352] Removed the old Accurate VBeam emulation setting from
 the game ini's.

---
 Data/User/GameConfig/G3FE69.ini | 1 -
 Data/User/GameConfig/G3FF69.ini | 1 -
 Data/User/GameConfig/G3FP69.ini | 1 -
 Data/User/GameConfig/GM4E01.ini | 1 -
 Data/User/GameConfig/GM4J01.ini | 1 -
 Data/User/GameConfig/GM4P01.ini | 1 -
 Data/User/GameConfig/GSWE64.ini | 1 -
 Data/User/GameConfig/GSWP64.ini | 1 -
 Data/User/GameConfig/GSWS64.ini | 1 -
 Data/User/GameConfig/RBHE08.ini | 1 -
 Data/User/GameConfig/RBHJ08.ini | 1 -
 Data/User/GameConfig/RBHP08.ini | 1 -
 12 files changed, 12 deletions(-)

diff --git a/Data/User/GameConfig/G3FE69.ini b/Data/User/GameConfig/G3FE69.ini
index 2f628b7bab..6e902ad0fa 100644
--- a/Data/User/GameConfig/G3FE69.ini
+++ b/Data/User/GameConfig/G3FE69.ini
@@ -15,7 +15,6 @@ PH_ZFar =
 [Gecko]
 [Core]
 MMU = 1
-VBeam = 1
 BlockMerging = 1
 [Video_Settings]

 SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/G3FF69.ini b/Data/User/GameConfig/G3FF69.ini
index 7367649d4b..37af95e657 100644
--- a/Data/User/GameConfig/G3FF69.ini
+++ b/Data/User/GameConfig/G3FF69.ini
@@ -15,7 +15,6 @@ PH_ZFar =
 [Gecko]
 [Core]
 MMU = 1
-VBeam = 1
 BlockMerging = 1
 [Video_Settings]

 SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/G3FP69.ini b/Data/User/GameConfig/G3FP69.ini
index 0272d70fde..cd74b017bf 100644
--- a/Data/User/GameConfig/G3FP69.ini
+++ b/Data/User/GameConfig/G3FP69.ini
@@ -15,7 +15,6 @@ PH_ZFar =
 [Gecko]
 [Core]
 MMU = 1
-VBeam = 1
 BlockMerging = 1
 [Video_Settings]

 SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/GM4E01.ini b/Data/User/GameConfig/GM4E01.ini
index c63b0d8a1b..5daa37570e 100644
--- a/Data/User/GameConfig/GM4E01.ini
+++ b/Data/User/GameConfig/GM4E01.ini
@@ -128,4 +128,3 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Core]
-VBeam = 1
diff --git a/Data/User/GameConfig/GM4J01.ini b/Data/User/GameConfig/GM4J01.ini
index 9431bc933a..b9d39df920 100644
--- a/Data/User/GameConfig/GM4J01.ini
+++ b/Data/User/GameConfig/GM4J01.ini
@@ -14,4 +14,3 @@ PH_ZNear =
 PH_ZFar = 
 [Gecko]
 [Core]
-VBeam = 1
diff --git a/Data/User/GameConfig/GM4P01.ini b/Data/User/GameConfig/GM4P01.ini
index f9cd8b3a71..1ab428de05 100644
--- a/Data/User/GameConfig/GM4P01.ini
+++ b/Data/User/GameConfig/GM4P01.ini
@@ -139,4 +139,3 @@ $Goraud Shading
 [Video]
 ProjectionHack = 0
 [Core]
-VBeam = 1
diff --git a/Data/User/GameConfig/GSWE64.ini b/Data/User/GameConfig/GSWE64.ini
index 75f82caf63..95246f3c8f 100644
--- a/Data/User/GameConfig/GSWE64.ini
+++ b/Data/User/GameConfig/GSWE64.ini
@@ -3,7 +3,6 @@
 MMU = 1
 BAT = 1
 FastDiscSpeed = 1
-VBeam = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationIssues = 
 EmulationStateId = 3
diff --git a/Data/User/GameConfig/GSWP64.ini b/Data/User/GameConfig/GSWP64.ini
index c580edee4f..3083317042 100644
--- a/Data/User/GameConfig/GSWP64.ini
+++ b/Data/User/GameConfig/GSWP64.ini
@@ -3,7 +3,6 @@
 MMU = 1
 BAT = 1
 FastDiscSpeed = 1
-VBeam = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationIssues = 
 EmulationStateId = 3
diff --git a/Data/User/GameConfig/GSWS64.ini b/Data/User/GameConfig/GSWS64.ini
index 8bcb77f296..5f3512743a 100644
--- a/Data/User/GameConfig/GSWS64.ini
+++ b/Data/User/GameConfig/GSWS64.ini
@@ -3,7 +3,6 @@
 MMU = 1
 BAT = 1
 FastDiscSpeed = 1
-VBeam = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationIssues = 
 EmulationStateId = 3
diff --git a/Data/User/GameConfig/RBHE08.ini b/Data/User/GameConfig/RBHE08.ini
index 80fb2a796e..2def435787 100644
--- a/Data/User/GameConfig/RBHE08.ini
+++ b/Data/User/GameConfig/RBHE08.ini
@@ -1,6 +1,5 @@
 # RBHE08 - Resident Evil Archives: Resident Evil Zero
 [Core] Values set here will override the main dolphin settings.
-VBeam = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 5
 EmulationIssues = 
diff --git a/Data/User/GameConfig/RBHJ08.ini b/Data/User/GameConfig/RBHJ08.ini
index 7ed45e1ee7..6ff5f267ba 100644
--- a/Data/User/GameConfig/RBHJ08.ini
+++ b/Data/User/GameConfig/RBHJ08.ini
@@ -1,6 +1,5 @@
 # RBHJ08 - Biohazard 0
 [Core] Values set here will override the main dolphin settings.
-VBeam = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 5
 EmulationIssues = 
diff --git a/Data/User/GameConfig/RBHP08.ini b/Data/User/GameConfig/RBHP08.ini
index ee4c6ec35f..0703e1fc4f 100644
--- a/Data/User/GameConfig/RBHP08.ini
+++ b/Data/User/GameConfig/RBHP08.ini
@@ -1,6 +1,5 @@
 # RBHP08 - Resident Evil Archives: Resident Evil Zero
 [Core] Values set here will override the main dolphin settings.
-VBeam = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 5
 EmulationIssues = 

From a2b543d47f81af22cb70182bde84a23f719a35f0 Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Thu, 25 Apr 2013 14:23:56 +1200
Subject: [PATCH 042/352] request_queue may not have anything in it on return
 from ExecuteCommand i.e. when calling ES_Launch and everything is reset.

Don't call Update after queuing a request.
---
 Source/Core/Core/Src/HW/WII_IPC.cpp          | 7 +++++--
 Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Source/Core/Core/Src/HW/WII_IPC.cpp b/Source/Core/Core/Src/HW/WII_IPC.cpp
index dce6c3481b..b77ba33ef9 100644
--- a/Source/Core/Core/Src/HW/WII_IPC.cpp
+++ b/Source/Core/Core/Src/HW/WII_IPC.cpp
@@ -212,8 +212,11 @@ void Write32(const u32 _Value, const u32 _Address)
 		_dbg_assert_msg_(WII_IPC, 0, "w32 %08x @ %08x", _Value, _Address);
 		break;
 	}	
-
-	//WII_IPC_HLE_Interface::Update();
+	
+	if((_Address & 0xFFFF) != IPC_PPCCTRL)
+	{
+		WII_IPC_HLE_Interface::Update();	
+	}
 	CoreTiming::ScheduleEvent_Threadsafe(0, updateInterrupts, 0);
 }
 
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
index 989c43aac9..fc77354947 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
@@ -566,7 +566,8 @@ void Update()
 		INFO_LOG(WII_IPC_HLE, "||-- Acknowledge IPC Request @ 0x%08x", request_queue.front());
 
 		ExecuteCommand(request_queue.front());
-		request_queue.pop_front();
+		if(request_queue.size())
+			request_queue.pop_front();
 
 #if MAX_LOGLEVEL >= DEBUG_LEVEL
 		Dolphin_Debugger::PrintCallstack(LogTypes::WII_IPC_HLE, LogTypes::LDEBUG);

From 7c50ac931d79be9e1f4d62053af3764fdf93e9d6 Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Thu, 25 Apr 2013 14:37:12 +1200
Subject: [PATCH 043/352] Update before enqueue.

---
 Source/Core/Core/Src/HW/WII_IPC.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Core/Core/Src/HW/WII_IPC.cpp b/Source/Core/Core/Src/HW/WII_IPC.cpp
index b77ba33ef9..0a7c31110d 100644
--- a/Source/Core/Core/Src/HW/WII_IPC.cpp
+++ b/Source/Core/Core/Src/HW/WII_IPC.cpp
@@ -182,6 +182,7 @@ void Write32(const u32 _Value, const u32 _Address)
 			if (ctrl.X1)
 			{
 				INFO_LOG(WII_IPC, "New pointer available: %08x", ppc_msg);
+				WII_IPC_HLE_Interface::Update();	
 				// Let the HLE handle the request on it's own time
 				WII_IPC_HLE_Interface::EnqRequest(ppc_msg);
 			}

From d18b71ccf91c9578236b44ae26e8bc35314cc180 Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Thu, 25 Apr 2013 15:28:42 +1200
Subject: [PATCH 044/352] Back to broken ES_launch but 4 wiimotes working.

---
 Source/Core/Core/Src/HW/WII_IPC.cpp          | 8 ++------
 Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp | 7 +++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Source/Core/Core/Src/HW/WII_IPC.cpp b/Source/Core/Core/Src/HW/WII_IPC.cpp
index 0a7c31110d..b09d83f44b 100644
--- a/Source/Core/Core/Src/HW/WII_IPC.cpp
+++ b/Source/Core/Core/Src/HW/WII_IPC.cpp
@@ -182,7 +182,6 @@ void Write32(const u32 _Value, const u32 _Address)
 			if (ctrl.X1)
 			{
 				INFO_LOG(WII_IPC, "New pointer available: %08x", ppc_msg);
-				WII_IPC_HLE_Interface::Update();	
 				// Let the HLE handle the request on it's own time
 				WII_IPC_HLE_Interface::EnqRequest(ppc_msg);
 			}
@@ -212,12 +211,9 @@ void Write32(const u32 _Value, const u32 _Address)
 	default:
 		_dbg_assert_msg_(WII_IPC, 0, "w32 %08x @ %08x", _Value, _Address);
 		break;
-	}	
-	
-	if((_Address & 0xFFFF) != IPC_PPCCTRL)
-	{
-		WII_IPC_HLE_Interface::Update();	
 	}
+	
+	WII_IPC_HLE_Interface::Update();
 	CoreTiming::ScheduleEvent_Threadsafe(0, updateInterrupts, 0);
 }
 
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
index fc77354947..439d37c5d9 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
@@ -564,10 +564,9 @@ void Update()
 	{
 		WII_IPCInterface::GenerateAck(request_queue.front());
 		INFO_LOG(WII_IPC_HLE, "||-- Acknowledge IPC Request @ 0x%08x", request_queue.front());
-
-		ExecuteCommand(request_queue.front());
-		if(request_queue.size())
-			request_queue.pop_front();
+		u32 command = request_queue.front();
+		request_queue.pop_front();
+		ExecuteCommand(command);
 
 #if MAX_LOGLEVEL >= DEBUG_LEVEL
 		Dolphin_Debugger::PrintCallstack(LogTypes::WII_IPC_HLE, LogTypes::LDEBUG);

From eef95fa4c5919bf93335e10dd61cd5a9fd6a5f6d Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Thu, 25 Apr 2013 13:30:41 +0200
Subject: [PATCH 045/352] ShaderGenCommon: Adding documentation.

---
 Source/Core/VideoCommon/Src/ShaderGenCommon.h | 52 ++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index e148fac54c..4b3d16b8d7 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -27,18 +27,55 @@
 #include "CommonTypes.h"
 #include "VideoCommon.h"
 
+/**
+ * Common interface for classes that need to go through the shader generation path (GenerateVertexShader, GeneratePixelShader)
+ * In particular, this includes the shader code generator (ShaderCode).
+ * A different class (ShaderUid) can be used to uniquely identify each ShaderCode object.
+ * More interesting things can be done with this, e.g. ShaderConstantProfile checks what shader constants are being used. This can be used to optimize buffer management.
+ * Each of the ShaderCode, ShaderUid and ShaderConstantProfile child classes only implement the subset of ShaderGeneratorInterface methods that are required for the specific tasks.
+ */
 class ShaderGeneratorInterface
 {
 public:
+	/*
+	 * Used when the shader generator would write a piece of ShaderCode.
+	 * Can be used like printf.
+	 * @note In the ShaderCode implementation, this does indeed write the parameter string to an internal buffer. However, you're free to do whatever you like with the parameter.
+	 */
 	void Write(const char* fmt, ...) {}
+
+	/*
+	 * Returns a read pointer to the internal buffer.
+	 * @note When implementing this method in a child class, you likely want to return the argument of the last SetBuffer call here
+	 * @note SetBuffer() should be called before using GetBuffer().
+	 */
 	const char* GetBuffer() { return NULL; }
+
+	/*
+	 * Can be used to give the object a place to write to. This should be called before using Write().
+	 * @param buffer pointer to a char buffer that the object can write to
+	 */
 	void SetBuffer(char* buffer) { }
+
+	/*
+	 * Tells us that a specific constant range (including last_index) is being used by the shader
+	 */
 	inline void SetConstantsUsed(unsigned int first_index, unsigned int last_index) {}
 
+	/*
+	 * Returns a pointer to an internally stored object of the uid_data type.
+	 * @warning since most child classes use the default implementation you shouldn't access this directly without adding precautions against NULL access (e.g. via adding a dummy structure, cf. the vertex/pixel shader generators)
+	 */
 	template<class uid_data>
 	uid_data& GetUidData() { return *(uid_data*)NULL; }
 };
 
+/**
+ * Shader UID class used to uniquely identify the ShaderCode output written in the shader generator.
+ * uid_data can be any struct of parameters that uniquely identify each shader code output.
+ * Unless performance is not an issue, uid_data should be tightly packed to reduce memory footprint.
+ * Shader generators will write to specific uid_data fields; ShaderUid methods will only read raw u32 values from a union.
+ */
 template<class uid_data>
 class ShaderUid : public ShaderGeneratorInterface
 {
@@ -59,9 +96,10 @@ public:
 		return memcmp(this->values, obj.values, sizeof(values)) != 0;
 	}
 
-	// TODO: Store last frame used and order by that? makes much more sense anyway...
+	// determines the storage order inside STL containers
 	bool operator < (const ShaderUid& obj) const
 	{
+		// TODO: Store last frame used and order by that? makes much more sense anyway...
 		for (unsigned int i = 0; i < sizeof(uid_data) / sizeof(u32); ++i)
 		{
 			if (this->values[i] < obj.values[i])
@@ -107,6 +145,9 @@ private:
 	char* write_ptr;
 };
 
+/**
+ * Generates a shader constant profile which can be used to query which constants are used in a shader
+ */
 class ShaderConstantProfile : public ShaderGeneratorInterface
 {
 public:
@@ -120,6 +161,7 @@ public:
 
 	inline bool ConstantIsUsed(unsigned int index)
 	{
+		// TODO: Not ready for usage yet
 		return true;
 //		return constant_usage[index];
 	}
@@ -154,6 +196,10 @@ static void DeclareUniform(T& object, API_TYPE api_type, bool using_ubos, const
 	object.Write(";\n");
 }
 
+/**
+ * Common uid data used for shader generators that use lighting calculations.
+ * Expected to be stored as a member called "lighting".
+ */
 struct LightingUidData
 {
 	struct
@@ -167,9 +213,13 @@ struct LightingUidData
 	} lit_chans[4];
 };
 
+/**
+ * Checks if there has been
+ */
 template<class UidT, class CodeT>
 void CheckForUidMismatch(CodeT& new_code, const UidT& new_uid, const char* shader_type, const char* dump_prefix)
 {
+	// TODO: Might be sensitive to config changes
 	static std::map<UidT,std::string> s_shaders;
 	static std::vector<UidT> s_uids;
 

From 3b732f695d7f06da54e97e517849be9e27e6ef13 Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Thu, 25 Apr 2013 19:59:08 -0400
Subject: [PATCH 046/352] Show video backend and audio engine in title bar.

Fixes issue 6276.
---
 Source/Core/Core/Src/Core.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index 0d8752195f..661271e829 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -680,7 +680,8 @@ void UpdateTitle()
 	u32 Speed = DrawnVideo * (100 * 1000) / (VideoInterface::TargetRefreshRate * ElapseTime);
 
 	// Settings are shown the same for both extended and summary info
-	std::string SSettings = StringFromFormat("%s %s", cpu_core_base->GetName(),	_CoreParameter.bCPUThread ? "DC" : "SC");
+	std::string SSettings = StringFromFormat("%s %s - %s - %s", cpu_core_base->GetName(),	_CoreParameter.bCPUThread ? "DC" : "SC", 
+		_CoreParameter.m_strVideoBackend.c_str(), _CoreParameter.bDSPHLE ? "DSPHLE" : "DSPLLE");
 
 	// Use extended or summary information. The summary information does not print the ticks data,
 	// that's more of a debugging interest, it can always be optional of course if someone is interested.

From 03dfe7b816a16c976e0106b56c69c956b6cb9426 Mon Sep 17 00:00:00 2001
From: Glenn Rice <glennricster@gmail.com>
Date: Thu, 25 Apr 2013 23:41:45 -0500
Subject: [PATCH 047/352] The evdpy should be used for the X11 window creation
 and in the event thread.  dpy should only be used for GL.

---
 Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
index dd04ee0c73..4177cecb85 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
@@ -157,7 +157,7 @@ void cX11Window::CreateXWindow(void)
 
 void cX11Window::DestroyXWindow(void)
 {
-	XUnmapWindow(GLWin.dpy, GLWin.win);
+	XUnmapWindow(GLWin.evdpy, GLWin.win);
 	GLWin.win = 0;
 	if (GLWin.xEventThread.joinable())
 		GLWin.xEventThread.join();
@@ -175,9 +175,9 @@ void cX11Window::XEventThread()
 	{
 		XEvent event;
 		KeySym key;
-		for (int num_events = XPending(GLWin.dpy); num_events > 0; num_events--)
+		for (int num_events = XPending(GLWin.evdpy); num_events > 0; num_events--)
 		{
-			XNextEvent(GLWin.dpy, &event);
+			XNextEvent(GLWin.evdpy, &event);
 			switch(event.type) {
 				case KeyPress:
 					key = XLookupKeysym((XKeyEvent*)&event, 0);
@@ -305,17 +305,17 @@ void cX11Window::XEventThread()
 				case ConfigureNotify:
 					Window winDummy;
 					unsigned int borderDummy, depthDummy;
-					XGetGeometry(GLWin.dpy, GLWin.win, &winDummy, &GLWin.x, &GLWin.y,
+					XGetGeometry(GLWin.evdpy, GLWin.win, &winDummy, &GLWin.x, &GLWin.y,
 							&GLWin.width, &GLWin.height, &borderDummy, &depthDummy);
 					GLInterface->SetBackBufferDimensions(GLWin.width, GLWin.height);
 					break;
 				case ClientMessage:
 					if ((unsigned long) event.xclient.data.l[0] ==
-							XInternAtom(GLWin.dpy, "WM_DELETE_WINDOW", False))
+							XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", False))
 						Host_Message(WM_USER_STOP);
 					if ((unsigned long) event.xclient.data.l[0] ==
-							XInternAtom(GLWin.dpy, "RESIZE", False))
-						XMoveResizeWindow(GLWin.dpy, GLWin.win,
+							XInternAtom(GLWin.evdpy, "RESIZE", False))
+						XMoveResizeWindow(GLWin.evdpy, GLWin.win,
 								event.xclient.data.l[1], event.xclient.data.l[2],
 								event.xclient.data.l[3], event.xclient.data.l[4]);
 					break;

From 5afceca7a10a2d993e53ba348ee55836d7831f8e Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Fri, 26 Apr 2013 02:47:11 -0400
Subject: [PATCH 048/352] Apparently we can't trust m_strVideoBackend on osx.

---
 Source/Core/Core/Src/Core.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index 661271e829..20cbc5086a 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -681,7 +681,7 @@ void UpdateTitle()
 
 	// Settings are shown the same for both extended and summary info
 	std::string SSettings = StringFromFormat("%s %s - %s - %s", cpu_core_base->GetName(),	_CoreParameter.bCPUThread ? "DC" : "SC", 
-		_CoreParameter.m_strVideoBackend.c_str(), _CoreParameter.bDSPHLE ? "DSPHLE" : "DSPLLE");
+		g_video_backend->GetName().c_str(), _CoreParameter.bDSPHLE ? "DSPHLE" : "DSPLLE");
 
 	// Use extended or summary information. The summary information does not print the ticks data,
 	// that's more of a debugging interest, it can always be optional of course if someone is interested.

From 1666e091ef2f40c17005a134551c78b73521ca7d Mon Sep 17 00:00:00 2001
From: Glenn Rice <glennricster@gmail.com>
Date: Fri, 26 Apr 2013 10:53:46 -0500
Subject: [PATCH 049/352] Make EGL and X11 dpy/evdpy usage consistent.  EGL
 needs testing.

---
 Source/Core/DolphinWX/Src/GLInterface/GLX.cpp |  4 +-
 .../DolphinWX/Src/GLInterface/X11_Util.cpp    | 38 +++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp
index 84a753c784..929d365081 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp
@@ -25,7 +25,7 @@
 // Show the current FPS
 void cInterfaceGLX::UpdateFPSDisplay(const char *text)
 {
-	XStoreName(GLWin.dpy, GLWin.win, text);
+	XStoreName(GLWin.evdpy, GLWin.win, text);
 }
 
 void cInterfaceGLX::SwapInterval(int Interval)
@@ -136,7 +136,7 @@ bool cInterfaceGLX::MakeCurrent()
 	#if defined(HAVE_WX) && (HAVE_WX)
 	Host_GetRenderWindowSize(GLWin.x, GLWin.y,
 			(int&)GLWin.width, (int&)GLWin.height);
-	XMoveResizeWindow(GLWin.dpy, GLWin.win, GLWin.x, GLWin.y,
+	XMoveResizeWindow(GLWin.evdpy, GLWin.win, GLWin.x, GLWin.y,
 			GLWin.width, GLWin.height);
 	#endif
 	return glXMakeCurrent(GLWin.dpy, GLWin.win, GLWin.ctx);
diff --git a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
index 4177cecb85..f6e678151f 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
@@ -24,9 +24,9 @@
 #if USE_EGL
 bool cXInterface::ServerConnect(void)
 {
-	GLWin.evdpy = XOpenDisplay(NULL);
+	GLWin.dpy = XOpenDisplay(NULL);
 
-	if (!GLWin.evdpy)
+	if (!GLWin.dpy)
 		return false;
 
 	return true;
@@ -39,7 +39,7 @@ bool cXInterface::Initialize(void *config)
 	int num_visuals;
 	EGLint vid;
 
-	if (!GLWin.evdpy) {
+	if (!GLWin.dpy) {
 		printf("Error: couldn't open X display\n");
 		return false;
 	}
@@ -51,7 +51,7 @@ bool cXInterface::Initialize(void *config)
 
 	/* The X window visual must match the EGL config */
 	visTemplate.visualid = vid;
-	GLWin.vi = XGetVisualInfo(GLWin.evdpy, VisualIDMask, &visTemplate, &num_visuals);
+	GLWin.vi = XGetVisualInfo(GLWin.dpy, VisualIDMask, &visTemplate, &num_visuals);
 	if (!GLWin.vi) {
 		printf("Error: couldn't get X visual\n");
 		exit(1);
@@ -64,12 +64,12 @@ bool cXInterface::Initialize(void *config)
 	GLWin.width = _twidth;
 	GLWin.height = _theight;
 
-	GLWin.dpy = XOpenDisplay(NULL);
+	GLWin.evdpy = XOpenDisplay(NULL);
 	GLWin.parent = GLWin.win;
-	GLWin.screen = DefaultScreen(GLWin.evdpy);
+	GLWin.screen = DefaultScreen(GLWin.dpy);
 
 	if (GLWin.parent == 0)
-		GLWin.parent = RootWindow(GLWin.evdpy, GLWin.screen);
+		GLWin.parent = RootWindow(GLWin.dpy, GLWin.screen);
 
 	/* Set initial projection/viewing transformation.
 	 * We can't be sure we'll get a ConfigureNotify event when the window
@@ -82,7 +82,7 @@ bool cXInterface::Initialize(void *config)
 
 void *cXInterface::EGLGetDisplay(void)
 {
-	return eglGetDisplay(GLWin.evdpy);
+	return eglGetDisplay(GLWin.dpy);
 }
 
 void *cXInterface::CreateWindow(void)
@@ -90,22 +90,22 @@ void *cXInterface::CreateWindow(void)
 	Atom wmProtocols[1];
 
 	// Setup window attributes
-	GLWin.attr.colormap = XCreateColormap(GLWin.dpy,
+	GLWin.attr.colormap = XCreateColormap(GLWin.evdpy,
 			GLWin.parent, GLWin.vi->visual, AllocNone);
 	GLWin.attr.event_mask = KeyPressMask | StructureNotifyMask | FocusChangeMask;
-	GLWin.attr.background_pixel = BlackPixel(GLWin.dpy, GLWin.screen);
+	GLWin.attr.background_pixel = BlackPixel(GLWin.evdpy, GLWin.screen);
 	GLWin.attr.border_pixel = 0;
 
 	// Create the window
-	GLWin.win = XCreateWindow(GLWin.dpy, GLWin.parent,
+	GLWin.win = XCreateWindow(GLWin.evdpy, GLWin.parent,
 			GLWin.x, GLWin.y, GLWin.width, GLWin.height, 0,
 			GLWin.vi->depth, InputOutput, GLWin.vi->visual,
 			CWBorderPixel | CWBackPixel | CWColormap | CWEventMask, &GLWin.attr);
-	wmProtocols[0] = XInternAtom(GLWin.dpy, "WM_DELETE_WINDOW", True);
-	XSetWMProtocols(GLWin.dpy, GLWin.win, wmProtocols, 1);
-	XSetStandardProperties(GLWin.dpy, GLWin.win, "GPU", "GPU", None, NULL, 0, NULL);
-	XMapRaised(GLWin.dpy, GLWin.win);
-	XSync(GLWin.dpy, True);
+	wmProtocols[0] = XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", True);
+	XSetWMProtocols(GLWin.evdpy, GLWin.win, wmProtocols, 1);
+	XSetStandardProperties(GLWin.evdpy, GLWin.win, "GPU", "GPU", None, NULL, 0, NULL);
+	XMapRaised(GLWin.evdpy, GLWin.win);
+	XSync(GLWin.evdpy, True);
 
 	GLWin.xEventThread = std::thread(&cXInterface::XEventThread, this);
 	// Control window size and picture scaling
@@ -116,16 +116,16 @@ void *cXInterface::CreateWindow(void)
 
 void cXInterface::DestroyWindow(void)
 {
-	XDestroyWindow(GLWin.dpy, GLWin.win);
+	XDestroyWindow(GLWin.evdpy, GLWin.win);
 	GLWin.win = 0;
 	if (GLWin.xEventThread.joinable())
 		GLWin.xEventThread.join();
-	XFreeColormap(GLWin.dpy, GLWin.attr.colormap);
+	XFreeColormap(GLWin.evdpy, GLWin.attr.colormap);
 }
 
 void cXInterface::UpdateFPSDisplay(const char *text)
 {
-	XStoreName(GLWin.dpy, GLWin.win, text);
+	XStoreName(GLWin.evdpy, GLWin.win, text);
 }
 
 void cXInterface::XEventThread()

From 2c8c6304d7b02e1e94ab7a8ebfc96f27864a7481 Mon Sep 17 00:00:00 2001
From: Glenn Rice <glennricster@gmail.com>
Date: Fri, 26 Apr 2013 11:35:42 -0500
Subject: [PATCH 050/352] Make sure the EGL evdpy is closed.

---
 Source/Core/DolphinWX/Src/GLInterface/Platform.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Source/Core/DolphinWX/Src/GLInterface/Platform.cpp b/Source/Core/DolphinWX/Src/GLInterface/Platform.cpp
index 83f064615c..64e32591d8 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/Platform.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/Platform.cpp
@@ -115,7 +115,10 @@ out:
 #if HAVE_X11
 	if (selected_platform != EGL_PLATFORM_X11) {
 		if (GLWin.dpy)
+		{
 			XCloseDisplay(GLWin.dpy);
+			XCloseDisplay(GLWin.evdpy);
+		}
 	}
 #endif
 	if (selected_platform == EGL_PLATFORM_NONE)

From 8dbe2366063f74b3f15dcdf18dcaea91e4bb1a61 Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Mon, 29 Apr 2013 12:00:23 -0400
Subject: [PATCH 051/352] =?UTF-8?q?=EF=BB=BFFixing=20or=20disabling=20the?=
 =?UTF-8?q?=20"Download=20Codes=20(WiiRD=20Database)"=20button=20problem?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The "Download Codes (WiiRD Database)" button is enabled (and its click return silently without an effect) when "Tools → Cheats Manager" is opened when there's a running emulation for which there's no "[Gecko]" ini section, confusing the user about the reason for not downloading codes or showing an error when there's no running emulation

Solution

when there's a running emulation: fix the button

when there's no running emulation: disable the button (to indicate to the user that this button must be clicked elsewhere, in the ISO settings dialog, the user will realise or remember)
---
 Source/Core/DolphinWX/Src/CheatsWindow.cpp  | 2 +-
 Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp | 6 +++++-
 Source/Core/DolphinWX/Src/GeckoCodeDiag.h   | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.cpp b/Source/Core/DolphinWX/Src/CheatsWindow.cpp
index e3a51208b4..ba4918c917 100644
--- a/Source/Core/DolphinWX/Src/CheatsWindow.cpp
+++ b/Source/Core/DolphinWX/Src/CheatsWindow.cpp
@@ -39,7 +39,7 @@ wxCheatsWindow::wxCheatsWindow(wxWindow* const parent)
 	{
 		m_gameini_path = File::GetUserPath(D_GAMECONFIG_IDX) + vol->GetUniqueID() + ".ini";
 		m_gameini.Load(m_gameini_path);
-		m_geckocode_panel->LoadCodes(m_gameini);
+		m_geckocode_panel->LoadCodes(m_gameini, Core::g_CoreStartupParameter.GetUniqueID());
 	}
 	}
 
diff --git a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp
index 9f96956abc..12685fac75 100644
--- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp
+++ b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp
@@ -41,7 +41,8 @@ CodeConfigPanel::CodeConfigPanel(wxWindow* const parent)
 
 	// button sizer
 	wxBoxSizer* const sizer_buttons = new wxBoxSizer(wxHORIZONTAL);
-	wxButton* const btn_download = new wxButton(this, -1, _("Download Codes (WiiRD Database)"), wxDefaultPosition, wxSize(128, -1));
+	btn_download = new wxButton(this, -1, _("Download Codes (WiiRD Database)"), wxDefaultPosition, wxSize(128, -1));
+	btn_download->Enable(false);
 	btn_download->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CodeConfigPanel::DownloadCodes, this);
 	sizer_buttons->AddStretchSpacer(1);
 	sizer_buttons->Add(btn_download, 1, wxEXPAND);
@@ -60,6 +61,9 @@ CodeConfigPanel::CodeConfigPanel(wxWindow* const parent)
 
 void CodeConfigPanel::UpdateCodeList()
 {
+	// disable the button if it doesn't have an effect
+	btn_download->Enable(!m_gameid.empty());
+
 	m_listbox_gcodes->Clear();
 	// add the codes to the listbox
 	std::vector<GeckoCode>::const_iterator
diff --git a/Source/Core/DolphinWX/Src/GeckoCodeDiag.h b/Source/Core/DolphinWX/Src/GeckoCodeDiag.h
index 8a59e09ce2..66bbdbd4bb 100644
--- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.h
+++ b/Source/Core/DolphinWX/Src/GeckoCodeDiag.h
@@ -44,7 +44,7 @@ private:
 		wxTextCtrl		*textctrl_notes;
 		wxListBox	*listbox_codes;
 	} m_infobox;
-
+	wxButton* btn_download;
 };
 
 

From adab4e37f7dcfe9a60819a2ed1f8576b8a57a505 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Mon, 29 Apr 2013 19:37:32 +0200
Subject: [PATCH 052/352] Fix some mistakes from the master merge; some
 cleanups.

---
 Source/Core/VideoCommon/Src/PixelShaderGen.cpp  | 10 +++++-----
 Source/Core/VideoCommon/Src/PixelShaderGen.h    | 10 ++--------
 Source/Core/VideoCommon/Src/VertexShaderGen.cpp |  7 +------
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 4187c44d0f..1bf4ca25d8 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -254,7 +254,7 @@ const char *WriteLocation(API_TYPE ApiType)
 }
 
 template<class T>
-void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
+static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
 	// Non-uid template parameters will write to the dummy data (=> gets optimized out)
 	pixel_shader_uid_data dummy_data;
@@ -333,9 +333,9 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 
 	if (ApiType == API_OPENGL)
 	{
-		out.Write("COLOROUT(ocol0);\n");
+		out.Write("COLOROUT(ocol0)\n");
 		if (dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND)
-			out.Write("COLOROUT(ocol1);\n");
+			out.Write("COLOROUT(ocol1)\n");
 
 		if (per_pixel_depth)
 			out.Write("#define depth gl_FragDepth\n");
@@ -572,7 +572,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	if (Pretest == AlphaTest::UNDETERMINED)
 		WriteAlphaTest<T>(out, uid_data, ApiType, dstAlphaMode, per_pixel_depth);
 
-	
+
 	// the screen space depth value = far z + (clip z / clip w) * z range
 	if(ApiType == API_OPENGL || ApiType == API_D3D11)
 		out.Write("float zCoord = rawpos.z;\n");
@@ -584,7 +584,7 @@ void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u
 	}
 
 	// Note: depth textures are disabled if early depth test is enabled
-	uid_data.ztex.op = bpmem.ztex2.op;
+	uid_data.ztex_op = bpmem.ztex2.op;
 	uid_data.per_pixel_depth = per_pixel_depth;
 	uid_data.fog.fsel = bpmem.fog.c_proj_fsel.fsel;
 
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 024bc170b5..783f50a301 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -86,7 +86,7 @@ struct pixel_shader_uid_data
         u32 bc3 : 3;
         u32 bi4 : 3;
         u32 bc4 : 3;
-		void SetValues(int index, u32 texcoord, u32 texmap)
+		inline void SetValues(int index, u32 texcoord, u32 texmap)
 		{
 			if (index == 0) { bc0 = texcoord; bi0 = texmap; }
 			else if (index == 1) { bc1 = texcoord; bi1 = texmap; }
@@ -180,7 +180,6 @@ struct pixel_shader_uid_data
 		u32 comp0 : 3;
 		u32 comp1 : 3;
 		u32 logic : 2;
-		// TODO: ref???
 		u32 use_zcomploc_hack : 1;
 	} alpha_test;
 
@@ -194,12 +193,7 @@ struct pixel_shader_uid_data
 		u32 hex : 4;
 	} fog;
 
-	union {
-		struct {
-			u32 op : 2;
-		};
-		u32 hex : 2;
-	} ztex;
+	u32 ztex_op : 2;
 
 	u32 per_pixel_depth : 1;
 	u32 bHasIndStage : 16;
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index eac041d5c9..81b8c79553 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -80,11 +80,6 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 	_assert_(bpmem.genMode.numcolchans == xfregs.numChan.numColorChans);
 
 	bool is_d3d = (api_type & API_D3D9 || api_type == API_D3D11);
-	u32 lightMask = 0;
-	if (xfregs.numChan.numColorChans > 0)
-		lightMask |= xfregs.color[0].GetFullLightMask() | xfregs.alpha[0].GetFullLightMask();
-	if (xfregs.numChan.numColorChans > 1)
-		lightMask |= xfregs.color[1].GetFullLightMask() | xfregs.alpha[1].GetFullLightMask();
 
 	// uniforms
 	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
@@ -112,7 +107,7 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 	{
 		out.Write("ATTRIN float4 rawpos; // ATTR%d,\n", SHADER_POSITION_ATTRIB);
 		if (components & VB_HAS_POSMTXIDX)
-			out.Write("ATTRIN float posmtx; // ATTR%d,\n", SHADER_POSMTX_ATTRIB);
+			out.Write("ATTRIN float fposmtx; // ATTR%d,\n", SHADER_POSMTX_ATTRIB);
 		if (components & VB_HAS_NRM0)
 			out.Write("ATTRIN float3 rawnorm0; // ATTR%d,\n", SHADER_NORM0_ATTRIB);
 		if (components & VB_HAS_NRM1)

From 77dae3496a45b8f885119fc65da93cb0699c0bb2 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Mon, 29 Apr 2013 19:52:12 +0200
Subject: [PATCH 053/352] PixelShaderGen: Cleanups.

---
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 46 ++++++-------------
 1 file changed, 13 insertions(+), 33 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 1bf4ca25d8..b9df2ebe8e 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -233,26 +233,6 @@ static void BuildSwapModeTable()
 	}
 }
 
-const char* WriteRegister(API_TYPE ApiType, const char *prefix, const u32 num)
-{
-	if (ApiType == API_OPENGL)
-		return ""; // Nothing to do here
-
-	static char result[64];
-	sprintf(result, " : register(%s%d)", prefix, num);
-	return result;
-}
-
-const char *WriteLocation(API_TYPE ApiType)
-{
-	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-		return "";
-
-	static char result[64];
-	sprintf(result, "uniform ");
-	return result;
-}
-
 template<class T>
 static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
@@ -273,8 +253,8 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 	bool per_pixel_depth = bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable;
 
 	out.Write("//Pixel Shader for TEV stages\n");
-	out.Write("//%i TEV stages, %i texgens, XXX IND stages\n",
-		numStages, numTexgen/*, bpmem.genMode.numindstages*/);
+	out.Write("//%i TEV stages, %i texgens, %i IND stages\n",
+		numStages, numTexgen, bpmem.genMode.numindstages);
 
 	uid_data.dstAlphaMode = dstAlphaMode;
 	uid_data.genMode.numindstages = bpmem.genMode.numindstages;
@@ -299,7 +279,7 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 	{
 		// Declare samplers
 		for (int i = 0; i < 8; ++i)
-			out.Write("%s samp%d %s;\n", (ApiType == API_D3D11) ? "sampler" : "uniform sampler2D", i, WriteRegister(ApiType, "s", i));
+			out.Write("%s samp%d : register(s%d);\n", (ApiType == API_D3D11) ? "sampler" : "uniform sampler2D", i, i);
 
 		if (ApiType == API_D3D11)
 		{
@@ -315,18 +295,18 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 		out.Write("layout(std140) uniform PSBlock {\n");
 
-	out.Write("\t%sfloat4 " I_COLORS"[4] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_COLORS)); // TODO: first element not used??
-	out.Write("\t%sfloat4 " I_KCOLORS"[4] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_KCOLORS));
-	out.Write("\t%sfloat4 " I_ALPHA"[1] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_ALPHA)); // TODO: Why is this an array...-.-
-	out.Write("\t%sfloat4 " I_TEXDIMS"[8] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_TEXDIMS));
-	out.Write("\t%sfloat4 " I_ZBIAS"[2] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_ZBIAS));
-	out.Write("\t%sfloat4 " I_INDTEXSCALE"[2] %s;\n", WriteLocation(ApiType),  WriteRegister(ApiType, "c", C_INDTEXSCALE));
-	out.Write("\t%sfloat4 " I_INDTEXMTX"[6] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_INDTEXMTX));
-	out.Write("\t%sfloat4 " I_FOG"[3] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_FOG));
+	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_COLORS, "float4", I_COLORS"[4]");
+	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_KCOLORS, "float4", I_KCOLORS"[4]");
+	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_ALPHA, "float4", I_ALPHA"[1]");  // TODO: Why is this an array...-.-
+	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_TEXDIMS, "float4", I_TEXDIMS"[8]");
+	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_ZBIAS, "float4", I_ZBIAS"[2]");
+	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_INDTEXSCALE, "float4", I_INDTEXSCALE"[2]");
+	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_INDTEXMTX, "float4", I_INDTEXMTX"[6]");
+	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_FOG, "float4", I_FOG"[3]");
 
 	// For pixel lighting - TODO: Should only be defined when per pixel lighting is enabled!
-	out.Write("\t%sfloat4 " I_PLIGHTS"[40] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_PLIGHTS));
-	out.Write("\t%sfloat4 " I_PMATERIALS"[4] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_PMATERIALS));
+	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_PLIGHTS, "float4", I_PLIGHTS"[40]");
+	DeclareUniform(out, ApiType, g_ActiveConfig.backend_info.bSupportsGLSLUBO, C_PMATERIALS, "float4", I_PMATERIALS"[4]");
 
 	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 		out.Write("};\n");

From 02afec507622d2fcf705f9147de21f081f77aaa5 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Mon, 29 Apr 2013 21:00:39 +0200
Subject: [PATCH 054/352] Polish shader uid checking.

---
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   |  9 +-
 Source/Core/VideoCommon/Src/ShaderGenCommon.h | 83 +++++++++++++------
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  |  7 --
 .../Plugin_VideoDX11/Src/PixelShaderCache.cpp | 10 ++-
 .../Plugin_VideoDX11/Src/PixelShaderCache.h   |  2 +
 .../Src/VertexShaderCache.cpp                 |  9 ++
 .../Plugin_VideoDX11/Src/VertexShaderCache.h  |  2 +
 .../Plugin_VideoDX9/Src/PixelShaderCache.cpp  |  8 ++
 .../Plugin_VideoDX9/Src/PixelShaderCache.h    |  2 +
 .../Plugin_VideoDX9/Src/VertexShaderCache.cpp |  9 ++
 .../Plugin_VideoDX9/Src/VertexShaderCache.h   |  3 +
 .../Src/ProgramShaderCache.cpp                | 16 ++++
 .../Plugin_VideoOGL/Src/ProgramShaderCache.h  |  3 +
 13 files changed, 120 insertions(+), 43 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index b9df2ebe8e..179560ddfa 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -392,7 +392,7 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 		// compute window position if needed because binding semantic WPOS is not widely supported
 		if (numTexgen < 7)
 		{
-			for (int i = 0; i < numTexgen; ++i)
+			for (unsigned int i = 0; i < numTexgen; ++i)
 				out.Write(",\n  in %s float3 uv%d : TEXCOORD%d", optCentroid, i, i);
 			out.Write(",\n  in %s float4 clipPos : TEXCOORD%d", optCentroid, numTexgen);
 			if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
@@ -1190,13 +1190,6 @@ static void WriteFog(T& out, pixel_shader_uid_data& uid_data)
 void GetPixelShaderUid(PixelShaderUid& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
 	GeneratePixelShader<PixelShaderUid>(object, dstAlphaMode, ApiType, components);
-
-	if (g_ActiveConfig.bEnableShaderDebugging)
-	{
-		PixelShaderCode code;
-		GeneratePixelShaderCode(code, dstAlphaMode, API_OPENGL, components);
-		CheckForUidMismatch<PixelShaderUid,PixelShaderCode>(code, object, "Pixel", "p");
-	}
 }
 
 void GeneratePixelShaderCode(PixelShaderCode& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index 4b3d16b8d7..ebf2ae1b87 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -113,6 +113,9 @@ public:
 	template<class T>
 	inline T& GetUidData() { return data; }
 
+	const uid_data& GetUidData() const { return data; }
+	size_t GetUidDataSize() const { return sizeof(values); }
+
 private:
 	union
 	{
@@ -217,42 +220,68 @@ struct LightingUidData
  * Checks if there has been
  */
 template<class UidT, class CodeT>
-void CheckForUidMismatch(CodeT& new_code, const UidT& new_uid, const char* shader_type, const char* dump_prefix)
+class UidChecker
 {
-	// TODO: Might be sensitive to config changes
-	static std::map<UidT,std::string> s_shaders;
-	static std::vector<UidT> s_uids;
-
-	bool uid_is_indexed = std::find(s_uids.begin(), s_uids.end(), new_uid) != s_uids.end();
-	if (!uid_is_indexed)
+public:
+	void Invalidate()
 	{
-		s_uids.push_back(new_uid);
-		s_shaders[new_uid] = new_code.GetBuffer();
+		m_shaders.clear();
+		m_uids.clear();
 	}
-	else
+
+	void AddToIndexAndCheck(CodeT& new_code, const UidT& new_uid, const char* shader_type, const char* dump_prefix)
 	{
-		// uid is already in the index => check if there's a shader with the same uid but different code
-		auto& old_code = s_shaders[new_uid];
-		if (strcmp(old_code.c_str(), new_code.GetBuffer()) != 0)
+		bool uid_is_indexed = std::find(m_uids.begin(), m_uids.end(), new_uid) != m_uids.end();
+		if (!uid_is_indexed)
 		{
-			static int num_failures = 0;
+			m_uids.push_back(new_uid);
+			m_shaders[new_uid] = new_code.GetBuffer();
+		}
+		else
+		{
+			// uid is already in the index => check if there's a shader with the same uid but different code
+			auto& old_code = m_shaders[new_uid];
+			if (strcmp(old_code.c_str(), new_code.GetBuffer()) != 0)
+			{
+				static int num_failures = 0;
 
-			char szTemp[MAX_PATH];
-			sprintf(szTemp, "%s%ssuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(),
-					dump_prefix,
-					++num_failures);
+				char szTemp[MAX_PATH];
+				sprintf(szTemp, "%s%ssuid_mismatch_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(),
+						dump_prefix,
+						++num_failures);
 
-			// TODO: Should also dump uids
-			std::ofstream file;
-			OpenFStream(file, szTemp, std::ios_base::out);
-			file << "Old shader code:\n" << old_code;
-			file << "\n\nNew shader code:\n" << new_code.GetBuffer();
-			file.close();
+				// TODO: Should also dump uids
+				std::ofstream file;
+				OpenFStream(file, szTemp, std::ios_base::out);
+				file << "Old shader code:\n" << old_code;
+				file << "\n\nNew shader code:\n" << new_code.GetBuffer();
+				file << "\n\nShader uid:\n";
+				for (unsigned int i = 0; i < new_uid.GetUidDataSize(); ++i)
+				{
+					u32 value = ((u32*)&new_uid.GetUidData())[i];
+					if ((i % 4) == 0)
+					{
+						unsigned int last_value = (i+3 < new_uid.GetUidDataSize()-1) ? i+3 : new_uid.GetUidDataSize();
+						file << std::setfill(' ') << std::dec;
+						file << "Values " << std::setw(2) << i << " - " << last_value << ": ";
+					}
 
-			// TODO: Make this more idiot-proof
-			ERROR_LOG(VIDEO, "%s shader uid mismatch!", shader_type);
+					file << std::setw(8) << std::setfill('0') << std::hex << value << std::setw(1);
+					if ((i % 4) < 3)
+						file << ' ';
+					else
+						file << std::endl;
+				}
+				file.close();
+
+				ERROR_LOG(VIDEO, "%s shader uid mismatch! See %s for details", shader_type, szTemp);
+			}
 		}
 	}
-}
+	
+private:
+	std::map<UidT,std::string> m_shaders;
+	std::vector<UidT> m_uids;
+};
 
 #endif // _SHADERGENCOMMON_H
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 81b8c79553..6cbf273097 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -538,13 +538,6 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 void GetVertexShaderUid(VertexShaderUid& object, u32 components, API_TYPE api_type)
 {
 	GenerateVertexShader<VertexShaderUid>(object, components, api_type);
-
-	if (g_ActiveConfig.bEnableShaderDebugging)
-	{
-		VertexShaderCode code;
-		GenerateVertexShaderCode(code, components, API_OPENGL);
-		CheckForUidMismatch<VertexShaderUid,VertexShaderCode>(code, object, "Vertex", "v");
-	}
 }
 
 void GenerateVertexShaderCode(VertexShaderCode& object, u32 components, API_TYPE api_type)
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
index 9db0a53d13..0adf82fef9 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
@@ -29,6 +29,7 @@ namespace DX11
 PixelShaderCache::PSCache PixelShaderCache::PixelShaders;
 const PixelShaderCache::PSCacheEntry* PixelShaderCache::last_entry;
 PixelShaderUid PixelShaderCache::last_uid;
+UidChecker<PixelShaderUid,PixelShaderCode> PixelShaderCache::pixel_uid_checker;
 
 LinearDiskCache<PixelShaderUid, u8> g_ps_disk_cache;
 
@@ -412,7 +413,8 @@ void PixelShaderCache::Clear()
 {
 	for (PSCache::iterator iter = PixelShaders.begin(); iter != PixelShaders.end(); iter++)
 		iter->second.Destroy();
-	PixelShaders.clear(); 
+	PixelShaders.clear();
+	pixel_uid_checker.Invalidate();
 
 	last_entry = NULL;
 }
@@ -450,6 +452,12 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
 {
 	PixelShaderUid uid;
 	GetPixelShaderUid(uid, dstAlphaMode, API_D3D11, components);
+	if (g_ActiveConfig.bEnableShaderDebugging)
+	{
+		PixelShaderCode code;
+		GeneratePixelShaderCode(code, dstAlphaMode, API_D3D11, components);
+		pixel_uid_checker.AddToIndexAndCheck(code, uid, "Pixel", "p");
+	}
 
 	// Check if the shader is already set
 	if (last_entry)
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h
index ace3a9ac6a..dee930ccfe 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h
@@ -52,6 +52,8 @@ private:
 	static PSCache PixelShaders;
 	static const PSCacheEntry* last_entry;
 	static PixelShaderUid last_uid;
+
+	static UidChecker<PixelShaderUid,PixelShaderCode> pixel_uid_checker;
 };
 
 }  // namespace DX11
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp
index 19b276ddb6..2754267b09 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp
@@ -25,6 +25,7 @@ namespace DX11 {
 VertexShaderCache::VSCache VertexShaderCache::vshaders;
 const VertexShaderCache::VSCacheEntry *VertexShaderCache::last_entry;
 VertexShaderUid VertexShaderCache::last_uid;
+UidChecker<VertexShaderUid,VertexShaderCode> VertexShaderCache::vertex_uid_checker;
 
 static ID3D11VertexShader* SimpleVertexShader = NULL;
 static ID3D11VertexShader* ClearVertexShader = NULL;
@@ -174,6 +175,7 @@ void VertexShaderCache::Clear()
 	for (VSCache::iterator iter = vshaders.begin(); iter != vshaders.end(); ++iter)
 		iter->second.Destroy();
 	vshaders.clear();
+	vertex_uid_checker.Invalidate();
 
 	last_entry = NULL;
 }
@@ -197,6 +199,13 @@ bool VertexShaderCache::SetShader(u32 components)
 {
 	VertexShaderUid uid;
 	GetVertexShaderUid(uid, components, API_D3D11);
+	if (g_ActiveConfig.bEnableShaderDebugging)
+	{
+		VertexShaderCode code;
+		GenerateVertexShaderCode(code, components, API_D3D11);
+		vertex_uid_checker.AddToIndexAndCheck(code, uid, "Vertex", "v");
+	}
+
 	if (last_entry)
 	{
 		if (uid == last_uid)
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h
index 04f74bc055..b80dbcd7b1 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h
@@ -59,6 +59,8 @@ private:
 	static VSCache vshaders;
 	static const VSCacheEntry* last_entry;
 	static VertexShaderUid last_uid;
+
+	static UidChecker<VertexShaderUid,VertexShaderCode> vertex_uid_checker;
 };
 
 }  // namespace DX11
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
index eb47614ae5..bbb46e4d56 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
@@ -31,6 +31,7 @@ namespace DX9
 PixelShaderCache::PSCache PixelShaderCache::PixelShaders;
 const PixelShaderCache::PSCacheEntry *PixelShaderCache::last_entry;
 PixelShaderUid PixelShaderCache::last_uid;
+UidChecker<PixelShaderUid,PixelShaderCode> PixelShaderCache::pixel_uid_checker;
 
 static LinearDiskCache<PixelShaderUid, u8> g_ps_disk_cache;
 static std::set<u32> unique_shaders;
@@ -284,6 +285,7 @@ void PixelShaderCache::Clear()
 	for (PSCache::iterator iter = PixelShaders.begin(); iter != PixelShaders.end(); iter++)
 		iter->second.Destroy();
 	PixelShaders.clear();
+	pixel_uid_checker.Invalidate();
 
 	last_entry = NULL;
 }
@@ -322,6 +324,12 @@ bool PixelShaderCache::SetShader(DSTALPHA_MODE dstAlphaMode, u32 components)
 	const API_TYPE api = ((D3D::GetCaps().PixelShaderVersion >> 8) & 0xFF) < 3 ? API_D3D9_SM20 : API_D3D9_SM30;
 	PixelShaderUid uid;
 	GetPixelShaderUid(uid, dstAlphaMode, API_D3D9, components);
+	if (g_ActiveConfig.bEnableShaderDebugging)
+	{
+		PixelShaderCode code;
+		GeneratePixelShaderCode(code, dstAlphaMode, API_D3D9, components);
+		pixel_uid_checker.AddToIndexAndCheck(code, uid, "Pixel", "p");
+	}
 
 	// Check if the shader is already set
 	if (last_entry)
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h
index aadd2c02f7..733a68233a 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h
@@ -44,6 +44,8 @@ private:
 	static PSCache PixelShaders;
 	static const PSCacheEntry *last_entry;
 	static PixelShaderUid last_uid;
+	static UidChecker<PixelShaderUid,PixelShaderCode> pixel_uid_checker;
+
 	static void Clear();
 
 public:
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
index 9223533b3a..2d11368a6d 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
@@ -26,6 +26,7 @@ namespace DX9
 VertexShaderCache::VSCache VertexShaderCache::vshaders;
 const VertexShaderCache::VSCacheEntry *VertexShaderCache::last_entry;
 VertexShaderUid VertexShaderCache::last_uid;
+UidChecker<VertexShaderUid,VertexShaderCode> VertexShaderCache::vertex_uid_checker;
 
 #define MAX_SSAA_SHADERS 3
 
@@ -150,6 +151,7 @@ void VertexShaderCache::Clear()
 	for (VSCache::iterator iter = vshaders.begin(); iter != vshaders.end(); ++iter)
 		iter->second.Destroy();
 	vshaders.clear();
+	vertex_uid_checker.Invalidate();
 
 	last_entry = NULL;
 }
@@ -176,6 +178,13 @@ bool VertexShaderCache::SetShader(u32 components)
 {
 	VertexShaderUid uid;
 	GetVertexShaderUid(uid, components, API_D3D9);
+	if (g_ActiveConfig.bEnableShaderDebugging)
+	{
+		VertexShaderCode code;
+		GenerateVertexShaderCode(code, components, API_D3D9);
+		vertex_uid_checker.AddToIndexAndCheck(code, uid, "Vertex", "v");
+	}
+
 	if (last_entry)
 	{
 		if (uid == last_uid)
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h
index 88c295c435..32fbea92be 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h
+++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h
@@ -38,6 +38,9 @@ private:
 	static VSCache vshaders;
 	static const VSCacheEntry *last_entry;
 	static VertexShaderUid last_uid;
+
+	static UidChecker<VertexShaderUid,VertexShaderCode> vertex_uid_checker;
+
 	static void Clear();
 
 public:
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index bab52073fb..732c63ac67 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -29,6 +29,8 @@ static GLuint CurrentProgram = 0;
 ProgramShaderCache::PCache ProgramShaderCache::pshaders;
 ProgramShaderCache::PCacheEntry* ProgramShaderCache::last_entry;
 SHADERUID ProgramShaderCache::last_uid;
+UidChecker<PixelShaderUid,PixelShaderCode> ProgramShaderCache::pixel_uid_checker;
+UidChecker<VertexShaderUid,VertexShaderCode> ProgramShaderCache::vertex_uid_checker;
 
 static char s_glsl_header[1024] = "";
 
@@ -351,6 +353,17 @@ void ProgramShaderCache::GetShaderId(SHADERUID* uid, DSTALPHA_MODE dstAlphaMode,
 {
 	GetPixelShaderUid(uid->puid, dstAlphaMode, API_OPENGL, components);
 	GetVertexShaderUid(uid->vuid, components, API_OPENGL);
+
+	if (g_ActiveConfig.bEnableShaderDebugging)
+	{
+		PixelShaderCode pcode;
+		GeneratePixelShaderCode(pcode, dstAlphaMode, API_OPENGL, components);
+		pixel_uid_checker.AddToIndexAndCheck(pcode, uid->puid, "Pixel", "p");
+
+		VertexShaderCode vcode;
+		GenerateVertexShaderCode(vcode, components, API_OPENGL);
+		vertex_uid_checker.AddToIndexAndCheck(vcode, uid->vuid, "Vertex", "v");
+	}
 }
 
 ProgramShaderCache::PCacheEntry ProgramShaderCache::GetShaderProgram(void)
@@ -448,6 +461,9 @@ void ProgramShaderCache::Shutdown(void)
 		iter->second.Destroy();
 	pshaders.clear();
 
+	pixel_uid_checker.Invalidate();
+	vertex_uid_checker.Invalidate();
+
 	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 	{
 		delete s_buffer;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h
index 9cd9a9b12c..30428ad6de 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.h
@@ -106,6 +106,9 @@ private:
 	static PCacheEntry* last_entry;
 	static SHADERUID last_uid;
 
+	static UidChecker<PixelShaderUid,PixelShaderCode> pixel_uid_checker;
+	static UidChecker<VertexShaderUid,VertexShaderCode> vertex_uid_checker;
+
 	static GLintptr s_vs_data_size;
 	static GLintptr s_ps_data_size;
 	static GLintptr s_vs_data_offset;

From 9cb263ad48b1b5f52f69e84b534807427110b145 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Mon, 29 Apr 2013 21:19:48 +0200
Subject: [PATCH 055/352] PixelShaderGen: Set some uid fields that I missed
 before.

---
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 19 ++++++++++-------
 Source/Core/VideoCommon/Src/PixelShaderGen.h  | 21 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 179560ddfa..2be42bcf43 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -790,10 +790,10 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		|| ac.c == TEVALPHAARG_RASA || ac.d == TEVALPHAARG_RASA)
 	{
 		const int i = bpmem.combiners[n].alphaC.rswap;
-		uid_data.tevksel_n_swap |= bpmem.tevksel[i*2  ].swap1 << (i*2);
-		uid_data.tevksel_n_swap |= bpmem.tevksel[i*2+1].swap1 << (i*2 + 1);
-		uid_data.tevksel_n_swap |= bpmem.tevksel[i*2  ].swap2 << (i*2 + 16);
-		uid_data.tevksel_n_swap |= bpmem.tevksel[i*2+1].swap2 << (i*2 + 17);
+		uid_data.tevksel[i*2  ].swap1 = bpmem.tevksel[i*2  ].swap1;
+		uid_data.tevksel[i*2+1].swap1 = bpmem.tevksel[i*2+1].swap1;
+		uid_data.tevksel[i*2  ].swap2 = bpmem.tevksel[i*2  ].swap2;
+		uid_data.tevksel[i*2+1].swap2 = bpmem.tevksel[i*2+1].swap2;
 
 		char *rasswap = swapModeTable[bpmem.combiners[n].alphaC.rswap];
 		out.Write("rastemp = %s.%s;\n", tevRasTable[bpmem.tevorders[n / 2].getColorChan(n & 1)], rasswap);
@@ -813,13 +813,14 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		}
 
 		const int i = bpmem.combiners[n].alphaC.tswap;
-		uid_data.tevksel_n_swap |= bpmem.tevksel[i*2  ].swap1 << (i*2);
-		uid_data.tevksel_n_swap |= bpmem.tevksel[i*2+1].swap1 << (i*2 + 1);
-		uid_data.tevksel_n_swap |= bpmem.tevksel[i*2  ].swap2 << (i*2 + 16);
-		uid_data.tevksel_n_swap |= bpmem.tevksel[i*2+1].swap2 << (i*2 + 17);
+		uid_data.tevksel[i*2  ].swap1 = bpmem.tevksel[i*2  ].swap1;
+		uid_data.tevksel[i*2+1].swap1 = bpmem.tevksel[i*2+1].swap1;
+		uid_data.tevksel[i*2  ].swap2 = bpmem.tevksel[i*2  ].swap2;
+		uid_data.tevksel[i*2+1].swap2 = bpmem.tevksel[i*2+1].swap2;
 
 		char *texswap = swapModeTable[bpmem.combiners[n].alphaC.tswap];
 		int texmap = bpmem.tevorders[n/2].getTexMap(n&1);
+		uid_data.tevindref.SetTexmap(i, texmap);
 		SampleTexture<T>(out, "textemp", "tevcoord", texswap, texmap, ApiType);
 	}
 	else
@@ -833,6 +834,8 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 	{
 		int kc = bpmem.tevksel[n / 2].getKC(n & 1);
 		int ka = bpmem.tevksel[n / 2].getKA(n & 1);
+		uid_data.tevksel[n/2].set_kcsel(n & 1, kc);
+		uid_data.tevksel[n/2].set_kasel(n & 1, ka);
 		out.Write("konsttemp = float4(%s, %s);\n", tevKSelTableC[kc], tevKSelTableA[ka]);
 		if(kc > 7 || ka > 7)
 		{
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 783f50a301..2340b96af7 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -93,6 +93,13 @@ struct pixel_shader_uid_data
 			else if (index == 2) { bc3 = texcoord; bi2 = texmap; }
 			else if (index == 3) { bc4 = texcoord; bi4 = texmap; }
 		}
+		inline void SetTexmap(int index, u32 texmap)
+		{
+			if (index == 0) { bi0 = texmap; }
+			else if (index == 1) { bi1 = texmap; }
+			else if (index == 2) { bi2 = texmap; }
+			else if (index == 3) { bi4 = texmap; }
+		}
 	} tevindref;
 
 	u32 tevorders_n_texcoord1 : 24; // 8 x 3 bit
@@ -135,7 +142,19 @@ struct pixel_shader_uid_data
 		}
 	} tevind_n;
 
-	u32 tevksel_n_swap : 32; // 8 x 2 bit (swap1) + 8 x 2 bit (swap2)
+	struct
+	{
+		u32 swap1 : 2;
+		u32 swap2 : 2;
+		u32 kcsel0 : 5;
+		u32 kasel0 : 5;
+		u32 kcsel1 : 5;
+		u32 kasel1 : 5;
+
+		void set_kcsel(int i, u32 value) { if (i) kcsel1 = value; else kcsel0 = value; }
+		void set_kasel(int i, u32 value) { if( i) kasel1 = value; else kasel0 = value; }
+	} tevksel[8];
+
 	struct
 	{
 		union {

From 76a316ffab7c8a23bb70669d5b7a2b701f4093ba Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Mon, 29 Apr 2013 21:30:14 +0200
Subject: [PATCH 056/352] Don't exit when bluetooth support is not available on
 Windows.

Fixes running Dolphin in Wine and on regular Windows setups where bthprops.cpl is not available.

Fixes issue 6283.
---
 Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
index aa5b022a44..4aae05fa3a 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
@@ -87,8 +87,8 @@ inline void init_lib()
 		hid_lib = LoadLibrary(_T("hid.dll"));
 		if (!hid_lib)
 		{
-			PanicAlertT("Failed to load hid.dll");
-			exit(EXIT_FAILURE);
+			PanicAlertT("Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin might crash unexpectedly!");
+			return;
 		}
 
 		HidD_GetHidGuid = (PHidD_GetHidGuid)GetProcAddress(hid_lib, "HidD_GetHidGuid");
@@ -98,15 +98,15 @@ inline void init_lib()
 		if (!HidD_GetHidGuid || !HidD_GetAttributes ||
 			!HidD_SetOutputReport || !HidD_GetProductString)
 		{
-			PanicAlertT("Failed to load hid.dll");
-			exit(EXIT_FAILURE);
+			PanicAlertT("Failed to load hid.dll! Connecting real Wiimotes won't work and Dolphin might crash unexpectedly!");
+			return;
 		}
 
 		bthprops_lib = LoadLibrary(_T("bthprops.cpl"));
 		if (!bthprops_lib)
 		{
-			PanicAlertT("Failed to load bthprops.cpl");
-			exit(EXIT_FAILURE);
+			PanicAlertT("Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin might crash unexpectedly!");
+			return;
 		}
 
 		Bth_BluetoothFindDeviceClose = (PBth_BluetoothFindDeviceClose)GetProcAddress(bthprops_lib, "BluetoothFindDeviceClose");
@@ -128,8 +128,8 @@ inline void init_lib()
 			!Bth_BluetoothSetServiceState || !Bth_BluetoothAuthenticateDevice ||
 			!Bth_BluetoothEnumerateInstalledServices)
 		{
-			PanicAlertT("Failed to load bthprops.cpl");
-			exit(EXIT_FAILURE);
+			PanicAlertT("Failed to load bthprops.cpl! Connecting real Wiimotes won't work and Dolphin might crash unexpectedly!");
+			return;
 		}
 
 		initialized = true;

From ef2e0a87d06eb498f0e2eaebe6be2785740e54dd Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Thu, 8 Nov 2012 08:40:49 +0100
Subject: [PATCH 057/352] Adding option to save and load state by timestamp

Load by timestamp: load last state is expanded from 1 to 8 actions, for newest to oldest state

Save by timestamp: overwrite the oldest state (or use an empty slot if available)

Adding remaining hardcoded state keys to hotkey dialog

Adding a program exit hotkey
---
 Source/Core/Core/Src/ConfigManager.cpp   |  15 +++
 Source/Core/Core/Src/CoreParameter.h     |  14 ++
 Source/Core/Core/Src/State.cpp           | 108 ++++++++++++---
 Source/Core/Core/Src/State.h             |  21 ++-
 Source/Core/DolphinWX/Src/Frame.cpp      | 165 +++++++----------------
 Source/Core/DolphinWX/Src/Frame.h        |   1 +
 Source/Core/DolphinWX/Src/FrameTools.cpp |  50 +++++--
 Source/Core/DolphinWX/Src/Globals.h      |  10 +-
 Source/Core/DolphinWX/Src/HotkeyDlg.cpp  |  16 ++-
 9 files changed, 253 insertions(+), 147 deletions(-)

diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp
index 485c1ab259..1eec9fd7b7 100644
--- a/Source/Core/Core/Src/ConfigManager.cpp
+++ b/Source/Core/Core/Src/ConfigManager.cpp
@@ -35,6 +35,7 @@ static const struct {
 
 	{ "ToggleFullscreen",	70 /* 'F' */,		2 /* wxMOD_CMD */ },
 	{ "Screenshot",			83 /* 'S' */,		2 /* wxMOD_CMD */ },
+	{ "Exit",	0,	0 /* wxMOD_NONE */ },
 
 	{ "Wiimote1Connect",	49 /* '1' */,		2 /* wxMOD_CMD */ },
 	{ "Wiimote2Connect",	50 /* '2' */,		2 /* wxMOD_CMD */ },
@@ -57,6 +58,7 @@ static const struct {
 
 	{ "ToggleFullscreen",	13 /* WXK_RETURN */,	1 /* wxMOD_ALT */ },
 	{ "Screenshot",		348 /* WXK_F9 */,	0 /* wxMOD_NONE */ },
+	{ "Exit",	0,	0 /* wxMOD_NONE */ },
 
 	{ "Wiimote1Connect",	344 /* WXK_F5 */,	1 /* wxMOD_ALT */ },
 	{ "Wiimote2Connect",	345 /* WXK_F6 */,	1 /* wxMOD_ALT */ },
@@ -81,6 +83,19 @@ static const struct {
 	{ "SaveStateSlot6",	345 /* WXK_F6 */,	4 /* wxMOD_SHIFT */ },
 	{ "SaveStateSlot7",	346 /* WXK_F7 */,	4 /* wxMOD_SHIFT */ },
 	{ "SaveStateSlot8",	347 /* WXK_F8 */,	4 /* wxMOD_SHIFT */ },
+
+	{ "LoadLastState1",	0,	0 /* wxMOD_NONE */ },
+	{ "LoadLastState2",	0,	0 /* wxMOD_NONE */ },
+	{ "LoadLastState3",	0,	0 /* wxMOD_NONE */ },
+	{ "LoadLastState4",	0,	0 /* wxMOD_NONE */ },
+	{ "LoadLastState5",	0,	0 /* wxMOD_NONE */ },
+	{ "LoadLastState6",	0,	0 /* wxMOD_NONE */ },
+	{ "LoadLastState7",	0,	0 /* wxMOD_NONE */ },
+	{ "LoadLastState8",	0,	0 /* wxMOD_NONE */ },
+
+	{ "SaveFirstState",	0,	0 /* wxMOD_NONE */ },
+	{ "UndoLoadState",	351 /* WXK_F12 */,	0 /* wxMOD_NONE */ },
+	{ "UndoSaveState",	351 /* WXK_F12 */,	4 /* wxMOD_SHIFT */ },
 };
 
 SConfig::SConfig()
diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h
index 9652b84618..6f2219e9f8 100644
--- a/Source/Core/Core/Src/CoreParameter.h
+++ b/Source/Core/Core/Src/CoreParameter.h
@@ -26,6 +26,7 @@ enum Hotkey
 
 	HK_FULLSCREEN,
 	HK_SCREENSHOT,
+	HK_EXIT,
 
 	HK_WIIMOTE1_CONNECT,
 	HK_WIIMOTE2_CONNECT,
@@ -50,6 +51,19 @@ enum Hotkey
 	HK_SAVE_STATE_SLOT_7,
 	HK_SAVE_STATE_SLOT_8,
 
+	HK_LOAD_LAST_STATE_1,
+	HK_LOAD_LAST_STATE_2,
+	HK_LOAD_LAST_STATE_3,
+	HK_LOAD_LAST_STATE_4,
+	HK_LOAD_LAST_STATE_5,
+	HK_LOAD_LAST_STATE_6,
+	HK_LOAD_LAST_STATE_7,
+	HK_LOAD_LAST_STATE_8,
+
+	HK_SAVE_FIRST_STATE,
+	HK_UNDO_LOAD_STATE,
+	HK_UNDO_SAVE_STATE,
+
 	NUM_HOTKEYS,
 };
 
diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp
index 3be8470d14..09653ac9ad 100644
--- a/Source/Core/Core/Src/State.cpp
+++ b/Source/Core/Core/Src/State.cpp
@@ -3,6 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "Common.h"
+#include "Timer.h"
 #include "State.h"
 #include "Core.h"
 #include "ConfigManager.h"
@@ -58,13 +59,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
 static std::thread g_save_thread;
 
 // Don't forget to increase this after doing changes on the savestate system
-static const u32 STATE_VERSION = 16;
-
-struct StateHeader
-{
-	u8 gameID[6];
-	size_t size;
-};
+static const u32 STATE_VERSION = 17;
 
 enum
 {
@@ -159,17 +154,59 @@ void VerifyBuffer(std::vector<u8>& buffer)
 	Core::PauseAndLock(false, wasUnpaused);
 }
 
+// return state number not in map
+int GetEmptySlot(std::map<double, int> m)
+{
+	for (int i = 1; i <= NUM_STATES; i++)
+	{
+		bool found = false;
+		for (std::map<double, int>::iterator it = m.begin(); it != m.end(); it++)
+		{
+			if (it->second == i)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (!found) return i;
+	}
+	return -1;
+}
+
+// read state timestamps
+std::map<double, int> GetSavedStates()
+{
+	StateHeader header;
+	std::map<double, int> m;
+	for (int i = 1; i <= NUM_STATES; i++)
+	{
+		if (File::Exists(MakeStateFilename(i)))
+		{
+			if (ReadHeader(MakeStateFilename(i), header))
+			{
+				double d = Common::Timer::GetDoubleTime() - header.time;
+				// increase time until unique value is obtained
+				while (m.find(d) != m.end()) d += .001;
+				m.insert(std::pair<double,int>(d, i));
+			}
+		}
+	}
+	return m;
+}
+
 struct CompressAndDumpState_args
 {
 	std::vector<u8>* buffer_vector;
 	std::mutex* buffer_mutex;
 	std::string filename;
+	bool wait;
 };
 
 void CompressAndDumpState(CompressAndDumpState_args save_args)
 {
 	std::lock_guard<std::mutex> lk(*save_args.buffer_mutex);
-	g_compressAndDumpStateSyncEvent.Set();
+	if (!save_args.wait)
+		g_compressAndDumpStateSyncEvent.Set();
 
 	const u8* const buffer_data = &(*(save_args.buffer_vector))[0];
 	const size_t buffer_size = (save_args.buffer_vector)->size();
@@ -201,6 +238,7 @@ void CompressAndDumpState(CompressAndDumpState_args save_args)
 	if (!f)
 	{
 		Core::DisplayMessage("Could not save state", 2000);
+		g_compressAndDumpStateSyncEvent.Set();
 		return;
 	}
 
@@ -208,6 +246,7 @@ void CompressAndDumpState(CompressAndDumpState_args save_args)
 	StateHeader header;
 	memcpy(header.gameID, SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID().c_str(), 6);
 	header.size = g_use_compression ? buffer_size : 0;
+	header.time = Common::Timer::GetDoubleTime();
 
 	f.WriteArray(&header, 1);
 
@@ -244,9 +283,10 @@ void CompressAndDumpState(CompressAndDumpState_args save_args)
 
 	Core::DisplayMessage(StringFromFormat("Saved State to %s",
 		filename.c_str()).c_str(), 2000);
+	g_compressAndDumpStateSyncEvent.Set();
 }
 
-void SaveAs(const std::string& filename)
+void SaveAs(const std::string& filename, bool wait)
 {
 	// Pause the core while we save the state
 	bool wasUnpaused = Core::PauseAndLock(true);
@@ -274,6 +314,7 @@ void SaveAs(const std::string& filename)
 		save_args.buffer_vector = &g_current_buffer;
 		save_args.buffer_mutex = &g_cs_current_buffer;
 		save_args.filename = filename;
+		save_args.wait = wait;
 
 		Flush();
 		g_save_thread = std::thread(CompressAndDumpState, save_args);
@@ -291,6 +332,20 @@ void SaveAs(const std::string& filename)
 	Core::PauseAndLock(false, wasUnpaused);
 }
 
+bool ReadHeader(const std::string filename, StateHeader& header)
+{
+	Flush();
+	File::IOFile f(filename, "rb");
+	if (!f)
+	{
+		Core::DisplayMessage("State not found", 2000);
+		return false;
+	}
+
+	f.ReadArray(&header, 1);
+	return true;
+}
+
 void LoadFileStateData(const std::string& filename, std::vector<u8>& ret_data)
 {
 	Flush();
@@ -496,9 +551,9 @@ static std::string MakeStateFilename(int number)
 		SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID().c_str(), number);
 }
 
-void Save(int slot)
+void Save(int slot, bool wait)
 {
-	SaveAs(MakeStateFilename(slot));
+	SaveAs(MakeStateFilename(slot), wait);
 }
 
 void Load(int slot)
@@ -511,12 +566,35 @@ void Verify(int slot)
 	VerifyAt(MakeStateFilename(slot));
 }
 
-void LoadLastSaved()
+void LoadLastSaved(int i)
 {
-	if (g_last_filename.empty())
-		Core::DisplayMessage("There is no last saved state", 2000);
+	std::map<double, int> savedStates = GetSavedStates();
+
+	if (i > savedStates.size())
+		Core::DisplayMessage("State doesn't exist", 2000);
 	else
-		LoadAs(g_last_filename);
+	{
+		std::map<double, int>::iterator it = savedStates.begin();
+		std::advance(it, i-1);
+		Load(it->second);
+	}
+}
+
+// must wait for state to be written because it must know if all slots are taken
+void SaveFirstSaved()
+{
+	std::map<double, int> savedStates = GetSavedStates();
+
+	// save to an empty slot
+	if (savedStates.size() < NUM_STATES)
+		Save(GetEmptySlot(savedStates), true);
+	// overwrite the oldest state
+	else
+	{
+		std::map<double, int>::iterator it = savedStates.begin();
+		std::advance(it, savedStates.size()-1);
+		Save(it->second, true);
+	}
 }
 
 void Flush()
diff --git a/Source/Core/Core/Src/State.h b/Source/Core/Core/Src/State.h
index db88cef766..14e77bae5c 100644
--- a/Source/Core/Core/Src/State.h
+++ b/Source/Core/Core/Src/State.h
@@ -14,22 +14,34 @@
 namespace State
 {
 
+// number of states
+static const u32 NUM_STATES = 8;
+
+struct StateHeader
+{
+	u8 gameID[6];
+	u32 size;
+	double time;
+};
+
 void Init();
 
 void Shutdown();
 
 void EnableCompression(bool compression);
 
+bool ReadHeader(const std::string filename, StateHeader& header);
+
 // These don't happen instantly - they get scheduled as events.
 // ...But only if we're not in the main cpu thread.
 //    If we're in the main cpu thread then they run immediately instead
 //    because some things (like Lua) need them to run immediately.
 // Slots from 0-99.
-void Save(int slot);
+void Save(int slot, bool wait = false);
 void Load(int slot);
 void Verify(int slot);
 
-void SaveAs(const std::string &filename);
+void SaveAs(const std::string &filename, bool wait = false);
 void LoadAs(const std::string &filename);
 void VerifyAt(const std::string &filename);
 
@@ -37,7 +49,10 @@ void SaveToBuffer(std::vector<u8>& buffer);
 void LoadFromBuffer(std::vector<u8>& buffer);
 void VerifyBuffer(std::vector<u8>& buffer);
 
-void LoadLastSaved();
+static std::string MakeStateFilename(int number);
+
+void LoadLastSaved(int i = 1);
+void SaveFirstSaved();
 void UndoSaveState();
 void UndoLoadState();
 
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index 2ed76f6214..1e0e0c756c 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -204,13 +204,14 @@ EVT_MENU_RANGE(IDM_LOGWINDOW, IDM_VIDEOWINDOW, CFrame::OnToggleWindow)
 
 EVT_MENU(IDM_PURGECACHE, CFrame::GameListChanged)
 
-EVT_MENU(IDM_LOADLASTSTATE, CFrame::OnLoadLastState)
+EVT_MENU(IDM_SAVEFIRSTSTATE, CFrame::OnSaveFirstState)
 EVT_MENU(IDM_UNDOLOADSTATE,     CFrame::OnUndoLoadState)
 EVT_MENU(IDM_UNDOSAVESTATE,     CFrame::OnUndoSaveState)
 EVT_MENU(IDM_LOADSTATEFILE, CFrame::OnLoadStateFromFile)
 EVT_MENU(IDM_SAVESTATEFILE, CFrame::OnSaveStateToFile)
 
 EVT_MENU_RANGE(IDM_LOADSLOT1, IDM_LOADSLOT8, CFrame::OnLoadState)
+EVT_MENU_RANGE(IDM_LOADLAST1, IDM_LOADLAST8, CFrame::OnLoadLastState)
 EVT_MENU_RANGE(IDM_SAVESLOT1, IDM_SAVESLOT8, CFrame::OnSaveState)
 EVT_MENU_RANGE(IDM_FRAMESKIP0, IDM_FRAMESKIP9, CFrame::OnFrameSkip)
 EVT_MENU_RANGE(IDM_DRIVE1, IDM_DRIVE24, CFrame::OnBootDrive)
@@ -719,104 +720,56 @@ int GetCmdForHotkey(unsigned int key)
 {
 	switch (key)
 	{
-	case HK_OPEN:
-		return wxID_OPEN;
+	case HK_OPEN: return wxID_OPEN;
+	case HK_CHANGE_DISC: return IDM_CHANGEDISC;
+	case HK_REFRESH_LIST: return wxID_REFRESH;
+	case HK_PLAY_PAUSE: return IDM_PLAY;
+	case HK_STOP: return IDM_STOP;
+	case HK_RESET: return IDM_RESET;
+	case HK_FRAME_ADVANCE: return IDM_FRAMESTEP;
+	case HK_START_RECORDING: return IDM_RECORD;
+	case HK_PLAY_RECORDING: return IDM_PLAYRECORD;
+	case HK_EXPORT_RECORDING: return IDM_RECORDEXPORT;
+	case HK_READ_ONLY_MODE: return IDM_RECORDREADONLY;
+	case HK_FULLSCREEN: return IDM_TOGGLE_FULLSCREEN;
+	case HK_SCREENSHOT: return IDM_SCREENSHOT;
+	case HK_EXIT: return wxID_EXIT;
 
-	case HK_CHANGE_DISC:
-		return IDM_CHANGEDISC;
+	case HK_WIIMOTE1_CONNECT: return IDM_CONNECT_WIIMOTE1;
+	case HK_WIIMOTE2_CONNECT: return IDM_CONNECT_WIIMOTE2;
+	case HK_WIIMOTE3_CONNECT: return IDM_CONNECT_WIIMOTE3;
+	case HK_WIIMOTE4_CONNECT: return IDM_CONNECT_WIIMOTE4;
 
-	case HK_REFRESH_LIST:
-		return wxID_REFRESH;
+	case HK_LOAD_STATE_SLOT_1: return IDM_LOADSLOT1;
+	case HK_LOAD_STATE_SLOT_2: return IDM_LOADSLOT2;
+	case HK_LOAD_STATE_SLOT_3: return IDM_LOADSLOT3;
+	case HK_LOAD_STATE_SLOT_4: return IDM_LOADSLOT4;
+	case HK_LOAD_STATE_SLOT_5: return IDM_LOADSLOT5;
+	case HK_LOAD_STATE_SLOT_6: return IDM_LOADSLOT6;
+	case HK_LOAD_STATE_SLOT_7: return IDM_LOADSLOT7;
+	case HK_LOAD_STATE_SLOT_8: return IDM_LOADSLOT8;
 
-	case HK_PLAY_PAUSE:
-		return IDM_PLAY;
+	case HK_SAVE_STATE_SLOT_1: return IDM_SAVESLOT1;
+	case HK_SAVE_STATE_SLOT_2: return IDM_SAVESLOT2;
+	case HK_SAVE_STATE_SLOT_3: return IDM_SAVESLOT3;
+	case HK_SAVE_STATE_SLOT_4: return IDM_SAVESLOT4;
+	case HK_SAVE_STATE_SLOT_5: return IDM_SAVESLOT5;
+	case HK_SAVE_STATE_SLOT_6: return IDM_SAVESLOT6;
+	case HK_SAVE_STATE_SLOT_7: return IDM_SAVESLOT7;
+	case HK_SAVE_STATE_SLOT_8: return IDM_SAVESLOT8;
 
-	case HK_STOP:
-		return IDM_STOP;
+	case HK_LOAD_LAST_STATE_1: return IDM_LOADLAST1;
+	case HK_LOAD_LAST_STATE_2: return IDM_LOADLAST2;
+	case HK_LOAD_LAST_STATE_3: return IDM_LOADLAST3;
+	case HK_LOAD_LAST_STATE_4: return IDM_LOADLAST4;
+	case HK_LOAD_LAST_STATE_5: return IDM_LOADLAST5;
+	case HK_LOAD_LAST_STATE_6: return IDM_LOADLAST6;
+	case HK_LOAD_LAST_STATE_7: return IDM_LOADLAST7;
+	case HK_LOAD_LAST_STATE_8: return IDM_LOADLAST8;
 
-	case HK_RESET:
-		return IDM_RESET;
-
-	case HK_FRAME_ADVANCE:
-		return IDM_FRAMESTEP;
-
-	case HK_START_RECORDING:
-		return IDM_RECORD;
-
-	case HK_PLAY_RECORDING:
-		return IDM_PLAYRECORD;
-
-	case HK_EXPORT_RECORDING:
-		return IDM_RECORDEXPORT;
-
-	case HK_READ_ONLY_MODE:
-		return IDM_RECORDREADONLY;
-
-	case HK_FULLSCREEN:
-		return IDM_TOGGLE_FULLSCREEN;
-
-	case HK_SCREENSHOT:
-		return IDM_SCREENSHOT;
-
-	case HK_WIIMOTE1_CONNECT:
-		return IDM_CONNECT_WIIMOTE1;
-
-	case HK_WIIMOTE2_CONNECT:
-		return IDM_CONNECT_WIIMOTE2;
-
-	case HK_WIIMOTE3_CONNECT:
-		return IDM_CONNECT_WIIMOTE3;
-
-	case HK_WIIMOTE4_CONNECT:
-		return IDM_CONNECT_WIIMOTE4;
-
-	case HK_LOAD_STATE_SLOT_1:
-		return IDM_LOADSLOT1;
-
-	case HK_LOAD_STATE_SLOT_2:
-		return IDM_LOADSLOT2;
-
-	case HK_LOAD_STATE_SLOT_3:
-		return IDM_LOADSLOT3;
-
-	case HK_LOAD_STATE_SLOT_4:
-		return IDM_LOADSLOT4;
-
-	case HK_LOAD_STATE_SLOT_5:
-		return IDM_LOADSLOT5;
-
-	case HK_LOAD_STATE_SLOT_6:
-		return IDM_LOADSLOT6;
-
-	case HK_LOAD_STATE_SLOT_7:
-		return IDM_LOADSLOT7;
-
-	case HK_LOAD_STATE_SLOT_8:
-		return IDM_LOADSLOT8;
-
-	case HK_SAVE_STATE_SLOT_1:
-		return IDM_SAVESLOT1;
-
-	case HK_SAVE_STATE_SLOT_2:
-		return IDM_SAVESLOT2;
-
-	case HK_SAVE_STATE_SLOT_3:
-		return IDM_SAVESLOT3;
-
-	case HK_SAVE_STATE_SLOT_4:
-		return IDM_SAVESLOT4;
-
-	case HK_SAVE_STATE_SLOT_5:
-		return IDM_SAVESLOT5;
-
-	case HK_SAVE_STATE_SLOT_6:
-		return IDM_SAVESLOT6;
-
-	case HK_SAVE_STATE_SLOT_7:
-		return IDM_SAVESLOT7;
-
-	case HK_SAVE_STATE_SLOT_8:
-		return IDM_SAVESLOT8;
+	case HK_SAVE_FIRST_STATE: return IDM_SAVEFIRSTSTATE;
+	case HK_UNDO_LOAD_STATE: return IDM_UNDOLOADSTATE;
+	case HK_UNDO_SAVE_STATE: return IDM_UNDOSAVESTATE;
 	}
 
 	return -1;
@@ -859,6 +812,8 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
 		// Screenshot hotkey
 		else if (IsHotkey(event, HK_SCREENSHOT))
 			Core::SaveScreenShot();
+		else if (IsHotkey(event, HK_EXIT))
+			wxPostEvent(this, wxCommandEvent(wxID_EXIT));
 		// Wiimote connect and disconnect hotkeys
 		else if (IsHotkey(event, HK_WIIMOTE1_CONNECT))
 			WiimoteId = 0;
@@ -868,28 +823,6 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
 			WiimoteId = 2;
 		else if (IsHotkey(event, HK_WIIMOTE4_CONNECT))
 			WiimoteId = 3;
-		// State save and state load hotkeys
-		/*else if (event.GetKeyCode() >= WXK_F1 && event.GetKeyCode() <= WXK_F8)
-		{
-			int slot_number = event.GetKeyCode() - WXK_F1 + 1;
-			if (event.GetModifiers() == wxMOD_NONE)
-				State::Load(slot_number);
-			else if (event.GetModifiers() == wxMOD_SHIFT)
-				State::Save(slot_number);
-			else
-				event.Skip();
-		}*/
-		else if (event.GetKeyCode() == WXK_F11 && event.GetModifiers() == wxMOD_NONE)
-			State::LoadLastSaved();
-		else if (event.GetKeyCode() == WXK_F12)
-		{
-			if (event.GetModifiers() == wxMOD_NONE)
-				State::UndoSaveState();
-			else if (event.GetModifiers() == wxMOD_SHIFT)
-				State::UndoLoadState();
-			else
-				event.Skip();
-		}
 		else
 		{
 			unsigned int i = NUM_HOTKEYS;
diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h
index 6657c62013..0a29fffd37 100644
--- a/Source/Core/DolphinWX/Src/Frame.h
+++ b/Source/Core/DolphinWX/Src/Frame.h
@@ -289,6 +289,7 @@ private:
 	void OnLoadStateFromFile(wxCommandEvent& event);
 	void OnSaveStateToFile(wxCommandEvent& event);
 	void OnLoadLastState(wxCommandEvent& event);
+	void OnSaveFirstState(wxCommandEvent& event);
 	void OnUndoLoadState(wxCommandEvent& event);
 	void OnUndoSaveState(wxCommandEvent& event);
 
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index ef0aa81e9d..57c465abfa 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -150,26 +150,25 @@ void CFrame::CreateMenu()
 	emulationMenu->Append(IDM_SAVESTATE, _("Sa&ve State"), saveMenu);
 
 	saveMenu->Append(IDM_SAVESTATEFILE, _("Save State..."));
-	loadMenu->Append(IDM_UNDOSAVESTATE, _("Last Overwritten State") + wxString(wxT("\tF12")));
+	saveMenu->Append(IDM_SAVEFIRSTSTATE, GetMenuLabel(HK_SAVE_FIRST_STATE));
+	loadMenu->Append(IDM_UNDOSAVESTATE, GetMenuLabel(HK_UNDO_SAVE_STATE));
 	saveMenu->AppendSeparator();
 
 	loadMenu->Append(IDM_LOADSTATEFILE, _("Load State..."));
-
-	// Reserve F11 for the "step into" function in the debugger
-	if (g_pCodeWindow)
-		loadMenu->Append(IDM_LOADLASTSTATE, _("Last Saved State"));
-	else
-		loadMenu->Append(IDM_LOADLASTSTATE, _("Last Saved State") + wxString(wxT("\tF11")));
 	
-	loadMenu->Append(IDM_UNDOLOADSTATE, _("Undo Load State") + wxString(wxT("\tShift+F12")));
+	loadMenu->Append(IDM_UNDOLOADSTATE, GetMenuLabel(HK_UNDO_LOAD_STATE));
 	loadMenu->AppendSeparator();
 
-	for (int i = 1; i <= 8; i++)
+	for (int i = 1; i <= State::NUM_STATES; i++)
 	{
 		loadMenu->Append(IDM_LOADSLOT1 + i - 1, GetMenuLabel(HK_LOAD_STATE_SLOT_1 + i - 1));
 		saveMenu->Append(IDM_SAVESLOT1 + i - 1, GetMenuLabel(HK_SAVE_STATE_SLOT_1 + i - 1));
 	}
 
+	loadMenu->AppendSeparator();
+	for (int i = 1; i <= State::NUM_STATES; i++)
+		loadMenu->Append(IDM_LOADLAST1 + i - 1, GetMenuLabel(HK_LOAD_LAST_STATE_1 + i - 1));
+
 	m_MenuBar->Append(emulationMenu, _("&Emulation"));
 
 	// Options menu
@@ -360,6 +359,9 @@ wxString CFrame::GetMenuLabel(int Id)
 		case HK_SCREENSHOT:
 			Label = _("Take Screenshot");
 			break;
+		case HK_EXIT:
+			Label = _("Exit");
+			break;
 
 		case HK_WIIMOTE1_CONNECT:
 		case HK_WIIMOTE2_CONNECT:
@@ -393,6 +395,22 @@ wxString CFrame::GetMenuLabel(int Id)
 					Id - HK_SAVE_STATE_SLOT_1 + 1);
 			break;
 
+		case HK_LOAD_LAST_STATE_1:
+		case HK_LOAD_LAST_STATE_2:
+		case HK_LOAD_LAST_STATE_3:
+		case HK_LOAD_LAST_STATE_4:
+		case HK_LOAD_LAST_STATE_5:
+		case HK_LOAD_LAST_STATE_6:
+		case HK_LOAD_LAST_STATE_7:
+		case HK_LOAD_LAST_STATE_8:
+			Label = wxString::Format(_("Last %i"),
+				Id - HK_LOAD_LAST_STATE_1 + 1);
+			break;
+
+		case HK_SAVE_FIRST_STATE: Label = wxString("Save Oldest State"); break;
+		case HK_UNDO_LOAD_STATE: Label = wxString("Undo Load State"); break;
+		case HK_UNDO_SAVE_STATE: Label = wxString("Undo Save State"); break;
+
 		default:
 			Label = wxString::Format(_("Undefined %i"), Id);
 	}
@@ -1437,10 +1455,20 @@ void CFrame::OnSaveStateToFile(wxCommandEvent& WXUNUSED (event))
 		State::SaveAs(WxStrToStr(path));
 }
 
-void CFrame::OnLoadLastState(wxCommandEvent& WXUNUSED (event))
+void CFrame::OnLoadLastState(wxCommandEvent& event)
 {
 	if (Core::IsRunningAndStarted())
-		State::LoadLastSaved();
+	{
+		int id = event.GetId();
+		int slot = id - IDM_LOADLAST1 + 1;
+		State::LoadLastSaved(slot);
+	}
+}
+
+void CFrame::OnSaveFirstState(wxCommandEvent& WXUNUSED(event))
+{
+	if (Core::GetState() != Core::CORE_UNINITIALIZED)
+		State::SaveFirstSaved();
 }
 
 void CFrame::OnUndoLoadState(wxCommandEvent& WXUNUSED (event))
diff --git a/Source/Core/DolphinWX/Src/Globals.h b/Source/Core/DolphinWX/Src/Globals.h
index 8229af059a..144eafe40f 100644
--- a/Source/Core/DolphinWX/Src/Globals.h
+++ b/Source/Core/DolphinWX/Src/Globals.h
@@ -25,7 +25,7 @@ enum
 {
 	IDM_LOADSTATE = 200, // File menu
 	IDM_SAVESTATE,
-	IDM_LOADLASTSTATE,
+	IDM_SAVEFIRSTSTATE,
 	IDM_UNDOLOADSTATE,
 	IDM_UNDOSAVESTATE,
 	IDM_LOADSTATEFILE,
@@ -46,6 +46,14 @@ enum
 	IDM_LOADSLOT6,
 	IDM_LOADSLOT7,
 	IDM_LOADSLOT8,
+	IDM_LOADLAST1,
+	IDM_LOADLAST2,
+	IDM_LOADLAST3,
+	IDM_LOADLAST4,
+	IDM_LOADLAST5,
+	IDM_LOADLAST6,
+	IDM_LOADLAST7,
+	IDM_LOADLAST8,
 	IDM_FRAMESKIP0,
 	IDM_FRAMESKIP1,
 	IDM_FRAMESKIP2,
diff --git a/Source/Core/DolphinWX/Src/HotkeyDlg.cpp b/Source/Core/DolphinWX/Src/HotkeyDlg.cpp
index f841b412c6..5ee94deb59 100644
--- a/Source/Core/DolphinWX/Src/HotkeyDlg.cpp
+++ b/Source/Core/DolphinWX/Src/HotkeyDlg.cpp
@@ -179,6 +179,7 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls(void)
 
 		_("Toggle Fullscreen"),
 		_("Take Screenshot"),
+		_("Exit"),
 
 		_("Connect Wiimote 1"),
 		_("Connect Wiimote 2"),
@@ -201,7 +202,20 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls(void)
 		_("Save State Slot 5"),
 		_("Save State Slot 6"),
 		_("Save State Slot 7"),
-		_("Save State Slot 8")
+		_("Save State Slot 8"),
+
+		_("Load State Last 1"),
+		_("Load State Last 2"),
+		_("Load State Last 3"),
+		_("Load State Last 4"),
+		_("Load State Last 5"),
+		_("Load State Last 6"),
+		_("Load State Last 7"),
+		_("Load State Last 8"),
+
+		_("Save Oldest State"),
+		_("Undo Load State"),
+		_("Undo Save State")
 	};
 
 	const int page_breaks[3] = {HK_OPEN, HK_LOAD_STATE_SLOT_1, NUM_HOTKEYS};

From e70a277af2a3c1950af4e1fef06dc54f74958290 Mon Sep 17 00:00:00 2001
From: skidau <skidau@gmail.com>
Date: Tue, 30 Apr 2013 23:36:46 +1000
Subject: [PATCH 058/352] Added Dance Mat support for the Family Trainer/Active
 Life series.

Select the dance mat via Configure > Gamecube > Port 1 > Dance Mat

The dance mat is mapped to the GC Pad:

D-Pad Up = Blue Arrow Up
D-Pad Down = Blue Arrow Down
D-Pad Left = Blue Arrow Left
D-Pad Right = Blue Square
Y Button = Orange Arrow Up
A Button = Orange Arrow Down
X Button = Orange Arrow Right
B Button = Oranage Square
---
 Source/Core/Core/CMakeLists.txt               |   1 +
 Source/Core/Core/Core.vcxproj                 |   2 +
 Source/Core/Core/Core.vcxproj.filters         |   6 +
 Source/Core/Core/Src/HW/SI_Device.cpp         |   5 +
 Source/Core/Core/Src/HW/SI_Device.h           |   2 +
 Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp | 264 ++++++++++++++++++
 Source/Core/Core/Src/HW/SI_DeviceDanceMat.h   | 105 +++++++
 Source/Core/Core/Src/NetPlay.cpp              |  11 +
 Source/Core/DolphinWX/Src/ConfigMain.cpp      |  13 +-
 9 files changed, 406 insertions(+), 3 deletions(-)
 create mode 100644 Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp
 create mode 100644 Source/Core/Core/Src/HW/SI_DeviceDanceMat.h

diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
index 0fed2e0b8a..d0ad3c615d 100644
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@@ -111,6 +111,7 @@ set(SRCS	Src/ActionReplay.cpp
 			Src/HW/SI.cpp
 			Src/HW/SI_DeviceAMBaseboard.cpp
 			Src/HW/SI_Device.cpp
+			Src/HW/SI_DeviceDanceMat.cpp
 			Src/HW/SI_DeviceGBA.cpp
 			Src/HW/SI_DeviceGCController.cpp
 			Src/HW/SI_DeviceGCSteeringWheel.cpp
diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj
index 5d0d3b2754..a191d86282 100644
--- a/Source/Core/Core/Core.vcxproj
+++ b/Source/Core/Core/Core.vcxproj
@@ -298,6 +298,7 @@
     <ClCompile Include="Src\HW\SI.cpp" />
     <ClCompile Include="Src\HW\SI_Device.cpp" />
     <ClCompile Include="Src\HW\SI_DeviceAMBaseboard.cpp" />
+    <ClCompile Include="Src\HW\SI_DeviceDanceMat.cpp" />
     <ClCompile Include="Src\HW\SI_DeviceGBA.cpp" />
     <ClCompile Include="Src\HW\SI_DeviceGCController.cpp" />
     <ClCompile Include="Src\HW\SI_DeviceGCSteeringWheel.cpp" />
@@ -498,6 +499,7 @@
     <ClInclude Include="Src\HW\SI.h" />
     <ClInclude Include="Src\HW\SI_Device.h" />
     <ClInclude Include="Src\HW\SI_DeviceAMBaseboard.h" />
+    <ClInclude Include="Src\HW\SI_DeviceDanceMat.h" />
     <ClInclude Include="Src\HW\SI_DeviceGBA.h" />
     <ClInclude Include="Src\HW\SI_DeviceGCController.h" />
     <ClInclude Include="Src\HW\SI_DeviceGCSteeringWheel.h" />
diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters
index c38d68c303..75c592a685 100644
--- a/Source/Core/Core/Core.vcxproj.filters
+++ b/Source/Core/Core/Core.vcxproj.filters
@@ -289,6 +289,9 @@
     <ClCompile Include="Src\HW\SI_DeviceGCSteeringWheel.cpp">
       <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
     </ClCompile>
+    <ClCompile Include="Src\HW\SI_DeviceDanceMat.cpp">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClCompile>
     <ClCompile Include="Src\HW\VideoInterface.cpp">
       <Filter>HW %28Flipper/Hollywood%29\VI - Video Interface</Filter>
     </ClCompile>
@@ -810,6 +813,9 @@
     <ClInclude Include="Src\HW\SI_DeviceGCSteeringWheel.h">
       <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
     </ClInclude>
+    <ClInclude Include="Src\HW\SI_DeviceDanceMat.h">
+      <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
+    </ClInclude>
     <ClInclude Include="Src\HW\SI.h">
       <Filter>HW %28Flipper/Hollywood%29\SI - Serial Interface</Filter>
     </ClInclude>
diff --git a/Source/Core/Core/Src/HW/SI_Device.cpp b/Source/Core/Core/Src/HW/SI_Device.cpp
index baa144c83d..e9674bcab6 100644
--- a/Source/Core/Core/Src/HW/SI_Device.cpp
+++ b/Source/Core/Core/Src/HW/SI_Device.cpp
@@ -5,6 +5,7 @@
 #include "SI_Device.h"
 #include "SI_DeviceGCController.h"
 #include "SI_DeviceGCSteeringWheel.h"
+#include "SI_DeviceDanceMat.h"
 #include "SI_DeviceGBA.h"
 #include "SI_DeviceAMBaseboard.h"
 
@@ -64,6 +65,10 @@ ISIDevice* SIDevice_Create(const SIDevices device, const int port_number)
 		return new CSIDevice_GCController(device, port_number);
 		break;
 
+	case SIDEVICE_DANCEMAT:
+		return new CSIDevice_DanceMat(device, port_number);
+		break;
+
 	case SIDEVICE_GC_STEERING:
 		return new CSIDevice_GCSteeringWheel(device, port_number);
 		break;
diff --git a/Source/Core/Core/Src/HW/SI_Device.h b/Source/Core/Core/Src/HW/SI_Device.h
index bf3e1fc506..62614656c7 100644
--- a/Source/Core/Core/Src/HW/SI_Device.h
+++ b/Source/Core/Core/Src/HW/SI_Device.h
@@ -34,6 +34,7 @@ enum TSIDevices
 	SI_GC_CONTROLLER	= (SI_TYPE_GC | SI_GC_STANDARD),
 	SI_GC_KEYBOARD		= (SI_TYPE_GC | 0x00200000),
 	SI_GC_STEERING		= SI_TYPE_GC, // (shuffle2)I think the "chainsaw" is the same (Or else it's just standard)
+	SI_DANCEMAT			= (SI_TYPE_GC | SI_GC_STANDARD | 0x00000300),
 	SI_AM_BASEBOARD		= 0x10110800 // gets ORd with dipswitch state
 };
 
@@ -49,6 +50,7 @@ enum SIDevices
 	SIDEVICE_GC_CONTROLLER,
 	SIDEVICE_GC_KEYBOARD,
 	SIDEVICE_GC_STEERING,
+	SIDEVICE_DANCEMAT,
 	SIDEVICE_GC_TARUKONGA,
 	SIDEVICE_AM_BASEBOARD
 };
diff --git a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp
new file mode 100644
index 0000000000..30237286e6
--- /dev/null
+++ b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.cpp
@@ -0,0 +1,264 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "SI.h"
+#include "SI_Device.h"
+#include "SI_DeviceDanceMat.h"
+
+#include "EXI_Device.h"
+#include "EXI_DeviceMic.h"
+
+#include "GCPad.h"
+
+#include "../Movie.h"
+
+#include "../CoreTiming.h"
+#include "SystemTimers.h"
+#include "ProcessorInterface.h"
+#include "../Core.h"
+
+// --- Dance mat gamecube controller ---
+CSIDevice_DanceMat::CSIDevice_DanceMat(SIDevices device, int _iDeviceNumber)
+	: ISIDevice(device, _iDeviceNumber)
+	, m_TButtonComboStart(0)
+	, m_TButtonCombo(0)
+	, m_LastButtonCombo(COMBO_NONE)
+{
+	memset(&m_Origin, 0, sizeof(SOrigin));
+	m_Origin.uCommand			= CMD_ORIGIN;
+	m_Origin.uOriginStickX		= 0x80; // center
+	m_Origin.uOriginStickY		= 0x80;
+	m_Origin.uSubStickStickX	= 0x80;
+	m_Origin.uSubStickStickY	= 0x80;
+	m_Origin.uTrigger_L			= 0x00;
+	m_Origin.uTrigger_R			= 0x00;
+
+	// Dunno if we need to do this, game/lib should set it?
+	m_Mode						= 0x03;
+}
+
+int CSIDevice_DanceMat::RunBuffer(u8* _pBuffer, int _iLength)
+{
+	// For debug logging only
+	ISIDevice::RunBuffer(_pBuffer, _iLength);
+
+	// Read the command
+	EBufferCommands command = static_cast<EBufferCommands>(_pBuffer[3]);
+
+	// Handle it
+	switch (command)
+	{
+	case CMD_RESET:
+		*(u32*)&_pBuffer[0] = SI_DANCEMAT;
+		break;
+
+	case CMD_DIRECT:
+		{
+			INFO_LOG(SERIALINTERFACE, "PAD - Direct (Length: %d)", _iLength);
+			u32 high, low;
+			GetData(high, low);
+			for (int i = 0; i < (_iLength - 1) / 2; i++)
+			{
+				_pBuffer[0 + i] = (high >> (i * 8)) & 0xff;
+				_pBuffer[4 + i] = (low >> (i * 8)) & 0xff;
+			}
+		}
+		break;
+
+	case CMD_ORIGIN:
+		{
+			INFO_LOG(SERIALINTERFACE, "PAD - Get Origin");
+			u8* pCalibration = reinterpret_cast<u8*>(&m_Origin);
+			for (int i = 0; i < (int)sizeof(SOrigin); i++)
+			{
+				_pBuffer[i ^ 3] = *pCalibration++;
+			}
+		}
+		break;
+
+	// Recalibrate (FiRES: i am not 100 percent sure about this)
+	case CMD_RECALIBRATE:
+		{
+			INFO_LOG(SERIALINTERFACE, "PAD - Recalibrate");
+			u8* pCalibration = reinterpret_cast<u8*>(&m_Origin);
+			for (int i = 0; i < (int)sizeof(SOrigin); i++)
+			{
+				_pBuffer[i ^ 3] = *pCalibration++;
+			}				
+		}
+		break;
+
+	// DEFAULT
+	default:
+		{
+			ERROR_LOG(SERIALINTERFACE, "Unknown SI command     (0x%x)", command);
+			PanicAlert("SI: Unknown command (0x%x)", command);
+		}			
+		break;
+	}
+
+	return _iLength;
+}
+
+
+// GetData
+
+// Return true on new data (max 7 Bytes and 6 bits ;)
+// [00?SYXBA] [1LRZUDRL] [x] [y] [cx] [cy] [l] [r]
+//  |\_ ERR_LATCH (error latched - check SISR)
+//  |_ ERR_STATUS (error on last GetData or SendCmd?)
+bool CSIDevice_DanceMat::GetData(u32& _Hi, u32& _Low)
+{
+	SPADStatus PadStatus;
+	memset(&PadStatus, 0, sizeof(PadStatus));
+	
+	Pad::GetStatus(ISIDevice::m_iDeviceNumber, &PadStatus);
+	Movie::CallInputManip(&PadStatus, ISIDevice::m_iDeviceNumber);
+
+	u32 netValues[2];
+	if (NetPlay_GetInput(ISIDevice::m_iDeviceNumber, PadStatus, netValues))
+	{
+		_Hi  = netValues[0];	// first 4 bytes
+		_Low = netValues[1];	// last  4 bytes
+		return true;
+	}
+
+	Movie::SetPolledDevice();
+
+	if(Movie::IsPlayingInput())
+	{
+		Movie::PlayController(&PadStatus, ISIDevice::m_iDeviceNumber);
+		Movie::InputUpdate();
+	}
+	else if(Movie::IsRecordingInput())
+	{
+		Movie::RecordInput(&PadStatus, ISIDevice::m_iDeviceNumber);
+		Movie::InputUpdate();
+	}
+	else
+	{
+		Movie::CheckPadStatus(&PadStatus, ISIDevice::m_iDeviceNumber);
+	}
+
+	// Map the dpad to the blue arrows, the buttons to the orange arrows
+	// Z = + button, Start = - button
+	u16 map = 0;
+	if (PadStatus.button & PAD_BUTTON_UP)
+		map |= 0x1000;
+	if (PadStatus.button & PAD_BUTTON_DOWN)
+		map |= 0x2;
+	if (PadStatus.button & PAD_BUTTON_LEFT)
+		map |= 0x8;
+	if (PadStatus.button & PAD_BUTTON_RIGHT)
+		map |= 0x4;
+	if (PadStatus.button & PAD_BUTTON_Y)
+		map |= 0x200;
+	if (PadStatus.button & PAD_BUTTON_A)
+		map |= 0x10;
+	if (PadStatus.button & PAD_BUTTON_B)
+		map |= 0x100;
+	if (PadStatus.button & PAD_BUTTON_X)
+		map |= 0x800;
+	if (PadStatus.button & PAD_TRIGGER_Z)
+		map |= 0x400;
+	if (PadStatus.button & PAD_BUTTON_START)
+		map |= 0x1;
+
+	_Hi = (u32)(map << 16) | 0x8080;
+
+	// Low bits are packed differently per mode
+	if (m_Mode == 0 || m_Mode == 5 || m_Mode == 6 || m_Mode == 7)
+	{
+		_Low  = (u8)(PadStatus.analogB >> 4);					// Top 4 bits
+		_Low |= (u32)((u8)(PadStatus.analogA >> 4) << 4);		// Top 4 bits
+		_Low |= (u32)((u8)(PadStatus.triggerRight >> 4) << 8);	// Top 4 bits
+		_Low |= (u32)((u8)(PadStatus.triggerLeft >> 4) << 12);	// Top 4 bits
+		_Low |= (u32)((u8)(PadStatus.substickY) << 16);			// All 8 bits
+		_Low |= (u32)((u8)(PadStatus.substickX) << 24);			// All 8 bits
+	}
+	else if (m_Mode == 1)
+	{
+		_Low  = (u8)(PadStatus.analogB >> 4);					// Top 4 bits
+		_Low |= (u32)((u8)(PadStatus.analogA >> 4) << 4);		// Top 4 bits
+		_Low |= (u32)((u8)PadStatus.triggerRight << 8);			// All 8 bits
+		_Low |= (u32)((u8)PadStatus.triggerLeft << 16);			// All 8 bits
+		_Low |= (u32)((u8)PadStatus.substickY << 24);			// Top 4 bits
+		_Low |= (u32)((u8)PadStatus.substickX << 28);			// Top 4 bits
+	}
+	else if (m_Mode == 2)
+	{
+		// Identifies the dance mat
+		_Low = 0x8080ffff;
+	}
+	else if (m_Mode == 3)
+	{
+		// Analog A/B are always 0
+		_Low  = (u8)PadStatus.triggerRight;						// All 8 bits
+		_Low |= (u32)((u8)PadStatus.triggerLeft << 8);			// All 8 bits
+		_Low |= (u32)((u8)PadStatus.substickY << 16);			// All 8 bits
+		_Low |= (u32)((u8)PadStatus.substickX << 24);			// All 8 bits
+	}
+	else if (m_Mode == 4)
+	{
+		_Low  = (u8)(PadStatus.analogB);						// All 8 bits
+		_Low |= (u32)((u8)(PadStatus.analogA) << 8);			// All 8 bits
+		// triggerLeft/Right are always 0
+		_Low |= (u32)((u8)PadStatus.substickY << 16);			// All 8 bits
+		_Low |= (u32)((u8)PadStatus.substickX << 24);			// All 8 bits
+	}
+	return true;
+}
+
+
+// SendCommand
+void CSIDevice_DanceMat::SendCommand(u32 _Cmd, u8 _Poll)
+{
+	UCommand command(_Cmd);
+
+	switch (command.Command)
+	{
+	// Costis sent it in some demos :)
+	case 0x00:
+		break;
+
+	case CMD_WRITE:
+		{
+			unsigned int uType = command.Parameter1;  // 0 = stop, 1 = rumble, 2 = stop hard
+			unsigned int uStrength = command.Parameter2;
+
+			// get the correct pad number that should rumble locally when using netplay
+			const u8 numPAD = NetPlay_GetPadNum(ISIDevice::m_iDeviceNumber);
+
+			if (numPAD < 4)
+				Pad::Rumble(numPAD, uType, uStrength);
+
+			if (!_Poll)
+			{
+				m_Mode = command.Parameter2;
+				INFO_LOG(SERIALINTERFACE, "PAD %i set to mode %i", ISIDevice::m_iDeviceNumber, m_Mode);
+			}
+		}
+		break;
+
+	default:
+		{
+			ERROR_LOG(SERIALINTERFACE, "Unknown direct command     (0x%x)", _Cmd);
+			PanicAlert("SI: Unknown direct command");
+		}
+		break;
+	}
+}
+
+// Savestate support
+void CSIDevice_DanceMat::DoState(PointerWrap& p)
+{
+	p.Do(m_Origin);
+	p.Do(m_Mode);
+	p.Do(m_TButtonComboStart);
+	p.Do(m_TButtonCombo);
+	p.Do(m_LastButtonCombo);
+}
diff --git a/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h
new file mode 100644
index 0000000000..b30c107847
--- /dev/null
+++ b/Source/Core/Core/Src/HW/SI_DeviceDanceMat.h
@@ -0,0 +1,105 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
+#ifndef _SI_DEVICEDANCEMAT_H
+#define _SI_DEVICEDANCEMAT_H
+
+#include "SI_Device.h"
+#include "GCPadStatus.h"
+
+
+// standard gamecube controller
+class CSIDevice_DanceMat : public ISIDevice
+{
+private:
+	
+	// Commands
+	enum EBufferCommands
+	{
+		CMD_RESET		= 0x00,
+		CMD_DIRECT		= 0x40,
+		CMD_ORIGIN		= 0x41,
+		CMD_RECALIBRATE	= 0x42,
+	};
+
+	struct SOrigin
+	{
+		u8 uCommand;// Maybe should be button bits?
+		u8 unk_1;	// ..and this would be the other half
+		u8 uOriginStickX;
+		u8 uOriginStickY;
+		u8 uSubStickStickX;
+		u8 uSubStickStickY;
+		u8 uTrigger_L;
+		u8 uTrigger_R;
+		u8 unk_4;
+		u8 unk_5;
+		u8 unk_6;
+		u8 unk_7;
+	};
+
+	enum EDirectCommands
+	{
+		CMD_WRITE = 0x40
+	};
+
+	union UCommand
+	{
+		u32 Hex;
+		struct  
+		{
+			u32 Parameter1	:	8;
+			u32 Parameter2	:	8;
+			u32 Command		:	8;
+			u32				:	8;
+		};
+		UCommand()				{Hex = 0;}
+		UCommand(u32 _iValue)	{Hex = _iValue;}
+	};
+
+	enum EButtonCombo
+	{
+		COMBO_NONE = 0,
+		COMBO_ORIGIN,
+		COMBO_RESET
+	};
+
+	// struct to compare input against
+	// Set on connection and (standard pad only) on button combo
+	SOrigin m_Origin;
+
+	// PADAnalogMode
+	u8 m_Mode;
+
+	// Timer to track special button combos:
+	// y, X, start for 3 seconds updates origin with current status
+	//   Technically, the above is only on standard pad, wavebird does not support it for example
+	// b, x, start for 3 seconds triggers reset (PI reset button interrupt)
+	u64 m_TButtonComboStart, m_TButtonCombo;
+	// Type of button combo from the last/current poll
+	EButtonCombo m_LastButtonCombo;
+
+public:
+
+	// Constructor
+	CSIDevice_DanceMat(SIDevices device, int _iDeviceNumber);
+
+	// Run the SI Buffer
+	virtual int RunBuffer(u8* _pBuffer, int _iLength);
+
+	// Send and Receive pad input from network
+	static bool NetPlay_GetInput(u8 numPAD, SPADStatus status, u32 *PADStatus);
+	static u8 NetPlay_GetPadNum(u8 numPAD);
+
+	// Return true on new data
+	virtual bool GetData(u32& _Hi, u32& _Low);
+
+	// Send a command directly
+	virtual void SendCommand(u32 _Cmd, u8 _Poll);
+
+	// Savestate support
+	virtual void DoState(PointerWrap& p);
+};
+
+#endif
diff --git a/Source/Core/Core/Src/NetPlay.cpp b/Source/Core/Core/Src/NetPlay.cpp
index 96c4a69f98..7f4b838ffc 100644
--- a/Source/Core/Core/Src/NetPlay.cpp
+++ b/Source/Core/Core/Src/NetPlay.cpp
@@ -10,6 +10,7 @@
 // for gcpad
 #include "HW/SI_DeviceGCController.h"
 #include "HW/SI_DeviceGCSteeringWheel.h"
+#include "HW/SI_DeviceDanceMat.h"
 // for gctime
 #include "HW/EXI_DeviceIPL.h"
 // for wiimote/ OSD messages
@@ -299,6 +300,11 @@ bool CSIDevice_GCSteeringWheel::NetPlay_GetInput(u8 numPAD, SPADStatus PadStatus
 	return CSIDevice_GCController::NetPlay_GetInput(numPAD, PadStatus, PADStatus);
 }
 
+bool CSIDevice_DanceMat::NetPlay_GetInput(u8 numPAD, SPADStatus PadStatus, u32 *PADStatus)
+{
+	return CSIDevice_GCController::NetPlay_GetInput(numPAD, PadStatus, PADStatus);
+}
+
 // called from ---CPU--- thread
 // so all players' games get the same time
 u32 CEXIIPL::NetPlay_GetGCTime()
@@ -328,6 +334,11 @@ u8 CSIDevice_GCSteeringWheel::NetPlay_GetPadNum(u8 numPAD)
 	return CSIDevice_GCController::NetPlay_GetPadNum(numPAD);
 }
 
+u8 CSIDevice_DanceMat::NetPlay_GetPadNum(u8 numPAD)
+{
+	return CSIDevice_GCController::NetPlay_GetPadNum(numPAD);
+}
+
 // called from ---CPU--- thread
 // wiimote update / used for frame counting
 //void CWII_IPC_HLE_Device_usb_oh1_57e_305::NetPlay_WiimoteUpdate(int _number)
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp
index edbc45a50d..4ae51d78a1 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp
@@ -87,6 +87,7 @@ static const wxLanguage langIds[] =
 
 #define SIDEV_STDCONT_STR	_trans("Standard Controller")
 #define SIDEV_STEERING_STR	_trans("Steering Wheel")
+#define SIDEV_DANCEMAT_STR	_trans("Dance Mat")
 #define SIDEV_BONGO_STR		_trans("TaruKonga (Bongos)")
 #define SIDEV_GBA_STR		"GBA"
 #define SIDEV_AM_BB_STR		_trans("AM-Baseboard")
@@ -388,6 +389,7 @@ void CConfigMain::InitializeGUIValues()
 		SIDevices.Add(_(DEV_NONE_STR));
 		SIDevices.Add(_(SIDEV_STDCONT_STR));
 		SIDevices.Add(_(SIDEV_STEERING_STR));
+		SIDevices.Add(_(SIDEV_DANCEMAT_STR));
 		SIDevices.Add(_(SIDEV_BONGO_STR));
 		SIDevices.Add(_(SIDEV_GBA_STR));
 		SIDevices.Add(_(SIDEV_AM_BB_STR));
@@ -443,15 +445,18 @@ void CConfigMain::InitializeGUIValues()
 		case SIDEVICE_GC_STEERING:
 			GCSIDevice[i]->SetStringSelection(SIDevices[2]);
 			break;
-		case SIDEVICE_GC_TARUKONGA:
+		case SIDEVICE_DANCEMAT:
 			GCSIDevice[i]->SetStringSelection(SIDevices[3]);
 			break;
-		case SIDEVICE_GC_GBA:
+		case SIDEVICE_GC_TARUKONGA:
 			GCSIDevice[i]->SetStringSelection(SIDevices[4]);
 			break;
-		case SIDEVICE_AM_BASEBOARD:
+		case SIDEVICE_GC_GBA:
 			GCSIDevice[i]->SetStringSelection(SIDevices[5]);
 			break;
+		case SIDEVICE_AM_BASEBOARD:
+			GCSIDevice[i]->SetStringSelection(SIDevices[6]);
+			break;
 		default:
 			GCSIDevice[i]->SetStringSelection(SIDevices[0]);
 			break;
@@ -1103,6 +1108,8 @@ void CConfigMain::ChooseSIDevice(wxString deviceName, int deviceNum)
 		tempType = SIDEVICE_GC_CONTROLLER;
 	else if (!deviceName.compare(WXSTR_TRANS(SIDEV_STEERING_STR)))
 		tempType = SIDEVICE_GC_STEERING;
+	else if (!deviceName.compare(WXSTR_TRANS(SIDEV_DANCEMAT_STR)))
+		tempType = SIDEVICE_DANCEMAT;
 	else if (!deviceName.compare(WXSTR_TRANS(SIDEV_BONGO_STR)))
 		tempType = SIDEVICE_GC_TARUKONGA;
 	else if (!deviceName.compare(wxT(SIDEV_GBA_STR)))

From 2c7ed2a793c1c75cf68e051d1171ebf0a6425c46 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Wed, 1 May 2013 11:42:00 +0200
Subject: [PATCH 059/352] Apply color mask when alpha test parameters change.
 Required to make the changes in revision be706a397720 work properly.

Fixes issue 6080.
---
 Source/Core/VideoCommon/Src/BPStructs.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp
index 314041f894..31f873acc6 100644
--- a/Source/Core/VideoCommon/Src/BPStructs.cpp
+++ b/Source/Core/VideoCommon/Src/BPStructs.cpp
@@ -356,6 +356,7 @@ void BPWritten(const BPCmd& bp)
 		PRIM_LOG("alphacmp: ref0=%d, ref1=%d, comp0=%d, comp1=%d, logic=%d", bpmem.alpha_test.ref0,
 				bpmem.alpha_test.ref1, bpmem.alpha_test.comp0, bpmem.alpha_test.comp1, bpmem.alpha_test.logic);
 		PixelShaderManager::SetAlpha(bpmem.alpha_test);
+		g_renderer->SetColorMask();
 		break;
 	case BPMEM_BIAS: // BIAS
 		PRIM_LOG("ztex bias=0x%x", bpmem.ztex1.bias);

From 62065be7889d9dceba3d16e10674ac34abc65f38 Mon Sep 17 00:00:00 2001
From: lioncash <mathew1900@hotmail.com>
Date: Wed, 1 May 2013 09:05:37 -0400
Subject: [PATCH 060/352] Fix a bug where FIFO recording could not work.

Example (in step by step explanation):

1. Run Dolphin.

2. Go to Tools -> Fifo Player

3. Go to the Record tab and hit record and then stop without a game loaded.

The button is now disabled and will not become active again for the whole time that Dolphin is running. Dolphin must be closed and then re-opened in order to use it again. This fixes that.

I've tested it with multiple conditions to make sure this doesn't beef anything else related to the Fifo Player.

ie)

- Record then Stop without a game loaded (multiple times)
- Record then Stop with a game loaded (multiple times, as well as testing playback. All of which work fine).
---
 Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
index 8b22166a81..8f14797fb0 100644
--- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
+++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
@@ -34,8 +34,8 @@ FifoPlayerDlg::FifoPlayerDlg(wxWindow * const parent) :
 {
 	CreateGUIControls();
 
-	sMutex.lock();	
-	m_EvtHandler = GetEventHandler();	
+	sMutex.lock();
+	m_EvtHandler = GetEventHandler();
 	sMutex.unlock();
 
 	FifoPlayer::GetInstance().SetFileLoadedCallback(FileLoaded);
@@ -65,7 +65,7 @@ FifoPlayerDlg::~FifoPlayerDlg()
 
 	FifoPlayer::GetInstance().SetFrameWrittenCallback(NULL);
 
-	sMutex.lock();	
+	sMutex.lock();
 	m_EvtHandler = NULL;
 	sMutex.unlock();
 }
@@ -407,8 +407,8 @@ void FifoPlayerDlg::OnRecordStop(wxCommandEvent& WXUNUSED(event))
 		// Then stop recording
 		recorder.StopRecording();
 
-		// and disable the button to stop recording
-		m_RecordStop->Disable();
+		// and change the button label accordingly.
+		m_RecordStop->SetLabel(_("Record"));
 	}
 	else // Recorder is actually about to start recording
 	{

From fbc77e956ae348e581bffca2b5b3fe654c03bc42 Mon Sep 17 00:00:00 2001
From: lioncash <mathew1900@hotmail.com>
Date: Wed, 1 May 2013 09:35:31 -0400
Subject: [PATCH 061/352] Display the initial number of frames that are to be
 recorded in the Fifo Player.

Before this commit, nothing would would be displayed in the "Frames to Record" text control.

This fixes that by setting it to what m_FramesToRecord is initially set to, which is 1 (at the time of this commit).
---
 Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
index 8f14797fb0..09eb0b21db 100644
--- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
+++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
@@ -192,7 +192,8 @@ void FifoPlayerDlg::CreateGUIControls()
 	m_FramesToRecordLabel->Wrap(-1);
 	sRecordingOptions->Add(m_FramesToRecordLabel, 0, wxALL, 5);
 	
-	m_FramesToRecordCtrl = new wxSpinCtrl(m_RecordPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10000, 1);
+	wxString initialNum = wxString::Format(_T("%d"), m_FramesToRecord);
+	m_FramesToRecordCtrl = new wxSpinCtrl(m_RecordPage, wxID_ANY, initialNum, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10000);
 	sRecordingOptions->Add(m_FramesToRecordCtrl, 0, wxALL, 5);
 	
 	sRecordPage->Add(sRecordingOptions, 0, wxEXPAND, 5);

From c2859a52078ab5189633656af6c59bb0c42bdcb4 Mon Sep 17 00:00:00 2001
From: lioncash <mathew1900@hotmail.com>
Date: Wed, 1 May 2013 09:41:45 -0400
Subject: [PATCH 062/352] Dammit Ctrl-Z. Restore a wxSpinCtrl parameter that
 accidentally got removed in the last commit.

---
 Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
index 09eb0b21db..eed63d7552 100644
--- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
+++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
@@ -193,7 +193,7 @@ void FifoPlayerDlg::CreateGUIControls()
 	sRecordingOptions->Add(m_FramesToRecordLabel, 0, wxALL, 5);
 	
 	wxString initialNum = wxString::Format(_T("%d"), m_FramesToRecord);
-	m_FramesToRecordCtrl = new wxSpinCtrl(m_RecordPage, wxID_ANY, initialNum, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10000);
+	m_FramesToRecordCtrl = new wxSpinCtrl(m_RecordPage, wxID_ANY, initialNum, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 10000, 1);
 	sRecordingOptions->Add(m_FramesToRecordCtrl, 0, wxALL, 5);
 	
 	sRecordPage->Add(sRecordingOptions, 0, wxEXPAND, 5);

From 8bcd9a74c8f1c844dadd5b11f22dfaa659848f71 Mon Sep 17 00:00:00 2001
From: skidau <skidau@gmail.com>
Date: Wed, 1 May 2013 23:51:43 +1000
Subject: [PATCH 063/352] Clear the texture cache when a new dol is loaded via
 ES_LAUNCH.  Fixes the black screen in The House of the Dead 2. Abbreviated
 some of the information in the window titlebar.

---
 Source/Core/Core/Src/Core.cpp                      | 12 ++++++------
 Source/Core/Core/Src/HLE/HLE_Misc.cpp              |  2 ++
 Source/Plugins/Plugin_VideoDX11/Src/VideoBackend.h |  1 +
 Source/Plugins/Plugin_VideoDX11/Src/main.cpp       |  5 +++++
 Source/Plugins/Plugin_VideoDX9/Src/main.cpp        |  2 +-
 Source/Plugins/Plugin_VideoOGL/Src/VideoBackend.h  |  1 +
 Source/Plugins/Plugin_VideoOGL/Src/main.cpp        |  5 +++++
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index 20cbc5086a..ffd2c35472 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -680,8 +680,8 @@ void UpdateTitle()
 	u32 Speed = DrawnVideo * (100 * 1000) / (VideoInterface::TargetRefreshRate * ElapseTime);
 
 	// Settings are shown the same for both extended and summary info
-	std::string SSettings = StringFromFormat("%s %s - %s - %s", cpu_core_base->GetName(),	_CoreParameter.bCPUThread ? "DC" : "SC", 
-		g_video_backend->GetName().c_str(), _CoreParameter.bDSPHLE ? "DSPHLE" : "DSPLLE");
+	std::string SSettings = StringFromFormat("%s %s | %s | %s", cpu_core_base->GetName(),	_CoreParameter.bCPUThread ? "DC" : "SC", 
+		g_video_backend->GetName().c_str(), _CoreParameter.bDSPHLE ? "HLE" : "LLE");
 
 	// Use extended or summary information. The summary information does not print the ticks data,
 	// that's more of a debugging interest, it can always be optional of course if someone is interested.
@@ -698,7 +698,7 @@ void UpdateTitle()
 
 		float TicksPercentage = (float)diff / (float)(SystemTimers::GetTicksPerSecond() / 1000000) * 100;
 
-		std::string SFPS = StringFromFormat("FPS: %u - VPS: %u - SPEED: %u%%", FPS, VPS, Speed);
+		std::string SFPS = StringFromFormat("FPS: %u - VPS: %u - %u%%", FPS, VPS, Speed);
 		SFPS += StringFromFormat(" | CPU: %s%i MHz [Real: %i + IdleSkip: %i] / %i MHz (%s%3.0f%%)",
 				_CoreParameter.bSkipIdle ? "~" : "",
 				(int)(diff),
@@ -711,11 +711,11 @@ void UpdateTitle()
 	#else	// Summary information
 	std::string SFPS;
 	if (Movie::IsPlayingInput())
-		SFPS = StringFromFormat("VI: %u/%u - Frame: %u/%u - FPS: %u - VPS: %u - SPEED: %u%%", (u32)Movie::g_currentFrame, (u32)Movie::g_totalFrames, (u32)Movie::g_currentInputCount, (u32)Movie::g_totalInputCount, FPS, VPS, Speed);
+		SFPS = StringFromFormat("VI: %u/%u - Frame: %u/%u - FPS: %u - VPS: %u - %u%%", (u32)Movie::g_currentFrame, (u32)Movie::g_totalFrames, (u32)Movie::g_currentInputCount, (u32)Movie::g_totalInputCount, FPS, VPS, Speed);
 	else if (Movie::IsRecordingInput())
-		SFPS = StringFromFormat("VI: %u - Frame: %u - FPS: %u - VPS: %u - SPEED: %u%%", (u32)Movie::g_currentFrame, (u32)Movie::g_currentInputCount, FPS, VPS, Speed);
+		SFPS = StringFromFormat("VI: %u - Frame: %u - FPS: %u - VPS: %u - %u%%", (u32)Movie::g_currentFrame, (u32)Movie::g_currentInputCount, FPS, VPS, Speed);
 	else
-		SFPS = StringFromFormat("FPS: %u - VPS: %u - SPEED: %u%%", FPS, VPS, Speed);
+		SFPS = StringFromFormat("FPS: %u - VPS: %u - %u%%", FPS, VPS, Speed);
 	#endif
 
 	// This is our final "frame counter" string
diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.cpp b/Source/Core/Core/Src/HLE/HLE_Misc.cpp
index a37fc44a97..6db9704be8 100644
--- a/Source/Core/Core/Src/HLE/HLE_Misc.cpp
+++ b/Source/Core/Core/Src/HLE/HLE_Misc.cpp
@@ -20,6 +20,7 @@
 #include "PowerPC/SignatureDB.h"
 #include "PowerPC/PPCSymbolDB.h"
 #include "CommonPaths.h"
+#include "TextureCacheBase.h"
 
 namespace HLE_Misc
 {
@@ -310,6 +311,7 @@ void ExecuteDOL(u8* dolFile, u32 fileSize)
 	}
 
 	PowerPC::ppcState.iCache.Reset();
+	TextureCache::Invalidate();
 
 	CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer();
 	size_t size = s_Usb->m_WiiMotes.size();
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VideoBackend.h b/Source/Plugins/Plugin_VideoDX11/Src/VideoBackend.h
index a76935da72..f714dbe05a 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/VideoBackend.h
+++ b/Source/Plugins/Plugin_VideoDX11/Src/VideoBackend.h
@@ -13,6 +13,7 @@ class VideoBackend : public VideoBackendHardware
 	void Shutdown();
 
 	std::string GetName();
+	std::string GetDisplayName();
 
 	void Video_Prepare();
 	void Video_Cleanup();
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp
index 5d9a93067c..0561885b27 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp
@@ -63,6 +63,11 @@ void VideoBackend::UpdateFPSDisplay(const char *text)
 }
 
 std::string VideoBackend::GetName()
+{
+	return "DX11";
+}
+
+std::string VideoBackend::GetDisplayName()
 {
 	return "Direct3D11";
 }
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
index b7fb9c1d44..42011d1b9e 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
@@ -72,7 +72,7 @@ void VideoBackend::UpdateFPSDisplay(const char *text)
 
 std::string VideoBackend::GetName()
 {
-	return "Direct3D9";
+	return "DX9";
 }
 
 std::string VideoBackend::GetDisplayName()
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VideoBackend.h b/Source/Plugins/Plugin_VideoOGL/Src/VideoBackend.h
index 2520c72763..137c09a973 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VideoBackend.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VideoBackend.h
@@ -13,6 +13,7 @@ class VideoBackend : public VideoBackendHardware
 	void Shutdown();
 
 	std::string GetName();
+	std::string GetDisplayName();
 
 	void Video_Prepare();
 	void Video_Cleanup();
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
index 74393fe121..4356418c81 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
@@ -91,6 +91,11 @@ namespace OGL
 {
 
 std::string VideoBackend::GetName()
+{
+	return "OGL";
+}
+
+std::string VideoBackend::GetDisplayName()
 {
 	return "OpenGL";
 }

From c80309ee1ad6116cb76c5ee557e0b203c2a3be0f Mon Sep 17 00:00:00 2001
From: LPFaint99 <lpfaint99@gmail.com>
Date: Wed, 1 May 2013 11:28:02 -0700
Subject: [PATCH 064/352] GCMemcard: Initialize the current/previous DIR BAT
 pointers when creating a new memory card fixes issue 6288

---
 Source/Core/Core/Src/HW/GCMemcard.cpp | 8 +++++++-
 Source/Core/Core/Src/HW/GCMemcard.h   | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Source/Core/Core/Src/HW/GCMemcard.cpp b/Source/Core/Core/Src/HW/GCMemcard.cpp
index a13cdb4a2c..c51d3221e3 100644
--- a/Source/Core/Core/Src/HW/GCMemcard.cpp
+++ b/Source/Core/Core/Src/HW/GCMemcard.cpp
@@ -215,7 +215,12 @@ GCMemcard::GCMemcard(const char *filename, bool forceCreation, bool sjis)
 	}
 
 	mcdFile.Close();
+	
+	initDirBatPointers();
+}
 
+void GCMemcard::initDirBatPointers() 
+{
 	if (BE16(dir.UpdateCounter) > (BE16(dir_backup.UpdateCounter)))
 	{
 		CurrentDir = &dir;
@@ -1273,7 +1278,8 @@ bool GCMemcard::Format(bool sjis, u16 SizeMb)
 		GCMBlock b;
 		mc_data_blocks.push_back(b);
 	}
-
+	
+	initDirBatPointers();
 	m_valid = true;
 
 	return Save();
diff --git a/Source/Core/Core/Src/HW/GCMemcard.h b/Source/Core/Core/Src/HW/GCMemcard.h
index a25d8daacb..215402dd10 100644
--- a/Source/Core/Core/Src/HW/GCMemcard.h
+++ b/Source/Core/Core/Src/HW/GCMemcard.h
@@ -171,6 +171,7 @@ private:
 
 	u32 ImportGciInternal(FILE* gcih, const char *inputFile, const std::string &outputFile);
 	static void FormatInternal(GCMC_Header &GCP);
+	void initDirBatPointers() ;
 public:
 
 	GCMemcard(const char* fileName, bool forceCreation=false, bool sjis=false);

From 18b0556e0dbc9c55fd54d91765468c1f3efcdcc7 Mon Sep 17 00:00:00 2001
From: skidau <skidau@gmail.com>
Date: Fri, 3 May 2013 23:20:48 +1000
Subject: [PATCH 065/352] Immediately process ARAM DMA transfers if they are 1
 block in length.  Fixes the teleportation in Beyond Good and Evil.

Fixes issue 6289.
---
 Source/Core/Core/Src/HW/DSP.cpp | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/Source/Core/Core/Src/HW/DSP.cpp b/Source/Core/Core/Src/HW/DSP.cpp
index 809128225e..24a872da87 100644
--- a/Source/Core/Core/Src/HW/DSP.cpp
+++ b/Source/Core/Core/Src/HW/DSP.cpp
@@ -687,12 +687,27 @@ void UpdateAudioDMA()
 
 void Do_ARAM_DMA()
 {
-	g_dspState.DSPControl.DMAState = 1;
-	CoreTiming::ScheduleEvent_Threadsafe(0, et_GenerateDSPInterrupt, INT_ARAM | (1<<16));
+	if (g_arDMA.Cnt.count == 32)
+	{
+		// Beyond Good and Evil (GGEE41) sends count 32
+		GenerateDSPInterrupt(INT_ARAM);
+	}
+	else
+	{
+		g_dspState.DSPControl.DMAState = 1;
+		CoreTiming::ScheduleEvent_Threadsafe(0, et_GenerateDSPInterrupt, INT_ARAM | (1<<16));
 
-	// Force an early exception check on large transfers. Fixes RE2 audio.
-	if (g_arDMA.Cnt.count > 2048 && g_arDMA.Cnt.count <= 6144)
-		CoreTiming::ForceExceptionCheck(100);
+		// Force an early exception check on large transfers. Fixes RE2 audio.
+		// NFS:HP2 (<= 6144)
+		// Viewtiful Joe (<= 6144)
+		// Sonic Mega Collection (> 2048)
+		// Paper Mario battles (> 32)
+		// Mario Super Baseball (> 32)
+		// Knockout Kings 2003 loading (> 32)
+		// WWE DOR (> 32)
+		if (g_arDMA.Cnt.count > 2048 && g_arDMA.Cnt.count <= 6144)
+			CoreTiming::ForceExceptionCheck(100);
+	}
 
 	// Real hardware DMAs in 32byte chunks, but we can get by with 8byte chunks
 	if (g_arDMA.Cnt.dir)

From 719f18a12221f35ec4e6e1d8c4d506a851b36da0 Mon Sep 17 00:00:00 2001
From: skidau <skidau@gmail.com>
Date: Sat, 4 May 2013 00:19:02 +1000
Subject: [PATCH 066/352] Forced an exception check on short ARAM DMA
 transfers.

---
 Source/Core/Core/Src/HW/DSP.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/Core/Core/Src/HW/DSP.cpp b/Source/Core/Core/Src/HW/DSP.cpp
index 24a872da87..3ef62e5aaa 100644
--- a/Source/Core/Core/Src/HW/DSP.cpp
+++ b/Source/Core/Core/Src/HW/DSP.cpp
@@ -690,7 +690,9 @@ void Do_ARAM_DMA()
 	if (g_arDMA.Cnt.count == 32)
 	{
 		// Beyond Good and Evil (GGEE41) sends count 32
+		// Lost Kingdoms 2 needs the exception check here in DSP HLE mode
 		GenerateDSPInterrupt(INT_ARAM);
+		CoreTiming::ForceExceptionCheck(100);
 	}
 	else
 	{

From a295a3eb56a3bd0fef815d640cc632af089cdf59 Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Sat, 4 May 2013 23:30:13 +0200
Subject: [PATCH 067/352] ogl: report shader compilation issues in the same way
 as other backends

---
 .../Src/ProgramShaderCache.cpp                | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index 153fe748f1..8689ecbd4e 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -23,6 +23,7 @@ u32 ProgramShaderCache::s_ubo_buffer_size;
 bool ProgramShaderCache::s_ubo_dirty;
 
 static StreamBuffer *s_buffer;
+static int num_failures = 0;
 
 LinearDiskCache<SHADERUID, u8> g_program_disk_cache;
 static GLuint CurrentProgram = 0;
@@ -287,11 +288,19 @@ bool ProgramShaderCache::CompileShader ( SHADER& shader, const char* vcode, cons
 		glGetProgramInfoLog(pid, length, &charsWritten, infoLog);
 		ERROR_LOG(VIDEO, "Program info log:\n%s", infoLog);
 		char szTemp[MAX_PATH];
-		sprintf(szTemp, "%sp_%d.txt", File::GetUserPath(D_DUMP_IDX).c_str(), pid);
+		sprintf(szTemp, "%sbad_p_%d.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
 		std::ofstream file;
 		OpenFStream(file, szTemp, std::ios_base::out);
 		file << infoLog << s_glsl_header << vcode << s_glsl_header << pcode;
 		file.close();
+		
+		PanicAlert("Failed to link shaders!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s, %s, %s):\n%s",
+			szTemp,
+			g_ogl_config.gl_vendor,
+			g_ogl_config.gl_renderer,
+			g_ogl_config.gl_version,
+			infoLog);
+		
 		delete [] infoLog;
 	}
 	if (linkStatus != GL_TRUE)
@@ -328,11 +337,24 @@ GLuint ProgramShaderCache::CompileSingleShader (GLuint type, const char* code )
 		glGetShaderInfoLog(result, length, &charsWritten, infoLog);
 		ERROR_LOG(VIDEO, "PS Shader info log:\n%s", infoLog);
 		char szTemp[MAX_PATH];
-		sprintf(szTemp, "%sps_%d.txt", File::GetUserPath(D_DUMP_IDX).c_str(), result);
+		sprintf(szTemp, 
+			"%sbad_%s_%04i.txt", 
+			File::GetUserPath(D_DUMP_IDX).c_str(), 
+			type==GL_VERTEX_SHADER ? "vs" : "ps", 
+			num_failures++);
 		std::ofstream file;
 		OpenFStream(file, szTemp, std::ios_base::out);
 		file << infoLog << s_glsl_header << code;
 		file.close();
+		
+		PanicAlert("Failed to compile %s shader!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s, %s, %s):\n%s",
+			type==GL_VERTEX_SHADER ? "vertex" : "pixel",
+			szTemp,
+			g_ogl_config.gl_vendor,
+			g_ogl_config.gl_renderer,
+			g_ogl_config.gl_version,
+			infoLog);
+		
 		delete[] infoLog;
 	}
 	if (compileStatus != GL_TRUE)

From 7cc2e3146b55a04cab23db42f832aa306ea6514e Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Sat, 4 May 2013 19:27:39 +0200
Subject: [PATCH 068/352] Updating Cheats manager when the ISO is changed etc.

The Cheats manager should be updated when the ISO is changed because it's non-modal

Removing code that read the ID from file because the cheats manager only has a use when an emulation is running (when the ID doesn't need to be read from the ISO again because it's in a variable). This fixes loading Gecko codes for .wad during an emulation because "VolumeHandler::GetVolume()" return false in this case
---
 Source/Core/DolphinWX/Src/CheatsWindow.cpp  | 47 ++++++++++++++-------
 Source/Core/DolphinWX/Src/CheatsWindow.h    |  3 ++
 Source/Core/DolphinWX/Src/FrameTools.cpp    | 13 ++++++
 Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp | 12 +++---
 Source/Core/DolphinWX/Src/GeckoCodeDiag.h   |  4 +-
 5 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.cpp b/Source/Core/DolphinWX/Src/CheatsWindow.cpp
index ba4918c917..522d30c764 100644
--- a/Source/Core/DolphinWX/Src/CheatsWindow.cpp
+++ b/Source/Core/DolphinWX/Src/CheatsWindow.cpp
@@ -14,6 +14,7 @@
 #include "WxUtils.h"
 
 #define MAX_CHEAT_SEARCH_RESULTS_DISPLAY	256
+const std::string title = _("Cheats Manager");
 
 extern std::vector<ActionReplay::ARCode> arCodes;
 extern CFrame* main_frame;
@@ -22,26 +23,15 @@ extern CFrame* main_frame;
 static wxCheatsWindow *g_cheat_window;
 
 wxCheatsWindow::wxCheatsWindow(wxWindow* const parent)
-	: wxDialog(parent, wxID_ANY, _("Cheats Manager"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxDIALOG_NO_PARENT)
+	: wxDialog(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxDIALOG_NO_PARENT)
 {
 	::g_cheat_window = this;
 
 	// Create the GUI controls
 	Init_ChildControls();
 
-	// Load Data
-	Load_ARCodes();
-
-	// Load Gecko Codes :/
-	{
-	const DiscIO::IVolume* const vol = VolumeHandler::GetVolume();
-	if (vol)
-	{
-		m_gameini_path = File::GetUserPath(D_GAMECONFIG_IDX) + vol->GetUniqueID() + ".ini";
-		m_gameini.Load(m_gameini_path);
-		m_geckocode_panel->LoadCodes(m_gameini, Core::g_CoreStartupParameter.GetUniqueID());
-	}
-	}
+	// load codes
+	UpdateGUI();
 
 	SetSize(wxSize(-1, 600));
 	Center();
@@ -119,7 +109,7 @@ void wxCheatsWindow::Init_ChildControls()
 	m_Notebook_Main->AddPage(m_Tab_Log, _("Logging"));
 
 	// Button Strip
-	wxButton* const button_apply = new wxButton(panel, wxID_APPLY, _("Apply"), wxDefaultPosition, wxDefaultSize);
+	button_apply = new wxButton(panel, wxID_APPLY, _("Apply"), wxDefaultPosition, wxDefaultSize);
 	button_apply->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &wxCheatsWindow::OnEvent_ApplyChanges_Press, this);
 	wxButton* const button_cancel = new wxButton(panel, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize);
 	button_cancel->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &wxCheatsWindow::OnEvent_ButtonClose_Press, this);
@@ -249,12 +239,34 @@ void wxCheatsWindow::OnEvent_Close(wxCloseEvent& ev)
 	Destroy();
 }
 
+// load codes for a new ISO ID
+void wxCheatsWindow::UpdateGUI()
+{
+	// load code
+	m_gameini_path = File::GetUserPath(D_GAMECONFIG_IDX) + Core::g_CoreStartupParameter.GetUniqueID() + ".ini";
+	m_gameini.Load(m_gameini_path);
+	Load_ARCodes();
+	Load_GeckoCodes();
+
+	// enable controls
+	button_apply->Enable(Core::IsRunning());
+
+	// write the ISO name in the title
+	if (Core::IsRunning())
+		SetTitle(title + ": " + Core::g_CoreStartupParameter.GetUniqueID() + " - " + Core::g_CoreStartupParameter.m_strName);
+	else
+		SetTitle(title);
+}
+
 void wxCheatsWindow::Load_ARCodes()
 {
 	using namespace ActionReplay;
 
 	m_CheckListBox_CheatsList->Clear();
 
+	if (!Core::IsRunning())
+		return;
+
 	indexList.clear();
 	size_t size = GetCodeListSize();
 	for (size_t i = 0; i < size; i++)
@@ -269,6 +281,11 @@ void wxCheatsWindow::Load_ARCodes()
 	}
 }
 
+void wxCheatsWindow::Load_GeckoCodes()
+{
+	m_geckocode_panel->LoadCodes(m_gameini, Core::g_CoreStartupParameter.GetUniqueID(), true);
+}
+
 void wxCheatsWindow::OnEvent_CheatsList_ItemSelected(wxCommandEvent& WXUNUSED (event))
 {
 	using namespace ActionReplay;
diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.h b/Source/Core/DolphinWX/Src/CheatsWindow.h
index 293236e005..244e4d5b48 100644
--- a/Source/Core/DolphinWX/Src/CheatsWindow.h
+++ b/Source/Core/DolphinWX/Src/CheatsWindow.h
@@ -96,6 +96,7 @@ class wxCheatsWindow : public wxDialog
 	public:
 		wxCheatsWindow(wxWindow* const parent);
 		~wxCheatsWindow();
+		void UpdateGUI();
 
 	protected:
 
@@ -105,6 +106,7 @@ class wxCheatsWindow : public wxDialog
 		};
 
 		// --- GUI Controls ---
+		wxButton* button_apply;
 		wxNotebook *m_Notebook_Main;
 
 		wxPanel *m_Tab_Cheats;
@@ -134,6 +136,7 @@ class wxCheatsWindow : public wxDialog
 		void Init_ChildControls();
 
 		void Load_ARCodes();
+		void Load_GeckoCodes();
 
 		// --- Wx Events Handlers ---
 
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index 57c465abfa..e183669c86 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -1133,6 +1133,7 @@ void CFrame::OnConfigMain(wxCommandEvent& WXUNUSED (event))
 	CConfigMain ConfigMain(this);
 	if (ConfigMain.ShowModal() == wxID_OK)
 		m_GameListCtrl->Update();
+	UpdateGUI();
 }
 
 void CFrame::OnConfigGFX(wxCommandEvent& WXUNUSED (event))
@@ -1568,6 +1569,9 @@ void CFrame::UpdateGUI()
 	if (DiscIO::CNANDContentManager::Access().GetNANDLoader(TITLEID_SYSMENU).IsValid())
 		GetMenuBar()->FindItem(IDM_LOAD_WII_MENU)->Enable(!Initialized);
 
+	// Tools
+	GetMenuBar()->FindItem(IDM_CHEATS)->Enable(SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats);
+
 	GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE1)->Enable(RunningWii);
 	GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE2)->Enable(RunningWii);
 	GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE3)->Enable(RunningWii);
@@ -1675,6 +1679,15 @@ void CFrame::UpdateGUI()
 
 	// Commit changes to manager
 	m_Mgr->Update();
+
+	// Update non-modal windows
+	if (g_CheatsWindow)
+	{
+		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats)
+			g_CheatsWindow->UpdateGUI();
+		else
+			g_CheatsWindow->Close();
+	}
 }
 
 void CFrame::UpdateGameList()
diff --git a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp
index 12685fac75..efd4a3a990 100644
--- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp
+++ b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp
@@ -3,6 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "GeckoCodeDiag.h"
+#include "Core.h"
 #include "WxUtils.h"
 
 #include <SFML/Network/Http.hpp>
@@ -59,10 +60,10 @@ CodeConfigPanel::CodeConfigPanel(wxWindow* const parent)
 	SetSizerAndFit(sizer_main);
 }
 
-void CodeConfigPanel::UpdateCodeList()
+void CodeConfigPanel::UpdateCodeList(bool checkRunning)
 {
 	// disable the button if it doesn't have an effect
-	btn_download->Enable(!m_gameid.empty());
+	btn_download->Enable((!checkRunning || Core::IsRunning()) && !m_gameid.empty());
 
 	m_listbox_gcodes->Clear();
 	// add the codes to the listbox
@@ -80,14 +81,15 @@ void CodeConfigPanel::UpdateCodeList()
 	UpdateInfoBox(evt);
 }
 
-void CodeConfigPanel::LoadCodes(const IniFile& inifile, const std::string& gameid)
+void CodeConfigPanel::LoadCodes(const IniFile& inifile, const std::string& gameid, bool checkRunning)
 {
 	m_gameid = gameid;
 
 	m_gcodes.clear();
-	Gecko::LoadCodes(inifile, m_gcodes);
+	if (!checkRunning || Core::IsRunning())
+		Gecko::LoadCodes(inifile, m_gcodes);
 
-	UpdateCodeList();
+	UpdateCodeList(checkRunning);
 }
 
 void CodeConfigPanel::ToggleCode(wxCommandEvent& evt)
diff --git a/Source/Core/DolphinWX/Src/GeckoCodeDiag.h b/Source/Core/DolphinWX/Src/GeckoCodeDiag.h
index 66bbdbd4bb..0140966c5e 100644
--- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.h
+++ b/Source/Core/DolphinWX/Src/GeckoCodeDiag.h
@@ -20,7 +20,7 @@ public:
 	CodeConfigPanel(wxWindow* const parent);
 
 
-	void LoadCodes(const IniFile& inifile, const std::string& gameid = "");
+	void LoadCodes(const IniFile& inifile, const std::string& gameid = "", bool checkRunning = false);
 	const std::vector<GeckoCode>& GetCodes() const { return m_gcodes; }
 
 protected:
@@ -29,7 +29,7 @@ protected:
 	void DownloadCodes(wxCommandEvent&);
 	//void ApplyChanges(wxCommandEvent&);
 
-	void UpdateCodeList();
+	void UpdateCodeList(bool checkRunning = false);
 
 private:
 	std::vector<GeckoCode> m_gcodes;

From 46cd91dc0d70178800deecf9867ae80b3d7884bf Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Sun, 5 May 2013 21:23:16 +0200
Subject: [PATCH 069/352] Build fix

---
 Source/Core/DolphinWX/Src/CheatsWindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.cpp b/Source/Core/DolphinWX/Src/CheatsWindow.cpp
index 522d30c764..7d92d7cb04 100644
--- a/Source/Core/DolphinWX/Src/CheatsWindow.cpp
+++ b/Source/Core/DolphinWX/Src/CheatsWindow.cpp
@@ -14,7 +14,7 @@
 #include "WxUtils.h"
 
 #define MAX_CHEAT_SEARCH_RESULTS_DISPLAY	256
-const std::string title = _("Cheats Manager");
+const wxString title = _("Cheats Manager");
 
 extern std::vector<ActionReplay::ARCode> arCodes;
 extern CFrame* main_frame;

From 12d791a6288704affa1627dd54fbf14bda77eb12 Mon Sep 17 00:00:00 2001
From: Glenn Rice <glennricster@gmail.com>
Date: Sun, 5 May 2013 23:22:57 -0500
Subject: [PATCH 070/352] Fix some of the compiler warnings that have appeared
 recently.

---
 Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp | 5 ++---
 Source/Core/Core/Src/State.cpp                     | 8 +++++---
 Source/Core/Core/Src/State.h                       | 2 --
 Source/Core/DolphinWX/Src/FrameTools.cpp           | 4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp
index f7387154b2..e28d5a32ae 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp
@@ -66,9 +66,8 @@ void CUCode_AX::LoadResamplingCoefficients()
 
 	WARN_LOG(DSPHLE, "Loading polyphase resampling coeffs from %s", filename.c_str());
 
-	FILE* fp = fopen(filename.c_str(), "rb");
-	fread(m_coeffs, 1, 0x1000, fp);
-	fclose(fp);
+	File::IOFile fp(filename, "rb");
+	fp.ReadBytes(m_coeffs, 0x1000);
 
 	for (u32 i = 0; i < 0x800; ++i)
 		m_coeffs[i] = Common::swap16(m_coeffs[i]);
diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp
index 09653ac9ad..40a48b4841 100644
--- a/Source/Core/Core/Src/State.cpp
+++ b/Source/Core/Core/Src/State.cpp
@@ -157,7 +157,7 @@ void VerifyBuffer(std::vector<u8>& buffer)
 // return state number not in map
 int GetEmptySlot(std::map<double, int> m)
 {
-	for (int i = 1; i <= NUM_STATES; i++)
+	for (int i = 1; i <= (int)NUM_STATES; i++)
 	{
 		bool found = false;
 		for (std::map<double, int>::iterator it = m.begin(); it != m.end(); it++)
@@ -173,12 +173,14 @@ int GetEmptySlot(std::map<double, int> m)
 	return -1;
 }
 
+static std::string MakeStateFilename(int number);
+
 // read state timestamps
 std::map<double, int> GetSavedStates()
 {
 	StateHeader header;
 	std::map<double, int> m;
-	for (int i = 1; i <= NUM_STATES; i++)
+	for (int i = 1; i <= (int)NUM_STATES; i++)
 	{
 		if (File::Exists(MakeStateFilename(i)))
 		{
@@ -570,7 +572,7 @@ void LoadLastSaved(int i)
 {
 	std::map<double, int> savedStates = GetSavedStates();
 
-	if (i > savedStates.size())
+	if (i > (int)savedStates.size())
 		Core::DisplayMessage("State doesn't exist", 2000);
 	else
 	{
diff --git a/Source/Core/Core/Src/State.h b/Source/Core/Core/Src/State.h
index 14e77bae5c..302e25d617 100644
--- a/Source/Core/Core/Src/State.h
+++ b/Source/Core/Core/Src/State.h
@@ -49,8 +49,6 @@ void SaveToBuffer(std::vector<u8>& buffer);
 void LoadFromBuffer(std::vector<u8>& buffer);
 void VerifyBuffer(std::vector<u8>& buffer);
 
-static std::string MakeStateFilename(int number);
-
 void LoadLastSaved(int i = 1);
 void SaveFirstSaved();
 void UndoSaveState();
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index e183669c86..c6d542bf85 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -159,14 +159,14 @@ void CFrame::CreateMenu()
 	loadMenu->Append(IDM_UNDOLOADSTATE, GetMenuLabel(HK_UNDO_LOAD_STATE));
 	loadMenu->AppendSeparator();
 
-	for (int i = 1; i <= State::NUM_STATES; i++)
+	for (unsigned int i = 1; i <= State::NUM_STATES; i++)
 	{
 		loadMenu->Append(IDM_LOADSLOT1 + i - 1, GetMenuLabel(HK_LOAD_STATE_SLOT_1 + i - 1));
 		saveMenu->Append(IDM_SAVESLOT1 + i - 1, GetMenuLabel(HK_SAVE_STATE_SLOT_1 + i - 1));
 	}
 
 	loadMenu->AppendSeparator();
-	for (int i = 1; i <= State::NUM_STATES; i++)
+	for (unsigned int i = 1; i <= State::NUM_STATES; i++)
 		loadMenu->Append(IDM_LOADLAST1 + i - 1, GetMenuLabel(HK_LOAD_LAST_STATE_1 + i - 1));
 
 	m_MenuBar->Append(emulationMenu, _("&Emulation"));

From b2d3dc8a681767d7da69dfd5932f0a9daecfdb3d Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sun, 5 May 2013 22:42:13 -0500
Subject: [PATCH 071/352] [Android] Allow the user to select multiple browse
 paths.

---
 .../dolphinemu/DolphinEmulator.java           |  4 +-
 .../dolphinemu/dolphinemu/GameListView.java   | 76 ++++++++++---------
 2 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index db647723ad..060807d63c 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -6,8 +6,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import net.simonvt.menudrawer.MenuDrawer;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -25,7 +23,7 @@ public class DolphinEmulator<MainActivity> extends Activity
 	
 	private float screenWidth;
 	private float screenHeight;
-	
+
 	public static native void onTouchEvent(int Action, float X, float Y);
 	
 	static
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
index d585ead372..df7d29e91f 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
@@ -28,7 +28,7 @@ import android.widget.Toast;
 
 public class GameListView extends ListActivity {
 	private GameListAdapter adapter;
-	private static File currentDir = null;
+	private static List<File> currentDir;
 	private MenuDrawer mDrawer;
 	
     private SideMenuAdapter mAdapter;
@@ -37,38 +37,42 @@ public class GameListView extends ListActivity {
     public static native String GetConfig(String Key, String Value, String Default);
     public static native void SetConfig(String Key, String Value, String Default);
 	
-	private void Fill(File f)
+	private void Fill()
     {
-		File[]dirs = f.listFiles();
+		
+		
 		this.setTitle("Game List");
-		List<GameListItem>dir = new ArrayList<GameListItem>();
 		List<GameListItem>fls = new ArrayList<GameListItem>();
-         
-		try
+		String Directories = GetConfig("General", "GCMPathes", "0");
+		int intDirectories = Integer.parseInt(Directories);
+		for (int a = 0; a < intDirectories; ++a)
 		{
-			for(File ff: dirs)
+			String BrowseDir = GetConfig("General", "GCMPaths" + Integer.toString(a), "");
+			File currentDir = new File(BrowseDir);
+			File[]dirs = currentDir.listFiles();
+			try
 			{
-				if (ff.getName().charAt(0) != '.')
-					if(!ff.isDirectory())
-	                	if (ff.getName().toLowerCase().contains(".gcm") ||
-	                		ff.getName().toLowerCase().contains(".iso") ||
-	                		ff.getName().toLowerCase().contains(".wbfs") ||
-	                		ff.getName().toLowerCase().contains(".gcz") ||
-	                		ff.getName().toLowerCase().contains(".dol") ||
-	                		ff.getName().toLowerCase().contains(".elf"))
-	                			fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath()));
-             }
-         }
-         catch(Exception e)
-         {
-         }
-         
-         Collections.sort(dir);
-         Collections.sort(fls);
-         dir.addAll(fls);
-         
-         adapter = new GameListAdapter(this,R.layout.main,dir);
-		 this.setListAdapter(adapter);
+				for(File ff: dirs)
+				{
+					if (ff.getName().charAt(0) != '.')
+						if(!ff.isDirectory())
+			            	if (ff.getName().toLowerCase().contains(".gcm") ||
+			            		ff.getName().toLowerCase().contains(".iso") ||
+			            		ff.getName().toLowerCase().contains(".wbfs") ||
+			            		ff.getName().toLowerCase().contains(".gcz") ||
+			            		ff.getName().toLowerCase().contains(".dol") ||
+			            		ff.getName().toLowerCase().contains(".elf"))
+			            			fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath()));
+				}
+			}
+			catch(Exception e)
+			{
+			}
+		}
+		Collections.sort(fls);
+		 
+		adapter = new GameListAdapter(this,R.layout.main, fls);
+		this.setListAdapter(adapter);
     }
 	
 	@Override
@@ -103,11 +107,13 @@ public class GameListView extends ListActivity {
 		{
 			String FileName = data.getStringExtra("Select");
 			Toast.makeText(this, "Folder Selected: " + FileName, Toast.LENGTH_SHORT).show();
-			SetConfig("General", "GCMPathes", "1");
-			SetConfig("General", "GCMPaths0", FileName);
+			String Directories = GetConfig("General", "GCMPathes", "0");
+			int intDirectories = Integer.parseInt(Directories);
+			Directories = Integer.toString(intDirectories + 1);
+			SetConfig("General", "GCMPathes", Directories);
+			SetConfig("General", "GCMPaths" + Integer.toString(intDirectories), FileName);
 			
-			currentDir = new File(FileName);
-			Fill(currentDir);
+			Fill();
 		}
 	}
 	
@@ -119,10 +125,8 @@ public class GameListView extends ListActivity {
 		 
 		mDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT);
 		 
-		String BrowseDir = GetConfig("General", "GCMPaths0", "");
-		if(currentDir == null)
-			currentDir = new File(BrowseDir);
-		Fill(currentDir);
+		
+		Fill();
 		 
 		List<SideMenuItem>dir = new ArrayList<SideMenuItem>();
 		dir.add(new SideMenuItem("Browse Folder", 0));

From 09def3ed3f4dc746ffa9c0b6ebd749ff751ec6f5 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sun, 5 May 2013 22:47:15 -0500
Subject: [PATCH 072/352] [Android] Add in a compiling option for GLES3

---
 CMakeLists.txt                                | 19 ++++++++++++++-----
 Source/Core/Common/Src/VideoBackendBase.cpp   |  4 ++--
 Source/Core/Core/CMakeLists.txt               |  2 +-
 Source/Core/DolphinWX/Src/GLInterface/EGL.cpp |  4 ++++
 Source/Plugins/CMakeLists.txt                 |  2 +-
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e8b26e254..1ddf6c1581 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,8 @@ option(ANDROID "Enables a build for Android" OFF)
 option(USE_EGL "Enables EGL OpenGL Interface" OFF)
 option(USE_X11 "Enables X11 Support" ON)
 option(USE_WAYLAND "Enables Wayland Support" OFF)
-option(USE_GLES "Enables GLES And EGL, disables OGL" OFF)
+option(USE_GLES "Enables GLES2 And EGL, disables OGL" OFF)
+option(USE_GLES3 "Enables GLES3 and EGL" OFF)
 option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF)
 
 option(FASTLOG "Enable all logs" OFF)
@@ -261,11 +262,19 @@ endif()
 
 # For now GLES and EGL are tied to each other.
 # Enabling GLES also disables the OpenGL plugin.
-if(USE_GLES)
-	message("GLES rendering enabled")
-	add_definitions(-DUSE_GLES=1)
-	add_definitions(-DUSE_EGL=1)
+if(USE_GLES3)
+	message("GLES3 rendering enabled")
+	add_definitions(-DUSE_GLES=1 -DUSE_EGL=1 -DUSE_GLES3=1)
+	include_directories(Externals/GLES3)
 	set(USE_EGL True)
+	set(USE_GLES True)
+else()
+	if(USE_GLES)
+		message("GLES2 rendering enabled. OpenGL disabled")
+		add_definitions(-DUSE_GLES=1)
+		add_definitions(-DUSE_EGL=1)
+		set(USE_EGL True)
+	endif()
 endif()
 # For now Wayland and EGL are tied to each other.
 # The alternative would be an shm path
diff --git a/Source/Core/Common/Src/VideoBackendBase.cpp b/Source/Core/Common/Src/VideoBackendBase.cpp
index 8db4e2ff79..99bce01156 100644
--- a/Source/Core/Common/Src/VideoBackendBase.cpp
+++ b/Source/Core/Common/Src/VideoBackendBase.cpp
@@ -9,7 +9,7 @@
 #include "../../../Plugins/Plugin_VideoDX9/Src/VideoBackend.h"
 #include "../../../Plugins/Plugin_VideoDX11/Src/VideoBackend.h"
 #endif
-#ifndef USE_GLES
+#if !defined(USE_GLES) || USE_GLES3
 #include "../../../Plugins/Plugin_VideoOGL/Src/VideoBackend.h"
 #endif
 #include "../../../Plugins/Plugin_VideoSoftware/Src/VideoBackend.h"
@@ -45,7 +45,7 @@ void VideoBackend::PopulateList()
 	if (IsGteVista())
 		g_available_video_backends.push_back(backends[0] = new DX11::VideoBackend);
 #endif
-#ifndef USE_GLES
+#if !defined(USE_GLES) || USE_GLES3
 	g_available_video_backends.push_back(backends[1] = new OGL::VideoBackend);
 #endif
 	g_available_video_backends.push_back(backends[3] = new SW::VideoSoftware);
diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
index d0ad3c615d..5474083132 100644
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@@ -217,7 +217,7 @@ endif()
 
 set(LIBS bdisasm inputcommon videosoftware sfml-network)
 
-if(NOT USE_GLES)
+if(NOT USE_GLES OR USE_GLES3)
 	set(LIBS ${LIBS} videoogl)
 endif()
 
diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp
index aa26c40b6f..6c12c1156c 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp
@@ -52,7 +52,11 @@ bool cInterfaceEGL::Create(void *&window_handle)
 		EGL_BLUE_SIZE, 8,
 		EGL_DEPTH_SIZE, 24,
 #ifdef USE_GLES
+#ifdef USE_GLES3
+		EGL_RENDERABLE_TYPE, (1 << 6) /* EGL_OPENGL_ES3_BIT */,
+#else
 		EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+#endif
 #else
 		EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
 #endif
diff --git a/Source/Plugins/CMakeLists.txt b/Source/Plugins/CMakeLists.txt
index 7dfdbaca83..3a58c3aab1 100644
--- a/Source/Plugins/CMakeLists.txt
+++ b/Source/Plugins/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(NOT USE_GLES)
+if(NOT USE_GLES OR USE_GLES3)
 	add_subdirectory(Plugin_VideoOGL)
 endif()
 add_subdirectory(Plugin_VideoSoftware)

From b6963ce1cbf6ad8db42ccefbf04d9bf7da306063 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sun, 5 May 2013 23:10:58 -0500
Subject: [PATCH 073/352] [Android] Use vsnprintf for the log messages.

---
 Source/Core/DolphinWX/Src/MainAndroid.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/DolphinWX/Src/MainAndroid.cpp b/Source/Core/DolphinWX/Src/MainAndroid.cpp
index 4d623d5d0b..f1297e8026 100644
--- a/Source/Core/DolphinWX/Src/MainAndroid.cpp
+++ b/Source/Core/DolphinWX/Src/MainAndroid.cpp
@@ -113,7 +113,7 @@ void Host_SysMessage(const char *fmt, ...)
 	char msg[512];
 
 	va_start(list, fmt);
-	vsprintf(msg, fmt, list);
+	vsnprintf(msg, 512, fmt, list);
 	va_end(list);
 
 	size_t len = strlen(msg);

From 028a1a49715f52436d4c18282c7488037cdfe98c Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sun, 5 May 2013 23:20:46 -0500
Subject: [PATCH 074/352] GL_DEPTH_COMPONENT can't have type of
 GL_UNSIGNED_BYTE with glTexImage2D. Qualcomm drivers get hit with this but
 all else don't care.

---
 Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
index f590208fc3..2638a43fe6 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
@@ -73,7 +73,7 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
 		glTexImage2D(GL_TEXTURE_RECTANGLE, 0, GL_RGBA8, m_targetWidth, m_targetHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
 
 		glBindTexture(GL_TEXTURE_RECTANGLE, m_efbDepth);
-		glTexImage2D(GL_TEXTURE_RECTANGLE, 0, GL_DEPTH_COMPONENT24, m_targetWidth, m_targetHeight, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL);
+		glTexImage2D(GL_TEXTURE_RECTANGLE, 0, GL_DEPTH_COMPONENT24, m_targetWidth, m_targetHeight, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL);
 
 		glBindTexture(GL_TEXTURE_RECTANGLE, 0);
 
@@ -160,7 +160,7 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
 	glViewport(0, 0, m_targetWidth, m_targetHeight);
 	glScissor(0, 0, m_targetWidth, m_targetHeight);
 	glClearColor(0.f, 0.f, 0.f, 1.f);
-	glClearDepth(1.0);
+	glClearDepthf(1.0f);
 	glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
 }
 

From cb5b9c0327c1223975b2fdae28b0db7ef5a92b77 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sun, 5 May 2013 23:22:21 -0500
Subject: [PATCH 075/352] [Android] Add GLSLES3 to the GLSL version enums. Add
 in the version and precision qualifier to the shader header.

---
 Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | 6 ++++--
 Source/Plugins/Plugin_VideoOGL/Src/Render.h               | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index 8689ecbd4e..d24ab5a6a0 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -501,6 +501,7 @@ void ProgramShaderCache::CreateHeader ( void )
 	GLSL_VERSION v = g_ogl_config.eSupportedGLSLVersion;
 	snprintf(s_glsl_header, sizeof(s_glsl_header), 
 		"#version %s\n"
+		"%s\n" // default precision
 		"%s\n" // tex_rect
 		"%s\n" // ubo
 		
@@ -528,9 +529,10 @@ void ProgramShaderCache::CreateHeader ( void )
 		"%s\n"
 		"#define COLOROUT(name) %s\n"
 		
-		, v==GLSL_120 ? "120" : v==GLSL_130 ? "130" : "140"
+		, v==GLSLES3 ? "300 es" : v==GLSL_120 ? "120" : v==GLSL_130 ? "130" : "140"
+		, v==GLSLES3 ? "precision highp float;" : ""
 		, v<=GLSL_130 ? "#extension GL_ARB_texture_rectangle : enable" : "#define texture2DRect texture"
-		, g_ActiveConfig.backend_info.bSupportsGLSLUBO && v!=GLSL_140 ? "#extension GL_ARB_uniform_buffer_object : enable" : ""
+		, g_ActiveConfig.backend_info.bSupportsGLSLUBO && v<GLSL_140 ? "#extension GL_ARB_uniform_buffer_object : enable" : ""
 		, v==GLSL_120 ? "attribute" : "in"
 		, v==GLSL_120 ? "attribute" : "out"
 		, v==GLSL_120 ? "varying" : "centroid in"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.h b/Source/Plugins/Plugin_VideoOGL/Src/Render.h
index 61e820dad4..0a0a5a3231 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.h
@@ -12,7 +12,8 @@ void ClearEFBCache();
 enum GLSL_VERSION {
 	GLSL_120,
 	GLSL_130,
-	GLSL_140 // and above
+	GLSL_140, // and above
+	GLSLES3
 };
 
 // ogl-only config, so not in VideoConfig.h

From 5ac58a34ead8b80806b02e6f412ba33eed0d6bfc Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sun, 5 May 2013 23:33:49 -0500
Subject: [PATCH 076/352] [Android] Beginning of GLES3 support.

---
 Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 74 ++++++++++++++-----
 1 file changed, 56 insertions(+), 18 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index 60b3f38079..19472b5249 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -201,6 +201,8 @@ int GetNumMSAACoverageSamples(int MSAAMode)
 }
 
 void ApplySSAASettings() {
+	// GLES3 doesn't support SSAA
+#ifndef USE_GLES3
 	if(g_ActiveConfig.iMultisampleMode == MULTISAMPLE_SSAA_4X) {
 		if(g_ogl_config.bSupportSampleShading) {
 			glEnable(GL_SAMPLE_SHADING_ARB);
@@ -211,13 +213,17 @@ void ApplySSAASettings() {
 	} else if(g_ogl_config.bSupportSampleShading) {
 		glDisable(GL_SAMPLE_SHADING_ARB);
 	}
+#endif
 }
 
 void ErrorCallback( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const char* message, void* userParam)
 {
+	// GLES3 doesn't natively support this
+	// XXX: Include GLES2 extensions header so we can use this
+#ifndef USE_GLES3
 	const char *s_source;
 	const char *s_type;
-	
+
 	switch(source)
 	{
 		case GL_DEBUG_SOURCE_API_ARB:             s_source = "API"; break;
@@ -245,6 +251,7 @@ void ErrorCallback( GLenum source, GLenum type, GLuint id, GLenum severity, GLsi
 		case GL_DEBUG_SEVERITY_LOW_ARB:    WARN_LOG(VIDEO, "id: %x, source: %s, type: %s - %s", id, s_source, s_type, message); break;
 		default:                           ERROR_LOG(VIDEO, "id: %x, source: %s, type: %s - %s", id, s_source, s_type, message); break;
 	}
+#endif
 }
 
 // Init functions
@@ -259,6 +266,29 @@ Renderer::Renderer()
 	InitFPSCounter();
 
 	bool bSuccess = true;
+
+	g_ogl_config.gl_vendor = (const char*)glGetString(GL_VENDOR);
+	g_ogl_config.gl_renderer = (const char*)glGetString(GL_RENDERER);
+	g_ogl_config.gl_version = (const char*)glGetString(GL_VERSION);
+	g_ogl_config.glsl_version = (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION);
+
+	// Init extension support.
+#ifdef USE_GLES3
+	// Set default GLES3 options
+	WARN_LOG(VIDEO, "Running the OpenGL ES 3 backend!");
+	g_Config.backend_info.bSupportsDualSourceBlend = false;
+	g_Config.backend_info.bSupportsGLSLUBO = true; 
+	g_Config.backend_info.bSupportsPrimitiveRestart = false; 
+	
+	g_ogl_config.bSupportsGLSLCache = false; // XXX: Reenable once shaders compile correctly  
+	g_ogl_config.bSupportsGLPinnedMemory = false; 
+	g_ogl_config.bSupportsGLSync = true; 
+	g_ogl_config.bSupportsGLBaseVertex = false; 
+	g_ogl_config.bSupportCoverageMSAA = false; // XXX: GLES3 spec has MSAA
+	g_ogl_config.bSupportSampleShading = false; 
+	g_ogl_config.bSupportOGL31 = false; 
+	g_ogl_config.eSupportedGLSLVersion = GLSLES3;
+#else
 	GLint numvertexattribs = 0;
 	glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &numvertexattribs);
 	if (numvertexattribs < 16)
@@ -268,8 +298,6 @@ Renderer::Renderer()
 				numvertexattribs);
 		bSuccess = false;
 	}
-
-	// Init extension support.
 #ifdef __APPLE__
 	glewExperimental = 1;
 #endif
@@ -323,6 +351,8 @@ Renderer::Renderer()
 				"Please report this issue, then there will be a workaround");
 		bSuccess = false;
 	}
+	if (!GLEW_ARB_texture_non_power_of_two)
+		WARN_LOG(VIDEO, "ARB_texture_non_power_of_two not supported.");
 
 	if (!bSuccess)
 		return;	// TODO: fail
@@ -338,12 +368,7 @@ Renderer::Renderer()
 	g_ogl_config.bSupportCoverageMSAA = GLEW_NV_framebuffer_multisample_coverage;
 	g_ogl_config.bSupportSampleShading = GLEW_ARB_sample_shading;
 	g_ogl_config.bSupportOGL31 = GLEW_VERSION_3_1;
-	
-	g_ogl_config.gl_vendor = (const char*)glGetString(GL_VENDOR);
-	g_ogl_config.gl_renderer = (const char*)glGetString(GL_RENDERER);
-	g_ogl_config.gl_version = (const char*)glGetString(GL_VERSION);
-	g_ogl_config.glsl_version = (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION);
-	
+
 	if(strstr(g_ogl_config.glsl_version, "1.00") || strstr(g_ogl_config.glsl_version, "1.10"))
 	{
 		ERROR_LOG(VIDEO, "GPU: OGL ERROR: Need at least GLSL 1.20\n"
@@ -364,6 +389,7 @@ Renderer::Renderer()
 	{
 		g_ogl_config.eSupportedGLSLVersion = GLSL_140;
 	}
+#endif	
 	
 	glGetIntegerv(GL_MAX_SAMPLES, &g_ogl_config.max_samples);
 	if(g_ogl_config.max_samples < 1) 
@@ -425,9 +451,6 @@ Renderer::Renderer()
 	if (GL_REPORT_ERROR() != GL_NO_ERROR)
 		bSuccess = false;
 
-	if (!GLEW_ARB_texture_non_power_of_two)
-		WARN_LOG(VIDEO, "ARB_texture_non_power_of_two not supported.");
-
 	// TODO: Move these somewhere else?
 	FramebufferManagerBase::SetLastXfbWidth(MAX_XFB_WIDTH);
 	FramebufferManagerBase::SetLastXfbHeight(MAX_XFB_HEIGHT);
@@ -457,7 +480,7 @@ Renderer::Renderer()
 	glViewport(0, 0, GetTargetWidth(), GetTargetHeight()); // Reset The Current Viewport
 
 	glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
-	glClearDepth(1.0f);
+	glClearDepthf(1.0f);
 	glEnable(GL_DEPTH_TEST);
 	glDepthFunc(GL_LEQUAL);
 
@@ -468,8 +491,9 @@ Renderer::Renderer()
 
 	glScissor(0, 0, GetTargetWidth(), GetTargetHeight());
 	glBlendColor(0, 0, 0, 0.5f);
-	glClearDepth(1.0f);
-	
+	glClearDepthf(1.0f);
+
+#ifndef USE_GLES3	
 	if(g_ActiveConfig.backend_info.bSupportsPrimitiveRestart)
 	{
 		if(g_ogl_config.bSupportOGL31)
@@ -483,7 +507,7 @@ Renderer::Renderer()
 			glPrimitiveRestartIndexNV(65535);
 		}
 	}
-
+#endif
 	UpdateActiveConfig();
 }
 
@@ -884,8 +908,14 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data)
 
 				u32* colorMap = new u32[targetPixelRcWidth * targetPixelRcHeight];
 
+#ifdef USE_GLES3
+				// XXX: Swap colours
+				glReadPixels(targetPixelRc.left, targetPixelRc.bottom, targetPixelRcWidth, targetPixelRcHeight,
+				             GL_RGBA, GL_UNSIGNED_INT, colorMap);
+#else
 				glReadPixels(targetPixelRc.left, targetPixelRc.bottom, targetPixelRcWidth, targetPixelRcHeight,
 				             GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, colorMap);
+#endif
 				GL_REPORT_ERRORD();
 
 				UpdateEFBCache(type, cacheRectIdx, efbPixelRc, targetPixelRc, colorMap);
@@ -970,7 +1000,7 @@ void Renderer::UpdateViewport(Matrix44& vpCorrection)
 
 	// Update the view port
 	glViewport(X, Y, Width, Height);
-	glDepthRange(GLNear, GLFar);
+	glDepthRangef(GLNear, GLFar);
 }
 
 void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaEnable, bool zEnable, u32 color, u32 z)
@@ -992,7 +1022,7 @@ void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaE
 	// depth
 	glDepthMask(zEnable ? GL_TRUE : GL_FALSE);
 
-	glClearDepth(float(z & 0xFFFFFF) / float(0xFFFFFF));
+	glClearDepthf(float(z & 0xFFFFFF) / float(0xFFFFFF));
 
 	// Update rect for clearing the picture
 	glEnable(GL_SCISSOR_TEST);
@@ -1487,7 +1517,9 @@ void Renderer::RestoreAPIState()
 	SetBlendMode(true);
 	VertexShaderManager::SetViewportChanged();
 
+#ifndef USE_GLES3
 	glPolygonMode(GL_FRONT_AND_BACK, g_ActiveConfig.bWireFrame ? GL_LINE : GL_FILL);
+#endif
 	
 	VertexManager *vm = (OGL::VertexManager*)g_vertex_manager;
 	glBindBuffer(GL_ARRAY_BUFFER, vm->m_vertex_buffers);
@@ -1539,6 +1571,9 @@ void Renderer::SetDepthMode()
 
 void Renderer::SetLogicOpMode()
 {
+
+	// Logic ops aren't available in GLES3/GLES2
+#ifndef USE_GLES3
 	const GLenum glLogicOpCodes[16] =
 	{
 		GL_CLEAR,
@@ -1568,6 +1603,7 @@ void Renderer::SetLogicOpMode()
 	{
 		glDisable(GL_COLOR_LOGIC_OP);
 	}
+#endif
 }
 
 void Renderer::SetDitherMode()
@@ -1585,8 +1621,10 @@ void Renderer::SetLineWidth()
 	if (bpmem.lineptwidth.linesize > 0)
 		// scale by ratio of widths
 		glLineWidth((float)bpmem.lineptwidth.linesize * fratio / 6.0f);
+#ifndef USE_GLES3
 	if (bpmem.lineptwidth.pointsize > 0)
 		glPointSize((float)bpmem.lineptwidth.pointsize * fratio / 6.0f);
+#endif
 }
 
 void Renderer::SetSamplerState(int stage, int texindex)

From 0247b2a97a1dc4edf56a035cf7d128a636a8460e Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Mon, 6 May 2013 06:43:04 -0500
Subject: [PATCH 077/352] [Android] More GLES3 things. Disable Framedumping and
 MSAA rendering. Remove the HLSL->GLSL shader defines since Qualcomm doesn't
 support this in their shader compiler. Now they get chosen in our shader
 generator instead.

---
 .../VideoCommon/Src/LightingShaderGen.cpp     |  2 +-
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 57 +++++++++++--------
 .../Src/FramebufferManager.cpp                |  3 +-
 .../Src/ProgramShaderCache.cpp                |  8 +--
 Source/Plugins/Plugin_VideoOGL/Src/Render.cpp |  4 +-
 5 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.cpp b/Source/Core/VideoCommon/Src/LightingShaderGen.cpp
index a9c602ad3d..4be33e9eac 100644
--- a/Source/Core/VideoCommon/Src/LightingShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/LightingShaderGen.cpp
@@ -213,7 +213,7 @@ char *GenerateLightingShader(char *p, int components, const char* materialsName,
 					p = GenerateLightShader(p, i, workingchannel, lightsName, coloralpha);
 			}
 		}
-		WRITE(p, "%s%d = mat * saturate(lacc);\n", dest, j);
+		WRITE(p, "%s%d = mat * clamp(lacc, 0.0, 1.0);\n", dest, j);
 		WRITE(p, "}\n");
 	}
 
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index efc16566eb..9ab5752e88 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -272,7 +272,7 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType);
 static void SampleTexture(char *&p, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType);
 // static void WriteAlphaCompare(char *&p, int num, int comp);
 static void WriteAlphaTest(char *&p, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode, bool per_pixel_depth);
-static void WriteFog(char *&p);
+static void WriteFog(char *&p, API_TYPE ApiType);
 
 static const char *tevKSelTableC[] = // KCSEL
 {
@@ -480,6 +480,17 @@ static void BuildSwapModeTable()
 	}
 }
 
+// We can't use function defines since the Qualcomm shader compiler doesn't support it
+static const char *GLSLConvertFunctions[] =
+{
+	"frac", // HLSL
+	"fract", // GLSL
+	"lerp",
+	"mix"
+};
+#define FUNC_FRAC 0
+#define FUNC_LERP 2
+
 const char* WriteRegister(API_TYPE ApiType, const char *prefix, const u32 num)
 {
 	if (ApiType == API_OPENGL)
@@ -508,7 +519,7 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 	int numTexgen = bpmem.genMode.numtexgens;
 
 	bool per_pixel_depth = bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable;
-
+	bool bOpenGL = ApiType == API_OPENGL;
 	char *p = text;
 	WRITE(p, "//Pixel Shader for TEV stages\n");
 	WRITE(p, "//%i TEV stages, %i texgens, XXX IND stages\n",
@@ -802,7 +813,7 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 	}
 	// emulation of unsigned 8 overflow when casting if needed
 	if(RegisterStates[0].AlphaNeedOverflowControl || RegisterStates[0].ColorNeedOverflowControl)
-		WRITE(p, "\tprev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n");
+		WRITE(p, "\tprev = %s(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]);
 
 	AlphaTest::TEST_RESULT Pretest = bpmem.alpha_test.TestResult();
 	if (Pretest == AlphaTest::UNDETERMINED)
@@ -826,7 +837,7 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 
 		// scale to make result from frac correct
 		WRITE(p, "zCoord = zCoord * (16777215.0f/16777216.0f);\n");
-		WRITE(p, "zCoord = frac(zCoord);\n");
+		WRITE(p, "zCoord = %s(zCoord);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]);
 		WRITE(p, "zCoord = zCoord * (16777216.0f/16777215.0f);\n");
 
 		// Note: depth texture out put is only written to depth buffer if late depth test is used
@@ -840,7 +851,7 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 	}
 	else
 	{
-		WriteFog(p);
+		WriteFog(p, ApiType);
 		WRITE(p, "\tocol0 = prev;\n");
 	}
 
@@ -913,16 +924,14 @@ static const char *TEVCMPAlphaOPTable[16] =
 	"   %s.a + (abs(dot(%s.rgb, comp24) - dot(%s.rgb, comp24)) < (0.5f/255.0f) ? %s.a : 0.0f)",//#define TEVCMP_BGR24_EQ 13
 	"   %s.a + ((%s.a >= (%s.a + (0.25f/255.0f))) ? %s.a : 0.0f)",//#define TEVCMP_A8_GT 14
 	"   %s.a + (abs(%s.a - %s.a) < (0.5f/255.0f) ? %s.a : 0.0f)"//#define TEVCMP_A8_EQ 15
-
 };
 
-
 static void WriteStage(char *&p, int n, API_TYPE ApiType)
 {
 	int texcoord = bpmem.tevorders[n/2].getTexCoord(n&1);
 	bool bHasTexCoord = (u32)texcoord < bpmem.genMode.numtexgens;
 	bool bHasIndStage = bpmem.tevind[n].IsActive() && bpmem.tevind[n].bt < bpmem.genMode.numindstages;
-
+	bool bOpenGL = ApiType == API_OPENGL;
 	// HACK to handle cases where the tex gen is not enabled
 	if (!bHasTexCoord)
 		texcoord = 0;
@@ -1016,7 +1025,7 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 	{
 		char *rasswap = swapModeTable[bpmem.combiners[n].alphaC.rswap];
 		WRITE(p, "rastemp = %s.%s;\n", tevRasTable[bpmem.tevorders[n / 2].getColorChan(n & 1)], rasswap);
-		WRITE(p, "crastemp = frac(rastemp * (255.0f/256.0f)) * (256.0f/255.0f);\n");
+		WRITE(p, "crastemp = %s(rastemp * (255.0f/256.0f)) * (256.0f/255.0f);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]);
 	}
 
 
@@ -1049,7 +1058,7 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 		WRITE(p, "konsttemp = float4(%s, %s);\n", tevKSelTableC[kc], tevKSelTableA[ka]);
 		if (kc > 7 || ka > 7)
 		{
-			WRITE(p, "ckonsttemp = frac(konsttemp * (255.0f/256.0f)) * (256.0f/255.0f);\n");
+			WRITE(p, "ckonsttemp = %s(konsttemp * (255.0f/256.0f)) * (256.0f/255.0f);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]);
 		}
 		else
 		{
@@ -1064,7 +1073,7 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 	{
 		if(RegisterStates[0].AlphaNeedOverflowControl || RegisterStates[0].ColorNeedOverflowControl)
 		{
-			WRITE(p, "cprev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n");
+			WRITE(p, "cprev = %s(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]);
 			RegisterStates[0].AlphaNeedOverflowControl = false;
 			RegisterStates[0].ColorNeedOverflowControl = false;
 		}
@@ -1082,7 +1091,7 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 	{
 		if(RegisterStates[1].AlphaNeedOverflowControl || RegisterStates[1].ColorNeedOverflowControl)
 		{
-			WRITE(p, "cc0 = frac(c0 * (255.0f/256.0f)) * (256.0f/255.0f);\n");
+			WRITE(p, "cc0 = %s(c0 * (255.0f/256.0f)) * (256.0f/255.0f);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]);
 			RegisterStates[1].AlphaNeedOverflowControl = false;
 			RegisterStates[1].ColorNeedOverflowControl = false;
 		}
@@ -1100,7 +1109,7 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 	{
 		if(RegisterStates[2].AlphaNeedOverflowControl || RegisterStates[2].ColorNeedOverflowControl)
 		{
-			WRITE(p, "cc1 = frac(c1 * (255.0f/256.0f)) * (256.0f/255.0f);\n");
+			WRITE(p, "cc1 = %s(c1 * (255.0f/256.0f)) * (256.0f/255.0f);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]);
 			RegisterStates[2].AlphaNeedOverflowControl = false;
 			RegisterStates[2].ColorNeedOverflowControl = false;
 		}
@@ -1118,7 +1127,7 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 	{
 		if(RegisterStates[3].AlphaNeedOverflowControl || RegisterStates[3].ColorNeedOverflowControl)
 		{
-			WRITE(p, "cc2 = frac(c2 * (255.0f/256.0f)) * (256.0f/255.0f);\n");
+			WRITE(p, "cc2 = %s(c2 * (255.0f/256.0f)) * (256.0f/255.0f);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]);
 			RegisterStates[3].AlphaNeedOverflowControl = false;
 			RegisterStates[3].ColorNeedOverflowControl = false;
 		}
@@ -1135,7 +1144,7 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 	// combine the color channel
 	WRITE(p, "// color combine\n");
 	if (cc.clamp)
-		WRITE(p, "%s = saturate(", tevCOutputTable[cc.dest]);
+		WRITE(p, "%s = clamp(", tevCOutputTable[cc.dest]);
 	else
 		WRITE(p, "%s = ", tevCOutputTable[cc.dest]);
 
@@ -1160,7 +1169,7 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 		else if (cc.b == TEVCOLORARG_ZERO)
 			WRITE(p, "%s*(float3(1.0f, 1.0f, 1.0f)-%s)", tevCInputTable[cc.a + 16], tevCInputTable[cc.c + 16]);
 		else
-			WRITE(p, "lerp(%s, %s, %s)", tevCInputTable[cc.a + 16], tevCInputTable[cc.b + 16], tevCInputTable[cc.c + 16]);
+			WRITE(p, "%s(%s, %s, %s)", GLSLConvertFunctions[FUNC_LERP + bOpenGL], tevCInputTable[cc.a + 16], tevCInputTable[cc.b + 16], tevCInputTable[cc.c + 16]);
 
 		WRITE(p, "%s", tevBiasTable[cc.bias]);
 
@@ -1177,7 +1186,7 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 				tevCInputTable[cc.c + 16]);
 	}
 	if (cc.clamp)
-		WRITE(p, ")");
+		WRITE(p, ", 0.0, 1.0)");
 	WRITE(p,";\n");
 
 	RegisterStates[ac.dest].AlphaNeedOverflowControl = (ac.clamp == 0);
@@ -1186,7 +1195,7 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 	// combine the alpha channel
 	WRITE(p, "// alpha combine\n");
 	if (ac.clamp)
-		WRITE(p, "%s = saturate(", tevAOutputTable[ac.dest]);
+		WRITE(p, "%s = clamp(", tevAOutputTable[ac.dest]);
 	else
 		WRITE(p, "%s = ", tevAOutputTable[ac.dest]);
 
@@ -1208,7 +1217,7 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 		else if (ac.b == TEVALPHAARG_ZERO)
 			WRITE(p, "%s.a*(1.0f-%s.a)", tevAInputTable[ac.a + 8], tevAInputTable[ac.c + 8]);
 		else
-			WRITE(p, "lerp(%s.a, %s.a, %s.a)", tevAInputTable[ac.a + 8], tevAInputTable[ac.b + 8], tevAInputTable[ac.c + 8]);
+			WRITE(p, "%s(%s.a, %s.a, %s.a)", GLSLConvertFunctions[FUNC_LERP + bOpenGL], tevAInputTable[ac.a + 8], tevAInputTable[ac.b + 8], tevAInputTable[ac.c + 8]);
 
 		WRITE(p, "%s",tevBiasTable[ac.bias]);
 
@@ -1227,7 +1236,7 @@ static void WriteStage(char *&p, int n, API_TYPE ApiType)
 				tevAInputTable[ac.c + 8]);
 	}
 	if (ac.clamp)
-		WRITE(p, ")");
+		WRITE(p, ", 0.0, 1.0)");
 	WRITE(p, ";\n\n");
 	WRITE(p, "// TEV done\n");
 }
@@ -1319,8 +1328,10 @@ static const char *tevFogFuncsTable[] =
 	"\tfog = 1.0f - fog;\n   fog = pow(2.0f, -8.0f * fog * fog);\n"	// backward exp2
 };
 
-static void WriteFog(char *&p)
+static void WriteFog(char *&p, API_TYPE ApiType)
 {
+	bool bOpenGL = ApiType == API_OPENGL;
+
 	if (bpmem.fog.c_proj_fsel.fsel == 0)
 		return; // no Fog
 
@@ -1347,7 +1358,7 @@ static void WriteFog(char *&p)
 		WRITE (p, "\tze *= x_adjust;\n");
 	}
 
-	WRITE (p, "\tfloat fog = saturate(ze - " I_FOG"[1].z);\n");
+	WRITE (p, "\tfloat fog = clamp(ze - " I_FOG"[1].z, 0.0, 1.0);\n");
 
 	if (bpmem.fog.c_proj_fsel.fsel > 3)
 	{
@@ -1359,5 +1370,5 @@ static void WriteFog(char *&p)
 			WARN_LOG(VIDEO, "Unknown Fog Type! %08x", bpmem.fog.c_proj_fsel.fsel);
 	}
 
-	WRITE(p, "\tprev.rgb = lerp(prev.rgb, " I_FOG"[0].rgb, fog);\n");
+	WRITE(p, "\tprev.rgb = %s(prev.rgb, " I_FOG"[0].rgb, fog);\n", GLSLConvertFunctions[FUNC_LERP + bOpenGL]);
 }
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
index 2638a43fe6..5ce106601f 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
@@ -86,6 +86,7 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
 
 		GL_REPORT_FBO_ERROR();
 	}
+#ifndef USE_GLES3
 	else
 	{
 		// EFB targets will be renderbuffers in MSAA mode (required by OpenGL).
@@ -151,7 +152,7 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
 
 		glBindFramebuffer(GL_FRAMEBUFFER, m_efbFramebuffer);
 	}
-
+#endif
 	// Create XFB framebuffer; targets will be created elsewhere.
 
 	glGenFramebuffers(1, &m_xfbFramebuffer);
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index d24ab5a6a0..1b5ab26c73 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -103,6 +103,7 @@ void SHADER::SetProgramVariables()
 
 void SHADER::SetProgramBindings()
 {
+#ifndef USE_GLES3
 	if (g_ActiveConfig.backend_info.bSupportsDualSourceBlend)
 	{
 		// So we do support extended blending
@@ -120,7 +121,7 @@ void SHADER::SetProgramBindings()
 		// ogl2 shaders don't need to bind output colors.
 		// gl_FragColor already point to color channel
 	}
-
+#endif
 	// Need to set some attribute locations
 	glBindAttribLocation(glprogid, SHADER_POSITION_ATTRIB, "rawpos");
 	
@@ -516,11 +517,6 @@ void ProgramShaderCache::CreateHeader ( void )
 		"#define float3 vec3\n"
 		"#define float4 vec4\n"
 
-		// hlsl to glsl function translation
-		"#define frac(x) fract(x)\n"
-		"#define saturate(x) clamp(x, 0.0f, 1.0f)\n"
-		"#define lerp(x, y, z) mix(x, y, z)\n"
-		
 		// glsl 120 hack
 		"%s\n"
 		"%s\n"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index 19472b5249..db628a8f54 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -1276,6 +1276,8 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 	}
 
 	// Frame dumps are handled a little differently in Windows
+	// Frame dumping disabled entirely on GLES3
+#ifndef USE_GLES3
 #if defined _WIN32 || defined HAVE_LIBAV
 	if (g_ActiveConfig.bDumpFrames)
 	{
@@ -1372,7 +1374,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 		bLastFrameDumped = false;
 	}
 #endif
-
+#endif
 	// Finish up the current frame, print some stats
 
 	SetWindowSize(fbWidth, fbHeight);

From 6871cc9700c9916fc602dd460e6451711990e5de Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Mon, 6 May 2013 22:18:46 +0200
Subject: [PATCH 078/352] FifoPlayerDlg: Improve navigating through search
 results.

---
 Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp | 30 ++++++++++++++-------
 Source/Core/DolphinWX/Src/FifoPlayerDlg.h   |  1 +
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
index eed63d7552..63781008b3 100644
--- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
+++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp
@@ -55,7 +55,7 @@ FifoPlayerDlg::~FifoPlayerDlg()
 	m_ObjectToCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnObjectTo, this);
 	m_EarlyMemoryUpdates->Unbind(wxEVT_COMMAND_CHECKBOX_CLICKED, &FifoPlayerDlg::OnCheckEarlyMemoryUpdates, this);
 	m_RecordStop->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnRecordStop, this);
-	m_Save->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnSaveFile, this);	
+	m_Save->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnSaveFile, this);
 	m_FramesToRecordCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnNumFramesToRecord, this);
 	m_Close->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnCloseClick, this);
 
@@ -253,9 +253,7 @@ void FifoPlayerDlg::CreateGUIControls()
 	m_findNext = new wxButton(m_AnalyzePage, wxID_ANY, _("Find next"));
 	m_findPrevious = new wxButton(m_AnalyzePage, wxID_ANY, _("Find previous"));
 
-	m_beginSearch->Disable();
-	m_findNext->Disable();
-	m_findPrevious->Disable();
+	ResetSearch();
 
 	sSearchButtons->Add(m_beginSearch, 0, wxALL, 5);
 	sSearchButtons->Add(m_findNext, 0, wxALL, 5);
@@ -500,16 +498,12 @@ void FifoPlayerDlg::OnBeginSearch(wxCommandEvent& event)
 
 	ChangeSearchResult(0);
 	m_beginSearch->Disable();
-	m_findNext->Enable();
-	m_findPrevious->Enable();
 	m_numResultsText->SetLabel(wxString::Format(_("Found %d results for \'"), search_results.size()) + m_searchField->GetValue() + _("\'"));
 }
 
 void FifoPlayerDlg::OnSearchFieldTextChanged(wxCommandEvent& event)
 {
-	m_beginSearch->Enable(m_searchField->GetLineLength(0) > 0);
-	m_findNext->Disable();
-	m_findPrevious->Disable();
+	ResetSearch();
 }
 
 void FifoPlayerDlg::OnFindNextClick(wxCommandEvent& event)
@@ -552,7 +546,7 @@ void FifoPlayerDlg::OnFindPreviousClick(wxCommandEvent& event)
 
 void FifoPlayerDlg::ChangeSearchResult(unsigned int result_idx)
 {
-	if (search_results.size() > result_idx)
+	if (result_idx < search_results.size()) // if index is valid
 	{
 		m_search_result_idx = result_idx;
 		int prev_frame = m_framesList->GetSelection();
@@ -578,6 +572,9 @@ void FifoPlayerDlg::ChangeSearchResult(unsigned int result_idx)
 			ev.SetInt(m_objectCmdList->GetSelection());
 			OnObjectCmdListSelectionChanged(ev);
 		}
+
+		m_findNext->Enable(result_idx+1 < search_results.size());
+		m_findPrevious->Enable(result_idx != 0);
 	}
 	else if (search_results.size())
 	{
@@ -585,6 +582,15 @@ void FifoPlayerDlg::ChangeSearchResult(unsigned int result_idx)
 	}
 }
 
+void FifoPlayerDlg::ResetSearch()
+{
+	m_beginSearch->Enable(m_searchField->GetLineLength(0) > 0);
+	m_findNext->Disable();
+	m_findPrevious->Disable();
+
+	search_results.clear();
+}
+
 void FifoPlayerDlg::OnFrameListSelectionChanged(wxCommandEvent& event)
 {
 	FifoPlayer& player = FifoPlayer::GetInstance();
@@ -601,6 +607,8 @@ void FifoPlayerDlg::OnFrameListSelectionChanged(wxCommandEvent& event)
 	wxCommandEvent ev = wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
 	ev.SetInt(-1);
 	OnObjectListSelectionChanged(ev);
+
+	ResetSearch();
 }
 
 void FifoPlayerDlg::OnObjectListSelectionChanged(wxCommandEvent& event)
@@ -728,6 +736,8 @@ void FifoPlayerDlg::OnObjectListSelectionChanged(wxCommandEvent& event)
 	wxCommandEvent ev = wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
 	ev.SetInt(-1);
 	OnObjectCmdListSelectionChanged(ev);
+
+	ResetSearch();
 }
 
 void FifoPlayerDlg::OnObjectCmdListSelectionChanged(wxCommandEvent& event)
diff --git a/Source/Core/DolphinWX/Src/FifoPlayerDlg.h b/Source/Core/DolphinWX/Src/FifoPlayerDlg.h
index 9b0098a92e..6f4a8074b9 100644
--- a/Source/Core/DolphinWX/Src/FifoPlayerDlg.h
+++ b/Source/Core/DolphinWX/Src/FifoPlayerDlg.h
@@ -37,6 +37,7 @@ private:
 	void OnFindPreviousClick(wxCommandEvent& event);
 	void OnSearchFieldTextChanged(wxCommandEvent& event);
 	void ChangeSearchResult(unsigned int result_idx);
+	void ResetSearch();
 
 	void OnRecordingFinished(wxEvent& event);
 	void OnFrameWritten(wxEvent& event);

From 9365187f8942f21ab3d35d37b786eacb1146cd67 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Mon, 6 May 2013 22:19:21 +0200
Subject: [PATCH 079/352] BPMemory: Add register documentation for texture
 source adress and EFB configuration.

---
 Source/Core/VideoCommon/Src/BPMemory.cpp | 28 ++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/Source/Core/VideoCommon/Src/BPMemory.cpp b/Source/Core/VideoCommon/Src/BPMemory.cpp
index e917632e1f..4828972cae 100644
--- a/Source/Core/VideoCommon/Src/BPMemory.cpp
+++ b/Source/Core/VideoCommon/Src/BPMemory.cpp
@@ -89,6 +89,19 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size
 		}
 		break;
 
+	case BPMEM_ZCOMPARE:
+		{
+			SetRegName(BPMEM_ZCOMPARE);
+			PE_CONTROL config; config.hex = cmddata;
+			const char* pixel_formats[] = { "RGB8_Z24", "RGBA6_Z24", "RGB565_Z16", "Z24", "Y8", "U8", "V8", "YUV420" };
+			const char* zformats[] = { "linear", "compressed (near)", "compressed (mid)", "compressed (far)", "compressed (inv near)", "compressed (inv mid)", "compressed (inv far)" };
+			snprintf(desc, desc_size, "EFB pixel format: %s\n"
+									"Depth format: %s\n"
+									"Early depth test: %s\n",
+									pixel_formats[config.pixel_format], zformats[config.zformat], no_yes[config.early_ztest]);
+		}
+		break;
+
 	case BPMEM_EFB_BR: // 0x4A
 		{
 			// TODO: Misleading name, should be BPMEM_EFB_WH instead
@@ -162,6 +175,21 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size
 		// TODO: Description
 		break;
 
+	case BPMEM_TX_SETIMAGE3: // 0x94
+	case BPMEM_TX_SETIMAGE3+1:
+	case BPMEM_TX_SETIMAGE3+2:
+	case BPMEM_TX_SETIMAGE3+3:
+	case BPMEM_TX_SETIMAGE3_4: // 0xB4
+	case BPMEM_TX_SETIMAGE3_4+1:
+	case BPMEM_TX_SETIMAGE3_4+2:
+	case BPMEM_TX_SETIMAGE3_4+3:
+		{
+			SetRegName(BPMEM_TX_SETIMAGE3);
+			TexImage3 teximg; teximg.hex = cmddata;
+			snprintf(desc, desc_size, "Source address (32 byte aligned): 0x%06X", teximg.image_base << 5);
+		}
+		break;
+
 	case BPMEM_TEV_COLOR_ENV: // 0xC0
 	case BPMEM_TEV_COLOR_ENV+2:
 	case BPMEM_TEV_COLOR_ENV+4:

From a031351eb2cfe635b4970ebcf24b547c3190e16d Mon Sep 17 00:00:00 2001
From: calc84maniac <calc84maniac@gmail.com>
Date: Tue, 7 May 2013 23:22:28 -0400
Subject: [PATCH 080/352] Use SOUNDTOUCH_INTEGER_SAMPLES only on Android build.
 Some audio backends (i.e. OpenAL) only support floating-point samples.

---
 Externals/soundtouch/STTypes.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Externals/soundtouch/STTypes.h b/Externals/soundtouch/STTypes.h
index 9855939119..39bc68bd69 100644
--- a/Externals/soundtouch/STTypes.h
+++ b/Externals/soundtouch/STTypes.h
@@ -80,7 +80,7 @@ namespace soundtouch
     #undef SOUNDTOUCH_INTEGER_SAMPLES
     #undef SOUNDTOUCH_FLOAT_SAMPLES
 
-    #if (defined(__SOFTFP__))
+    #if (defined(ANDROID) && defined(__SOFTFP__))
         // For Android compilation: Force use of Integer samples in case that
         // compilation uses soft-floating point emulation - soft-fp is way too slow
         #undef  SOUNDTOUCH_FLOAT_SAMPLES

From c7486609fa26626beca76e1f018a120ee406f14d Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Thu, 9 May 2013 10:17:12 +0200
Subject: [PATCH 081/352] fix underflow in IndexGenerator::AddFan

fix issue 6282

The Last Story seems to render a fan with two vertices. It is non-sense as it
shouldn't do anything, but the code underflows at (u32)numVerts-3
---
 Source/Core/VideoCommon/Src/IndexGenerator.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/IndexGenerator.cpp b/Source/Core/VideoCommon/Src/IndexGenerator.cpp
index 15b2311f89..3970d8c82f 100644
--- a/Source/Core/VideoCommon/Src/IndexGenerator.cpp
+++ b/Source/Core/VideoCommon/Src/IndexGenerator.cpp
@@ -142,7 +142,7 @@ template <bool pr> void IndexGenerator::AddFan(u32 numVerts)
 	
 	if(pr)
 	{
-		for(; i<=numVerts-3; i+=3)
+		for(; i+3<=numVerts; i+=3)
 		{
 			*Tptr++ = index + i - 1;
 			*Tptr++ = index + i + 0;
@@ -153,7 +153,7 @@ template <bool pr> void IndexGenerator::AddFan(u32 numVerts)
 			numT += 3;
 		}
 		
-		for(; i<=numVerts-2; i+=2)
+		for(; i+2<=numVerts; i+=2)
 		{
 			*Tptr++ = index + i - 1;
 			*Tptr++ = index + i + 0;

From 98e8f8d7d052be619545f9acc0d79c9145a7e14c Mon Sep 17 00:00:00 2001
From: skidau <skidau@gmail.com>
Date: Fri, 10 May 2013 00:03:00 +1000
Subject: [PATCH 082/352] Forced an external exception check on DI interrupts. 
 Fixes Summoner: A Goddess Reborn.

Fixes issue 6301.
---
 Source/Core/Core/Src/HW/DVDInterface.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Source/Core/Core/Src/HW/DVDInterface.cpp b/Source/Core/Core/Src/HW/DVDInterface.cpp
index 03a856662e..0e77b2a443 100644
--- a/Source/Core/Core/Src/HW/DVDInterface.cpp
+++ b/Source/Core/Core/Src/HW/DVDInterface.cpp
@@ -530,6 +530,9 @@ void UpdateInterrupts()
 	{
 		ProcessorInterface::SetInterrupt(ProcessorInterface::INT_CAUSE_DI, false);
 	}
+
+	// Required for Summoner: A Goddess Reborn
+	CoreTiming::ForceExceptionCheck(50);
 }
 
 void GenerateDIInterrupt(DI_InterruptType _DVDInterrupt)

From 89be1cbf511591dba1e0e33868a67ca393d687fc Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Thu, 9 May 2013 17:48:48 +0200
Subject: [PATCH 083/352] recreate "per pixel depth" option and renamed it to
 fast depth calculation

---
 Source/Core/DolphinWX/Src/VideoConfigDiag.cpp |  3 +-
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 56 ++++++++++---------
 Source/Core/VideoCommon/Src/PixelShaderGen.h  |  2 +-
 Source/Core/VideoCommon/Src/VideoConfig.cpp   |  4 ++
 Source/Core/VideoCommon/Src/VideoConfig.h     |  1 +
 5 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
index 8ad34bed08..531fbe2cc4 100644
--- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
@@ -87,6 +87,7 @@ wxString aa_desc = wxTRANSLATE("Reduces the amount of aliasing caused by rasteri
 wxString scaled_efb_copy_desc = wxTRANSLATE("Greatly increases quality of textures generated using render to texture effects.\nRaising the internal resolution will improve the effect of this setting.\nSlightly decreases performance and possibly causes issues (although unlikely).\n\nIf unsure, leave this checked.");
 wxString pixel_lighting_desc = wxTRANSLATE("Calculate lighting of 3D graphics per-pixel rather than per vertex.\nDecreases emulation speed by some percent (depending on your GPU).\nThis usually is a safe enhancement, but might cause issues sometimes.\n\nIf unsure, leave this unchecked.");
 wxString hacked_buffer_upload_desc = wxTRANSLATE("Use a hacked upload strategy to stream vertices.\nThis usually speed up, but is forbidden by OpenGL specification and may causes heavy glitches.\n\nIf unsure, leave this unchecked.");
+wxString fast_depth_calc_desc = wxTRANSLATE("Use the hardware perspective division to calculate the depth value.\nThis speed up the GPU a lot as the pixel shader only need to calculate the samples which pass the depth test.\nBut as this doesn't have to be accurate enough, flickering may happen on some gpus.");
 wxString force_filtering_desc = wxTRANSLATE("Force texture filtering even if the emulated game explicitly disabled it.\nImproves texture quality slightly but causes glitches in some games.\n\nIf unsure, leave this unchecked.");
 wxString _3d_vision_desc = wxTRANSLATE("Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's supported by your GPU.\nPossibly causes issues.\nRequires fullscreen to work.\n\nIf unsure, leave this unchecked.");
 wxString internal_res_desc = wxTRANSLATE("Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games.\n\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less issues. Generally speaking, the lower the internal resolution is, the better your performance will be.\n\nIf unsure, select 640x528.");
@@ -502,7 +503,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
 	szr_other->Add(CreateCheckBox(page_hacks, _("OpenCL Texture Decoder"), wxGetTranslation(opencl_desc), vconfig.bEnableOpenCL));
 	szr_other->Add(CreateCheckBox(page_hacks, _("OpenMP Texture Decoder"), wxGetTranslation(omp_desc), vconfig.bOMPDecoder));
 	szr_other->Add(hacked_buffer_upload_cb = CreateCheckBox(page_hacks, _("Hacked Buffer Upload"), wxGetTranslation(hacked_buffer_upload_desc), vconfig.bHackedBufferUpload));
-
+	szr_other->Add(CreateCheckBox(page_hacks, _("Fast Depth Calucation"), wxGetTranslation(fast_depth_calc_desc), vconfig.bFastDepthCalc));
 	if (Core::GetState() != Core::CORE_UNINITIALIZED)
 		hacked_buffer_upload_cb->Disable();
 	
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 9ab5752e88..c97cd889ea 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -95,22 +95,23 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo
 	uid->values[0] |= bpmem.genMode.numtevstages; // 4
 	uid->values[0] |= bpmem.genMode.numtexgens << 4; // 4
 	uid->values[0] |= dstAlphaMode << 8; // 2
+	uid->values[0] |= g_ActiveConfig.bFastDepthCalc << 10; // 1
 
 	bool enablePL = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting;
-	uid->values[0] |= enablePL << 10; // 1
+	uid->values[0] |= enablePL << 11; // 1
 
 	if (!enablePL)
 	{
-		uid->values[0] |= xfregs.numTexGen.numTexGens << 11; // 4
+		uid->values[0] |= xfregs.numTexGen.numTexGens << 12; // 4
 	}
 
 	AlphaTest::TEST_RESULT alphaPreTest = bpmem.alpha_test.TestResult();
-	uid->values[0] |= alphaPreTest << 15; // 2
+	uid->values[0] |= alphaPreTest << 16; // 2
 
 	// numtexgens should be <= 8
 	for (unsigned int i = 0; i < bpmem.genMode.numtexgens; ++i)
 	{
-		uid->values[0] |= xfregs.texMtxInfo[i].projection << (17+i); // 1
+		uid->values[0] |= xfregs.texMtxInfo[i].projection << (18+i); // 1
 	}
 
 	uid->values[1] = bpmem.genMode.numindstages; // 3
@@ -180,8 +181,9 @@ void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode, u
 	*ptr++ = bpmem.ztex2.hex; // 2
 	*ptr++ = bpmem.zcontrol.hex; // 3
 	*ptr++ = bpmem.zmode.hex; // 4
-	*ptr++ = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; // 5
-	*ptr++ = xfregs.numTexGen.hex; // 6
+	*ptr++ = g_ActiveConfig.bFastDepthCalc; // 5
+	*ptr++ = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting; // 6
+	*ptr++ = xfregs.numTexGen.hex; // 7
 
 	if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
 	{
@@ -193,28 +195,28 @@ void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode, u
 	}
 
 	for (unsigned int i = 0; i < 8; ++i)
-		*ptr++ = xfregs.texMtxInfo[i].hex; // 7-14
+		*ptr++ = xfregs.texMtxInfo[i].hex; // 8-15
 
 	for (unsigned int i = 0; i < 16; ++i)
-		*ptr++ = bpmem.tevind[i].hex; // 15-30
+		*ptr++ = bpmem.tevind[i].hex; // 16-31
 
-	*ptr++ = bpmem.tevindref.hex; // 31
+	*ptr++ = bpmem.tevindref.hex; // 32
 
 	for (u32 i = 0; i < bpmem.genMode.numtevstages+1u; ++i) // up to 16 times
 	{
-		*ptr++ = bpmem.combiners[i].colorC.hex; // 32+5*i
-		*ptr++ = bpmem.combiners[i].alphaC.hex; // 33+5*i
-		*ptr++ = bpmem.tevind[i].hex; // 34+5*i
-		*ptr++ = bpmem.tevksel[i/2].hex; // 35+5*i
-		*ptr++ = bpmem.tevorders[i/2].hex; // 36+5*i
+		*ptr++ = bpmem.combiners[i].colorC.hex; // 33+5*i
+		*ptr++ = bpmem.combiners[i].alphaC.hex; // 34+5*i
+		*ptr++ = bpmem.tevind[i].hex; // 35+5*i
+		*ptr++ = bpmem.tevksel[i/2].hex; // 36+5*i
+		*ptr++ = bpmem.tevorders[i/2].hex; // 37+5*i
 	}
 
-	ptr = &uid->values[112];
+	ptr = &uid->values[113];
 
-	*ptr++ = bpmem.alpha_test.hex; // 112
+	*ptr++ = bpmem.alpha_test.hex; // 113
 
-	*ptr++ = bpmem.fog.c_proj_fsel.hex; // 113
-	*ptr++ = bpmem.fogRange.Base.hex; // 114
+	*ptr++ = bpmem.fog.c_proj_fsel.hex; // 114
+	*ptr++ = bpmem.fogRange.Base.hex; // 115
 
 	_assert_((ptr - uid->values) == uid->GetNumValues());
 }
@@ -518,7 +520,7 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 	int numStages = bpmem.genMode.numtevstages + 1;
 	int numTexgen = bpmem.genMode.numtexgens;
 
-	bool per_pixel_depth = bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable;
+	bool per_pixel_depth = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable) || !g_ActiveConfig.bFastDepthCalc;
 	bool bOpenGL = ApiType == API_OPENGL;
 	char *p = text;
 	WRITE(p, "//Pixel Shader for TEV stages\n");
@@ -820,15 +822,18 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 		WriteAlphaTest(p, ApiType, dstAlphaMode, per_pixel_depth);
 
 	
-	// the screen space depth value = far z + (clip z / clip w) * z range
-	if(ApiType == API_OPENGL || ApiType == API_D3D11)
+	// dx9 doesn't support readback of depth in pixel shader, so we always have to calculate it again
+	// shouldn't be a performance issue as early_z is still possible, but there may be depth issues with z-textures
+	if((ApiType == API_OPENGL || ApiType == API_D3D11) && g_ActiveConfig.bFastDepthCalc)
 		WRITE(p, "float zCoord = rawpos.z;\n");
 	else
-		// dx9 doesn't support 4 component position, so we have to calculate it again
+		// the screen space depth value = far z + (clip z / clip w) * z range
 		WRITE(p, "float zCoord = " I_ZBIAS"[1].x + (clipPos.z / clipPos.w) * " I_ZBIAS"[1].y;\n");
 
 	// depth texture can safely be ignored if the result won't be written to the depth buffer (early_ztest) and isn't used for fog either
 	bool skip_ztexture = !per_pixel_depth && !bpmem.fog.c_proj_fsel.fsel;
+	
+	// Note: depth texture out put is only written to depth buffer if late depth test is used
 	if (bpmem.ztex2.op != ZTEXTURE_DISABLE && !skip_ztexture)
 	{
 		// use the texture input of the last texture stage (textemp), hopefully this has been read and is in correct format...
@@ -839,11 +844,10 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 		WRITE(p, "zCoord = zCoord * (16777215.0f/16777216.0f);\n");
 		WRITE(p, "zCoord = %s(zCoord);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]);
 		WRITE(p, "zCoord = zCoord * (16777216.0f/16777215.0f);\n");
-
-		// Note: depth texture out put is only written to depth buffer if late depth test is used
-		if (per_pixel_depth)
-			WRITE(p, "depth = zCoord;\n");
 	}
+	
+	if (per_pixel_depth)
+		WRITE(p, "depth = zCoord;\n");
 
 	if (dstAlphaMode == DSTALPHA_ALPHA_PASS)
 	{
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index b93659c01c..d2a3046939 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -32,7 +32,7 @@
 #define C_PMATERIALS	(C_PLIGHTS + 40)
 #define C_PENVCONST_END (C_PMATERIALS + 4)
 #define PIXELSHADERUID_MAX_VALUES 70
-#define PIXELSHADERUID_MAX_VALUES_SAFE 115
+#define PIXELSHADERUID_MAX_VALUES_SAFE 116
 
 // Annoying sure, can be removed once we get up to GLSL ~1.3
 const s_svar PSVar_Loc[] = { {I_COLORS, C_COLORS, 4 },
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp
index 0b70b5440f..85fac2da19 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.cpp
+++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp
@@ -64,6 +64,7 @@ void VideoConfig::Load(const char *ini_file)
 	iniFile.Get("Settings", "AnaglyphFocalAngle", &iAnaglyphFocalAngle, 0);
 	iniFile.Get("Settings", "EnablePixelLighting", &bEnablePixelLighting, 0);
 	iniFile.Get("Settings", "HackedBufferUpload", &bHackedBufferUpload, 0);
+	iniFile.Get("Settings", "FastDepthCalc", &bFastDepthCalc, 0);
 
 	iniFile.Get("Settings", "MSAA", &iMultisampleMode, 0);
 	iniFile.Get("Settings", "EFBScale", &iEFBScale, (int) SCALE_1X); // native
@@ -123,6 +124,7 @@ void VideoConfig::GameIniLoad(const char *ini_file)
 	iniFile.GetIfExists("Video_Settings", "AnaglyphFocalAngle", &iAnaglyphFocalAngle);
 	iniFile.GetIfExists("Video_Settings", "EnablePixelLighting", &bEnablePixelLighting);
 	iniFile.GetIfExists("Video_Settings", "HackedBufferUpload", &bHackedBufferUpload);
+	iniFile.GetIfExists("Video_Settings", "FastDepthCalc", &bFastDepthCalc);
 	iniFile.GetIfExists("Video_Settings", "MSAA", &iMultisampleMode);
 	int tmp = -9000;
 	iniFile.GetIfExists("Video_Settings", "EFBScale", &tmp); // integral
@@ -219,6 +221,7 @@ void VideoConfig::Save(const char *ini_file)
 	iniFile.Set("Settings", "AnaglyphFocalAngle", iAnaglyphFocalAngle);
 	iniFile.Set("Settings", "EnablePixelLighting", bEnablePixelLighting);
 	iniFile.Set("Settings", "HackedBufferUpload", bHackedBufferUpload);
+	iniFile.Set("Settings", "FastDepthCalc", bFastDepthCalc);
 
 	iniFile.Set("Settings", "ShowEFBCopyRegions", bShowEFBCopyRegions);
 	iniFile.Set("Settings", "MSAA", iMultisampleMode);
@@ -283,6 +286,7 @@ void VideoConfig::GameIniSave(const char* default_ini, const char* game_ini)
 	SET_IF_DIFFERS("Video_Settings", "AnaglyphStereoSeparation", iAnaglyphStereoSeparation);
 	SET_IF_DIFFERS("Video_Settings", "AnaglyphFocalAngle", iAnaglyphFocalAngle);
 	SET_IF_DIFFERS("Video_Settings", "EnablePixelLighting", bEnablePixelLighting);
+	SET_IF_DIFFERS("Video_Settings", "FastDepthCalc", bFastDepthCalc);
 	SET_IF_DIFFERS("Video_Settings", "MSAA", iMultisampleMode);
 	SET_IF_DIFFERS("Video_Settings", "EFBScale", iEFBScale); // integral
 	SET_IF_DIFFERS("Video_Settings", "DstAlphaPass", bDstAlphaPass);
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h
index 9b5076df8c..ec4ad3ed3d 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.h
+++ b/Source/Core/VideoCommon/Src/VideoConfig.h
@@ -123,6 +123,7 @@ struct VideoConfig
 	bool bUseBBox;
 	bool bEnablePixelLighting;
 	bool bHackedBufferUpload;
+	bool bFastDepthCalc;
 
 	int iLog; // CONF_ bits
 	int iSaveTargetId; // TODO: Should be dropped

From f7c3cacb5cff2d02ee74ed7602ba3aae4f3278ba Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Fri, 10 May 2013 12:51:06 +0200
Subject: [PATCH 084/352] ppd: fix small issues in my last commit

---
 Source/Core/DolphinWX/Src/VideoConfigDiag.cpp  |  4 ++--
 Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 10 +++++++---
 Source/Core/VideoCommon/Src/VideoConfig.cpp    |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
index 531fbe2cc4..45bf35046e 100644
--- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
@@ -87,7 +87,7 @@ wxString aa_desc = wxTRANSLATE("Reduces the amount of aliasing caused by rasteri
 wxString scaled_efb_copy_desc = wxTRANSLATE("Greatly increases quality of textures generated using render to texture effects.\nRaising the internal resolution will improve the effect of this setting.\nSlightly decreases performance and possibly causes issues (although unlikely).\n\nIf unsure, leave this checked.");
 wxString pixel_lighting_desc = wxTRANSLATE("Calculate lighting of 3D graphics per-pixel rather than per vertex.\nDecreases emulation speed by some percent (depending on your GPU).\nThis usually is a safe enhancement, but might cause issues sometimes.\n\nIf unsure, leave this unchecked.");
 wxString hacked_buffer_upload_desc = wxTRANSLATE("Use a hacked upload strategy to stream vertices.\nThis usually speed up, but is forbidden by OpenGL specification and may causes heavy glitches.\n\nIf unsure, leave this unchecked.");
-wxString fast_depth_calc_desc = wxTRANSLATE("Use the hardware perspective division to calculate the depth value.\nThis speed up the GPU a lot as the pixel shader only need to calculate the samples which pass the depth test.\nBut as this doesn't have to be accurate enough, flickering may happen on some gpus.");
+wxString fast_depth_calc_desc = wxTRANSLATE("Use a less accurate algorithm to calculate depth values.\nCauses issues in a few games but might give a decent speedup.\n\nIf unsure, leave this checked.");
 wxString force_filtering_desc = wxTRANSLATE("Force texture filtering even if the emulated game explicitly disabled it.\nImproves texture quality slightly but causes glitches in some games.\n\nIf unsure, leave this unchecked.");
 wxString _3d_vision_desc = wxTRANSLATE("Enable 3D effects via stereoscopy using Nvidia 3D Vision technology if it's supported by your GPU.\nPossibly causes issues.\nRequires fullscreen to work.\n\nIf unsure, leave this unchecked.");
 wxString internal_res_desc = wxTRANSLATE("Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games.\n\"Multiple of 640x528\" is a bit slower than \"Window Size\" but yields less issues. Generally speaking, the lower the internal resolution is, the better your performance will be.\n\nIf unsure, select 640x528.");
@@ -503,7 +503,7 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
 	szr_other->Add(CreateCheckBox(page_hacks, _("OpenCL Texture Decoder"), wxGetTranslation(opencl_desc), vconfig.bEnableOpenCL));
 	szr_other->Add(CreateCheckBox(page_hacks, _("OpenMP Texture Decoder"), wxGetTranslation(omp_desc), vconfig.bOMPDecoder));
 	szr_other->Add(hacked_buffer_upload_cb = CreateCheckBox(page_hacks, _("Hacked Buffer Upload"), wxGetTranslation(hacked_buffer_upload_desc), vconfig.bHackedBufferUpload));
-	szr_other->Add(CreateCheckBox(page_hacks, _("Fast Depth Calucation"), wxGetTranslation(fast_depth_calc_desc), vconfig.bFastDepthCalc));
+	szr_other->Add(CreateCheckBox(page_hacks, _("Fast Depth Calculation"), wxGetTranslation(fast_depth_calc_desc), vconfig.bFastDepthCalc));
 	if (Core::GetState() != Core::CORE_UNINITIALIZED)
 		hacked_buffer_upload_cb->Disable();
 	
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index c97cd889ea..9fd71c0e09 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -823,7 +823,8 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 
 	
 	// dx9 doesn't support readback of depth in pixel shader, so we always have to calculate it again
-	// shouldn't be a performance issue as early_z is still possible, but there may be depth issues with z-textures
+	// shouldn't be a performance issue as the written depth is usually still from perspective division
+	// but this isn't true for z-textures, so there will be depth issues between enabled and disabled z-textures fragments
 	if((ApiType == API_OPENGL || ApiType == API_D3D11) && g_ActiveConfig.bFastDepthCalc)
 		WRITE(p, "float zCoord = rawpos.z;\n");
 	else
@@ -833,7 +834,10 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 	// depth texture can safely be ignored if the result won't be written to the depth buffer (early_ztest) and isn't used for fog either
 	bool skip_ztexture = !per_pixel_depth && !bpmem.fog.c_proj_fsel.fsel;
 	
-	// Note: depth texture out put is only written to depth buffer if late depth test is used
+	// Note: z-textures are not written to depth buffer if early depth test is used
+	if (per_pixel_depth && bpmem.zcontrol.early_ztest)
+		WRITE(p, "depth = zCoord;\n");
+	
 	if (bpmem.ztex2.op != ZTEXTURE_DISABLE && !skip_ztexture)
 	{
 		// use the texture input of the last texture stage (textemp), hopefully this has been read and is in correct format...
@@ -846,7 +850,7 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 		WRITE(p, "zCoord = zCoord * (16777216.0f/16777215.0f);\n");
 	}
 	
-	if (per_pixel_depth)
+	if (per_pixel_depth && !bpmem.zcontrol.early_ztest)
 		WRITE(p, "depth = zCoord;\n");
 
 	if (dstAlphaMode == DSTALPHA_ALPHA_PASS)
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp
index 85fac2da19..6e1bc31e55 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.cpp
+++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp
@@ -64,7 +64,7 @@ void VideoConfig::Load(const char *ini_file)
 	iniFile.Get("Settings", "AnaglyphFocalAngle", &iAnaglyphFocalAngle, 0);
 	iniFile.Get("Settings", "EnablePixelLighting", &bEnablePixelLighting, 0);
 	iniFile.Get("Settings", "HackedBufferUpload", &bHackedBufferUpload, 0);
-	iniFile.Get("Settings", "FastDepthCalc", &bFastDepthCalc, 0);
+	iniFile.Get("Settings", "FastDepthCalc", &bFastDepthCalc, true);
 
 	iniFile.Get("Settings", "MSAA", &iMultisampleMode, 0);
 	iniFile.Get("Settings", "EFBScale", &iEFBScale, (int) SCALE_1X); // native

From f348712d3a8dd6c6bfc262081dbbbb6d429c18b6 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@googlemail.com>
Date: Fri, 10 May 2013 11:47:06 +0000
Subject: [PATCH 085/352] BPMemory: Fix a small documentation mistake from
 revision 9365187f8942.

---
 Source/Core/VideoCommon/Src/BPMemory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/VideoCommon/Src/BPMemory.cpp b/Source/Core/VideoCommon/Src/BPMemory.cpp
index 4828972cae..77f2f6bab3 100644
--- a/Source/Core/VideoCommon/Src/BPMemory.cpp
+++ b/Source/Core/VideoCommon/Src/BPMemory.cpp
@@ -94,7 +94,7 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size
 			SetRegName(BPMEM_ZCOMPARE);
 			PE_CONTROL config; config.hex = cmddata;
 			const char* pixel_formats[] = { "RGB8_Z24", "RGBA6_Z24", "RGB565_Z16", "Z24", "Y8", "U8", "V8", "YUV420" };
-			const char* zformats[] = { "linear", "compressed (near)", "compressed (mid)", "compressed (far)", "compressed (inv near)", "compressed (inv mid)", "compressed (inv far)" };
+			const char* zformats[] = { "linear", "compressed (near)", "compressed (mid)", "compressed (far)", "inv linear", "compressed (inv near)", "compressed (inv mid)", "compressed (inv far)" };
 			snprintf(desc, desc_size, "EFB pixel format: %s\n"
 									"Depth format: %s\n"
 									"Early depth test: %s\n",

From 82cd91e944a4c95dfff83be770b5d6b6c39c49d0 Mon Sep 17 00:00:00 2001
From: Pierre <pierre@pirsoft.de>
Date: Fri, 10 May 2013 20:07:58 +0200
Subject: [PATCH 086/352] DSPJIT: the shift value must still be loaded into the
 correct register

Fixes issue 6295
---
 Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp
index 04cc3aa753..dbb185844e 100644
--- a/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp
+++ b/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp
@@ -1563,6 +1563,7 @@ void DSPEmitter::lsrn(const UDSPInstruction opc)
 	FixupBranch noShift = J_CC(CC_Z);
 //CL gets automatically masked with 0x3f on IA32/AMD64
 	//MOVZX(64, 16, RCX, R(RAX));
+	MOV(64, R(RCX), R(RAX));
 	//AND(16, R(RCX), Imm16(0x3f));
 	TEST(16, R(RAX), Imm16(0x40));
 	FixupBranch shiftLeft = J_CC(CC_Z);

From bf67378812931dc607ea42dba41bc06969ec7eda Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sat, 11 May 2013 00:16:02 -0500
Subject: [PATCH 087/352] Fix the integer compare in our GLSL fmod function

---
 Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 9ab5752e88..c1e57815f4 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -544,7 +544,7 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 		WRITE(p, "float fmod( float x, float y )\n");
 		WRITE(p, "{\n");
 		WRITE(p, "\tfloat z = fract( abs( x / y) ) * abs( y );\n");
-		WRITE(p, "\treturn (x < 0) ? -z : z;\n");
+		WRITE(p, "\treturn (x < 0.0) ? -z : z;\n");
 		WRITE(p, "}\n");
 
 		for (int i = 0; i < 8; ++i)

From 6113cc12a27e375e765cfb02d9be4c6a68bf56cf Mon Sep 17 00:00:00 2001
From: "kostamarino@hotmail.com" <kostamarino@hotmail.com>
Date: Sun, 12 May 2013 00:17:48 +0300
Subject: [PATCH 088/352] Gameini database update. Fixes issue 6258, Where's
 Waldo? The Fantastic Journey missing ingame pointer, and Battleship font.
 Various small changes.

---
 Data/User/GameConfig/GHMD4F.ini | 16 ++++++++++++++++
 Data/User/GameConfig/GHME4F.ini |  8 ++++++++
 Data/User/GameConfig/GHMF4F.ini | 16 ++++++++++++++++
 Data/User/GameConfig/GHMP4F.ini | 16 ++++++++++++++++
 Data/User/GameConfig/JAAE01.ini | 25 +++++++++++++++++--------
 Data/User/GameConfig/SB3E08.ini |  2 +-
 Data/User/GameConfig/SB3J08.ini |  2 +-
 Data/User/GameConfig/SB3P08.ini |  2 +-
 Data/User/GameConfig/SLWE41.ini | 18 ++++++++++++++++++
 Data/User/GameConfig/SVBE52.ini | 17 +++++++++++++++++
 Data/User/GameConfig/SVBP52.ini | 17 +++++++++++++++++
 Data/User/GameConfig/W8CEXS.ini |  9 +++++++--
 Data/User/GameConfig/WILETL.ini |  8 +++++++-
 13 files changed, 142 insertions(+), 14 deletions(-)
 create mode 100644 Data/User/GameConfig/GHMD4F.ini
 create mode 100644 Data/User/GameConfig/GHMF4F.ini
 create mode 100644 Data/User/GameConfig/GHMP4F.ini
 create mode 100644 Data/User/GameConfig/SLWE41.ini
 create mode 100644 Data/User/GameConfig/SVBE52.ini
 create mode 100644 Data/User/GameConfig/SVBP52.ini

diff --git a/Data/User/GameConfig/GHMD4F.ini b/Data/User/GameConfig/GHMD4F.ini
new file mode 100644
index 0000000000..804c7ce141
--- /dev/null
+++ b/Data/User/GameConfig/GHMD4F.ini
@@ -0,0 +1,16 @@
+# GHMD4F - Hitman 2: Silent Assassin
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 5
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
diff --git a/Data/User/GameConfig/GHME4F.ini b/Data/User/GameConfig/GHME4F.ini
index 9ad65bde82..dfce92de40 100644
--- a/Data/User/GameConfig/GHME4F.ini
+++ b/Data/User/GameConfig/GHME4F.ini
@@ -30,3 +30,11 @@ $Press Left + Y For Nailgun
 52889D30 00000801
 0406D250 418201BC
 0406D288 408000C4
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
diff --git a/Data/User/GameConfig/GHMF4F.ini b/Data/User/GameConfig/GHMF4F.ini
new file mode 100644
index 0000000000..cf6dbb5494
--- /dev/null
+++ b/Data/User/GameConfig/GHMF4F.ini
@@ -0,0 +1,16 @@
+# GHMF4F - Hitman 2: Silent Assassin
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 5
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
diff --git a/Data/User/GameConfig/GHMP4F.ini b/Data/User/GameConfig/GHMP4F.ini
new file mode 100644
index 0000000000..b9a7263c92
--- /dev/null
+++ b/Data/User/GameConfig/GHMP4F.ini
@@ -0,0 +1,16 @@
+# GHMP4F - Hitman 2: Silent Assassin
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 5
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
diff --git a/Data/User/GameConfig/JAAE01.ini b/Data/User/GameConfig/JAAE01.ini
index ad577becc9..96dab75a98 100644
--- a/Data/User/GameConfig/JAAE01.ini
+++ b/Data/User/GameConfig/JAAE01.ini
@@ -1,8 +1,17 @@
-# JAAE01 - Super Mario World 
-[Core] Values set here will override the main dolphin settings.
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = No Sound
-EmulationStateId = 4
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
-[Video]
\ No newline at end of file
+# JAAE01 - Super Mario World 
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationIssues = 
+EmulationStateId = 4
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]

+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/SB3E08.ini b/Data/User/GameConfig/SB3E08.ini
index 110fee08ed..ce8e25554e 100644
--- a/Data/User/GameConfig/SB3E08.ini
+++ b/Data/User/GameConfig/SB3E08.ini
@@ -1,7 +1,7 @@
 # SB3E08 - BASARA
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Audio synch issues during dialogues, otherwise perfect
+EmulationIssues = 
 EmulationStateId = 5
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/SB3J08.ini b/Data/User/GameConfig/SB3J08.ini
index e7b6b6a3ef..70805a3243 100644
--- a/Data/User/GameConfig/SB3J08.ini
+++ b/Data/User/GameConfig/SB3J08.ini
@@ -1,7 +1,7 @@
 # SB3J08 - BASARA
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Audio synch issues during dialogues, otherwise perfect
+EmulationIssues = 
 EmulationStateId = 5
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/SB3P08.ini b/Data/User/GameConfig/SB3P08.ini
index e6d3b168ea..bd1677f5eb 100644
--- a/Data/User/GameConfig/SB3P08.ini
+++ b/Data/User/GameConfig/SB3P08.ini
@@ -1,7 +1,7 @@
 # SB3P08 - BASARA
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Audio synch issues during dialogues, otherwise perfect
+EmulationIssues = 
 EmulationStateId = 5
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
diff --git a/Data/User/GameConfig/SLWE41.ini b/Data/User/GameConfig/SLWE41.ini
new file mode 100644
index 0000000000..8c6c850c01
--- /dev/null
+++ b/Data/User/GameConfig/SLWE41.ini
@@ -0,0 +1,18 @@
+# SLWE41 - Where's Waldo? The Fantastic Journey
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Real Xfb for the pointer to appear.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/User/GameConfig/SVBE52.ini b/Data/User/GameConfig/SVBE52.ini
new file mode 100644
index 0000000000..30756bcb27
--- /dev/null
+++ b/Data/User/GameConfig/SVBE52.ini
@@ -0,0 +1,17 @@
+# SVBE52 - Battleship
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]

+SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/SVBP52.ini b/Data/User/GameConfig/SVBP52.ini
new file mode 100644
index 0000000000..8095983a48
--- /dev/null
+++ b/Data/User/GameConfig/SVBP52.ini
@@ -0,0 +1,17 @@
+# SVBP52 - Battleship
+[Core] Values set here will override the main dolphin settings.
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]

+SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/W8CEXS.ini b/Data/User/GameConfig/W8CEXS.ini
index dcaeed3473..7607ca4e5f 100644
--- a/Data/User/GameConfig/W8CEXS.ini
+++ b/Data/User/GameConfig/W8CEXS.ini
@@ -1,10 +1,15 @@
 # W8CEXS - BIT.TRIP CORE
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-EmulationIssues = Requires a Wii save game to boot
+EmulationStateId = 4
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]
diff --git a/Data/User/GameConfig/WILETL.ini b/Data/User/GameConfig/WILETL.ini
index e8823e2ae1..0be2cca3c9 100644
--- a/Data/User/GameConfig/WILETL.ini
+++ b/Data/User/GameConfig/WILETL.ini
@@ -2,8 +2,14 @@
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationIssues = 
-EmulationStateId = 1
+EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]

From c30d00e904e4aeabc1e8e18a1cb52b19496148a1 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Fri, 17 May 2013 21:07:25 -0500
Subject: [PATCH 089/352] [Android] Support DFF files in the interface.

---
 Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
index df7d29e91f..d90bb32016 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
@@ -61,7 +61,8 @@ public class GameListView extends ListActivity {
 			            		ff.getName().toLowerCase().contains(".wbfs") ||
 			            		ff.getName().toLowerCase().contains(".gcz") ||
 			            		ff.getName().toLowerCase().contains(".dol") ||
-			            		ff.getName().toLowerCase().contains(".elf"))
+			            		ff.getName().toLowerCase().contains(".elf") ||
+			            		ff.getName().toLowerCase().contains(".dff"))
 			            			fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath()));
 				}
 			}

From 39c9516197c208bb918ce87b968ad32e703b4413 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Fri, 17 May 2013 21:12:21 -0500
Subject: [PATCH 090/352] [Android] Qualcomm driver has a bug where it returns
 an invalid length for GL_INFO_LOG_LENGTH with glGetShaderiv. Qualcomm drivers
 seem to max out at ~512bytes returned from glGetShaderInfoLog so this is a
 reasonable max.

---
 Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index 1b5ab26c73..1c85177352 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -334,6 +334,12 @@ GLuint ProgramShaderCache::CompileSingleShader (GLuint type, const char* code )
 	if (compileStatus != GL_TRUE || (length > 1 && DEBUG_GLSL))
 	{
 		GLsizei charsWritten;
+#ifdef USE_GLES3
+		// This is a bug in the Qualcomm OpenGL Driver
+		// The length returned is garbage length so we need to set a default max
+		// XXX: Check if qualcomm driver here
+		length = 1024; // Qualcomm driver maxes out at 512 bytes returned from glGetShaderInfoLog anyway
+#endif
 		GLchar* infoLog = new GLchar[length];
 		glGetShaderInfoLog(result, length, &charsWritten, infoLog);
 		ERROR_LOG(VIDEO, "PS Shader info log:\n%s", infoLog);
@@ -527,7 +533,7 @@ void ProgramShaderCache::CreateHeader ( void )
 		
 		, v==GLSLES3 ? "300 es" : v==GLSL_120 ? "120" : v==GLSL_130 ? "130" : "140"
 		, v==GLSLES3 ? "precision highp float;" : ""
-		, v<=GLSL_130 ? "#extension GL_ARB_texture_rectangle : enable" : "#define texture2DRect texture"
+		, v==GLSLES3 ? "" : v<=GLSL_130 ? "#extension GL_ARB_texture_rectangle : enable" : "#define texture2DRect texture"
 		, g_ActiveConfig.backend_info.bSupportsGLSLUBO && v<GLSL_140 ? "#extension GL_ARB_uniform_buffer_object : enable" : ""
 		, v==GLSL_120 ? "attribute" : "in"
 		, v==GLSL_120 ? "attribute" : "out"

From 19252f4e0e7ecc0f75d78616bb0ac43825623e52 Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Sat, 18 May 2013 20:31:37 +1200
Subject: [PATCH 091/352] Initial commit with balance board working on Linux.
 Will not work on any other platform currently. Missing any sort of config,
 and definitely no emulation mode.

---
 Source/Core/Core/Src/Core.cpp                 |   6 +-
 Source/Core/Core/Src/HW/Wiimote.cpp           |   9 +-
 Source/Core/Core/Src/HW/Wiimote.h             |  13 +-
 Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp |  25 ++--
 .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp   | 137 +++++++++++++-----
 .../Core/Src/HW/WiimoteReal/WiimoteReal.h     |   7 +-
 .../Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp    |  66 ++++++---
 .../Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h |   6 +-
 .../Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp  |   6 +-
 Source/Core/Core/Src/Movie.cpp                |   2 +-
 .../Core/DolphinWX/Src/WiimoteConfigDiag.cpp  |   4 +-
 Source/Core/DolphinWX/Src/WiimoteConfigDiag.h |   4 +-
 12 files changed, 196 insertions(+), 89 deletions(-)

diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index ffd2c35472..268d474ae6 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -394,10 +394,10 @@ void EmuThread()
 		Wiimote::Initialize(g_pWindowHandle);
 
 		// Activate wiimotes which don't have source set to "None"
-		for (unsigned int i = 0; i != MAX_WIIMOTES; ++i)
+		for (unsigned int i = 0; i != MAX_BBMOTES; ++i)
 			if (g_wiimote_sources[i])
-				GetUsbPointer()->AccessWiiMote(i | 0x100)->
-					Activate(true);
+				GetUsbPointer()->AccessWiiMote(i | 0x100)->Activate(true);
+			
 	}
 
 	// The hardware is initialized.
diff --git a/Source/Core/Core/Src/HW/Wiimote.cpp b/Source/Core/Core/Src/HW/Wiimote.cpp
index 20e10b5fb8..6723a26d28 100644
--- a/Source/Core/Core/Src/HW/Wiimote.cpp
+++ b/Source/Core/Core/Src/HW/Wiimote.cpp
@@ -42,9 +42,10 @@ void Shutdown()
 void Initialize(void* const hwnd)
 {
 	// add 4 wiimotes
-	for (unsigned int i = 0; i<4; ++i)
+	for (unsigned int i = WIIMOTE_CHAN_0; i<MAX_BBMOTES; ++i)
 		g_plugin.controllers.push_back(new WiimoteEmu::Wiimote(i));
-
+	
+	
 	g_controller_interface.SetHwnd(hwnd);
 	g_controller_interface.Initialize();
 
@@ -134,7 +135,7 @@ void Update(int _number)
 unsigned int GetAttached()
 {
 	unsigned int attached = 0;
-	for (unsigned int i=0; i<4; ++i)
+	for (unsigned int i=0; i<MAX_BBMOTES; ++i)
 		if (g_wiimote_sources[i])
 			attached |= (1 << i);
 	return attached;
@@ -151,7 +152,7 @@ void DoState(u8 **ptr, PointerWrap::Mode mode)
 	// TODO:
 
 	PointerWrap p(ptr, mode);
-	for (unsigned int i=0; i<4; ++i)
+	for (unsigned int i=0; i<MAX_BBMOTES; ++i)
 		((WiimoteEmu::Wiimote*)g_plugin.controllers[i])->DoState(p);
 }
 
diff --git a/Source/Core/Core/Src/HW/Wiimote.h b/Source/Core/Core/Src/HW/Wiimote.h
index fa4ec895bd..51ab018417 100644
--- a/Source/Core/Core/Src/HW/Wiimote.h
+++ b/Source/Core/Core/Src/HW/Wiimote.h
@@ -8,7 +8,16 @@
 #include "../../InputCommon/Src/InputConfig.h"
 #include "ChunkFile.h"
 
-#define MAX_WIIMOTES	4
+enum {
+	WIIMOTE_CHAN_0 = 0,
+	WIIMOTE_CHAN_1,
+	WIIMOTE_CHAN_2,
+	WIIMOTE_CHAN_3,
+	WIIMOTE_BALANCE_BOARD,
+	MAX_WIIMOTES = WIIMOTE_BALANCE_BOARD,
+	MAX_BBMOTES = 5,
+};
+
 
 #define WIIMOTE_INI_NAME	"WiimoteNew"
 
@@ -20,7 +29,7 @@ enum
 	WIIMOTE_SRC_HYBRID = 3,	// emu + real
 };
 
-extern unsigned int g_wiimote_sources[MAX_WIIMOTES];
+extern unsigned int g_wiimote_sources[MAX_BBMOTES];
 
 namespace Wiimote
 {
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp
index 87ddc5086b..edd79f2bf6 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IONix.cpp
@@ -63,23 +63,22 @@ WiimoteScanner::~WiimoteScanner()
 void WiimoteScanner::Update()
 {}
 
-std::vector<Wiimote*> WiimoteScanner::FindWiimotes()
+void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimote* & found_board)
 {
-	std::vector<Wiimote*> found_wiimotes;
-
 	// supposedly 1.28 seconds
 	int const wait_len = 1;
 
 	int const max_infos = 255;
 	inquiry_info scan_infos[max_infos] = {};
 	auto* scan_infos_ptr = scan_infos;
-
+	found_board = NULL;
+	
 	// Scan for bluetooth devices
 	int const found_devices = hci_inquiry(device_id, wait_len, max_infos, NULL, &scan_infos_ptr, IREQ_CACHE_FLUSH);
 	if (found_devices < 0)
 	{
 		ERROR_LOG(WIIMOTE, "Error searching for bluetooth devices.");
-		return found_wiimotes;
+		return;
 	}
 
 	DEBUG_LOG(WIIMOTE, "Found %i bluetooth device(s).", found_devices);
@@ -91,7 +90,7 @@ std::vector<Wiimote*> WiimoteScanner::FindWiimotes()
 		
 		// BT names are a maximum of 248 bytes apparently
 		char name[255] = {};
-		if (hci_read_remote_name(device_sock, &scan_infos[i].bdaddr, sizeof(name), name, 0) < 0)
+		if (hci_read_remote_name(device_sock, &scan_infos[i].bdaddr, sizeof(name), name, 1000) < 0)
 		{
 			ERROR_LOG(WIIMOTE, "name request failed");
 			continue;
@@ -119,14 +118,20 @@ std::vector<Wiimote*> WiimoteScanner::FindWiimotes()
 
 				auto* const wm = new Wiimote;
 				wm->bdaddr = scan_infos[i].bdaddr;
-				found_wiimotes.push_back(wm);
-				
-				NOTICE_LOG(WIIMOTE, "Found wiimote (%s).", bdaddr_str);
+				if(IsBalanceBoardName(name))
+				{
+					found_board = wm;
+					NOTICE_LOG(WIIMOTE, "Found balance board (%s).", bdaddr_str);
+				}
+				else
+				{
+					found_wiimotes.push_back(wm);
+					NOTICE_LOG(WIIMOTE, "Found wiimote (%s).", bdaddr_str);
+				}
 			}
 		}
 	}
 
-	return found_wiimotes;
 }
 
 // Connect to a wiimote with a known address.
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
index aaaaff6301..1d3be13cc5 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
@@ -17,12 +17,13 @@
 
 #include "../WiimoteEmu/WiimoteHid.h"
 
-unsigned int	g_wiimote_sources[MAX_WIIMOTES];
+unsigned int	g_wiimote_sources[MAX_BBMOTES];
 
 namespace WiimoteReal
 {
 
 void HandleFoundWiimotes(const std::vector<Wiimote*>&);
+void TryToConnectBalanceBoard(Wiimote*);
 void TryToConnectWiimote(Wiimote*);
 void HandleWiimoteDisconnect(int index);
 void DoneWithWiimote(int index);
@@ -31,8 +32,7 @@ bool g_real_wiimotes_initialized = false;
 
 std::recursive_mutex g_refresh_lock;
 
-Wiimote* g_wiimotes[MAX_WIIMOTES];
-
+Wiimote* g_wiimotes[MAX_BBMOTES];
 WiimoteScanner g_wiimote_scanner;
 
 Wiimote::Wiimote()
@@ -285,7 +285,7 @@ bool Wiimote::Prepare(int _index)
 	u8 const mode_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_REPORT_MODE, 0, WM_REPORT_CORE};
 	
 	// Set the active LEDs and turn on rumble.
-	u8 const led_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_LEDS, u8(WIIMOTE_LED_1 << index | 0x1)};
+	u8 const led_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_LEDS, u8(WIIMOTE_LED_1 << (index%WIIMOTE_BALANCE_BOARD) | 0x1)};
 
 	// Turn off rumble
 	u8 rumble_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_RUMBLE, 0};
@@ -325,11 +325,25 @@ unsigned int CalculateWantedWiimotes()
 	return wanted_wiimotes;
 }
 
+unsigned int CalculateWantedBB()
+{
+	unsigned int wanted_bb = 0;
+	if (WIIMOTE_SRC_REAL & g_wiimote_sources[WIIMOTE_BALANCE_BOARD] && !g_wiimotes[WIIMOTE_BALANCE_BOARD])
+		++wanted_bb;
+	return wanted_bb;
+}
+
 void WiimoteScanner::WantWiimotes(bool do_want)
 {
 	m_want_wiimotes = do_want;
 }
 
+
+void WiimoteScanner::WantBB(bool do_want)
+{
+	m_want_bb = do_want;
+}
+
 void WiimoteScanner::StartScanning()
 {
 	if (!m_run_thread)
@@ -352,7 +366,7 @@ void CheckForDisconnectedWiimotes()
 {
 	std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
 
-	for (unsigned int i = 0; i != MAX_WIIMOTES; ++i)
+	for (unsigned int i = 0; i < MAX_BBMOTES; ++i)
 		if (g_wiimotes[i] && !g_wiimotes[i]->IsConnected())
 			HandleWiimoteDisconnect(i);
 }
@@ -366,12 +380,13 @@ void WiimoteScanner::ThreadFunc()
 	while (m_run_thread)
 	{
 		std::vector<Wiimote*> found_wiimotes;
+		Wiimote* found_board = NULL;
 
 		//NOTICE_LOG(WIIMOTE, "In loop");
 
-		if (m_want_wiimotes)
+		if (m_want_wiimotes || m_want_bb)
 		{
-			found_wiimotes = FindWiimotes();
+			FindWiimotes(found_wiimotes, found_board);
 		}
 		else
 		{
@@ -384,7 +399,10 @@ void WiimoteScanner::ThreadFunc()
 		// TODO: this is a fairly lame place for this
 		CheckForDisconnectedWiimotes();
 
-		HandleFoundWiimotes(found_wiimotes);
+		if(m_want_wiimotes)
+			HandleFoundWiimotes(found_wiimotes);
+		if(m_want_bb && found_board)
+			TryToConnectBalanceBoard(found_board);
 
 		//std::this_thread::yield();
 		Common::SleepCurrentThread(500);
@@ -439,6 +457,7 @@ void LoadSettings()
 
 		sec.Get("Source", &g_wiimote_sources[i], i ? WIIMOTE_SRC_NONE : WIIMOTE_SRC_EMU);
 	}
+	g_wiimote_sources[WIIMOTE_BALANCE_BOARD] = WIIMOTE_SRC_REAL;
 }
 
 // config dialog calls this when some settings change
@@ -452,6 +471,7 @@ void Initialize()
 	std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
 
 	g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes());
+	g_wiimote_scanner.WantBB(0 != CalculateWantedBB());
 	
 	if (g_real_wiimotes_initialized)
 		return;
@@ -474,7 +494,7 @@ void Shutdown(void)
 
 	g_real_wiimotes_initialized = false;
 
-	for (unsigned int i = 0; i < MAX_WIIMOTES; ++i)
+	for (unsigned int i = 0; i < MAX_BBMOTES; ++i)
 		HandleWiimoteDisconnect(i);
 }
 
@@ -482,9 +502,10 @@ void ChangeWiimoteSource(unsigned int index, int source)
 {
 	{
 	std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
-	
 	g_wiimote_sources[index] = source;
 	g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes());
+	g_wiimote_scanner.WantBB(0 != CalculateWantedBB());
+	
 	
 	// kill real connection (or swap to different slot)
 	DoneWithWiimote(index);
@@ -500,7 +521,7 @@ void TryToConnectWiimote(Wiimote* wm)
 {
 	std::unique_lock<std::recursive_mutex> lk(g_refresh_lock);
 
-	for (unsigned int i = 0; i != MAX_WIIMOTES; ++i)
+	for (unsigned int i = 0; i < MAX_WIIMOTES; ++i)
 	{
 		if (WIIMOTE_SRC_REAL & g_wiimote_sources[i]
 			&& !g_wiimotes[i])
@@ -525,16 +546,41 @@ void TryToConnectWiimote(Wiimote* wm)
 	delete wm;
 }
 
+void TryToConnectBalanceBoard(Wiimote* wm)
+{
+	std::unique_lock<std::recursive_mutex> lk(g_refresh_lock);
+	
+	if (WIIMOTE_SRC_REAL & g_wiimote_sources[WIIMOTE_BALANCE_BOARD]
+		&& !g_wiimotes[WIIMOTE_BALANCE_BOARD])
+	{
+		if (wm->Connect() && wm->Prepare(WIIMOTE_BALANCE_BOARD))
+		{
+			NOTICE_LOG(WIIMOTE, "Connected to Balance Board %i.", WIIMOTE_BALANCE_BOARD + 1);
+			
+			std::swap(g_wiimotes[WIIMOTE_BALANCE_BOARD], wm);
+			g_wiimotes[WIIMOTE_BALANCE_BOARD]->StartThread();
+			
+			Host_ConnectWiimote(WIIMOTE_BALANCE_BOARD, true);
+		}
+	}
+	
+	g_wiimote_scanner.WantBB(0 != CalculateWantedBB());
+	
+	lk.unlock();
+	
+	delete wm;
+}
+
 void DoneWithWiimote(int index)
 {
 	std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
-	
+
 	if (g_wiimotes[index])
 	{
 		g_wiimotes[index]->StopThread();
 		
 		// First see if we can use this real Wiimote in another slot.
-		for (unsigned int i = 0; i != MAX_WIIMOTES; ++i)
+		for (unsigned int i = 0; i < MAX_WIIMOTES; ++i)
 		{
 			if (WIIMOTE_SRC_REAL & g_wiimote_sources[i]
 				&& !g_wiimotes[i])
@@ -560,9 +606,11 @@ void HandleWiimoteDisconnect(int index)
 	Wiimote* wm = NULL;
 	
 	{
-	std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
-	std::swap(wm, g_wiimotes[index]);
-	g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes());
+		std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
+
+		std::swap(wm, g_wiimotes[index]);
+		g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes());
+		g_wiimote_scanner.WantBB(0 != CalculateWantedBB());
 	}
 
 	if (wm)
@@ -583,31 +631,34 @@ void Refresh()
 	g_wiimote_scanner.StopScanning();
 	
 	{
-	std::unique_lock<std::recursive_mutex> lk(g_refresh_lock);
-	std::vector<Wiimote*> found_wiimotes;
-	
-	if (0 != CalculateWantedWiimotes())
-	{
-		// Don't hang Dolphin when searching
-		lk.unlock();
-		found_wiimotes = g_wiimote_scanner.FindWiimotes();
-		lk.lock();
-	}
-
-	CheckForDisconnectedWiimotes();
-
-	// Brief rumble for already connected Wiimotes.
-	for (int i = 0; i != MAX_WIIMOTES; ++i)
-	{
-		if (g_wiimotes[i])
+		std::unique_lock<std::recursive_mutex> lk(g_refresh_lock);
+		std::vector<Wiimote*> found_wiimotes;
+		Wiimote* found_board = NULL;
+		
+		if (0 != CalculateWantedWiimotes())
 		{
-			g_wiimotes[i]->StopThread();
-			g_wiimotes[i]->Prepare(i);
-			g_wiimotes[i]->StartThread();
+			// Don't hang Dolphin when searching
+			lk.unlock();
+			g_wiimote_scanner.FindWiimotes(found_wiimotes, found_board);
+			lk.lock();
 		}
-	}
 
-	HandleFoundWiimotes(found_wiimotes);
+		CheckForDisconnectedWiimotes();
+
+		// Brief rumble for already connected Wiimotes.
+		for (int i = 0; i < MAX_BBMOTES; ++i)
+		{
+			if (g_wiimotes[i])
+			{
+				g_wiimotes[i]->StopThread();
+				g_wiimotes[i]->Prepare(i);
+				g_wiimotes[i]->StartThread();
+			}
+		}
+
+		HandleFoundWiimotes(found_wiimotes);
+		if(found_board)
+			TryToConnectBalanceBoard(found_board);
 	}
 	
 	Initialize();
@@ -616,7 +667,6 @@ void Refresh()
 void InterruptChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 _Size)
 {
 	std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
-
 	if (g_wiimotes[_WiimoteNumber])
 		g_wiimotes[_WiimoteNumber]->InterruptChannel(_channelID, _pData, _Size);
 }
@@ -656,7 +706,14 @@ bool IsValidBluetoothName(const std::string& name)
 {
 	return
 		"Nintendo RVL-CNT-01" == name ||
-		"Nintendo RVL-CNT-01-TR" == name;
+		"Nintendo RVL-CNT-01-TR" == name ||
+		IsBalanceBoardName(name);
+}
+
+bool IsBalanceBoardName(const std::string& name)
+{
+	return
+	"Nintendo RVL-WBC-01" == name;
 }
 
 }; // end of namespace
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h
index b57e1be2f4..695dc86b82 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h
@@ -117,11 +117,12 @@ public:
 	bool IsReady() const;
 	
 	void WantWiimotes(bool do_want);
+	void WantBB(bool do_want);
 
 	void StartScanning();
 	void StopScanning();
 
-	std::vector<Wiimote*> FindWiimotes();
+	void FindWiimotes(std::vector<Wiimote*>&, Wiimote*&);
 
 	// function called when not looking for more wiimotes
 	void Update();
@@ -133,6 +134,7 @@ private:
 
 	volatile bool m_run_thread;
 	volatile bool m_want_wiimotes;
+	volatile bool m_want_bb;
 
 #if defined(_WIN32)
 	
@@ -145,7 +147,7 @@ private:
 
 extern std::recursive_mutex g_refresh_lock;
 extern WiimoteScanner g_wiimote_scanner;
-extern Wiimote *g_wiimotes[4];
+extern Wiimote *g_wiimotes[MAX_BBMOTES];
 
 void InterruptChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 _Size);
 void ControlChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32 _Size);
@@ -158,6 +160,7 @@ int FindWiimotes(Wiimote** wm, int max_wiimotes);
 void ChangeWiimoteSource(unsigned int index, int source);
 
 bool IsValidBluetoothName(const std::string& name);
+bool IsBalanceBoardName(const std::string& name);
 
 }; // WiimoteReal
 
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
index 41f751cb77..daa28b340d 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
@@ -32,7 +32,7 @@ CWII_IPC_HLE_Device_usb_oh1_57e_305::CWII_IPC_HLE_Device_usb_oh1_57e_305(u32 _De
 	}
 	else
 	{
-		u8 maxWM = min<u8>(BT_DINF.num_registered, CONF_PAD_MAX_ACTIVE);
+		u8 maxWM = min<u8>(BT_DINF.num_registered, MAX_BBMOTES);
 		bdaddr_t tmpBD = BDADDR_ANY;
 		u8 i = 0;
 		while (i < maxWM)
@@ -43,28 +43,60 @@ CWII_IPC_HLE_Device_usb_oh1_57e_305::CWII_IPC_HLE_Device_usb_oh1_57e_305(u32 _De
 			tmpBD.b[2] = BT_DINF.active[i].bdaddr[3] = BT_DINF.registered[i].bdaddr[3];
 			tmpBD.b[1] = BT_DINF.active[i].bdaddr[4] = BT_DINF.registered[i].bdaddr[4];
 			tmpBD.b[0] = BT_DINF.active[i].bdaddr[5] = BT_DINF.registered[i].bdaddr[5];
+			if(i == WIIMOTE_BALANCE_BOARD)
+			{
+				const char * wmName = "Nintendo RVL-WBC-01";
+				memcpy(BT_DINF.registered[i].name, wmName, 20);
+				memcpy(BT_DINF.balance_board.name, wmName, 20);
+			}
+			else
+			{
+				const char * wmName = "Nintendo RVL-CNT-01";
+				memcpy(BT_DINF.registered[i].name, wmName, 20);
+				memcpy(BT_DINF.active[i].name, wmName, 20);
+			}
 
 			INFO_LOG(WII_IPC_WIIMOTE, "Wiimote %d BT ID %x,%x,%x,%x,%x,%x", i, tmpBD.b[0], tmpBD.b[1], tmpBD.b[2], tmpBD.b[3], tmpBD.b[4], tmpBD.b[5]);
 			m_WiiMotes.push_back(CWII_IPC_HLE_WiiMote(this, i, tmpBD, false));
 			i++;
 		}
-		while (i < CONF_PAD_MAX_ACTIVE)
+		while (i < MAX_BBMOTES)
 		{
-			const char * wmName = "Nintendo RVL-CNT-01";
-			++BT_DINF.num_registered;
-			BT_DINF.active[i].bdaddr[0] = BT_DINF.registered[i].bdaddr[0] = tmpBD.b[5] = i;
-			BT_DINF.active[i].bdaddr[1] = BT_DINF.registered[i].bdaddr[1] = tmpBD.b[4] = 0;
-			BT_DINF.active[i].bdaddr[2] = BT_DINF.registered[i].bdaddr[2] = tmpBD.b[3] = 0x79;
-			BT_DINF.active[i].bdaddr[3] = BT_DINF.registered[i].bdaddr[3] = tmpBD.b[2] = 0x19;
-			BT_DINF.active[i].bdaddr[4] = BT_DINF.registered[i].bdaddr[4] = tmpBD.b[1] = 2;
-			BT_DINF.active[i].bdaddr[5] = BT_DINF.registered[i].bdaddr[5] = tmpBD.b[0] = 0x11;
-			memcpy(BT_DINF.registered[i].name, wmName, 20);
+			if(i == WIIMOTE_BALANCE_BOARD)
+			{
+				const char * wmName = "Nintendo RVL-WBC-01";
+				++BT_DINF.num_registered;
+				BT_DINF.balance_board.bdaddr[0] = BT_DINF.registered[i].bdaddr[0] = tmpBD.b[5] = i;
+				BT_DINF.balance_board.bdaddr[1] = BT_DINF.registered[i].bdaddr[1] = tmpBD.b[4] = 0;
+				BT_DINF.balance_board.bdaddr[2] = BT_DINF.registered[i].bdaddr[2] = tmpBD.b[3] = 0x79;
+				BT_DINF.balance_board.bdaddr[3] = BT_DINF.registered[i].bdaddr[3] = tmpBD.b[2] = 0x19;
+				BT_DINF.balance_board.bdaddr[4] = BT_DINF.registered[i].bdaddr[4] = tmpBD.b[1] = 2;
+				BT_DINF.balance_board.bdaddr[5] = BT_DINF.registered[i].bdaddr[5] = tmpBD.b[0] = 0x11;
+				memcpy(BT_DINF.registered[i].name, wmName, 20);
+				memcpy(BT_DINF.balance_board.name, wmName, 20);
+				
+				INFO_LOG(WII_IPC_WIIMOTE, "Balance Board %d BT ID %x,%x,%x,%x,%x,%x", i, tmpBD.b[0], tmpBD.b[1], tmpBD.b[2], tmpBD.b[3], tmpBD.b[4], tmpBD.b[5]);
+				m_WiiMotes.push_back(CWII_IPC_HLE_WiiMote(this, i, tmpBD, false));
+			}
+			else
+			{
+				const char * wmName = "Nintendo RVL-CNT-01";
+				++BT_DINF.num_registered;
+				BT_DINF.active[i].bdaddr[0] = BT_DINF.registered[i].bdaddr[0] = tmpBD.b[5] = i;
+				BT_DINF.active[i].bdaddr[1] = BT_DINF.registered[i].bdaddr[1] = tmpBD.b[4] = 0;
+				BT_DINF.active[i].bdaddr[2] = BT_DINF.registered[i].bdaddr[2] = tmpBD.b[3] = 0x79;
+				BT_DINF.active[i].bdaddr[3] = BT_DINF.registered[i].bdaddr[3] = tmpBD.b[2] = 0x19;
+				BT_DINF.active[i].bdaddr[4] = BT_DINF.registered[i].bdaddr[4] = tmpBD.b[1] = 2;
+				BT_DINF.active[i].bdaddr[5] = BT_DINF.registered[i].bdaddr[5] = tmpBD.b[0] = 0x11;
+				memcpy(BT_DINF.registered[i].name, wmName, 20);
 
-			INFO_LOG(WII_IPC_WIIMOTE, "Adding to SYSConf Wiimote %d BT ID %x,%x,%x,%x,%x,%x", i, tmpBD.b[0], tmpBD.b[1], tmpBD.b[2], tmpBD.b[3], tmpBD.b[4], tmpBD.b[5]);
-			m_WiiMotes.push_back(CWII_IPC_HLE_WiiMote(this, i, tmpBD, false));
+				INFO_LOG(WII_IPC_WIIMOTE, "Adding to SYSConf Wiimote %d BT ID %x,%x,%x,%x,%x,%x", i, tmpBD.b[0], tmpBD.b[1], tmpBD.b[2], tmpBD.b[3], tmpBD.b[4], tmpBD.b[5]);
+				m_WiiMotes.push_back(CWII_IPC_HLE_WiiMote(this, i, tmpBD, false));
+			
+			}
 			i++;
 		}
-
+		
 		// save now so that when games load sysconf file it includes the new wiimotes
 		// and the correct order for connected wiimotes
 		if (!SConfig::GetInstance().m_SYSCONF->SetArrayData("BT.DINF", (u8*)&BT_DINF, sizeof(_conf_pads)) || !SConfig::GetInstance().m_SYSCONF->Save())
@@ -99,18 +131,18 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::DoState(PointerWrap &p)
 	p.DoPOD(m_HCIEndpoint);
 	p.DoPOD(m_ACLEndpoint);
 	p.Do(m_last_ticks);
-	p.DoArray(m_PacketCount,4);
+	p.DoArray(m_PacketCount,MAX_BBMOTES);
 	p.Do(m_ScanEnable);
 	p.Do(m_EventQueue);
 	m_acl_pool.DoState(p);
 
-	for (unsigned int i = 0; i < 4; i++)
+	for (unsigned int i = 0; i < MAX_BBMOTES; i++)
 		m_WiiMotes[i].DoState(p);
 
 	// Reset the connection of real and hybrid wiimotes
 	if (p.GetMode() == PointerWrap::MODE_READ && SConfig::GetInstance().m_WiimoteReconnectOnLoad)
 	{
-		for (unsigned int i = 0; i < 4; i++)
+		for (unsigned int i = 0; i < MAX_BBMOTES; i++)
 		{
 			if (WIIMOTE_SRC_EMU == g_wiimote_sources[i] || WIIMOTE_SRC_NONE == g_wiimote_sources[i])
 				continue;
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h
index f3d79b0fb8..7ac93b5be1 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h
@@ -12,6 +12,7 @@
 #include "WII_IPC_HLE.h"
 #include "WII_IPC_HLE_Device.h"
 #include "WII_IPC_HLE_WiiMote.h"
+#include "../HW/Wiimote.h"
 
 struct SQueuedEvent
 {
@@ -193,7 +194,7 @@ private:
 		}
 	} m_acl_pool;
 
-	u32 m_PacketCount[4];
+	u32 m_PacketCount[MAX_BBMOTES];
 	u64 m_last_ticks;
 
 	// Send ACL data to a device (wiimote)
@@ -274,7 +275,6 @@ private:
 
 #pragma pack(push,1)
 #define CONF_PAD_MAX_REGISTERED 10
-#define CONF_PAD_MAX_ACTIVE 4
 	
 	struct _conf_pad_device
 	{
@@ -286,7 +286,7 @@ private:
 	{
 		u8 num_registered;
 		_conf_pad_device registered[CONF_PAD_MAX_REGISTERED];
-		_conf_pad_device active[CONF_PAD_MAX_ACTIVE];
+		_conf_pad_device active[MAX_WIIMOTES];
 		_conf_pad_device balance_board;
 		u8 unknown[0x45];
 	};
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
index 22930eb94c..9386682106 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
@@ -37,7 +37,7 @@ CWII_IPC_HLE_WiiMote::CWII_IPC_HLE_WiiMote(CWII_IPC_HLE_Device_usb_oh1_57e_305*
 	, m_HIDInterruptChannel_Config(false)
 	, m_HIDInterruptChannel_ConfigWait(false)
 	, m_BD(_BD)
-	, m_Name("Nintendo RVL-CNT-01")
+	, m_Name(_Number == WIIMOTE_BALANCE_BOARD ? "Nintendo RVL-WBC-01" : "Nintendo RVL-CNT-01")
 	, m_pHost(_pHost)
 {
 	DEBUG_LOG(WII_IPC_WIIMOTE, "Wiimote: #%i Constructed", _Number);
@@ -277,13 +277,13 @@ void CWII_IPC_HLE_WiiMote::ExecuteL2capCmd(u8* _pData, u32 _Size)
 					break;
 
 				case L2CAP_PSM_HID_CNTL:
-					if (number < 4)
+					if (number < MAX_BBMOTES)
 						Wiimote::ControlChannel(number, pHeader->dcid, pData, DataSize);
 					break;
 
 				case L2CAP_PSM_HID_INTR:
 					{
-						if (number < 4)
+						if (number < MAX_BBMOTES)
 						{
 							DEBUG_LOG(WIIMOTE, "Wiimote_InterruptChannel");
 							DEBUG_LOG(WIIMOTE, "    Channel ID: %04x", pHeader->dcid);
diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp
index c57ce8d4cc..75951df67d 100644
--- a/Source/Core/Core/Src/Movie.cpp
+++ b/Source/Core/Core/Src/Movie.cpp
@@ -392,7 +392,7 @@ void ChangeWiiPads(bool instantly)
 	if (instantly && (g_numPads >> 4) == controllers)
 		return;
 
-	for (int i = 0; i < 4; i++)
+	for (int i = 0; i < MAX_BBMOTES; i++)
 	{
 		g_wiimote_sources[i] = IsUsingWiimote(i) ? WIIMOTE_SRC_EMU : WIIMOTE_SRC_NONE;
 		GetUsbPointer()->AccessWiiMote(i | 0x100)->Activate(IsUsingWiimote(i));
diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp
index f039fe4938..1a1544373c 100644
--- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp
@@ -15,7 +15,7 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin
 	wxStaticText* wiimote_label[4];
 	wxChoice* wiimote_source_ch[4];
 
-	for (unsigned int i = 0; i < 4; ++i)
+	for (unsigned int i = 0; i < MAX_WIIMOTES; ++i)
 	{
 		wxString str;
 		str.Printf(_("Wiimote %i"), i + 1);
@@ -206,7 +206,7 @@ void WiimoteConfigDiag::SelectSource(wxCommandEvent& event)
 
 void WiimoteConfigDiag::RevertSource()
 {
-	for (int i = 0; i < 4; ++i)
+	for (int i = 0; i < MAX_WIIMOTES; ++i)
 		g_wiimote_sources[i] = m_orig_wiimote_sources[i];
 }
 
diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h
index 4c33661ca2..88fea037a9 100644
--- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h
+++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h
@@ -76,9 +76,9 @@ private:
 	wxNotebook*		m_pad_notebook;
 
 	std::map<wxWindowID, unsigned int> m_wiimote_index_from_ctrl_id;
-	unsigned int m_orig_wiimote_sources[4];
+	unsigned int m_orig_wiimote_sources[MAX_WIIMOTES];
 
-	wxButton* wiimote_configure_bt[4];
+	wxButton* wiimote_configure_bt[MAX_WIIMOTES];
 	std::map<wxWindowID, unsigned int> m_wiimote_index_from_conf_bt_id;
 };
 

From fccf37718072cc6ff63cdc10a62d0a5c3588bfbc Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Sat, 18 May 2013 20:35:37 +1200
Subject: [PATCH 092/352] Fix IODummy FindWiimote method.

---
 Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp
index 3a017354eb..59025f9040 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp
@@ -32,9 +32,10 @@ WiimoteScanner::~WiimoteScanner()
 void WiimoteScanner::Update()
 {}
 
-std::vector<Wiimote*> WiimoteScanner::FindWiimotes()
+void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimote* & found_board)
 {
-	return std::vector<Wiimote*>();
+	found_wiimotes.clear();
+	found_board = NULL;
 }
 
 bool WiimoteScanner::IsReady() const

From 2c7f9b1b78f47a6d84e5c54a1fa3761af0485aba Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sat, 18 May 2013 03:56:45 -0500
Subject: [PATCH 093/352] [Android] Copy over the Dolphin shared library to the
 Android APK build directory so it doesn't need to be manually copied each
 time.

---
 Source/Core/DolphinWX/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
index 9508f75a36..e3f8789634 100644
--- a/Source/Core/DolphinWX/CMakeLists.txt
+++ b/Source/Core/DolphinWX/CMakeLists.txt
@@ -172,6 +172,9 @@ if(ANDROID)
 	${LIBS}
 	"-Wl,--no-whole-archive"
 	)
+	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
+		COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/libs/armeabi-v7a/lib${DOLPHIN_EXE}.so ${CMAKE_SOURCE_DIR}/Source/Android/libs/armeabi-v7a
+	)
 else()
 	add_executable(${DOLPHIN_EXE} ${SRCS})
 	target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS})

From 10018cfe9a4e5effc8470998734a63ac6a3ccda6 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sat, 18 May 2013 04:04:07 -0500
Subject: [PATCH 094/352] [Android] Add in the Android Studio project files so
 one can use Android Studio instead of ADT.

---
 Source/Android/.idea/.name                    |   1 +
 Source/Android/.idea/compiler.xml             |  23 +
 .../.idea/copyright/profiles_settings.xml     |   5 +
 Source/Android/.idea/encodings.xml            |   5 +
 Source/Android/.idea/libraries/dexedLibs.xml  |  10 +
 Source/Android/.idea/misc.xml                 |  26 +
 Source/Android/.idea/modules.xml              |  10 +
 .../Android/.idea/scopes/scope_settings.xml   |   5 +
 Source/Android/.idea/vcs.xml                  |   8 +
 Source/Android/.idea/workspace.xml            | 493 ++++++++++++++++++
 Source/Android/Android.iml                    |  19 +
 11 files changed, 605 insertions(+)
 create mode 100644 Source/Android/.idea/.name
 create mode 100644 Source/Android/.idea/compiler.xml
 create mode 100644 Source/Android/.idea/copyright/profiles_settings.xml
 create mode 100644 Source/Android/.idea/encodings.xml
 create mode 100644 Source/Android/.idea/libraries/dexedLibs.xml
 create mode 100644 Source/Android/.idea/misc.xml
 create mode 100644 Source/Android/.idea/modules.xml
 create mode 100644 Source/Android/.idea/scopes/scope_settings.xml
 create mode 100644 Source/Android/.idea/vcs.xml
 create mode 100644 Source/Android/.idea/workspace.xml
 create mode 100644 Source/Android/Android.iml

diff --git a/Source/Android/.idea/.name b/Source/Android/.idea/.name
new file mode 100644
index 0000000000..1429c13e57
--- /dev/null
+++ b/Source/Android/.idea/.name
@@ -0,0 +1 @@
+Android
\ No newline at end of file
diff --git a/Source/Android/.idea/compiler.xml b/Source/Android/.idea/compiler.xml
new file mode 100644
index 0000000000..217af471a9
--- /dev/null
+++ b/Source/Android/.idea/compiler.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+    <resourceExtensions />
+    <wildcardResourcePatterns>
+      <entry name="!?*.java" />
+      <entry name="!?*.form" />
+      <entry name="!?*.class" />
+      <entry name="!?*.groovy" />
+      <entry name="!?*.scala" />
+      <entry name="!?*.flex" />
+      <entry name="!?*.kt" />
+      <entry name="!?*.clj" />
+    </wildcardResourcePatterns>
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>
+
diff --git a/Source/Android/.idea/copyright/profiles_settings.xml b/Source/Android/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000000..3572571ad8
--- /dev/null
+++ b/Source/Android/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,5 @@
+<component name="CopyrightManager">
+  <settings default="">
+    <module2copyright />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/Source/Android/.idea/encodings.xml b/Source/Android/.idea/encodings.xml
new file mode 100644
index 0000000000..e206d70d85
--- /dev/null
+++ b/Source/Android/.idea/encodings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
+
diff --git a/Source/Android/.idea/libraries/dexedLibs.xml b/Source/Android/.idea/libraries/dexedLibs.xml
new file mode 100644
index 0000000000..d8e5061380
--- /dev/null
+++ b/Source/Android/.idea/libraries/dexedLibs.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="dexedLibs">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/bin/dexedLibs/library-f3f525b7017bd70eb33262cbaaf909f6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/bin/dexedLibs/library-7180f05db1823245b4a6600ab592b5c5.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/Source/Android/.idea/misc.xml b/Source/Android/.idea/misc.xml
new file mode 100644
index 0000000000..4304d8b8c8
--- /dev/null
+++ b/Source/Android/.idea/misc.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android 4.2.2" project-jdk-type="Android SDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>Android 4.2.2</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
+</project>
+
diff --git a/Source/Android/.idea/modules.xml b/Source/Android/.idea/modules.xml
new file mode 100644
index 0000000000..e28a283f98
--- /dev/null
+++ b/Source/Android/.idea/modules.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/Android.iml" filepath="$PROJECT_DIR$/Android.iml" />
+      <module fileurl="file://$PROJECT_DIR$/../../Externals/android-menudrawer/library/library.iml" filepath="$PROJECT_DIR$/../../Externals/android-menudrawer/library/library.iml" />
+    </modules>
+  </component>
+</project>
+
diff --git a/Source/Android/.idea/scopes/scope_settings.xml b/Source/Android/.idea/scopes/scope_settings.xml
new file mode 100644
index 0000000000..922003b843
--- /dev/null
+++ b/Source/Android/.idea/scopes/scope_settings.xml
@@ -0,0 +1,5 @@
+<component name="DependencyValidationManager">
+  <state>
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/Source/Android/.idea/vcs.xml b/Source/Android/.idea/vcs.xml
new file mode 100644
index 0000000000..a5dd08645f
--- /dev/null
+++ b/Source/Android/.idea/vcs.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="" />
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>
+
diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
new file mode 100644
index 0000000000..5482878f58
--- /dev/null
+++ b/Source/Android/.idea/workspace.xml
@@ -0,0 +1,493 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidLayouts">
+    <shared>
+      <config />
+    </shared>
+  </component>
+  <component name="BookmarkManager">
+    <bookmark url="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" line="37" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="682e8195-a9c2-48a7-a941-e8c10f5cb64a" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../Plugins/Plugin_VideoOGL/CMakeLists.txt" afterPath="$PROJECT_DIR$/../Plugins/Plugin_VideoOGL/CMakeLists.txt" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../Plugins/Plugin_VideoOGL/Src/GLUtil.h" afterPath="$PROJECT_DIR$/../Plugins/Plugin_VideoOGL/Src/GLUtil.h" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../Plugins/Plugin_VideoOGL/Src/Render.cpp" afterPath="$PROJECT_DIR$/../Plugins/Plugin_VideoOGL/Src/Render.cpp" />
+    </list>
+    <ignored path="Android.iws" />
+    <ignored path=".idea/workspace.xml" />
+    <file path="/fragment.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368867720090" ignored="false" />
+    <file path="/Dummy.txt" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368867715791" ignored="false" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
+  <component name="CreatePatchCommitExecutor">
+    <option name="PATCH_PATH" value="" />
+  </component>
+  <component name="DaemonCodeAnalyzer">
+    <disable_hints />
+  </component>
+  <component name="DebuggerManager">
+    <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
+    <breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
+      <breakpoint>
+        <option name="NOTIFY_CAUGHT" value="true" />
+        <option name="NOTIFY_UNCAUGHT" value="true" />
+        <option name="ENABLED" value="false" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="REMOVE_AFTER_HIT" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="SUSPEND" value="true" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="true" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint>
+        <option name="NOTIFY_CAUGHT" value="true" />
+        <option name="NOTIFY_UNCAUGHT" value="true" />
+        <option name="ENABLED" value="false" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="REMOVE_AFTER_HIT" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="SUSPEND" value="true" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="true" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+    </breakpoint_any>
+    <breakpoint_rules />
+    <ui_properties />
+  </component>
+  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
+  <component name="FavoritesManager">
+    <favorites_list name="Android" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file leaf-file-name="DolphinEmulator.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="27" column="4" selection-start="743" selection-end="743" vertical-scroll-proportion="0.18817204">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="FindManager">
+    <FindUsagesManager>
+      <setting name="OPEN_NEW_TAB" value="false" />
+    </FindUsagesManager>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../.." />
+  </component>
+  <component name="GitLogSettings">
+    <option name="myDateState">
+      <MyDateState />
+    </option>
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="changedFiles">
+      <list>
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectFrameBounds">
+    <option name="x" value="23" />
+    <option name="width" value="1344" />
+    <option name="height" value="745" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectReloadState">
+    <option name="STATE" value="0" />
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+    </navigator>
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="recentsLimit" value="5" />
+    <property name="options.lastSelected" value="project.propVCSSupport.Mappings" />
+    <property name="MemberChooser.sorted" value="false" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
+    <property name="GoToFile.includeJavaFiles" value="false" />
+    <property name="MemberChooser.copyJavadoc" value="false" />
+    <property name="options.splitter.main.proportions" value="0.3" />
+    <property name="GoToClass.includeLibraries" value="false" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="978fa698" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="dynamic.classpath" value="false" />
+    <property name="FullScreen" value="false" />
+    <property name="restartRequiresConfirmation" value="true" />
+    <property name="MemberChooser.showClasses" value="true" />
+    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+    <property name="options.searchVisible" value="true" />
+    <property name="options.splitter.details.proportions" value="0.2" />
+  </component>
+  <component name="RunManager" selected="Android Application.Dolphin Emulator">
+    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
+      <module name="" />
+      <option name="ACTIVITY_CLASS" value="" />
+      <option name="MODE" value="default_activity" />
+      <option name="DEPLOY" value="true" />
+      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
+      <option name="PREFERRED_AVD" value="" />
+      <option name="USE_COMMAND_LINE" value="true" />
+      <option name="COMMAND_LINE" value="" />
+      <option name="WIPE_USER_DATA" value="false" />
+      <option name="DISABLE_BOOT_ANIMATION" value="false" />
+      <option name="NETWORK_SPEED" value="full" />
+      <option name="NETWORK_LATENCY" value="none" />
+      <option name="CLEAR_LOGCAT" value="false" />
+      <method />
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
+      <module name="" />
+      <option name="TESTING_TYPE" value="0" />
+      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
+      <option name="METHOD_NAME" value="" />
+      <option name="CLASS_NAME" value="" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
+      <option name="PREFERRED_AVD" value="" />
+      <option name="USE_COMMAND_LINE" value="true" />
+      <option name="COMMAND_LINE" value="" />
+      <option name="WIPE_USER_DATA" value="false" />
+      <option name="DISABLE_BOOT_ANIMATION" value="false" />
+      <option name="NETWORK_SPEED" value="full" />
+      <option name="NETWORK_LATENCY" value="none" />
+      <option name="CLEAR_LOGCAT" value="false" />
+      <method />
+    </configuration>
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <method />
+    </configuration>
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+      <method />
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+      <patterns />
+      <method />
+    </configuration>
+    <configuration default="false" name="Dolphin Emulator" type="AndroidRunConfigurationType" factoryName="Android Application">
+      <module name="Android" />
+      <option name="ACTIVITY_CLASS" value="" />
+      <option name="MODE" value="default_activity" />
+      <option name="DEPLOY" value="true" />
+      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
+      <option name="PREFERRED_AVD" value="" />
+      <option name="USE_COMMAND_LINE" value="true" />
+      <option name="COMMAND_LINE" value="" />
+      <option name="WIPE_USER_DATA" value="false" />
+      <option name="DISABLE_BOOT_ANIMATION" value="false" />
+      <option name="NETWORK_SPEED" value="full" />
+      <option name="NETWORK_LATENCY" value="none" />
+      <option name="CLEAR_LOGCAT" value="false" />
+      <RunnerSettings RunnerId="AndroidDebugRunner" />
+      <ConfigurationWrapper RunnerId="AndroidDebugRunner" />
+      <method />
+    </configuration>
+    <list size="1">
+      <item index="0" class="java.lang.String" itemvalue="Android Application.Dolphin Emulator" />
+    </list>
+    <recent_temporary>
+      <list size="1">
+        <item index="0" class="java.lang.String" itemvalue="Android Tests.Android" />
+      </list>
+    </recent_temporary>
+    <configuration name="&lt;template&gt;" type="TestNG" default="true" selected="false">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    </configuration>
+    <configuration name="&lt;template&gt;" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" default="true" selected="false">
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+    </configuration>
+    <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
+      <Host>localhost</Host>
+      <Port>5050</Port>
+    </configuration>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false" />
+  <component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="false" SSL_PROTOCOLS="all">
+    <option name="USER" value="" />
+    <option name="PASSWORD" value="" />
+    <option name="mySSHConnectionTimeout" value="30000" />
+    <option name="mySSHReadTimeout" value="30000" />
+    <option name="LAST_MERGED_REVISION" />
+    <option name="MERGE_DRY_RUN" value="false" />
+    <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
+    <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
+    <option name="IGNORE_SPACES_IN_MERGE" value="false" />
+    <option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
+    <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
+    <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
+    <option name="FORCE_UPDATE" value="false" />
+    <option name="IGNORE_EXTERNALS" value="false" />
+    <myIsUseDefaultProxy>false</myIsUseDefaultProxy>
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="682e8195-a9c2-48a7-a941-e8c10f5cb64a" name="Default" comment="" />
+      <created>1368695084085</created>
+      <updated>1368695084085</updated>
+      <workItem from="1368695097983" duration="553000" />
+      <workItem from="1368695712903" duration="805000" />
+      <workItem from="1368849359745" duration="3003000" />
+      <workItem from="1368867565839" duration="141000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="4502000" />
+  </component>
+  <component name="TodoView" selected-index="0">
+    <todo-panel id="selected-file">
+      <are-packages-shown value="false" />
+      <are-modules-shown value="false" />
+      <flatten-packages value="false" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <are-modules-shown value="false" />
+      <flatten-packages value="false" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="default-changelist">
+      <are-packages-shown value="false" />
+      <are-modules-shown value="false" />
+      <flatten-packages value="false" />
+      <is-autoscroll-to-source value="false" />
+    </todo-panel>
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="23" y="0" width="1344" height="745" extended-state="6" />
+    <editor active="false" />
+    <layout>
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32931036" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31867284" sideWeight="0.2512563" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7479132" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.319933" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294753" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32931036" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294753" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+    </layout>
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
+    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
+    <option name="CHECK_NEW_TODO" value="true" />
+    <option name="myTodoPanelSettings">
+      <value>
+        <are-packages-shown value="false" />
+        <are-modules-shown value="false" />
+        <flatten-packages value="false" />
+        <is-autoscroll-to-source value="false" />
+      </value>
+    </option>
+    <option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
+    <option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
+    <option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
+    <option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
+    <option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
+    <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
+    <option name="DEFAULT_PATCH_EXTENSION" value="patch" />
+    <option name="SHORT_DIFF_HORIZONTALLY" value="true" />
+    <option name="SHORT_DIFF_EXTRA_LINES" value="2" />
+    <option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
+    <option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
+    <option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
+    <option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
+    <option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
+    <option name="SHOW_DIRTY_RECURSIVELY" value="false" />
+    <option name="LIMIT_HISTORY" value="true" />
+    <option name="MAXIMUM_HISTORY_ROWS" value="1000" />
+    <option name="UPDATE_FILTER_SCOPE_NAME" />
+    <option name="USE_COMMIT_MESSAGE_MARGIN" value="false" />
+    <option name="COMMIT_MESSAGE_MARGIN_SIZE" value="72" />
+    <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="false" />
+    <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
+    <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
+    <option name="LAST_COMMIT_MESSAGE" />
+    <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
+    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
+    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
+    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
+    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
+    <option name="ACTIVE_VCS_NAME" />
+    <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
+    <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
+    <option name="UPDATE_FILTER_BY_SCOPE" value="false" />
+    <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
+    <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="21" column="43" selection-start="610" selection-end="610" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/layout/main.xml">
+      <provider selected="true" editor-type-id="android-designer">
+        <state />
+      </provider>
+      <provider editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gen/org/dolphinemu/dolphinemu/R.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="5" column="19" selection-start="176" selection-end="176" vertical-scroll-proportion="0.0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gen/org/dolphinemu/dolphinemu/Manifest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="5" column="19" selection-start="183" selection-end="183" vertical-scroll-proportion="0.0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gen/org/dolphinemu/dolphinemu/BuildConfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="5" column="19" selection-start="135" selection-end="135" vertical-scroll-proportion="0.078809105" />
+      </provider>
+    </entry>
+    <entry file="jar://$APPLICATION_HOME_DIR$/sdk/platforms/android-17/android.jar!/android/content/ContentProvider.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="69" column="2" selection-start="4062" selection-end="4062" vertical-scroll-proportion="0.81182796" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="27" column="4" selection-start="743" selection-end="743" vertical-scroll-proportion="0.18817204">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
+
diff --git a/Source/Android/Android.iml b/Source/Android/Android.iml
new file mode 100644
index 0000000000..5f8bb57f26
--- /dev/null
+++ b/Source/Android/Android.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Dolphin Emulator">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="library" />
+  </component>
+</module>
+

From 0b869cf12d914773d78fb5ee5234f208661d9280 Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Sat, 18 May 2013 22:26:00 +1200
Subject: [PATCH 095/352] Add mac support for balance board.

---
 .../Core/Core/Src/HW/WiimoteReal/IOdarwin.mm  | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
index cec18ed63a..9f9192423c 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
@@ -116,22 +116,21 @@ WiimoteScanner::~WiimoteScanner()
 void WiimoteScanner::Update()
 {}
 
-std::vector<Wiimote*> WiimoteScanner::FindWiimotes()
+void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimote* & found_board)
 {
 	// TODO: find the device in the constructor and save it for later
-	
-	std::vector<Wiimote*> wiimotes;
 	IOBluetoothHostController *bth;
 	IOBluetoothDeviceInquiry *bti;
 	SearchBT *sbt;
 	NSEnumerator *en;
+	found_board = NULL;
 
 	bth = [[IOBluetoothHostController alloc] init];
 	if ([bth addressAsString] == nil)
 	{
 		WARN_LOG(WIIMOTE, "No bluetooth host controller");
 		[bth release];
-		return wiimotes;
+		return;
 	}
 
 	sbt = [[SearchBT alloc] init];
@@ -162,14 +161,22 @@ std::vector<Wiimote*> WiimoteScanner::FindWiimotes()
 
 		Wiimote *wm = new Wiimote();
 		wm->btd = dev;
-		wiimotes.push_back(wm);
+		
+		if(IsBalanceBoardName(name))
+		{
+			found_board = wm;
+			NOTICE_LOG(WIIMOTE, "Found balance board (%s).", bdaddr_str);
+		}
+		else
+		{
+			found_wiimotes.push_back(wm);
+			NOTICE_LOG(WIIMOTE, "Found wiimote (%s).", bdaddr_str);
+		}
 	}
 
 	[bth release];
 	[bti release];
 	[sbt release];
-
-	return wiimotes;
 }
 
 bool WiimoteScanner::IsReady() const

From 08f6ba8274b39ca9b0edc31f0b65e5182e0622cc Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Sat, 18 May 2013 22:29:51 +1200
Subject: [PATCH 096/352] I'm bad at mac.. sorry. Used the correct name string.

---
 Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
index 9f9192423c..4eac3ca5ff 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
@@ -162,7 +162,7 @@ void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimot
 		Wiimote *wm = new Wiimote();
 		wm->btd = dev;
 		
-		if(IsBalanceBoardName(name))
+		if(IsBalanceBoardName([[dev name] UTF8String]))
 		{
 			found_board = wm;
 			NOTICE_LOG(WIIMOTE, "Found balance board (%s).", bdaddr_str);

From 59924d0291ec78a5763c675e2c943702fedfefb3 Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Sat, 18 May 2013 22:31:22 +1200
Subject: [PATCH 097/352] It never had logging here anyway...

---
 Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
index 4eac3ca5ff..6f85f62a82 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IOdarwin.mm
@@ -165,12 +165,10 @@ void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimot
 		if(IsBalanceBoardName([[dev name] UTF8String]))
 		{
 			found_board = wm;
-			NOTICE_LOG(WIIMOTE, "Found balance board (%s).", bdaddr_str);
 		}
 		else
 		{
 			found_wiimotes.push_back(wm);
-			NOTICE_LOG(WIIMOTE, "Found wiimote (%s).", bdaddr_str);
 		}
 	}
 

From 7208823396762ae9659ec03addabe696fa93256b Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Sun, 19 May 2013 00:30:20 +1200
Subject: [PATCH 098/352] Added config for enabling Balance Board. Fixed other
 structures that still assumed 4 of everything.

---
 .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp   | 26 +++++++-----
 .../Core/DolphinWX/Src/WiimoteConfigDiag.cpp  | 42 +++++++++++++++----
 Source/Core/DolphinWX/Src/WiimoteConfigDiag.h |  2 +-
 Source/Core/InputCommon/Src/InputConfig.cpp   |  9 ++--
 4 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
index 1d3be13cc5..40c6ee0554 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
@@ -457,7 +457,10 @@ void LoadSettings()
 
 		sec.Get("Source", &g_wiimote_sources[i], i ? WIIMOTE_SRC_NONE : WIIMOTE_SRC_EMU);
 	}
-	g_wiimote_sources[WIIMOTE_BALANCE_BOARD] = WIIMOTE_SRC_REAL;
+	
+	std::string secname("BalanceBoard");
+	IniFile::Section& sec = *inifile.GetOrCreateSection(secname.c_str());
+	sec.Get("Source", &g_wiimote_sources[WIIMOTE_BALANCE_BOARD], WIIMOTE_SRC_NONE);
 }
 
 // config dialog calls this when some settings change
@@ -501,14 +504,14 @@ void Shutdown(void)
 void ChangeWiimoteSource(unsigned int index, int source)
 {
 	{
-	std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
-	g_wiimote_sources[index] = source;
-	g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes());
-	g_wiimote_scanner.WantBB(0 != CalculateWantedBB());
-	
-	
-	// kill real connection (or swap to different slot)
-	DoneWithWiimote(index);
+		std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
+		g_wiimote_sources[index] = source;
+		g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes());
+		g_wiimote_scanner.WantBB(0 != CalculateWantedBB());
+		
+		
+		// kill real connection (or swap to different slot)
+		DoneWithWiimote(index);
 	}
 
 	// reconnect to the emulator
@@ -635,7 +638,7 @@ void Refresh()
 		std::vector<Wiimote*> found_wiimotes;
 		Wiimote* found_board = NULL;
 		
-		if (0 != CalculateWantedWiimotes())
+		if (0 != CalculateWantedWiimotes() || 0 != CalculateWantedBB())
 		{
 			// Don't hang Dolphin when searching
 			lk.unlock();
@@ -646,7 +649,8 @@ void Refresh()
 		CheckForDisconnectedWiimotes();
 
 		// Brief rumble for already connected Wiimotes.
-		for (int i = 0; i < MAX_BBMOTES; ++i)
+		// Don't do this for Balance Board as it doesn't have rumble anyway.
+		for (int i = 0; i < MAX_WIIMOTES; ++i)
 		{
 			if (g_wiimotes[i])
 			{
diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp
index 1a1544373c..be29f11015 100644
--- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp
@@ -54,8 +54,25 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin
 		wiimote_sizer->Add(wiimote_configure_bt[i]);
 	}
 	wiimote_group->Add(wiimote_sizer, 1, wxEXPAND, 5 );
+	
+	
+	// "BalanceBoard" layout
+	wxStaticBoxSizer* const bb_group = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Balance Board"));
+	wxFlexGridSizer* const bb_sizer = new wxFlexGridSizer(1, 5, 5);
+	int source_ctrl_id =  wxWindow::NewControlId();
+	m_wiimote_index_from_ctrl_id.insert(std::pair<wxWindowID, unsigned int>(source_ctrl_id, WIIMOTE_BALANCE_BOARD));
+	const wxString src_choices[] = { _("None"), _("Real Balance Board") };
+	wxChoice* bb_source = new wxChoice(this, source_ctrl_id, wxDefaultPosition, wxDefaultSize, sizeof(src_choices)/sizeof(*src_choices), src_choices);
+	bb_source->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &WiimoteConfigDiag::SelectSource, this);
+	
+	m_orig_wiimote_sources[WIIMOTE_BALANCE_BOARD] = g_wiimote_sources[WIIMOTE_BALANCE_BOARD];
+	bb_source->Select(m_orig_wiimote_sources[WIIMOTE_BALANCE_BOARD] ? 1 : 0);
+	
+	bb_sizer->Add(bb_source, 0, wxALIGN_CENTER_VERTICAL);
+	
+	bb_group->Add(bb_sizer, 1, wxEXPAND, 5 );
 
-
+	
 	// "Real wiimotes" controls
 	wxButton* const refresh_btn = new wxButton(this, -1, _("Refresh"), wxDefaultPosition);
 	refresh_btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &WiimoteConfigDiag::RefreshRealWiimotes, this);
@@ -166,6 +183,7 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin
 
 	// Dialog layout
 	main_sizer->Add(wiimote_group, 0, wxEXPAND | wxALL, 5);
+	main_sizer->Add(bb_group, 0, wxEXPAND | wxALL, 5);
 	main_sizer->Add(real_wiimotes_group, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
 	main_sizer->Add(general_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
 	main_sizer->Add(CreateButtonSizer(wxOK | wxCANCEL), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
@@ -196,17 +214,23 @@ void WiimoteConfigDiag::SelectSource(wxCommandEvent& event)
 	// Revert if the dialog is canceled.
 	int index = m_wiimote_index_from_ctrl_id[event.GetId()];
 	
-	WiimoteReal::ChangeWiimoteSource(index, event.GetInt());
-
-	if (g_wiimote_sources[index] != WIIMOTE_SRC_EMU && g_wiimote_sources[index] != WIIMOTE_SRC_HYBRID)
-		wiimote_configure_bt[index]->Disable();
+	if(index != WIIMOTE_BALANCE_BOARD)
+	{
+		WiimoteReal::ChangeWiimoteSource(index, event.GetInt());
+		if (g_wiimote_sources[index] != WIIMOTE_SRC_EMU && g_wiimote_sources[index] != WIIMOTE_SRC_HYBRID)
+			wiimote_configure_bt[index]->Disable();
+		else
+			wiimote_configure_bt[index]->Enable();
+	}
 	else
-		wiimote_configure_bt[index]->Enable();
+	{
+		WiimoteReal::ChangeWiimoteSource(index, event.GetInt() ? WIIMOTE_SRC_REAL : WIIMOTE_SRC_NONE);	
+	}
 }
 
 void WiimoteConfigDiag::RevertSource()
 {
-	for (int i = 0; i < MAX_WIIMOTES; ++i)
+	for (int i = 0; i < MAX_BBMOTES; ++i)
 		g_wiimote_sources[i] = m_orig_wiimote_sources[i];
 }
 
@@ -225,6 +249,10 @@ void WiimoteConfigDiag::Save(wxCommandEvent& event)
 
 		sec.Set("Source", (int)g_wiimote_sources[i]);
 	}
+	
+	std::string secname("BalanceBoard");
+	IniFile::Section& sec = *inifile.GetOrCreateSection(secname.c_str());
+	sec.Set("Source", (int)g_wiimote_sources[WIIMOTE_BALANCE_BOARD]);
 
 	inifile.Save(ini_filename);
 
diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h
index 88fea037a9..dac963d9f3 100644
--- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h
+++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h
@@ -76,7 +76,7 @@ private:
 	wxNotebook*		m_pad_notebook;
 
 	std::map<wxWindowID, unsigned int> m_wiimote_index_from_ctrl_id;
-	unsigned int m_orig_wiimote_sources[MAX_WIIMOTES];
+	unsigned int m_orig_wiimote_sources[MAX_BBMOTES];
 
 	wxButton* wiimote_configure_bt[MAX_WIIMOTES];
 	std::map<wxWindowID, unsigned int> m_wiimote_index_from_conf_bt_id;
diff --git a/Source/Core/InputCommon/Src/InputConfig.cpp b/Source/Core/InputCommon/Src/InputConfig.cpp
index 65529b0a3f..e1af00f41d 100644
--- a/Source/Core/InputCommon/Src/InputConfig.cpp
+++ b/Source/Core/InputCommon/Src/InputConfig.cpp
@@ -3,7 +3,8 @@
 // Refer to the license.txt file included.
 
 #include "InputConfig.h"
-#include "../../Core/Src/ConfigManager.h"
+#include "../Src/ConfigManager.h"
+#include "../Src/HW/Wiimote.h"
 
 InputPlugin::~InputPlugin()
 {
@@ -18,9 +19,9 @@ bool InputPlugin::LoadConfig(bool isGC)
 {
 	IniFile inifile;
 	IniFile game_ini;
-	bool useProfile[4] = {false, false, false, false};
-	std::string num[4] = {"1", "2", "3", "4"};
-	std::string profile[4];
+	bool useProfile[MAX_BBMOTES] = {false, false, false, false, false};
+	std::string num[MAX_BBMOTES] = {"1", "2", "3", "4", "BB"};
+	std::string profile[MAX_BBMOTES];
 	std::string path;
 
 	if (SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() != "00000000")

From 065d772696fd66720574fadbcbf4ce8190ff5d20 Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Sun, 19 May 2013 14:45:24 +1200
Subject: [PATCH 099/352] Windows should have support for Balance Board now.

Needs to be tested.
---
 Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 25 +++++++++++++++----
 Source/Core/InputCommon/Src/InputConfig.cpp   |  4 +--
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
index 4aae05fa3a..cf47315066 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
@@ -183,7 +183,7 @@ void WiimoteScanner::Update()
 // Does not replace already found wiimotes even if they are disconnected.
 // wm is an array of max_wiimotes wiimotes
 // Returns the total number of found and connected wiimotes.
-std::vector<Wiimote*> WiimoteScanner::FindWiimotes()
+void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimote* & found_board)
 {
 	ProcessWiimotes(true, [](HANDLE hRadio, const BLUETOOTH_RADIO_INFO& rinfo, BLUETOOTH_DEVICE_INFO_STRUCT& btdi)
 	{
@@ -198,8 +198,6 @@ std::vector<Wiimote*> WiimoteScanner::FindWiimotes()
 	// Get all hid devices connected
 	HDEVINFO const device_info = SetupDiGetClassDevs(&device_id, NULL, NULL, (DIGCF_DEVICEINTERFACE | DIGCF_PRESENT));
 
-	std::vector<Wiimote*> wiimotes;
-
 	SP_DEVICE_INTERFACE_DATA device_data;
 	device_data.cbSize = sizeof(device_data);
 	PSP_DEVICE_INTERFACE_DETAIL_DATA detail_data = NULL;
@@ -217,7 +215,25 @@ std::vector<Wiimote*> WiimoteScanner::FindWiimotes()
 		{
 			auto const wm = new Wiimote;
 			wm->devicepath = detail_data->DevicePath;
-			wiimotes.push_back(wm);
+			
+			TCHAR name[128] = {};
+			HANDLE dev_handle = CreateFile(wm->devicepath.c_str(),
+								GENERIC_READ, FILE_SHARE_READ,
+								NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
+			
+			if (dev_handle != INVALID_HANDLE_VALUE && HidD_GetProductString(dev_handle, name, 128) && IsBalanceBoardName(TStrToUTF8(name)))
+			{
+				found_board = wm;
+			}
+			else
+			{
+				found_wiimotes.push_back(wm);
+			}
+			
+			if(dev_handle != INVALID_HANDLE_VALUE)
+			{
+				CloseHandle(dev_handle);
+			}
 		}
 
 		free(detail_data);
@@ -229,7 +245,6 @@ std::vector<Wiimote*> WiimoteScanner::FindWiimotes()
 	//if (!wiimotes.empty())
 	//	SLEEP(2000);
 
-	return wiimotes;
 }
 
 bool WiimoteScanner::IsReady() const
diff --git a/Source/Core/InputCommon/Src/InputConfig.cpp b/Source/Core/InputCommon/Src/InputConfig.cpp
index e1af00f41d..96fc6205db 100644
--- a/Source/Core/InputCommon/Src/InputConfig.cpp
+++ b/Source/Core/InputCommon/Src/InputConfig.cpp
@@ -3,8 +3,8 @@
 // Refer to the license.txt file included.
 
 #include "InputConfig.h"
-#include "../Src/ConfigManager.h"
-#include "../Src/HW/Wiimote.h"
+#include "../../Core/Src/ConfigManager.h"
+#include "../../Core/Src/HW/Wiimote.h"
 
 InputPlugin::~InputPlugin()
 {

From 56976ad6ea5491809732129b54221bc5674e68b6 Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Sun, 19 May 2013 14:57:04 +1200
Subject: [PATCH 100/352] Fix coding style.

---
 Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
index cf47315066..4eded21d2d 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
@@ -217,11 +217,17 @@ void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimot
 			wm->devicepath = detail_data->DevicePath;
 			
 			TCHAR name[128] = {};
-			HANDLE dev_handle = CreateFile(wm->devicepath.c_str(),
-								GENERIC_READ, FILE_SHARE_READ,
-								NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
+			HANDLE dev_handle = CreateFile(wm->devicepath.c_str(), 
+								  GENERIC_READ, 
+								  FILE_SHARE_READ, 
+								  NULL, 
+								  OPEN_EXISTING, 
+								  FILE_FLAG_OVERLAPPED, 
+								  NULL);
 			
-			if (dev_handle != INVALID_HANDLE_VALUE && HidD_GetProductString(dev_handle, name, 128) && IsBalanceBoardName(TStrToUTF8(name)))
+			if (dev_handle != INVALID_HANDLE_VALUE && 
+				HidD_GetProductString(dev_handle, name, 128) && 
+				IsBalanceBoardName(TStrToUTF8(name)))
 			{
 				found_board = wm;
 			}
@@ -230,7 +236,7 @@ void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimot
 				found_wiimotes.push_back(wm);
 			}
 			
-			if(dev_handle != INVALID_HANDLE_VALUE)
+			if (dev_handle != INVALID_HANDLE_VALUE)
 			{
 				CloseHandle(dev_handle);
 			}

From 252edb942dac4828ed0b76b1cf9a98f088d59234 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sun, 19 May 2013 05:25:02 -0500
Subject: [PATCH 101/352] [Android] Beginning of setting menu, doesn't do
 anything yet.

---
 Source/Android/.idea/vcs.xml                  |   1 -
 Source/Android/.idea/workspace.xml            | 417 ++++++++++++------
 Source/Android/AndroidManifest.xml            |   8 +-
 .../dolphinemu/dolphinemu/GameListView.java   |  51 +--
 .../dolphinemu/dolphinemu/SettingBrowser.java |  56 +++
 .../dolphinemu/SettingMenuAdapter.java        |  60 +++
 .../dolphinemu/SettingMenuItem.java           |  37 ++
 .../dolphinemu/dolphinemu/SideMenuItem.java   |   6 +
 8 files changed, 472 insertions(+), 164 deletions(-)
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/SettingBrowser.java
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuItem.java

diff --git a/Source/Android/.idea/vcs.xml b/Source/Android/.idea/vcs.xml
index a5dd08645f..def6a6a184 100644
--- a/Source/Android/.idea/vcs.xml
+++ b/Source/Android/.idea/vcs.xml
@@ -2,7 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="" />
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
   </component>
 </project>
 
diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index 5482878f58..49334515f9 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -9,15 +9,16 @@
     <bookmark url="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" line="37" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="682e8195-a9c2-48a7-a941-e8c10f5cb64a" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../Plugins/Plugin_VideoOGL/CMakeLists.txt" afterPath="$PROJECT_DIR$/../Plugins/Plugin_VideoOGL/CMakeLists.txt" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../Plugins/Plugin_VideoOGL/Src/GLUtil.h" afterPath="$PROJECT_DIR$/../Plugins/Plugin_VideoOGL/Src/GLUtil.h" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/../Plugins/Plugin_VideoOGL/Src/Render.cpp" afterPath="$PROJECT_DIR$/../Plugins/Plugin_VideoOGL/Src/Render.cpp" />
-    </list>
+    <list default="true" id="682e8195-a9c2-48a7-a941-e8c10f5cb64a" name="Default" comment="" />
     <ignored path="Android.iws" />
     <ignored path=".idea/workspace.xml" />
     <file path="/fragment.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368867720090" ignored="false" />
-    <file path="/Dummy.txt" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368867715791" ignored="false" />
+    <file path="/Dummy.txt" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368955682446" ignored="false" />
+    <file path="/GameListView.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368956140826" ignored="false" />
+    <file path="/SettingBrowser.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368957239085" ignored="false" />
+    <file path="/SettingMenuItem.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368957197656" ignored="false" />
+    <file path="/SettingMenuAdapter.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368957350110" ignored="false" />
+    <file path="/AndroidManifest.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368956692901" ignored="false" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -78,10 +79,46 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="DolphinEmulator.java" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="DolphinEmulator.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="27" column="4" selection-start="743" selection-end="743" vertical-scroll-proportion="0.18817204">
+            <state line="24" column="31" selection-start="669" selection-end="669" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="GameListView.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="42" column="29" selection-start="1288" selection-end="1288" vertical-scroll-proportion="0.026929982">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="GameListItem.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="11" column="13" selection-start="0" selection-end="1837" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="FolderBrowser.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="28" column="0" selection-start="793" selection-end="3160" vertical-scroll-proportion="0.0">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="SettingBrowser.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingBrowser.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="9" column="22" selection-start="234" selection-end="234" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -106,13 +143,19 @@
     <option name="changedFiles">
       <list>
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
+        <option value="$PROJECT_DIR$/AndroidManifest.xml" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuItem.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuItem.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingBrowser.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="23" />
-    <option name="width" value="1344" />
-    <option name="height" value="745" />
+    <option name="x" value="24" />
+    <option name="width" value="1342" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <OptionsSetting value="true" id="Add" />
@@ -121,14 +164,14 @@
     <OptionsSetting value="true" id="Update" />
     <OptionsSetting value="true" id="Status" />
     <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="1" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
   </component>
   <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
+    <navigator currentView="Scope" currentSubView="Project Files" proportions="" version="1" splitterProportion="0.5">
       <flattenPackages />
       <showMembers />
       <showModules />
@@ -140,6 +183,26 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="Scope">
+        <subPane subId="Project Files">
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -148,101 +211,59 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dolphinemu" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
       <pane id="PackagesPane" />
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="recentsLimit" value="5" />
-    <property name="options.lastSelected" value="project.propVCSSupport.Mappings" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
     <property name="options.splitter.main.proportions" value="0.3" />
+    <property name="FullScreen" value="false" />
+    <property name="options.searchVisible" value="true" />
+    <property name="recentsLimit" value="5" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="GoToClass.includeLibraries" value="false" />
     <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="978fa698" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="dynamic.classpath" value="false" />
-    <property name="FullScreen" value="false" />
-    <property name="restartRequiresConfirmation" value="true" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="options.searchVisible" value="true" />
     <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="options.lastSelected" value="project.propVCSSupport.Mappings" />
+    <property name="MemberChooser.showClasses" value="true" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
+    <property name="MemberChooser.sorted" value="false" />
+    <property name="restartRequiresConfirmation" value="true" />
+    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+    <property name="GoToFile.includeJavaFiles" value="false" />
+    <property name="MemberChooser.copyJavadoc" value="false" />
+    <property name="dynamic.classpath" value="false" />
   </component>
   <component name="RunManager" selected="Android Application.Dolphin Emulator">
-    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
-      <module name="" />
-      <option name="ACTIVITY_CLASS" value="" />
-      <option name="MODE" value="default_activity" />
-      <option name="DEPLOY" value="true" />
-      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="USE_COMMAND_LINE" value="true" />
-      <option name="COMMAND_LINE" value="" />
-      <option name="WIPE_USER_DATA" value="false" />
-      <option name="DISABLE_BOOT_ANIMATION" value="false" />
-      <option name="NETWORK_SPEED" value="full" />
-      <option name="NETWORK_LATENCY" value="none" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
-      <module name="" />
-      <option name="TESTING_TYPE" value="0" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="USE_COMMAND_LINE" value="true" />
-      <option name="COMMAND_LINE" value="" />
-      <option name="WIPE_USER_DATA" value="false" />
-      <option name="DISABLE_BOOT_ANIMATION" value="false" />
-      <option name="NETWORK_SPEED" value="full" />
-      <option name="NETWORK_LATENCY" value="none" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <module name="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
       <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -263,6 +284,75 @@
       <patterns />
       <method />
     </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
+      <module name="" />
+      <option name="ACTIVITY_CLASS" value="" />
+      <option name="MODE" value="default_activity" />
+      <option name="DEPLOY" value="true" />
+      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
+      <option name="PREFERRED_AVD" value="" />
+      <option name="USE_COMMAND_LINE" value="true" />
+      <option name="COMMAND_LINE" value="" />
+      <option name="WIPE_USER_DATA" value="false" />
+      <option name="DISABLE_BOOT_ANIMATION" value="false" />
+      <option name="NETWORK_SPEED" value="full" />
+      <option name="NETWORK_LATENCY" value="none" />
+      <option name="CLEAR_LOGCAT" value="false" />
+      <method />
+    </configuration>
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+      <method />
+    </configuration>
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <method />
+    </configuration>
+    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
+      <module name="" />
+      <option name="TESTING_TYPE" value="0" />
+      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
+      <option name="METHOD_NAME" value="" />
+      <option name="CLASS_NAME" value="" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
+      <option name="PREFERRED_AVD" value="" />
+      <option name="USE_COMMAND_LINE" value="true" />
+      <option name="COMMAND_LINE" value="" />
+      <option name="WIPE_USER_DATA" value="false" />
+      <option name="DISABLE_BOOT_ANIMATION" value="false" />
+      <option name="NETWORK_SPEED" value="full" />
+      <option name="NETWORK_LATENCY" value="none" />
+      <option name="CLEAR_LOGCAT" value="false" />
+      <method />
+    </configuration>
     <configuration default="false" name="Dolphin Emulator" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="Android" />
       <option name="ACTIVITY_CLASS" value="" />
@@ -284,11 +374,6 @@
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Android Application.Dolphin Emulator" />
     </list>
-    <recent_temporary>
-      <list size="1">
-        <item index="0" class="java.lang.String" itemvalue="Android Tests.Android" />
-      </list>
-    </recent_temporary>
     <configuration name="&lt;template&gt;" type="TestNG" default="true" selected="false">
       <option name="MAIN_CLASS_NAME" />
       <option name="VM_PARAMETERS" value="-ea" />
@@ -329,12 +414,17 @@
       <workItem from="1368695097983" duration="553000" />
       <workItem from="1368695712903" duration="805000" />
       <workItem from="1368849359745" duration="3003000" />
-      <workItem from="1368867565839" duration="141000" />
+      <workItem from="1368867565839" duration="1956000" />
+      <workItem from="1368872339338" duration="8211000" />
+      <workItem from="1368954925765" duration="561000" />
+      <workItem from="1368955681290" duration="2332000" />
+      <workItem from="1368958063194" duration="125000" />
+      <workItem from="1368958842851" duration="47000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="4502000" />
+    <option name="totallyTimeSpent" value="17593000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -357,32 +447,32 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="23" y="0" width="1344" height="745" extended-state="6" />
+    <frame x="24" y="0" width="1342" height="744" extended-state="0" />
     <editor active="false" />
     <layout>
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32931036" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7470687" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31867284" sideWeight="0.2512563" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7479132" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.319933" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19474497" sideWeight="0.680067" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.319933" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294753" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32931036" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294753" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32931036" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294753" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
     </layout>
   </component>
   <component name="VcsContentAnnotationSettings">
@@ -417,7 +507,7 @@
     <option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
     <option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
     <option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
-    <option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
+    <option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="false" />
     <option name="SHOW_DIRTY_RECURSIVELY" value="false" />
     <option name="LIMIT_HISTORY" value="true" />
     <option name="MAXIMUM_HISTORY_ROWS" value="1000" />
@@ -446,21 +536,13 @@
     <breakpoint-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingBrowser.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="21" column="43" selection-start="610" selection-end="610" vertical-scroll-proportion="0.0">
+        <state line="9" column="22" selection-start="234" selection-end="234" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/res/layout/main.xml">
-      <provider selected="true" editor-type-id="android-designer">
-        <state />
-      </provider>
-      <provider editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/gen/org/dolphinemu/dolphinemu/R.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="5" column="19" selection-start="176" selection-end="176" vertical-scroll-proportion="0.0" />
@@ -481,9 +563,80 @@
         <state line="69" column="2" selection-start="4062" selection-end="4062" vertical-scroll-proportion="0.81182796" />
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="11" column="13" selection-start="0" selection-end="1323" vertical-scroll-proportion="0.10507881" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/layout/sidemenu.xml">
+      <provider selected="true" editor-type-id="android-designer">
+        <state />
+      </provider>
+      <provider editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="28" column="0" selection-start="793" selection-end="3160" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="11" column="13" selection-start="0" selection-end="1837" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="27" column="4" selection-start="743" selection-end="743" vertical-scroll-proportion="0.18817204">
+        <state line="24" column="31" selection-start="669" selection-end="669" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="21" column="48" selection-start="955" selection-end="955" vertical-scroll-proportion="0.82894737">
+          <folding>
+            <element signature="e#659#677#0" expanded="true" />
+            <element signature="e#767#785#0" expanded="true" />
+            <element signature="e#1338#1356#0" expanded="true" />
+            <element signature="e#1646#1664#0" expanded="true" />
+            <element signature="e#1955#1973#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuItem.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="1" column="0" selection-start="35" selection-end="35" vertical-scroll-proportion="0.039473683">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuItem.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="23" column="15" selection-start="454" selection-end="454" vertical-scroll-proportion="0.33157894" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="41" column="88" selection-start="1280" selection-end="1280" vertical-scroll-proportion="1.3421053" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingBrowser.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="9" column="22" selection-start="234" selection-end="234" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="42" column="29" selection-start="1288" selection-end="1288" vertical-scroll-proportion="0.026929982">
           <folding />
         </state>
       </provider>
diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index 82573aa8aa..2eb749d1a2 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -31,12 +31,18 @@
             android:theme="@android:style/Theme"
             android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
         </activity>
-                <activity 
+        <activity
             android:name="org.dolphinemu.dolphinemu.FolderBrowser"
             android:label="@string/app_name"
             android:theme="@android:style/Theme"
             android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
         </activity>
+        <activity
+            android:name="org.dolphinemu.dolphinemu.SettingBrowser"
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme"
+            android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
+        </activity>
     </application>
 
 </manifest>
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
index d90bb32016..96b67c2130 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
@@ -1,38 +1,26 @@
 package org.dolphinemu.dolphinemu;
 
+import android.app.Activity;
+import android.app.ListActivity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.Toast;
+import net.simonvt.menudrawer.MenuDrawer;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import net.simonvt.menudrawer.MenuDrawer;
-
-import android.app.Activity;
-import android.app.ListActivity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.DisplayMetrics;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.Surface;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-
 public class GameListView extends ListActivity {
 	private GameListAdapter adapter;
-	private static List<File> currentDir;
 	private MenuDrawer mDrawer;
 	
     private SideMenuAdapter mAdapter;
-    private ListView mList;
     private static GameListView me;
     public static native String GetConfig(String Key, String Value, String Default);
     public static native void SetConfig(String Key, String Value, String Default);
@@ -66,7 +54,7 @@ public class GameListView extends ListActivity {
 			            			fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath()));
 				}
 			}
-			catch(Exception e)
+			catch(Exception ignored)
 			{
 			}
 		}
@@ -78,13 +66,10 @@ public class GameListView extends ListActivity {
 	
 	@Override
 	protected void onListItemClick(ListView l, View v, int position, long id) {
-		// TODO Auto-generated method stub
 		super.onListItemClick(l, v, position, id);
 		GameListItem o = adapter.getItem(position);
-		if(o.getData().equalsIgnoreCase("folder")||o.getData().equalsIgnoreCase("parent directory")){
-		}
-		else
-		{
+		if(!(o.getData().equalsIgnoreCase("folder")||o.getData().equalsIgnoreCase("parent directory")))
+        {
 			onFileClick(o.getPath());
 		}
 	}
@@ -131,8 +116,9 @@ public class GameListView extends ListActivity {
 		 
 		List<SideMenuItem>dir = new ArrayList<SideMenuItem>();
 		dir.add(new SideMenuItem("Browse Folder", 0));
+        dir.add(new SideMenuItem("Settings", 1));
 
-		mList = new ListView(this);
+        ListView mList = new ListView(this);
 		mAdapter = new SideMenuAdapter(this,R.layout.sidemenu,dir);
 		mList.setAdapter(mAdapter);
 		mList.setOnItemClickListener(mItemClickListener);
@@ -150,6 +136,11 @@ public class GameListView extends ListActivity {
         			Intent ListIntent = new Intent(me, FolderBrowser.class);
         			startActivityForResult(ListIntent, 1);
         		break;
+                case 1:
+                    Toast.makeText(me, "Loading up settings", Toast.LENGTH_SHORT).show();
+                    Intent SettingIntent = new Intent(me, SettingBrowser.class);
+                    startActivityForResult(SettingIntent, 1);
+                break;
         		default:
         		break;
         	}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/SettingBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/SettingBrowser.java
new file mode 100644
index 0000000000..123bb174ed
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/SettingBrowser.java
@@ -0,0 +1,56 @@
+package org.dolphinemu.dolphinemu;
+
+import android.app.ListActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ListView;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ *  Copyright 2013 Dolphin Emulator Project
+ *  Licensed under GPLv2
+ *  Refer to the license.txt file included.
+ */
+
+public class SettingBrowser extends ListActivity {
+    private SettingMenuAdapter adapter;
+    private void Fill()
+    {
+        this.setTitle("Settings");
+        List<SettingMenuItem> dir = new ArrayList<SettingMenuItem>();
+
+        dir.add(new SettingMenuItem("Setting 1", "SubTitle 1", 0));
+        Collections.sort(dir);
+
+        adapter = new SettingMenuAdapter(this,R.layout.folderbrowser,dir);
+        this.setListAdapter(adapter);
+    }
+
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        super.onListItemClick(l, v, position, id);
+        SettingMenuItem o = adapter.getItem(position);
+        switch (o.getID())
+        {
+            default:
+                // Do nothing yet
+            break;
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+
+        Fill();
+    }
+    @Override
+    public void onBackPressed() {
+        this.finish();
+        super.onBackPressed();
+    }
+}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java
new file mode 100644
index 0000000000..8fb0b237f6
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java
@@ -0,0 +1,60 @@
+package org.dolphinemu.dolphinemu;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+import java.util.List;
+
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2
+ * Refer to the license.txt file included.
+ */
+
+public class SettingMenuAdapter extends ArrayAdapter<SettingMenuItem>{
+
+    private Context c;
+    private int id;
+    private List<SettingMenuItem>items;
+
+    public SettingMenuAdapter(Context context, int textViewResourceId,
+                           List<SettingMenuItem> objects) {
+        super(context, textViewResourceId, objects);
+        c = context;
+        id = textViewResourceId;
+        items = objects;
+    }
+    public SettingMenuItem getItem(int i)
+    {
+        return items.get(i);
+    }
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        View v = convertView;
+        if (v == null) {
+            LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            v = vi.inflate(id, null);
+            if (v == null)
+                return null; // This should never be hit, but have it to clear a warning
+        }
+        final SettingMenuItem o = items.get(position);
+        if (o != null) {
+            TextView t1 = (TextView) v.findViewById(R.id.TextView01);
+            TextView t2 = (TextView) v.findViewById(R.id.TextView02);
+
+            if (t1 != null)
+                t1.setText(o.getName());
+            if (t2 != null)
+                t2.setText(o.getSubtitle());
+        }
+        return v;
+    }
+
+
+
+}
+
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuItem.java
new file mode 100644
index 0000000000..fcb0da942c
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuItem.java
@@ -0,0 +1,37 @@
+package org.dolphinemu.dolphinemu;
+
+public class SettingMenuItem implements Comparable<SettingMenuItem>{
+    private String name;
+    private String subtitle;
+    private int m_id;
+
+    public SettingMenuItem(String n,String d, int id)
+    {
+        name = n;
+        subtitle = d;
+        m_id = id;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public String getSubtitle()
+    {
+        return subtitle;
+    }
+    public int getID()
+    {
+        return m_id;
+    }
+
+    public int compareTo(SettingMenuItem o)
+    {
+        if(this.name != null)
+            return this.name.toLowerCase().compareTo(o.getName().toLowerCase());
+        else
+            throw new IllegalArgumentException();
+    }
+}
+
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuItem.java
index 80f3eaec64..e24842bed1 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuItem.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuItem.java
@@ -1,5 +1,11 @@
 package org.dolphinemu.dolphinemu;
 
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2
+ * Refer to the license.txt file included.
+ */
+
 public class SideMenuItem implements Comparable<SideMenuItem>{
     private String m_name;
     private int m_id;

From 9a1b9e9b3b6960cdb0723b73a4a224cee9a7c1bf Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Sun, 19 May 2013 19:44:37 +0200
Subject: [PATCH 102/352] Removing ISO ini presence requirement for reading
 movie settings

because it's not necessary for running a movie
---
 Source/Core/Core/Src/BootManager.cpp | 30 +++++++++++++++-------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp
index f829f3f4d6..cf67b6f310 100644
--- a/Source/Core/Core/Src/BootManager.cpp
+++ b/Source/Core/Core/Src/BootManager.cpp
@@ -108,20 +108,6 @@ bool BootCore(const std::string& _rFilename)
 		game_ini.Get("Core", "HLE_BS2",				&StartUp.bHLE_BS2, StartUp.bHLE_BS2);
 		VideoBackend::ActivateBackend(StartUp.m_strVideoBackend);
 
-		if (Movie::IsPlayingInput() && Movie::IsConfigSaved())
-		{
-			StartUp.bCPUThread = Movie::IsDualCore();
-			StartUp.bSkipIdle = Movie::IsSkipIdle();
-			StartUp.bDSPHLE = Movie::IsDSPHLE();
-			StartUp.bProgressive = Movie::IsProgressive();
-			StartUp.bFastDiscSpeed = Movie::IsFastDiscSpeed();
-			StartUp.iCPUCore = Movie::GetCPUMode();
-			if (Movie::IsUsingMemcard() && Movie::IsStartingFromClearSave() && !StartUp.bWii)
-			{
-				if (File::Exists("Movie.raw"))
-					File::Delete("Movie.raw");
-			}
-		}
 		// Wii settings
 		if (StartUp.bWii)
 		{
@@ -130,6 +116,22 @@ bool BootCore(const std::string& _rFilename)
 		}
 	} 
 
+	// movie settings
+	if (Movie::IsPlayingInput() && Movie::IsConfigSaved())
+	{
+		StartUp.bCPUThread = Movie::IsDualCore();
+		StartUp.bSkipIdle = Movie::IsSkipIdle();
+		StartUp.bDSPHLE = Movie::IsDSPHLE();
+		StartUp.bProgressive = Movie::IsProgressive();
+		StartUp.bFastDiscSpeed = Movie::IsFastDiscSpeed();
+		StartUp.iCPUCore = Movie::GetCPUMode();
+		if (Movie::IsUsingMemcard() && Movie::IsStartingFromClearSave() && !StartUp.bWii)
+		{
+			if (File::Exists("Movie.raw"))
+				File::Delete("Movie.raw");
+		}
+	}
+
 	// Run the game
 	// Init the core
 	if (!Core::Init())

From f8a5d05c07e6a3f10b9bf5f5e17e9fe59e60107c Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Mon, 20 May 2013 02:57:39 -0500
Subject: [PATCH 103/352] [Android] Redo the Settings menu, Can now change the
 CPU Core, dual core setting, and video backend in the settings"

---
 Source/Android/.idea/workspace.xml            | 456 +++++++++++-------
 Source/Android/AndroidManifest.xml            |   8 +-
 Source/Android/res/layout/prefs.xml           |  28 ++
 Source/Android/res/values/prefvalues.xml      |  22 +
 .../dolphinemu/dolphinemu/GameListView.java   |  82 +++-
 .../dolphinemu/dolphinemu/PrefsActivity.java  |  40 ++
 .../dolphinemu/dolphinemu/SettingBrowser.java |  56 ---
 .../dolphinemu/SettingMenuAdapter.java        |  60 ---
 .../dolphinemu/SettingMenuItem.java           |  37 --
 9 files changed, 443 insertions(+), 346 deletions(-)
 create mode 100644 Source/Android/res/layout/prefs.xml
 create mode 100644 Source/Android/res/values/prefvalues.xml
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java
 delete mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/SettingBrowser.java
 delete mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java
 delete mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuItem.java

diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index 49334515f9..87d98b0e1e 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -1,9 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AndroidLayoutPreviewToolWindow">
+    <option name="state">
+      <GlobalState>
+        <option name="visible" value="false" />
+      </GlobalState>
+    </option>
+  </component>
   <component name="AndroidLayouts">
     <shared>
-      <config />
+      <config>
+        <target>android-17</target>
+      </config>
     </shared>
+    <layouts>
+      <layout url="file://$PROJECT_DIR$/res/layout/fragment_edit_name.xml">
+        <config>
+          <device>Nexus 4</device>
+          <theme>@android:style/Theme.Holo</theme>
+        </config>
+      </layout>
+    </layouts>
   </component>
   <component name="BookmarkManager">
     <bookmark url="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" line="37" />
@@ -14,11 +31,17 @@
     <ignored path=".idea/workspace.xml" />
     <file path="/fragment.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368867720090" ignored="false" />
     <file path="/Dummy.txt" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368955682446" ignored="false" />
-    <file path="/GameListView.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368956140826" ignored="false" />
-    <file path="/SettingBrowser.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368957239085" ignored="false" />
+    <file path="/GameListView.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369035891369" ignored="false" />
+    <file path="/SettingBrowser.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368965879091" ignored="false" />
     <file path="/SettingMenuItem.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368957197656" ignored="false" />
     <file path="/SettingMenuAdapter.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368957350110" ignored="false" />
-    <file path="/AndroidManifest.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368956692901" ignored="false" />
+    <file path="/AndroidManifest.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369032503953" ignored="false" />
+    <file path="/EditNameDialog.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369023935830" ignored="false" />
+    <file path="/PrefsActivity.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369031747746" ignored="false" />
+    <file path="/PrefsFragment.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369032642639" ignored="false" />
+    <file path="/prefs.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369036284146" ignored="false" />
+    <file path="$PROJECT_DIR$/gen/org/dolphinemu/dolphinemu/BuildConfig.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369036186956" ignored="false" />
+    <file path="/prefvalues.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369036331457" ignored="false" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -26,6 +49,11 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
+  <component name="Commander">
+    <leftPanel />
+    <rightPanel />
+    <splitter proportion="0.5" />
+  </component>
   <component name="CreatePatchCommitExecutor">
     <option name="PATCH_PATH" value="" />
   </component>
@@ -82,25 +110,25 @@
       <file leaf-file-name="DolphinEmulator.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="24" column="31" selection-start="669" selection-end="669" vertical-scroll-proportion="0.0">
+            <state line="92" column="12" selection-start="2123" selection-end="2222" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="GameListView.java" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="GameListView.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="42" column="29" selection-start="1288" selection-end="1288" vertical-scroll-proportion="0.026929982">
+            <state line="118" column="34" selection-start="3985" selection-end="3985" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="GameListItem.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
+      <file leaf-file-name="prefvalues.xml" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="11" column="13" selection-start="0" selection-end="1837" vertical-scroll-proportion="0.0">
+            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -109,19 +137,22 @@
       <file leaf-file-name="FolderBrowser.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="28" column="0" selection-start="793" selection-end="3160" vertical-scroll-proportion="0.0">
+            <state line="58" column="30" selection-start="1963" selection-end="1963" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SettingBrowser.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingBrowser.java">
+      <file leaf-file-name="prefs.xml" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="9" column="22" selection-start="234" selection-end="234" vertical-scroll-proportion="0.0">
+            <state line="21" column="41" selection-start="857" selection-end="857" vertical-scroll-proportion="-3.6">
               <folding />
             </state>
           </provider>
+          <provider editor-type-id="android-designer">
+            <state />
+          </provider>
         </entry>
       </file>
     </leaf>
@@ -143,15 +174,26 @@
     <option name="changedFiles">
       <list>
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
-        <option value="$PROJECT_DIR$/AndroidManifest.xml" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuItem.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuItem.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingBrowser.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java" />
+        <option value="$PROJECT_DIR$/res/layout/fragment_edit_name.xml" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/EditNameDialog.java" />
+        <option value="$PROJECT_DIR$/res/values/array.xml" />
+        <option value="$PROJECT_DIR$/AndroidManifest.xml" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsFragment.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java" />
+        <option value="$PROJECT_DIR$/res/values/prefs.xml" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingBrowser.java" />
+        <option value="$PROJECT_DIR$/res/layout/prefs.xml" />
+        <option value="$PROJECT_DIR$/res/values/prefvalues.xml" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java" />
       </list>
     </option>
   </component>
+  <component name="MavenProjectNavigator">
+    <treeState />
+  </component>
   <component name="ProjectFrameBounds">
     <option name="x" value="24" />
     <option name="width" value="1342" />
@@ -183,26 +225,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope">
-        <subPane subId="Project Files">
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -242,28 +264,167 @@
         </subPane>
       </pane>
       <pane id="PackagesPane" />
+      <pane id="Scope">
+        <subPane subId="Project Files">
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="src">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="org/dolphinemu/dolphinemu">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="res">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="values">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="res">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="layout">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="res">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="options.splitter.main.proportions" value="0.3" />
-    <property name="FullScreen" value="false" />
-    <property name="options.searchVisible" value="true" />
-    <property name="recentsLimit" value="5" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="978fa698" />
-    <property name="options.splitter.details.proportions" value="0.2" />
-    <property name="options.lastSelected" value="project.propVCSSupport.Mappings" />
+    <property name="dynamic.classpath" value="false" />
     <property name="MemberChooser.showClasses" value="true" />
+    <property name="options.searchVisible" value="true" />
+    <property name="options.lastSelected" value="project.propVCSSupport.Mappings" />
+    <property name="FullScreen" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="restartRequiresConfirmation" value="true" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="978fa698" />
+    <property name="GoToClass.includeLibraries" value="false" />
     <property name="GoToFile.includeJavaFiles" value="false" />
     <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="dynamic.classpath" value="false" />
+    <property name="MemberChooser.sorted" value="false" />
+    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+    <property name="options.splitter.main.proportions" value="0.3" />
+    <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="recentsLimit" value="5" />
+    <property name="restartRequiresConfirmation" value="true" />
   </component>
   <component name="RunManager" selected="Android Application.Dolphin Emulator">
+    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
+      <module name="" />
+      <option name="TESTING_TYPE" value="0" />
+      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
+      <option name="METHOD_NAME" value="" />
+      <option name="CLASS_NAME" value="" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
+      <option name="PREFERRED_AVD" value="" />
+      <option name="USE_COMMAND_LINE" value="true" />
+      <option name="COMMAND_LINE" value="" />
+      <option name="WIPE_USER_DATA" value="false" />
+      <option name="DISABLE_BOOT_ANIMATION" value="false" />
+      <option name="NETWORK_SPEED" value="full" />
+      <option name="NETWORK_LATENCY" value="none" />
+      <option name="CLEAR_LOGCAT" value="false" />
+      <method />
+    </configuration>
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <method />
+    </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
       <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -284,18 +445,12 @@
       <patterns />
       <method />
     </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
       <method />
     </configuration>
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
@@ -314,43 +469,18 @@
       <option name="CLEAR_LOGCAT" value="false" />
       <method />
     </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <module name="" />
+    <configuration default="true" type="Application" factoryName="Application">
       <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
       <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
       <module name="" />
-      <option name="TESTING_TYPE" value="0" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="USE_COMMAND_LINE" value="true" />
-      <option name="COMMAND_LINE" value="" />
-      <option name="WIPE_USER_DATA" value="false" />
-      <option name="DISABLE_BOOT_ANIMATION" value="false" />
-      <option name="NETWORK_SPEED" value="full" />
-      <option name="NETWORK_LATENCY" value="none" />
-      <option name="CLEAR_LOGCAT" value="false" />
+      <envs />
       <method />
     </configuration>
     <configuration default="false" name="Dolphin Emulator" type="AndroidRunConfigurationType" factoryName="Android Application">
@@ -420,11 +550,12 @@
       <workItem from="1368955681290" duration="2332000" />
       <workItem from="1368958063194" duration="125000" />
       <workItem from="1368958842851" duration="47000" />
+      <workItem from="1369030521257" duration="6092000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="17593000" />
+    <option name="totallyTimeSpent" value="26691000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -450,29 +581,30 @@
     <frame x="24" y="0" width="1342" height="744" extended-state="0" />
     <editor active="false" />
     <layout>
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32931036" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7470687" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19474497" sideWeight="0.680067" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6812081" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.319933" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7470687" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31879196" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2179289" sideWeight="0.6812081" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32931036" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16306028" sideWeight="0.6812081" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294753" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32931036" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3294753" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="VcsContentAnnotationSettings">
@@ -536,107 +668,85 @@
     <breakpoint-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingBrowser.java">
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="9" column="22" selection-start="234" selection-end="234" vertical-scroll-proportion="0.0">
+        <state line="30" column="64" selection-start="729" selection-end="729" vertical-scroll-proportion="-0.42105263">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/gen/org/dolphinemu/dolphinemu/R.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="19" selection-start="176" selection-end="176" vertical-scroll-proportion="0.0" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gen/org/dolphinemu/dolphinemu/Manifest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="19" selection-start="183" selection-end="183" vertical-scroll-proportion="0.0" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/gen/org/dolphinemu/dolphinemu/BuildConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="19" selection-start="135" selection-end="135" vertical-scroll-proportion="0.078809105" />
-      </provider>
-    </entry>
-    <entry file="jar://$APPLICATION_HOME_DIR$/sdk/platforms/android-17/android.jar!/android/content/ContentProvider.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="69" column="2" selection-start="4062" selection-end="4062" vertical-scroll-proportion="0.81182796" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="11" column="13" selection-start="0" selection-end="1323" vertical-scroll-proportion="0.10507881" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/res/layout/sidemenu.xml">
-      <provider selected="true" editor-type-id="android-designer">
-        <state />
-      </provider>
-      <provider editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="28" column="0" selection-start="793" selection-end="3160" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="11" column="13" selection-start="0" selection-end="1837" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="24" column="31" selection-start="669" selection-end="669" vertical-scroll-proportion="0.0">
+        <state line="11" column="13" selection-start="267" selection-end="267" vertical-scroll-proportion="0.082167834">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="21" column="48" selection-start="955" selection-end="955" vertical-scroll-proportion="0.82894737">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding>
             <element signature="e#659#677#0" expanded="true" />
             <element signature="e#767#785#0" expanded="true" />
             <element signature="e#1338#1356#0" expanded="true" />
             <element signature="e#1646#1664#0" expanded="true" />
-            <element signature="e#1955#1973#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuItem.java">
+    <entry file="file://$PROJECT_DIR$/res/layout/main.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="1" column="0" selection-start="35" selection-end="35" vertical-scroll-proportion="0.039473683">
+        <state line="2" column="0" selection-start="112" selection-end="190" vertical-scroll-proportion="-0.6">
+          <folding />
+        </state>
+      </provider>
+      <provider editor-type-id="android-designer">
+        <state />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="92" column="12" selection-start="2123" selection-end="2222" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuItem.java">
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="23" column="15" selection-start="454" selection-end="454" vertical-scroll-proportion="0.33157894" />
+        <state line="23" column="9" selection-start="698" selection-end="698" vertical-scroll-proportion="0.39473686">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java">
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="41" column="88" selection-start="1280" selection-end="1280" vertical-scroll-proportion="1.3421053" />
+        <state line="58" column="30" selection-start="1963" selection-end="1963" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingBrowser.java">
+    <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
+      <provider editor-type-id="android-designer">
+        <state />
+      </provider>
       <provider selected="true" editor-type-id="text-editor">
-        <state line="9" column="22" selection-start="234" selection-end="234" vertical-scroll-proportion="0.0">
+        <state line="21" column="41" selection-start="857" selection-end="857" vertical-scroll-proportion="-3.6">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="42" column="29" selection-start="1288" selection-end="1288" vertical-scroll-proportion="0.026929982">
+        <state line="118" column="34" selection-start="3985" selection-end="3985" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index 2eb749d1a2..2812e35815 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -37,11 +37,9 @@
             android:theme="@android:style/Theme"
             android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
         </activity>
-        <activity
-            android:name="org.dolphinemu.dolphinemu.SettingBrowser"
-            android:label="@string/app_name"
-            android:theme="@android:style/Theme"
-            android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
+            <activity
+            android:name=".PrefsActivity"
+            android:theme="@android:style/Theme.Black.NoTitleBar" >
         </activity>
     </application>
 
diff --git a/Source/Android/res/layout/prefs.xml b/Source/Android/res/layout/prefs.xml
new file mode 100644
index 0000000000..bceb581c36
--- /dev/null
+++ b/Source/Android/res/layout/prefs.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        >
+    <PreferenceCategory
+            android:summary="Settings"
+            android:title="CPU Settings" >
+        <ListPreference
+                android:entries="@array/cpuOptions"
+                android:entryValues="@array/cpuValues"
+                android:key="cpupref"
+                android:summary="Emulation core to use"
+                android:title="CPU Core" />
+        <CheckBoxPreference
+                android:key="dualcorepref"
+                android:summary="On/Off"
+                android:title="Dual Core" />
+    </PreferenceCategory>
+    <PreferenceCategory
+            android:summary="Settings"
+            android:title="Video Settings" >
+        <ListPreference
+                android:entries="@array/gpuOptions"
+                android:entryValues="@array/gpuValues"
+                android:key="gpupref"
+                android:summary="Video backend to use"
+                android:title="Video Backend" />
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/Source/Android/res/values/prefvalues.xml b/Source/Android/res/values/prefvalues.xml
new file mode 100644
index 0000000000..77354f76a4
--- /dev/null
+++ b/Source/Android/res/values/prefvalues.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="cpuOptions">
+        <item>Interpreter</item>
+        <item>ARM JIT Recompiler</item>
+    </string-array>
+
+    <string-array name="cpuValues">
+        <item>0</item>
+        <item>3</item>
+    </string-array>
+
+    <string-array name="gpuOptions">
+        <item>Software Renderer</item>
+        <item>OpenGL</item>
+    </string-array>
+
+    <string-array name="gpuValues">
+        <item>Software Renderer</item>
+        <item>OGL</item>
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
index 96b67c2130..760f0445ec 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
@@ -3,7 +3,9 @@ package org.dolphinemu.dolphinemu;
 import android.app.Activity;
 import android.app.ListActivity;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
@@ -24,6 +26,8 @@ public class GameListView extends ListActivity {
     private static GameListView me;
     public static native String GetConfig(String Key, String Value, String Default);
     public static native void SetConfig(String Key, String Value, String Default);
+
+    enum keyTypes {TYPE_STRING, TYPE_BOOL};
 	
 	private void Fill()
     {
@@ -88,19 +92,67 @@ public class GameListView extends ListActivity {
 	public void onActivityResult(int requestCode, int resultCode, Intent data)
 	{
 		super.onActivityResult(requestCode, resultCode, data);
-		
-		if (resultCode == Activity.RESULT_OK)
-		{
-			String FileName = data.getStringExtra("Select");
-			Toast.makeText(this, "Folder Selected: " + FileName, Toast.LENGTH_SHORT).show();
-			String Directories = GetConfig("General", "GCMPathes", "0");
-			int intDirectories = Integer.parseInt(Directories);
-			Directories = Integer.toString(intDirectories + 1);
-			SetConfig("General", "GCMPathes", Directories);
-			SetConfig("General", "GCMPaths" + Integer.toString(intDirectories), FileName);
-			
-			Fill();
-		}
+
+        switch (requestCode)
+        {
+            // Browse
+            case 1:
+                if (resultCode == Activity.RESULT_OK)
+                {
+                    String FileName = data.getStringExtra("Select");
+                    Toast.makeText(this, "Folder Selected: " + FileName, Toast.LENGTH_SHORT).show();
+                    String Directories = GetConfig("General", "GCMPathes", "0");
+                    int intDirectories = Integer.parseInt(Directories);
+                    Directories = Integer.toString(intDirectories + 1);
+                    SetConfig("General", "GCMPathes", Directories);
+                    SetConfig("General", "GCMPaths" + Integer.toString(intDirectories), FileName);
+
+                    Fill();
+                }
+            break;
+            // Settings
+            case 2:
+
+                String Keys[] = {
+                        "cpupref",
+                        "dualcorepref",
+                        "gpupref",
+                };
+                String ConfigKeys[] = {
+                        "Core-CPUCore",
+                        "Core-CPUThread",
+                        "Core-GFXBackend",
+                };
+
+                keyTypes KeysTypes[] = {
+                        keyTypes.TYPE_STRING,
+                        keyTypes.TYPE_BOOL,
+                        keyTypes.TYPE_STRING,
+                };
+                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+
+                // Set our preferences here
+                for (int a = 0; a < Keys.length; ++a)
+                {
+                    String ConfigValues[] = ConfigKeys[a].split("-");
+                    String Key = ConfigValues[0];
+                    String Value = ConfigValues[1];
+
+                    switch(KeysTypes[a])
+                    {
+                        case TYPE_STRING:
+                            String strPref = prefs.getString(Keys[a], "");
+                            SetConfig(Key, Value, strPref);
+                        break;
+                        case TYPE_BOOL:
+                            boolean boolPref = prefs.getBoolean(Keys[a], true);
+                            SetConfig(Key, Value, boolPref ? "True" : "False");
+                        break;
+                    }
+
+                }
+            break;
+        }
 	}
 	
 	@Override
@@ -138,8 +190,8 @@ public class GameListView extends ListActivity {
         		break;
                 case 1:
                     Toast.makeText(me, "Loading up settings", Toast.LENGTH_SHORT).show();
-                    Intent SettingIntent = new Intent(me, SettingBrowser.class);
-                    startActivityForResult(SettingIntent, 1);
+                    Intent SettingIntent = new Intent(me, PrefsActivity.class);
+                    startActivityForResult(SettingIntent, 2);
                 break;
         		default:
         		break;
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java
new file mode 100644
index 0000000000..e12e37c10a
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java
@@ -0,0 +1,40 @@
+package org.dolphinemu.dolphinemu;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceFragment;
+
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2
+ * Refer to the license.txt file included.
+ */
+public class PrefsActivity extends PreferenceActivity {
+
+    public class PrefsFragment extends PreferenceFragment {
+
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+
+            // Load the preferences from an XML resource
+            addPreferencesFromResource(R.layout.prefs);
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getFragmentManager().beginTransaction().replace(android.R.id.content,
+                new PrefsFragment()).commit();
+    }
+    @Override
+    public void onBackPressed() {
+        Intent intent = new Intent();
+        setResult(Activity.RESULT_OK, intent);
+        this.finish();
+        super.onBackPressed();
+    }
+}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/SettingBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/SettingBrowser.java
deleted file mode 100644
index 123bb174ed..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/SettingBrowser.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.dolphinemu.dolphinemu;
-
-import android.app.ListActivity;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ListView;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- *  Copyright 2013 Dolphin Emulator Project
- *  Licensed under GPLv2
- *  Refer to the license.txt file included.
- */
-
-public class SettingBrowser extends ListActivity {
-    private SettingMenuAdapter adapter;
-    private void Fill()
-    {
-        this.setTitle("Settings");
-        List<SettingMenuItem> dir = new ArrayList<SettingMenuItem>();
-
-        dir.add(new SettingMenuItem("Setting 1", "SubTitle 1", 0));
-        Collections.sort(dir);
-
-        adapter = new SettingMenuAdapter(this,R.layout.folderbrowser,dir);
-        this.setListAdapter(adapter);
-    }
-
-    @Override
-    protected void onListItemClick(ListView l, View v, int position, long id) {
-        super.onListItemClick(l, v, position, id);
-        SettingMenuItem o = adapter.getItem(position);
-        switch (o.getID())
-        {
-            default:
-                // Do nothing yet
-            break;
-        }
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-
-        Fill();
-    }
-    @Override
-    public void onBackPressed() {
-        this.finish();
-        super.onBackPressed();
-    }
-}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java
deleted file mode 100644
index 8fb0b237f6..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.dolphinemu.dolphinemu;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.TextView;
-
-import java.util.List;
-
-/**
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-
-public class SettingMenuAdapter extends ArrayAdapter<SettingMenuItem>{
-
-    private Context c;
-    private int id;
-    private List<SettingMenuItem>items;
-
-    public SettingMenuAdapter(Context context, int textViewResourceId,
-                           List<SettingMenuItem> objects) {
-        super(context, textViewResourceId, objects);
-        c = context;
-        id = textViewResourceId;
-        items = objects;
-    }
-    public SettingMenuItem getItem(int i)
-    {
-        return items.get(i);
-    }
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        View v = convertView;
-        if (v == null) {
-            LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            v = vi.inflate(id, null);
-            if (v == null)
-                return null; // This should never be hit, but have it to clear a warning
-        }
-        final SettingMenuItem o = items.get(position);
-        if (o != null) {
-            TextView t1 = (TextView) v.findViewById(R.id.TextView01);
-            TextView t2 = (TextView) v.findViewById(R.id.TextView02);
-
-            if (t1 != null)
-                t1.setText(o.getName());
-            if (t2 != null)
-                t2.setText(o.getSubtitle());
-        }
-        return v;
-    }
-
-
-
-}
-
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuItem.java
deleted file mode 100644
index fcb0da942c..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/SettingMenuItem.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.dolphinemu.dolphinemu;
-
-public class SettingMenuItem implements Comparable<SettingMenuItem>{
-    private String name;
-    private String subtitle;
-    private int m_id;
-
-    public SettingMenuItem(String n,String d, int id)
-    {
-        name = n;
-        subtitle = d;
-        m_id = id;
-    }
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public String getSubtitle()
-    {
-        return subtitle;
-    }
-    public int getID()
-    {
-        return m_id;
-    }
-
-    public int compareTo(SettingMenuItem o)
-    {
-        if(this.name != null)
-            return this.name.toLowerCase().compareTo(o.getName().toLowerCase());
-        else
-            throw new IllegalArgumentException();
-    }
-}
-

From e2b0632334622ed9eacd5955ce90e150ccf59c30 Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Tue, 21 May 2013 21:42:19 +1200
Subject: [PATCH 104/352] Added a method for detecting Wiimote extension. This
 is run before a Wiimote will be considered.

---
 Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 327 +++++++++++++-----
 .../Core/Src/HW/WiimoteReal/WiimoteReal.h     |   3 +-
 2 files changed, 250 insertions(+), 80 deletions(-)

diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
index 4eded21d2d..84cbe93bfa 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
@@ -138,6 +138,10 @@ inline void init_lib()
 
 namespace WiimoteReal
 {
+	
+	
+int _IOWrite(HANDLE &dev_handle, OVERLAPPED &hid_overlap_write, enum win_bt_stack_t &stack, const u8* buf, int len);
+int _IORead(HANDLE &dev_handle, OVERLAPPED &hid_overlap_read, u8* buf, int index);
 
 template <typename T>
 void ProcessWiimotes(bool new_scan, T& callback);
@@ -212,33 +216,23 @@ void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimot
 
 		// Query the data for this device
 		if (SetupDiGetDeviceInterfaceDetail(device_info, &device_data, detail_data, len, NULL, NULL))
-		{
+		{			
 			auto const wm = new Wiimote;
 			wm->devicepath = detail_data->DevicePath;
-			
-			TCHAR name[128] = {};
-			HANDLE dev_handle = CreateFile(wm->devicepath.c_str(), 
-								  GENERIC_READ, 
-								  FILE_SHARE_READ, 
-								  NULL, 
-								  OPEN_EXISTING, 
-								  FILE_FLAG_OVERLAPPED, 
-								  NULL);
-			
-			if (dev_handle != INVALID_HANDLE_VALUE && 
-				HidD_GetProductString(dev_handle, name, 128) && 
-				IsBalanceBoardName(TStrToUTF8(name)))
+			bool real_wiimote = false, is_bb = false;
+
+			CheckDeviceType(wm->devicepath, real_wiimote, is_bb);
+			if (is_bb)
 			{
 				found_board = wm;
 			}
-			else
+			else if (real_wiimote)
 			{
 				found_wiimotes.push_back(wm);
 			}
-			
-			if (dev_handle != INVALID_HANDLE_VALUE)
+			else
 			{
-				CloseHandle(dev_handle);
+				free(wm);
 			}
 		}
 
@@ -252,6 +246,169 @@ void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimot
 	//	SLEEP(2000);
 
 }
+int CheckDeviceType_Write(HANDLE &dev_handle, const u8* buf, int size, int attempts)
+{
+	OVERLAPPED hid_overlap_write = OVERLAPPED();
+	hid_overlap_write.hEvent = CreateEvent(NULL, true, false, NULL);
+	enum win_bt_stack_t stack = MSBT_STACK_UNKNOWN;
+
+	DWORD written = 0;
+	
+	for (; attempts>0; --attempts)
+	{
+		if (_IOWrite(dev_handle, hid_overlap_write, stack, buf, size))
+		{
+			auto const wait_result = WaitForSingleObject(hid_overlap_write.hEvent, WIIMOTE_DEFAULT_TIMEOUT);
+			if (WAIT_TIMEOUT == wait_result)
+			{
+				WARN_LOG(WIIMOTE, "CheckDeviceType_Write: A timeout occurred on writing to Wiimote.");
+				CancelIo(dev_handle);
+				continue;
+			}
+			else if (WAIT_FAILED == wait_result)
+			{
+				WARN_LOG(WIIMOTE, "CheckDeviceType_Write: A wait error occurred on writing to Wiimote.");
+				CancelIo(dev_handle);
+				continue;
+			}
+			if (GetOverlappedResult(dev_handle, &hid_overlap_write, &written, TRUE))
+			{
+				break;
+			}
+		}
+	}
+	
+	CloseHandle(hid_overlap_write.hEvent);
+
+	return written;
+}
+
+int CheckDeviceType_Read(HANDLE &dev_handle, u8* buf, int attempts)
+{
+	OVERLAPPED hid_overlap_read = OVERLAPPED();
+	hid_overlap_read.hEvent = CreateEvent(NULL, true, false, NULL);
+	int read = 0;
+	for (; attempts>0; --attempts)
+	{
+		read = _IORead(dev_handle, hid_overlap_read, buf, 1);
+		if (read > 0)
+			break;
+	}
+	
+	CloseHandle(hid_overlap_read.hEvent);
+
+	return read;
+}
+
+// A convoluted way of checking if a device is a Wii Balance Board and if it is a connectable Wiimote.
+// Because nothing on Windows should be easy.
+// (We can't seem to easily identify the bluetooth device an HID device belongs to...)
+void WiimoteScanner::CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool &real_wiimote, bool &is_bb)
+{
+	real_wiimote = false;
+	is_bb = false;
+	
+#ifdef SHARE_WRITE_WIIMOTES
+	std::lock_guard<std::mutex> lk(g_connected_wiimotes_lock);
+	if (g_connected_wiimotes.count(devicepath) != 0)
+		return;
+#endif
+	
+	HANDLE dev_handle = CreateFile(devicepath.c_str(),
+								GENERIC_READ | GENERIC_WRITE, 
+								FILE_SHARE_READ | FILE_SHARE_WRITE,
+								NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 
+								NULL);
+	if (dev_handle == INVALID_HANDLE_VALUE)
+		return;
+	// enable to only check for official nintendo wiimotes/bb's
+	bool check_vidpid = false;
+	HIDD_ATTRIBUTES attrib;
+	attrib.Size = sizeof(attrib);
+	if (!check_vidpid || 
+		(HidD_GetAttributes(dev_handle, &attrib) &&
+		(attrib.VendorID == 0x057e) &&
+		(attrib.ProductID == 0x0306)))
+	{
+		int rc = 0;
+		// max_cycles insures we are never stuck here due to bad coding...
+		int max_cycles = 20;
+		u8 buf[MAX_PAYLOAD] = {0};
+
+		u8 const req_status_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_REQUEST_STATUS, 0};
+
+		rc = CheckDeviceType_Write(dev_handle, 
+									req_status_report, 
+									sizeof(req_status_report), 
+									1);
+		while (rc > 0 && --max_cycles > 0)
+		{
+			if ((rc = CheckDeviceType_Read(dev_handle, buf, 1)) <= 0)
+				break;
+			
+			switch (buf[1])
+			{
+				case WM_STATUS_REPORT:
+				{
+					real_wiimote = true;
+					wm_status_report * wsr = (wm_status_report*)&buf[2];
+					if (wsr->extension)
+					{
+						// Wiimote with extension, we ask it what kind.
+						u8 read_ext[MAX_PAYLOAD] = {0};
+						read_ext[0] = WM_SET_REPORT | WM_BT_OUTPUT;
+						read_ext[1] = WM_READ_DATA;
+						// Extension type register.
+						*(u32*)&read_ext[2] = Common::swap32(0x4a400fa);
+						// Size.
+						*(u16*)&read_ext[6] = Common::swap16(6);
+						rc = CheckDeviceType_Write(dev_handle, read_ext, 8, 1);
+					}
+					else
+					{
+						// Normal Wiimote, exit while and be happy.
+						rc = -1;
+					}
+					break;
+				}
+				case WM_ACK_DATA:
+				{
+					real_wiimote = true;
+					break;
+				}
+				case WM_READ_DATA_REPLY:
+				{
+					wm_read_data_reply * wrdr 
+						= (wm_read_data_reply*)&buf[2];
+					// Check if it has returned what we asked.
+					if (Common::swap16(wrdr->address) == 0x00fa)
+					{
+						// 0x020420A40000ULL means balance board.
+						u64 ext_type = (*(u64*)&wrdr->data[0]);
+						is_bb = ext_type == 0x020420A40000ULL;
+					}
+					else
+					{
+						ERROR_LOG(WIIMOTE, 
+								  "CheckDeviceType: GOT UNREQUESTED ADDRESS %X", 
+								  Common::swap16(wrdr->address));
+					}
+					// force end
+					rc = -1;
+
+					break;
+				}
+				default:
+				{
+					// We let read try again incase there is another packet waiting.
+					// ERROR_LOG(WIIMOTE, "CheckDeviceType: GOT UNKNOWN REPLY: %X", buf[1]);
+					break;
+				}
+			}
+		}
+	}
+	CloseHandle(dev_handle);
+}
 
 bool WiimoteScanner::IsReady() const
 {
@@ -376,7 +533,7 @@ bool Wiimote::IsConnected() const
 // positive = read packet
 // negative = didn't read packet
 // zero = error
-int Wiimote::IORead(u8* buf)
+int _IORead(HANDLE &dev_handle, OVERLAPPED &hid_overlap_read, u8* buf, int index)
 {
 	// Add data report indicator byte (here, 0xa1)
 	buf[0] = 0xa1;
@@ -429,78 +586,92 @@ int Wiimote::IORead(u8* buf)
 	return bytes + 1;
 }
 
-int Wiimote::IOWrite(const u8* buf, int len)
+// positive = read packet
+// negative = didn't read packet
+// zero = error
+int Wiimote::IORead(u8* buf)
+{
+	return _IORead(dev_handle, hid_overlap_read, buf, index);
+}
+
+
+int _IOWrite(HANDLE &dev_handle, OVERLAPPED &hid_overlap_write, enum win_bt_stack_t &stack, const u8* buf, int len)
 {
 	switch (stack)
 	{
-	case MSBT_STACK_UNKNOWN:
-	{
-		// Try to auto-detect the stack type
-		stack = MSBT_STACK_BLUESOLEIL;
-		if (IOWrite(buf, len))
-			return 1;
-
-		stack = MSBT_STACK_MS;
-		if (IOWrite(buf, len))
-			return 1;
-
-		stack = MSBT_STACK_UNKNOWN;
-		break;
-	}
-	case MSBT_STACK_MS:
-	{
-		auto result = HidD_SetOutputReport(dev_handle, const_cast<u8*>(buf) + 1, len - 1);
-		//FlushFileBuffers(dev_handle);
-
-		if (!result)
+		case MSBT_STACK_UNKNOWN:
 		{
-			auto err = GetLastError();
-			if (err == 121)
+			// Try to auto-detect the stack type
+			stack = MSBT_STACK_BLUESOLEIL;
+			if (_IOWrite(dev_handle, hid_overlap_write, stack, buf, len))
+				return 1;
+			
+			stack = MSBT_STACK_MS;
+			if (_IOWrite(dev_handle, hid_overlap_write, stack, buf, len))
+				return 1;
+			
+			stack = MSBT_STACK_UNKNOWN;
+			break;
+		}
+		case MSBT_STACK_MS:
+		{
+			auto result = HidD_SetOutputReport(dev_handle, const_cast<u8*>(buf) + 1, len - 1);
+			//FlushFileBuffers(dev_handle);
+			
+			if (!result)
 			{
-				// Semaphore timeout
-				NOTICE_LOG(WIIMOTE, "WiimoteIOWrite[MSBT_STACK_MS]:  Unable to send data to the Wiimote");
+				auto err = GetLastError();
+				if (err == 121)
+				{
+					// Semaphore timeout
+					NOTICE_LOG(WIIMOTE, "WiimoteIOWrite[MSBT_STACK_MS]:  Unable to send data to the Wiimote");
+				}
+				else
+				{
+					WARN_LOG(WIIMOTE, "IOWrite[MSBT_STACK_MS]: ERROR: %08x", err);
+				}
+			}
+			
+			return result;
+			break;
+		}
+		case MSBT_STACK_BLUESOLEIL:
+		{
+			u8 big_buf[MAX_PAYLOAD];
+			if (len < MAX_PAYLOAD)
+			{
+				std::copy(buf, buf + len, big_buf);
+				std::fill(big_buf + len, big_buf + MAX_PAYLOAD, 0);
+				buf = big_buf;
+			}
+			
+			ResetEvent(hid_overlap_write.hEvent);
+			DWORD bytes = 0;
+			if (WriteFile(dev_handle, buf + 1, MAX_PAYLOAD - 1, &bytes, &hid_overlap_write))
+			{
+				// WriteFile always returns true with bluesoleil.
+				return 1;
 			}
 			else
 			{
-				WARN_LOG(WIIMOTE, "IOWrite[MSBT_STACK_MS]: ERROR: %08x", err);
+				auto const err = GetLastError();
+				if (ERROR_IO_PENDING == err)
+				{
+					CancelIo(dev_handle);
+				}
 			}
+			break;
 		}
-
-		return result;
-		break;
 	}
-	case MSBT_STACK_BLUESOLEIL:
-	{
-		u8 big_buf[MAX_PAYLOAD];
-		if (len < MAX_PAYLOAD)
-		{
-			std::copy(buf, buf + len, big_buf);
-			std::fill(big_buf + len, big_buf + MAX_PAYLOAD, 0);
-			buf = big_buf;
-		}
-
-		ResetEvent(hid_overlap_write.hEvent);
-		DWORD bytes = 0;
-		if (WriteFile(dev_handle, buf + 1, MAX_PAYLOAD - 1, &bytes, &hid_overlap_write))
-		{
-			// WriteFile always returns true with bluesoleil.
-			return 1;
-		}
-		else
-		{
-			auto const err = GetLastError();
-			if (ERROR_IO_PENDING == err)
-			{
-				CancelIo(dev_handle);
-			}
-		}
-		break;
-	}
-	}
-
+	
 	return 0;
 }
 
+int Wiimote::IOWrite(const u8* buf, int len)
+{
+	return _IOWrite(dev_handle, hid_overlap_write, stack, buf, len);
+}
+
 // invokes callback for each found wiimote bluetooth device
 template <typename T>
 void ProcessWiimotes(bool new_scan, T& callback)
@@ -519,7 +690,7 @@ void ProcessWiimotes(bool new_scan, T& callback)
 
 	BLUETOOTH_FIND_RADIO_PARAMS radioParam;
 	radioParam.dwSize = sizeof(radioParam);
-
+	
 	HANDLE hRadio;
 	
 	// TODO: save radio(s) in the WiimoteScanner constructor?
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h
index 695dc86b82..d195f92120 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h
@@ -137,8 +137,7 @@ private:
 	volatile bool m_want_bb;
 
 #if defined(_WIN32)
-	
-
+	void CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool &real_wiimote, bool &is_bb);
 #elif defined(__linux__) && HAVE_BLUEZ
 	int device_id;
 	int device_sock;

From f178015461a558bfde468611e203757098af1740 Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Tue, 21 May 2013 22:54:01 +1200
Subject: [PATCH 105/352] Better checking for extension.

---
 Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
index 84cbe93bfa..5e4f32caab 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
@@ -344,13 +344,16 @@ void WiimoteScanner::CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool
 		while (rc > 0 && --max_cycles > 0)
 		{
 			if ((rc = CheckDeviceType_Read(dev_handle, buf, 1)) <= 0)
+			{
+				// DEBUG_LOG(WIIMOTE, "CheckDeviceType: Read failed...");
 				break;
+			}
 			
 			switch (buf[1])
 			{
 				case WM_STATUS_REPORT:
 				{
-					real_wiimote = true;
+					// DEBUG_LOG(WIIMOTE, "CheckDeviceType: Got Status Report");
 					wm_status_report * wsr = (wm_status_report*)&buf[2];
 					if (wsr->extension)
 					{
@@ -366,6 +369,7 @@ void WiimoteScanner::CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool
 					}
 					else
 					{
+						real_wiimote = true;
 						// Normal Wiimote, exit while and be happy.
 						rc = -1;
 					}
@@ -373,18 +377,23 @@ void WiimoteScanner::CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool
 				}
 				case WM_ACK_DATA:
 				{
-					real_wiimote = true;
+					// DEBUG_LOG(WIIMOTE, "CheckDeviceType: Got Ack");
 					break;
 				}
 				case WM_READ_DATA_REPLY:
 				{
+					// DEBUG_LOG(WIIMOTE, "CheckDeviceType: Got Data Reply");
 					wm_read_data_reply * wrdr 
 						= (wm_read_data_reply*)&buf[2];
 					// Check if it has returned what we asked.
 					if (Common::swap16(wrdr->address) == 0x00fa)
 					{
+						real_wiimote = true;
 						// 0x020420A40000ULL means balance board.
 						u64 ext_type = (*(u64*)&wrdr->data[0]);
+						// DEBUG_LOG(WIIMOTE, 
+						//		  "CheckDeviceType: GOT EXT TYPE %llX", 
+						//		  ext_type);
 						is_bb = ext_type == 0x020420A40000ULL;
 					}
 					else
@@ -401,7 +410,7 @@ void WiimoteScanner::CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool
 				default:
 				{
 					// We let read try again incase there is another packet waiting.
-					// ERROR_LOG(WIIMOTE, "CheckDeviceType: GOT UNKNOWN REPLY: %X", buf[1]);
+					// DEBUG_LOG(WIIMOTE, "CheckDeviceType: GOT UNKNOWN REPLY: %X", buf[1]);
 					break;
 				}
 			}

From d642abce46fa3a999f762b329ae0154891c7170a Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Tue, 21 May 2013 23:31:41 +1200
Subject: [PATCH 106/352] Only show 4 config dialogs in wiimote config.

---
 Source/Core/DolphinWX/Src/InputConfigDiag.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
index cd17c4c682..ef4ae8d29b 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
@@ -5,6 +5,7 @@
 #include "InputConfigDiag.h"
 #include "UDPConfigDiag.h"
 #include "WxUtils.h"
+#include "HW/Wiimote.h"
 
 void GamepadPage::ConfigUDPWii(wxCommandEvent &event)
 {
@@ -947,7 +948,7 @@ InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputPlugin& plugin
 	, m_plugin(plugin)
 {
 	m_pad_notebook = new wxNotebook(this, -1, wxDefaultPosition, wxDefaultSize, wxNB_DEFAULT);
-	for (unsigned int i = 0; i < plugin.controllers.size(); ++i)
+	for (unsigned int i = 0; i < std::min(plugin.controllers.size(), (size_t)MAX_WIIMOTES); ++i)
 	{
 		GamepadPage* gp = new GamepadPage(m_pad_notebook, m_plugin, i, this);
 		m_padpages.push_back(gp);

From 10d1d194092a019aa755c84ae4648bae76ceab37 Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Tue, 21 May 2013 19:20:22 -0400
Subject: [PATCH 107/352] Set graphics settings while playing a movie in
 UpdateActiveConfig(), so settings can't be changed for a frame.

---
 Source/Core/Core/Src/Movie.cpp              | 5 -----
 Source/Core/VideoCommon/Src/VideoConfig.cpp | 3 +++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp
index 75951df67d..2f165d1d44 100644
--- a/Source/Core/Core/Src/Movie.cpp
+++ b/Source/Core/Core/Src/Movie.cpp
@@ -126,11 +126,6 @@ void FrameUpdate()
 		g_totalFrames = g_currentFrame;
 		g_totalLagCount = g_currentLagCount;
 	}
-	if (IsPlayingInput() && IsConfigSaved())
-	{
-		SetGraphicsConfig();
-	}
-
 	if (g_bFrameStep)
 	{
 		Core::SetState(Core::CORE_PAUSE);
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp
index 6e1bc31e55..7827c0008a 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.cpp
+++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp
@@ -10,12 +10,15 @@
 #include "VideoCommon.h"
 #include "FileUtil.h"
 #include "Core.h"
+#include "Movie.h"
 
 VideoConfig g_Config;
 VideoConfig g_ActiveConfig;
 
 void UpdateActiveConfig()
 {
+	if (Movie::IsPlayingInput() && Movie::IsConfigSaved())
+		Movie::SetGraphicsConfig();
 	g_ActiveConfig = g_Config;
 }
 

From 5e801fd6ef194e99eb72dfa01c5bba686b52865e Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Wed, 22 May 2013 01:09:13 +0200
Subject: [PATCH 108/352] Adding DSP state values to state

because that allow the DSP state to be loaded
---
 Source/Core/Core/Src/DSP/DSPCore.cpp        |  1 +
 Source/Core/Core/Src/DSP/DSPHWInterface.cpp |  9 ++-------
 Source/Core/Core/Src/DSP/DSPHost.h          |  2 +-
 Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp  | 17 +++++++++++------
 Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp   |  5 ++++-
 Source/Core/Core/Src/State.cpp              |  2 +-
 6 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/Source/Core/Core/Src/DSP/DSPCore.cpp b/Source/Core/Core/Src/DSP/DSPCore.cpp
index 59e5063af6..64206b3ee0 100644
--- a/Source/Core/Core/Src/DSP/DSPCore.cpp
+++ b/Source/Core/Core/Src/DSP/DSPCore.cpp
@@ -137,6 +137,7 @@ bool DSPCore_Init(const char *irom_filename, const char *coef_filename,
 {
 	g_dsp.step_counter = 0;
 	cyclesLeft = 0;
+	init_hax = false;
 	dspjit = NULL;
 	
 	g_dsp.irom = (u16*)AllocateMemoryPages(DSP_IROM_BYTE_SIZE);
diff --git a/Source/Core/Core/Src/DSP/DSPHWInterface.cpp b/Source/Core/Core/Src/DSP/DSPHWInterface.cpp
index 371bec572c..56e998d3c0 100644
--- a/Source/Core/Core/Src/DSP/DSPHWInterface.cpp
+++ b/Source/Core/Core/Src/DSP/DSPHWInterface.cpp
@@ -246,14 +246,9 @@ static void gdsp_idma_in(u16 dsp_addr, u32 addr, u32 size)
 	}
 	WriteProtectMemory(g_dsp.iram, DSP_IRAM_BYTE_SIZE, false);
 
-	g_dsp.iram_crc = DSPHost_CodeLoaded(g_dsp.cpu_ram + (addr & 0x0fffffff), size);
-	
-	NOTICE_LOG(DSPLLE, "*** Copy new UCode from 0x%08x to 0x%04x (crc: %8x)", addr, dsp_addr, g_dsp.iram_crc);
+	DSPHost_CodeLoaded((const u8*)g_dsp.iram + dsp_addr, size);
 
-	if (dspjit)
-		dspjit->ClearIRAM();
-	
-	DSPAnalyzer::Analyze();
+	NOTICE_LOG(DSPLLE, "*** Copy new UCode from 0x%08x to 0x%04x (crc: %8x)", addr, dsp_addr, g_dsp.iram_crc);
 }
 
 static void gdsp_idma_out(u16 dsp_addr, u32 addr, u32 size)
diff --git a/Source/Core/Core/Src/DSP/DSPHost.h b/Source/Core/Core/Src/DSP/DSPHost.h
index 86033b0724..cef329a7ec 100644
--- a/Source/Core/Core/Src/DSP/DSPHost.h
+++ b/Source/Core/Core/Src/DSP/DSPHost.h
@@ -15,7 +15,7 @@ void DSPHost_WriteHostMemory(u8 value, u32 addr);
 bool DSPHost_OnThread();
 bool DSPHost_Wii();
 void DSPHost_InterruptRequest();
-u32 DSPHost_CodeLoaded(const u8 *ptr, int size);
+void DSPHost_CodeLoaded(const u8 *ptr, int size);
 void DSPHost_UpdateDebugger();
 
 #endif
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp
index 9349820450..26e7110d6e 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp
+++ b/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp
@@ -4,6 +4,8 @@
 
 #include "Common.h"
 #include "Hash.h"
+#include "DSP/DSPAnalyzer.h"
+#include "DSP/DSPCore.h"
 #include "DSP/DSPHost.h"
 #include "DSPSymbols.h"
 #include "DSPLLETools.h"
@@ -45,23 +47,23 @@ void DSPHost_InterruptRequest()
 	DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
 }
 
-u32 DSPHost_CodeLoaded(const u8 *ptr, int size)
+void DSPHost_CodeLoaded(const u8 *ptr, int size)
 {
-	u32 ector_crc = HashEctor(ptr, size);
+	g_dsp.iram_crc = HashEctor(ptr, size);
 
 #if defined(_DEBUG) || defined(DEBUGFAST)
-	DumpDSPCode(ptr, size, ector_crc);
+	DumpDSPCode(ptr, size, g_dsp.iram_crc);
 #endif
 
 	DSPSymbols::Clear();
 
 	// Auto load text file - if none just disassemble.
 	
-	NOTICE_LOG(DSPLLE, "ector_crc: %08x", ector_crc);
+	NOTICE_LOG(DSPLLE, "g_dsp.iram_crc: %08x", g_dsp.iram_crc);
 
 	DSPSymbols::Clear();
 	bool success = false;
-	switch (ector_crc)
+	switch (g_dsp.iram_crc)
 	{
 		case 0x86840740: success = DSPSymbols::ReadAnnotatedAssembly("../../docs/DSP/DSP_UC_Zelda.txt"); break;
 		case 0x42f64ac4: success = DSPSymbols::ReadAnnotatedAssembly("../../docs/DSP/DSP_UC_Luigi.txt"); break;
@@ -86,7 +88,10 @@ u32 DSPHost_CodeLoaded(const u8 *ptr, int size)
 
 	DSPHost_UpdateDebugger();
 
-	return ector_crc;
+	if (dspjit)
+		dspjit->ClearIRAM();
+
+	DSPAnalyzer::Analyze();
 }
 
 void DSPHost_UpdateDebugger()
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp
index df43441c03..d16af5f601 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp
+++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp
@@ -16,6 +16,7 @@
 #include "Core.h"
 
 #include "DSPLLEGlobals.h" // Local
+#include "DSP/DSPHost.h"
 #include "DSP/DSPInterpreter.h"
 #include "DSP/DSPHWInterface.h"
 #include "DSP/disassemble.h"
@@ -67,7 +68,6 @@ void DSPLLE::DoState(PointerWrap &p)
 		p.Do(g_dsp.reg_stack[i]);
 	}
 
-	p.Do(g_dsp.iram_crc);
 	p.Do(g_dsp.step_counter);
 	p.Do(g_dsp.ifx_regs);
 	p.Do(g_dsp.mbox[0]);
@@ -75,8 +75,11 @@ void DSPLLE::DoState(PointerWrap &p)
 	UnWriteProtectMemory(g_dsp.iram, DSP_IRAM_BYTE_SIZE, false);
 	p.DoArray(g_dsp.iram, DSP_IRAM_SIZE);
 	WriteProtectMemory(g_dsp.iram, DSP_IRAM_BYTE_SIZE, false);
+	if (p.GetMode() == PointerWrap::MODE_READ)
+		DSPHost_CodeLoaded((const u8*)g_dsp.iram, DSP_IRAM_BYTE_SIZE);
 	p.DoArray(g_dsp.dram, DSP_DRAM_SIZE);
 	p.Do(cyclesLeft);
+	p.Do(init_hax);
 	p.Do(m_cycle_count);
 
 	bool prevInitMixer = m_InitMixer;
diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp
index 40a48b4841..5923ba6917 100644
--- a/Source/Core/Core/Src/State.cpp
+++ b/Source/Core/Core/Src/State.cpp
@@ -59,7 +59,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
 static std::thread g_save_thread;
 
 // Don't forget to increase this after doing changes on the savestate system
-static const u32 STATE_VERSION = 17;
+static const u32 STATE_VERSION = 18;
 
 enum
 {

From 2412b2287a66ae1a84ab71edc396be1563ac49fc Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Tue, 21 May 2013 20:30:09 -0400
Subject: [PATCH 109/352] Buildfix for dsptool.

---
 Source/DSPTool/Src/DSPTool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/DSPTool/Src/DSPTool.cpp b/Source/DSPTool/Src/DSPTool.cpp
index ba0ce665ca..78335d3026 100644
--- a/Source/DSPTool/Src/DSPTool.cpp
+++ b/Source/DSPTool/Src/DSPTool.cpp
@@ -13,7 +13,7 @@ u8 DSPHost_ReadHostMemory(u32 addr) { return 0; }
 void DSPHost_WriteHostMemory(u8 value, u32 addr) {}
 bool DSPHost_OnThread() { return false; }
 bool DSPHost_Wii() { return false; }
-u32 DSPHost_CodeLoaded(const u8 *ptr, int size) {return 0x1337c0de;}
+void DSPHost_CodeLoaded(const u8 *ptr, int size) {}
 void DSPHost_InterruptRequest() {}
 void DSPHost_UpdateDebugger() {}
 

From 9ab63aba886ff9b02c4b3680a7fdd77e100c8633 Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Wed, 22 May 2013 02:40:00 +0200
Subject: [PATCH 110/352] Adding unit test project to VS solution

because that inform about compile errors because of changes in function identity

DSP unit test build fix
---
 Source/Dolphin_2010.sln                    | 819 +++++++++++----------
 Source/UnitTests/AudioJitTests.cpp         |   2 +-
 Source/UnitTests/UnitTests.vcproj          | 358 ---------
 Source/UnitTests/UnitTests.vcxproj         | 217 ++++++
 Source/UnitTests/UnitTests.vcxproj.filters |  22 +
 5 files changed, 656 insertions(+), 762 deletions(-)
 delete mode 100644 Source/UnitTests/UnitTests.vcproj
 create mode 100644 Source/UnitTests/UnitTests.vcxproj
 create mode 100644 Source/UnitTests/UnitTests.vcxproj.filters

diff --git a/Source/Dolphin_2010.sln b/Source/Dolphin_2010.sln
index a65ba2e894..6e304983dc 100644
--- a/Source/Dolphin_2010.sln
+++ b/Source/Dolphin_2010.sln
@@ -1,403 +1,416 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\Dolphin.vcxproj", "{1B099EF8-6F87-47A2-A3E7-898A24584F49}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D} = {8C60E805-0DA5-4E25-8F84-038DB504BB0D}
-		{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
-		{9E9DA440-E9AD-413C-B648-91030E792211} = {9E9DA440-E9AD-413C-B648-91030E792211}
-		{93D73454-2512-424E-9CDA-4BB357FE13DD} = {93D73454-2512-424E-9CDA-4BB357FE13DD}
-		{B6398059-EBB6-4C34-B547-95F365B71FF4} = {B6398059-EBB6-4C34-B547-95F365B71FF4}
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050} = {AA862E5E-A993-497A-B6A0-0E8E94B10050}
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F} = {B39AC394-5DB5-4DA9-9D98-09D46CA3701F}
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Core\Common\Common.vcxproj", "{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}"
-	ProjectSection(ProjectDependencies) = postProject
-		{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AudioCommon", "Core\AudioCommon\AudioCommon.vcxproj", "{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SOIL", "..\Externals\SOIL\SOIL.vcxproj", "{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SFML_Network", "..\Externals\SFML\build\vc2010\SFML_Network.vcxproj", "{93D73454-2512-424E-9CDA-4BB357FE13DD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LZO", "..\Externals\LZO\LZO.vcxproj", "{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\Externals\zlib\zlib.vcxproj", "{3E1339F5-9311-4122-9442-369702E8FCAD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoCommon", "Core\VideoCommon\VideoCommon.vcxproj", "{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050} = {AA862E5E-A993-497A-B6A0-0E8E94B10050}
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181} = {8544F1FF-F2A5-42D8-A568-C56B5D3B4181}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CLRun", "..\Externals\CLRun\clrun\CLRun.vcxproj", "{AA862E5E-A993-497A-B6A0-0E8E94B10050}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcxproj", "{8C60E805-0DA5-4E25-8F84-038DB504BB0D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6} = {CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}
-		{93D73454-2512-424E-9CDA-4BB357FE13DD} = {93D73454-2512-424E-9CDA-4BB357FE13DD}
-		{B6398059-EBB6-4C34-B547-95F365B71FF4} = {B6398059-EBB6-4C34-B547-95F365B71FF4}
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F} = {B39AC394-5DB5-4DA9-9D98-09D46CA3701F}
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20} = {D8890B98-26F7-4CFF-BBFB-B95F371B5F20}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bochs_disasm", "..\Externals\Bochs_disasm\Bochs_disasm.vcxproj", "{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiscIO", "Core\DiscIO\DiscIO.vcxproj", "{B6398059-EBB6-4C34-B547-95F365B71FF4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
-		{3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoDX9", "Plugins\Plugin_VideoDX9\Plugin_VideoDX9.vcxproj", "{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoDX11", "Plugins\Plugin_VideoDX11\Plugin_VideoDX11.vcxproj", "{9A4C733C-BADE-4AC6-B58A-6E274395E90E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoOGL", "Plugins\Plugin_VideoOGL\Plugin_VideoOGL.vcxproj", "{1909CD2D-1707-456F-86CA-0DF42A727C99}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoSoftware", "Plugins\Plugin_VideoSoftware\Plugin_VideoSoftware.vcxproj", "{9E9DA440-E9AD-413C-B648-91030E792211}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InputCommon", "Core\InputCommon\InputCommon.vcxproj", "{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Languages", "..\Languages\Languages.vcxproj", "{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSPTool", "DSPTool\DSPTool.vcxproj", "{1970D175-3DE8-4738-942A-4D98D1CDBF64}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D} = {8C60E805-0DA5-4E25-8F84-038DB504BB0D}
-		{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxWidgets", "..\Externals\wxWidgets3\build\msw\wx_base.vcxproj", "{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{01573C36-AC6E-49F6-94BA-572517EB9740} = {01573C36-AC6E-49F6-94BA-572517EB9740}
-		{3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "..\Externals\libpng\png\png.vcxproj", "{01573C36-AC6E-49F6-94BA-572517EB9740}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SCMRevGen", "Core\Common\SVNRevGen.vcxproj", "{69F00340-5C3D-449F-9A80-958435C6CF06}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "..\Externals\SoundTouch\SoundTouch.vcxproj", "{68A5DD20-7057-448B-8FE0-B6AC8D205509}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		DebugFast|Win32 = DebugFast|Win32
-		DebugFast|x64 = DebugFast|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Debug|Win32.Build.0 = Debug|Win32
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Debug|x64.ActiveCfg = Debug|x64
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Debug|x64.Build.0 = Debug|x64
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.DebugFast|x64.Build.0 = DebugFast|x64
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Release|Win32.ActiveCfg = Release|Win32
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Release|Win32.Build.0 = Release|Win32
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Release|x64.ActiveCfg = Release|x64
-		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Release|x64.Build.0 = Release|x64
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Debug|Win32.Build.0 = Debug|Win32
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Debug|x64.ActiveCfg = Debug|x64
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Debug|x64.Build.0 = Debug|x64
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.DebugFast|x64.Build.0 = DebugFast|x64
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|Win32.ActiveCfg = Release|Win32
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|Win32.Build.0 = Release|Win32
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|x64.ActiveCfg = Release|x64
-		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|x64.Build.0 = Release|x64
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|Win32.ActiveCfg = Debug|Win32
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|Win32.Build.0 = Debug|Win32
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|x64.ActiveCfg = Debug|x64
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|x64.Build.0 = Debug|x64
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.DebugFast|x64.Build.0 = DebugFast|x64
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Release|Win32.ActiveCfg = Release|Win32
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Release|Win32.Build.0 = Release|Win32
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Release|x64.ActiveCfg = Release|x64
-		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Release|x64.Build.0 = Release|x64
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Debug|Win32.Build.0 = Debug|Win32
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Debug|x64.ActiveCfg = Debug|x64
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Debug|x64.Build.0 = Debug|x64
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.DebugFast|x64.Build.0 = DebugFast|x64
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Release|Win32.ActiveCfg = Release|Win32
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Release|Win32.Build.0 = Release|Win32
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Release|x64.ActiveCfg = Release|x64
-		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Release|x64.Build.0 = Release|x64
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Debug|Win32.Build.0 = Debug|Win32
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Debug|x64.ActiveCfg = Debug|x64
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Debug|x64.Build.0 = Debug|x64
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.DebugFast|x64.Build.0 = DebugFast|x64
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Release|Win32.ActiveCfg = Release|Win32
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Release|Win32.Build.0 = Release|Win32
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Release|x64.ActiveCfg = Release|x64
-		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Release|x64.Build.0 = Release|x64
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Debug|Win32.Build.0 = Debug|Win32
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Debug|x64.ActiveCfg = Debug|x64
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Debug|x64.Build.0 = Debug|x64
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.DebugFast|x64.Build.0 = DebugFast|x64
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Release|Win32.ActiveCfg = Release|Win32
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Release|Win32.Build.0 = Release|Win32
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Release|x64.ActiveCfg = Release|x64
-		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Release|x64.Build.0 = Release|x64
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.Debug|Win32.Build.0 = Debug|Win32
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.Debug|x64.ActiveCfg = Debug|x64
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.Debug|x64.Build.0 = Debug|x64
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.DebugFast|x64.Build.0 = DebugFast|x64
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.Release|Win32.ActiveCfg = Release|Win32
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.Release|Win32.Build.0 = Release|Win32
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.Release|x64.ActiveCfg = Release|x64
-		{3E1339F5-9311-4122-9442-369702E8FCAD}.Release|x64.Build.0 = Release|x64
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Debug|Win32.Build.0 = Debug|Win32
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Debug|x64.ActiveCfg = Debug|x64
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Debug|x64.Build.0 = Debug|x64
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.DebugFast|x64.Build.0 = DebugFast|x64
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Release|Win32.ActiveCfg = Release|Win32
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Release|Win32.Build.0 = Release|Win32
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Release|x64.ActiveCfg = Release|x64
-		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Release|x64.Build.0 = Release|x64
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Debug|Win32.Build.0 = Debug|Win32
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Debug|x64.ActiveCfg = Debug|x64
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Debug|x64.Build.0 = Debug|x64
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.DebugFast|x64.Build.0 = DebugFast|x64
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Release|Win32.ActiveCfg = Release|Win32
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Release|Win32.Build.0 = Release|Win32
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Release|x64.ActiveCfg = Release|x64
-		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Release|x64.Build.0 = Release|x64
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Debug|Win32.Build.0 = Debug|Win32
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Debug|x64.ActiveCfg = Debug|x64
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Debug|x64.Build.0 = Debug|x64
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.DebugFast|x64.Build.0 = DebugFast|x64
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Release|Win32.ActiveCfg = Release|Win32
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Release|Win32.Build.0 = Release|Win32
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Release|x64.ActiveCfg = Release|x64
-		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Release|x64.Build.0 = Release|x64
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Debug|Win32.Build.0 = Debug|Win32
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Debug|x64.ActiveCfg = Debug|x64
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Debug|x64.Build.0 = Debug|x64
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.DebugFast|x64.Build.0 = DebugFast|x64
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Release|Win32.ActiveCfg = Release|Win32
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Release|Win32.Build.0 = Release|Win32
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Release|x64.ActiveCfg = Release|x64
-		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Release|x64.Build.0 = Release|x64
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Debug|Win32.Build.0 = Debug|Win32
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Debug|x64.ActiveCfg = Debug|x64
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Debug|x64.Build.0 = Debug|x64
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.DebugFast|x64.Build.0 = DebugFast|x64
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Release|Win32.ActiveCfg = Release|Win32
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Release|Win32.Build.0 = Release|Win32
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Release|x64.ActiveCfg = Release|x64
-		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Release|x64.Build.0 = Release|x64
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Debug|Win32.Build.0 = Debug|Win32
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Debug|x64.ActiveCfg = Debug|x64
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Debug|x64.Build.0 = Debug|x64
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.DebugFast|x64.Build.0 = DebugFast|x64
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Release|Win32.ActiveCfg = Release|Win32
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Release|Win32.Build.0 = Release|Win32
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Release|x64.ActiveCfg = Release|x64
-		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Release|x64.Build.0 = Release|x64
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Debug|Win32.Build.0 = Debug|Win32
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Debug|x64.ActiveCfg = Debug|x64
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Debug|x64.Build.0 = Debug|x64
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.DebugFast|x64.Build.0 = DebugFast|x64
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Release|Win32.ActiveCfg = Release|Win32
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Release|Win32.Build.0 = Release|Win32
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Release|x64.ActiveCfg = Release|x64
-		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Release|x64.Build.0 = Release|x64
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Debug|Win32.Build.0 = Debug|Win32
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Debug|x64.ActiveCfg = Debug|x64
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Debug|x64.Build.0 = Debug|x64
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.DebugFast|x64.Build.0 = DebugFast|x64
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Release|Win32.ActiveCfg = Release|Win32
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Release|Win32.Build.0 = Release|Win32
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Release|x64.ActiveCfg = Release|x64
-		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Release|x64.Build.0 = Release|x64
-		{9E9DA440-E9AD-413C-B648-91030E792211}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9E9DA440-E9AD-413C-B648-91030E792211}.Debug|Win32.Build.0 = Debug|Win32
-		{9E9DA440-E9AD-413C-B648-91030E792211}.Debug|x64.ActiveCfg = Debug|x64
-		{9E9DA440-E9AD-413C-B648-91030E792211}.Debug|x64.Build.0 = Debug|x64
-		{9E9DA440-E9AD-413C-B648-91030E792211}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{9E9DA440-E9AD-413C-B648-91030E792211}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{9E9DA440-E9AD-413C-B648-91030E792211}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{9E9DA440-E9AD-413C-B648-91030E792211}.DebugFast|x64.Build.0 = DebugFast|x64
-		{9E9DA440-E9AD-413C-B648-91030E792211}.Release|Win32.ActiveCfg = Release|Win32
-		{9E9DA440-E9AD-413C-B648-91030E792211}.Release|Win32.Build.0 = Release|Win32
-		{9E9DA440-E9AD-413C-B648-91030E792211}.Release|x64.ActiveCfg = Release|x64
-		{9E9DA440-E9AD-413C-B648-91030E792211}.Release|x64.Build.0 = Release|x64
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Debug|Win32.Build.0 = Debug|Win32
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Debug|x64.ActiveCfg = Debug|x64
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Debug|x64.Build.0 = Debug|x64
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.DebugFast|x64.Build.0 = DebugFast|x64
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Release|Win32.ActiveCfg = Release|Win32
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Release|Win32.Build.0 = Release|Win32
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Release|x64.ActiveCfg = Release|x64
-		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Release|x64.Build.0 = Release|x64
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Debug|Win32.ActiveCfg = Release|Win32
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Debug|Win32.Build.0 = Release|Win32
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Debug|x64.ActiveCfg = Release|x64
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Debug|x64.Build.0 = Release|x64
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.DebugFast|Win32.ActiveCfg = Release|Win32
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.DebugFast|Win32.Build.0 = Release|Win32
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.DebugFast|x64.ActiveCfg = Release|x64
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.DebugFast|x64.Build.0 = Release|x64
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Release|Win32.ActiveCfg = Release|Win32
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Release|Win32.Build.0 = Release|Win32
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Release|x64.ActiveCfg = Release|x64
-		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Release|x64.Build.0 = Release|x64
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|Win32.Build.0 = Debug|Win32
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|x64.ActiveCfg = Debug|x64
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|x64.Build.0 = Debug|x64
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.DebugFast|x64.Build.0 = DebugFast|x64
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|Win32.ActiveCfg = Release|Win32
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|Win32.Build.0 = Release|Win32
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.ActiveCfg = Release|x64
-		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.Build.0 = Release|x64
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|Win32.Build.0 = Debug|Win32
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|x64.ActiveCfg = Debug|x64
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|x64.Build.0 = Debug|x64
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|x64.Build.0 = DebugFast|x64
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|Win32.ActiveCfg = Release|Win32
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|Win32.Build.0 = Release|Win32
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|x64.ActiveCfg = Release|x64
-		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|x64.Build.0 = Release|x64
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.Debug|Win32.ActiveCfg = Debug|Win32
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.Debug|Win32.Build.0 = Debug|Win32
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.Debug|x64.ActiveCfg = Debug|x64
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.Debug|x64.Build.0 = Debug|x64
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.DebugFast|Win32.Build.0 = DebugFast|Win32
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.DebugFast|x64.ActiveCfg = DebugFast|x64
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.DebugFast|x64.Build.0 = DebugFast|x64
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.Release|Win32.ActiveCfg = Release|Win32
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.Release|Win32.Build.0 = Release|Win32
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.Release|x64.ActiveCfg = Release|x64
-		{01573C36-AC6E-49F6-94BA-572517EB9740}.Release|x64.Build.0 = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.ActiveCfg = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.Build.0 = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.ActiveCfg = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.Build.0 = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|Win32.ActiveCfg = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|Win32.Build.0 = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|x64.ActiveCfg = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|x64.Build.0 = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.ActiveCfg = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.Build.0 = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.ActiveCfg = Release|x64
-		{69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.Build.0 = Release|x64
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|Win32.ActiveCfg = Debug|Win32
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|Win32.Build.0 = Debug|Win32
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|x64.ActiveCfg = Debug|x64
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|x64.Build.0 = Debug|x64
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|Win32.ActiveCfg = Debug|Win32
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|Win32.Build.0 = Debug|Win32
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|x64.ActiveCfg = Release|x64
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|x64.Build.0 = Release|x64
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|Win32.ActiveCfg = Release|Win32
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|Win32.Build.0 = Release|Win32
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|x64.ActiveCfg = Release|x64
-		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\Dolphin.vcxproj", "{1B099EF8-6F87-47A2-A3E7-898A24584F49}"
+	ProjectSection(ProjectDependencies) = postProject
+		{8C60E805-0DA5-4E25-8F84-038DB504BB0D} = {8C60E805-0DA5-4E25-8F84-038DB504BB0D}
+		{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
+		{9E9DA440-E9AD-413C-B648-91030E792211} = {9E9DA440-E9AD-413C-B648-91030E792211}
+		{93D73454-2512-424E-9CDA-4BB357FE13DD} = {93D73454-2512-424E-9CDA-4BB357FE13DD}
+		{B6398059-EBB6-4C34-B547-95F365B71FF4} = {B6398059-EBB6-4C34-B547-95F365B71FF4}
+		{AA862E5E-A993-497A-B6A0-0E8E94B10050} = {AA862E5E-A993-497A-B6A0-0E8E94B10050}
+		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
+		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F} = {B39AC394-5DB5-4DA9-9D98-09D46CA3701F}
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Core\Common\Common.vcxproj", "{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}"
+	ProjectSection(ProjectDependencies) = postProject
+		{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AudioCommon", "Core\AudioCommon\AudioCommon.vcxproj", "{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SOIL", "..\Externals\SOIL\SOIL.vcxproj", "{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SFML_Network", "..\Externals\SFML\build\vc2010\SFML_Network.vcxproj", "{93D73454-2512-424E-9CDA-4BB357FE13DD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LZO", "..\Externals\LZO\LZO.vcxproj", "{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\Externals\zlib\zlib.vcxproj", "{3E1339F5-9311-4122-9442-369702E8FCAD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoCommon", "Core\VideoCommon\VideoCommon.vcxproj", "{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AA862E5E-A993-497A-B6A0-0E8E94B10050} = {AA862E5E-A993-497A-B6A0-0E8E94B10050}
+		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
+		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181} = {8544F1FF-F2A5-42D8-A568-C56B5D3B4181}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CLRun", "..\Externals\CLRun\clrun\CLRun.vcxproj", "{AA862E5E-A993-497A-B6A0-0E8E94B10050}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcxproj", "{8C60E805-0DA5-4E25-8F84-038DB504BB0D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6} = {CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}
+		{93D73454-2512-424E-9CDA-4BB357FE13DD} = {93D73454-2512-424E-9CDA-4BB357FE13DD}
+		{B6398059-EBB6-4C34-B547-95F365B71FF4} = {B6398059-EBB6-4C34-B547-95F365B71FF4}
+		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
+		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F} = {B39AC394-5DB5-4DA9-9D98-09D46CA3701F}
+		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20} = {D8890B98-26F7-4CFF-BBFB-B95F371B5F20}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bochs_disasm", "..\Externals\Bochs_disasm\Bochs_disasm.vcxproj", "{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiscIO", "Core\DiscIO\DiscIO.vcxproj", "{B6398059-EBB6-4C34-B547-95F365B71FF4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
+		{3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoDX9", "Plugins\Plugin_VideoDX9\Plugin_VideoDX9.vcxproj", "{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoDX11", "Plugins\Plugin_VideoDX11\Plugin_VideoDX11.vcxproj", "{9A4C733C-BADE-4AC6-B58A-6E274395E90E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoOGL", "Plugins\Plugin_VideoOGL\Plugin_VideoOGL.vcxproj", "{1909CD2D-1707-456F-86CA-0DF42A727C99}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoSoftware", "Plugins\Plugin_VideoSoftware\Plugin_VideoSoftware.vcxproj", "{9E9DA440-E9AD-413C-B648-91030E792211}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InputCommon", "Core\InputCommon\InputCommon.vcxproj", "{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Languages", "..\Languages\Languages.vcxproj", "{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DSPTool", "DSPTool\DSPTool.vcxproj", "{1970D175-3DE8-4738-942A-4D98D1CDBF64}"
+	ProjectSection(ProjectDependencies) = postProject
+		{8C60E805-0DA5-4E25-8F84-038DB504BB0D} = {8C60E805-0DA5-4E25-8F84-038DB504BB0D}
+		{69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06}
+		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxWidgets", "..\Externals\wxWidgets3\build\msw\wx_base.vcxproj", "{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{01573C36-AC6E-49F6-94BA-572517EB9740} = {01573C36-AC6E-49F6-94BA-572517EB9740}
+		{3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "..\Externals\libpng\png\png.vcxproj", "{01573C36-AC6E-49F6-94BA-572517EB9740}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SCMRevGen", "Core\Common\SVNRevGen.vcxproj", "{69F00340-5C3D-449F-9A80-958435C6CF06}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "..\Externals\SoundTouch\SoundTouch.vcxproj", "{68A5DD20-7057-448B-8FE0-B6AC8D205509}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "UnitTests\UnitTests.vcxproj", "{40C636FA-B5BF-4D67-ABC8-376B524A7551}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		DebugFast|Win32 = DebugFast|Win32
+		DebugFast|x64 = DebugFast|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Debug|Win32.Build.0 = Debug|Win32
+		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Debug|x64.ActiveCfg = Debug|x64
+		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Debug|x64.Build.0 = Debug|x64
+		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.DebugFast|x64.Build.0 = DebugFast|x64
+		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Release|Win32.ActiveCfg = Release|Win32
+		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Release|Win32.Build.0 = Release|Win32
+		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Release|x64.ActiveCfg = Release|x64
+		{1B099EF8-6F87-47A2-A3E7-898A24584F49}.Release|x64.Build.0 = Release|x64
+		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Debug|Win32.Build.0 = Debug|Win32
+		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Debug|x64.ActiveCfg = Debug|x64
+		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Debug|x64.Build.0 = Debug|x64
+		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.DebugFast|x64.Build.0 = DebugFast|x64
+		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|Win32.ActiveCfg = Release|Win32
+		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|Win32.Build.0 = Release|Win32
+		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|x64.ActiveCfg = Release|x64
+		{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|x64.Build.0 = Release|x64
+		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|Win32.ActiveCfg = Debug|Win32
+		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|Win32.Build.0 = Debug|Win32
+		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|x64.ActiveCfg = Debug|x64
+		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|x64.Build.0 = Debug|x64
+		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.DebugFast|x64.Build.0 = DebugFast|x64
+		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Release|Win32.ActiveCfg = Release|Win32
+		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Release|Win32.Build.0 = Release|Win32
+		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Release|x64.ActiveCfg = Release|x64
+		{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Release|x64.Build.0 = Release|x64
+		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Debug|Win32.Build.0 = Debug|Win32
+		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Debug|x64.ActiveCfg = Debug|x64
+		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Debug|x64.Build.0 = Debug|x64
+		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.DebugFast|x64.Build.0 = DebugFast|x64
+		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Release|Win32.ActiveCfg = Release|Win32
+		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Release|Win32.Build.0 = Release|Win32
+		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Release|x64.ActiveCfg = Release|x64
+		{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}.Release|x64.Build.0 = Release|x64
+		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Debug|Win32.Build.0 = Debug|Win32
+		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Debug|x64.ActiveCfg = Debug|x64
+		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Debug|x64.Build.0 = Debug|x64
+		{93D73454-2512-424E-9CDA-4BB357FE13DD}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{93D73454-2512-424E-9CDA-4BB357FE13DD}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{93D73454-2512-424E-9CDA-4BB357FE13DD}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{93D73454-2512-424E-9CDA-4BB357FE13DD}.DebugFast|x64.Build.0 = DebugFast|x64
+		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Release|Win32.ActiveCfg = Release|Win32
+		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Release|Win32.Build.0 = Release|Win32
+		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Release|x64.ActiveCfg = Release|x64
+		{93D73454-2512-424E-9CDA-4BB357FE13DD}.Release|x64.Build.0 = Release|x64
+		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Debug|Win32.Build.0 = Debug|Win32
+		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Debug|x64.ActiveCfg = Debug|x64
+		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Debug|x64.Build.0 = Debug|x64
+		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.DebugFast|x64.Build.0 = DebugFast|x64
+		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Release|Win32.ActiveCfg = Release|Win32
+		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Release|Win32.Build.0 = Release|Win32
+		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Release|x64.ActiveCfg = Release|x64
+		{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}.Release|x64.Build.0 = Release|x64
+		{3E1339F5-9311-4122-9442-369702E8FCAD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3E1339F5-9311-4122-9442-369702E8FCAD}.Debug|Win32.Build.0 = Debug|Win32
+		{3E1339F5-9311-4122-9442-369702E8FCAD}.Debug|x64.ActiveCfg = Debug|x64
+		{3E1339F5-9311-4122-9442-369702E8FCAD}.Debug|x64.Build.0 = Debug|x64
+		{3E1339F5-9311-4122-9442-369702E8FCAD}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{3E1339F5-9311-4122-9442-369702E8FCAD}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{3E1339F5-9311-4122-9442-369702E8FCAD}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{3E1339F5-9311-4122-9442-369702E8FCAD}.DebugFast|x64.Build.0 = DebugFast|x64
+		{3E1339F5-9311-4122-9442-369702E8FCAD}.Release|Win32.ActiveCfg = Release|Win32
+		{3E1339F5-9311-4122-9442-369702E8FCAD}.Release|Win32.Build.0 = Release|Win32
+		{3E1339F5-9311-4122-9442-369702E8FCAD}.Release|x64.ActiveCfg = Release|x64
+		{3E1339F5-9311-4122-9442-369702E8FCAD}.Release|x64.Build.0 = Release|x64
+		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Debug|Win32.Build.0 = Debug|Win32
+		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Debug|x64.ActiveCfg = Debug|x64
+		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Debug|x64.Build.0 = Debug|x64
+		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.DebugFast|x64.Build.0 = DebugFast|x64
+		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Release|Win32.ActiveCfg = Release|Win32
+		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Release|Win32.Build.0 = Release|Win32
+		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Release|x64.ActiveCfg = Release|x64
+		{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}.Release|x64.Build.0 = Release|x64
+		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Debug|Win32.Build.0 = Debug|Win32
+		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Debug|x64.ActiveCfg = Debug|x64
+		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Debug|x64.Build.0 = Debug|x64
+		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.DebugFast|x64.Build.0 = DebugFast|x64
+		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Release|Win32.ActiveCfg = Release|Win32
+		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Release|Win32.Build.0 = Release|Win32
+		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Release|x64.ActiveCfg = Release|x64
+		{AA862E5E-A993-497A-B6A0-0E8E94B10050}.Release|x64.Build.0 = Release|x64
+		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Debug|Win32.Build.0 = Debug|Win32
+		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Debug|x64.ActiveCfg = Debug|x64
+		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Debug|x64.Build.0 = Debug|x64
+		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.DebugFast|x64.Build.0 = DebugFast|x64
+		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Release|Win32.ActiveCfg = Release|Win32
+		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Release|Win32.Build.0 = Release|Win32
+		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Release|x64.ActiveCfg = Release|x64
+		{8C60E805-0DA5-4E25-8F84-038DB504BB0D}.Release|x64.Build.0 = Release|x64
+		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Debug|Win32.Build.0 = Debug|Win32
+		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Debug|x64.ActiveCfg = Debug|x64
+		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Debug|x64.Build.0 = Debug|x64
+		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.DebugFast|x64.Build.0 = DebugFast|x64
+		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Release|Win32.ActiveCfg = Release|Win32
+		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Release|Win32.Build.0 = Release|Win32
+		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Release|x64.ActiveCfg = Release|x64
+		{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}.Release|x64.Build.0 = Release|x64
+		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Debug|Win32.Build.0 = Debug|Win32
+		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Debug|x64.ActiveCfg = Debug|x64
+		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Debug|x64.Build.0 = Debug|x64
+		{B6398059-EBB6-4C34-B547-95F365B71FF4}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{B6398059-EBB6-4C34-B547-95F365B71FF4}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{B6398059-EBB6-4C34-B547-95F365B71FF4}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{B6398059-EBB6-4C34-B547-95F365B71FF4}.DebugFast|x64.Build.0 = DebugFast|x64
+		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Release|Win32.ActiveCfg = Release|Win32
+		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Release|Win32.Build.0 = Release|Win32
+		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Release|x64.ActiveCfg = Release|x64
+		{B6398059-EBB6-4C34-B547-95F365B71FF4}.Release|x64.Build.0 = Release|x64
+		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Debug|Win32.Build.0 = Debug|Win32
+		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Debug|x64.ActiveCfg = Debug|x64
+		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Debug|x64.Build.0 = Debug|x64
+		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.DebugFast|x64.Build.0 = DebugFast|x64
+		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Release|Win32.ActiveCfg = Release|Win32
+		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Release|Win32.Build.0 = Release|Win32
+		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Release|x64.ActiveCfg = Release|x64
+		{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}.Release|x64.Build.0 = Release|x64
+		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Debug|Win32.Build.0 = Debug|Win32
+		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Debug|x64.ActiveCfg = Debug|x64
+		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Debug|x64.Build.0 = Debug|x64
+		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.DebugFast|x64.Build.0 = DebugFast|x64
+		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Release|Win32.ActiveCfg = Release|Win32
+		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Release|Win32.Build.0 = Release|Win32
+		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Release|x64.ActiveCfg = Release|x64
+		{9A4C733C-BADE-4AC6-B58A-6E274395E90E}.Release|x64.Build.0 = Release|x64
+		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Debug|Win32.Build.0 = Debug|Win32
+		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Debug|x64.ActiveCfg = Debug|x64
+		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Debug|x64.Build.0 = Debug|x64
+		{1909CD2D-1707-456F-86CA-0DF42A727C99}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{1909CD2D-1707-456F-86CA-0DF42A727C99}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{1909CD2D-1707-456F-86CA-0DF42A727C99}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{1909CD2D-1707-456F-86CA-0DF42A727C99}.DebugFast|x64.Build.0 = DebugFast|x64
+		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Release|Win32.ActiveCfg = Release|Win32
+		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Release|Win32.Build.0 = Release|Win32
+		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Release|x64.ActiveCfg = Release|x64
+		{1909CD2D-1707-456F-86CA-0DF42A727C99}.Release|x64.Build.0 = Release|x64
+		{9E9DA440-E9AD-413C-B648-91030E792211}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9E9DA440-E9AD-413C-B648-91030E792211}.Debug|Win32.Build.0 = Debug|Win32
+		{9E9DA440-E9AD-413C-B648-91030E792211}.Debug|x64.ActiveCfg = Debug|x64
+		{9E9DA440-E9AD-413C-B648-91030E792211}.Debug|x64.Build.0 = Debug|x64
+		{9E9DA440-E9AD-413C-B648-91030E792211}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{9E9DA440-E9AD-413C-B648-91030E792211}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{9E9DA440-E9AD-413C-B648-91030E792211}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{9E9DA440-E9AD-413C-B648-91030E792211}.DebugFast|x64.Build.0 = DebugFast|x64
+		{9E9DA440-E9AD-413C-B648-91030E792211}.Release|Win32.ActiveCfg = Release|Win32
+		{9E9DA440-E9AD-413C-B648-91030E792211}.Release|Win32.Build.0 = Release|Win32
+		{9E9DA440-E9AD-413C-B648-91030E792211}.Release|x64.ActiveCfg = Release|x64
+		{9E9DA440-E9AD-413C-B648-91030E792211}.Release|x64.Build.0 = Release|x64
+		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Debug|Win32.Build.0 = Debug|Win32
+		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Debug|x64.ActiveCfg = Debug|x64
+		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Debug|x64.Build.0 = Debug|x64
+		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.DebugFast|x64.Build.0 = DebugFast|x64
+		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Release|Win32.ActiveCfg = Release|Win32
+		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Release|Win32.Build.0 = Release|Win32
+		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Release|x64.ActiveCfg = Release|x64
+		{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}.Release|x64.Build.0 = Release|x64
+		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Debug|Win32.ActiveCfg = Release|Win32
+		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Debug|Win32.Build.0 = Release|Win32
+		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Debug|x64.ActiveCfg = Release|x64
+		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Debug|x64.Build.0 = Release|x64
+		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.DebugFast|Win32.ActiveCfg = Release|Win32
+		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.DebugFast|Win32.Build.0 = Release|Win32
+		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.DebugFast|x64.ActiveCfg = Release|x64
+		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.DebugFast|x64.Build.0 = Release|x64
+		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Release|Win32.ActiveCfg = Release|Win32
+		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Release|Win32.Build.0 = Release|Win32
+		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Release|x64.ActiveCfg = Release|x64
+		{0B8D0A82-C520-46BA-849D-3BB8F637EE0C}.Release|x64.Build.0 = Release|x64
+		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|Win32.Build.0 = Debug|Win32
+		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|x64.ActiveCfg = Debug|x64
+		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Debug|x64.Build.0 = Debug|x64
+		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.DebugFast|x64.Build.0 = DebugFast|x64
+		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|Win32.ActiveCfg = Release|Win32
+		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|Win32.Build.0 = Release|Win32
+		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.ActiveCfg = Release|x64
+		{1970D175-3DE8-4738-942A-4D98D1CDBF64}.Release|x64.Build.0 = Release|x64
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|Win32.Build.0 = Debug|Win32
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|x64.ActiveCfg = Debug|x64
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|x64.Build.0 = Debug|x64
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|x64.Build.0 = DebugFast|x64
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|Win32.ActiveCfg = Release|Win32
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|Win32.Build.0 = Release|Win32
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|x64.ActiveCfg = Release|x64
+		{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|x64.Build.0 = Release|x64
+		{01573C36-AC6E-49F6-94BA-572517EB9740}.Debug|Win32.ActiveCfg = Debug|Win32
+		{01573C36-AC6E-49F6-94BA-572517EB9740}.Debug|Win32.Build.0 = Debug|Win32
+		{01573C36-AC6E-49F6-94BA-572517EB9740}.Debug|x64.ActiveCfg = Debug|x64
+		{01573C36-AC6E-49F6-94BA-572517EB9740}.Debug|x64.Build.0 = Debug|x64
+		{01573C36-AC6E-49F6-94BA-572517EB9740}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{01573C36-AC6E-49F6-94BA-572517EB9740}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{01573C36-AC6E-49F6-94BA-572517EB9740}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{01573C36-AC6E-49F6-94BA-572517EB9740}.DebugFast|x64.Build.0 = DebugFast|x64
+		{01573C36-AC6E-49F6-94BA-572517EB9740}.Release|Win32.ActiveCfg = Release|Win32
+		{01573C36-AC6E-49F6-94BA-572517EB9740}.Release|Win32.Build.0 = Release|Win32
+		{01573C36-AC6E-49F6-94BA-572517EB9740}.Release|x64.ActiveCfg = Release|x64
+		{01573C36-AC6E-49F6-94BA-572517EB9740}.Release|x64.Build.0 = Release|x64
+		{69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.ActiveCfg = Release|x64
+		{69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.Build.0 = Release|x64
+		{69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.ActiveCfg = Release|x64
+		{69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.Build.0 = Release|x64
+		{69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|Win32.ActiveCfg = Release|x64
+		{69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|Win32.Build.0 = Release|x64
+		{69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|x64.ActiveCfg = Release|x64
+		{69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|x64.Build.0 = Release|x64
+		{69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.ActiveCfg = Release|x64
+		{69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.Build.0 = Release|x64
+		{69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.ActiveCfg = Release|x64
+		{69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.Build.0 = Release|x64
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|Win32.ActiveCfg = Debug|Win32
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|Win32.Build.0 = Debug|Win32
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|x64.ActiveCfg = Debug|x64
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Debug|x64.Build.0 = Debug|x64
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|Win32.ActiveCfg = Debug|Win32
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|Win32.Build.0 = Debug|Win32
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|x64.ActiveCfg = Release|x64
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.DebugFast|x64.Build.0 = Release|x64
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|Win32.ActiveCfg = Release|Win32
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|Win32.Build.0 = Release|Win32
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|x64.ActiveCfg = Release|x64
+		{68A5DD20-7057-448B-8FE0-B6AC8D205509}.Release|x64.Build.0 = Release|x64
+		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Debug|Win32.ActiveCfg = Debug|Win32
+		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Debug|Win32.Build.0 = Debug|Win32
+		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Debug|x64.ActiveCfg = Debug|x64
+		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Debug|x64.Build.0 = Debug|x64
+		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.DebugFast|Win32.ActiveCfg = Debug|x64
+		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.DebugFast|x64.ActiveCfg = Debug|x64
+		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.DebugFast|x64.Build.0 = Debug|x64
+		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Release|Win32.ActiveCfg = Release|Win32
+		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Release|Win32.Build.0 = Release|Win32
+		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Release|x64.ActiveCfg = Release|x64
+		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/Source/UnitTests/AudioJitTests.cpp b/Source/UnitTests/AudioJitTests.cpp
index 4991eeb485..7712f59fc3 100644
--- a/Source/UnitTests/AudioJitTests.cpp
+++ b/Source/UnitTests/AudioJitTests.cpp
@@ -341,7 +341,7 @@ void AudioJitTests()
 
 //required to be able to link against DSPCore
 void DSPHost_UpdateDebugger() { }
-unsigned int DSPHost_CodeLoaded(unsigned const char*, int) { return 0; }
+void DSPHost_CodeLoaded(unsigned const char*, int) { }
 void DSPHost_InterruptRequest() { }
 bool DSPHost_OnThread() { return false; }
 void DSPHost_WriteHostMemory(unsigned char, unsigned int) { }
diff --git a/Source/UnitTests/UnitTests.vcproj b/Source/UnitTests/UnitTests.vcproj
deleted file mode 100644
index a93651b3e4..0000000000
--- a/Source/UnitTests/UnitTests.vcproj
+++ /dev/null
@@ -1,358 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="UnitTests"
-	ProjectGUID="{40C636FA-B5BF-4D67-ABC8-376B524A7551}"
-	RootNamespace="UnitTests"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../Core/Core/Src;../Core/Common/Src;../Core/InputCommon/Src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib winmm.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="xcopy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)..\Binary\$(PlatformName)\&quot; /e /s /y /d"
-				ExcludedFromBuild="true"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../Core/Core/Src;../Core/Common/Src;../Core/InputCommon/Src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib winmm.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="xcopy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)..\Binary\$(PlatformName)\&quot; /e /s /y /d"
-				ExcludedFromBuild="true"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../Core/Core/Src;../Core/Common/Src;../Core/InputCommon/Src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib winmm.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="xcopy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)..\Binary\$(PlatformName)\&quot; /e /s /y /d"
-				ExcludedFromBuild="true"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../Core/Core/Src;../Core/Common/Src;../Core/InputCommon/Src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib winmm.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="xcopy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)..\Binary\$(PlatformName)\&quot; /e /s /y /d"
-				ExcludedFromBuild="true"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Audio"
-			>
-			<File
-				RelativePath=".\AudioJitTests.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\DSPJitTester.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\DSPJitTester.h"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\UnitTests.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj
new file mode 100644
index 0000000000..d1a72a9979
--- /dev/null
+++ b/Source/UnitTests/UnitTests.vcxproj
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{40C636FA-B5BF-4D67-ABC8-376B524A7551}</ProjectGuid>
+    <RootNamespace>UnitTests</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</PostBuildEventUseInBuild>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</PostBuildEventUseInBuild>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PostBuildEventUseInBuild>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</PostBuildEventUseInBuild>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../Core/Core/Src;../Core/Common/Src;../Core/InputCommon/Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>Iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy "$(TargetPath)" "$(SolutionDir)..\Binary\$(Platform)\" /e /s /y /d</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../Core/Core/Src;../Core/Common/Src;../Core/InputCommon/Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>Iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy "$(TargetPath)" "$(SolutionDir)..\Binary\$(Platform)\" /e /s /y /d</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>../Core/Core/Src;../Core/Common/Src;../Core/InputCommon/Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>Iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy "$(TargetPath)" "$(SolutionDir)..\Binary\$(Platform)\" /e /s /y /d</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>../Core/Core/Src;../Core/Common/Src;../Core/InputCommon/Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>Iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy "$(TargetPath)" "$(SolutionDir)..\Binary\$(Platform)\" /e /s /y /d</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="AudioJitTests.cpp" />
+    <ClCompile Include="DSPJitTester.cpp" />
+    <ClCompile Include="UnitTests.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="DSPJitTester.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Externals\Bochs_disasm\Bochs_disasm.vcxproj">
+      <Project>{cd3d4c3c-1027-4d33-b047-aec7b56d0bf6}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\Core\Common\Common.vcxproj">
+      <Project>{c87a4178-44f6-49b2-b7aa-c79af1b8c534}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\Core\Core\Core.vcxproj">
+      <Project>{8c60e805-0da5-4e25-8f84-038db504bb0d}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/UnitTests/UnitTests.vcxproj.filters b/Source/UnitTests/UnitTests.vcxproj.filters
new file mode 100644
index 0000000000..b38fc876e5
--- /dev/null
+++ b/Source/UnitTests/UnitTests.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Audio">
+      <UniqueIdentifier>{cde9a42c-90d9-4bc9-9182-3fcc0cf9f7a4}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="AudioJitTests.cpp">
+      <Filter>Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="DSPJitTester.cpp">
+      <Filter>Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="UnitTests.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="DSPJitTester.h">
+      <Filter>Audio</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

From 2effab9a9f84a906bae68a3d82acf6bf44090cc9 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Wed, 22 May 2013 05:29:47 -0500
Subject: [PATCH 111/352] [Android] Make it less stupid to add a folder to the
 search list. Now just hit the menu button and select 'Add current folder'

---
 Source/Android/.idea/workspace.xml            | 322 ++++++++++--------
 .../dolphinemu/DolphinEmulator.java           |   8 +-
 .../dolphinemu/dolphinemu/FolderBrowser.java  |  36 +-
 .../dolphinemu/dolphinemu/GameListView.java   |   4 +-
 4 files changed, 203 insertions(+), 167 deletions(-)

diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index 87d98b0e1e..b6b28566ce 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -13,14 +13,6 @@
         <target>android-17</target>
       </config>
     </shared>
-    <layouts>
-      <layout url="file://$PROJECT_DIR$/res/layout/fragment_edit_name.xml">
-        <config>
-          <device>Nexus 4</device>
-          <theme>@android:style/Theme.Holo</theme>
-        </config>
-      </layout>
-    </layouts>
   </component>
   <component name="BookmarkManager">
     <bookmark url="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" line="37" />
@@ -40,8 +32,9 @@
     <file path="/PrefsActivity.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369031747746" ignored="false" />
     <file path="/PrefsFragment.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369032642639" ignored="false" />
     <file path="/prefs.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369036284146" ignored="false" />
-    <file path="$PROJECT_DIR$/gen/org/dolphinemu/dolphinemu/BuildConfig.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369036186956" ignored="false" />
+    <file path="$PROJECT_DIR$/gen/org/dolphinemu/dolphinemu/BuildConfig.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369127789356" ignored="false" />
     <file path="/prefvalues.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369036331457" ignored="false" />
+    <file path="/FolderBrowser.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369217914695" ignored="false" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -61,7 +54,6 @@
     <disable_hints />
   </component>
   <component name="DebuggerManager">
-    <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
     <breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
       <breakpoint>
         <option name="NOTIFY_CAUGHT" value="true" />
@@ -98,6 +90,7 @@
         <option name="LOG_MESSAGE" value="" />
       </breakpoint>
     </breakpoint_any>
+    <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
     <breakpoint_rules />
     <ui_properties />
   </component>
@@ -110,26 +103,19 @@
       <file leaf-file-name="DolphinEmulator.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="92" column="12" selection-start="2123" selection-end="2222" vertical-scroll-proportion="0.0">
+            <state line="117" column="29" selection-start="3221" selection-end="3223" vertical-scroll-proportion="-10.538462">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="GameListView.java" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="GameListView.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="118" column="34" selection-start="3985" selection-end="3985" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="prefvalues.xml" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-              <folding />
+            <state line="41" column="57" selection-start="1271" selection-end="1275" vertical-scroll-proportion="0.33236152">
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -137,8 +123,10 @@
       <file leaf-file-name="FolderBrowser.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="58" column="30" selection-start="1963" selection-end="1963" vertical-scroll-proportion="0.0">
-              <folding />
+            <state line="81" column="36" selection-start="2675" selection-end="2675" vertical-scroll-proportion="0.0">
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -146,7 +134,7 @@
       <file leaf-file-name="prefs.xml" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="21" column="41" selection-start="857" selection-end="857" vertical-scroll-proportion="-3.6">
+            <state line="21" column="41" selection-start="857" selection-end="857" vertical-scroll-proportion="-3.04">
               <folding />
             </state>
           </provider>
@@ -173,7 +161,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuItem.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuItem.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java" />
@@ -187,6 +174,8 @@
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingBrowser.java" />
         <option value="$PROJECT_DIR$/res/layout/prefs.xml" />
         <option value="$PROJECT_DIR$/res/values/prefvalues.xml" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java" />
       </list>
     </option>
@@ -225,6 +214,7 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -263,7 +253,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <PATH>
@@ -375,56 +364,25 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="dynamic.classpath" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
     <property name="options.searchVisible" value="true" />
-    <property name="options.lastSelected" value="project.propVCSSupport.Mappings" />
-    <property name="FullScreen" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="978fa698" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="MemberChooser.sorted" value="false" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="options.splitter.main.proportions" value="0.3" />
-    <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="GoToFile.includeJavaFiles" value="false" />
     <property name="recentsLimit" value="5" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="978fa698" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
+    <property name="dynamic.classpath" value="false" />
+    <property name="MemberChooser.copyJavadoc" value="false" />
+    <property name="options.splitter.main.proportions" value="0.3" />
     <property name="restartRequiresConfirmation" value="true" />
+    <property name="MemberChooser.showClasses" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="options.lastSelected" value="project.propVCSSupport.Mappings" />
+    <property name="GoToClass.includeLibraries" value="false" />
+    <property name="MemberChooser.sorted" value="false" />
+    <property name="FullScreen" value="false" />
   </component>
   <component name="RunManager" selected="Android Application.Dolphin Emulator">
-    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
-      <module name="" />
-      <option name="TESTING_TYPE" value="0" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="USE_COMMAND_LINE" value="true" />
-      <option name="COMMAND_LINE" value="" />
-      <option name="WIPE_USER_DATA" value="false" />
-      <option name="DISABLE_BOOT_ANIMATION" value="false" />
-      <option name="NETWORK_SPEED" value="full" />
-      <option name="NETWORK_LATENCY" value="none" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <module name="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <method />
-    </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
       <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -445,12 +403,31 @@
       <patterns />
       <method />
     </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
       <method />
     </configuration>
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
@@ -469,18 +446,30 @@
       <option name="CLEAR_LOGCAT" value="false" />
       <method />
     </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+      <method />
+    </configuration>
+    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
       <module name="" />
-      <envs />
+      <option name="TESTING_TYPE" value="0" />
+      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
+      <option name="METHOD_NAME" value="" />
+      <option name="CLASS_NAME" value="" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
+      <option name="PREFERRED_AVD" value="" />
+      <option name="USE_COMMAND_LINE" value="true" />
+      <option name="COMMAND_LINE" value="" />
+      <option name="WIPE_USER_DATA" value="false" />
+      <option name="DISABLE_BOOT_ANIMATION" value="false" />
+      <option name="NETWORK_SPEED" value="full" />
+      <option name="NETWORK_LATENCY" value="none" />
+      <option name="CLEAR_LOGCAT" value="false" />
       <method />
     </configuration>
     <configuration default="false" name="Dolphin Emulator" type="AndroidRunConfigurationType" factoryName="Android Application">
@@ -551,11 +540,13 @@
       <workItem from="1368958063194" duration="125000" />
       <workItem from="1368958842851" duration="47000" />
       <workItem from="1369030521257" duration="6092000" />
+      <workItem from="1369127738883" duration="3497000" />
+      <workItem from="1369215536267" duration="2414000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="26691000" />
+    <option name="totallyTimeSpent" value="32602000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -579,32 +570,32 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="24" y="0" width="1342" height="744" extended-state="0" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6812081" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7470687" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31879196" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2179289" sideWeight="0.6812081" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32931036" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16306028" sideWeight="0.6812081" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2179289" sideWeight="0.68456376" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31543624" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31543624" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16306028" sideWeight="0.6812081" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6812081" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="VcsContentAnnotationSettings">
@@ -668,6 +659,48 @@
     <breakpoint-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="92" column="12" selection-start="2123" selection-end="2222" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="118" column="34" selection-start="3985" selection-end="3985" vertical-scroll-proportion="0.0">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="58" column="30" selection-start="1963" selection-end="1963" vertical-scroll-proportion="0.0">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
+      <provider editor-type-id="android-designer">
+        <state />
+      </provider>
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="21" column="41" selection-start="857" selection-end="857" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="30" column="64" selection-start="729" selection-end="729" vertical-scroll-proportion="-0.42105263">
@@ -704,13 +737,6 @@
         <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="92" column="12" selection-start="2123" selection-end="2222" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="23" column="9" selection-start="698" selection-end="698" vertical-scroll-proportion="0.39473686">
@@ -720,30 +746,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="58" column="30" selection-start="1963" selection-end="1963" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
-      <provider editor-type-id="android-designer">
-        <state />
-      </provider>
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="21" column="41" selection-start="857" selection-end="857" vertical-scroll-proportion="-3.6">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="118" column="34" selection-start="3985" selection-end="3985" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
@@ -751,6 +753,48 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
+      <provider editor-type-id="android-designer">
+        <state />
+      </provider>
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="21" column="41" selection-start="857" selection-end="857" vertical-scroll-proportion="-3.04">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$APPLICATION_HOME_DIR$/sdk/platforms/android-17/android.jar!/android/app/Activity.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="132" column="0" selection-start="5190" selection-end="5190" vertical-scroll-proportion="2.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="81" column="36" selection-start="2675" selection-end="2675" vertical-scroll-proportion="0.0">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="117" column="29" selection-start="3221" selection-end="3223" vertical-scroll-proportion="-10.538462">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="41" column="57" selection-start="1271" selection-end="1275" vertical-scroll-proportion="0.33236152">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
 
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index 060807d63c..c3d6d8ae06 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -1,11 +1,5 @@
 package org.dolphinemu.dolphinemu;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -16,6 +10,8 @@ import android.util.Log;
 import android.view.MotionEvent;
 import android.view.WindowManager;
 
+import java.io.*;
+
 public class DolphinEmulator<MainActivity> extends Activity 
 {	
 	static private NativeGLSurfaceView GLview = null;
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
index 68203413b7..15afb36c3c 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
@@ -1,29 +1,19 @@
 package org.dolphinemu.dolphinemu;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import net.simonvt.menudrawer.MenuDrawer;
-
 import android.app.Activity;
 import android.app.ListActivity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Environment;
-import android.view.Gravity;
-import android.view.LayoutInflater;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemLongClickListener;
-import android.widget.BaseAdapter;
-import android.widget.LinearLayout;
 import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 public class FolderBrowser extends ListActivity {
 	private GameListAdapter adapter;
@@ -87,12 +77,18 @@ public class FolderBrowser extends ListActivity {
 		Fill(currentDir);
 	}
     @Override
-    public void onBackPressed() {
+    public boolean onCreateOptionsMenu(Menu menu)
+    {
+        menu.add("Add current folder");
+        return true;
+    }
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
         Intent intent = new Intent();
         intent.putExtra("Select", currentDir.getPath());
         setResult(Activity.RESULT_OK, intent);
-        
-    	this.finish();
-    	super.onBackPressed();
+
+        this.finish();
+        return true;
     }
 }
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
index 760f0445ec..ad2df58fa3 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
@@ -39,7 +39,7 @@ public class GameListView extends ListActivity {
 		int intDirectories = Integer.parseInt(Directories);
 		for (int a = 0; a < intDirectories; ++a)
 		{
-			String BrowseDir = GetConfig("General", "GCMPaths" + Integer.toString(a), "");
+			String BrowseDir = GetConfig("General", "GCMPath" + Integer.toString(a), "");
 			File currentDir = new File(BrowseDir);
 			File[]dirs = currentDir.listFiles();
 			try
@@ -105,7 +105,7 @@ public class GameListView extends ListActivity {
                     int intDirectories = Integer.parseInt(Directories);
                     Directories = Integer.toString(intDirectories + 1);
                     SetConfig("General", "GCMPathes", Directories);
-                    SetConfig("General", "GCMPaths" + Integer.toString(intDirectories), FileName);
+                    SetConfig("General", "GCMPath" + Integer.toString(intDirectories), FileName);
 
                     Fill();
                 }

From 3778c96d48fcca61293b3046e70ecc249cfe2acd Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Wed, 22 May 2013 22:39:55 +1200
Subject: [PATCH 112/352] Edge case where balance board returns corrupt
 extension type...

---
 Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
index 5e4f32caab..fc497c29a3 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
@@ -353,6 +353,8 @@ void WiimoteScanner::CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool
 			{
 				case WM_STATUS_REPORT:
 				{
+					real_wiimote = true;
+					
 					// DEBUG_LOG(WIIMOTE, "CheckDeviceType: Got Status Report");
 					wm_status_report * wsr = (wm_status_report*)&buf[2];
 					if (wsr->extension)
@@ -369,7 +371,6 @@ void WiimoteScanner::CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool
 					}
 					else
 					{
-						real_wiimote = true;
 						// Normal Wiimote, exit while and be happy.
 						rc = -1;
 					}
@@ -377,7 +378,9 @@ void WiimoteScanner::CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool
 				}
 				case WM_ACK_DATA:
 				{
-					// DEBUG_LOG(WIIMOTE, "CheckDeviceType: Got Ack");
+					real_wiimote = true;
+					//wm_acknowledge * wm = (wm_acknowledge*)&buf[2];
+					//DEBUG_LOG(WIIMOTE, "CheckDeviceType: Got Ack Error: %X ReportID: %X", wm->errorID, wm->reportID);
 					break;
 				}
 				case WM_READ_DATA_REPLY:
@@ -394,7 +397,9 @@ void WiimoteScanner::CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool
 						// DEBUG_LOG(WIIMOTE, 
 						//		  "CheckDeviceType: GOT EXT TYPE %llX", 
 						//		  ext_type);
-						is_bb = ext_type == 0x020420A40000ULL;
+						is_bb = (ext_type == 0x020420A40000ULL) ||
+									((ext_type & 0xf00000000000ULL) && 
+										ext_type != 0xffffffffffffULL);
 					}
 					else
 					{

From 2f00f87e8e058f276ccf8900f678b5afd2922ee6 Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Wed, 22 May 2013 23:34:02 +1200
Subject: [PATCH 113/352] Use working directory for executions. Fixes issue
 6318

---
 CMakeLists.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ddf6c1581..ecc8e6ea61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,11 +85,11 @@ endfunction(enable_precompiled_headers)
 include(FindGit OPTIONAL)
 if(GIT_FOUND AND NOT DOLPHIN_WC_REVISION)
 # defines DOLPHIN_WC_REVISION
-	EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+	EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
 	OUTPUT_VARIABLE DOLPHIN_WC_REVISION
 	OUTPUT_STRIP_TRAILING_WHITESPACE)
 # defines DOLPHIN_WC_DESCRIBE
-	EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty
+	EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty
 	OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
 	OUTPUT_STRIP_TRAILING_WHITESPACE)
 
@@ -97,7 +97,7 @@ if(GIT_FOUND AND NOT DOLPHIN_WC_REVISION)
 	STRING(REGEX REPLACE "-[^-]+((-dirty)?)$" "\\1" DOLPHIN_WC_DESCRIBE "${DOLPHIN_WC_DESCRIBE}")
 
 # defines DOLPHIN_WC_BRANCH
-	EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+	EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
 	OUTPUT_VARIABLE DOLPHIN_WC_BRANCH
 	OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif()
@@ -604,7 +604,7 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 	FIND_PACKAGE(wxWidgets COMPONENTS core aui adv)
 
 	if(wxWidgets_FOUND)
-		EXECUTE_PROCESS(
+		EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} 
 			COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
 				${wxWidgets_CONFIG_OPTIONS} --version
 			OUTPUT_VARIABLE wxWidgets_VERSION
@@ -619,7 +619,7 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 	endif(wxWidgets_FOUND)
 		
 	if(wxWidgets_FOUND)
-		EXECUTE_PROCESS(
+		EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} 
 			COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
 				${wxWidgets_CONFIG_OPTIONS} --version
 			OUTPUT_VARIABLE wxWidgets_VERSION

From f452a6442f395587d7c57e1603319ff47891b678 Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Sun, 19 May 2013 17:14:29 +0200
Subject: [PATCH 114/352] Adding MMU state values to state

because that allow the MMU state to be loaded
---
 Source/Core/Core/Src/HW/MemmapFunctions.cpp | 11 ++++-------
 Source/Core/Core/Src/PowerPC/PowerPC.cpp    |  2 ++
 Source/Core/Core/Src/PowerPC/PowerPC.h      |  3 +++
 Source/Core/Core/Src/State.cpp              |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Source/Core/Core/Src/HW/MemmapFunctions.cpp b/Source/Core/Core/Src/HW/MemmapFunctions.cpp
index 39c852ec22..0e899079c5 100644
--- a/Source/Core/Core/Src/HW/MemmapFunctions.cpp
+++ b/Source/Core/Core/Src/HW/MemmapFunctions.cpp
@@ -598,9 +598,6 @@ union UPTE2
 	u32 Hex;
 };
 
-u32 pagetable_base = 0;
-u32 pagetable_hashmask = 0;
-
 void GenerateDSIException(u32 _EffectiveAddress, bool _bWrite)
 {
 	if (_bWrite)
@@ -644,8 +641,8 @@ void SDRUpdated()
 	{
 		return;
 	}
-	pagetable_base = htaborg<<16;
-	pagetable_hashmask = ((xx<<10)|0x3ff);
+	PowerPC::ppcState.pagetable_base = htaborg<<16;
+	PowerPC::ppcState.pagetable_hashmask = ((xx<<10)|0x3ff);
 } 
 
 
@@ -821,7 +818,7 @@ u32 TranslatePageAddress(const u32 _Address, const XCheckTLBFlag _Flag)
 
 	// hash function no 1 "xor" .360
 	u32 hash1 = (VSID ^ page_index);
-	u32 pteg_addr = ((hash1 & pagetable_hashmask) << 6) | pagetable_base;
+	u32 pteg_addr = ((hash1 & PowerPC::ppcState.pagetable_hashmask) << 6) | PowerPC::ppcState.pagetable_base;
 
 	// hash1
 	for (int i = 0; i < 8; i++)
@@ -856,7 +853,7 @@ u32 TranslatePageAddress(const u32 _Address, const XCheckTLBFlag _Flag)
 
 	// hash function no 2 "not" .360
 	hash1 = ~hash1;
-	pteg_addr = ((hash1 & pagetable_hashmask) << 6) | pagetable_base;
+	pteg_addr = ((hash1 & PowerPC::ppcState.pagetable_hashmask) << 6) | PowerPC::ppcState.pagetable_base;
 	for (int i = 0; i < 8; i++) 
 	{
 		u32 pte = bswap(*(u32*)&pRAM[pteg_addr]);
diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.cpp b/Source/Core/Core/Src/PowerPC/PowerPC.cpp
index 7628e1298e..4f45d08ede 100644
--- a/Source/Core/Core/Src/PowerPC/PowerPC.cpp
+++ b/Source/Core/Core/Src/PowerPC/PowerPC.cpp
@@ -138,6 +138,8 @@ void Init(int cpu_core)
 	ppcState.itlb_last = 0;
 	memset(ppcState.itlb_va, 0, sizeof(ppcState.itlb_va));
 	memset(ppcState.itlb_pa, 0, sizeof(ppcState.itlb_pa));
+	ppcState.pagetable_base = 0;
+	ppcState.pagetable_hashmask = 0;
 
 	ResetRegisters();
 	PPCTables::InitTables(cpu_core);
diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.h b/Source/Core/Core/Src/PowerPC/PowerPC.h
index 219dcc192f..82c912d213 100644
--- a/Source/Core/Core/Src/PowerPC/PowerPC.h
+++ b/Source/Core/Core/Src/PowerPC/PowerPC.h
@@ -64,6 +64,9 @@ struct GC_ALIGNED64(PowerPCState)
 	u32 itlb_va[128];
 	u32 itlb_pa[128];
 
+	u32 pagetable_base;
+	u32 pagetable_hashmask;
+
 	InstructionCache iCache;
 };
 
diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp
index 5923ba6917..f41b32485e 100644
--- a/Source/Core/Core/Src/State.cpp
+++ b/Source/Core/Core/Src/State.cpp
@@ -59,7 +59,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
 static std::thread g_save_thread;
 
 // Don't forget to increase this after doing changes on the savestate system
-static const u32 STATE_VERSION = 18;
+static const u32 STATE_VERSION = 19;
 
 enum
 {

From ae55d82e4337ed19ec8646c00fc3edb8ad6719ea Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Thu, 23 May 2013 11:08:07 +0200
Subject: [PATCH 115/352] disable hacked buffer option for d3d

---
 Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 5 +----
 Source/Core/DolphinWX/Src/VideoConfigDiag.h   | 5 +++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
index 45bf35046e..b3b0e1b123 100644
--- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
@@ -497,15 +497,12 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
 	// - other hacks
 	{
 	wxGridSizer* const szr_other = new wxGridSizer(2, 5, 5);
-	SettingCheckBox* hacked_buffer_upload_cb;
 	szr_other->Add(CreateCheckBox(page_hacks, _("Cache Display Lists"), wxGetTranslation(dlc_desc), vconfig.bDlistCachingEnable));
 	szr_other->Add(CreateCheckBox(page_hacks, _("Disable Destination Alpha"), wxGetTranslation(disable_dstalpha_desc), vconfig.bDstAlphaPass));
 	szr_other->Add(CreateCheckBox(page_hacks, _("OpenCL Texture Decoder"), wxGetTranslation(opencl_desc), vconfig.bEnableOpenCL));
 	szr_other->Add(CreateCheckBox(page_hacks, _("OpenMP Texture Decoder"), wxGetTranslation(omp_desc), vconfig.bOMPDecoder));
-	szr_other->Add(hacked_buffer_upload_cb = CreateCheckBox(page_hacks, _("Hacked Buffer Upload"), wxGetTranslation(hacked_buffer_upload_desc), vconfig.bHackedBufferUpload));
+	szr_other->Add(hacked_buffer_upload = CreateCheckBox(page_hacks, _("Hacked Buffer Upload"), wxGetTranslation(hacked_buffer_upload_desc), vconfig.bHackedBufferUpload));
 	szr_other->Add(CreateCheckBox(page_hacks, _("Fast Depth Calculation"), wxGetTranslation(fast_depth_calc_desc), vconfig.bFastDepthCalc));
-	if (Core::GetState() != Core::CORE_UNINITIALIZED)
-		hacked_buffer_upload_cb->Disable();
 	
 	wxStaticBoxSizer* const group_other = new wxStaticBoxSizer(wxVERTICAL, page_hacks, _("Other"));
 	group_other->Add(szr_other, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.h b/Source/Core/DolphinWX/Src/VideoConfigDiag.h
index 90a42c34a1..1c8963b908 100644
--- a/Source/Core/DolphinWX/Src/VideoConfigDiag.h
+++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.h
@@ -8,6 +8,7 @@
 
 #include "ConfigManager.h"
 #include "VideoConfig.h"
+#include "Core.h"
 
 #include <wx/wx.h>
 #include <wx/textctrl.h>
@@ -165,6 +166,9 @@ protected:
 		// XFB
 		virtual_xfb->Enable(vconfig.bUseXFB);
 		real_xfb->Enable(vconfig.bUseXFB);
+		
+		// OGL Hacked buffer
+		hacked_buffer_upload->Enable(Core::GetState() == Core::CORE_UNINITIALIZED && vconfig.backend_info.APIType == API_OPENGL);
 
 		ev.Skip();
 	}
@@ -194,6 +198,7 @@ protected:
 	SettingRadioButton* efbcopy_ram;
 	SettingCheckBox* cache_efb_copies;
 	SettingCheckBox* emulate_efb_format_changes;
+	SettingCheckBox* hacked_buffer_upload;
 
 	SettingRadioButton* virtual_xfb;
 	SettingRadioButton* real_xfb;

From 6a5e7d7be40cc8f06aa2e4d382204bc169488234 Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Thu, 23 May 2013 13:58:37 +0200
Subject: [PATCH 116/352] also hide hacked buffer option on d3d

---
 Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 2 +-
 Source/Core/DolphinWX/Src/VideoConfigDiag.h   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
index b3b0e1b123..8c4ee9ebb4 100644
--- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
@@ -501,8 +501,8 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
 	szr_other->Add(CreateCheckBox(page_hacks, _("Disable Destination Alpha"), wxGetTranslation(disable_dstalpha_desc), vconfig.bDstAlphaPass));
 	szr_other->Add(CreateCheckBox(page_hacks, _("OpenCL Texture Decoder"), wxGetTranslation(opencl_desc), vconfig.bEnableOpenCL));
 	szr_other->Add(CreateCheckBox(page_hacks, _("OpenMP Texture Decoder"), wxGetTranslation(omp_desc), vconfig.bOMPDecoder));
-	szr_other->Add(hacked_buffer_upload = CreateCheckBox(page_hacks, _("Hacked Buffer Upload"), wxGetTranslation(hacked_buffer_upload_desc), vconfig.bHackedBufferUpload));
 	szr_other->Add(CreateCheckBox(page_hacks, _("Fast Depth Calculation"), wxGetTranslation(fast_depth_calc_desc), vconfig.bFastDepthCalc));
+	szr_other->Add(hacked_buffer_upload = CreateCheckBox(page_hacks, _("Hacked Buffer Upload"), wxGetTranslation(hacked_buffer_upload_desc), vconfig.bHackedBufferUpload));
 	
 	wxStaticBoxSizer* const group_other = new wxStaticBoxSizer(wxVERTICAL, page_hacks, _("Other"));
 	group_other->Add(szr_other, 1, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.h b/Source/Core/DolphinWX/Src/VideoConfigDiag.h
index 1c8963b908..563f5076d6 100644
--- a/Source/Core/DolphinWX/Src/VideoConfigDiag.h
+++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.h
@@ -169,6 +169,7 @@ protected:
 		
 		// OGL Hacked buffer
 		hacked_buffer_upload->Enable(Core::GetState() == Core::CORE_UNINITIALIZED && vconfig.backend_info.APIType == API_OPENGL);
+		hacked_buffer_upload->Show(vconfig.backend_info.APIType == API_OPENGL);
 
 		ev.Skip();
 	}

From a51d6a6dddc99b91a19025988a3e91bb2bc02acb Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Thu, 23 May 2013 21:07:01 +0200
Subject: [PATCH 117/352] add new statistics for gpu buffer streaming

---
 Source/Core/VideoCommon/Src/Statistics.cpp                | 3 +++
 Source/Core/VideoCommon/Src/Statistics.h                  | 4 ++++
 Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp  | 2 ++
 Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp     | 3 +++
 Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp | 2 ++
 Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp      | 2 ++
 Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | 2 ++
 Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp      | 3 +++
 8 files changed, 21 insertions(+)

diff --git a/Source/Core/VideoCommon/Src/Statistics.cpp b/Source/Core/VideoCommon/Src/Statistics.cpp
index 3dcd281b7f..0c69499355 100644
--- a/Source/Core/VideoCommon/Src/Statistics.cpp
+++ b/Source/Core/VideoCommon/Src/Statistics.cpp
@@ -55,6 +55,9 @@ char *Statistics::ToString(char *ptr)
 	ptr+=sprintf(ptr,"CP loads (DL): %i\n",stats.thisFrame.numCPLoadsInDL);
 	ptr+=sprintf(ptr,"BP loads: %i\n",stats.thisFrame.numBPLoads);
 	ptr+=sprintf(ptr,"BP loads (DL): %i\n",stats.thisFrame.numBPLoadsInDL);
+	ptr+=sprintf(ptr,"Vertex streamed: %i kB\n",stats.thisFrame.bytesVertexStreamed/1024);
+	ptr+=sprintf(ptr,"Index streamed: %i kB\n",stats.thisFrame.bytesIndexStreamed/1024);
+	ptr+=sprintf(ptr,"Uniform streamed: %i kB\n",stats.thisFrame.bytesUniformStreamed/1024);
 	ptr+=sprintf(ptr,"Vertex Loaders: %i\n",stats.numVertexLoaders);
 
 	std::string text1;
diff --git a/Source/Core/VideoCommon/Src/Statistics.h b/Source/Core/VideoCommon/Src/Statistics.h
index cb8a3afdc5..a7976651a5 100644
--- a/Source/Core/VideoCommon/Src/Statistics.h
+++ b/Source/Core/VideoCommon/Src/Statistics.h
@@ -60,6 +60,10 @@ struct Statistics
 		int numBufferSplits;
 
 		int numDListsCalled;
+		
+		int bytesVertexStreamed;
+		int bytesIndexStreamed;
+		int bytesUniformStreamed;
 	};
 	ThisFrame thisFrame;
 	void ResetFrame();
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
index bc5004d0c2..a2bdd360c2 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
@@ -345,6 +345,8 @@ ID3D11Buffer* &PixelShaderCache::GetConstantBuffer()
 		memcpy(map.pData, psconstants, sizeof(psconstants));
 		D3D::context->Unmap(pscbuf, 0);
 		pscbufchanged = false;
+		
+		ADDSTAT(stats.thisFrame.bytesUniformStreamed, sizeof(psconstants));
 	}
 	return pscbuf;
 }
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
index 1f2a662b53..46161e25a5 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
@@ -128,6 +128,9 @@ void VertexManager::PrepareDrawBuffers()
 	memcpy((u16*)map.pData + m_point_draw_index, GetPointIndexBuffer(), sizeof(u16) * IndexGenerator::GetPointindexLen());
 	D3D::context->Unmap(m_index_buffers[m_current_index_buffer], 0);
 	m_index_buffer_cursor += iCount;
+	
+	ADDSTAT(stats.thisFrame.bytesVertexStreamed, vSize);
+	ADDSTAT(stats.thisFrame.bytesIndexStreamed, iCount*sizeof(u16));
 }
 
 static const float LINE_PT_TEX_OFFSETS[8] = {
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp
index ade8d7697c..267f7c9642 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp
@@ -50,6 +50,8 @@ ID3D11Buffer* &VertexShaderCache::GetConstantBuffer()
 		memcpy(map.pData, vsconstants, sizeof(vsconstants));
 		D3D::context->Unmap(vscbuf, 0);
 		vscbufchanged = false;
+		
+		ADDSTAT(stats.thisFrame.bytesUniformStreamed, sizeof(vsconstants));
 	}
 	return vscbuf;
 }
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
index 348f2d89a2..e0592b12e0 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
@@ -197,6 +197,8 @@ void VertexManager::PrepareDrawBuffers(u32 stride)
 		D3D::SetIndices(m_index_buffers[m_current_index_buffer]);
 	}
 	
+	ADDSTAT(stats.thisFrame.bytesVertexStreamed, datasize);
+	ADDSTAT(stats.thisFrame.bytesIndexStreamed, IndexDataSize);
 }
 
 void VertexManager::DrawVertexBuffer(int stride)
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index 1c85177352..2df1f47760 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -171,6 +171,8 @@ void ProgramShaderCache::UploadConstants()
 		glBindBufferRange(GL_UNIFORM_BUFFER, 1, s_buffer->getBuffer(), offset, s_ps_data_size);
 		glBindBufferRange(GL_UNIFORM_BUFFER, 2, s_buffer->getBuffer(), offset + s_vs_data_offset, s_vs_data_size);
 		s_ubo_dirty = false;
+		
+		ADDSTAT(stats.thisFrame.bytesUniformStreamed, s_ubo_buffer_size);
 	}
 }
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
index 6e1590c1c6..59ea68504b 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
@@ -104,6 +104,9 @@ void VertexManager::PrepareDrawBuffers(u32 stride)
 	{
 		s_offset[2] = s_indexBuffer->Upload((u8*)GetPointIndexBuffer(), point_index_size * sizeof(u16));
 	}
+	
+	ADDSTAT(stats.thisFrame.bytesVertexStreamed, vertex_data_size);
+	ADDSTAT(stats.thisFrame.bytesIndexStreamed, index_size);
 }
 
 void VertexManager::Draw(u32 stride)

From 026ab26755487de4693b73f7079c164cd56cda2f Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Fri, 24 May 2013 19:04:06 -0400
Subject: [PATCH 118/352] Save settings to file when booting a game.

Fixes issue 6310.
---
 Source/Core/Core/Src/BootManager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp
index cf67b6f310..e4ce413926 100644
--- a/Source/Core/Core/Src/BootManager.cpp
+++ b/Source/Core/Core/Src/BootManager.cpp
@@ -60,6 +60,7 @@ bool BootCore(const std::string& _rFilename)
 	StartUp.m_BootType = SCoreStartupParameter::BOOT_ISO;
 	StartUp.m_strFilename = _rFilename;
 	SConfig::GetInstance().m_LastFilename = _rFilename;
+	SConfig::GetInstance().SaveSettings();
 	StartUp.bRunCompareClient = false;
 	StartUp.bRunCompareServer = false;
 

From 743230500f1bdd2bdf29787fb84feaff407faca5 Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Sat, 25 May 2013 03:03:12 -0400
Subject: [PATCH 119/352] Add auto fullscreen resolution option. Not tested on
 Linux, let me know if it doesn't work (it probably does).

Fixes issue 6082.
---
 Source/Core/DolphinWX/Src/FrameTools.cpp      | 5 +++--
 Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index c6d542bf85..8607fdb110 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -798,7 +798,7 @@ void CFrame::OnRenderParentResize(wxSizeEvent& event)
 void CFrame::ToggleDisplayMode(bool bFullscreen)
 {
 #ifdef _WIN32
-	if (bFullscreen)
+	if (bFullscreen && SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution != "Auto")
 	{
 		DEVMODE dmScreenSettings;
 		memset(&dmScreenSettings,0,sizeof(dmScreenSettings));
@@ -817,7 +817,8 @@ void CFrame::ToggleDisplayMode(bool bFullscreen)
 		ChangeDisplaySettings(NULL, CDS_FULLSCREEN);
 	}
 #elif defined(HAVE_XRANDR) && HAVE_XRANDR
-	m_XRRConfig->ToggleDisplayMode(bFullscreen);
+	if (SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution != "Auto")
+		m_XRRConfig->ToggleDisplayMode(bFullscreen);
 #elif defined __APPLE__
 	if(bFullscreen)
 		CGDisplayHideCursor(CGMainDisplayID());
diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
index 8c4ee9ebb4..5a7d11f96e 100644
--- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp
@@ -131,6 +131,7 @@ wxString shader_errors_desc = wxTRANSLATE("Usually if shader compilation fails,
 wxArrayString GetListOfResolutions()
 {
 	wxArrayString retlist;
+	retlist.Add("Auto");
 #ifdef _WIN32
 	DWORD iModeNum = 0;
 	DEVMODE dmi;

From 3378f7d6a7a87e995c2fba7bf0b9822cef8be65e Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Sat, 25 May 2013 11:43:56 +0200
Subject: [PATCH 120/352] fix auto fullscreen resolution on linux

---
 Source/Core/DolphinWX/Src/X11Utils.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Source/Core/DolphinWX/Src/X11Utils.cpp b/Source/Core/DolphinWX/Src/X11Utils.cpp
index 6c4282cceb..9be4d23fbf 100644
--- a/Source/Core/DolphinWX/Src/X11Utils.cpp
+++ b/Source/Core/DolphinWX/Src/X11Utils.cpp
@@ -200,6 +200,9 @@ XRRConfiguration::~XRRConfiguration()
 
 void XRRConfiguration::Update()
 {
+	if(SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution == "Auto")
+		return;
+	
 	if (!bValid)
 		return;
 

From ca12e7ee8f05da66743abe0d9826a7d145e8b28e Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Sat, 25 May 2013 13:51:52 -0400
Subject: [PATCH 121/352] Make auto fullscreen resolution the default.

---
 Source/Core/Core/Src/ConfigManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp
index 1eec9fd7b7..2d4f566485 100644
--- a/Source/Core/Core/Src/ConfigManager.cpp
+++ b/Source/Core/Core/Src/ConfigManager.cpp
@@ -334,7 +334,7 @@ void SConfig::LoadSettings()
 
 		// Display
 		ini.Get("Display", "Fullscreen",			&m_LocalCoreStartupParameter.bFullscreen,		false);
-		ini.Get("Display", "FullscreenResolution",	&m_LocalCoreStartupParameter.strFullscreenResolution, "640x480");
+		ini.Get("Display", "FullscreenResolution",	&m_LocalCoreStartupParameter.strFullscreenResolution, "Auto");
 		ini.Get("Display", "RenderToMain",			&m_LocalCoreStartupParameter.bRenderToMain,		false);
 		ini.Get("Display", "RenderWindowXPos",		&m_LocalCoreStartupParameter.iRenderWindowXPos,	-1);
 		ini.Get("Display", "RenderWindowYPos",		&m_LocalCoreStartupParameter.iRenderWindowYPos,	-1);

From 61aa272bfb71ace8823a86ad08813f644db7cad2 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sat, 25 May 2013 22:17:05 -0500
Subject: [PATCH 122/352] [Android] Qualcomm drivers require that the EGL
 context is created on the same thread that the OpenGL commands are run on.
 Crappy driver limitation since eglMakeCurrent should work to let it be on a
 different thread.

---
 .../Plugin_VideoSoftware/Src/SWmain.cpp       | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
index 82aa72ab2e..c63ad2e446 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
@@ -39,7 +39,7 @@ namespace SW
 static volatile bool fifoStateRun = false;
 static volatile bool emuRunningState = false;
 static std::mutex m_csSWVidOccupied;
-
+static void* m_windowhandle; 
 
 std::string VideoSoftware::GetName()
 {
@@ -62,15 +62,9 @@ void VideoSoftware::ShowConfig(void *_hParent)
 bool VideoSoftware::Initialize(void *&window_handle)
 {
 	g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str());
-	InitInterface();
-
-	if (!GLInterface->Create(window_handle))
-	{
-		INFO_LOG(VIDEO, "%s", "SWRenderer::Create failed\n");
-		return false;
-	}
-	// Do our OSD callbacks	
-	OSD::DoCallbacks(OSD::OSD_INIT);
+	InitInterface();	
+	
+	m_windowhandle = window_handle;
 
 	InitBPMemory();
 	InitXFMemory();
@@ -166,6 +160,12 @@ void VideoSoftware::Video_Cleanup()
 // This is called after Video_Initialize() from the Core
 void VideoSoftware::Video_Prepare()
 {
+	if (!GLInterface->Create(m_windowhandle))
+	{
+		INFO_LOG(VIDEO, "%s", "SWRenderer::Create failed\n");
+		return;
+	}
+
 	GLInterface->MakeCurrent();
 	// Init extension support.
 #ifndef USE_GLES
@@ -180,6 +180,9 @@ void VideoSoftware::Video_Prepare()
 	// Handle VSync on/off
 	GLInterface->SwapInterval(VSYNC_ENABLED);
 
+	// Do our OSD callbacks	
+	OSD::DoCallbacks(OSD::OSD_INIT);
+
 	HwRasterizer::Prepare();
 	SWRenderer::Prepare();
 

From 92bea77e56cfdcd9b7304719379a0ee4b67e57c3 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sat, 25 May 2013 22:20:10 -0500
Subject: [PATCH 123/352] [Android] Disable OpenGL in the settings menu since
 it doesn't work yet. Change some theme settings so the back button shows up
 on screen where needed.

---
 Source/Android/.idea/workspace.xml            | 422 +++++++++---------
 Source/Android/AndroidManifest.xml            |   7 +-
 Source/Android/res/values/prefvalues.xml      |   2 +-
 .../dolphinemu/DolphinEmulator.java           |   2 +-
 4 files changed, 211 insertions(+), 222 deletions(-)

diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index b6b28566ce..fa89dca9a9 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -13,6 +13,20 @@
         <target>android-17</target>
       </config>
     </shared>
+    <layouts>
+      <layout url="file://$PROJECT_DIR$/res/layout/folderbrowser.xml">
+        <config>
+          <device>Nexus 4</device>
+          <theme>@android:style/Theme.Holo</theme>
+        </config>
+      </layout>
+      <layout url="file://$PROJECT_DIR$/res/layout/main.xml">
+        <config>
+          <device>Nexus 4</device>
+          <theme>@android:style/Theme.Holo</theme>
+        </config>
+      </layout>
+    </layouts>
   </component>
   <component name="BookmarkManager">
     <bookmark url="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" line="37" />
@@ -27,7 +41,7 @@
     <file path="/SettingBrowser.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368965879091" ignored="false" />
     <file path="/SettingMenuItem.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368957197656" ignored="false" />
     <file path="/SettingMenuAdapter.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368957350110" ignored="false" />
-    <file path="/AndroidManifest.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369032503953" ignored="false" />
+    <file path="/AndroidManifest.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369534483869" ignored="false" />
     <file path="/EditNameDialog.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369023935830" ignored="false" />
     <file path="/PrefsActivity.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369031747746" ignored="false" />
     <file path="/PrefsFragment.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369032642639" ignored="false" />
@@ -35,6 +49,10 @@
     <file path="$PROJECT_DIR$/gen/org/dolphinemu/dolphinemu/BuildConfig.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369127789356" ignored="false" />
     <file path="/prefvalues.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369036331457" ignored="false" />
     <file path="/FolderBrowser.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369217914695" ignored="false" />
+    <file path="/DolphinEmulator.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369534697502" ignored="false" />
+    <file path="/a.groovy" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369535676012" ignored="false" />
+    <file path="/a.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369535541830" ignored="false" />
+    <file path="/sample.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369535538754" ignored="false" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -54,6 +72,7 @@
     <disable_hints />
   </component>
   <component name="DebuggerManager">
+    <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
     <breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
       <breakpoint>
         <option name="NOTIFY_CAUGHT" value="true" />
@@ -90,7 +109,6 @@
         <option name="LOG_MESSAGE" value="" />
       </breakpoint>
     </breakpoint_any>
-    <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
     <breakpoint_rules />
     <ui_properties />
   </component>
@@ -103,19 +121,26 @@
       <file leaf-file-name="DolphinEmulator.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="117" column="29" selection-start="3221" selection-end="3223" vertical-scroll-proportion="-10.538462">
+            <state line="164" column="4" selection-start="4827" selection-end="4827" vertical-scroll-proportion="-9.307693">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="GameListView.java" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="AndroidManifest.xml" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="6" column="72" selection-start="281" selection-end="281" vertical-scroll-proportion="0.23316061">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="GameListView.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="41" column="57" selection-start="1271" selection-end="1275" vertical-scroll-proportion="0.33236152">
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state line="51" column="78" selection-start="1629" selection-end="1629" vertical-scroll-proportion="0.0">
+              <folding />
             </state>
           </provider>
         </entry>
@@ -124,22 +149,40 @@
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
           <provider selected="true" editor-type-id="text-editor">
             <state line="81" column="36" selection-start="2675" selection-end="2675" vertical-scroll-proportion="0.0">
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
       <file leaf-file-name="prefs.xml" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
+          <provider editor-type-id="android-designer">
+            <state />
+          </provider>
           <provider selected="true" editor-type-id="text-editor">
-            <state line="21" column="41" selection-start="857" selection-end="857" vertical-scroll-proportion="-3.04">
+            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0">
               <folding />
             </state>
           </provider>
-          <provider editor-type-id="android-designer">
-            <state />
+        </entry>
+      </file>
+      <file leaf-file-name="prefvalues.xml" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="14" column="31" selection-start="392" selection-end="392" vertical-scroll-proportion="-8.4">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PrefsActivity.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="14" column="0" selection-start="389" selection-end="389" vertical-scroll-proportion="0.0">
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
           </provider>
         </entry>
       </file>
@@ -167,16 +210,16 @@
         <option value="$PROJECT_DIR$/res/layout/fragment_edit_name.xml" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/EditNameDialog.java" />
         <option value="$PROJECT_DIR$/res/values/array.xml" />
-        <option value="$PROJECT_DIR$/AndroidManifest.xml" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsFragment.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java" />
         <option value="$PROJECT_DIR$/res/values/prefs.xml" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingBrowser.java" />
         <option value="$PROJECT_DIR$/res/layout/prefs.xml" />
-        <option value="$PROJECT_DIR$/res/values/prefvalues.xml" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java" />
+        <option value="$PROJECT_DIR$/res/values/prefvalues.xml" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
+        <option value="$PROJECT_DIR$/AndroidManifest.xml" />
       </list>
     </option>
   </component>
@@ -188,6 +231,22 @@
     <option name="width" value="1342" />
     <option name="height" value="744" />
   </component>
+  <component name="ProjectInspectionProfilesVisibleTreeState">
+    <entry key="Project Default">
+      <profile-state>
+        <expanded-state>
+          <State>
+            <id />
+          </State>
+        </expanded-state>
+        <selected-state>
+          <State>
+            <id>Abstraction issues</id>
+          </State>
+        </selected-state>
+      </profile-state>
+    </entry>
+  </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <OptionsSetting value="true" id="Add" />
     <OptionsSetting value="true" id="Remove" />
@@ -214,45 +273,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dolphinemu" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
       <pane id="Scope">
         <subPane subId="Project Files">
           <PATH>
@@ -297,66 +317,43 @@
               <option name="myItemType" value="" />
             </PATH_ELEMENT>
           </PATH>
+        </subPane>
+      </pane>
+      <pane id="PackagesPane" />
+      <pane id="ProjectPane">
+        <subPane>
           <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="res">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="values">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
           </PATH>
           <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="res">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="layout">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
           <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="res">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dolphinemu" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
@@ -364,25 +361,46 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="options.searchVisible" value="true" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="recentsLimit" value="5" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="978fa698" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
     <property name="dynamic.classpath" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="options.splitter.main.proportions" value="0.3" />
-    <property name="restartRequiresConfirmation" value="true" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="options.splitter.details.proportions" value="0.2" />
-    <property name="options.lastSelected" value="project.propVCSSupport.Mappings" />
     <property name="GoToClass.includeLibraries" value="false" />
+    <property name="MemberChooser.showClasses" value="true" />
+    <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="recentsLimit" value="5" />
     <property name="MemberChooser.sorted" value="false" />
     <property name="FullScreen" value="false" />
+    <property name="options.searchVisible" value="true" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
+    <property name="restartRequiresConfirmation" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="options.splitter.main.proportions" value="0.3" />
+    <property name="GoToFile.includeJavaFiles" value="false" />
+    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+    <property name="options.lastSelected" value="android.dex.compiler" />
+    <property name="MemberChooser.copyJavadoc" value="false" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="192.168.0.188:5555" />
   </component>
   <component name="RunManager" selected="Android Application.Dolphin Emulator">
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+      <method />
+    </configuration>
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <method />
+    </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
       <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -417,24 +435,13 @@
       <envs />
       <method />
     </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
+    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
       <module name="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
-      <module name="" />
-      <option name="ACTIVITY_CLASS" value="" />
-      <option name="MODE" value="default_activity" />
-      <option name="DEPLOY" value="true" />
+      <option name="TESTING_TYPE" value="0" />
+      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
+      <option name="METHOD_NAME" value="" />
+      <option name="CLASS_NAME" value="" />
+      <option name="PACKAGE_NAME" value="" />
       <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
       <option name="PREFERRED_AVD" value="" />
       <option name="USE_COMMAND_LINE" value="true" />
@@ -446,21 +453,11 @@
       <option name="CLEAR_LOGCAT" value="false" />
       <method />
     </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
+    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
-      <option name="TESTING_TYPE" value="0" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="PACKAGE_NAME" value="" />
+      <option name="ACTIVITY_CLASS" value="" />
+      <option name="MODE" value="default_activity" />
+      <option name="DEPLOY" value="true" />
       <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
       <option name="PREFERRED_AVD" value="" />
       <option name="USE_COMMAND_LINE" value="true" />
@@ -542,11 +539,15 @@
       <workItem from="1369030521257" duration="6092000" />
       <workItem from="1369127738883" duration="3497000" />
       <workItem from="1369215536267" duration="2414000" />
+      <workItem from="1369296443609" duration="7832000" />
+      <workItem from="1369308108390" duration="81000" />
+      <workItem from="1369310924441" duration="263000" />
+      <workItem from="1369391881947" duration="6610000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="32602000" />
+    <option name="totallyTimeSpent" value="47388000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -572,30 +573,30 @@
     <frame x="24" y="0" width="1342" height="744" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2179289" sideWeight="0.68456376" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2179289" sideWeight="0.6912752" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6912752" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3110368" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30872482" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31543624" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31543624" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16306028" sideWeight="0.6812081" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6812081" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="VcsContentAnnotationSettings">
@@ -659,22 +660,6 @@
     <breakpoint-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="92" column="12" selection-start="2123" selection-end="2222" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="118" column="34" selection-start="3985" selection-end="3985" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
@@ -685,9 +670,7 @@
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="58" column="30" selection-start="1963" selection-end="1963" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -715,38 +698,49 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
+    <entry file="jar://$APPLICATION_HOME_DIR$/sdk/platforms/android-17/android.jar!/android/app/Activity.class">
       <provider selected="true" editor-type-id="text-editor">
+        <state line="132" column="0" selection-start="5190" selection-end="5190" vertical-scroll-proportion="2.0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/layout/folderbrowser.xml">
+      <provider selected="true" editor-type-id="android-designer">
+        <state />
+      </provider>
+      <provider editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="e#659#677#0" expanded="true" />
-            <element signature="e#767#785#0" expanded="true" />
-            <element signature="e#1338#1356#0" expanded="true" />
-            <element signature="e#1646#1664#0" expanded="true" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/res/layout/main.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="2" column="0" selection-start="112" selection-end="190" vertical-scroll-proportion="-0.6">
+      <provider selected="true" editor-type-id="android-designer">
+        <state />
+      </provider>
+      <provider editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
-      <provider editor-type-id="android-designer">
-        <state />
-      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="23" column="9" selection-start="698" selection-end="698" vertical-scroll-proportion="0.39473686">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state line="81" column="36" selection-start="2675" selection-end="2675" vertical-scroll-proportion="0.0">
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="51" column="78" selection-start="1629" selection-end="1629" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/layout/folderbrowserfooter.xml">
+      <provider editor-type-id="android-designer">
+        <state />
+      </provider>
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
@@ -758,21 +752,21 @@
         <state />
       </provider>
       <provider selected="true" editor-type-id="text-editor">
-        <state line="21" column="41" selection-start="857" selection-end="857" vertical-scroll-proportion="-3.04">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$APPLICATION_HOME_DIR$/sdk/platforms/android-17/android.jar!/android/app/Activity.class">
+    <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="132" column="0" selection-start="5190" selection-end="5190" vertical-scroll-proportion="2.0">
+        <state line="14" column="31" selection-start="392" selection-end="392" vertical-scroll-proportion="-8.4">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="81" column="36" selection-start="2675" selection-end="2675" vertical-scroll-proportion="0.0">
+        <state line="14" column="0" selection-start="389" selection-end="389" vertical-scroll-proportion="0.0">
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -781,17 +775,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="117" column="29" selection-start="3221" selection-end="3223" vertical-scroll-proportion="-10.538462">
+        <state line="164" column="4" selection-start="4827" selection-end="4827" vertical-scroll-proportion="-9.307693">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
+    <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="41" column="57" selection-start="1271" selection-end="1275" vertical-scroll-proportion="0.33236152">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state line="6" column="72" selection-start="281" selection-end="281" vertical-scroll-proportion="0.23316061">
+          <folding />
         </state>
       </provider>
     </entry>
diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index 2812e35815..e9c33670e9 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -28,18 +28,15 @@
         <activity 
             android:name="org.dolphinemu.dolphinemu.GameListView"
             android:label="@string/app_name"
-            android:theme="@android:style/Theme"
             android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
         </activity>
         <activity
             android:name="org.dolphinemu.dolphinemu.FolderBrowser"
             android:label="@string/app_name"
-            android:theme="@android:style/Theme"
             android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
         </activity>
-            <activity
-            android:name=".PrefsActivity"
-            android:theme="@android:style/Theme.Black.NoTitleBar" >
+        <activity
+                android:name=".PrefsActivity" >
         </activity>
     </application>
 
diff --git a/Source/Android/res/values/prefvalues.xml b/Source/Android/res/values/prefvalues.xml
index 77354f76a4..3f67dcbe5b 100644
--- a/Source/Android/res/values/prefvalues.xml
+++ b/Source/Android/res/values/prefvalues.xml
@@ -12,7 +12,7 @@
 
     <string-array name="gpuOptions">
         <item>Software Renderer</item>
-        <item>OpenGL</item>
+        <!--item>OpenGL</item-->
     </string-array>
 
     <string-array name="gpuValues">
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index c3d6d8ae06..7edd0fe936 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -163,7 +163,7 @@ public class DolphinEmulator<MainActivity> extends Activity
 		return false;
 	}
 	
-	public boolean overrideKeys()
+    public boolean overrideKeys()
 	{   
 		return false;
 	}  

From 4a3bbf6165376e6cad4f2d139d33f84c261491ba Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sat, 25 May 2013 23:00:30 -0500
Subject: [PATCH 124/352] [Android] Drop minimum Android version support to 2.3
 since there is a /bunch/ of people asking for it.

---
 Source/Android/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index e9c33670e9..cb7814c703 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -4,7 +4,7 @@
     android:versionCode="2"
     android:versionName="0.2" >
 
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14"/>
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
     
     <uses-feature android:glEsVersion="0x00020000"></uses-feature>
 		<uses-feature android:name="android.hardware.screen.landscape" />

From 0bd8aaf9d428a59c761caecb50d56172824edbd5 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sat, 25 May 2013 23:16:47 -0500
Subject: [PATCH 125/352] [Android] 0.3 Release

---
 Source/Android/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index cb7814c703..d66ce154e2 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.dolphinemu.dolphinemu"
-    android:versionCode="2"
-    android:versionName="0.2" >
+    android:versionCode="3"
+    android:versionName="0.3" >
 
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
     

From f06fc78814dbc1a30a85c226fd8a9801dfdd34a0 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sun, 26 May 2013 22:29:40 -0500
Subject: [PATCH 126/352] [Android] Properly open the navigation drawer when
 pressing menu or back in the game list.

---
 Source/Android/AndroidManifest.xml            |  4 +--
 .../dolphinemu/dolphinemu/GameListView.java   | 35 ++++++++-----------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index d66ce154e2..adf52eb360 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.dolphinemu.dolphinemu"
-    android:versionCode="3"
-    android:versionName="0.3" >
+    android:versionCode="4"
+    android:versionName="0.4" >
 
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
     
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
index ad2df58fa3..314e8e0ae5 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
@@ -6,7 +6,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.view.MenuItem;
+import android.view.KeyEvent;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
@@ -205,25 +205,18 @@ public class GameListView extends ListActivity {
     	mDrawer.setContentView(layoutResID);
         onContentChanged();
     }
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-            	mDrawer.toggleMenu();
-                return true;
-        }
 
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void onBackPressed() {
-        final int drawerState = mDrawer.getDrawerState();
-        if (drawerState == MenuDrawer.STATE_OPEN || drawerState == MenuDrawer.STATE_OPENING) {
-        	mDrawer.closeMenu();
-            return;
-        }
-
-        super.onBackPressed();
-    }
+	@Override
+	public boolean onKeyUp(int keyCode, KeyEvent event) {
+		if (event.getAction() == KeyEvent.KEYCODE_MENU|| event.getAction() == KeyEvent.KEYCODE_BACK) {
+			final int drawerState = mDrawer.getDrawerState();
+			if (drawerState == MenuDrawer.STATE_OPEN || drawerState == MenuDrawer.STATE_OPENING) {
+				mDrawer.closeMenu();
+				return true;
+			}
+			mDrawer.openMenu();
+			return true;
+		}
+		return false;
+	}
 }

From 2697b8c04f9e7c8d0a40bd42db95b4a534947c43 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sun, 26 May 2013 22:30:38 -0500
Subject: [PATCH 127/352] Create our OGL context on the same thread in the
 OpenGL backend. Same issue with Qualcomm not working with threading
 correctly.

---
 Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp |  5 +++-
 Source/Plugins/Plugin_VideoOGL/Src/main.cpp   | 26 ++++++++++---------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
index d7a891ecd1..7323f7f3e5 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
@@ -24,7 +24,10 @@ namespace OGL
 // Draw messages on top of the screen
 unsigned int VideoBackend::PeekMessages()
 {
-	return GLInterface->PeekMessages();
+	if (GLInterface)
+		return GLInterface->PeekMessages();
+	else 
+		return 0;
 }
 
 // Show the current FPS
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
index 4356418c81..596a4cd86d 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
@@ -89,6 +89,7 @@ Make AA apply instantly during gameplay if possible
 
 namespace OGL
 {
+static void* m_windowhandle; 
 
 std::string VideoBackend::GetName()
 {
@@ -149,15 +150,12 @@ void VideoBackend::ShowConfig(void *_hParent)
 	diag.ShowModal();
 #endif
 }
-void Test(u32 Data)
-{
-	printf("Data: %d\n", Data);
-}
 bool VideoBackend::Initialize(void *&window_handle)
 {
 	InitializeShared();
 	InitBackendInfo();
-
+	
+	m_windowhandle = window_handle;
 	frameCount = 0;
 
 	g_Config.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_opengl.ini").c_str());
@@ -166,13 +164,7 @@ bool VideoBackend::Initialize(void *&window_handle)
 	g_Config.VerifyValidity();
 	UpdateActiveConfig();
 
-	InitInterface();
-	if (!GLInterface->Create(window_handle))
-		return false;
-
-	// Do our OSD callbacks	
-	OSD::DoCallbacks(OSD::OSD_INIT);
-
+	
 	s_BackendInitialized = true;
 
 	return true;
@@ -182,6 +174,16 @@ bool VideoBackend::Initialize(void *&window_handle)
 // Run from the graphics thread
 void VideoBackend::Video_Prepare()
 {
+	InitInterface();
+	if (!GLInterface->Create(m_windowhandle))
+	{
+		INFO_LOG(VIDEO, "%s", "GLInterface::Create failed\n");
+		return;
+	}
+
+	// Do our OSD callbacks	
+	OSD::DoCallbacks(OSD::OSD_INIT);
+
 	GLInterface->MakeCurrent();
 
 	g_renderer = new Renderer;

From 388ddee68508bcfdaf865182c0903a7f27bc5bbc Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Mon, 27 May 2013 15:38:36 +0200
Subject: [PATCH 128/352] Adding condition to CoreTiming state function

because ev->type might be undefined in MODE_READ
---
 Source/Core/Core/Src/CoreTiming.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Source/Core/Core/Src/CoreTiming.cpp b/Source/Core/Core/Src/CoreTiming.cpp
index af56ab25bb..06770aa375 100644
--- a/Source/Core/Core/Src/CoreTiming.cpp
+++ b/Source/Core/Core/Src/CoreTiming.cpp
@@ -170,7 +170,10 @@ void EventDoState(PointerWrap &p, BaseEvent* ev)
 
 	// we can't savestate ev->type directly because events might not get registered in the same order (or at all) every time.
 	// so, we savestate the event's type's name, and derive ev->type from that when loading.
-	std::string name = event_types[ev->type].name;
+	std::string name;
+	if (p.GetMode() != PointerWrap::MODE_READ)
+		name = event_types[ev->type].name;
+
 	p.Do(name);
 	if (p.GetMode() == PointerWrap::MODE_READ)
 	{

From 4dad640d5f58c226c0e6fd757edd13fe23099856 Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Tue, 28 May 2013 02:03:06 +0200
Subject: [PATCH 129/352] Reading shake force from calibration rather than a
 constant

because that allow maximum force regardless of calibration
---
 .../Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp |  4 ++--
 Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp      | 10 +++++++---
 Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h        |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp
index 0abe0d4b9c..47cb95905e 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/Attachment/Nunchuk.cpp
@@ -72,6 +72,7 @@ void Nunchuk::GetState(u8* const data, const bool focus)
 	m_stick->GetState(&ncdata->jx, &ncdata->jy, 0x80, focus ? 127 : 0);
 	
 	AccelData accel;
+	accel_cal* calib = (accel_cal*)&reg[0x20];
 
 	// tilt
 	EmulateTilt(&accel, m_tilt, focus);
@@ -81,7 +82,7 @@ void Nunchuk::GetState(u8* const data, const bool focus)
 		// swing
 		EmulateSwing(&accel, m_swing);
 		// shake
-		EmulateShake(&accel, m_shake, m_shake_step);
+		EmulateShake(&accel, calib, m_shake, m_shake_step);
 		// buttons
 		m_buttons->GetState(&ncdata->bt, nunchuk_button_bitmasks);
 	}
@@ -119,7 +120,6 @@ void Nunchuk::GetState(u8* const data, const bool focus)
 	}
 
 	wm_accel* dt = (wm_accel*)&ncdata->ax;
-	accel_cal* calib = (accel_cal*)&reg[0x20];
 	dt->x = u8(trim(accel.x * (calib->one_g.x - calib->zero_g.x) + calib->zero_g.x));
 	dt->y = u8(trim(accel.y * (calib->one_g.y - calib->zero_g.y) + calib->zero_g.y));
 	dt->z = u8(trim(accel.z * (calib->one_g.z - calib->zero_g.z) + calib->zero_g.z));
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
index 196b38ab57..5ccfb19b43 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -86,6 +86,7 @@ const ReportFeatures reporting_mode_features[] =
 };
 
 void EmulateShake(AccelData* const accel
+	  , accel_cal* const calib
 	  , ControllerEmu::Buttons* const buttons_group
 	  , u8* const shake_step )
 {
@@ -94,7 +95,7 @@ void EmulateShake(AccelData* const accel
 	auto const shake_step_max = 15;
 
 	// peak G-force
-	auto const shake_intensity = 3.f;
+	double shake_intensity;
 	
 	// shake is a bitfield of X,Y,Z shake button states
 	static const unsigned int btns[] = { 0x01, 0x02, 0x04 };
@@ -105,6 +106,9 @@ void EmulateShake(AccelData* const accel
 	{
 		if (shake & (1 << i))
 		{
+			double zero = double((&(calib->zero_g.x))[i]);
+			double one = double((&(calib->one_g.x))[i]);
+			shake_intensity = max(zero / (one - zero), (255.f - zero) / (one - zero));
 			(&(accel->x))[i] = std::sin(TAU * shake_step[i] / shake_step_max) * shake_intensity;
 			shake_step[i] = (shake_step[i] + 1) % shake_step_max;
 		}
@@ -406,6 +410,7 @@ void Wiimote::GetAccelData(u8* const data, u8* const buttons)
 	const bool has_focus = HAS_FOCUS;
 	const bool is_sideways = m_options->settings[1]->value != 0;
 	const bool is_upright = m_options->settings[2]->value != 0;
+	accel_cal* calib = (accel_cal*)&m_eeprom[0x16];
 
 	// ----TILT----
 	EmulateTilt(&m_accel, m_tilt, has_focus, is_sideways, is_upright);
@@ -415,11 +420,10 @@ void Wiimote::GetAccelData(u8* const data, u8* const buttons)
 	if (has_focus)
 	{
 		EmulateSwing(&m_accel, m_swing, is_sideways, is_upright);
-		EmulateShake(&m_accel, m_shake, m_shake_step);
+		EmulateShake(&m_accel, calib, m_shake, m_shake_step);
 		UDPTLayer::GetAcceleration(m_udp, &m_accel);
 	}
 	wm_accel* dt = (wm_accel*)data;
-	accel_cal* calib = (accel_cal*)&m_eeprom[0x16];
 	double cx,cy,cz;
 	cx=trim(m_accel.x*(calib->one_g.x-calib->zero_g.x)+calib->zero_g.x);
 	cy=trim(m_accel.y*(calib->one_g.y-calib->zero_g.y)+calib->zero_g.y);
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h
index 05045de32a..828594a4f7 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h
@@ -45,6 +45,7 @@ struct ADPCMState
 extern const ReportFeatures reporting_mode_features[];
 
 void EmulateShake(AccelData* const accel_data
+	  , accel_cal* const calib
 	  , ControllerEmu::Buttons* const buttons_group
 	  , u8* const shake_step);
 

From 80b09c074e610304d3e34ba05c80c41a6d872507 Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Sun, 5 May 2013 04:50:39 +0200
Subject: [PATCH 130/352] Changing the Gecko code comparison from metadata to
 data comparison

because different data sometimes have the same metadata
---
 Source/Core/Core/Src/GeckoCode.cpp          | 32 +++++++++++++++++++++
 Source/Core/Core/Src/GeckoCode.h            |  3 ++
 Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp |  5 ++--
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/Source/Core/Core/Src/GeckoCode.cpp b/Source/Core/Core/Src/GeckoCode.cpp
index f93bbd1b4c..c7127ef018 100644
--- a/Source/Core/Core/Src/GeckoCode.cpp
+++ b/Source/Core/Core/Src/GeckoCode.cpp
@@ -63,6 +63,38 @@ u32 GeckoCode::Code::GetAddress() const
 	return gcaddress + (use_po ? pointer_address : (base_address & 0xFE000000));
 }
 
+// return true if a code exists
+bool GeckoCode::Exist(u32 address, u32 data)
+{
+	std::vector<GeckoCode::Code>::const_iterator
+		codes_iter = codes.begin(),
+		codes_end = codes.end();
+	for (; codes_iter != codes_end; ++codes_iter)
+	{
+		if (codes_iter->address == address && codes_iter->data == data)
+			return true;
+	}
+	return false;
+}
+
+// return true if the code is identical
+bool GeckoCode::Compare(GeckoCode compare) const
+{
+	if (codes.size() != compare.codes.size())
+		return false;
+
+	int exist = 0;
+	std::vector<GeckoCode::Code>::const_iterator
+		codes_iter = codes.begin(),
+		codes_end = codes.end();
+	for (; codes_iter != codes_end; ++codes_iter)
+	{
+		if (compare.Exist(codes_iter->address, codes_iter->data))
+			exist++;
+	}
+	return exist == codes.size();
+}
+
 static std::mutex active_codes_lock;
 
 // currently running code
diff --git a/Source/Core/Core/Src/GeckoCode.h b/Source/Core/Core/Src/GeckoCode.h
index 42ac941523..59da6fd091 100644
--- a/Source/Core/Core/Src/GeckoCode.h
+++ b/Source/Core/Core/Src/GeckoCode.h
@@ -66,6 +66,9 @@ namespace Gecko
 		std::vector<std::string>	notes;
 
 		bool	enabled;
+
+		bool Compare(GeckoCode compare) const;
+		bool Exist(u32 address, u32 data);
 	};
 
 	void SetActiveCodes(const std::vector<GeckoCode>& gcodes);
diff --git a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp
index efd4a3a990..39130bcf8e 100644
--- a/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp
+++ b/Source/Core/DolphinWX/Src/GeckoCodeDiag.cpp
@@ -283,9 +283,8 @@ void CodeConfigPanel::DownloadCodes(wxCommandEvent&)
 						break;
 					}
 
-					// code with this name+creator exists
-					if (existing_gcodes_iter->name == gcodes_iter->name &&
-						existing_gcodes_iter->creator == gcodes_iter->creator)
+					// code exists
+					if (existing_gcodes_iter->Compare(*gcodes_iter))
 						break;
 				}
 			}

From 7aae9ccbc0494cd468a37413d7199061bd1981d2 Mon Sep 17 00:00:00 2001
From: eli173 <eli@eli173.com>
Date: Sat, 1 Jun 2013 19:17:52 -0500
Subject: [PATCH 131/352] Added optimizations to ClassifyFloat/Double functions
 in Mathutil.cpp and to PPCCache.cpp

---
 Source/Core/Common/Src/MathUtil.cpp       | 89 +++++++++++------------
 Source/Core/Core/Src/PowerPC/PPCCache.cpp | 48 ++++++------
 2 files changed, 64 insertions(+), 73 deletions(-)

diff --git a/Source/Core/Common/Src/MathUtil.cpp b/Source/Core/Common/Src/MathUtil.cpp
index 0e90328ee0..fc79a54ef0 100644
--- a/Source/Core/Common/Src/MathUtil.cpp
+++ b/Source/Core/Common/Src/MathUtil.cpp
@@ -13,61 +13,54 @@ namespace MathUtil
 {
 
 u32 ClassifyDouble(double dvalue)
-{
-	// TODO: Optimize the below to be as fast as possible.
-	IntDouble value;
-	value.d = dvalue;
-	u64 sign = value.i & DOUBLE_SIGN;
-	u64 exp  = value.i & DOUBLE_EXP;
-	if (exp > DOUBLE_ZERO && exp < DOUBLE_EXP) 
-	{
-		// Nice normalized number.
-		return sign ? PPC_FPCLASS_NN : PPC_FPCLASS_PN;
-	}
-	else
-	{
-		u64 mantissa = value.i & DOUBLE_FRAC;
-		if (mantissa)
-		{
-			if (exp)
-			{
-				return PPC_FPCLASS_QNAN;
-			}
-			else
-			{
-				// Denormalized number.
-				return sign ? PPC_FPCLASS_ND : PPC_FPCLASS_PD;
-			}
-		}
-		else if (exp)
-		{
-			//Infinite
-			return sign ? PPC_FPCLASS_NINF : PPC_FPCLASS_PINF;
-		}
-		else
-		{
-			//Zero
-			return sign ? PPC_FPCLASS_NZ : PPC_FPCLASS_PZ;
-		}
-	}
-}
+    {
+        // TODO: Optimize the below to be as fast as possible.
+        u64 exp  = *(u64*)(&dvalue) & DOUBLE_EXP;
+        if (exp != DOUBLE_ZERO && exp != DOUBLE_EXP)
+        {
+            // Nice normalized number.
+            return *(u64*)(&dvalue)&DOUBLE_SIGN ? PPC_FPCLASS_NN : PPC_FPCLASS_PN;
+        }
+        else
+        {
+            if (*(u64*)(&dvalue) & DOUBLE_FRAC)
+            {
+                if (exp)
+                {
+                    return PPC_FPCLASS_QNAN;
+                }
+                else
+                {
+                    // Denormalized number.
+                    return *(u64*)(&dvalue)&DOUBLE_SIGN ? PPC_FPCLASS_ND : PPC_FPCLASS_PD;
+                }
+            }
+            else if (exp)
+            {
+                //Infinite
+                return *(u64*)(&dvalue)&DOUBLE_SIGN ? PPC_FPCLASS_NINF : PPC_FPCLASS_PINF;
+            }
+            else
+            {
+                //Zero
+                return *(u64*)(&dvalue)&DOUBLE_SIGN ? PPC_FPCLASS_NZ : PPC_FPCLASS_PZ;
+            }
+        }
+    }
+
 
 u32 ClassifyFloat(float fvalue)
 {
 	// TODO: Optimize the below to be as fast as possible.
-	IntFloat value;
-	value.f = fvalue;
-	u32 sign = value.i & FLOAT_SIGN;
-	u32 exp  = value.i & FLOAT_EXP;
+	u32 exp  = *(u32*)(&fvalue) & FLOAT_EXP;
 	if (exp > FLOAT_ZERO && exp < FLOAT_EXP) 
 	{
 		// Nice normalized number.
-		return sign ? PPC_FPCLASS_NN : PPC_FPCLASS_PN;
+		return *(u32*)(&fvalue) & FLOAT_SIGN ? PPC_FPCLASS_NN : PPC_FPCLASS_PN;
 	}
 	else
 	{
-		u32 mantissa = value.i & FLOAT_FRAC;
-		if (mantissa)
+		if (*(u32*)(&fvalue) & FLOAT_FRAC)
 		{
 			if (exp)
 			{
@@ -76,18 +69,18 @@ u32 ClassifyFloat(float fvalue)
 			else
 			{
 				// Denormalized number.
-				return sign ? PPC_FPCLASS_ND : PPC_FPCLASS_PD;
+				return *(u32*)(&fvalue) & FLOAT_SIGN ? PPC_FPCLASS_ND : PPC_FPCLASS_PD;
 			}
 		} 
 		else if (exp) 
 		{
 			// Infinite
-			return sign ? PPC_FPCLASS_NINF : PPC_FPCLASS_PINF;
+			return *(u32*)(&fvalue) & FLOAT_SIGN ? PPC_FPCLASS_NINF : PPC_FPCLASS_PINF;
 		} 
 		else 
 		{
 			//Zero
-			return sign ? PPC_FPCLASS_NZ : PPC_FPCLASS_PZ;
+			return *(u32*)(&fvalue) & FLOAT_SIGN ? PPC_FPCLASS_NZ : PPC_FPCLASS_PZ;
 		}
 	}
 }
diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.cpp b/Source/Core/Core/Src/PowerPC/PPCCache.cpp
index 4ead232b18..e1940ec18c 100644
--- a/Source/Core/Core/Src/PowerPC/PPCCache.cpp
+++ b/Source/Core/Core/Src/PowerPC/PPCCache.cpp
@@ -26,31 +26,29 @@ namespace PowerPC
 
 		for (u32 m = 0; m < 128; m++)
 		{
-			u32 b[7];
-			for (int i = 0; i < 7; i++) b[i] = m & (1<<i);
-			u32 w;
-			if (b[0])
-				if (b[2])
-					if (b[6])
-						w = 7;
-					else
-						w = 6;
-				else
-					if (b[5])
-						w = 5;
-					else
-						w = 4;
-			else
-				if (b[1])
-					if (b[4])
-						w = 3;
-					else
-						w = 2;
-				else
-					if (b[3])
-						w = 1;
-					else
-						w = 0;
+            u32 w;
+            if(m & (1<<0))
+                if(m & (1<<2))
+                    if(m & (1<<6))
+                        w=7;
+                    else
+                        w=6;
+                    else
+                        if(m & (1<<5))
+                            w=5;
+                        else
+                            w=4;
+                        else
+                            if(m & (1<<1))
+                                if(m & (1<<4))
+                                    w=3;
+                                else
+                                    w=2;
+                                else
+                                    if(m & (1<<3))
+                                        w=1;
+                                    else
+                                        w=0;
 			way_from_plru[m] = w;
 		}
 	}

From b6e1127c8a14aac8c6f5c322809274977abdb2ae Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Thu, 10 Nov 2011 09:27:33 +0100
Subject: [PATCH 132/352] Adding stick radius setting

because that makes it easier to adjust it

Adding visual aid for the hardware range because that makes it easier to adjust the radius relative to it
---
 .../DolphinWX/Src/InputConfigDiagBitmaps.cpp  | 48 +++++++++++++++++--
 Source/Core/InputCommon/Src/ControllerEmu.cpp |  1 +
 Source/Core/InputCommon/Src/ControllerEmu.h   | 19 ++++++--
 3 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp b/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp
index 9561295cb3..74015bd274 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp
+++ b/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp
@@ -89,13 +89,53 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
 						dc.DrawRectangle( 0, 31 - z*31, 64, 2);
 					}
 
-					// circle for visual aid for diagonal adjustment
+					// octagon for visual aid for diagonal adjustment
 					dc.SetPen(*wxLIGHT_GREY_PEN);
 					dc.SetBrush(*wxWHITE_BRUSH);
 					if ( GROUP_TYPE_STICK == (*g)->control_group->type )
 					{
-						dc.SetBrush(*wxTRANSPARENT_BRUSH);
-						dc.DrawCircle( 32, 32, 32);
+						// outline and fill colors
+						wxBrush LightGrayBrush(_T("#dddddd"));
+						wxPen LightGrayPen(_T("#bfbfbf"));
+						dc.SetBrush(LightGrayBrush);
+						dc.SetPen(LightGrayPen);
+
+						// polygon offset
+						float max
+							, diagonal
+							, box = 64
+							, d_of = box / 256.0
+							, x_of = box / 2.0;
+
+						if ((*g)->control_group->name == "Main Stick")
+						{
+							max = (87.0 / 127.0) * 100;
+							diagonal = (55.0 / 127.0) * 100.0;
+						}
+						else if ((*g)->control_group->name == "C-Stick")
+						{
+							max = (74.0 / 127.0) * 100;
+							diagonal = (46.0 / 127.0) * 100;
+						}
+						else
+						{
+							max = (82.0 / 127.0) * 100;
+							diagonal = (58.0 / 127.0) * 100;
+						}
+
+						// polygon corners
+						wxPoint Points[8];
+						Points[0].x = (int)(0.0 * d_of + x_of); Points[0].y = (int)(max * d_of + x_of);
+						Points[1].x = (int)(diagonal * d_of + x_of); Points[1].y = (int)(diagonal * d_of + x_of);
+						Points[2].x = (int)(max * d_of + x_of); Points[2].y = (int)(0.0 * d_of + x_of);
+						Points[3].x = (int)(diagonal * d_of + x_of); Points[3].y = (int)(-diagonal * d_of + x_of);
+						Points[4].x = (int)(0.0 * d_of + x_of); Points[4].y = (int)(-max * d_of + x_of);
+						Points[5].x = (int)(-diagonal * d_of + x_of); Points[5].y = (int)(-diagonal * d_of + x_of);
+						Points[6].x = (int)(-max * d_of + x_of); Points[6].y = (int)(0.0 * d_of + x_of);
+						Points[7].x = (int)(-diagonal * d_of + x_of); Points[7].y = (int)(diagonal * d_of + x_of);
+
+						// draw polygon
+						dc.DrawPolygon(8, Points);
 					}
 					else
 					{
@@ -106,7 +146,7 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
 					{
 						// deadzone circle
 						dc.SetBrush(*wxLIGHT_GREY_BRUSH);
-						dc.DrawCircle( 32, 32, ((*g)->control_group)->settings[0]->value * 32 );
+						dc.DrawCircle( 32, 32, ((*g)->control_group)->settings[SETTING_DEADZONE]->value * 32 );
 					}
 
 					// raw dot
diff --git a/Source/Core/InputCommon/Src/ControllerEmu.cpp b/Source/Core/InputCommon/Src/ControllerEmu.cpp
index b7eee1a143..328fcb8c2f 100644
--- a/Source/Core/InputCommon/Src/ControllerEmu.cpp
+++ b/Source/Core/InputCommon/Src/ControllerEmu.cpp
@@ -226,6 +226,7 @@ ControllerEmu::AnalogStick::AnalogStick(const char* const _name) : ControlGroup(
 
 	controls.push_back(new Input(_trans("Modifier")));
 
+	settings.push_back(new Setting(_trans("Radius"), 0.7f, 0, 100));
 	settings.push_back(new Setting(_trans("Dead Zone"), 0, 0, 50));
 	settings.push_back(new Setting(_trans("Square Stick"), 0));
 
diff --git a/Source/Core/InputCommon/Src/ControllerEmu.h b/Source/Core/InputCommon/Src/ControllerEmu.h
index 33057434cd..cf87f2562e 100644
--- a/Source/Core/InputCommon/Src/ControllerEmu.h
+++ b/Source/Core/InputCommon/Src/ControllerEmu.h
@@ -35,6 +35,13 @@ enum
 	GROUP_TYPE_SLIDER,
 };
 
+enum
+{
+	SETTING_RADIUS,
+	SETTING_DEADZONE,
+	SETTING_SQUARE,
+};
+
 const char * const named_directions[] = 
 {
 	"Up",
@@ -126,8 +133,9 @@ public:
 			ControlState yy = controls[0]->control_ref->State() - controls[1]->control_ref->State();
 			ControlState xx = controls[3]->control_ref->State() - controls[2]->control_ref->State();
 
-			ControlState deadzone = settings[0]->value;
-			ControlState square = settings[1]->value;
+			ControlState radius = settings[SETTING_RADIUS]->value;
+			ControlState deadzone = settings[SETTING_DEADZONE]->value;
+			ControlState square = settings[SETTING_SQUARE]->value;
 			ControlState m = controls[4]->control_ref->State();
 
 			// modifier code
@@ -138,11 +146,11 @@ public:
 			}
 
 			// deadzone / square stick code
-			if (deadzone || square)
+			if (radius != 1 || deadzone || square)
 			{
 				// this section might be all wrong, but its working good enough, I think
 
-				ControlState ang = atan2(yy, xx); 
+				ControlState ang = atan2(yy, xx);
 				ControlState ang_sin = sin(ang);
 				ControlState ang_cos = cos(ang);
 
@@ -163,6 +171,9 @@ public:
 				ControlState amt = dist / stick_full;
 				dist -= ((square_full - 1) * amt * square);
 
+				// radius
+				dist *= radius;
+
 				yy = std::max(-1.0f, std::min(1.0f, ang_sin * dist));
 				xx = std::max(-1.0f, std::min(1.0f, ang_cos * dist));
 			}

From 3ff2a3a11a65c4f4985ec7f9f45122ae05e9cc1a Mon Sep 17 00:00:00 2001
From: "ondra.hosek" <ondra.hosek@gmail.com>
Date: Thu, 6 Jun 2013 21:30:50 +1000
Subject: [PATCH 133/352] Fix the GameCube mic dialog header's invalid include
 guard.

Fixes issue 6349.
---
 Source/Core/DolphinWX/Src/GCMicDlg.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/GCMicDlg.h b/Source/Core/DolphinWX/Src/GCMicDlg.h
index ee6933b7c5..7d5d88b6dd 100644
--- a/Source/Core/DolphinWX/Src/GCMicDlg.h
+++ b/Source/Core/DolphinWX/Src/GCMicDlg.h
@@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#ifndef __HOTKEYDIALOG_h__
-#define __HOTKEYDIALOG_h__
+#ifndef __GCMICDIALOG_h__
+#define __GCMICDIALOG_h__
 
 #include <wx/wx.h>
 #include <wx/textctrl.h>

From 196d152ad761861dab000db87b90e10f62c6fb91 Mon Sep 17 00:00:00 2001
From: skidau <skidau@gmail.com>
Date: Sat, 8 Jun 2013 11:28:54 +1000
Subject: [PATCH 134/352] Invalidate the texture cache using the GPU thread
 when the CPU thread makes a request.

Fixes issue 6350.
---
 Source/Core/Core/Src/HLE/HLE_Misc.cpp            |  2 +-
 Source/Core/VideoCommon/Src/TextureCacheBase.cpp | 13 ++++++++++++-
 Source/Core/VideoCommon/Src/TextureCacheBase.h   |  3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Source/Core/Core/Src/HLE/HLE_Misc.cpp b/Source/Core/Core/Src/HLE/HLE_Misc.cpp
index 6db9704be8..c8323ca6c4 100644
--- a/Source/Core/Core/Src/HLE/HLE_Misc.cpp
+++ b/Source/Core/Core/Src/HLE/HLE_Misc.cpp
@@ -311,7 +311,7 @@ void ExecuteDOL(u8* dolFile, u32 fileSize)
 	}
 
 	PowerPC::ppcState.iCache.Reset();
-	TextureCache::Invalidate();
+	TextureCache::RequestInvalidateTextureCache();
 
 	CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer();
 	size_t size = s_Usb->m_WiiMotes.size();
diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp
index d5d21f89d0..7d5b9354ad 100644
--- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp
+++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp
@@ -32,6 +32,7 @@ TextureCache::TexCache TextureCache::textures;
 
 TextureCache::BackupConfig TextureCache::backup_config;
 
+bool invalidate_texture_cache_requested;
 
 TextureCache::TCacheEntryBase::~TCacheEntryBase()
 {
@@ -49,6 +50,13 @@ TextureCache::TextureCache()
 		HiresTextures::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str());
 
 	SetHash64Function(g_ActiveConfig.bHiresTextures || g_ActiveConfig.bDumpTextures);
+
+	invalidate_texture_cache_requested = false;
+}
+
+void TextureCache::RequestInvalidateTextureCache()
+{
+	invalidate_texture_cache_requested = true;
 }
 
 void TextureCache::Invalidate()
@@ -80,7 +88,8 @@ void TextureCache::OnConfigChanged(VideoConfig& config)
 		if (config.iSafeTextureCache_ColorSamples != backup_config.s_colorsamples ||
 			config.bTexFmtOverlayEnable != backup_config.s_texfmt_overlay ||
 			config.bTexFmtOverlayCenter != backup_config.s_texfmt_overlay_center ||
-			config.bHiresTextures != backup_config.s_hires_textures)
+			config.bHiresTextures != backup_config.s_hires_textures ||
+			invalidate_texture_cache_requested)
 		{
 			g_texture_cache->Invalidate();
 
@@ -89,6 +98,8 @@ void TextureCache::OnConfigChanged(VideoConfig& config)
 
 			SetHash64Function(g_ActiveConfig.bHiresTextures || g_ActiveConfig.bDumpTextures);
 			TexDecoder_SetTexFmtOverlayOptions(g_ActiveConfig.bTexFmtOverlayEnable, g_ActiveConfig.bTexFmtOverlayCenter);
+
+			invalidate_texture_cache_requested = false;
 		}
 
 		// TODO: Probably shouldn't clear all render targets here, just mark them dirty or something.
diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h
index acfb2e94b2..1afcb8cd2d 100644
--- a/Source/Core/VideoCommon/Src/TextureCacheBase.h
+++ b/Source/Core/VideoCommon/Src/TextureCacheBase.h
@@ -107,6 +107,8 @@ public:
 	static void CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat, unsigned int srcFormat,
 		const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf);
 
+	static void RequestInvalidateTextureCache();
+
 protected:
 	TextureCache();
 
@@ -118,7 +120,6 @@ private:
 	static PC_TexFormat LoadCustomTexture(u64 tex_hash, int texformat, unsigned int level, unsigned int& width, unsigned int& height);
 	static void DumpTexture(TCacheEntryBase* entry, unsigned int level);
 
-
 	typedef std::map<u32, TCacheEntryBase*> TexCache;
 
 	static TexCache textures;

From 92fdc15aa337eb21310ef89d211a53352084904f Mon Sep 17 00:00:00 2001
From: skidau <skidau@gmail.com>
Date: Sat, 8 Jun 2013 14:05:02 +1000
Subject: [PATCH 135/352] Implemented field order detection for PAL games. 
 Fixes the shaking of the screen when XFB is enabled with a PAL game.

Fixes issue 6316.
---
 Source/Core/Core/Src/HW/VideoInterface.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Source/Core/Core/Src/HW/VideoInterface.cpp b/Source/Core/Core/Src/HW/VideoInterface.cpp
index 5e7299586c..e5d32a9a8f 100644
--- a/Source/Core/Core/Src/HW/VideoInterface.cpp
+++ b/Source/Core/Core/Src/HW/VideoInterface.cpp
@@ -804,11 +804,9 @@ static void BeginField(FieldType field)
 	u32 fbWidth = m_HorizontalStepping.FieldSteps * 16;
 	u32 fbHeight = (m_HorizontalStepping.FbSteps / m_HorizontalStepping.FieldSteps) * m_VerticalTimingRegister.ACV;
 
-	// TODO: Are the "Bottom Field" and "Top Field" registers actually more
-	// like "First Field" and "Second Field" registers? There's an important
-	// difference because NTSC and PAL have opposite field orders.
-
-	u32 xfbAddr = (field == FIELD_LOWER) ? GetXFBAddressBottom() : GetXFBAddressTop();
+	// NTSC and PAL have opposite field orders.
+	FieldType order = (m_DisplayControlRegister.FMT == 0) ? FIELD_LOWER : FIELD_UPPER;
+	u32 xfbAddr = (field == order) ? GetXFBAddressBottom() : GetXFBAddressTop();
 
 	static const char* const fieldTypeNames[] = { "Progressive", "Upper", "Lower" };
 

From 0fddc49b210dbbaa2564f2a4cea8b875cefd4b8c Mon Sep 17 00:00:00 2001
From: skidau <skidau@gmail.com>
Date: Mon, 10 Jun 2013 23:40:20 +1000
Subject: [PATCH 136/352] Added FIFO reset bypass patch for the PAL version of
 Wallace and Gromit in Project Zoo.

Fixes issue 6357.
---
 Data/User/GameConfig/GWLX6L.ini | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Data/User/GameConfig/GWLX6L.ini b/Data/User/GameConfig/GWLX6L.ini
index ae259eb466..cd4408b3e5 100644
--- a/Data/User/GameConfig/GWLX6L.ini
+++ b/Data/User/GameConfig/GWLX6L.ini
@@ -1,8 +1,10 @@
 # GWLX6L - Project Zoo
 [Core] Values set here will override the main dolphin settings.
-TLBHack=1
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-EmulationIssues = Unespecified codes,report to devs
+EmulationStateId = 4
+EmulationIssues =
 [OnFrame] Add memory patches to be applied every frame here.
++$Bypass FIFO reset
+0x8028EE80:dword:0x48000638
 [ActionReplay] Add action replay cheats here.

From 3e40f283693e9375f3bde797e6bfb30aa50b0901 Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Mon, 10 Jun 2013 21:04:55 -0400
Subject: [PATCH 137/352] Get video backend name via g_video_backend->GetName()
 instead of sconfig for movies, since that can be wrong.

Also, I still can't code. Or even notice when something obviously doesn't work.
---
 Source/Core/Core/Src/Movie.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp
index 2f165d1d44..5a81c7d904 100644
--- a/Source/Core/Core/Src/Movie.cpp
+++ b/Source/Core/Core/Src/Movie.cpp
@@ -1168,18 +1168,15 @@ void GetSettings()
 	bProgressive = SConfig::GetInstance().m_LocalCoreStartupParameter.bProgressive;
 	bDSPHLE = SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE;
 	bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed;
-	videoBackend = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend;
+	videoBackend = g_video_backend->GetName();
 	iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore;
 	if (!Core::g_CoreStartupParameter.bWii)
 		g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA);
 	bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD;
 
-	int temp;
-
-	for(int i = 0; i < 4; ++i )
+	for (int i = 0; i < 20; ++i)
 	{
-		sscanf(SCM_REV_STR + 2 * i, "%2x", &temp );
-		revision[i] = temp;
+		sscanf(SCM_REV_STR + 2 * i, "%02x", &revision[i]);
 	}
 }
 

From a1276efe17383d00297e58a034e708f08817941f Mon Sep 17 00:00:00 2001
From: "kostamarino@hotmail.com" <kostamarino@hotmail.com>
Date: Tue, 11 Jun 2013 09:35:43 +0300
Subject: [PATCH 138/352] Gameini database update. Fixes issues 6354,6355,6356.
 Update NFS Most Wanted.

---
 Data/User/GameConfig/GJXP51.ini | 18 ++++++++++++++++++
 Data/User/GameConfig/GOWD69.ini | 16 ++++++++++++++++
 Data/User/GameConfig/GOWE69.ini | 11 ++++++++++-
 Data/User/GameConfig/GOWF69.ini | 16 ++++++++++++++++
 Data/User/GameConfig/GOWJ69.ini | 16 ++++++++++++++++
 Data/User/GameConfig/GOWP69.ini | 16 ++++++++++++++++
 Data/User/GameConfig/GX2P52.ini | 18 ++++++++++++++++++
 Data/User/GameConfig/GX3P41.ini |  2 +-
 Data/User/GameConfig/GX3X41.ini | 21 +++++++++++++++++++++
 9 files changed, 132 insertions(+), 2 deletions(-)
 create mode 100644 Data/User/GameConfig/GJXP51.ini
 create mode 100644 Data/User/GameConfig/GOWD69.ini
 create mode 100644 Data/User/GameConfig/GOWF69.ini
 create mode 100644 Data/User/GameConfig/GOWJ69.ini
 create mode 100644 Data/User/GameConfig/GOWP69.ini
 create mode 100644 Data/User/GameConfig/GX2P52.ini
 create mode 100644 Data/User/GameConfig/GX3X41.ini

diff --git a/Data/User/GameConfig/GJXP51.ini b/Data/User/GameConfig/GJXP51.ini
new file mode 100644
index 0000000000..e8d89a1d99
--- /dev/null
+++ b/Data/User/GameConfig/GJXP51.ini
@@ -0,0 +1,18 @@
+# GJXP51 - Vexx
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[EmuState]
+EmulationStateId = 4
+EmulationIssues = Slow because it needs mmu to run.
+[OnFrame]
+[ActionReplay]
+[Gecko]
+[Video_Settings]


+[Core]
+MMU = 1
+
diff --git a/Data/User/GameConfig/GOWD69.ini b/Data/User/GameConfig/GOWD69.ini
new file mode 100644
index 0000000000..b72311394e
--- /dev/null
+++ b/Data/User/GameConfig/GOWD69.ini
@@ -0,0 +1,16 @@
+# GOWD69 - NFS Most Wanted
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos are messed up, skip them.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
diff --git a/Data/User/GameConfig/GOWE69.ini b/Data/User/GameConfig/GOWE69.ini
index 055236f92c..e3ec320abd 100644
--- a/Data/User/GameConfig/GOWE69.ini
+++ b/Data/User/GameConfig/GOWE69.ini
@@ -1,7 +1,16 @@
 # GOWE69 - NFS Most Wanted
 [Core] Values set here will override the main dolphin settings.
+TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Some GFX Glitches And may be slow.
+EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
diff --git a/Data/User/GameConfig/GOWF69.ini b/Data/User/GameConfig/GOWF69.ini
new file mode 100644
index 0000000000..a6e4e56de3
--- /dev/null
+++ b/Data/User/GameConfig/GOWF69.ini
@@ -0,0 +1,16 @@
+# GOWF69 - NFS Most Wanted
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos are messed up, skip them.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
diff --git a/Data/User/GameConfig/GOWJ69.ini b/Data/User/GameConfig/GOWJ69.ini
new file mode 100644
index 0000000000..dfd9602e7e
--- /dev/null
+++ b/Data/User/GameConfig/GOWJ69.ini
@@ -0,0 +1,16 @@
+# GOWJ69 - NFS Most Wanted
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos are messed up, skip them.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
diff --git a/Data/User/GameConfig/GOWP69.ini b/Data/User/GameConfig/GOWP69.ini
new file mode 100644
index 0000000000..9d85f68fb0
--- /dev/null
+++ b/Data/User/GameConfig/GOWP69.ini
@@ -0,0 +1,16 @@
+# GOWP69 - NFS Most Wanted
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Videos are messed up, skip them.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
diff --git a/Data/User/GameConfig/GX2P52.ini b/Data/User/GameConfig/GX2P52.ini
new file mode 100644
index 0000000000..d57566d6f6
--- /dev/null
+++ b/Data/User/GameConfig/GX2P52.ini
@@ -0,0 +1,18 @@
+# GX2P52 - X-Men Legends 2: Rise of Apocalypse
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 3
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Enhancements]
+
diff --git a/Data/User/GameConfig/GX3P41.ini b/Data/User/GameConfig/GX3P41.ini
index f7d136347c..ed40ef469a 100644
--- a/Data/User/GameConfig/GX3P41.ini
+++ b/Data/User/GameConfig/GX3P41.ini
@@ -4,7 +4,7 @@ TLBHack = 1
 MMU = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs real xfb for the videos to show up (r6906)
+EmulationIssues = Needs real xfb for the videos to show up.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
diff --git a/Data/User/GameConfig/GX3X41.ini b/Data/User/GameConfig/GX3X41.ini
new file mode 100644
index 0000000000..377ada9d50
--- /dev/null
+++ b/Data/User/GameConfig/GX3X41.ini
@@ -0,0 +1,21 @@
+# GX3X41 - XIII
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+MMU = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs real xfb for the videos to show up.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+

From 8efdbcda9e70eba8f3d3208b580fd0c5d9a9cccb Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 11 Jun 2013 08:23:32 -0500
Subject: [PATCH 139/352] [Android] Fix drawn buttons causing rendering issues.

---
 Source/Core/InputCommon/Src/Android/ButtonManager.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Source/Core/InputCommon/Src/Android/ButtonManager.cpp b/Source/Core/InputCommon/Src/Android/ButtonManager.cpp
index 947f7b0081..9ae996732d 100644
--- a/Source/Core/InputCommon/Src/Android/ButtonManager.cpp
+++ b/Source/Core/InputCommon/Src/Android/ButtonManager.cpp
@@ -37,9 +37,6 @@ namespace ButtonManager
 	
 	void Init()
 	{
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-		
 		// Initialize our buttons
 		m_buttons.push_back(new Button("ButtonA.png", BUTTON_A, m_coords[0]));
 		m_buttons.push_back(new Button("ButtonB.png", BUTTON_B, m_coords[1]));
@@ -83,8 +80,13 @@ namespace ButtonManager
 
 	void DrawButtons()
 	{
+		glEnable(GL_BLEND);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
 		for(auto it = m_buttons.begin(); it != m_buttons.end(); ++it)
 			DrawButton((*it)->GetTexture(), (*it)->GetCoords());	
+
+		glDisable(GL_BLEND);
 	}
 
 }

From fcf86f112af0dac317e618a5a544457e70db2268 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 11 Jun 2013 08:24:23 -0500
Subject: [PATCH 140/352] [Android] Remove artificial limitation to not leave
 the sdcard directory. Keep screen on while running.

---
 .../Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index 7edd0fe936..bee3e5fcca 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -137,7 +137,7 @@ public class DolphinEmulator<MainActivity> extends Activity
 			
 			String FileName = data.getStringExtra("Select");
 			GLview = new NativeGLSurfaceView(this);
-			//this.getWindow().setUiOptions(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN, View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN);
+			this.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 			GLview.SetDimensions(screenWidth, screenHeight);
 			GLview.SetFileName(FileName);
 			setContentView(GLview);

From 1bea76a6e063df2d381e68d054a29068128b6916 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 11 Jun 2013 08:25:15 -0500
Subject: [PATCH 141/352] [Android] Remove artificial limitation to not leave
 the sdcard directory in the folder browser as well.

---
 .../Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
index 15afb36c3c..0ff58cdb39 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
@@ -49,8 +49,8 @@ public class FolderBrowser extends ListActivity {
 		Collections.sort(dir);
         Collections.sort(fls);
         dir.addAll(fls);
-         if (!f.getName().equalsIgnoreCase("sdcard"))
-        	 dir.add(0, new GameListItem(getApplicationContext(), "..", "Parent Directory", f.getParent()));
+	    if (!f.getPath().equalsIgnoreCase("/"))
+	        dir.add(0, new GameListItem(getApplicationContext(), "..", "Parent Directory", f.getParent()));
 
          adapter = new GameListAdapter(this,R.layout.folderbrowser,dir);
 		 this.setListAdapter(adapter);
@@ -58,7 +58,6 @@ public class FolderBrowser extends ListActivity {
 
 	@Override
 	protected void onListItemClick(ListView l, View v, int position, long id) {
-		// TODO Auto-generated method stub
 		super.onListItemClick(l, v, position, id);
 		GameListItem o = adapter.getItem(position);
 		if(o.getData().equalsIgnoreCase("folder")||o.getData().equalsIgnoreCase("parent directory")){

From 703a51e4c06b4177a23a36861ace2516b8b5b1bf Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 11 Jun 2013 08:33:56 -0500
Subject: [PATCH 142/352] [Android] Start of *working* GLES3 support. Needs to
 be able to compile in Windows still.

---
 Source/Android/.idea/workspace.xml            | 392 ++++++++----------
 Source/Android/res/values/prefvalues.xml      |   2 +-
 Source/Core/VideoCommon/CMakeLists.txt        |   1 +
 Source/Core/VideoCommon/Src/DriverDetails.cpp |  69 +++
 Source/Core/VideoCommon/Src/DriverDetails.h   |  52 +++
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  |  20 +-
 Source/Plugins/Plugin_VideoOGL/CMakeLists.txt |   3 +-
 .../Plugin_VideoOGL/Src/GLFunctions.cpp       |  93 +++++
 .../Plugins/Plugin_VideoOGL/Src/GLFunctions.h |  90 ++++
 Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h   |   3 +
 .../Src/ProgramShaderCache.cpp                |   7 +-
 Source/Plugins/Plugin_VideoOGL/Src/Render.cpp |  53 ++-
 12 files changed, 563 insertions(+), 222 deletions(-)
 create mode 100644 Source/Core/VideoCommon/Src/DriverDetails.cpp
 create mode 100644 Source/Core/VideoCommon/Src/DriverDetails.h
 create mode 100644 Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.cpp
 create mode 100644 Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.h

diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index fa89dca9a9..d695fc4924 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -35,24 +35,6 @@
     <list default="true" id="682e8195-a9c2-48a7-a941-e8c10f5cb64a" name="Default" comment="" />
     <ignored path="Android.iws" />
     <ignored path=".idea/workspace.xml" />
-    <file path="/fragment.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368867720090" ignored="false" />
-    <file path="/Dummy.txt" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368955682446" ignored="false" />
-    <file path="/GameListView.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369035891369" ignored="false" />
-    <file path="/SettingBrowser.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368965879091" ignored="false" />
-    <file path="/SettingMenuItem.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368957197656" ignored="false" />
-    <file path="/SettingMenuAdapter.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368957350110" ignored="false" />
-    <file path="/AndroidManifest.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369534483869" ignored="false" />
-    <file path="/EditNameDialog.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369023935830" ignored="false" />
-    <file path="/PrefsActivity.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369031747746" ignored="false" />
-    <file path="/PrefsFragment.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369032642639" ignored="false" />
-    <file path="/prefs.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369036284146" ignored="false" />
-    <file path="$PROJECT_DIR$/gen/org/dolphinemu/dolphinemu/BuildConfig.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369127789356" ignored="false" />
-    <file path="/prefvalues.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369036331457" ignored="false" />
-    <file path="/FolderBrowser.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369217914695" ignored="false" />
-    <file path="/DolphinEmulator.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369534697502" ignored="false" />
-    <file path="/a.groovy" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369535676012" ignored="false" />
-    <file path="/a.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369535541830" ignored="false" />
-    <file path="/sample.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369535538754" ignored="false" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -118,19 +100,19 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="DolphinEmulator.java" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="DolphinEmulator.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="164" column="4" selection-start="4827" selection-end="4827" vertical-scroll-proportion="-9.307693">
+            <state line="140" column="60" selection-start="4228" selection-end="4228" vertical-scroll-proportion="0.18997361" vertical-offset="1878" max-vertical-offset="2490">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="AndroidManifest.xml" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="AndroidManifest.xml" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="6" column="72" selection-start="281" selection-end="281" vertical-scroll-proportion="0.23316061">
+            <state line="6" column="71" selection-start="280" selection-end="280" vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="735">
               <folding />
             </state>
           </provider>
@@ -139,7 +121,7 @@
       <file leaf-file-name="GameListView.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="51" column="78" selection-start="1629" selection-end="1629" vertical-scroll-proportion="0.0">
+            <state line="62" column="13" selection-start="2128" selection-end="2128" vertical-scroll-proportion="0.0" vertical-offset="915" max-vertical-offset="3420">
               <folding />
             </state>
           </provider>
@@ -148,28 +130,7 @@
       <file leaf-file-name="FolderBrowser.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="81" column="36" selection-start="2675" selection-end="2675" vertical-scroll-proportion="0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="prefs.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
-          <provider editor-type-id="android-designer">
-            <state />
-          </provider>
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="prefvalues.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="14" column="31" selection-start="392" selection-end="392" vertical-scroll-proportion="-8.4">
+            <state line="75" column="25" selection-start="2518" selection-end="2518" vertical-scroll-proportion="0.0" vertical-offset="1110" max-vertical-offset="1485">
               <folding />
             </state>
           </provider>
@@ -178,10 +139,8 @@
       <file leaf-file-name="PrefsActivity.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="14" column="0" selection-start="389" selection-end="389" vertical-scroll-proportion="0.0">
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state line="14" column="0" selection-start="389" selection-end="389" vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="690">
+              <folding />
             </state>
           </provider>
         </entry>
@@ -204,7 +163,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuItem.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuItem.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java" />
         <option value="$PROJECT_DIR$/res/layout/fragment_edit_name.xml" />
@@ -215,11 +173,12 @@
         <option value="$PROJECT_DIR$/res/values/prefs.xml" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingBrowser.java" />
         <option value="$PROJECT_DIR$/res/layout/prefs.xml" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java" />
-        <option value="$PROJECT_DIR$/res/values/prefvalues.xml" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
         <option value="$PROJECT_DIR$/AndroidManifest.xml" />
+        <option value="$PROJECT_DIR$/res/values/prefvalues.xml" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
       </list>
     </option>
   </component>
@@ -273,6 +232,44 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dolphinemu" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="Scope">
         <subPane subId="Project Files">
           <PATH>
@@ -317,67 +314,47 @@
               <option name="myItemType" value="" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="assets">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
       <pane id="PackagesPane" />
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dolphinemu" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="dynamic.classpath" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="options.splitter.details.proportions" value="0.2" />
-    <property name="recentsLimit" value="5" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="FullScreen" value="false" />
     <property name="options.searchVisible" value="true" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
-    <property name="restartRequiresConfirmation" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="options.splitter.main.proportions" value="0.3" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="options.lastSelected" value="android.dex.compiler" />
+    <property name="FullScreen" value="false" />
+    <property name="GoToFile.includeJavaFiles" value="false" />
     <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="192.168.0.188:5555" />
+    <property name="recentsLimit" value="5" />
+    <property name="options.lastSelected" value="editor.preferences.appearance" />
+    <property name="restartRequiresConfirmation" value="true" />
+    <property name="MemberChooser.sorted" value="false" />
+    <property name="options.splitter.main.proportions" value="0.3" />
+    <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="978fa698" />
+    <property name="GoToClass.includeLibraries" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
+    <property name="MemberChooser.showClasses" value="true" />
+    <property name="dynamic.classpath" value="false" />
   </component>
   <component name="RunManager" selected="Android Application.Dolphin Emulator">
     <configuration default="true" type="Remote" factoryName="Remote">
@@ -388,17 +365,22 @@
       <option name="PORT" value="5005" />
       <method />
     </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
+    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
       <module name="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="TESTING_TYPE" value="0" />
+      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
+      <option name="METHOD_NAME" value="" />
+      <option name="CLASS_NAME" value="" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
+      <option name="PREFERRED_AVD" value="" />
+      <option name="USE_COMMAND_LINE" value="true" />
+      <option name="COMMAND_LINE" value="" />
+      <option name="WIPE_USER_DATA" value="false" />
+      <option name="DISABLE_BOOT_ANIMATION" value="false" />
+      <option name="NETWORK_SPEED" value="full" />
+      <option name="NETWORK_LATENCY" value="none" />
+      <option name="CLEAR_LOGCAT" value="false" />
       <method />
     </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
@@ -435,24 +417,6 @@
       <envs />
       <method />
     </configuration>
-    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
-      <module name="" />
-      <option name="TESTING_TYPE" value="0" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="USE_COMMAND_LINE" value="true" />
-      <option name="COMMAND_LINE" value="" />
-      <option name="WIPE_USER_DATA" value="false" />
-      <option name="DISABLE_BOOT_ANIMATION" value="false" />
-      <option name="NETWORK_SPEED" value="full" />
-      <option name="NETWORK_LATENCY" value="none" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <method />
-    </configuration>
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
       <option name="ACTIVITY_CLASS" value="" />
@@ -469,6 +433,19 @@
       <option name="CLEAR_LOGCAT" value="false" />
       <method />
     </configuration>
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <method />
+    </configuration>
     <configuration default="false" name="Dolphin Emulator" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="Android" />
       <option name="ACTIVITY_CLASS" value="" />
@@ -543,11 +520,20 @@
       <workItem from="1369308108390" duration="81000" />
       <workItem from="1369310924441" duration="263000" />
       <workItem from="1369391881947" duration="6610000" />
+      <workItem from="1369625958954" duration="18957000" />
+      <workItem from="1370018581705" duration="1122000" />
+      <workItem from="1370034754003" duration="6035000" />
+      <workItem from="1370353132771" duration="5420000" />
+      <workItem from="1370516537067" duration="4475000" />
+      <workItem from="1370645477148" duration="1282000" />
+      <workItem from="1370804398348" duration="807000" />
+      <workItem from="1370827141473" duration="1893000" />
+      <workItem from="1370854938756" duration="5106000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="47388000" />
+    <option name="totallyTimeSpent" value="92485000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -573,30 +559,30 @@
     <frame x="24" y="0" width="1342" height="744" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2179289" sideWeight="0.6912752" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6912752" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3110368" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30872482" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29865772" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29865772" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
+      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6912752" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2179289" sideWeight="0.7013423" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="VcsContentAnnotationSettings">
@@ -662,14 +648,12 @@
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="58" column="30" selection-start="1963" selection-end="1963" vertical-scroll-proportion="0.0">
+        <state line="58" column="30" selection-start="1963" selection-end="1963" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0">
           <folding />
         </state>
       </provider>
@@ -679,28 +663,19 @@
         <state />
       </provider>
       <provider selected="true" editor-type-id="text-editor">
-        <state line="21" column="41" selection-start="857" selection-end="857" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="30" column="64" selection-start="729" selection-end="729" vertical-scroll-proportion="-0.42105263">
-          <folding />
-        </state>
+        <state line="21" column="41" selection-start="857" selection-end="857" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="11" column="13" selection-start="267" selection-end="267" vertical-scroll-proportion="0.082167834">
+        <state line="11" column="13" selection-start="267" selection-end="267" vertical-scroll-proportion="0.082167834" vertical-offset="0" max-vertical-offset="0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="jar://$APPLICATION_HOME_DIR$/sdk/platforms/android-17/android.jar!/android/app/Activity.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="132" column="0" selection-start="5190" selection-end="5190" vertical-scroll-proportion="2.0" />
+        <state line="132" column="0" selection-start="5190" selection-end="5190" vertical-scroll-proportion="2.0" vertical-offset="0" max-vertical-offset="0" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/res/layout/folderbrowser.xml">
@@ -708,9 +683,7 @@
         <state />
       </provider>
       <provider editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/res/layout/main.xml">
@@ -718,23 +691,7 @@
         <state />
       </provider>
       <provider editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="81" column="36" selection-start="2675" selection-end="2675" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="51" column="78" selection-start="1629" selection-end="1629" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/res/layout/folderbrowserfooter.xml">
@@ -742,47 +699,60 @@
         <state />
       </provider>
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
-      <provider editor-type-id="android-designer">
-        <state />
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0">
+        <state line="14" column="0" selection-start="389" selection-end="389" vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="690">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="14" column="31" selection-start="392" selection-end="392" vertical-scroll-proportion="-8.4">
+        <state line="14" column="26" selection-start="387" selection-end="387" vertical-scroll-proportion="0.5426357" vertical-offset="0" max-vertical-offset="0" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="0" />
+      </provider>
+      <provider editor-type-id="android-designer">
+        <state />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="6" column="71" selection-start="280" selection-end="280" vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="735">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="14" column="0" selection-start="389" selection-end="389" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state line="62" column="13" selection-start="2128" selection-end="2128" vertical-scroll-proportion="0.0" vertical-offset="915" max-vertical-offset="3420">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="56" column="5" selection-start="1377" selection-end="1377" vertical-scroll-proportion="-0.39534885" vertical-offset="0" max-vertical-offset="0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="75" column="25" selection-start="2518" selection-end="2518" vertical-scroll-proportion="0.0" vertical-offset="1110" max-vertical-offset="1485">
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="164" column="4" selection-start="4827" selection-end="4827" vertical-scroll-proportion="-9.307693">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="6" column="72" selection-start="281" selection-end="281" vertical-scroll-proportion="0.23316061">
+        <state line="140" column="60" selection-start="4228" selection-end="4228" vertical-scroll-proportion="0.18997361" vertical-offset="1878" max-vertical-offset="2490">
           <folding />
         </state>
       </provider>
diff --git a/Source/Android/res/values/prefvalues.xml b/Source/Android/res/values/prefvalues.xml
index 3f67dcbe5b..77354f76a4 100644
--- a/Source/Android/res/values/prefvalues.xml
+++ b/Source/Android/res/values/prefvalues.xml
@@ -12,7 +12,7 @@
 
     <string-array name="gpuOptions">
         <item>Software Renderer</item>
-        <!--item>OpenGL</item-->
+        <item>OpenGL</item>
     </string-array>
 
     <string-array name="gpuValues">
diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt
index 89b6828281..1bbc69a150 100644
--- a/Source/Core/VideoCommon/CMakeLists.txt
+++ b/Source/Core/VideoCommon/CMakeLists.txt
@@ -4,6 +4,7 @@ set(SRCS	Src/BPFunctions.cpp
 			Src/CPMemory.cpp
 			Src/CommandProcessor.cpp
 			Src/Debugger.cpp
+			Src/DriverDetails.cpp
 			Src/Fifo.cpp
 			Src/FPSCounter.cpp
 			Src/FramebufferManagerBase.cpp
diff --git a/Source/Core/VideoCommon/Src/DriverDetails.cpp b/Source/Core/VideoCommon/Src/DriverDetails.cpp
new file mode 100644
index 0000000000..8d3c2d9cf7
--- /dev/null
+++ b/Source/Core/VideoCommon/Src/DriverDetails.cpp
@@ -0,0 +1,69 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+
+#include <map>
+
+#include "LogManager.h"
+#include "DriverDetails.h"
+
+namespace DriverDetails
+{
+	struct BugInfo
+	{
+		Bug m_bug; // Which bug it is
+		u32 m_devfamily; // Which device(family) has the error
+		double m_versionstart; // When it started
+		double m_versionend; // When it ended
+		bool m_hasbug; // Does it have it?
+	};
+
+	// Local members
+	Vendor	m_vendor = VENDOR_UNKNOWN;
+	u32	m_devfamily = 0;
+	double	m_version = 0.0;
+
+	// This is a list of all known bugs for each vendor
+	// We use this to check if the device and driver has a issue
+	BugInfo m_qualcommbugs[] = {
+		{BUG_NODYNUBOACCESS, 300, 14.0, -1.0},
+		{BUG_BROKENCENTROID, 300, 14.0, -1.0},
+	};
+
+	std::map<std::pair<Vendor, Bug>, BugInfo> m_bugs;
+	
+	// Private function
+	void InitBugMap()
+	{
+		switch(m_vendor)
+		{
+			case VENDOR_QUALCOMM:
+				for (int a = 0; a < (sizeof(m_qualcommbugs) / sizeof(BugInfo)); ++a)
+					m_bugs[std::make_pair(m_vendor, m_qualcommbugs[a].m_bug)] = m_qualcommbugs[a];
+			break;
+			default:
+			break;
+		}
+	}
+
+	void Init(Vendor vendor, const u32 devfamily, const double version)
+	{
+		m_vendor = vendor;
+		m_devfamily = devfamily;
+		m_version = version;
+		InitBugMap();
+
+		for (auto it = m_bugs.begin(); it != m_bugs.end(); ++it)
+			if (it->second.m_devfamily == m_devfamily)
+				if (it->second.m_versionend == -1.0 || (it->second.m_versionstart <= m_version && it->second.m_versionend > m_version))
+					it->second.m_hasbug = true;
+	}
+
+	const bool HasBug(Bug bug)
+	{
+		auto it = m_bugs.find(std::make_pair(m_vendor, bug));
+		if (it == m_bugs.end())
+			return false;	
+		return it->second.m_hasbug;
+	}
+}
diff --git a/Source/Core/VideoCommon/Src/DriverDetails.h b/Source/Core/VideoCommon/Src/DriverDetails.h
new file mode 100644
index 0000000000..524825f10b
--- /dev/null
+++ b/Source/Core/VideoCommon/Src/DriverDetails.h
@@ -0,0 +1,52 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+#pragma once
+#include "CommonTypes.h"
+
+namespace DriverDetails
+{
+	// Enum of known vendors
+	// Tegra and Nvidia are separated out due to such substantial differences
+	enum Vendor
+	{
+		VENDOR_NVIDIA = 0,
+		VENDOR_ATI,
+		VENDOR_INTEL,
+		VENDOR_ARM,
+		VENDOR_QUALCOMM,
+		VENDOR_IMGTEC,
+		VENDOR_TEGRA,
+		VENDOR_VIVANTE,
+		VENDOR_UNKNOWN
+	};
+
+	// Enum of known bugs
+	// These can be vendor specific, but we put them all in here
+	// For putting a new bug in here, make sure to put a detailed comment above the enum
+	// This'll ensure we know exactly what the issue is.
+	enum Bug
+	{
+		// Bug: No Dynamic UBO array object access
+		// Affected Devices: Qualcomm/Adreno
+		// Started Version: 14
+		// Ended Version: -1
+		// Accessing UBO array members dynamically causes the Adreno shader compiler to crash
+		// Errors out with "Internal Error"
+		BUG_NODYNUBOACCESS = 0,
+		// Bug: Centroid is broken in shaders
+		// Affected devices: Qualcomm/Adreno
+		// Started Version: 14
+		// Ended Version: -1
+		// Centroid in/out, used in the shaders, is used for multisample buffers to get the texel correctly
+		// When MSAA is disabled, it acts like a regular in/out
+		// Tends to cause the driver to render full white or black
+		BUG_BROKENCENTROID,
+	};
+	
+	// Initializes our internal vendor, device family, and driver version	
+	void Init(Vendor vendor, const u32 devfamily, const double version);
+	
+	// Once Vendor and driver version is set, this will return if it has the applicable bug passed to it.
+	const bool HasBug(Bug bug);
+}
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index d2f77a58cc..ecb2623183 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -9,6 +9,7 @@
 
 #include "BPMemory.h"
 #include "CPMemory.h"
+#include "DriverDetails.h"
 #include "LightingShaderGen.h"
 #include "VertexShaderGen.h"
 #include "VideoConfig.h"
@@ -322,13 +323,22 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE ApiType)
 			WRITE(p, "int posmtx = int(fposmtx);\n");
 		}
 
-		WRITE(p, "float4 pos = float4(dot(" I_TRANSFORMMATRICES"[posmtx], rawpos), dot(" I_TRANSFORMMATRICES"[posmtx+1], rawpos), dot(" I_TRANSFORMMATRICES"[posmtx+2], rawpos), 1);\n");		
-
-		if (components & VB_HAS_NRMALL) {
-			WRITE(p, "int normidx = posmtx >= 32 ? (posmtx-32) : posmtx;\n");
-			WRITE(p, "float3 N0 = " I_NORMALMATRICES"[normidx].xyz, N1 = " I_NORMALMATRICES"[normidx+1].xyz, N2 = " I_NORMALMATRICES"[normidx+2].xyz;\n");
+		if (DriverDetails::HasBug(BUG_NODYNUBOACCESS))
+		{
+			// This'll cause issues, but  it can't be helped
+			WRITE(p, "float4 pos = float4(dot(" I_TRANSFORMMATRICES"[0], rawpos), dot(" I_TRANSFORMMATRICES"[1], rawpos), dot(" I_TRANSFORMMATRICES"[2], rawpos), 1);\n");		
+			if (components & VB_HAS_NRMALL) 
+				WRITE(p, "float3 N0 = " I_NORMALMATRICES"[0].xyz, N1 = " I_NORMALMATRICES"[1].xyz, N2 = " I_NORMALMATRICES"[2].xyz;\n");
 		}
+		else
+		{
+			WRITE(p, "float4 pos = float4(dot(" I_TRANSFORMMATRICES"[posmtx], rawpos), dot(" I_TRANSFORMMATRICES"[posmtx+1], rawpos), dot(" I_TRANSFORMMATRICES"[posmtx+2], rawpos), 1);\n");		
 
+			if (components & VB_HAS_NRMALL) {
+				WRITE(p, "int normidx = posmtx >= 32 ? (posmtx-32) : posmtx;\n");
+				WRITE(p, "float3 N0 = " I_NORMALMATRICES"[normidx].xyz, N1 = " I_NORMALMATRICES"[normidx+1].xyz, N2 = " I_NORMALMATRICES"[normidx+2].xyz;\n");
+			}
+		}
 		if (components & VB_HAS_NRM0)
 			WRITE(p, "float3 _norm0 = normalize(float3(dot(N0, rawnorm0), dot(N1, rawnorm0), dot(N2, rawnorm0)));\n");
 		if (components & VB_HAS_NRM1)
diff --git a/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt b/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt
index 3d4e225932..f3d7ce4e4f 100644
--- a/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt
+++ b/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt
@@ -24,9 +24,10 @@ if(USE_EGL)
 		EGL)
 endif()
 
-if(USE_GLES)
+if(USE_GLES3)
 	set(LIBS ${LIBS}
 		GLESv2)
+	set(SRCS ${SRCS} Src/GLFunctions.cpp)
 else()
 	set(LIBS ${LIBS}
 		GLEW
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.cpp
new file mode 100644
index 0000000000..6b8b01562a
--- /dev/null
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.cpp
@@ -0,0 +1,93 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+#include "GLFunctions.h"
+#include "Log.h"
+#ifdef USE_GLES3
+PFNGLMAPBUFFERPROC glMapBuffer;
+PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
+PFNGLUNMAPBUFFERPROC glUnmapBuffer;
+PFNGLBINDBUFFERRANGEPROC glBindBufferRange;
+
+PFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer;
+
+PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
+PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays;
+PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
+
+PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
+PFNGLDELETESYNCPROC glDeleteSync;
+PFNGLFENCESYNCPROC glFenceSync;
+
+PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
+PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
+PFNGLSAMPLERPARAMETERFVPROC glSamplerParameterfv;
+PFNGLBINDSAMPLERPROC glBindSampler;
+PFNGLDELETESAMPLERSPROC glDeleteSamplers;
+PFNGLGENSAMPLERSPROC glGenSamplers;
+
+PFNGLGETPROGRAMBINARYPROC glGetProgramBinary;
+PFNGLPROGRAMBINARYPROC glProgramBinary;
+PFNGLPROGRAMPARAMETERIPROC glProgramParameteri;
+
+PFNGLGETUNIFORMBLOCKINDEXPROC glGetUniformBlockIndex;
+PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding;
+
+PFNGLBEGINQUERYPROC glBeginQuery;
+PFNGLENDQUERYPROC glEndQuery;
+PFNGLGETQUERYOBJECTUIVPROC glGetQueryObjectuiv;
+PFNGLDELETEQUERIESPROC glDeleteQueries;
+PFNGLGENQUERIESPROC glGenQueries;
+#endif
+namespace GLFunc
+{
+	void LoadFunction(const char *name, void **func)
+	{
+#ifdef USE_GLES3
+		*func = (void*)eglGetProcAddress(name);
+		if (*func == NULL)
+		{
+			ERROR_LOG(VIDEO, "Couldn't load function %s", name);
+			exit(0);
+		}
+#endif
+	}
+
+	void Init()
+	{
+		LoadFunction("glBeginQuery", (void**)&glBeginQuery);
+		LoadFunction("glEndQuery", (void**)&glEndQuery);
+		LoadFunction("glGetQueryObjectuiv", (void**)&glGetQueryObjectuiv);
+		LoadFunction("glDeleteQueries", (void**)&glDeleteQueries);
+		LoadFunction("glGenQueries", (void**)&glGenQueries);
+		{
+			LoadFunction("glMapBuffer", (void**)&glMapBuffer);	
+			LoadFunction("glUnmapBuffer", (void**)&glUnmapBuffer);
+			LoadFunction("glMapBufferRange", (void**)&glMapBufferRange);
+			LoadFunction("glBindBufferRange", (void**)&glBindBufferRange);
+
+			LoadFunction("glBlitFramebuffer", (void**)&glBlitFramebuffer);
+
+			LoadFunction("glGenVertexArrays", (void**)&glGenVertexArrays);
+			LoadFunction("glDeleteVertexArrays", (void**)&glDeleteVertexArrays);
+			LoadFunction("glBindVertexArray", (void**)&glBindVertexArray);
+
+			LoadFunction("glClientWaitSync", (void**)&glClientWaitSync);
+			LoadFunction("glDeleteSync", (void**)&glDeleteSync);
+			LoadFunction("glFenceSync", (void**)&glFenceSync);
+			LoadFunction("glSamplerParameterf", (void**)&glSamplerParameterf);
+			LoadFunction("glSamplerParameteri", (void**)&glSamplerParameteri);
+			LoadFunction("glSamplerParameterfv", (void**)&glSamplerParameterfv);
+			LoadFunction("glBindSampler", (void**)&glBindSampler);
+			LoadFunction("glDeleteSamplers", (void**)&glDeleteSamplers);
+			LoadFunction("glGenSamplers", (void**)&glGenSamplers);
+		}
+			
+		LoadFunction("glGetProgramBinary", (void**)&glGetProgramBinary);
+		LoadFunction("glProgramBinary", (void**)&glProgramBinary);
+		LoadFunction("glProgramParameteri", (void**)&glProgramParameteri);
+
+		LoadFunction("glGetUniformBlockIndex", (void**)&glGetUniformBlockIndex);
+		LoadFunction("glUniformBlockBinding", (void**)&glUniformBlockBinding);
+	}
+}
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.h b/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.h
new file mode 100644
index 0000000000..e8ff77690d
--- /dev/null
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.h
@@ -0,0 +1,90 @@
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
+#ifndef GLFUNCTIONS_H_
+#define GLFUNCTIONS_H_
+#include "GLInterface.h"
+
+#ifdef USE_GLES3
+typedef GLvoid* (*PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
+typedef GLvoid* (*PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (*PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef GLboolean (*PFNGLUNMAPBUFFERPROC) (GLenum target);
+
+typedef void (*PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+// VAOS
+typedef void (*PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint* arrays);
+typedef void (*PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint* arrays);
+typedef void (*PFNGLBINDVERTEXARRAYPROC) (GLuint array);
+
+// Sync
+typedef GLenum (*PFNGLCLIENTWAITSYNCPROC) (GLsync GLsync,GLbitfield flags,GLuint64 timeout);
+typedef void (*PFNGLDELETESYNCPROC) (GLsync GLsync);
+typedef GLsync (*PFNGLFENCESYNCPROC) (GLenum condition,GLbitfield flags);
+
+//Sampler
+typedef void (*PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param);
+typedef void (*PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param);
+typedef void (*PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat* params);
+typedef void (*PFNGLBINDSAMPLERPROC) (GLuint unit, GLuint sampler);
+typedef void (*PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint * samplers);
+typedef void (*PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint* samplers);
+
+//Program binar
+typedef void (*PFNGLGETPROGRAMBINARYPROC) (GLuint program, GLsizei bufSize, GLsizei* length, GLenum *binaryFormat, GLvoid*binary);
+typedef void (*PFNGLPROGRAMBINARYPROC) (GLuint program, GLenum binaryFormat, const void* binary, GLsizei length);
+typedef void (*PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value);
+
+typedef GLuint (*PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar* uniformBlockName);
+typedef void (*PFNGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+
+//Query
+typedef void (*PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
+typedef void (*PFNGLENDQUERYPROC) (GLenum target);
+typedef void (*PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint* params);
+typedef void (*PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint* ids);
+typedef void (*PFNGLGENQUERIESPROC) (GLsizei n, GLuint* ids);
+
+// ptrs
+extern PFNGLBEGINQUERYPROC glBeginQuery;
+extern PFNGLENDQUERYPROC glEndQuery;
+extern PFNGLGETQUERYOBJECTUIVPROC glGetQueryObjectuiv;
+extern PFNGLDELETEQUERIESPROC glDeleteQueries;
+extern PFNGLGENQUERIESPROC glGenQueries;
+
+extern PFNGLMAPBUFFERPROC glMapBuffer;
+extern PFNGLUNMAPBUFFERPROC glUnmapBuffer;
+extern PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
+extern PFNGLBINDBUFFERRANGEPROC glBindBufferRange;
+
+extern PFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer;
+
+extern PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
+extern PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays;
+extern PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
+
+extern PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
+extern PFNGLDELETESYNCPROC glDeleteSync;
+extern PFNGLFENCESYNCPROC glFenceSync;
+
+extern PFNGLGETPROGRAMBINARYPROC glGetProgramBinary;
+extern PFNGLPROGRAMBINARYPROC glProgramBinary;
+extern PFNGLPROGRAMPARAMETERIPROC glProgramParameteri;
+
+//Sampler
+extern PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
+extern PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
+extern PFNGLSAMPLERPARAMETERFVPROC glSamplerParameterfv;
+extern PFNGLBINDSAMPLERPROC glBindSampler;
+extern PFNGLDELETESAMPLERSPROC glDeleteSamplers;
+extern PFNGLGENSAMPLERSPROC glGenSamplers;
+
+extern PFNGLGETUNIFORMBLOCKINDEXPROC glGetUniformBlockIndex;
+extern PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding;
+#endif
+
+namespace GLFunc
+{
+	void Init();
+}
+#endif
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
index 6df5aa1524..6057fa99f4 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
@@ -21,6 +21,9 @@
 #define PREC	"highp"
 #define TEXTYPE "sampler2D"
 #define TEXFUNC "texture2D"
+#ifdef USE_GLES3
+#include "GLFunctions.h"
+#endif
 #else
 #define TEX2D	GL_TEXTURE_RECTANGLE_ARB
 #define PREC 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index 2df1f47760..4588317ab8 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -3,6 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "ProgramShaderCache.h"
+#include "DriverDetails"
 #include "MathUtil.h"
 #include "StreamBuffer.h"
 #include "Debugger.h"
@@ -532,15 +533,15 @@ void ProgramShaderCache::CreateHeader ( void )
 		"%s\n"
 		"%s\n"
 		"#define COLOROUT(name) %s\n"
-		
+				
 		, v==GLSLES3 ? "300 es" : v==GLSL_120 ? "120" : v==GLSL_130 ? "130" : "140"
 		, v==GLSLES3 ? "precision highp float;" : ""
 		, v==GLSLES3 ? "" : v<=GLSL_130 ? "#extension GL_ARB_texture_rectangle : enable" : "#define texture2DRect texture"
 		, g_ActiveConfig.backend_info.bSupportsGLSLUBO && v<GLSL_140 ? "#extension GL_ARB_uniform_buffer_object : enable" : ""
 		, v==GLSL_120 ? "attribute" : "in"
 		, v==GLSL_120 ? "attribute" : "out"
-		, v==GLSL_120 ? "varying" : "centroid in"
-		, v==GLSL_120 ? "varying" : "centroid out"
+		, DriverDetails::HasBug(BUG_BROKENCENTROID) ? "in" : v==GLSL_120 ? "varying" : "centroid in"
+		, DriverDetails::HasBug(BUG_BROKENCENTROID) ? "out" : v==GLSL_120 ? "varying" : "centroid out"
 		, v==GLSL_120 ? "#define texture texture2D" : ""
 		, v==GLSL_120 ? "#define round(x) floor((x)+0.5f)" : ""
 		, v==GLSL_120 ? "#define out " : ""
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index db628a8f54..7ed532019b 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -22,6 +22,7 @@
 #endif
 
 #include "CommonPaths.h"
+#include "DriverDetails.h"
 #include "VideoConfig.h"
 #include "Statistics.h"
 #include "ImageWrite.h"
@@ -254,6 +255,53 @@ void ErrorCallback( GLenum source, GLenum type, GLuint id, GLenum severity, GLsi
 #endif
 }
 
+void InitDriverInfo()
+{
+	// Get Vendor
+	std::string svendor = std::string(g_ogl_config.gl_vendor);
+	std::string srenderer = std::string(g_ogl_config.gl_renderer);
+	DriverDetails::Vendor vendor = DriverDetails::VENDOR_UNKNOWN;
+	u32 devfamily = 0;
+	double version = 0.0;
+
+	// Get Vendor first
+	if (svendor == "NVIDIA Corporation" && srenderer != "NVIDIA Tegra")
+		vendor = DriverDetails::VENDOR_NVIDIA; 
+	else if (svendor == "ATI Technologies Inc.")
+		vendor = DriverDetails::VENDOR_ATI;
+	else if (std::string::npos != svendor.find("Intel"))
+		vendor = DriverDetails::VENDOR_INTEL;
+	else if (svendor == "ARM")
+		vendor = DriverDetails::VENDOR_ARM;
+	else if (svendor == "Qualcomm")
+		vendor = DriverDetails::VENDOR_QUALCOMM;
+	else if (svendor == "Imagination Technologies")
+		vendor = DriverDetails::VENDOR_IMGTEC;
+	else if (svendor == "NVIDIA Corporation" && srenderer != "NVIDIA Tegra")
+		vendor = DriverDetails::VENDOR_TEGRA;
+	else if (svendor == "Vivante Corporation")
+		vendor = DriverDetails::VENDOR_VIVANTE;
+	
+	// Get device family and driver version...if we care about it
+	switch(vendor)
+	{
+		case DriverDetails::VENDOR_QUALCOMM:
+		{
+			if (std::string::npos != srenderer.find("Adreno (TM) 3"))
+				devfamily = 300;
+			else
+				devfamily = 200;
+			double glVersion;
+			sscanf(g_ogl_config.gl_version, "OpenGL ES %lg V@%lg", &glVersion, &version);
+		}
+		break;
+		// We don't care about these
+		default:
+		break;
+	}
+	DriverDetails::Init(vendor, devfamily, version);
+}
+
 // Init functions
 Renderer::Renderer()
 {
@@ -271,10 +319,13 @@ Renderer::Renderer()
 	g_ogl_config.gl_renderer = (const char*)glGetString(GL_RENDERER);
 	g_ogl_config.gl_version = (const char*)glGetString(GL_VERSION);
 	g_ogl_config.glsl_version = (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION);
+	
+	InitDriverInfo();
 
 	// Init extension support.
 #ifdef USE_GLES3
 	// Set default GLES3 options
+	GLFunc::Init();
 	WARN_LOG(VIDEO, "Running the OpenGL ES 3 backend!");
 	g_Config.backend_info.bSupportsDualSourceBlend = false;
 	g_Config.backend_info.bSupportsGLSLUBO = true; 
@@ -1432,7 +1483,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 	DrawDebugText();
 
 	GL_REPORT_ERRORD();
-	
+ 
 	// Do our OSD callbacks	
 	OSD::DoCallbacks(OSD::OSD_ONFRAME);
 	OSD::DrawMessages();

From 9df3dbe13c6fd12f060b28b500cba3d6467ee1c7 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 11 Jun 2013 08:38:45 -0500
Subject: [PATCH 143/352] Build Fix

---
 Source/Core/VideoCommon/Src/VertexShaderGen.cpp           | 2 +-
 Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index ecb2623183..f2f72251ef 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -323,7 +323,7 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE ApiType)
 			WRITE(p, "int posmtx = int(fposmtx);\n");
 		}
 
-		if (DriverDetails::HasBug(BUG_NODYNUBOACCESS))
+		if (DriverDetails::HasBug(DriverDetails::BUG_NODYNUBOACCESS))
 		{
 			// This'll cause issues, but  it can't be helped
 			WRITE(p, "float4 pos = float4(dot(" I_TRANSFORMMATRICES"[0], rawpos), dot(" I_TRANSFORMMATRICES"[1], rawpos), dot(" I_TRANSFORMMATRICES"[2], rawpos), 1);\n");		
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index 4588317ab8..d07dbb6246 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -540,8 +540,8 @@ void ProgramShaderCache::CreateHeader ( void )
 		, g_ActiveConfig.backend_info.bSupportsGLSLUBO && v<GLSL_140 ? "#extension GL_ARB_uniform_buffer_object : enable" : ""
 		, v==GLSL_120 ? "attribute" : "in"
 		, v==GLSL_120 ? "attribute" : "out"
-		, DriverDetails::HasBug(BUG_BROKENCENTROID) ? "in" : v==GLSL_120 ? "varying" : "centroid in"
-		, DriverDetails::HasBug(BUG_BROKENCENTROID) ? "out" : v==GLSL_120 ? "varying" : "centroid out"
+		, DriverDetails::HasBug(DriverDetails::BUG_BROKENCENTROID) ? "in" : v==GLSL_120 ? "varying" : "centroid in"
+		, DriverDetails::HasBug(DriverDetails::BUG_BROKENCENTROID) ? "out" : v==GLSL_120 ? "varying" : "centroid out"
 		, v==GLSL_120 ? "#define texture texture2D" : ""
 		, v==GLSL_120 ? "#define round(x) floor((x)+0.5f)" : ""
 		, v==GLSL_120 ? "#define out " : ""

From ab6151a5ba9583b94bdd0cb47c4dbada4c96e315 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 11 Jun 2013 08:41:30 -0500
Subject: [PATCH 144/352] Build Fix 2x

---
 Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index d07dbb6246..90cf401687 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "ProgramShaderCache.h"
-#include "DriverDetails"
+#include "DriverDetails.h"
 #include "MathUtil.h"
 #include "StreamBuffer.h"
 #include "Debugger.h"

From baf16a72b68be7206797e5b02036a058184aa720 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 11 Jun 2013 08:45:31 -0500
Subject: [PATCH 145/352] [Android] Back to enforcing ICS or above limitation.
 Tired of this nonsense.

---
 Source/Android/.idea/workspace.xml | 244 +++++++++++++----------------
 Source/Android/AndroidManifest.xml |   2 +-
 2 files changed, 109 insertions(+), 137 deletions(-)

diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index fa89dca9a9..2a518c17f3 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -35,24 +35,6 @@
     <list default="true" id="682e8195-a9c2-48a7-a941-e8c10f5cb64a" name="Default" comment="" />
     <ignored path="Android.iws" />
     <ignored path=".idea/workspace.xml" />
-    <file path="/fragment.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368867720090" ignored="false" />
-    <file path="/Dummy.txt" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368955682446" ignored="false" />
-    <file path="/GameListView.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369035891369" ignored="false" />
-    <file path="/SettingBrowser.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368965879091" ignored="false" />
-    <file path="/SettingMenuItem.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368957197656" ignored="false" />
-    <file path="/SettingMenuAdapter.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1368957350110" ignored="false" />
-    <file path="/AndroidManifest.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369534483869" ignored="false" />
-    <file path="/EditNameDialog.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369023935830" ignored="false" />
-    <file path="/PrefsActivity.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369031747746" ignored="false" />
-    <file path="/PrefsFragment.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369032642639" ignored="false" />
-    <file path="/prefs.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369036284146" ignored="false" />
-    <file path="$PROJECT_DIR$/gen/org/dolphinemu/dolphinemu/BuildConfig.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369127789356" ignored="false" />
-    <file path="/prefvalues.xml" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369036331457" ignored="false" />
-    <file path="/FolderBrowser.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369217914695" ignored="false" />
-    <file path="/DolphinEmulator.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369534697502" ignored="false" />
-    <file path="/a.groovy" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369535676012" ignored="false" />
-    <file path="/a.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369535541830" ignored="false" />
-    <file path="/sample.java" changelist="682e8195-a9c2-48a7-a941-e8c10f5cb64a" time="1369535538754" ignored="false" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -72,7 +54,6 @@
     <disable_hints />
   </component>
   <component name="DebuggerManager">
-    <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
     <breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
       <breakpoint>
         <option name="NOTIFY_CAUGHT" value="true" />
@@ -109,6 +90,7 @@
         <option name="LOG_MESSAGE" value="" />
       </breakpoint>
     </breakpoint_any>
+    <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
     <breakpoint_rules />
     <ui_properties />
   </component>
@@ -121,7 +103,7 @@
       <file leaf-file-name="DolphinEmulator.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="164" column="4" selection-start="4827" selection-end="4827" vertical-scroll-proportion="-9.307693">
+            <state line="164" column="4" selection-start="4729" selection-end="4729" vertical-scroll-proportion="0.0" vertical-offset="2445" max-vertical-offset="2640">
               <folding />
             </state>
           </provider>
@@ -130,7 +112,7 @@
       <file leaf-file-name="AndroidManifest.xml" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="6" column="72" selection-start="281" selection-end="281" vertical-scroll-proportion="0.23316061">
+            <state line="6" column="39" selection-start="248" selection-end="248" vertical-scroll-proportion="0.026223777" vertical-offset="75" max-vertical-offset="735">
               <folding />
             </state>
           </provider>
@@ -139,7 +121,7 @@
       <file leaf-file-name="GameListView.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="51" column="78" selection-start="1629" selection-end="1629" vertical-scroll-proportion="0.0">
+            <state line="51" column="78" selection-start="1629" selection-end="1629" vertical-scroll-proportion="0.0" vertical-offset="750" max-vertical-offset="3420">
               <folding />
             </state>
           </provider>
@@ -148,7 +130,7 @@
       <file leaf-file-name="FolderBrowser.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="81" column="36" selection-start="2675" selection-end="2675" vertical-scroll-proportion="0.0">
+            <state line="81" column="20" selection-start="2652" selection-end="2652" vertical-scroll-proportion="0.0" vertical-offset="1200" max-vertical-offset="1485">
               <folding />
             </state>
           </provider>
@@ -160,7 +142,7 @@
             <state />
           </provider>
           <provider selected="true" editor-type-id="text-editor">
-            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0">
+            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="495">
               <folding />
             </state>
           </provider>
@@ -169,7 +151,7 @@
       <file leaf-file-name="prefvalues.xml" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="14" column="31" selection-start="392" selection-end="392" vertical-scroll-proportion="-8.4">
+            <state line="14" column="31" selection-start="392" selection-end="392" vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="405">
               <folding />
             </state>
           </provider>
@@ -178,10 +160,8 @@
       <file leaf-file-name="PrefsActivity.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="14" column="0" selection-start="389" selection-end="389" vertical-scroll-proportion="0.0">
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state line="14" column="0" selection-start="389" selection-end="389" vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="690">
+              <folding />
             </state>
           </provider>
         </entry>
@@ -361,23 +341,23 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="dynamic.classpath" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="options.splitter.details.proportions" value="0.2" />
-    <property name="recentsLimit" value="5" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="FullScreen" value="false" />
     <property name="options.searchVisible" value="true" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
-    <property name="restartRequiresConfirmation" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="options.splitter.main.proportions" value="0.3" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="options.lastSelected" value="android.dex.compiler" />
+    <property name="FullScreen" value="false" />
+    <property name="GoToFile.includeJavaFiles" value="false" />
     <property name="MemberChooser.copyJavadoc" value="false" />
+    <property name="recentsLimit" value="5" />
+    <property name="options.lastSelected" value="android.dex.compiler" />
+    <property name="restartRequiresConfirmation" value="true" />
+    <property name="MemberChooser.sorted" value="false" />
+    <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="options.splitter.main.proportions" value="0.3" />
     <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="192.168.0.188:5555" />
+    <property name="GoToClass.includeLibraries" value="false" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="MemberChooser.showClasses" value="true" />
+    <property name="dynamic.classpath" value="false" />
   </component>
   <component name="RunManager" selected="Android Application.Dolphin Emulator">
     <configuration default="true" type="Remote" factoryName="Remote">
@@ -388,17 +368,22 @@
       <option name="PORT" value="5005" />
       <method />
     </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
+    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
       <module name="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="TESTING_TYPE" value="0" />
+      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
+      <option name="METHOD_NAME" value="" />
+      <option name="CLASS_NAME" value="" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
+      <option name="PREFERRED_AVD" value="" />
+      <option name="USE_COMMAND_LINE" value="true" />
+      <option name="COMMAND_LINE" value="" />
+      <option name="WIPE_USER_DATA" value="false" />
+      <option name="DISABLE_BOOT_ANIMATION" value="false" />
+      <option name="NETWORK_SPEED" value="full" />
+      <option name="NETWORK_LATENCY" value="none" />
+      <option name="CLEAR_LOGCAT" value="false" />
       <method />
     </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
@@ -421,38 +406,6 @@
       <patterns />
       <method />
     </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
-      <module name="" />
-      <option name="TESTING_TYPE" value="0" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="USE_COMMAND_LINE" value="true" />
-      <option name="COMMAND_LINE" value="" />
-      <option name="WIPE_USER_DATA" value="false" />
-      <option name="DISABLE_BOOT_ANIMATION" value="false" />
-      <option name="NETWORK_SPEED" value="full" />
-      <option name="NETWORK_LATENCY" value="none" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <method />
-    </configuration>
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
       <option name="ACTIVITY_CLASS" value="" />
@@ -469,6 +422,33 @@
       <option name="CLEAR_LOGCAT" value="false" />
       <method />
     </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+      <method />
+    </configuration>
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <method />
+    </configuration>
     <configuration default="false" name="Dolphin Emulator" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="Android" />
       <option name="ACTIVITY_CLASS" value="" />
@@ -573,30 +553,30 @@
     <frame x="24" y="0" width="1342" height="744" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2179289" sideWeight="0.6912752" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6912752" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3110368" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30872482" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3110368" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.30769232" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
+      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6912752" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2179289" sideWeight="0.6912752" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="VcsContentAnnotationSettings">
@@ -662,14 +642,14 @@
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="58" column="30" selection-start="1963" selection-end="1963" vertical-scroll-proportion="0.0">
+        <state line="58" column="30" selection-start="1963" selection-end="1963" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0">
           <folding />
         </state>
       </provider>
@@ -679,28 +659,28 @@
         <state />
       </provider>
       <provider selected="true" editor-type-id="text-editor">
-        <state line="21" column="41" selection-start="857" selection-end="857" vertical-scroll-proportion="0.0">
+        <state line="21" column="41" selection-start="857" selection-end="857" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="30" column="64" selection-start="729" selection-end="729" vertical-scroll-proportion="-0.42105263">
+        <state line="30" column="64" selection-start="729" selection-end="729" vertical-scroll-proportion="-0.42105263" vertical-offset="0" max-vertical-offset="0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="11" column="13" selection-start="267" selection-end="267" vertical-scroll-proportion="0.082167834">
+        <state line="11" column="13" selection-start="267" selection-end="267" vertical-scroll-proportion="0.082167834" vertical-offset="0" max-vertical-offset="0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="jar://$APPLICATION_HOME_DIR$/sdk/platforms/android-17/android.jar!/android/app/Activity.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="132" column="0" selection-start="5190" selection-end="5190" vertical-scroll-proportion="2.0" />
+        <state line="132" column="0" selection-start="5190" selection-end="5190" vertical-scroll-proportion="2.0" vertical-offset="0" max-vertical-offset="0" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/res/layout/folderbrowser.xml">
@@ -708,9 +688,7 @@
         <state />
       </provider>
       <provider editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/res/layout/main.xml">
@@ -718,31 +696,34 @@
         <state />
       </provider>
       <provider editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
+    <entry file="file://$PROJECT_DIR$/res/layout/folderbrowserfooter.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="81" column="36" selection-start="2675" selection-end="2675" vertical-scroll-proportion="0.0">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0" />
+      </provider>
+      <provider editor-type-id="android-designer">
+        <state />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="164" column="4" selection-start="4729" selection-end="4729" vertical-scroll-proportion="0.0" vertical-offset="2445" max-vertical-offset="2640">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="51" column="78" selection-start="1629" selection-end="1629" vertical-scroll-proportion="0.0">
+        <state line="51" column="78" selection-start="1629" selection-end="1629" vertical-scroll-proportion="0.0" vertical-offset="750" max-vertical-offset="3420">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/res/layout/folderbrowserfooter.xml">
-      <provider editor-type-id="android-designer">
-        <state />
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+        <state line="81" column="20" selection-start="2652" selection-end="2652" vertical-scroll-proportion="0.0" vertical-offset="1200" max-vertical-offset="1485">
           <folding />
         </state>
       </provider>
@@ -752,37 +733,28 @@
         <state />
       </provider>
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="495">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="14" column="31" selection-start="392" selection-end="392" vertical-scroll-proportion="-8.4">
+        <state line="14" column="31" selection-start="392" selection-end="392" vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="405">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="14" column="0" selection-start="389" selection-end="389" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="164" column="4" selection-start="4827" selection-end="4827" vertical-scroll-proportion="-9.307693">
+        <state line="14" column="0" selection-start="389" selection-end="389" vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="690">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="6" column="72" selection-start="281" selection-end="281" vertical-scroll-proportion="0.23316061">
+        <state line="6" column="39" selection-start="248" selection-end="248" vertical-scroll-proportion="0.026223777" vertical-offset="75" max-vertical-offset="735">
           <folding />
         </state>
       </provider>
diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index adf52eb360..c1704eb0c5 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -4,7 +4,7 @@
     android:versionCode="4"
     android:versionName="0.4" >
 
-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
+    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14"/>
     
     <uses-feature android:glEsVersion="0x00020000"></uses-feature>
 		<uses-feature android:name="android.hardware.screen.landscape" />

From e4a3919a2bfb0e5db5e9de64790f809d3de97244 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Wed, 12 Jun 2013 03:11:59 -0500
Subject: [PATCH 146/352] [Android] 0.5 Release.

---
 Source/Android/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index c1704eb0c5..3b4d735b37 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.dolphinemu.dolphinemu"
-    android:versionCode="4"
-    android:versionName="0.4" >
+    android:versionCode="5"
+    android:versionName="0.5" >
 
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14"/>
     

From fa4ad82878d6ac416e1d1d5bd421ddc4399a6700 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Wed, 12 Jun 2013 03:14:13 -0500
Subject: [PATCH 147/352] Fix Windows Compiling?

---
 Source/Core/VideoCommon/VideoCommon.vcxproj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj
index f785cb5c84..f66dfc6b01 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcxproj
+++ b/Source/Core/VideoCommon/VideoCommon.vcxproj
@@ -182,6 +182,7 @@
     <ClCompile Include="Src\CommandProcessor.cpp" />
     <ClCompile Include="Src\CPMemory.cpp" />
     <ClCompile Include="Src\Debugger.cpp" />
+    <ClCompile Include="Src\DriverDetails.cpp" />
     <ClCompile Include="Src\EmuWindow.cpp" />
     <ClCompile Include="Src\Fifo.cpp" />
     <ClCompile Include="Src\FPSCounter.cpp" />
@@ -229,6 +230,7 @@
     <ClInclude Include="Src\CPMemory.h" />
     <ClInclude Include="Src\DataReader.h" />
     <ClInclude Include="Src\Debugger.h" />
+    <ClInclude Include="Src\DriverDetails.h" />
     <ClInclude Include="Src\DLCache.h" />
     <ClInclude Include="Src\EmuWindow.h" />
     <ClInclude Include="Src\Fifo.h" />
@@ -302,4 +304,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

From adb83cfabe77a04052412d2fd631e341c72319a2 Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Sun, 9 Jun 2013 09:43:27 +0200
Subject: [PATCH 148/352] Clarifying the OpenAL loop

because it isn't as clear as it can be
---
 Source/Core/AudioCommon/Src/OpenALStream.cpp | 202 +++++++++----------
 Source/Core/AudioCommon/Src/OpenALStream.h   |  19 +-
 2 files changed, 108 insertions(+), 113 deletions(-)

diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp
index b1e601dfe7..754df6139a 100644
--- a/Source/Core/AudioCommon/Src/OpenALStream.cpp
+++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp
@@ -97,7 +97,7 @@ void OpenALStream::SetVolume(int volume)
 	fVolume = (float)volume / 100.0f;
 
 	if (uiSource)
-		alSourcef(uiSource, AL_GAIN, fVolume); 
+		alSourcef(uiSource, AL_GAIN, fVolume);
 }
 
 void OpenALStream::Update()
@@ -124,6 +124,15 @@ void OpenALStream::SoundLoop()
 {
 	Common::SetCurrentThreadName("Audio thread - openal");
 
+	bool surround_capable = Core::g_CoreStartupParameter.bDPL2Decoder;
+#if defined(__APPLE__)
+	bool float32_capable = false;
+	// OSX does not have the alext AL_FORMAT_51CHN32 yet.
+	surround_capable = false;
+#else
+	bool float32_capable = true;
+#endif
+
 	u32 ulFrequency = m_mixer->GetSampleRate();
 	numBuffers = Core::g_CoreStartupParameter.iLatency + 2; // OpenAL requires a minimum of two buffers
 
@@ -136,22 +145,20 @@ void OpenALStream::SoundLoop()
 	alGenSources(1, &uiSource);
 
 	// Short Silence
-	memset(sampleBuffer, 0, OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * numBuffers);
-	memset(realtimeBuffer, 0, OAL_MAX_SAMPLES * 4);
+	memset(sampleBuffer, 0, OAL_MAX_SAMPLES * numBuffers * FRAME_SURROUND_FLOAT);
+	memset(realtimeBuffer, 0, OAL_MAX_SAMPLES * FRAME_STEREO_SHORT);
 	for (int i = 0; i < numBuffers; i++)
 	{
-#if !defined(__APPLE__)
-		if (Core::g_CoreStartupParameter.bDPL2Decoder)
-			alBufferData(uiBuffers[i], AL_FORMAT_51CHN32, sampleBuffer, 4 * SIZE_FLOAT * SURROUND_CHANNELS, ulFrequency);
+		if (surround_capable)
+			alBufferData(uiBuffers[i], AL_FORMAT_51CHN32, sampleBuffer, 4 * FRAME_SURROUND_FLOAT, ulFrequency);
 		else
-#endif
-			alBufferData(uiBuffers[i], AL_FORMAT_STEREO16, realtimeBuffer, 4 * 2 * 2, ulFrequency);
+			alBufferData(uiBuffers[i], AL_FORMAT_STEREO16, realtimeBuffer, 4 * FRAME_STEREO_SHORT, ulFrequency);
 	}
 	alSourceQueueBuffers(uiSource, numBuffers, uiBuffers);
 	alSourcePlay(uiSource);
-	
+
 	// Set the default sound volume as saved in the config file.
-	alSourcef(uiSource, AL_GAIN, fVolume); 
+	alSourcef(uiSource, AL_GAIN, fVolume);
 
 	// TODO: Error handling
 	//ALenum err = alGetError();
@@ -170,14 +177,7 @@ void OpenALStream::SoundLoop()
 	soundTouch.setSetting(SETTING_SEEKWINDOW_MS, 28);
 	soundTouch.setSetting(SETTING_OVERLAP_MS, 12);
 
-	bool surround_capable = Core::g_CoreStartupParameter.bDPL2Decoder;
-#if defined(__APPLE__)
-	bool float32_capable = false;
-#else
-	bool float32_capable = true;
-#endif
-
-	while (!threadData) 
+	while (!threadData)
 	{
 		// num_samples_to_render in this update - depends on SystemTimers::AUDIO_DMA_PERIOD.
 		const u32 stereo_16_bit_size = 4;
@@ -193,12 +193,9 @@ void OpenALStream::SoundLoop()
 		numSamples = m_mixer->Mix(realtimeBuffer, numSamples);
 
 		// Convert the samples from short to float
-		float dest[OAL_MAX_SAMPLES * 2 * 2 * OAL_MAX_BUFFERS];
-		for (u32 i = 0; i < numSamples; ++i)
-		{
-			dest[i * 2 + 0] = (float)realtimeBuffer[i * 2 + 0] / (1 << 16);
-			dest[i * 2 + 1] = (float)realtimeBuffer[i * 2 + 1] / (1 << 16);
-		}
+		float dest[OAL_MAX_SAMPLES * STEREO_CHANNELS];
+		for (u32 i = 0; i < numSamples * STEREO_CHANNELS; ++i)
+			dest[i] = (float)realtimeBuffer[i] / (1 << 16);
 
 		soundTouch.putSamples(dest, numSamples);
 
@@ -230,101 +227,94 @@ void OpenALStream::SoundLoop()
 				}
 			}
 
-			unsigned int nSamples = soundTouch.receiveSamples(sampleBuffer, OAL_MAX_SAMPLES * SIZE_FLOAT * OAL_MAX_BUFFERS);
+			unsigned int nSamples = soundTouch.receiveSamples(sampleBuffer, OAL_MAX_SAMPLES * numBuffers);
 
-			if (nSamples > minSamples)
+			if (nSamples < minSamples)
+				continue;
+
+			// Remove the Buffer from the Queue.  (uiBuffer contains the Buffer ID for the unqueued Buffer)
+			if (iBuffersFilled == 0)
 			{
-				// Remove the Buffer from the Queue.  (uiBuffer contains the Buffer ID for the unqueued Buffer)
-				if (iBuffersFilled == 0)
-				{
-					alSourceUnqueueBuffers(uiSource, iBuffersProcessed, uiBufferTemp);
-					ALenum err = alGetError();
-					if (err != 0)
-					{
-						ERROR_LOG(AUDIO, "Error unqueuing buffers: %08x", err);
-					}
-				}
-#if defined(__APPLE__)
-				// OSX does not have the alext AL_FORMAT_51CHN32 yet.
-				surround_capable = false;
-#else
-				if (surround_capable)
-				{
-					float dpl2[OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_MAX_BUFFERS];
-					dpl2decode(sampleBuffer, nSamples, dpl2);
-
-					alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_51CHN32, dpl2, nSamples * SIZE_FLOAT * SURROUND_CHANNELS, ulFrequency);
-					ALenum err = alGetError();
-					if (err == AL_INVALID_ENUM)
-					{
-						// 5.1 is not supported by the host, fallback to stereo
-						WARN_LOG(AUDIO, "Unable to set 5.1 surround mode.  Updating OpenAL Soft might fix this issue.");
-						surround_capable = false;
-					}
-					else if (err != 0)
-					{
-						ERROR_LOG(AUDIO, "Error occurred while buffering data: %08x", err);
-					}
-				}
-#endif
-				if (!surround_capable)
-				{
-#if !defined(__APPLE__)
-					if (float32_capable)
-					{
-						alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_STEREO_FLOAT32, sampleBuffer, nSamples * 4 * 2, ulFrequency);
-						ALenum err = alGetError();
-						if (err == AL_INVALID_ENUM)
-						{
-							float32_capable = false;
-						}
-						else if (err != 0)
-						{
-							ERROR_LOG(AUDIO, "Error occurred while buffering float32 data: %08x", err);
-						}
-					}
-#endif
-					if (!float32_capable)
-					{
-						// Convert the samples from float to short
-						short stereo[OAL_MAX_SAMPLES * 2 * 2 * OAL_MAX_BUFFERS];
-						for (u32 i = 0; i < nSamples; ++i)
-						{
-							stereo[i * 2 + 0] = (short)((float)sampleBuffer[i * 2 + 0] * (1 << 16));
-							stereo[i * 2 + 1] = (short)((float)sampleBuffer[i * 2 + 1] * (1 << 16));
-						}
-						alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_STEREO16, stereo, nSamples * 2 * 2, ulFrequency);
-					}
-				}
-
-				alSourceQueueBuffers(uiSource, 1, &uiBufferTemp[iBuffersFilled]);
+				alSourceUnqueueBuffers(uiSource, iBuffersProcessed, uiBufferTemp);
 				ALenum err = alGetError();
 				if (err != 0)
 				{
-					ERROR_LOG(AUDIO, "Error queuing buffers: %08x", err);
+					ERROR_LOG(AUDIO, "Error unqueuing buffers: %08x", err);
 				}
-				iBuffersFilled++;
+			}
 
-				if (iBuffersFilled == numBuffers)
+			if (surround_capable)
+			{
+				float dpl2[OAL_MAX_SAMPLES * OAL_MAX_BUFFERS * SURROUND_CHANNELS];
+				dpl2decode(sampleBuffer, nSamples, dpl2);
+				alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_51CHN32, dpl2, nSamples * FRAME_SURROUND_FLOAT, ulFrequency);
+				ALenum err = alGetError();
+				if (err == AL_INVALID_ENUM)
 				{
-					alSourcePlay(uiSource);
-					err = alGetError();
-					if (err != 0)
+					// 5.1 is not supported by the host, fallback to stereo
+					WARN_LOG(AUDIO, "Unable to set 5.1 surround mode.  Updating OpenAL Soft might fix this issue.");
+					surround_capable = false;
+				}
+				else if (err != 0)
+				{
+					ERROR_LOG(AUDIO, "Error occurred while buffering data: %08x", err);
+				}
+			}
+
+			else
+			{
+				if (float32_capable)
+				{
+					alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_STEREO_FLOAT32, sampleBuffer, nSamples * FRAME_STEREO_FLOAT, ulFrequency);
+					ALenum err = alGetError();
+					if (err == AL_INVALID_ENUM)
 					{
-						ERROR_LOG(AUDIO, "Error occurred during playback: %08x", err);
+						float32_capable = false;
+					}
+					else if (err != 0)
+					{
+						ERROR_LOG(AUDIO, "Error occurred while buffering float32 data: %08x", err);
 					}
 				}
 
-				alGetSourcei(uiSource, AL_SOURCE_STATE, &iState);
-				if (iState != AL_PLAYING)
+				else
 				{
-					// Buffer underrun occurred, resume playback
-					alSourcePlay(uiSource);
-					err = alGetError();
-					if (err != 0)
-					{
-						ERROR_LOG(AUDIO, "Error occurred resuming playback: %08x", err);
-					}
+					// Convert the samples from float to short
+					short stereo[OAL_MAX_SAMPLES * STEREO_CHANNELS * OAL_MAX_BUFFERS];
+					for (u32 i = 0; i < nSamples * STEREO_CHANNELS; ++i)
+						stereo[i] = (short)((float)sampleBuffer[i] * (1 << 16));
+
+					alBufferData(uiBufferTemp[iBuffersFilled], AL_FORMAT_STEREO16, stereo, nSamples * FRAME_STEREO_SHORT, ulFrequency);
+				}
+			}
+
+			alSourceQueueBuffers(uiSource, 1, &uiBufferTemp[iBuffersFilled]);
+			ALenum err = alGetError();
+			if (err != 0)
+			{
+				ERROR_LOG(AUDIO, "Error queuing buffers: %08x", err);
+			}
+			iBuffersFilled++;
+
+			if (iBuffersFilled == numBuffers)
+			{
+				alSourcePlay(uiSource);
+				err = alGetError();
+				if (err != 0)
+				{
+					ERROR_LOG(AUDIO, "Error occurred during playback: %08x", err);
+				}
+			}
+
+			alGetSourcei(uiSource, AL_SOURCE_STATE, &iState);
+			if (iState != AL_PLAYING)
+			{
+				// Buffer underrun occurred, resume playback
+				alSourcePlay(uiSource);
+				err = alGetError();
+				if (err != 0)
+				{
+					ERROR_LOG(AUDIO, "Error occurred resuming playback: %08x", err);
 				}
 			}
 		}
diff --git a/Source/Core/AudioCommon/Src/OpenALStream.h b/Source/Core/AudioCommon/Src/OpenALStream.h
index 42371db045..24217169bd 100644
--- a/Source/Core/AudioCommon/Src/OpenALStream.h
+++ b/Source/Core/AudioCommon/Src/OpenALStream.h
@@ -30,11 +30,16 @@
 #include <soundtouch/STTypes.h>
 
 // 16 bit Stereo
-#define SFX_MAX_SOURCE		1
-#define OAL_MAX_BUFFERS		32
-#define OAL_MAX_SAMPLES		256
-#define SURROUND_CHANNELS	6	// number of channels in surround mode
-#define SIZE_FLOAT			4   // size of a float in bytes
+#define SFX_MAX_SOURCE			1
+#define OAL_MAX_BUFFERS			32
+#define OAL_MAX_SAMPLES			256
+#define STEREO_CHANNELS			2
+#define SURROUND_CHANNELS		6	// number of channels in surround mode
+#define SIZE_SHORT				2
+#define SIZE_FLOAT				4   // size of a float in bytes
+#define FRAME_STEREO_SHORT		STEREO_CHANNELS * SIZE_SHORT
+#define FRAME_STEREO_FLOAT		STEREO_CHANNELS * SIZE_FLOAT
+#define FRAME_SURROUND_FLOAT	SURROUND_CHANNELS * SIZE_FLOAT
 #endif
 
 class OpenALStream: public SoundStream
@@ -61,8 +66,8 @@ private:
 	std::thread thread;
 	Common::Event soundSyncEvent;
 
-	short realtimeBuffer[OAL_MAX_SAMPLES * 2];
-	soundtouch::SAMPLETYPE sampleBuffer[OAL_MAX_SAMPLES * SIZE_FLOAT * SURROUND_CHANNELS * OAL_MAX_BUFFERS];
+	short realtimeBuffer[OAL_MAX_SAMPLES * STEREO_CHANNELS];
+	soundtouch::SAMPLETYPE sampleBuffer[OAL_MAX_SAMPLES * SURROUND_CHANNELS * OAL_MAX_BUFFERS];
 	ALuint uiBuffers[OAL_MAX_BUFFERS];
 	ALuint uiSource;
 	ALfloat fVolume;

From 5bd44d7e3fc064a74e1767744619cf62778749ec Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Thu, 13 Jun 2013 18:38:05 +0200
Subject: [PATCH 149/352] Build fix

---
 Source/Core/AudioCommon/Src/OpenALStream.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp
index 754df6139a..1c6467b801 100644
--- a/Source/Core/AudioCommon/Src/OpenALStream.cpp
+++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp
@@ -127,8 +127,10 @@ void OpenALStream::SoundLoop()
 	bool surround_capable = Core::g_CoreStartupParameter.bDPL2Decoder;
 #if defined(__APPLE__)
 	bool float32_capable = false;
+	const ALenum AL_FORMAT_STEREO_FLOAT32 = 0;
 	// OSX does not have the alext AL_FORMAT_51CHN32 yet.
 	surround_capable = false;
+	const ALenum AL_FORMAT_51CHN32 = 0;
 #else
 	bool float32_capable = true;
 #endif

From 825c5ca09a999aa492bd1137babef5540ff5956e Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Thu, 6 Jun 2013 09:00:52 +0200
Subject: [PATCH 150/352] Equalising the 32 and 64 bit state compression

because that allow loading both
---
 Source/Core/Core/Src/State.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Core/Core/Src/State.cpp b/Source/Core/Core/Src/State.cpp
index f41b32485e..24647c143a 100644
--- a/Source/Core/Core/Src/State.cpp
+++ b/Source/Core/Core/Src/State.cpp
@@ -59,7 +59,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
 static std::thread g_save_thread;
 
 // Don't forget to increase this after doing changes on the savestate system
-static const u32 STATE_VERSION = 19;
+static const u32 STATE_VERSION = 20;
 
 enum
 {
@@ -257,7 +257,7 @@ void CompressAndDumpState(CompressAndDumpState_args save_args)
 		lzo_uint i = 0;
 		while (true)
 		{
-			lzo_uint cur_len = 0;
+			lzo_uint32 cur_len = 0;
 			lzo_uint out_len = 0;
 
 			if ((i + IN_LEN) >= buffer_size)
@@ -269,7 +269,7 @@ void CompressAndDumpState(CompressAndDumpState_args save_args)
 				PanicAlertT("Internal LZO Error - compression failed");
 
 			// The size of the data to write is 'out_len'
-			f.WriteArray(&out_len, 1);
+			f.WriteArray((lzo_uint32*)&out_len, 1);
 			f.WriteBytes(out, out_len);
 
 			if (cur_len != IN_LEN)
@@ -379,7 +379,7 @@ void LoadFileStateData(const std::string& filename, std::vector<u8>& ret_data)
 		lzo_uint i = 0;
 		while (true)
 		{
-			lzo_uint cur_len = 0;  // number of bytes to read
+			lzo_uint32 cur_len = 0;  // number of bytes to read
 			lzo_uint new_len = 0;  // number of bytes to write
 
 			if (!f.ReadArray(&cur_len, 1))

From fc7099a9057ee962ea4fd43bf049396d86065cf0 Mon Sep 17 00:00:00 2001
From: Armada <jules.blok@gmail.com>
Date: Sat, 15 Jun 2013 13:21:57 +0200
Subject: [PATCH 151/352] Set the locale per-thread instead of globally when
 generating shaders. Add cross-compatible versions of newlocale, uselocale and
 freelocale.

This commit fixes a rare race condition when generating shaders because setlocale is global.
---
 Source/Core/Common/Src/CommonFuncs.h          | 39 +++++++++++++++++++
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   |  9 ++++-
 .../Src/TextureConversionShader.cpp           |  9 ++++-
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  |  9 ++++-
 .../Plugin_VideoDX9/Src/PixelShaderCache.cpp  | 10 ++++-
 5 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/Source/Core/Common/Src/CommonFuncs.h b/Source/Core/Common/Src/CommonFuncs.h
index 710c20955e..4321e6dba0 100644
--- a/Source/Core/Common/Src/CommonFuncs.h
+++ b/Source/Core/Common/Src/CommonFuncs.h
@@ -86,6 +86,45 @@ inline u64 _rotr64(u64 x, unsigned int shift){
 	#define unlink _unlink
 	#define snprintf _snprintf
 	#define vscprintf _vscprintf
+	
+// Locale Cross-Compatibility
+	#define locale_t _locale_t
+	#define freelocale _free_locale
+	#define newlocale(mask, locale, base) _create_locale(mask, locale)
+	
+	#define LC_GLOBAL_LOCALE	((locale_t)-1)
+	#define LC_ALL_MASK			LC_ALL
+	#define LC_COLLATE_MASK		LC_COLLATE
+	#define LC_CTYPE_MASK		LC_CTYPE
+	#define LC_MONETARY_MASK	LC_MONETARY
+	#define LC_NUMERIC_MASK		LC_NUMERIC
+	#define LC_TIME_MASK		LC_TIME
+	
+	inline locale_t uselocale(locale_t new_locale)
+	{
+		// Retrieve the current per thread locale setting
+		bool bIsPerThread = (_configthreadlocale(0) == _ENABLE_PER_THREAD_LOCALE);
+
+		// Retrieve the current thread-specific locale
+		locale_t old_locale = bIsPerThread ? _get_current_locale() : LC_GLOBAL_LOCALE;
+
+		if(new_locale == LC_GLOBAL_LOCALE)
+		{
+			// Restore the global locale
+			_configthreadlocale(_DISABLE_PER_THREAD_LOCALE);
+		}
+		else if(new_locale != NULL)
+		{
+			// Configure the thread to set the locale only for this thread
+			_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+
+			// Set all locale categories
+			for(int i = LC_MIN; i <= LC_MAX; i++)
+				setlocale(i, new_locale->locinfo->lc_category[i].locale);
+		}
+
+		return old_locale;
+	}
 
 // 64 bit offsets for windows
 	#define fseeko _fseeki64
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index e6a0512d7f..100cac5976 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -6,6 +6,9 @@
 #include <cmath>
 #include <assert.h>
 #include <locale.h>
+#ifdef __APPLE__
+	#include <xlocale.h>
+#endif
 
 #include "LightingShaderGen.h"
 #include "PixelShaderGen.h"
@@ -513,7 +516,8 @@ const char *WriteLocation(API_TYPE ApiType)
 
 const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
-	setlocale(LC_NUMERIC, "C"); // Reset locale for compilation
+	locale_t locale = newlocale(LC_NUMERIC_MASK, "C", NULL); // New locale for compilation
+	locale_t old_locale = uselocale(locale); // Apply the locale for this thread
 	text[sizeof(text) - 1] = 0x7C;  // canary
 
 	BuildSwapModeTable(); // Needed for WriteStage
@@ -886,7 +890,8 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 	if (text[sizeof(text) - 1] != 0x7C)
 		PanicAlert("PixelShader generator - buffer too small, canary has been eaten!");
 
-	setlocale(LC_NUMERIC, ""); // restore locale
+	uselocale(old_locale); // restore locale
+	freelocale(locale);
 	return text;
 }
 
diff --git a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
index 539d8799f9..573713a198 100644
--- a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
+++ b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
@@ -6,6 +6,9 @@
 #include <stdio.h>
 #include <math.h>
 #include <locale.h>
+#ifdef __APPLE__
+	#include <xlocale.h>
+#endif
 
 #include "TextureConversionShader.h"
 #include "TextureDecoder.h"
@@ -804,7 +807,8 @@ void WriteZ24Encoder(char* p, API_TYPE ApiType)
 
 const char *GenerateEncodingShader(u32 format,API_TYPE ApiType)
 {
-	setlocale(LC_NUMERIC, "C"); // Reset locale for compilation
+	locale_t locale = newlocale(LC_NUMERIC_MASK, "C", NULL); // New locale for compilation
+	locale_t old_locale = uselocale(locale); // Apply the locale for this thread
 	text[sizeof(text) - 1] = 0x7C;  // canary
 
 	char *p = text;
@@ -888,7 +892,8 @@ const char *GenerateEncodingShader(u32 format,API_TYPE ApiType)
 	if (text[sizeof(text) - 1] != 0x7C)
 		PanicAlert("TextureConversionShader generator - buffer too small, canary has been eaten!");
 
-	setlocale(LC_NUMERIC, ""); // restore locale
+	uselocale(old_locale); // restore locale
+	freelocale(locale);
 	return text;
 }
 
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index f2f72251ef..aede4aa2bd 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -4,6 +4,9 @@
 
 #include <math.h>
 #include <locale.h>
+#ifdef __APPLE__
+	#include <xlocale.h>
+#endif
 
 #include "NativeVertexFormat.h"
 
@@ -173,7 +176,8 @@ extern const char *WriteLocation(API_TYPE ApiType);
 
 const char *GenerateVertexShaderCode(u32 components, API_TYPE ApiType)
 {
-	setlocale(LC_NUMERIC, "C"); // Reset locale for compilation
+	locale_t locale = newlocale(LC_NUMERIC_MASK, "C", NULL); // New locale for compilation
+	locale_t old_locale = uselocale(locale); // Apply the locale for this thread
 	text[sizeof(text) - 1] = 0x7C;  // canary
 
 	_assert_(bpmem.genMode.numtexgens == xfregs.numTexGen.numTexGens);
@@ -640,6 +644,7 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE ApiType)
 
 	if (text[sizeof(text) - 1] != 0x7C)
 		PanicAlert("VertexShader generator - buffer too small, canary has been eaten!");
-	setlocale(LC_NUMERIC, ""); // restore locale
+	uselocale(old_locale); // restore locale
+	freelocale(locale);
 	return text;
 }
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
index 37da0b7216..f46cf43bd2 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
@@ -4,6 +4,10 @@
 
 #include <map>
 #include <set>
+#include <locale.h>
+#ifdef __APPLE__
+	#include <xlocale.h>
+#endif
 
 #include "Common.h"
 #include "Hash.h"
@@ -155,7 +159,8 @@ static LPDIRECT3DPIXELSHADER9 CreateCopyShader(int copyMatrixType, int depthConv
 	// this should create the same shaders as before (plus some extras added for DF16), just... more manageably than listing the full program for each combination
 	char text[3072];
 
-	setlocale(LC_NUMERIC, "C"); // Reset locale for compilation
+	locale_t locale = newlocale(LC_NUMERIC_MASK, "C", NULL); // New locale for compilation
+	locale_t old_locale = uselocale(locale); // Apply the locale for this thread
 	text[sizeof(text) - 1] = 0x7C;  // canary
 
 	char* p = text;
@@ -215,7 +220,8 @@ static LPDIRECT3DPIXELSHADER9 CreateCopyShader(int copyMatrixType, int depthConv
 	if (text[sizeof(text) - 1] != 0x7C)
 		PanicAlert("PixelShaderCache copy shader generator - buffer too small, canary has been eaten!");
 
-	setlocale(LC_NUMERIC, ""); // restore locale
+	uselocale(old_locale); // restore locale
+	freelocale(locale);
 	return D3D::CompileAndCreatePixelShader(text, (int)strlen(text));
 }
 

From 9594cac42c7612977e1ef4c8493e52037f15abf9 Mon Sep 17 00:00:00 2001
From: Armada <jules.blok@gmail.com>
Date: Sun, 16 Jun 2013 14:34:23 +0200
Subject: [PATCH 152/352] Build fix: Android NDK doesn't support any locale
 switching.

Also, Mac OS X doesn't support DX9.
---
 Source/Core/VideoCommon/Src/PixelShaderGen.cpp          | 4 ++++
 Source/Core/VideoCommon/Src/TextureConversionShader.cpp | 6 +++++-
 Source/Core/VideoCommon/Src/VertexShaderGen.cpp         | 4 ++++
 Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp | 5 +----
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 100cac5976..cfd236da69 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -516,8 +516,10 @@ const char *WriteLocation(API_TYPE ApiType)
 
 const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
+#ifndef ANDROID
 	locale_t locale = newlocale(LC_NUMERIC_MASK, "C", NULL); // New locale for compilation
 	locale_t old_locale = uselocale(locale); // Apply the locale for this thread
+#endif
 	text[sizeof(text) - 1] = 0x7C;  // canary
 
 	BuildSwapModeTable(); // Needed for WriteStage
@@ -890,8 +892,10 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 	if (text[sizeof(text) - 1] != 0x7C)
 		PanicAlert("PixelShader generator - buffer too small, canary has been eaten!");
 
+#ifndef ANDROID
 	uselocale(old_locale); // restore locale
 	freelocale(locale);
+#endif
 	return text;
 }
 
diff --git a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
index 573713a198..40873b903e 100644
--- a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
+++ b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
@@ -807,8 +807,10 @@ void WriteZ24Encoder(char* p, API_TYPE ApiType)
 
 const char *GenerateEncodingShader(u32 format,API_TYPE ApiType)
 {
+#ifndef ANDROID
 	locale_t locale = newlocale(LC_NUMERIC_MASK, "C", NULL); // New locale for compilation
 	locale_t old_locale = uselocale(locale); // Apply the locale for this thread
+#endif
 	text[sizeof(text) - 1] = 0x7C;  // canary
 
 	char *p = text;
@@ -891,9 +893,11 @@ const char *GenerateEncodingShader(u32 format,API_TYPE ApiType)
 
 	if (text[sizeof(text) - 1] != 0x7C)
 		PanicAlert("TextureConversionShader generator - buffer too small, canary has been eaten!");
-
+	
+#ifndef ANDROID
 	uselocale(old_locale); // restore locale
 	freelocale(locale);
+#endif
 	return text;
 }
 
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index aede4aa2bd..d076593423 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -176,8 +176,10 @@ extern const char *WriteLocation(API_TYPE ApiType);
 
 const char *GenerateVertexShaderCode(u32 components, API_TYPE ApiType)
 {
+#ifndef ANDROID
 	locale_t locale = newlocale(LC_NUMERIC_MASK, "C", NULL); // New locale for compilation
 	locale_t old_locale = uselocale(locale); // Apply the locale for this thread
+#endif
 	text[sizeof(text) - 1] = 0x7C;  // canary
 
 	_assert_(bpmem.genMode.numtexgens == xfregs.numTexGen.numTexGens);
@@ -644,7 +646,9 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE ApiType)
 
 	if (text[sizeof(text) - 1] != 0x7C)
 		PanicAlert("VertexShader generator - buffer too small, canary has been eaten!");
+#ifndef ANDROID
 	uselocale(old_locale); // restore locale
 	freelocale(locale);
+#endif
 	return text;
 }
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
index f46cf43bd2..69555df0e9 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
@@ -5,9 +5,6 @@
 #include <map>
 #include <set>
 #include <locale.h>
-#ifdef __APPLE__
-	#include <xlocale.h>
-#endif
 
 #include "Common.h"
 #include "Hash.h"
@@ -219,7 +216,7 @@ static LPDIRECT3DPIXELSHADER9 CreateCopyShader(int copyMatrixType, int depthConv
 	WRITE(p, "}\n");
 	if (text[sizeof(text) - 1] != 0x7C)
 		PanicAlert("PixelShaderCache copy shader generator - buffer too small, canary has been eaten!");
-
+	
 	uselocale(old_locale); // restore locale
 	freelocale(locale);
 	return D3D::CompileAndCreatePixelShader(text, (int)strlen(text));

From 37630211361ce8ea2b1d0534d2bfa0dd10567d0a Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Thu, 13 Jun 2013 22:04:59 +0200
Subject: [PATCH 153/352] Adding Travis CI script

because a build test is useful
---
 .travis.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..6d74538247
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,16 @@
+language:
+- cpp
+# - objective-c
+
+install:
+- sudo add-apt-repository -y ppa:fransschreuder1/usbpicprog-stable
+- sudo apt-get -qq update
+- sudo apt-get -qq install git cmake gettext wx2.9-headers libwxbase2.9-dev libwxgtk2.9-dev libgtk-3-dev libwayland-dev libsdl1.2-dev nvidia-cg-toolkit libxrandr-dev libxext-dev libglew-dev libavcodec-dev libavformat-dev libsoil-dev libsfml-dev libopenal-dev libao-dev libasound2-dev libpulse-dev libportaudio-dev libsoundtouch-dev libbluetooth-dev libreadline-dev libswscale-dev liblzo2-dev
+- nproc=$((`nproc` / 2))
+
+# - brew update
+# - brew install cmake
+# - nproc=4
+
+script:
+- cmake . && make -j $nproc

From 448e0900d11fa1fece832e2f6034710528637d9a Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sun, 16 Jun 2013 19:58:30 -0500
Subject: [PATCH 154/352] Revert "Adding Travis CI script"

This reverts commit 37630211361ce8ea2b1d0534d2bfa0dd10567d0a.

Reason: No.
---
 .travis.yml | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 6d74538247..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-language:
-- cpp
-# - objective-c
-
-install:
-- sudo add-apt-repository -y ppa:fransschreuder1/usbpicprog-stable
-- sudo apt-get -qq update
-- sudo apt-get -qq install git cmake gettext wx2.9-headers libwxbase2.9-dev libwxgtk2.9-dev libgtk-3-dev libwayland-dev libsdl1.2-dev nvidia-cg-toolkit libxrandr-dev libxext-dev libglew-dev libavcodec-dev libavformat-dev libsoil-dev libsfml-dev libopenal-dev libao-dev libasound2-dev libpulse-dev libportaudio-dev libsoundtouch-dev libbluetooth-dev libreadline-dev libswscale-dev liblzo2-dev
-- nproc=$((`nproc` / 2))
-
-# - brew update
-# - brew install cmake
-# - nproc=4
-
-script:
-- cmake . && make -j $nproc

From 43a4d418896f47ea971ccd83d5630a97f0f0000b Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Mon, 17 Jun 2013 19:25:55 +1200
Subject: [PATCH 155/352] Handle 1 partition only, fixes Issue #6353

---
 Source/Core/DolphinWX/Src/ISOProperties.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
index 3b2a79748d..efd84521f8 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp
@@ -818,14 +818,24 @@ void CISOProperties::OnExtractDir(wxCommandEvent& event)
 void CISOProperties::OnExtractDataFromHeader(wxCommandEvent& event)
 {
 	std::vector<const DiscIO::SFileInfo *> fst;
-	DiscIO::IFileSystem *FS = 0;
+	DiscIO::IFileSystem *FS = NULL;
 	wxString Path = wxDirSelector(_("Choose the folder to extract to"));
 
 	if (Path.empty())
 		return;
 
 	if (DiscIO::IsVolumeWiiDisc(OpenISO))
-		FS = WiiDisc.at(1).FileSystem;
+		if(WiiDisc.size() > 0)
+		{
+			// Get the filesystem of the LAST partition
+			FS = WiiDisc.at(WiiDisc.size() - 1).FileSystem;
+		}
+		else
+		{
+			PanicAlertT("No partitions found for: %s!", 
+						WxStrToStr(Path).c_str());
+			return;
+		}
 	else
 		FS = pFileSystem;
 

From 32b78a85726eb1d82c461ceefa066fc723cf4413 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Wed, 1 May 2013 11:39:30 +0200
Subject: [PATCH 156/352] First steps of making the pixel shader uid struct
 more compact.

---
 Source/Core/VideoCommon/Src/BPMemory.h        |   2 +-
 .../Core/VideoCommon/Src/LightingShaderGen.h  |  30 +--
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   |  91 ++++---
 Source/Core/VideoCommon/Src/PixelShaderGen.h  | 246 ++++++++----------
 Source/Core/VideoCommon/Src/ShaderGenCommon.h |  17 +-
 5 files changed, 181 insertions(+), 205 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/BPMemory.h b/Source/Core/VideoCommon/Src/BPMemory.h
index 0ae29a3022..5254ba7bd7 100644
--- a/Source/Core/VideoCommon/Src/BPMemory.h
+++ b/Source/Core/VideoCommon/Src/BPMemory.h
@@ -376,7 +376,7 @@ struct TevStageCombiner
 
 	union TwoTevStageOrders
 	{
-		struct 
+		struct
 		{
 			u32 texmap0    : 3; // indirect tex stage texmap
 			u32 texcoord0  : 3;
diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.h b/Source/Core/VideoCommon/Src/LightingShaderGen.h
index fde60be891..36bc52749a 100644
--- a/Source/Core/VideoCommon/Src/LightingShaderGen.h
+++ b/Source/Core/VideoCommon/Src/LightingShaderGen.h
@@ -54,8 +54,8 @@ static void GenerateLightShader(T& object, LightingUidData& uid_data, int index,
 	else if (coloralpha == 2)
 		swizzle = "w";
 
-	uid_data.lit_chans[litchan_index].attnfunc = chan.attnfunc;
-	uid_data.lit_chans[litchan_index].diffusefunc = chan.diffusefunc;
+	uid_data.attnfunc |= chan.attnfunc << (2*litchan_index);
+	uid_data.diffusefunc |= chan.diffusefunc << (2*litchan_index);
 	if (!(chan.attnfunc & 1))
 	{
 		// atten disabled
@@ -124,7 +124,7 @@ static void GenerateLightingShader(T& object, LightingUidData& uid_data, int com
 
 		object.Write("{\n");
 
-		uid_data.lit_chans[j].matsource = xfregs.color[j].matsource;
+		uid_data.matsource |= xfregs.color[j].matsource << j;
 		if (color.matsource) // from vertex
 		{
 			if (components & (VB_HAS_COL0 << j))
@@ -139,10 +139,10 @@ static void GenerateLightingShader(T& object, LightingUidData& uid_data, int com
 			object.Write("mat = %s[%d];\n", materialsName, j+2);
 		}
 
-		uid_data.lit_chans[j].enablelighting = xfregs.color[j].enablelighting;
+		uid_data.enablelighting |= xfregs.color[j].enablelighting << j;
 		if (color.enablelighting)
 		{
-			uid_data.lit_chans[j].ambsource = xfregs.color[j].ambsource;
+			uid_data.ambsource |= xfregs.color[j].ambsource << j;
 			if (color.ambsource) // from vertex
 			{
 				if (components & (VB_HAS_COL0<<j) )
@@ -163,7 +163,7 @@ static void GenerateLightingShader(T& object, LightingUidData& uid_data, int com
 		}
 
 		// check if alpha is different
-		uid_data.lit_chans[j+2].matsource = xfregs.alpha[j].matsource;
+		uid_data.matsource |= xfregs.alpha[j].matsource << (j+2);
 		if (alpha.matsource != color.matsource)
 		{
 			if (alpha.matsource) // from vertex
@@ -180,10 +180,10 @@ static void GenerateLightingShader(T& object, LightingUidData& uid_data, int com
 			}
 		}
 
-		uid_data.lit_chans[j+2].enablelighting = xfregs.alpha[j].enablelighting;
+		uid_data.enablelighting |= xfregs.alpha[j].enablelighting << (j+2);
 		if (alpha.enablelighting)
 		{
-			uid_data.lit_chans[j+2].ambsource = xfregs.alpha[j].ambsource;
+			uid_data.ambsource |= xfregs.alpha[j].ambsource << (j+2);
 			if (alpha.ambsource) // from vertex
 			{
 				if (components & (VB_HAS_COL0<<j) )
@@ -207,12 +207,12 @@ static void GenerateLightingShader(T& object, LightingUidData& uid_data, int com
 		{
 			// both have lighting, test if they use the same lights
 			int mask = 0;
-			uid_data.lit_chans[j].attnfunc = color.attnfunc;
-			uid_data.lit_chans[j+2].attnfunc = alpha.attnfunc;
-			uid_data.lit_chans[j].diffusefunc = color.diffusefunc;
-			uid_data.lit_chans[j+2].diffusefunc = alpha.diffusefunc;
-			uid_data.lit_chans[j].light_mask = color.GetFullLightMask();
-			uid_data.lit_chans[j+2].light_mask = alpha.GetFullLightMask();
+			uid_data.attnfunc |= color.attnfunc << (2*j);
+			uid_data.attnfunc |= alpha.attnfunc << (2*(j+2));
+			uid_data.diffusefunc |= color.diffusefunc << (2*j);
+			uid_data.diffusefunc |= alpha.diffusefunc << (2*(j+2));
+			uid_data.light_mask |= color.GetFullLightMask() << (8*j);
+			uid_data.light_mask |= alpha.GetFullLightMask() << (8*(j+2));
 			if(color.lightparams == alpha.lightparams)
 			{
 				mask = color.GetFullLightMask() & alpha.GetFullLightMask();
@@ -244,7 +244,7 @@ static void GenerateLightingShader(T& object, LightingUidData& uid_data, int com
 			const int lit_index = color.enablelighting ? j : (j+2);
 			int coloralpha = color.enablelighting ? 1 : 2;
 
-			uid_data.lit_chans[lit_index].light_mask = workingchannel.GetFullLightMask();
+			uid_data.light_mask |= workingchannel.GetFullLightMask() << (8*lit_index);
 			for (int i = 0; i < 8; ++i)
 			{
 				if (workingchannel.GetFullLightMask() & (1<<i))
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 2be42bcf43..ab3df05781 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -241,6 +241,8 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 	pixel_shader_uid_data& uid_data = (&out.template GetUidData<pixel_shader_uid_data>() != NULL)
 										? out.template GetUidData<pixel_shader_uid_data>() : dummy_data;
 
+	ERROR_LOG(VIDEO, "%lu", sizeof(pixel_shader_uid_data));
+
 	out.SetBuffer(text);
 	if (out.GetBuffer() != NULL)
 		setlocale(LC_NUMERIC, "C"); // Reset locale for compilation
@@ -257,9 +259,9 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 		numStages, numTexgen, bpmem.genMode.numindstages);
 
 	uid_data.dstAlphaMode = dstAlphaMode;
-	uid_data.genMode.numindstages = bpmem.genMode.numindstages;
-	uid_data.genMode.numtevstages = bpmem.genMode.numtevstages;
-	uid_data.genMode.numtexgens = bpmem.genMode.numtexgens;
+	uid_data.genMode_numindstages = bpmem.genMode.numindstages;
+	uid_data.genMode_numtevstages = bpmem.genMode.numtevstages;
+	uid_data.genMode_numtexgens = bpmem.genMode.numtexgens;
 
 	if (ApiType == API_OPENGL)
 	{
@@ -466,7 +468,7 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 		for (unsigned int i = 0; i < numTexgen; ++i)
 		{
 			// optional perspective divides
-			uid_data.texMtxInfo[i].projection = xfregs.texMtxInfo[i].projection;
+			uid_data.texMtxInfo_n_projection |= xfregs.texMtxInfo[i].projection << i;
 			if (xfregs.texMtxInfo[i].projection == XF_TEXPROJ_STQ)
 			{
 				out.Write("\tif (uv%d.z != 0.0f)", i);
@@ -496,7 +498,7 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 			unsigned int texcoord = bpmem.tevindref.getTexCoord(i);
 			unsigned int texmap = bpmem.tevindref.getTexMap(i);
 
-			uid_data.tevindref.SetValues(i, texcoord, texmap);
+			uid_data.SetTevindrefValues(i, texcoord, texmap);
 			if (texcoord < numTexgen)
 			{
 				out.SetConstantsUsed(C_INDTEXSCALE+i/2,C_INDTEXSCALE+i/2);
@@ -566,7 +568,7 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 	// Note: depth textures are disabled if early depth test is enabled
 	uid_data.ztex_op = bpmem.ztex2.op;
 	uid_data.per_pixel_depth = per_pixel_depth;
-	uid_data.fog.fsel = bpmem.fog.c_proj_fsel.fsel;
+	uid_data.fog_fsel = bpmem.fog.c_proj_fsel.fsel;
 
 	// depth texture can safely be ignored if the result won't be written to the depth buffer (early_ztest) and isn't used for fog either
 	bool skip_ztexture = !per_pixel_depth && !bpmem.fog.c_proj_fsel.fsel;
@@ -687,13 +689,12 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 	out.Write("// TEV stage %d\n", n);
 
 	uid_data.bHasIndStage |= bHasIndStage << n;
-	if (n < 8) { uid_data.tevorders_n_texcoord1 |= texcoord << (3 * n); }
-	else uid_data.tevorders_n_texcoord2 |= texcoord << (3 * n - 24);
+	uid_data.tevorders_n_texcoord |= texcoord << (3 * n);
 	if (bHasIndStage)
 	{
-		uid_data.tevind_n.bs |= bpmem.tevind[n].bs << (2*n);
-		uid_data.tevind_n.bt |= bpmem.tevind[n].bt << (2*n);
-		uid_data.tevind_n.fmt |= bpmem.tevind[n].fmt << (2*n);
+		uid_data.tevind_n_bs |= bpmem.tevind[n].bs << (2*n);
+		uid_data.tevind_n_bt |= bpmem.tevind[n].bt << (2*n);
+		uid_data.tevind_n_fmt |= bpmem.tevind[n].fmt << (2*n);
 
 		out.Write("// indirect op\n");
 		// perform the indirect op on the incoming regular coordinates using indtex%d as the offset coords
@@ -708,12 +709,12 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		out.Write("float3 indtevcrd%d = indtex%d * %s;\n", n, bpmem.tevind[n].bt, tevIndFmtScale[bpmem.tevind[n].fmt]);
 
 		// bias
-		uid_data.tevind_n.Set_bias(n, bpmem.tevind[n].bias);
+		uid_data.Set_tevind_bias(n, bpmem.tevind[n].bias);
 		if (bpmem.tevind[n].bias != ITB_NONE )
 			out.Write("indtevcrd%d.%s += %s;\n", n, tevIndBiasField[bpmem.tevind[n].bias], tevIndBiasAdd[bpmem.tevind[n].fmt]);
 
 		// multiply by offset matrix and scale
-		uid_data.tevind_n.Set_mid(n, bpmem.tevind[n].mid);
+		uid_data.Set_tevind_mid(n, bpmem.tevind[n].mid);
 		if (bpmem.tevind[n].mid != 0)
 		{
 			if (bpmem.tevind[n].mid <= 3)
@@ -750,9 +751,9 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		// ---------
 		// Wrapping
 		// ---------
-		uid_data.tevind_n.Set_sw(n, bpmem.tevind[n].sw);
-		uid_data.tevind_n.Set_tw(n, bpmem.tevind[n].tw);
-		uid_data.tevind_n.fb_addprev |= bpmem.tevind[n].fb_addprev << n;
+		uid_data.Set_tevind_sw(n, bpmem.tevind[n].sw);
+		uid_data.Set_tevind_tw(n, bpmem.tevind[n].tw);
+		uid_data.tevind_n_fb_addprev |= bpmem.tevind[n].fb_addprev << n;
 
 		// wrap S
 		if (bpmem.tevind[n].sw == ITW_OFF)
@@ -779,8 +780,26 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 	TevStageCombiner::ColorCombiner &cc = bpmem.combiners[n].colorC;
 	TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[n].alphaC;
 
-	uid_data.combiners[n].colorC.hex = cc.hex & 0xFFFFFF;
-	uid_data.combiners[n].alphaC.hex = ac.hex & 0xFFFFFF;
+	uid_data.cc_n_d = cc.d;
+	uid_data.cc_n_c = cc.c;
+	uid_data.cc_n_b = cc.b;
+	uid_data.cc_n_a = cc.a;
+	uid_data.cc_n_bias = cc.bias;
+	uid_data.cc_n_op = cc.op;
+	uid_data.cc_n_clamp = cc.clamp;
+	uid_data.cc_n_shift = cc.shift;
+	uid_data.cc_n_dest = cc.dest;
+	uid_data.ac_n_rswap = ac.rswap;
+	uid_data.ac_n_tswap = ac.tswap;
+	uid_data.ac_n_d = ac.d;
+	uid_data.ac_n_c = ac.c;
+	uid_data.ac_n_b = ac.b;
+	uid_data.ac_n_a = ac.a;
+	uid_data.ac_n_bias = ac.bias;
+	uid_data.ac_n_op = ac.op;
+	uid_data.ac_n_clamp = ac.clamp;
+	uid_data.ac_n_shift = ac.shift;
+	uid_data.ac_n_dest = ac.dest;
 
 	if(cc.a == TEVCOLORARG_RASA || cc.a == TEVCOLORARG_RASC
 		|| cc.b == TEVCOLORARG_RASA || cc.b == TEVCOLORARG_RASC
@@ -790,10 +809,10 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		|| ac.c == TEVALPHAARG_RASA || ac.d == TEVALPHAARG_RASA)
 	{
 		const int i = bpmem.combiners[n].alphaC.rswap;
-		uid_data.tevksel[i*2  ].swap1 = bpmem.tevksel[i*2  ].swap1;
-		uid_data.tevksel[i*2+1].swap1 = bpmem.tevksel[i*2+1].swap1;
-		uid_data.tevksel[i*2  ].swap2 = bpmem.tevksel[i*2  ].swap2;
-		uid_data.tevksel[i*2+1].swap2 = bpmem.tevksel[i*2+1].swap2;
+		uid_data.tevksel_n_swap1 = bpmem.tevksel[i*2  ].swap1 << (2 * (i*2  ));
+		uid_data.tevksel_n_swap1 = bpmem.tevksel[i*2+1].swap1 << (2 * (i*2+1));
+		uid_data.tevksel_n_swap2 = bpmem.tevksel[i*2  ].swap2 << (2 * (i*2  ));
+		uid_data.tevksel_n_swap2 = bpmem.tevksel[i*2+1].swap2 << (2 * (i*2+1));
 
 		char *rasswap = swapModeTable[bpmem.combiners[n].alphaC.rswap];
 		out.Write("rastemp = %s.%s;\n", tevRasTable[bpmem.tevorders[n / 2].getColorChan(n & 1)], rasswap);
@@ -813,14 +832,14 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		}
 
 		const int i = bpmem.combiners[n].alphaC.tswap;
-		uid_data.tevksel[i*2  ].swap1 = bpmem.tevksel[i*2  ].swap1;
-		uid_data.tevksel[i*2+1].swap1 = bpmem.tevksel[i*2+1].swap1;
-		uid_data.tevksel[i*2  ].swap2 = bpmem.tevksel[i*2  ].swap2;
-		uid_data.tevksel[i*2+1].swap2 = bpmem.tevksel[i*2+1].swap2;
+		uid_data.tevksel_n_swap1 = bpmem.tevksel[i*2  ].swap1 << (2 * (i*2  ));
+		uid_data.tevksel_n_swap1 = bpmem.tevksel[i*2+1].swap1 << (2 * (i*2+1));
+		uid_data.tevksel_n_swap2 = bpmem.tevksel[i*2  ].swap2 << (2 * (i*2  ));
+		uid_data.tevksel_n_swap2 = bpmem.tevksel[i*2+1].swap2 << (2 * (i*2+1));
 
 		char *texswap = swapModeTable[bpmem.combiners[n].alphaC.tswap];
 		int texmap = bpmem.tevorders[n/2].getTexMap(n&1);
-		uid_data.tevindref.SetTexmap(i, texmap);
+		uid_data.SetTevindrefTexmap(i, texmap);
 		SampleTexture<T>(out, "textemp", "tevcoord", texswap, texmap, ApiType);
 	}
 	else
@@ -834,8 +853,8 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 	{
 		int kc = bpmem.tevksel[n / 2].getKC(n & 1);
 		int ka = bpmem.tevksel[n / 2].getKA(n & 1);
-		uid_data.tevksel[n/2].set_kcsel(n & 1, kc);
-		uid_data.tevksel[n/2].set_kasel(n & 1, ka);
+		uid_data.set_tevksel_kcsel(n/2, n & 1, kc);
+		uid_data.set_tevksel_kasel(n/2, n & 1, ka);
 		out.Write("konsttemp = float4(%s, %s);\n", tevKSelTableC[kc], tevKSelTableA[ka]);
 		if(kc > 7 || ka > 7)
 		{
@@ -1086,9 +1105,9 @@ static void WriteAlphaTest(T& out, pixel_shader_uid_data& uid_data, API_TYPE Api
 	// using discard then return works the same in cg and dx9 but not in dx11
 	out.Write("\tif(!( ");
 
-	uid_data.alpha_test.comp0 = bpmem.alpha_test.comp0;
-	uid_data.alpha_test.logic = bpmem.alpha_test.comp1;
-	uid_data.alpha_test.logic = bpmem.alpha_test.logic;
+	uid_data.alpha_test_comp0 = bpmem.alpha_test.comp0;
+	uid_data.alpha_test_logic = bpmem.alpha_test.comp1;
+	uid_data.alpha_test_logic = bpmem.alpha_test.logic;
 
 	// Lookup the first component from the alpha function table
 	int compindex = bpmem.alpha_test.comp0;
@@ -1117,7 +1136,7 @@ static void WriteAlphaTest(T& out, pixel_shader_uid_data& uid_data, API_TYPE Api
 	// when the alpha test fail. This is not a correct implementation because
 	// even if the depth test fails the fragment could be alpha blended, but
 	// we don't have a choice.
-	uid_data.alpha_test.use_zcomploc_hack = bpmem.zcontrol.early_ztest && bpmem.zmode.updateenable;
+	uid_data.alpha_test_use_zcomploc_hack = bpmem.zcontrol.early_ztest && bpmem.zmode.updateenable;
 	if (!(bpmem.zcontrol.early_ztest && bpmem.zmode.updateenable))
 	{
 		out.Write("\t\tdiscard;\n");
@@ -1143,11 +1162,11 @@ static const char *tevFogFuncsTable[] =
 template<class T>
 static void WriteFog(T& out, pixel_shader_uid_data& uid_data)
 {
-	uid_data.fog.fsel = bpmem.fog.c_proj_fsel.fsel;
+	uid_data.fog_fsel = bpmem.fog.c_proj_fsel.fsel;
 	if(bpmem.fog.c_proj_fsel.fsel == 0)
 		return; // no Fog
 
-	uid_data.fog.proj = bpmem.fog.c_proj_fsel.proj;
+	uid_data.fog_proj = bpmem.fog.c_proj_fsel.proj;
 
 	out.SetConstantsUsed(C_FOG, C_FOG+1);
 	if (bpmem.fog.c_proj_fsel.proj == 0)
@@ -1166,7 +1185,7 @@ static void WriteFog(T& out, pixel_shader_uid_data& uid_data)
 	// x_adjust = sqrt((x-center)^2 + k^2)/k
 	// ze *= x_adjust
 	// this is completely theoretical as the real hardware seems to use a table intead of calculating the values.
-	uid_data.fog.RangeBaseEnabled = bpmem.fogRange.Base.Enabled;
+	uid_data.fog_RangeBaseEnabled = bpmem.fogRange.Base.Enabled;
 	if (bpmem.fogRange.Base.Enabled)
 	{
 		out.SetConstantsUsed(C_FOG+2, C_FOG+2);
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 2340b96af7..5ae3febfa3 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -55,162 +55,119 @@ const s_svar PSVar_Loc[] = { {I_COLORS, C_COLORS, 4 },
 						{I_PMATERIALS, C_PMATERIALS, 4 },
 						};
 
+// TODO: Packing?
+//#pragma pack(4)
 struct pixel_shader_uid_data
 {
 	u32 components;
-	DSTALPHA_MODE dstAlphaMode; // TODO: as u32 :2
-	AlphaTest::TEST_RESULT Pretest; // TODO: As :2
+	u32 dstAlphaMode : 2;
+	u32 Pretest : 2;
+
+	u32 genMode_numtexgens : 4;
+	u32 genMode_numtevstages : 4;
+	u32 genMode_numindstages : 3;
+
 	u32 nIndirectStagesUsed : 8;
-	struct {
-        u32 numtexgens : 4;
-        u32 numtevstages : 4;
-		u32 numindstages : 3;
-	} genMode;
-	struct
+
+	u32 texMtxInfo_n_unknown : 8; // 8x1 bit
+	u32 texMtxInfo_n_projection : 8; // 8x1 bit
+	u32 texMtxInfo_n_inputform : 16; // 8x2 bits
+	u32 texMtxInfo_n_texgentype : 24; // 8x3 bits
+	u64 texMtxInfo_n_sourcerow : 40; // 8x5 bits
+	u32 texMtxInfo_n_embosssourceshift : 24; // 8x3 bits
+	u32 texMtxInfo_n_embosslightshift : 24; // 8x3 bits
+
+	u32 tevindref_bi0 : 3;
+	u32 tevindref_bc0 : 3;
+	u32 tevindref_bi1 : 3;
+	u32 tevindref_bc1 : 3;
+	u32 tevindref_bi2 : 3;
+	u32 tevindref_bc3 : 3;
+	u32 tevindref_bi4 : 3;
+	u32 tevindref_bc4 : 3;
+	inline void SetTevindrefValues(int index, u32 texcoord, u32 texmap)
 	{
-		u32 unknown : 1;
-		u32 projection : 1; // XF_TEXPROJ_X
-		u32 inputform : 2; // XF_TEXINPUT_X
-		u32 texgentype : 3; // XF_TEXGEN_X
-		u32 sourcerow : 5; // XF_SRCGEOM_X
-		u32 embosssourceshift : 3; // what generated texcoord to use
-		u32 embosslightshift : 3; // light index that is used
-	} texMtxInfo[8];
-	struct
+		if (index == 0) { tevindref_bc0 = texcoord; tevindref_bi0 = texmap; }
+		else if (index == 1) { tevindref_bc1 = texcoord; tevindref_bi1 = texmap; }
+		else if (index == 2) { tevindref_bc3 = texcoord; tevindref_bi2 = texmap; }
+		else if (index == 3) { tevindref_bc4 = texcoord; tevindref_bi4 = texmap; }
+	}
+	inline void SetTevindrefTexmap(int index, u32 texmap)
 	{
-        u32 bi0 : 3; // indirect tex stage 0 ntexmap
-        u32 bc0 : 3; // indirect tex stage 0 ntexcoord
-        u32 bi1 : 3;
-        u32 bc1 : 3;
-        u32 bi2 : 3;
-        u32 bc3 : 3;
-        u32 bi4 : 3;
-        u32 bc4 : 3;
-		inline void SetValues(int index, u32 texcoord, u32 texmap)
-		{
-			if (index == 0) { bc0 = texcoord; bi0 = texmap; }
-			else if (index == 1) { bc1 = texcoord; bi1 = texmap; }
-			else if (index == 2) { bc3 = texcoord; bi2 = texmap; }
-			else if (index == 3) { bc4 = texcoord; bi4 = texmap; }
-		}
-		inline void SetTexmap(int index, u32 texmap)
-		{
-			if (index == 0) { bi0 = texmap; }
-			else if (index == 1) { bi1 = texmap; }
-			else if (index == 2) { bi2 = texmap; }
-			else if (index == 3) { bi4 = texmap; }
-		}
-	} tevindref;
+		if (index == 0) { tevindref_bi0 = texmap; }
+		else if (index == 1) { tevindref_bi1 = texmap; }
+		else if (index == 2) { tevindref_bi2 = texmap; }
+		else if (index == 3) { tevindref_bi4 = texmap; }
+	}
 
-	u32 tevorders_n_texcoord1 : 24; // 8 x 3 bit
-	u32 tevorders_n_texcoord2 : 24; // 8 x 3 bit
-	struct
+	u64 tevorders_n_texcoord : 48; // 16 x 3 bits
+
+	u64 tevind_n_sw : 48;         // 16 x 3 bits
+	u64 tevind_n_tw : 48;         // 16 x 3 bits
+	u32 tevind_n_fb_addprev : 16; // 16 x 1 bit
+	u32 tevind_n_bs : 32;         // 16 x 2 bits
+	u32 tevind_n_fmt : 32;        // 16 x 2 bits
+	u32 tevind_n_bt : 32;         // 16 x 2 bits
+	u64 tevind_n_bias : 48;       // 16 x 3 bits
+	u64 tevind_n_mid : 64;        // 16 x 4 bits
+
+	// NOTE: These assume that the affected bits are zero before calling
+	void Set_tevind_sw(int index, u64 val)
 	{
-		u32 sw1 : 24;        // 8 x 3 bit
-		u32 sw2 : 24;        // 8 x 3 bit
-		u32 tw1 : 24;        // 8 x 3 bit
-		u32 tw2 : 24;        // 8 x 3 bit
-		u32 fb_addprev : 16; // 16 x 1 bit
-		u32 bs : 32;         // 16 x 2 bit
-		u32 fmt : 32;        // 16 x 2 bit
-		u32 bt : 32;         // 16 x 2 bit
-		u32 bias1 : 24;      // 8 x 3 bit
-		u32 bias2 : 24;      // 8 x 3 bit
-		u32 mid1 : 32;       // 8 x 4 bit
-		u32 mid2 : 32;       // 8 x 4 bit
-
-		// NOTE: These assume that the affected bits are zero before calling
-		void Set_sw(int index, u32 val)
-		{
-			if (index < 8) sw1 |= val << (3*index);
-			else sw2 |= val << (3*index - 24);
-		}
-		void Set_tw(int index, u32 val)
-		{
-			if (index < 8) tw1 |= val << (3*index);
-			else tw2 |= val << (3*index - 24);
-		}
-		void Set_bias(int index, u32 val)
-		{
-			if (index < 8) bias1 |= val << (3*index);
-			else bias2 |= val << (3*index - 24);
-		}
-		void Set_mid(int index, u32 val)
-		{
-			if (index < 8) mid1 |= val << (4*index);
-			else mid2 |= val << (4*index - 32);
-		}
-	} tevind_n;
-
-	struct
+		tevind_n_sw |= val << (3*index);
+	}
+	void Set_tevind_tw(int index, u64 val)
 	{
-		u32 swap1 : 2;
-		u32 swap2 : 2;
-		u32 kcsel0 : 5;
-		u32 kasel0 : 5;
-		u32 kcsel1 : 5;
-		u32 kasel1 : 5;
-
-		void set_kcsel(int i, u32 value) { if (i) kcsel1 = value; else kcsel0 = value; }
-		void set_kasel(int i, u32 value) { if( i) kasel1 = value; else kasel0 = value; }
-	} tevksel[8];
-
-	struct
+		tevind_n_tw |= val << (3*index);
+	}
+	void Set_tevind_bias(int index, u64 val)
 	{
-		union {
-			struct  //abc=8bit,d=10bit
-			{
-				u32 d : 4; // TEVSELCC_X
-				u32 c : 4; // TEVSELCC_X
-				u32 b : 4; // TEVSELCC_X
-				u32 a : 4; // TEVSELCC_X
-
-				u32 bias : 2;
-				u32 op : 1;
-				u32 clamp : 1;
-
-				u32 shift : 2;
-				u32 dest : 2;  //1,2,3
-			};
-			u32 hex : 24;
-		} colorC;
-		union {
-			struct
-			{
-				u32 rswap : 2;
-				u32 tswap : 2;
-				u32 d : 3; // TEVSELCA_
-				u32 c : 3; // TEVSELCA_
-				u32 b : 3; // TEVSELCA_
-				u32 a : 3; // TEVSELCA_
-
-				u32 bias : 2; //GXTevBias
-				u32 op : 1;
-				u32 clamp : 1;
-
-				u32 shift : 2;
-				u32 dest : 2;  //1,2,3
-			};
-			u32 hex : 24;
-		} alphaC;
-	} combiners[16];
-	struct
+		tevind_n_bias |= val << (3*index);
+	}
+	void Set_tevind_mid(int index, u64 val)
 	{
-		u32 comp0 : 3;
-		u32 comp1 : 3;
-		u32 logic : 2;
-		u32 use_zcomploc_hack : 1;
-	} alpha_test;
+		tevind_n_mid |= val << (4*index);
+	}
 
-	union {
-		struct
-		{
-			u32 proj : 1; // 0 - perspective, 1 - orthographic
-			u32 fsel : 3; // 0 - off, 2 - linear, 4 - exp, 5 - exp2, 6 - backward exp, 7 - backward exp2
-			u32 RangeBaseEnabled : 1;
-		};
-		u32 hex : 4;
-	} fog;
+	u32 tevksel_n_swap1 : 16; // 8x2 bits
+	u32 tevksel_n_swap2 : 16; // 8x2 bits
+	u64 tevksel_n_kcsel0 : 40; // 8x5 bits
+	u64 tevksel_n_kasel0 : 40; // 8x5 bits
+	u64 tevksel_n_kcsel1 : 40; // 8x5 bits
+	u64 tevksel_n_kasel1 : 40; // 8x5 bits
+	void set_tevksel_kcsel(int index, int i, u32 value) { if (i) tevksel_n_kcsel1 |= value << (5*index); else tevksel_n_kcsel0 |= value << (5*index); }
+	void set_tevksel_kasel(int index, int i, u32 value) { if( i) tevksel_n_kasel1 |= value << (5*index); else tevksel_n_kasel0 |= value << (5*index); }
+
+	u64 cc_n_d : 64; // 16x4 bits
+	u64 cc_n_c : 64; // 16x4 bits
+	u64 cc_n_b : 64; // 16x4 bits
+	u64 cc_n_a : 64; // 16x4 bits
+	u32 cc_n_bias : 32; // 16x2 bits
+	u32 cc_n_op : 16; // 16x1 bit
+	u32 cc_n_clamp : 16; // 16x1 bit
+	u32 cc_n_shift : 32; // 16x2 bits
+	u32 cc_n_dest : 32; // 16x2 bits
+
+	u32 ac_n_rswap : 32; // 16x2 bits
+	u32 ac_n_tswap : 32; // 16x2 bits
+	u64 ac_n_d : 48; // 16x3 bits
+	u64 ac_n_c : 48; // 16x3 bits
+	u64 ac_n_b : 48; // 16x3 bits
+	u64 ac_n_a : 48; // 16x3 bits
+	u32 ac_n_bias : 32; // 16x2 bits
+	u32 ac_n_op : 16; // 16x1 bit
+	u32 ac_n_clamp : 16; // 16x1 bit
+	u32 ac_n_shift : 32; // 16x2 bits
+	u32 ac_n_dest : 32; // 16x2 bits
+
+	u32 alpha_test_comp0 : 3;
+	u32 alpha_test_comp1 : 3;
+	u32 alpha_test_logic : 2;
+	u32 alpha_test_use_zcomploc_hack : 1;
+
+	u32 fog_proj : 1;
+	u32 fog_fsel : 3;
+	u32 fog_RangeBaseEnabled : 1;
 
 	u32 ztex_op : 2;
 
@@ -221,6 +178,7 @@ struct pixel_shader_uid_data
 
 	LightingUidData lighting;
 };
+//#pragma pack()
 
 typedef ShaderUid<pixel_shader_uid_data> PixelShaderUid;
 typedef ShaderCode PixelShaderCode; // TODO: Obsolete
diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index ebf2ae1b87..b8820e2e98 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -199,22 +199,21 @@ static void DeclareUniform(T& object, API_TYPE api_type, bool using_ubos, const
 	object.Write(";\n");
 }
 
+#pragma pack(4)
 /**
  * Common uid data used for shader generators that use lighting calculations.
  * Expected to be stored as a member called "lighting".
  */
 struct LightingUidData
 {
-	struct
-	{
-		u32 matsource : 1;
-		u32 enablelighting : 1;
-		u32 ambsource : 1;
-		u32 diffusefunc : 2;
-		u32 attnfunc : 2;
-		u32 light_mask : 8;
-	} lit_chans[4];
+	u32 matsource : 4; // 4x1 bit
+	u32 enablelighting : 4; // 4x1 bit
+	u32 ambsource : 4; // 4x1 bit
+	u32 diffusefunc : 8; // 4x2 bits
+	u32 attnfunc : 8; // 4x2 bits
+	u32 light_mask : 32; // 4x8 bits
 };
+#pragma pack()
 
 /**
  * Checks if there has been

From 7e0db58b1ee2e5ac58c5fd84560506b9bb33ae8d Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Wed, 1 May 2013 11:42:00 +0200
Subject: [PATCH 157/352] Fix stuff

---
 Source/Core/VideoCommon/Src/BPStructs.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp
index 314041f894..31f873acc6 100644
--- a/Source/Core/VideoCommon/Src/BPStructs.cpp
+++ b/Source/Core/VideoCommon/Src/BPStructs.cpp
@@ -356,6 +356,7 @@ void BPWritten(const BPCmd& bp)
 		PRIM_LOG("alphacmp: ref0=%d, ref1=%d, comp0=%d, comp1=%d, logic=%d", bpmem.alpha_test.ref0,
 				bpmem.alpha_test.ref1, bpmem.alpha_test.comp0, bpmem.alpha_test.comp1, bpmem.alpha_test.logic);
 		PixelShaderManager::SetAlpha(bpmem.alpha_test);
+		g_renderer->SetColorMask();
 		break;
 	case BPMEM_BIAS: // BIAS
 		PRIM_LOG("ztex bias=0x%x", bpmem.ztex1.bias);

From 20719081dfe51c352b54fb82be34fc418a4f4074 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Mon, 17 Jun 2013 11:37:41 +0200
Subject: [PATCH 158/352] PixelShaderGen: Move RegisterStates from global
 storage to stack.

---
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index ab3df05781..2aa2468eef 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -24,11 +24,6 @@
 //   output is given by .outreg
 //   tevtemp is set according to swapmodetables and
 
-template<class T> static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE ApiType);
-template<class T> static void SampleTexture(T& out, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType);
-template<class T> static void WriteAlphaTest(T& out, pixel_shader_uid_data& uid_data, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode, bool per_pixel_depth);
-template<class T> static void WriteFog(T& out, pixel_shader_uid_data& uid_data);
-
 static const char *tevKSelTableC[] = // KCSEL
 {
 	"1.0f,1.0f,1.0f",       // 1   = 0x00
@@ -207,10 +202,6 @@ static const char *tevIndBiasAdd[]    = {"-128.0f", "1.0f", "1.0f", "1.0f" }; //
 static const char *tevIndWrapStart[]  = {"0.0f", "256.0f", "128.0f", "64.0f", "32.0f", "16.0f", "0.001f" };
 static const char *tevIndFmtScale[]   = {"255.0f", "31.0f", "15.0f", "7.0f" };
 
-static char swapModeTable[4][5];
-
-static char text[16384];
-
 struct RegisterState
 {
 	bool ColorNeedOverflowControl;
@@ -218,7 +209,9 @@ struct RegisterState
 	bool AuxStored;
 };
 
-static RegisterState RegisterStates[4];
+static char swapModeTable[4][5];
+
+static char text[16384];
 
 static void BuildSwapModeTable()
 {
@@ -233,6 +226,11 @@ static void BuildSwapModeTable()
 	}
 }
 
+template<class T> static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE ApiType, RegisterState RegisterStates[4]);
+template<class T> static void SampleTexture(T& out, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType);
+template<class T> static void WriteAlphaTest(T& out, pixel_shader_uid_data& uid_data, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode, bool per_pixel_depth);
+template<class T> static void WriteFog(T& out, pixel_shader_uid_data& uid_data);
+
 template<class T>
 static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
@@ -241,8 +239,6 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 	pixel_shader_uid_data& uid_data = (&out.template GetUidData<pixel_shader_uid_data>() != NULL)
 										? out.template GetUidData<pixel_shader_uid_data>() : dummy_data;
 
-	ERROR_LOG(VIDEO, "%lu", sizeof(pixel_shader_uid_data));
-
 	out.SetBuffer(text);
 	if (out.GetBuffer() != NULL)
 		setlocale(LC_NUMERIC, "C"); // Reset locale for compilation
@@ -513,6 +509,7 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 		}
 	}
 
+	RegisterState RegisterStates[4];
 	RegisterStates[0].AlphaNeedOverflowControl = false;
 	RegisterStates[0].ColorNeedOverflowControl = false;
 	RegisterStates[0].AuxStored = false;
@@ -526,7 +523,7 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 	// Uid fields for BuildSwapModeTable are set in WriteStage
 	BuildSwapModeTable();
 	for (unsigned int i = 0; i < numStages; i++)
-		WriteStage<T>(out, uid_data, i, ApiType); // build the equation for this stage
+		WriteStage<T>(out, uid_data, i, ApiType, RegisterStates); // build the equation for this stage
 
 	if (numStages)
 	{
@@ -676,7 +673,7 @@ static const char *TEVCMPAlphaOPTable[16] =
 
 
 template<class T>
-static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE ApiType)
+static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE ApiType, RegisterState RegisterStates[4])
 {
 	int texcoord = bpmem.tevorders[n/2].getTexCoord(n&1);
 	bool bHasTexCoord = (u32)texcoord < bpmem.genMode.numtexgens;

From f0ea525d3b4dea15363674c822943ecf38da26b3 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Mon, 17 Jun 2013 11:39:50 +0200
Subject: [PATCH 159/352] PixelShaderGen: Change a comment slightly.

---
 Source/Core/VideoCommon/Src/PixelShaderGen.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 5ae3febfa3..2305be7c4d 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -55,7 +55,7 @@ const s_svar PSVar_Loc[] = { {I_COLORS, C_COLORS, 4 },
 						{I_PMATERIALS, C_PMATERIALS, 4 },
 						};
 
-// TODO: Packing?
+// TODO: Should compact packing be enabled?
 //#pragma pack(4)
 struct pixel_shader_uid_data
 {

From c505260ec18656aa17c4ce80f5bbc72f4d10e952 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Mon, 17 Jun 2013 12:20:21 +0200
Subject: [PATCH 160/352] Fix some merge conflicts.

---
 Source/Core/VideoCommon/Src/LightingShaderGen.h | 2 +-
 Source/Core/VideoCommon/Src/PixelShaderGen.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.h b/Source/Core/VideoCommon/Src/LightingShaderGen.h
index 36bc52749a..ace785a477 100644
--- a/Source/Core/VideoCommon/Src/LightingShaderGen.h
+++ b/Source/Core/VideoCommon/Src/LightingShaderGen.h
@@ -251,7 +251,7 @@ static void GenerateLightingShader(T& object, LightingUidData& uid_data, int com
 					GenerateLightShader<T>(object, uid_data, i, lit_index, lightsName, coloralpha);
 			}
 		}
-		object.Write("%s%d = mat * saturate(lacc);\n", dest, j);
+		object.Write("%s%d = mat * clamp(lacc, 0.0, 1.0);\n", dest, j);
 		object.Write("}\n");
 	}
 }
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 9b8f3a9426..83b61cb164 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -945,7 +945,7 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		out.SetConstantsUsed(C_COLORS+2,C_COLORS+2);
 		if(RegisterStates[2].AlphaNeedOverflowControl || RegisterStates[2].ColorNeedOverflowControl)
 		{
-			out.Write("cc1 = frac(c1 * (255.0f/256.0f)) * (256.0f/255.0f);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]);
+			out.Write("cc1 = %s(c1 * (255.0f/256.0f)) * (256.0f/255.0f);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]);
 			RegisterStates[2].AlphaNeedOverflowControl = false;
 			RegisterStates[2].ColorNeedOverflowControl = false;
 		}

From 868c627876a202e1675c62ad23f9642e05d9af69 Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Mon, 17 Jun 2013 22:51:15 +1200
Subject: [PATCH 161/352] Fixes Issue 6353 Remove extract apploader/dol from
 top level

---
 Source/Core/DolphinWX/Src/ISOProperties.cpp | 31 +++++++++++++--------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
index efd84521f8..81e0e1a732 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp
@@ -615,24 +615,26 @@ void CISOProperties::OnRightClickOnTree(wxTreeEvent& event)
 
 	if (m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 0
 		&& m_Treectrl->GetFirstVisibleItem() != m_Treectrl->GetSelection())
+	{
 		popupMenu->Append(IDM_EXTRACTDIR, _("Extract Partition..."));
+	}
 	else if (m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 1)
 		popupMenu->Append(IDM_EXTRACTDIR, _("Extract Directory..."));
 	else if (m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 2)
 		popupMenu->Append(IDM_EXTRACTFILE, _("Extract File..."));
-
+	
 	popupMenu->Append(IDM_EXTRACTALL, _("Extract All Files..."));
-	popupMenu->AppendSeparator();
-	popupMenu->Append(IDM_EXTRACTAPPLOADER, _("Extract Apploader..."));
-	popupMenu->Append(IDM_EXTRACTDOL, _("Extract DOL..."));
-
+	
 	if (m_Treectrl->GetItemImage(m_Treectrl->GetSelection()) == 0
 		&& m_Treectrl->GetFirstVisibleItem() != m_Treectrl->GetSelection())
 	{
+		popupMenu->AppendSeparator();
+		popupMenu->Append(IDM_EXTRACTAPPLOADER, _("Extract Apploader..."));
+		popupMenu->Append(IDM_EXTRACTDOL, _("Extract DOL..."));
 		popupMenu->AppendSeparator();
 		popupMenu->Append(IDM_CHECKINTEGRITY, _("Check Partition Integrity"));
 	}
-
+	
 	PopupMenu(popupMenu);
 
 	event.Skip();
@@ -825,20 +827,27 @@ void CISOProperties::OnExtractDataFromHeader(wxCommandEvent& event)
 		return;
 
 	if (DiscIO::IsVolumeWiiDisc(OpenISO))
-		if(WiiDisc.size() > 0)
+	{
+		wxString Directory = m_Treectrl->GetItemText(m_Treectrl->GetSelection());
+		std::size_t partitionNum = (std::size_t)wxAtoi(Directory.Mid(Directory.find_first_of("/"), 1));
+		Directory.Remove(0, Directory.find_first_of("/") +1); // Remove "Partition x/"
+		
+		if(WiiDisc.size() > partitionNum)
 		{
 			// Get the filesystem of the LAST partition
-			FS = WiiDisc.at(WiiDisc.size() - 1).FileSystem;
+			FS = WiiDisc.at(partitionNum).FileSystem;
 		}
 		else
 		{
-			PanicAlertT("No partitions found for: %s!", 
-						WxStrToStr(Path).c_str());
+			PanicAlertT("Partition doesn't exist: %lu", partitionNum);
 			return;
 		}
+	}
 	else
+	{
 		FS = pFileSystem;
-
+	}
+	
 	bool ret = false;
 	if (event.GetId() == IDM_EXTRACTAPPLOADER)
 	{

From 7a01ceba731ba68baed391e4306ccd3c1dd11564 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Mon, 17 Jun 2013 12:51:57 +0200
Subject: [PATCH 162/352] PixelShaderGen: Fix various merge conflicts and a
 critical regression from revision 32b78a85.

---
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 47 ++++++++++---------
 Source/Core/VideoCommon/Src/PixelShaderGen.h  |  1 +
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 83b61cb164..36a6dc64e5 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -269,7 +269,7 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 	unsigned int numStages = bpmem.genMode.numtevstages + 1;
 	unsigned int numTexgen = bpmem.genMode.numtexgens;
 
-	bool per_pixel_depth = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable) || !g_ActiveConfig.bFastDepthCalc;
+	const bool per_pixel_depth = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable) || !g_ActiveConfig.bFastDepthCalc;
 	const bool bOpenGL = ApiType == API_OPENGL;
 
 	out.Write("//Pixel Shader for TEV stages\n");
@@ -288,7 +288,7 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 		out.Write("float fmod( float x, float y )\n");
 		out.Write("{\n");
 		out.Write("\tfloat z = fract( abs( x / y) ) * abs( y );\n");
-		out.Write("\treturn (x < 0) ? -z : z;\n");
+		out.Write("\treturn (x < 0.0) ? -z : z;\n");
 		out.Write("}\n");
 
 		// Declare samplers
@@ -587,10 +587,11 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 	}
 
 	// depth texture can safely be ignored if the result won't be written to the depth buffer (early_ztest) and isn't used for fog either
-	bool skip_ztexture = !per_pixel_depth && !bpmem.fog.c_proj_fsel.fsel;
+	const bool skip_ztexture = !per_pixel_depth && !bpmem.fog.c_proj_fsel.fsel;
 
 	uid_data.ztex_op = bpmem.ztex2.op;
 	uid_data.per_pixel_depth = per_pixel_depth;
+	uid_data.fast_depth_calc = g_ActiveConfig.bFastDepthCalc;
 	uid_data.fog_fsel = bpmem.fog.c_proj_fsel.fsel;
 
 	// Note: z-textures are not written to depth buffer if early depth test is used
@@ -810,26 +811,26 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 	TevStageCombiner::ColorCombiner &cc = bpmem.combiners[n].colorC;
 	TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[n].alphaC;
 
-	uid_data.cc_n_d = cc.d;
-	uid_data.cc_n_c = cc.c;
-	uid_data.cc_n_b = cc.b;
-	uid_data.cc_n_a = cc.a;
-	uid_data.cc_n_bias = cc.bias;
-	uid_data.cc_n_op = cc.op;
-	uid_data.cc_n_clamp = cc.clamp;
-	uid_data.cc_n_shift = cc.shift;
-	uid_data.cc_n_dest = cc.dest;
-	uid_data.ac_n_rswap = ac.rswap;
-	uid_data.ac_n_tswap = ac.tswap;
-	uid_data.ac_n_d = ac.d;
-	uid_data.ac_n_c = ac.c;
-	uid_data.ac_n_b = ac.b;
-	uid_data.ac_n_a = ac.a;
-	uid_data.ac_n_bias = ac.bias;
-	uid_data.ac_n_op = ac.op;
-	uid_data.ac_n_clamp = ac.clamp;
-	uid_data.ac_n_shift = ac.shift;
-	uid_data.ac_n_dest = ac.dest;
+	uid_data.cc_n_d = cc.d << (4*n);
+	uid_data.cc_n_c = cc.c << (4*n);
+	uid_data.cc_n_b = cc.b << (4*n);
+	uid_data.cc_n_a = cc.a << (4*n);
+	uid_data.cc_n_bias = cc.bias << (2*n);
+	uid_data.cc_n_op = cc.op << n;
+	uid_data.cc_n_clamp = cc.clamp << n;
+	uid_data.cc_n_shift = cc.shift << (2*n);
+	uid_data.cc_n_dest = cc.dest << (2*n);
+	uid_data.ac_n_rswap = ac.rswap << (2*n);
+	uid_data.ac_n_tswap = ac.tswap << (2*n);
+	uid_data.ac_n_d = ac.d << (3*n);
+	uid_data.ac_n_c = ac.c << (3*n);
+	uid_data.ac_n_b = ac.b << (3*n);
+	uid_data.ac_n_a = ac.a << (3*n);
+	uid_data.ac_n_bias = ac.bias << (2*n);
+	uid_data.ac_n_op = ac.op << n;
+	uid_data.ac_n_clamp = ac.clamp << n;
+	uid_data.ac_n_shift = ac.shift << (2*n);
+	uid_data.ac_n_dest = ac.dest << (2*n);
 
 	if(cc.a == TEVCOLORARG_RASA || cc.a == TEVCOLORARG_RASC
 		|| cc.b == TEVCOLORARG_RASA || cc.b == TEVCOLORARG_RASC
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 2305be7c4d..58e451d37d 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -171,6 +171,7 @@ struct pixel_shader_uid_data
 
 	u32 ztex_op : 2;
 
+	u32 fast_depth_calc : 1;
 	u32 per_pixel_depth : 1;
 	u32 bHasIndStage : 16;
 

From 2b2ca5260f0e28e115a3f835c4e83e5714b41e99 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Mon, 17 Jun 2013 13:03:38 +0200
Subject: [PATCH 163/352] PixelShaderGen: Fixed some bugs, removed unused
 shader uid fields.

---
 Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 18 +++++++++---------
 Source/Core/VideoCommon/Src/PixelShaderGen.h   | 10 ++--------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 36a6dc64e5..93e55e9353 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -720,7 +720,7 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 	out.Write("// TEV stage %d\n", n);
 
 	uid_data.bHasIndStage |= bHasIndStage << n;
-	uid_data.tevorders_n_texcoord |= texcoord << (3 * n);
+	uid_data.tevorders_n_texcoord |= (u64)texcoord << (3 * n);
 	if (bHasIndStage)
 	{
 		uid_data.tevind_n_bs |= bpmem.tevind[n].bs << (2*n);
@@ -811,10 +811,10 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 	TevStageCombiner::ColorCombiner &cc = bpmem.combiners[n].colorC;
 	TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[n].alphaC;
 
-	uid_data.cc_n_d = cc.d << (4*n);
-	uid_data.cc_n_c = cc.c << (4*n);
-	uid_data.cc_n_b = cc.b << (4*n);
-	uid_data.cc_n_a = cc.a << (4*n);
+	uid_data.cc_n_d = (u64)cc.d << (4*n);
+	uid_data.cc_n_c = (u64)cc.c << (4*n);
+	uid_data.cc_n_b = (u64)cc.b << (4*n);
+	uid_data.cc_n_a = (u64)cc.a << (4*n);
 	uid_data.cc_n_bias = cc.bias << (2*n);
 	uid_data.cc_n_op = cc.op << n;
 	uid_data.cc_n_clamp = cc.clamp << n;
@@ -822,10 +822,10 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 	uid_data.cc_n_dest = cc.dest << (2*n);
 	uid_data.ac_n_rswap = ac.rswap << (2*n);
 	uid_data.ac_n_tswap = ac.tswap << (2*n);
-	uid_data.ac_n_d = ac.d << (3*n);
-	uid_data.ac_n_c = ac.c << (3*n);
-	uid_data.ac_n_b = ac.b << (3*n);
-	uid_data.ac_n_a = ac.a << (3*n);
+	uid_data.ac_n_d = (u64)ac.d << (3*n);
+	uid_data.ac_n_c = (u64)ac.c << (3*n);
+	uid_data.ac_n_b = (u64)ac.b << (3*n);
+	uid_data.ac_n_a = (u64)ac.a << (3*n);
 	uid_data.ac_n_bias = ac.bias << (2*n);
 	uid_data.ac_n_op = ac.op << n;
 	uid_data.ac_n_clamp = ac.clamp << n;
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 58e451d37d..a3ebdab3c1 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -69,13 +69,7 @@ struct pixel_shader_uid_data
 
 	u32 nIndirectStagesUsed : 8;
 
-	u32 texMtxInfo_n_unknown : 8; // 8x1 bit
 	u32 texMtxInfo_n_projection : 8; // 8x1 bit
-	u32 texMtxInfo_n_inputform : 16; // 8x2 bits
-	u32 texMtxInfo_n_texgentype : 24; // 8x3 bits
-	u64 texMtxInfo_n_sourcerow : 40; // 8x5 bits
-	u32 texMtxInfo_n_embosssourceshift : 24; // 8x3 bits
-	u32 texMtxInfo_n_embosslightshift : 24; // 8x3 bits
 
 	u32 tevindref_bi0 : 3;
 	u32 tevindref_bc0 : 3;
@@ -135,8 +129,8 @@ struct pixel_shader_uid_data
 	u64 tevksel_n_kasel0 : 40; // 8x5 bits
 	u64 tevksel_n_kcsel1 : 40; // 8x5 bits
 	u64 tevksel_n_kasel1 : 40; // 8x5 bits
-	void set_tevksel_kcsel(int index, int i, u32 value) { if (i) tevksel_n_kcsel1 |= value << (5*index); else tevksel_n_kcsel0 |= value << (5*index); }
-	void set_tevksel_kasel(int index, int i, u32 value) { if( i) tevksel_n_kasel1 |= value << (5*index); else tevksel_n_kasel0 |= value << (5*index); }
+	void set_tevksel_kcsel(int index, int i, u64 value) { if (i) tevksel_n_kcsel1 |= value << (5*index); else tevksel_n_kcsel0 |= value << (5*index); }
+	void set_tevksel_kasel(int index, int i, u64 value) { if( i) tevksel_n_kasel1 |= value << (5*index); else tevksel_n_kasel0 |= value << (5*index); }
 
 	u64 cc_n_d : 64; // 16x4 bits
 	u64 cc_n_c : 64; // 16x4 bits

From f724b47f45cc737296edf1e042e22f060daf3b66 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Mon, 17 Jun 2013 13:08:38 +0200
Subject: [PATCH 164/352] PixelShaderGen: Fix more critical issues, some of
 which are regressions of revision 32b78a85.

---
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 93e55e9353..70931a9261 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -811,26 +811,26 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 	TevStageCombiner::ColorCombiner &cc = bpmem.combiners[n].colorC;
 	TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[n].alphaC;
 
-	uid_data.cc_n_d = (u64)cc.d << (4*n);
-	uid_data.cc_n_c = (u64)cc.c << (4*n);
-	uid_data.cc_n_b = (u64)cc.b << (4*n);
-	uid_data.cc_n_a = (u64)cc.a << (4*n);
-	uid_data.cc_n_bias = cc.bias << (2*n);
-	uid_data.cc_n_op = cc.op << n;
-	uid_data.cc_n_clamp = cc.clamp << n;
-	uid_data.cc_n_shift = cc.shift << (2*n);
-	uid_data.cc_n_dest = cc.dest << (2*n);
-	uid_data.ac_n_rswap = ac.rswap << (2*n);
-	uid_data.ac_n_tswap = ac.tswap << (2*n);
-	uid_data.ac_n_d = (u64)ac.d << (3*n);
-	uid_data.ac_n_c = (u64)ac.c << (3*n);
-	uid_data.ac_n_b = (u64)ac.b << (3*n);
-	uid_data.ac_n_a = (u64)ac.a << (3*n);
-	uid_data.ac_n_bias = ac.bias << (2*n);
-	uid_data.ac_n_op = ac.op << n;
-	uid_data.ac_n_clamp = ac.clamp << n;
-	uid_data.ac_n_shift = ac.shift << (2*n);
-	uid_data.ac_n_dest = ac.dest << (2*n);
+	uid_data.cc_n_d |= (u64)cc.d << (4*n);
+	uid_data.cc_n_c |= (u64)cc.c << (4*n);
+	uid_data.cc_n_b |= (u64)cc.b << (4*n);
+	uid_data.cc_n_a |= (u64)cc.a << (4*n);
+	uid_data.cc_n_bias |= cc.bias << (2*n);
+	uid_data.cc_n_op |= cc.op << n;
+	uid_data.cc_n_clamp |= cc.clamp << n;
+	uid_data.cc_n_shift |= cc.shift << (2*n);
+	uid_data.cc_n_dest |= cc.dest << (2*n);
+	uid_data.ac_n_rswap |= ac.rswap << (2*n);
+	uid_data.ac_n_tswap |= ac.tswap << (2*n);
+	uid_data.ac_n_d |= (u64)ac.d << (3*n);
+	uid_data.ac_n_c |= (u64)ac.c << (3*n);
+	uid_data.ac_n_b |= (u64)ac.b << (3*n);
+	uid_data.ac_n_a |= (u64)ac.a << (3*n);
+	uid_data.ac_n_bias |= ac.bias << (2*n);
+	uid_data.ac_n_op |= ac.op << n;
+	uid_data.ac_n_clamp |= ac.clamp << n;
+	uid_data.ac_n_shift |= ac.shift << (2*n);
+	uid_data.ac_n_dest |= ac.dest << (2*n);
 
 	if(cc.a == TEVCOLORARG_RASA || cc.a == TEVCOLORARG_RASC
 		|| cc.b == TEVCOLORARG_RASA || cc.b == TEVCOLORARG_RASC
@@ -840,10 +840,10 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		|| ac.c == TEVALPHAARG_RASA || ac.d == TEVALPHAARG_RASA)
 	{
 		const int i = bpmem.combiners[n].alphaC.rswap;
-		uid_data.tevksel_n_swap1 = bpmem.tevksel[i*2  ].swap1 << (2 * (i*2  ));
-		uid_data.tevksel_n_swap1 = bpmem.tevksel[i*2+1].swap1 << (2 * (i*2+1));
-		uid_data.tevksel_n_swap2 = bpmem.tevksel[i*2  ].swap2 << (2 * (i*2  ));
-		uid_data.tevksel_n_swap2 = bpmem.tevksel[i*2+1].swap2 << (2 * (i*2+1));
+		uid_data.tevksel_n_swap1 |= bpmem.tevksel[i*2  ].swap1 << (2 * (i*2  ));
+		uid_data.tevksel_n_swap1 |= bpmem.tevksel[i*2+1].swap1 << (2 * (i*2+1));
+		uid_data.tevksel_n_swap2 |= bpmem.tevksel[i*2  ].swap2 << (2 * (i*2  ));
+		uid_data.tevksel_n_swap2 |= bpmem.tevksel[i*2+1].swap2 << (2 * (i*2+1));
 
 		char *rasswap = swapModeTable[bpmem.combiners[n].alphaC.rswap];
 		out.Write("rastemp = %s.%s;\n", tevRasTable[bpmem.tevorders[n / 2].getColorChan(n & 1)], rasswap);
@@ -863,10 +863,10 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		}
 
 		const int i = bpmem.combiners[n].alphaC.tswap;
-		uid_data.tevksel_n_swap1 = bpmem.tevksel[i*2  ].swap1 << (2 * (i*2  ));
-		uid_data.tevksel_n_swap1 = bpmem.tevksel[i*2+1].swap1 << (2 * (i*2+1));
-		uid_data.tevksel_n_swap2 = bpmem.tevksel[i*2  ].swap2 << (2 * (i*2  ));
-		uid_data.tevksel_n_swap2 = bpmem.tevksel[i*2+1].swap2 << (2 * (i*2+1));
+		uid_data.tevksel_n_swap1 |= bpmem.tevksel[i*2  ].swap1 << (2 * (i*2  ));
+		uid_data.tevksel_n_swap1 |= bpmem.tevksel[i*2+1].swap1 << (2 * (i*2+1));
+		uid_data.tevksel_n_swap2 |= bpmem.tevksel[i*2  ].swap2 << (2 * (i*2  ));
+		uid_data.tevksel_n_swap2 |= bpmem.tevksel[i*2+1].swap2 << (2 * (i*2+1));
 
 		char *texswap = swapModeTable[bpmem.combiners[n].alphaC.tswap];
 		int texmap = bpmem.tevorders[n/2].getTexMap(n&1);

From 88163691443af7032b55e83ad78fe946f124b25f Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Mon, 17 Jun 2013 13:17:25 +0200
Subject: [PATCH 165/352] PixelShaderGen: Add some TODOs.

Totally the perfect commit message for a final commit before merging :p
---
 Source/Core/VideoCommon/Src/PixelShaderGen.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index a3ebdab3c1..826ec561d0 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -59,6 +59,8 @@ const s_svar PSVar_Loc[] = { {I_COLORS, C_COLORS, 4 },
 //#pragma pack(4)
 struct pixel_shader_uid_data
 {
+	// TODO: Optimize field order for easy access!
+
 	u32 components;
 	u32 dstAlphaMode : 2;
 	u32 Pretest : 2;
@@ -171,6 +173,7 @@ struct pixel_shader_uid_data
 
 	u32 xfregs_numTexGen_numTexGens : 4;
 
+	// TODO: I think we're fine without an enablePixelLighting field, should probably double check, though..
 	LightingUidData lighting;
 };
 //#pragma pack()

From c57a90c5b5acbd469c77aadae661a95f718f3dd3 Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Mon, 17 Jun 2013 23:24:54 +0200
Subject: [PATCH 166/352] don't define clipPos twice

fix issue 6378
---
 Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 70931a9261..31892cec36 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -473,7 +473,7 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 	if (numTexgen < 7)
 		out.Write("\tclipPos = float4(rawpos.x, rawpos.y, clipPos.z, clipPos.w);\n");
 	else
-		out.Write("\tfloat4 clipPos = float4(rawpos.x, rawpos.y, uv2.w, uv3.w);\n");
+		out.Write("\tclipPos = float4(rawpos.x, rawpos.y, uv2.w, uv3.w);\n");
 
 	// HACK to handle cases where the tex gen is not enabled
 	if (numTexgen == 0)

From a518a1cbdcc311af1b01eeb940b3fb57f6f15554 Mon Sep 17 00:00:00 2001
From: booto <booto+dolphin@justanothercoder.com>
Date: Tue, 18 Jun 2013 13:17:50 +0800
Subject: [PATCH 167/352] buffer fixes found via cppcheck/tetsuo--

---
 .../Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp     | 14 +++++++-------
 Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp | 14 ++++++++------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
index 6e590d1a83..a684bb0c02 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
@@ -214,7 +214,6 @@ clear_buffer:
 template <typename T> 
 void PrintObject(const T &Obj) 
 {
-	char byte[2] = {0};
 	std::stringstream ss;
 	u8 *o = (u8 *)&Obj;
 
@@ -223,16 +222,17 @@ void PrintObject(const T &Obj)
 	CompileTimeAssert<sizeof(ZeldaVoicePB) == 0x180> ensure_zpb_size_correct;
 	(void)ensure_zpb_size_correct;
 
+	ss << std::hex;
 	for (size_t i = 0; i < sizeof(T); i++)
 	{
-		if((i > 0) && ((i & 1) == 0))
-			ss << " ";
-
-		sprintf(byte, "%02X", Common::swap16(o[i]));
-		ss << byte;
+		if((i & 1) == 0)
+			ss << ' ';
+		ss.width(2);
+		ss.fill('0');
+		ss << Common::swap16(o[i]);
 	}
 
-	DEBUG_LOG(DSPHLE, "AFC PB: %s", ss.str().c_str());
+	DEBUG_LOG(DSPHLE, "AFC PB:%s", ss.str().c_str());
 }
 
 void CUCode_Zelda::RenderVoice_AFC(ZeldaVoicePB &PB, s16 *_Buffer, int _Size)
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp
index 6390b3ea5d..46644f2fc9 100644
--- a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.cpp
@@ -2,6 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include <sstream>
+
 #include "JitBase.h"
 #include "PowerPCDisasm.h"
 #include "disasm.h"
@@ -54,14 +56,14 @@ void LogGeneratedX86(int size, PPCAnalyst::CodeBuffer *code_buffer, const u8 *no
 
 	if (b->codeSize <= 250)
 	{
-		char x86code[500] = "";		
+		std::stringstream ss;
+		ss << std::hex;
 		for (u8 i = 0; i <= b->codeSize; i++)
 		{
-			char opcHex[2] = "";
-			u8 opc = *(normalEntry + i);
-			sprintf(opcHex, "%02x", opc);
-			strncat(x86code, opcHex, 2);		
+			ss.width(2);
+			ss.fill('0');
+			ss << (u32)*(normalEntry + i);
 		}
-		DEBUG_LOG(DYNA_REC,"IR_X86 bin: %s\n\n\n", x86code);
+		DEBUG_LOG(DYNA_REC,"IR_X86 bin: %s\n\n\n", ss.str().c_str());
 	}
 }

From 7223778520472bc2cca33632df56e451fc1d3796 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 18 Jun 2013 07:09:20 -0500
Subject: [PATCH 168/352] [Android] Gamepad input. Refactor JNI native
 functions to all pull from a single class instead of everywhere willy-nilly

---
 Source/Android/.idea/workspace.xml            | 344 ++++++++----------
 Source/Android/AndroidManifest.xml            |   5 +
 Source/Android/assets/GCPadNew.ini            |  34 +-
 .../dolphinemu/DolphinEmulator.java           |  67 ++--
 .../dolphinemu/dolphinemu/GameListItem.java   |  28 +-
 .../dolphinemu/dolphinemu/GameListView.java   |  27 +-
 .../dolphinemu/InputConfigActivity.java       | 181 +++++++++
 .../dolphinemu/InputConfigAdapter.java        |  56 +++
 .../dolphinemu/InputConfigItem.java           |  56 +++
 .../dolphinemu/NativeGLSurfaceView.java       |  22 +-
 .../dolphinemu/dolphinemu/NativeLibrary.java  |  36 ++
 Source/Core/DolphinWX/CMakeLists.txt          |   1 +
 .../DolphinWX/Src/Android/ButtonManager.cpp   | 223 ++++++++++++
 .../Src/Android/ButtonManager.h               |  72 +++-
 Source/Core/DolphinWX/Src/MainAndroid.cpp     |  58 ++-
 Source/Core/InputCommon/CMakeLists.txt        |   3 +-
 .../InputCommon/Src/Android/ButtonManager.cpp |  92 -----
 .../ControllerInterface/Android/Android.cpp   |  25 ++
 .../Src/ControllerInterface/Android/Android.h |  11 +-
 19 files changed, 946 insertions(+), 395 deletions(-)
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/InputConfigAdapter.java
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/InputConfigItem.java
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
 create mode 100644 Source/Core/DolphinWX/Src/Android/ButtonManager.cpp
 rename Source/Core/{InputCommon => DolphinWX}/Src/Android/ButtonManager.h (53%)
 delete mode 100644 Source/Core/InputCommon/Src/Android/ButtonManager.cpp

diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index 2a518c17f3..dee70dcfd4 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -29,7 +29,7 @@
     </layouts>
   </component>
   <component name="BookmarkManager">
-    <bookmark url="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" line="37" />
+    <bookmark url="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" line="27" />
   </component>
   <component name="ChangeListManager">
     <list default="true" id="682e8195-a9c2-48a7-a941-e8c10f5cb64a" name="Default" comment="" />
@@ -103,65 +103,42 @@
       <file leaf-file-name="DolphinEmulator.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="164" column="4" selection-start="4729" selection-end="4729" vertical-scroll-proportion="0.0" vertical-offset="2445" max-vertical-offset="2640">
+            <state line="171" column="88" selection-start="5001" selection-end="5001" vertical-scroll-proportion="0.0" vertical-offset="705" max-vertical-offset="2790">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="AndroidManifest.xml" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="6" column="39" selection-start="248" selection-end="248" vertical-scroll-proportion="0.026223777" vertical-offset="75" max-vertical-offset="735">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="GameListView.java" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="GameListView.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="51" column="78" selection-start="1629" selection-end="1629" vertical-scroll-proportion="0.0" vertical-offset="750" max-vertical-offset="3420">
+            <state line="151" column="32" selection-start="5433" selection-end="5433" vertical-scroll-proportion="0.7396907" vertical-offset="1228" max-vertical-offset="2745">
+              <folding>
+                <element signature="method#Fill#0;class#GameListView#0" expanded="false" />
+                <element signature="e#5708#5722#0" expanded="true" />
+                <element signature="e#6166#7251#0" expanded="true" />
+                <element signature="e#7244#7245#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="NativeLibrary.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeLibrary.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="11" column="56" selection-start="291" selection-end="291" vertical-scroll-proportion="0.0" vertical-offset="6" max-vertical-offset="615">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="FolderBrowser.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
+      <file leaf-file-name="InputConfigActivity.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="81" column="20" selection-start="2652" selection-end="2652" vertical-scroll-proportion="0.0" vertical-offset="1200" max-vertical-offset="1485">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="prefs.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
-          <provider editor-type-id="android-designer">
-            <state />
-          </provider>
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="495">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="prefvalues.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="14" column="31" selection-start="392" selection-end="392" vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="405">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PrefsActivity.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="14" column="0" selection-start="389" selection-end="389" vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="690">
-              <folding />
+            <state line="141" column="0" selection-start="4851" selection-end="4851" vertical-scroll-proportion="0.0" vertical-offset="1562" max-vertical-offset="2610">
+              <folding>
+                <element signature="e#3481#3488#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -173,6 +150,11 @@
       <setting name="OPEN_NEW_TAB" value="false" />
     </FindUsagesManager>
   </component>
+  <component name="GenerateSignedApkSettings">
+    <option name="KEY_STORE_PATH" value="$USER_HOME$/my-release-key.keystore" />
+    <option name="KEY_ALIAS" value="ryanhkey" />
+    <option name="REMEMBER_PASSWORDS" value="true" />
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../.." />
   </component>
@@ -184,22 +166,22 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuItem.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuItem.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingMenuAdapter.java" />
-        <option value="$PROJECT_DIR$/res/layout/fragment_edit_name.xml" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/EditNameDialog.java" />
-        <option value="$PROJECT_DIR$/res/values/array.xml" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsFragment.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java" />
-        <option value="$PROJECT_DIR$/res/values/prefs.xml" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SettingBrowser.java" />
-        <option value="$PROJECT_DIR$/res/layout/prefs.xml" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java" />
         <option value="$PROJECT_DIR$/res/values/prefvalues.xml" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigView.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfig.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputClass.java" />
         <option value="$PROJECT_DIR$/AndroidManifest.xml" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigAdapter.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigItem.java" />
+        <option value="$PROJECT_DIR$/assets/GCPadNew.ini" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeLibrary.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java" />
       </list>
     </option>
   </component>
@@ -253,6 +235,7 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <PATH>
@@ -288,18 +271,13 @@
               <option name="myItemId" value="" />
               <option name="myItemType" value="" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="src">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="org/dolphinemu/dolphinemu">
+            <PATH_ELEMENT USER_OBJECT="assets">
               <option name="myItemId" value="" />
               <option name="myItemType" value="" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -341,23 +319,26 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="options.searchVisible" value="true" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="FullScreen" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
     <property name="recentsLimit" value="5" />
-    <property name="options.lastSelected" value="android.dex.compiler" />
-    <property name="restartRequiresConfirmation" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="options.splitter.details.proportions" value="0.2" />
     <property name="options.splitter.main.proportions" value="0.3" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="192.168.0.188:5555" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="MemberChooser.showClasses" value="true" />
+    <property name="AndroidRunProguardForReleaseBuild" value="false" />
     <property name="dynamic.classpath" value="false" />
+    <property name="GoToFile.includeJavaFiles" value="false" />
+    <property name="MemberChooser.sorted" value="false" />
+    <property name="GoToClass.includeLibraries" value="false" />
+    <property name="ExportedModule" value="Android" />
+    <property name="options.searchVisible" value="true" />
+    <property name="FullScreen" value="false" />
+    <property name="MemberChooser.showClasses" value="true" />
+    <property name="MemberChooser.copyJavadoc" value="false" />
+    <property name="ExportedApkPath" value="$USER_HOME$/Desktop/DolphinEmu-Pre0.6-Android2.3.apk" />
+    <property name="options.lastSelected" value="android.dex.compiler" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="192.168.0.188:5555" />
+    <property name="restartRequiresConfirmation" value="true" />
+    <property name="last_opened_file_path" value="$USER_HOME$/my-release-key.keystore" />
+    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
+    <property name="options.splitter.details.proportions" value="0.2" />
   </component>
   <component name="RunManager" selected="Android Application.Dolphin Emulator">
     <configuration default="true" type="Remote" factoryName="Remote">
@@ -386,6 +367,19 @@
       <option name="CLEAR_LOGCAT" value="false" />
       <method />
     </configuration>
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <method />
+    </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
       <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -436,19 +430,6 @@
       <envs />
       <method />
     </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <module name="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <method />
-    </configuration>
     <configuration default="false" name="Dolphin Emulator" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="Android" />
       <option name="ACTIVITY_CLASS" value="" />
@@ -553,29 +534,29 @@
     <frame x="24" y="0" width="1342" height="744" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3110368" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.30769232" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6912752" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2179289" sideWeight="0.6912752" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.30536914" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2179289" sideWeight="0.69463086" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30536914" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
@@ -640,125 +621,106 @@
     <breakpoint-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="58" column="30" selection-start="1963" selection-end="1963" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0">
-          <folding />
-        </state>
+        <state line="17" column="13" selection-start="417" selection-end="417" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1290" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
-      <provider editor-type-id="android-designer">
-        <state />
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListAdapter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="21" column="41" selection-start="857" selection-end="857" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0">
-          <folding />
-        </state>
+        <state line="12" column="13" selection-start="300" selection-end="300" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="825" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="30" column="64" selection-start="729" selection-end="729" vertical-scroll-proportion="-0.42105263" vertical-offset="0" max-vertical-offset="0">
-          <folding />
-        </state>
+        <state line="10" column="13" selection-start="231" selection-end="231" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1050" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="11" column="13" selection-start="267" selection-end="267" vertical-scroll-proportion="0.082167834" vertical-offset="0" max-vertical-offset="0">
-          <folding />
-        </state>
+        <state line="11" column="13" selection-start="267" selection-end="267" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="720" />
       </provider>
     </entry>
-    <entry file="jar://$APPLICATION_HOME_DIR$/sdk/platforms/android-17/android.jar!/android/app/Activity.class">
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuItem.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="132" column="0" selection-start="5190" selection-end="5190" vertical-scroll-proportion="2.0" vertical-offset="0" max-vertical-offset="0" />
+        <state line="8" column="13" selection-start="168" selection-end="168" vertical-scroll-proportion="0.31007752" vertical-offset="0" max-vertical-offset="630" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/res/layout/folderbrowser.xml">
-      <provider selected="true" editor-type-id="android-designer">
-        <state />
-      </provider>
-      <provider editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/res/layout/main.xml">
-      <provider selected="true" editor-type-id="android-designer">
-        <state />
-      </provider>
-      <provider editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/res/layout/folderbrowserfooter.xml">
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0" />
-      </provider>
-      <provider editor-type-id="android-designer">
-        <state />
+        <state line="6" column="13" selection-start="150" selection-end="150" vertical-scroll-proportion="0.15503876" vertical-offset="0" max-vertical-offset="885" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
+    <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="164" column="4" selection-start="4729" selection-end="4729" vertical-scroll-proportion="0.0" vertical-offset="2445" max-vertical-offset="2640">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="51" column="78" selection-start="1629" selection-end="1629" vertical-scroll-proportion="0.0" vertical-offset="750" max-vertical-offset="3420">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="81" column="20" selection-start="2652" selection-end="2652" vertical-scroll-proportion="0.0" vertical-offset="1200" max-vertical-offset="1485">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
-      <provider editor-type-id="android-designer">
-        <state />
-      </provider>
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="495">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="14" column="31" selection-start="392" selection-end="392" vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="405">
+        <state line="6" column="69" selection-start="278" selection-end="278" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="810">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="14" column="0" selection-start="389" selection-end="389" vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="690">
+        <state line="13" column="13" selection-start="346" selection-end="346" vertical-scroll-proportion="0.33247423" vertical-offset="6" max-vertical-offset="630">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigAdapter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="6" column="39" selection-start="248" selection-end="248" vertical-scroll-proportion="0.026223777" vertical-offset="75" max-vertical-offset="735">
+        <state line="28" column="0" selection-start="756" selection-end="756" vertical-scroll-proportion="0.46391752" vertical-offset="135" max-vertical-offset="825">
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/assets/GCPadNew.ini">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="3" column="20" selection-start="81" selection-end="81" vertical-scroll-proportion="0.11597938" vertical-offset="0" max-vertical-offset="525">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigItem.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="11" column="0" selection-start="297" selection-end="297" vertical-scroll-proportion="-0.96649486" vertical-offset="540" max-vertical-offset="930">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeLibrary.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="11" column="56" selection-start="291" selection-end="291" vertical-scroll-proportion="0.0" vertical-offset="6" max-vertical-offset="615">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="141" column="0" selection-start="4851" selection-end="4851" vertical-scroll-proportion="0.0" vertical-offset="1562" max-vertical-offset="2610">
+          <folding>
+            <element signature="e#3481#3488#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="171" column="88" selection-start="5001" selection-end="5001" vertical-scroll-proportion="0.0" vertical-offset="2280" max-vertical-offset="2790">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="151" column="32" selection-start="5433" selection-end="5433" vertical-scroll-proportion="0.7396907" vertical-offset="1228" max-vertical-offset="2745">
+          <folding>
+            <element signature="method#Fill#0;class#GameListView#0" expanded="false" />
+            <element signature="e#5708#5722#0" expanded="true" />
+            <element signature="e#6166#7251#0" expanded="true" />
+            <element signature="e#7244#7245#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
 
diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index 3b4d735b37..802f2f6cf6 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -35,6 +35,11 @@
             android:label="@string/app_name"
             android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
         </activity>
+        <activity
+            android:name="org.dolphinemu.dolphinemu.InputConfigActivity"
+            android:label="@string/app_name"
+            android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
+        </activity>
         <activity
                 android:name=".PrefsActivity" >
         </activity>
diff --git a/Source/Android/assets/GCPadNew.ini b/Source/Android/assets/GCPadNew.ini
index cb828f9960..3c22ed5a2e 100644
--- a/Source/Android/assets/GCPadNew.ini
+++ b/Source/Android/assets/GCPadNew.ini
@@ -2,28 +2,28 @@
 Device = Android/0/Touchscreen
 Buttons/A = Button 0
 Buttons/B = Button 1
-Buttons/X = C
-Buttons/Y = S
-Buttons/Z = D
+Buttons/X = Button 3
+Buttons/Y = Button 4
+Buttons/Z = Button 5
 Buttons/Start = Button 2
-Main Stick/Up = Up
-Main Stick/Down = Down
-Main Stick/Left = Left
-Main Stick/Right = Right
+Main Stick/Up = Axis 10
+Main Stick/Down = Axis 11
+Main Stick/Left = Axis 12
+Main Stick/Right = Axis 13
 Main Stick/Modifier = Shift_L
 Main Stick/Modifier/Range = 50.000000
-C-Stick/Up = I
-C-Stick/Down = K
-C-Stick/Left = J
-C-Stick/Right = L
+C-Stick/Up = Axis 14
+C-Stick/Down = Axis 15
+C-Stick/Left = Axis 16
+C-Stick/Right = Axis 17
 C-Stick/Modifier = Control_L
 C-Stick/Modifier/Range = 50.000000
-Triggers/L = Q
-Triggers/R = W
-D-Pad/Up = T
-D-Pad/Down = G
-D-Pad/Left = F
-D-Pad/Right = H
+Triggers/L = Axis 18
+Triggers/R = Axis 19
+D-Pad/Up = Button 6
+D-Pad/Down = Button 7
+D-Pad/Left = Button 8
+D-Pad/Right = Button 9
 [GCPad2]
 [GCPad3]
 [GCPad4]
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index bee3e5fcca..d8432b7e22 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -7,10 +7,13 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.util.DisplayMetrics;
 import android.util.Log;
+import android.view.InputDevice;
+import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.WindowManager;
 
 import java.io.*;
+import java.util.List;
 
 public class DolphinEmulator<MainActivity> extends Activity 
 {	
@@ -20,19 +23,6 @@ public class DolphinEmulator<MainActivity> extends Activity
 	private float screenWidth;
 	private float screenHeight;
 
-	public static native void onTouchEvent(int Action, float X, float Y);
-	
-	static
-	{
-		try
-		{
-			System.loadLibrary("dolphin-emu-nogui"); 
-		}
-		catch (Exception ex)
-		{
-			Log.w("me", ex.toString());
-		}
-	}
 	private void CopyAsset(String asset, String output) {
         InputStream in = null;
         OutputStream out = null;
@@ -49,6 +39,7 @@ public class DolphinEmulator<MainActivity> extends Activity
             Log.e("tag", "Failed to copy asset file: " + asset, e);
         }       
 	}
+
 	private void copyFile(InputStream in, OutputStream out) throws IOException {
 	    byte[] buffer = new byte[1024];
 	    int read;
@@ -62,21 +53,21 @@ public class DolphinEmulator<MainActivity> extends Activity
 	{
 		super.onStop();
 		if (Running)
-			NativeGLSurfaceView.StopEmulation();
+			NativeLibrary.StopEmulation();
 	}
 	@Override
 	public void onPause()
 	{
 		super.onPause();
 		if (Running)
-			NativeGLSurfaceView.PauseEmulation();
+			NativeLibrary.PauseEmulation();
 	}
 	@Override
 	public void onResume()
 	{
 		super.onResume();
 		if (Running)
-			NativeGLSurfaceView.UnPauseEmulation();
+			NativeLibrary.UnPauseEmulation();
 	}
 
     /** Called when the activity is first created. */
@@ -158,14 +149,46 @@ public class DolphinEmulator<MainActivity> extends Activity
 		float ScreenX = ((X / screenWidth) * 2.0f) - 1.0f;
 		float ScreenY = ((Y / screenHeight) * -2.0f) + 1.0f;
 
-		onTouchEvent(Action, ScreenX, ScreenY);
+		NativeLibrary.onTouchEvent(Action, ScreenX, ScreenY);
 		
 		return false;
 	}
-	
-    public boolean overrideKeys()
-	{   
-		return false;
-	}  
+
+	// Gets button presses
+	@Override
+	public boolean dispatchKeyEvent(KeyEvent event) {
+		int action = 0;
+		switch (event.getAction()) {
+			case KeyEvent.ACTION_DOWN:
+				action = 0;
+				break;
+			case KeyEvent.ACTION_UP:
+				action = 1;
+				break;
+			default:
+				break;
+		}
+		InputDevice input = event.getDevice();
+		NativeLibrary.onGamePadEvent(input.getDescriptor(), event.getKeyCode(), action);
+		return true;
+	}
+
+	@Override
+	public boolean dispatchGenericMotionEvent(MotionEvent event) {
+		if (((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) == 0)) {
+			return super.dispatchGenericMotionEvent(event);
+		}
+
+		InputDevice input = event.getDevice();
+		List<InputDevice.MotionRange> motions = input.getMotionRanges();
+		for (int a = 0; a < motions.size(); ++a)
+		{
+			InputDevice.MotionRange range;
+			range = motions.get(a);
+			NativeLibrary.onGamePadMoveEvent(input.getDescriptor(), range.getAxis(), event.getAxisValue(range.getAxis()));
+		}
+
+		return true;
+	}
 
 }                                
\ No newline at end of file
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java
index 87137db48d..3018300b12 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java
@@ -1,33 +1,19 @@
 package org.dolphinemu.dolphinemu;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.util.Log;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 
 public class GameListItem implements Comparable<GameListItem>{
     private String name;
     private String data;
     private String path;
     private Bitmap image;
-    public static native int[] GetBanner(String filename);
-    public static native String GetTitle(String filename);
-	static
-	{
-		try
-		{
-			System.loadLibrary("dolphin-emu-nogui"); 
-		}
-		catch (Exception ex)
-		{
-			Log.w("me", ex.toString());
-		}
-	}
-    
+
     public GameListItem(Context ctx, String n,String d,String p)
     {
         name = n;
@@ -36,7 +22,7 @@ public class GameListItem implements Comparable<GameListItem>{
         File file = new File(path);
         if (!file.isDirectory())
         {
-        	int[] Banner = GetBanner(path);
+        	int[] Banner = NativeLibrary.GetBanner(path);
         	if (Banner[0] == 0)
         	{
         		try {
@@ -50,7 +36,7 @@ public class GameListItem implements Comparable<GameListItem>{
         	}
         	else
         		image = Bitmap.createBitmap(Banner, 96, 32, Bitmap.Config.ARGB_8888);
-        	name = GetTitle(path);
+        	name = NativeLibrary.GetTitle(path);
         }
     }
     
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
index 314e8e0ae5..ac1329f6a9 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
@@ -24,22 +24,18 @@ public class GameListView extends ListActivity {
 	
     private SideMenuAdapter mAdapter;
     private static GameListView me;
-    public static native String GetConfig(String Key, String Value, String Default);
-    public static native void SetConfig(String Key, String Value, String Default);
 
     enum keyTypes {TYPE_STRING, TYPE_BOOL};
 	
 	private void Fill()
     {
-		
-		
 		this.setTitle("Game List");
 		List<GameListItem>fls = new ArrayList<GameListItem>();
-		String Directories = GetConfig("General", "GCMPathes", "0");
+		String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
 		int intDirectories = Integer.parseInt(Directories);
 		for (int a = 0; a < intDirectories; ++a)
 		{
-			String BrowseDir = GetConfig("General", "GCMPath" + Integer.toString(a), "");
+			String BrowseDir = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPath" + Integer.toString(a), "");
 			File currentDir = new File(BrowseDir);
 			File[]dirs = currentDir.listFiles();
 			try
@@ -101,11 +97,11 @@ public class GameListView extends ListActivity {
                 {
                     String FileName = data.getStringExtra("Select");
                     Toast.makeText(this, "Folder Selected: " + FileName, Toast.LENGTH_SHORT).show();
-                    String Directories = GetConfig("General", "GCMPathes", "0");
+                    String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
                     int intDirectories = Integer.parseInt(Directories);
                     Directories = Integer.toString(intDirectories + 1);
-                    SetConfig("General", "GCMPathes", Directories);
-                    SetConfig("General", "GCMPath" + Integer.toString(intDirectories), FileName);
+	                NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPathes", Directories);
+	                NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPath" + Integer.toString(intDirectories), FileName);
 
                     Fill();
                 }
@@ -142,16 +138,19 @@ public class GameListView extends ListActivity {
                     {
                         case TYPE_STRING:
                             String strPref = prefs.getString(Keys[a], "");
-                            SetConfig(Key, Value, strPref);
+	                        NativeLibrary.SetConfig("Dolphin.ini", Key, Value, strPref);
                         break;
                         case TYPE_BOOL:
                             boolean boolPref = prefs.getBoolean(Keys[a], true);
-                            SetConfig(Key, Value, boolPref ? "True" : "False");
+                            NativeLibrary.SetConfig("Dolphin.ini", Key, Value, boolPref ? "True" : "False");
                         break;
                     }
 
                 }
             break;
+	        case 3: // Gamepad settings
+		        /* Do Nothing */
+		    break;
         }
 	}
 	
@@ -169,6 +168,7 @@ public class GameListView extends ListActivity {
 		List<SideMenuItem>dir = new ArrayList<SideMenuItem>();
 		dir.add(new SideMenuItem("Browse Folder", 0));
         dir.add(new SideMenuItem("Settings", 1));
+		dir.add(new SideMenuItem("Gamepad Config", 2));
 
         ListView mList = new ListView(this);
 		mAdapter = new SideMenuAdapter(this,R.layout.sidemenu,dir);
@@ -193,6 +193,11 @@ public class GameListView extends ListActivity {
                     Intent SettingIntent = new Intent(me, PrefsActivity.class);
                     startActivityForResult(SettingIntent, 2);
                 break;
+		        case 2:
+			        Toast.makeText(me, "Loading up settings", Toast.LENGTH_SHORT).show();
+			        Intent ConfigIntent = new Intent(me, InputConfigActivity.class);
+			        startActivityForResult(ConfigIntent, 3);
+			    break;
         		default:
         		break;
         	}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java
new file mode 100644
index 0000000000..1df812b830
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java
@@ -0,0 +1,181 @@
+package org.dolphinemu.dolphinemu;
+
+import android.app.Activity;
+import android.app.ListActivity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.ListView;
+import android.widget.Toast;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2
+ * Refer to the license.txt file included.
+ */
+public class InputConfigActivity extends ListActivity {
+	private InputConfigAdapter adapter;
+	private int configPosition = 0;
+	boolean Configuring = false;
+	boolean firstEvent = true;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+		List<InputConfigItem> Input = new ArrayList<InputConfigItem>();
+		int a = 0;
+
+		Input.add(a++, new InputConfigItem("Draw on-screen controls", "Android-ScreenControls", "True"));
+		Input.add(a++, new InputConfigItem("Button A", "Android-InputA"));
+		Input.add(a++, new InputConfigItem("Button B", "Android-InputB"));
+		Input.add(a++, new InputConfigItem("Button Start", "Android-InputStart"));
+		Input.add(a++, new InputConfigItem("Button X", "Android-InputX"));
+		Input.add(a++, new InputConfigItem("Button Y", "Android-InputY"));
+		Input.add(a++, new InputConfigItem("Button Z", "Android-InputZ"));
+		Input.add(a++, new InputConfigItem("D-Pad Up", "Android-DPadUp"));
+		Input.add(a++, new InputConfigItem("D-Pad Down", "Android-DPadDown"));
+		Input.add(a++, new InputConfigItem("D-Pad Left", "Android-DPadLeft"));
+		Input.add(a++, new InputConfigItem("D-Pad Right", "Android-DPadRight"));
+		Input.add(a++, new InputConfigItem("Main Stick Up", "Android-MainUp"));
+		Input.add(a++, new InputConfigItem("Main Stick Down", "Android-MainDown"));
+		Input.add(a++, new InputConfigItem("Main Stick Left", "Android-MainLeft"));
+		Input.add(a++, new InputConfigItem("Main Stick Right", "Android-MainRight"));
+		Input.add(a++, new InputConfigItem("C Stick Up", "Android-CStickUp"));
+		Input.add(a++, new InputConfigItem("C Stick Down", "Android-CStickDown"));
+		Input.add(a++, new InputConfigItem("C Stick Left", "Android-CStickLeft"));
+		Input.add(a++, new InputConfigItem("C Stick Right", "Android-CStickRight"));
+		Input.add(a++, new InputConfigItem("Trigger L", "Android-InputL"));
+		Input.add(a++, new InputConfigItem("Trigger R", "Android-InputR"));
+
+		adapter = new InputConfigAdapter(this,R.layout.folderbrowser, Input);
+		this.setListAdapter(adapter);
+	}
+	@Override
+	protected void onListItemClick(ListView l, View v, int position, long id) {
+		super.onListItemClick(l, v, position, id);
+		InputConfigItem o = adapter.getItem(position);
+		switch(position)
+		{
+			case 0: // On screen controls
+				String newBind;
+				if (o.getBind() == "True")
+				{
+					Toast.makeText(this, "Not Drawing on screen controls", Toast.LENGTH_SHORT).show();
+					newBind = "False";
+				}
+				else
+				{
+					Toast.makeText(this, "Drawing on screen controls", Toast.LENGTH_SHORT).show();
+					newBind = "True";
+				}
+				adapter.remove(o);
+				o.setBind(newBind);
+				adapter.insert(o, position);
+			break;
+			default: // gamepad controls
+				Toast.makeText(this, "Press button to configure " + o.getName(), Toast.LENGTH_SHORT).show();
+				configPosition = position;
+				Configuring = true;
+				firstEvent = true;
+			break;
+		}
+
+	}
+	static ArrayList<Float> m_values = new ArrayList<Float>();
+	// Gets move(triggers, joystick) events
+	void AssignBind(String bind)
+	{
+		InputConfigItem o = adapter.getItem(configPosition);
+		adapter.remove(o);
+		o.setBind(bind);
+		adapter.insert(o, configPosition);
+	}
+
+	@Override
+	public boolean dispatchGenericMotionEvent(MotionEvent event) {
+		if (((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) == 0)) {
+			return super.dispatchGenericMotionEvent(event);
+		}
+		InputDevice input = event.getDevice();
+		List<InputDevice.MotionRange> motions = input.getMotionRanges();
+		if (Configuring)
+		{
+			if (firstEvent)
+			{
+				m_values.clear();
+				for (int a = 0; a < motions.size(); ++a)
+				{
+					InputDevice.MotionRange range = motions.get(a);
+					m_values.add(event.getAxisValue(range.getAxis()));
+				}
+				firstEvent = false;
+			}
+			else
+			{
+				for (int a = 0; a < motions.size(); ++a)
+				{
+					InputDevice.MotionRange range;
+					range = motions.get(a);
+					if (m_values.get(a) > (event.getAxisValue(range.getAxis()) + 0.5f))
+					{
+						AssignBind("Device '" + input.getDescriptor() + "'-Axis " + range.getAxis() + "-");
+						Configuring = false;
+					}
+					else if (m_values.get(a) < (event.getAxisValue(range.getAxis()) - 0.5f))
+					{
+						AssignBind("Device '" + input.getDescriptor() + "'-Axis " + range.getAxis() + "+");
+						Configuring = false;
+					}
+				}
+			}
+		}
+		return true;
+	}
+
+	// Gets button presses
+	@Override
+	public boolean dispatchKeyEvent(KeyEvent event) {
+		Log.w("Dolphinemu", "Got Event " + event.getAction());
+		switch (event.getAction()) {
+			case KeyEvent.ACTION_DOWN:
+			case KeyEvent.ACTION_UP:
+				if (Configuring)
+				{
+					InputDevice input = event.getDevice();
+					AssignBind("Device '" + input.getDescriptor() + "'-Button " + event.getKeyCode());
+					Configuring = false;
+					return true;
+				}
+			default:
+				break;
+		}
+
+		return super.dispatchKeyEvent(event);
+	}
+
+	@Override
+	public void onBackPressed() {
+		for (int a = 0; a < adapter.getCount(); ++a)
+		{
+			InputConfigItem o = adapter.getItem(a);
+			String config = o.getConfig();
+			String bind = o.getBind();
+			String ConfigValues[] = config.split("-");
+			String Key = ConfigValues[0];
+			String Value = ConfigValues[1];
+			NativeLibrary.SetConfig("Dolphin.ini", Key, Value, bind);
+		}
+		Intent intent = new Intent();
+		setResult(Activity.RESULT_OK, intent);
+		this.finish();
+		super.onBackPressed();
+	}
+}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigAdapter.java
new file mode 100644
index 0000000000..4430126d46
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigAdapter.java
@@ -0,0 +1,56 @@
+package org.dolphinemu.dolphinemu;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+import java.util.List;
+
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2
+ * Refer to the license.txt file included.
+ */
+public class InputConfigAdapter extends ArrayAdapter<InputConfigItem> {
+	private Context c;
+	private int id;
+	private List<InputConfigItem> items;
+
+	public InputConfigAdapter(Context context, int textViewResourceId,
+	                       List<InputConfigItem> objects) {
+		super(context, textViewResourceId, objects);
+		c = context;
+		id = textViewResourceId;
+		items = objects;
+	}
+
+	public InputConfigItem getItem(int i)
+	{
+		return items.get(i);
+	}
+	@Override
+	public View getView(int position, View convertView, ViewGroup parent) {
+		View v = convertView;
+		if (v == null) {
+			LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+			v = vi.inflate(id, null);
+		}
+		final InputConfigItem o = items.get(position);
+		if (o != null) {
+			TextView t1 = (TextView) v.findViewById(R.id.TextView01);
+			TextView t2 = (TextView) v.findViewById(R.id.TextView02);
+
+			if(t1!=null)
+				t1.setText(o.getName());
+			if(t2!=null)
+				t2.setText(o.getBind());
+		}
+		return v;
+	}
+
+
+
+}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigItem.java
new file mode 100644
index 0000000000..7511406dc9
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigItem.java
@@ -0,0 +1,56 @@
+package org.dolphinemu.dolphinemu;
+
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2
+ * Refer to the license.txt file included.
+ */
+public class InputConfigItem implements Comparable<InputConfigItem>{
+	private String m_name;
+	private String m_Config;
+	private String m_bind;
+
+	private void Init(String n, String c, String d)
+	{
+		m_name = n;
+		m_Config = c;
+		String ConfigValues[] = m_Config.split("-");
+		String Key = ConfigValues[0];
+		String Value = ConfigValues[1];
+		m_bind = NativeLibrary.GetConfig("Dolphin.ini", Key, Value, d);
+	}
+
+	public InputConfigItem(String n, String c, String d)
+	{
+		Init(n, c, d);
+	}
+
+	public InputConfigItem(String n, String c)
+	{
+		Init(n, c, "None");
+	}
+	public String getName()
+	{
+		return m_name;
+	}
+	public String getConfig()
+	{
+		return m_Config;
+	}
+	public String getBind()
+	{
+		return m_bind;
+	}
+	public void setBind(String b)
+	{
+		m_bind = b;
+	}
+
+	public int compareTo(InputConfigItem o)
+	{
+		if(this.m_name != null)
+			return this.m_name.toLowerCase().compareTo(o.getName().toLowerCase());
+		else
+			throw new IllegalArgumentException();
+	}
+}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java b/Source/Android/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java
index 25c7ace0a0..8a8041a08b 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java
@@ -1,9 +1,6 @@
 package org.dolphinemu.dolphinemu;
 
 import android.content.Context;
-import android.opengl.GLSurfaceView;
-import android.util.Log;
-import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
@@ -14,23 +11,6 @@ public class NativeGLSurfaceView extends SurfaceView {
 	static private boolean Created = false;
 	static private float width;
 	static private float height;
-	
-	public static native void main(String File, Surface surf, int width, int height);
-	public static native void UnPauseEmulation();
-	public static native void PauseEmulation();
-	public static native void StopEmulation();
-	
-	static
-	{
-		try
-		{
-			System.loadLibrary("dolphin-emu-nogui"); 
-		}
-		catch (Exception ex)
-		{
-			Log.w("me", ex.toString());
-		}
-	}
 
 	public NativeGLSurfaceView(Context context) {
 		super(context);
@@ -40,7 +20,7 @@ public class NativeGLSurfaceView extends SurfaceView {
 			{
 				@Override
 	      		public void run() {
-	    	  		main(FileName, getHolder().getSurface(), (int)width, (int)height);
+	    	  		NativeLibrary.Run(FileName, getHolder().getSurface(), (int)width, (int)height);
 	      		}	
 			};
 			getHolder().addCallback(new SurfaceHolder.Callback() {
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
new file mode 100644
index 0000000000..52918a040a
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
@@ -0,0 +1,36 @@
+package org.dolphinemu.dolphinemu;
+
+import android.util.Log;
+import android.view.Surface;
+
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2
+ * Refer to the license.txt file included.
+ */
+public class NativeLibrary {
+	public static native void onTouchEvent(int Action, float X, float Y);
+	public static native void onGamePadEvent(String Device, int Button, int Action);
+	public static native void onGamePadMoveEvent(String Device, int Axis, float Value);
+	public static native String GetConfig(String configFile, String Key, String Value, String Default);
+	public static native void SetConfig(String configFile, String Key, String Value, String Default);
+	public static native int[] GetBanner(String filename);
+	public static native String GetTitle(String filename);
+
+	public static native void Run(String File, Surface surf, int width, int height);
+	public static native void UnPauseEmulation();
+	public static native void PauseEmulation();
+	public static native void StopEmulation();
+
+	static
+	{
+		try
+		{
+			System.loadLibrary("dolphin-emu-nogui");
+		}
+		catch (Exception ex)
+		{
+			Log.w("me", ex.toString());
+		}
+	}
+}
diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
index e3f8789634..940f05d811 100644
--- a/Source/Core/DolphinWX/CMakeLists.txt
+++ b/Source/Core/DolphinWX/CMakeLists.txt
@@ -92,6 +92,7 @@ if(wxWidgets_FOUND)
 else()
 	if(ANDROID)
 		set(SRCS Src/Android/TextureLoader.cpp
+			 Src/Android/ButtonManager.cpp
 			 Src/MainAndroid.cpp)
 	else()
 		set(SRCS Src/MainNoGUI.cpp)
diff --git a/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp
new file mode 100644
index 0000000000..15cc371126
--- /dev/null
+++ b/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp
@@ -0,0 +1,223 @@
+// Copyright (C) 2003 Dolphin Project.
+
+// This program 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, version 2.0.
+
+// This program 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 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#include <vector>
+#include "GLInterface.h"
+#include "Android/TextureLoader.h"
+#include "Android/ButtonManager.h"
+
+extern void DrawButton(GLuint tex, float *coords);
+
+namespace ButtonManager
+{
+	std::vector<Button*> m_buttons;
+	std::map<std::string, InputDevice*> m_controllers;
+	// XXX: This needs to not be here so we can load the locations from file
+	// This will allow customizable button locations in the future
+	// These are the OpenGL on screen coordinates
+	float m_coords[][8] =	{ // X, Y, X, EY, EX, EY, EX, Y
+				{0.75f, -1.0f, 0.75f, -0.75f, 1.0f, -0.75f, 1.0f, -1.0f}, // A
+				{0.50f, -1.0f, 0.50f, -0.75f, 0.75f, -0.75f, 0.75f, -1.0f}, // B
+				{-0.10f, -1.0f, -0.10f, -0.80f, 0.10f, -0.80f, 0.10f, -1.0f}, // Start
+				};
+	const char *configStrings[] = {	"InputA",
+					"InputB",
+					"InputStart",
+					"InputX",
+					"InputY",
+					"InputZ",
+					"DPadUp",
+					"DPadDown",
+					"DPadLeft",
+					"DPadRight",
+					"MainUp",
+					"MainDown",
+					"MainLeft",
+					"MainRight",
+					"CStickUp",
+					"CStickDown",
+					"CStickLeft",
+					"CStickRight",
+					"InputL",
+					"InputR" };
+	const int configStringNum = 20;
+	
+	void AddBind(std::string dev, sBind *bind)
+	{
+		auto it = m_controllers.find(dev);
+		if (it != m_controllers.end())
+		{
+			it->second->AddBind(bind);
+			return;
+		}
+		m_controllers[dev] = new InputDevice(dev);
+		m_controllers[dev]->AddBind(bind);
+	}
+
+	void Init()
+	{
+		// Initialize our touchscreen buttons
+		m_buttons.push_back(new Button("ButtonA.png", BUTTON_A, m_coords[0]));
+		m_buttons.push_back(new Button("ButtonB.png", BUTTON_B, m_coords[1]));
+		m_buttons.push_back(new Button("ButtonStart.png", BUTTON_START, m_coords[2]));
+
+		// Init our controller bindings
+		IniFile ini;
+		ini.Load(File::GetUserPath(D_CONFIG_IDX) + std::string("Dolphin.ini"));
+		for (int a = 0; a < configStringNum; ++a)
+		{
+			BindType type;
+			int bindnum;
+			char dev[128];
+			bool hasbind = false;
+			char modifier = 0;
+			std::string value;
+			ini.Get("Android", configStrings[a], &value, "None");
+			if (value == "None")
+				continue;
+			if (std::string::npos != value.find("Axis"))
+			{
+				hasbind = true;
+				type = BIND_AXIS;
+				sscanf(value.c_str(), "Device '%[^\']'-Axis %d%c", dev, &bindnum, &modifier);	
+			}
+			else if (std::string::npos != value.find("Button"))  
+			{
+				hasbind = true;
+				type = BIND_BUTTON;
+				sscanf(value.c_str(), "Device '%[^\']'-Button %d", dev, &bindnum);
+			}
+			if (hasbind)
+				AddBind(std::string(dev), new sBind((ButtonType)a, type, bindnum, modifier == '-' ? -1.0f : 1.0f));
+		}
+
+	}
+	bool GetButtonPressed(ButtonType button)
+	{
+		bool pressed = false;
+		for (auto it = m_buttons.begin(); it != m_buttons.end(); ++it)
+			if ((*it)->GetButtonType() == button)
+				pressed = (*it)->Pressed();
+
+		for (auto it = m_controllers.begin(); it != m_controllers.end(); ++it)
+			pressed |= it->second->ButtonValue(button);
+
+		return pressed;
+	}
+	float GetAxisValue(ButtonType axis)
+	{
+		auto it = m_controllers.begin();
+		if (it == m_controllers.end())
+			return 0.0f;
+		return it->second->AxisValue(axis); 
+	}
+	void TouchEvent(int action, float x, float y)
+	{
+		// Actions
+		// 0 is press
+		// 1 is let go
+		// 2 is move
+		for (auto it = m_buttons.begin(); it != m_buttons.end(); ++it)
+		{
+			float *coords = (*it)->GetCoords();
+			if (	x >= coords[0] &&
+				x <= coords[4] &&
+				y >= coords[1] &&
+				y <= coords[3])
+			{
+				if (action == 0)
+					(*it)->SetState(BUTTON_PRESSED);
+				if (action == 1)
+					(*it)->SetState(BUTTON_RELEASED);
+				if (action == 2)
+					; // XXX: Be used later for analog stick
+			}
+		}
+	}
+
+	void GamepadEvent(std::string dev, int button, int action)
+	{
+		auto it = m_controllers.find(dev);
+		if (it != m_controllers.end())
+		{
+			it->second->PressEvent(button, action);
+			return;
+		}
+		m_controllers[dev] = new InputDevice(dev);
+		m_controllers[dev]->PressEvent(button, action);
+	}
+	void GamepadAxisEvent(std::string dev, int axis, float value)
+	{
+		auto it = m_controllers.find(dev);
+		if (it != m_controllers.end())
+		{
+			it->second->AxisEvent(axis, value);
+			return;
+		}
+		m_controllers[dev] = new InputDevice(dev);
+		m_controllers[dev]->AxisEvent(axis, value);
+	}
+	void Shutdown()
+	{
+		for(auto it = m_buttons.begin(); it != m_buttons.end(); ++it)
+			delete *it;
+		for (auto it = m_controllers.begin(); it != m_controllers.end(); ++it)
+			delete it->second;
+	}
+
+	void DrawButtons()
+	{
+		glEnable(GL_BLEND);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+		for(auto it = m_buttons.begin(); it != m_buttons.end(); ++it)
+			DrawButton((*it)->GetTexture(), (*it)->GetCoords());	
+
+		glDisable(GL_BLEND);
+	}
+	
+	// InputDevice
+	void InputDevice::PressEvent(int button, int action)
+	{
+		m_buttons[button] = action == 0 ? true : false;
+	}
+	void InputDevice::AxisEvent(int axis, float value)
+	{
+		m_axises[axis] = value;
+	}
+	bool InputDevice::ButtonValue(ButtonType button)
+	{
+		auto it = m_binds.find(button);
+		if (it == m_binds.end())
+			return false;
+		if (it->second->m_bindtype == BIND_BUTTON)
+			return m_buttons[it->second->m_bind];
+		else
+			return AxisValue(button);
+	}
+	float InputDevice::AxisValue(ButtonType axis)
+	{
+		auto it = m_binds.find(axis);
+		if (it == m_binds.end())
+			return 0.0f;
+		if (it->second->m_bindtype == BIND_BUTTON)
+			return ButtonValue(axis);
+		else		
+			return m_axises[it->second->m_bind] * it->second->m_neg;
+	}
+	
+}
diff --git a/Source/Core/InputCommon/Src/Android/ButtonManager.h b/Source/Core/DolphinWX/Src/Android/ButtonManager.h
similarity index 53%
rename from Source/Core/InputCommon/Src/Android/ButtonManager.h
rename to Source/Core/DolphinWX/Src/Android/ButtonManager.h
index f21ceedd98..c312b9786a 100644
--- a/Source/Core/InputCommon/Src/Android/ButtonManager.h
+++ b/Source/Core/DolphinWX/Src/Android/ButtonManager.h
@@ -15,7 +15,10 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
+#pragma once
+
 #include <string>
+#include <map>
 #include "CommonPaths.h"
 #include "Android/TextureLoader.h"
 
@@ -26,12 +29,34 @@ namespace ButtonManager
 		BUTTON_A = 0,
 		BUTTON_B,
 		BUTTON_START,
+		BUTTON_X,
+		BUTTON_Y,
+		BUTTON_Z,
+		BUTTON_UP,
+		BUTTON_DOWN,
+		BUTTON_LEFT,
+		BUTTON_RIGHT,
+		STICK_MAIN_UP,
+		STICK_MAIN_DOWN,
+		STICK_MAIN_LEFT,
+		STICK_MAIN_RIGHT,
+		STICK_C_UP,
+		STICK_C_DOWN,
+		STICK_C_LEFT,
+		STICK_C_RIGHT,
+		TRIGGER_L,
+		TRIGGER_R
 	};
 	enum ButtonState
 	{
 		BUTTON_RELEASED = 0,
 		BUTTON_PRESSED = 1
 	};
+	enum BindType
+	{
+		BIND_BUTTON = 0,
+		BIND_AXIS
+	};
 	class Button
 	{
 	private:
@@ -47,17 +72,62 @@ namespace ButtonManager
 			memcpy(m_coords, coords, sizeof(float) * 8);
 			m_state = BUTTON_RELEASED;
 		}
+		Button(ButtonType button)
+		{
+			m_button = button;
+			m_state = BUTTON_RELEASED;
+		}
 		void SetState(ButtonState state) { m_state = state; }
 		bool Pressed() { return m_state == BUTTON_PRESSED; }
 		ButtonType GetButtonType() { return m_button; }
 		GLuint GetTexture() { return m_tex; }
 		float *GetCoords() { return m_coords; }
 			
-		~Button() { glDeleteTextures(1, &m_tex); }
+		~Button() { if(m_tex) glDeleteTextures(1, &m_tex); }
 	};
+
+	struct sBind
+	{
+		const ButtonType m_buttontype;
+		const BindType m_bindtype;
+		const int m_bind;
+		const float m_neg;
+		sBind(ButtonType buttontype, BindType bindtype, int bind, float neg) 
+			: m_buttontype(buttontype), m_bindtype(bindtype), m_bind(bind), m_neg(neg) 
+		{}
+	};
+	
+
+	class InputDevice
+	{
+	private:
+		std::string m_dev;
+		std::map<int, bool> m_buttons;
+		std::map<int, float> m_axises;
+		std::map<ButtonType, sBind*> m_binds;
+	public:
+		InputDevice(std::string dev)
+		{
+			m_dev = dev;
+		}
+		~InputDevice()
+		{
+			for (auto it = m_binds.begin(); it != m_binds.end(); ++it)
+			delete it->second;
+		}
+		void AddBind(sBind *bind) { m_binds[bind->m_buttontype] = bind; } 
+		void PressEvent(int button, int action);
+		void AxisEvent(int axis, float value);
+		bool ButtonValue(ButtonType button);
+		float AxisValue(ButtonType axis);
+	};
+
 	void Init();
 	void DrawButtons();
 	bool GetButtonPressed(ButtonType button);
+	float GetAxisValue(ButtonType axis);
 	void TouchEvent(int action, float x, float y);
+	void GamepadEvent(std::string dev, int button, int action);
+	void GamepadAxisEvent(std::string dev, int axis, float value);
 	void Shutdown();
 }
diff --git a/Source/Core/DolphinWX/Src/MainAndroid.cpp b/Source/Core/DolphinWX/Src/MainAndroid.cpp
index f1297e8026..1639e3fcf0 100644
--- a/Source/Core/DolphinWX/Src/MainAndroid.cpp
+++ b/Source/Core/DolphinWX/Src/MainAndroid.cpp
@@ -200,26 +200,39 @@ std::string GetName(std::string filename)
 extern "C"
 {
 #endif
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeGLSurfaceView_UnPauseEmulation(JNIEnv *env, jobject obj)
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_UnPauseEmulation(JNIEnv *env, jobject obj)
 {
 	PowerPC::Start();
 }
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeGLSurfaceView_PauseEmulation(JNIEnv *env, jobject obj) 
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_PauseEmulation(JNIEnv *env, jobject obj) 
 {
 	PowerPC::Pause();
 }
 
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeGLSurfaceView_StopEmulation(JNIEnv *env, jobject obj) 
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_StopEmulation(JNIEnv *env, jobject obj) 
 {
 	PowerPC::Stop();
 }
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_DolphinEmulator_onTouchEvent(JNIEnv *env, jobject obj, jint Action, jfloat X, jfloat Y)
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onTouchEvent(JNIEnv *env, jobject obj, jint Action, jfloat X, jfloat Y)
 {
 	ButtonManager::TouchEvent(Action, X, Y);
 }
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Button, jint Action)
+{
+	const char *Device = env->GetStringUTFChars(jDevice, NULL);
+	std::string strDevice = std::string(Device);
+	ButtonManager::GamepadEvent(strDevice, Button, Action);
+	env->ReleaseStringUTFChars(jDevice, Device);
+}
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_onGamePadMoveEvent(JNIEnv *env, jobject obj, jstring jDevice, jint Axis, jfloat Value)
+{
+	const char *Device = env->GetStringUTFChars(jDevice, NULL);
+	std::string strDevice = std::string(Device);
+	ButtonManager::GamepadAxisEvent(strDevice, Axis, Value);
+	env->ReleaseStringUTFChars(jDevice, Device);
+}
 
-
-JNIEXPORT jintArray JNICALL Java_org_dolphinemu_dolphinemu_GameListItem_GetBanner(JNIEnv *env, jobject obj, jstring jFile)
+JNIEXPORT jintArray JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetBanner(JNIEnv *env, jobject obj, jstring jFile)
 {
 	const char *File = env->GetStringUTFChars(jFile, NULL);
 	jintArray Banner = env->NewIntArray(DVD_BANNER_WIDTH * DVD_BANNER_HEIGHT);
@@ -231,7 +244,7 @@ JNIEXPORT jintArray JNICALL Java_org_dolphinemu_dolphinemu_GameListItem_GetBanne
 	env->ReleaseStringUTFChars(jFile, File);
 	return Banner;
 }
-JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_GameListItem_GetTitle(JNIEnv *env, jobject obj, jstring jFile)
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetTitle(JNIEnv *env, jobject obj, jstring jFile)
 {
 	const char *File = env->GetStringUTFChars(jFile, NULL);
 	std::string Name = GetName(File);
@@ -241,41 +254,46 @@ JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_GameListItem_GetTitle(J
 	env->ReleaseStringUTFChars(jFile, File);
 	return env->NewStringUTF(Name.c_str());
 }
-JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_GameListView_GetConfig(JNIEnv *env, jobject obj, jstring jKey, jstring jValue, jstring jDefault)
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetConfig(JNIEnv *env, jobject obj, jstring jFile, jstring jKey, jstring jValue, jstring jDefault)
 {
 	IniFile ini;
-	ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
+	const char *File = env->GetStringUTFChars(jFile, NULL);
 	const char *Key = env->GetStringUTFChars(jKey, NULL);
 	const char *Value = env->GetStringUTFChars(jValue, NULL);
 	const char *Default = env->GetStringUTFChars(jDefault, NULL);
 	
+	ini.Load(File::GetUserPath(D_CONFIG_IDX) + std::string(File));
 	std::string value;
 	
 	ini.Get(Key, Value, &value, Default);
-
+	
+	env->ReleaseStringUTFChars(jFile, File);
 	env->ReleaseStringUTFChars(jKey, Key);
 	env->ReleaseStringUTFChars(jValue, Value);
 	env->ReleaseStringUTFChars(jDefault, Default);
 
 	return env->NewStringUTF(value.c_str());
 }
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_GameListView_SetConfig(JNIEnv *env, jobject obj, jstring jKey, jstring jValue, jstring jDefault)
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetConfig(JNIEnv *env, jobject obj, jstring jFile, jstring jKey, jstring jValue, jstring jDefault)
 {
 	IniFile ini;
-	ini.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
+	const char *File = env->GetStringUTFChars(jFile, NULL);
 	const char *Key = env->GetStringUTFChars(jKey, NULL);
 	const char *Value = env->GetStringUTFChars(jValue, NULL);
 	const char *Default = env->GetStringUTFChars(jDefault, NULL);
 	
-	ini.Set(Key, Value, Default);
-	ini.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX));
+	ini.Load(File::GetUserPath(D_CONFIG_IDX) + std::string(File));
 
+	ini.Set(Key, Value, Default);
+	ini.Save(File::GetUserPath(D_CONFIG_IDX) + std::string(File));
+
+	env->ReleaseStringUTFChars(jFile, File);
 	env->ReleaseStringUTFChars(jKey, Key);
 	env->ReleaseStringUTFChars(jValue, Value);
 	env->ReleaseStringUTFChars(jDefault, Default);
 }
 
-JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeGLSurfaceView_main(JNIEnv *env, jobject obj, jstring jFile, jobject _surf, jint _width, jint _height)
+JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv *env, jobject obj, jstring jFile, jobject _surf, jint _width, jint _height)
 {
 	surf = ANativeWindow_fromSurface(env, _surf);
 	g_width = (int)_width;
@@ -283,7 +301,6 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeGLSurfaceView_main(J
 
 	// Install our callbacks
 	OSD::AddCallback(OSD::OSD_INIT, OSDCallbacks, 0);
-	OSD::AddCallback(OSD::OSD_ONFRAME, OSDCallbacks, 1);
 	OSD::AddCallback(OSD::OSD_SHUTDOWN, OSDCallbacks, 2);
 
 	LogManager::Init();
@@ -292,6 +309,15 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeGLSurfaceView_main(J
 	VideoBackend::ActivateBackend(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend);
 	WiimoteReal::LoadSettings();
 
+	// Load our Android specific settings
+	IniFile ini;
+	bool onscreencontrols = true;
+	ini.Load(File::GetUserPath(D_CONFIG_IDX) + std::string("Dolphin.ini"));
+	ini.Get("Android", "ScreenControls", &onscreencontrols, true);
+
+	if (onscreencontrols)
+		OSD::AddCallback(OSD::OSD_ONFRAME, OSDCallbacks, 1);
+
 	const char *File = env->GetStringUTFChars(jFile, NULL);
 	// No use running the loop when booting fails
 	if ( BootManager::BootCore( File ) )
diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt
index 8fc2a344c7..f6995583ff 100644
--- a/Source/Core/InputCommon/CMakeLists.txt
+++ b/Source/Core/InputCommon/CMakeLists.txt
@@ -23,8 +23,7 @@ elseif(X11_FOUND)
 				Src/ControllerInterface/Xlib/Xlib.cpp)
 elseif(ANDROID)
 	set(SRCS	${SRCS}
-				Src/ControllerInterface/Android/Android.cpp
-				Src/Android/ButtonManager.cpp)
+				Src/ControllerInterface/Android/Android.cpp)
 endif()
 
 add_library(inputcommon ${SRCS})
diff --git a/Source/Core/InputCommon/Src/Android/ButtonManager.cpp b/Source/Core/InputCommon/Src/Android/ButtonManager.cpp
deleted file mode 100644
index 9ae996732d..0000000000
--- a/Source/Core/InputCommon/Src/Android/ButtonManager.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program 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, version 2.0.
-
-// This program 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 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include <vector>
-#include "GLInterface.h"
-#include "Android/TextureLoader.h"
-#include "Android/ButtonManager.h"
-
-extern void DrawButton(GLuint tex, float *coords);
-
-namespace ButtonManager
-{
-	std::vector<Button*> m_buttons;
-
-	// XXX: This needs to not be here so we can load the locations from file
-	// This will allow customizable button locations in the future
-	// These are the OpenGL on screen coordinates
-	float m_coords[][8] =	{ // X, Y, X, EY, EX, EY, EX, Y
-				{0.75f, -1.0f, 0.75f, -0.75f, 1.0f, -0.75f, 1.0f, -1.0f}, // A
-				{0.50f, -1.0f, 0.50f, -0.75f, 0.75f, -0.75f, 0.75f, -1.0f}, // B
-				{-0.10f, -1.0f, -0.10f, -0.80f, 0.10f, -0.80f, 0.10f, -1.0f}, // Start
-				};
-	
-	void Init()
-	{
-		// Initialize our buttons
-		m_buttons.push_back(new Button("ButtonA.png", BUTTON_A, m_coords[0]));
-		m_buttons.push_back(new Button("ButtonB.png", BUTTON_B, m_coords[1]));
-		m_buttons.push_back(new Button("ButtonStart.png", BUTTON_START, m_coords[2]));
-	}
-	bool GetButtonPressed(ButtonType button)
-	{
-		for (auto it = m_buttons.begin(); it != m_buttons.end(); ++it)
-			if ((*it)->GetButtonType() == button)
-				return (*it)->Pressed();
-		return false;
-	}
-	void TouchEvent(int action, float x, float y)
-	{
-		// Actions
-		// 0 is press
-		// 1 is let go
-		// 2 is move
-		for (auto it = m_buttons.begin(); it != m_buttons.end(); ++it)
-		{
-			float *coords = (*it)->GetCoords();
-			if (	x >= coords[0] &&
-				x <= coords[4] &&
-				y >= coords[1] &&
-				y <= coords[3])
-			{
-				if (action == 0)
-					(*it)->SetState(BUTTON_PRESSED);
-				if (action == 1)
-					(*it)->SetState(BUTTON_RELEASED);
-				if (action == 2)
-					; // XXX: Be used later for analog stick
-			}
-		}
-	}
-	void Shutdown()
-	{
-		for(auto it = m_buttons.begin(); it != m_buttons.end(); ++it)
-			delete *it;
-	}
-
-	void DrawButtons()
-	{
-		glEnable(GL_BLEND);
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-		for(auto it = m_buttons.begin(); it != m_buttons.end(); ++it)
-			DrawButton((*it)->GetTexture(), (*it)->GetCoords());	
-
-		glDisable(GL_BLEND);
-	}
-
-}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp
index 2d01d38f23..6469945971 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp
@@ -48,6 +48,20 @@ Touchscreen::Touchscreen()
 	AddInput(new Button(ButtonManager::BUTTON_A));
 	AddInput(new Button(ButtonManager::BUTTON_B));
 	AddInput(new Button(ButtonManager::BUTTON_START));
+	AddInput(new Button(ButtonManager::BUTTON_X));
+	AddInput(new Button(ButtonManager::BUTTON_Y));
+	AddInput(new Button(ButtonManager::BUTTON_Z));
+	AddInput(new Button(ButtonManager::BUTTON_UP));
+	AddInput(new Button(ButtonManager::BUTTON_DOWN));
+	AddInput(new Button(ButtonManager::BUTTON_LEFT));
+	AddInput(new Button(ButtonManager::BUTTON_RIGHT));
+	AddAnalogInputs(new Axis(ButtonManager::STICK_MAIN_LEFT), new Axis(ButtonManager::STICK_MAIN_RIGHT));
+	AddAnalogInputs(new Axis(ButtonManager::STICK_MAIN_UP), new Axis(ButtonManager::STICK_MAIN_DOWN));
+	AddAnalogInputs(new Axis(ButtonManager::STICK_C_UP), new Axis(ButtonManager::STICK_C_DOWN));
+	AddAnalogInputs(new Axis(ButtonManager::STICK_C_LEFT), new Axis(ButtonManager::STICK_C_RIGHT));
+	AddAnalogInputs(new Axis(ButtonManager::TRIGGER_L), new Axis(ButtonManager::TRIGGER_L));
+	AddAnalogInputs(new Axis(ButtonManager::TRIGGER_R), new Axis(ButtonManager::TRIGGER_R));
+
 }
 // Buttons and stuff
 
@@ -62,6 +76,17 @@ ControlState Touchscreen::Button::GetState() const
 {
 	return ButtonManager::GetButtonPressed(m_index);
 }
+std::string Touchscreen::Axis::GetName() const
+{
+	std::ostringstream ss;
+	ss << "Axis " << (int)m_index;
+	return ss.str();
+}
+
+ControlState Touchscreen::Axis::GetState() const
+{
+	return ButtonManager::GetAxisValue(m_index);
+}
 
 }
 }
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
index 9bdb52a61d..21f35165f1 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
@@ -36,7 +36,16 @@ private:
 		Button(ButtonManager::ButtonType index) : m_index(index) {}
 		ControlState GetState() const;
 	private:
-		 const ButtonManager::ButtonType m_index;
+		const ButtonManager::ButtonType m_index;
+	};
+	class Axis : public Input
+	{
+	public:
+		std::string GetName() const;
+		Axis(ButtonManager::ButtonType index) : m_index(index) {}
+		ControlState GetState() const;
+	private:
+		const ButtonManager::ButtonType m_index;
 	};
 
 public:

From 7df8a9cae80039baaaeb0289ce17cec8f10ac1a3 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 18 Jun 2013 07:52:36 -0500
Subject: [PATCH 169/352] Partial revert of 0247b2a97a1d. I'll add a work
 around for Qualcomm in a bit. Qualcomm shader compiler failing was only due
 to floating suffixes not whole function defines. Qualcomm video driver devs
 seem to have a good response time when it comes to OpenGL ES 3 issues.

---
 .../Core/VideoCommon/Src/LightingShaderGen.h  |  2 +-
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 49 +++++++------------
 .../Src/ProgramShaderCache.cpp                |  5 ++
 3 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.h b/Source/Core/VideoCommon/Src/LightingShaderGen.h
index ace785a477..031dce44bd 100644
--- a/Source/Core/VideoCommon/Src/LightingShaderGen.h
+++ b/Source/Core/VideoCommon/Src/LightingShaderGen.h
@@ -251,7 +251,7 @@ static void GenerateLightingShader(T& object, LightingUidData& uid_data, int com
 					GenerateLightShader<T>(object, uid_data, i, lit_index, lightsName, coloralpha);
 			}
 		}
-		object.Write("%s%d = mat * clamp(lacc, 0.0, 1.0);\n", dest, j);
+		object.Write("%s%d = mat * clamp(lacc, 0.0f, 1.0f);\n", dest, j);
 		object.Write("}\n");
 	}
 }
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 31892cec36..1ec80ba56d 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -216,17 +216,6 @@ static char swapModeTable[4][5];
 
 static char text[16384];
 
-// We can't use function defines since the Qualcomm shader compiler doesn't support it
-static const char *GLSLConvertFunctions[] =
-{
-	"frac", // HLSL
-	"fract", // GLSL
-	"lerp",
-	"mix"
-};
-#define FUNC_FRAC 0
-#define FUNC_LERP 2
-
 static void BuildSwapModeTable()
 {
 	static const char *swapColors = "rgba";
@@ -243,7 +232,7 @@ static void BuildSwapModeTable()
 template<class T> static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE ApiType, RegisterState RegisterStates[4]);
 template<class T> static void SampleTexture(T& out, const char *destination, const char *texcoords, const char *texswap, int texmap, API_TYPE ApiType);
 template<class T> static void WriteAlphaTest(T& out, pixel_shader_uid_data& uid_data, API_TYPE ApiType,DSTALPHA_MODE dstAlphaMode, bool per_pixel_depth);
-template<class T> static void WriteFog(T& out, pixel_shader_uid_data& uid_data, API_TYPE ApiType);
+template<class T> static void WriteFog(T& out, pixel_shader_uid_data& uid_data);
 
 template<class T>
 static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
@@ -270,7 +259,6 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 	unsigned int numTexgen = bpmem.genMode.numtexgens;
 
 	const bool per_pixel_depth = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable) || !g_ActiveConfig.bFastDepthCalc;
-	const bool bOpenGL = ApiType == API_OPENGL;
 
 	out.Write("//Pixel Shader for TEV stages\n");
 	out.Write("//%i TEV stages, %i texgens, %i IND stages\n",
@@ -566,7 +554,7 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 	}
 	// emulation of unsigned 8 overflow when casting if needed
 	if(RegisterStates[0].AlphaNeedOverflowControl || RegisterStates[0].ColorNeedOverflowControl)
-		out.Write("\tprev = %s(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]);
+		out.Write("\tprev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n");
 
 	AlphaTest::TEST_RESULT Pretest = bpmem.alpha_test.TestResult();
 	uid_data.Pretest = Pretest;
@@ -607,7 +595,7 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 
 		// U24 overflow emulation
 		out.Write("zCoord = zCoord * (16777215.0f/16777216.0f);\n");
-		out.Write("zCoord = %s(zCoord);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]);
+		out.Write("zCoord = frac(zCoord);\n");
 		out.Write("zCoord = zCoord * (16777216.0f/16777215.0f);\n");
 
 		// Note: depth texture output is only written to depth buffer if late depth test is used
@@ -625,7 +613,7 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 	}
 	else
 	{
-		WriteFog<T>(out, uid_data, ApiType);
+		WriteFog<T>(out, uid_data);
 		out.Write("\tocol0 = prev;\n");
 	}
 
@@ -712,7 +700,6 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 	int texcoord = bpmem.tevorders[n/2].getTexCoord(n&1);
 	bool bHasTexCoord = (u32)texcoord < bpmem.genMode.numtexgens;
 	bool bHasIndStage = bpmem.tevind[n].IsActive() && bpmem.tevind[n].bt < bpmem.genMode.numindstages;
-	bool bOpenGL = ApiType == API_OPENGL;
 	// HACK to handle cases where the tex gen is not enabled
 	if (!bHasTexCoord)
 		texcoord = 0;
@@ -847,7 +834,7 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 
 		char *rasswap = swapModeTable[bpmem.combiners[n].alphaC.rswap];
 		out.Write("rastemp = %s.%s;\n", tevRasTable[bpmem.tevorders[n / 2].getColorChan(n & 1)], rasswap);
-		out.Write("crastemp = %s(rastemp * (255.0f/256.0f)) * (256.0f/255.0f);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]);
+		out.Write("crastemp = frac(rastemp * (255.0f/256.0f)) * (256.0f/255.0f);\n");
 	}
 
 
@@ -889,7 +876,7 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		out.Write("konsttemp = float4(%s, %s);\n", tevKSelTableC[kc], tevKSelTableA[ka]);
 		if(kc > 7 || ka > 7)
 		{
-			out.Write("ckonsttemp = %s(konsttemp * (255.0f/256.0f)) * (256.0f/255.0f);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]);
+			out.Write("ckonsttemp = frac(konsttemp * (255.0f/256.0f)) * (256.0f/255.0f);\n");
 		}
 		else
 		{
@@ -908,7 +895,7 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 	{
 		if(RegisterStates[0].AlphaNeedOverflowControl || RegisterStates[0].ColorNeedOverflowControl)
 		{
-			out.Write("cprev = %s(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]);
+			out.Write("cprev = frac(prev * (255.0f/256.0f)) * (256.0f/255.0f);\n");
 			RegisterStates[0].AlphaNeedOverflowControl = false;
 			RegisterStates[0].ColorNeedOverflowControl = false;
 		}
@@ -927,7 +914,7 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		out.SetConstantsUsed(C_COLORS+1,C_COLORS+1);
 		if(RegisterStates[1].AlphaNeedOverflowControl || RegisterStates[1].ColorNeedOverflowControl)
 		{
-			out.Write("cc0 = %s(c0 * (255.0f/256.0f)) * (256.0f/255.0f);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]);
+			out.Write("cc0 = frac(c0 * (255.0f/256.0f)) * (256.0f/255.0f);\n");
 			RegisterStates[1].AlphaNeedOverflowControl = false;
 			RegisterStates[1].ColorNeedOverflowControl = false;
 		}
@@ -946,7 +933,7 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		out.SetConstantsUsed(C_COLORS+2,C_COLORS+2);
 		if(RegisterStates[2].AlphaNeedOverflowControl || RegisterStates[2].ColorNeedOverflowControl)
 		{
-			out.Write("cc1 = %s(c1 * (255.0f/256.0f)) * (256.0f/255.0f);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]);
+			out.Write("cc1 = frac(c1 * (255.0f/256.0f)) * (256.0f/255.0f);\n");
 			RegisterStates[2].AlphaNeedOverflowControl = false;
 			RegisterStates[2].ColorNeedOverflowControl = false;
 		}
@@ -965,7 +952,7 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		out.SetConstantsUsed(C_COLORS+3,C_COLORS+3);
 		if(RegisterStates[3].AlphaNeedOverflowControl || RegisterStates[3].ColorNeedOverflowControl)
 		{
-			out.Write("cc2 = %s(c2 * (255.0f/256.0f)) * (256.0f/255.0f);\n", GLSLConvertFunctions[FUNC_FRAC + bOpenGL]);
+			out.Write("cc2 = frac(c2 * (255.0f/256.0f)) * (256.0f/255.0f);\n");
 			RegisterStates[3].AlphaNeedOverflowControl = false;
 			RegisterStates[3].ColorNeedOverflowControl = false;
 		}
@@ -1021,7 +1008,7 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		else if (cc.b == TEVCOLORARG_ZERO)
 			out.Write("%s*(float3(1.0f, 1.0f, 1.0f)-%s)", tevCInputTable[cc.a + 16], tevCInputTable[cc.c + 16]);
 		else
-			out.Write("%s(%s, %s, %s)", GLSLConvertFunctions[FUNC_LERP + bOpenGL], tevCInputTable[cc.a + 16], tevCInputTable[cc.b + 16], tevCInputTable[cc.c + 16]);
+			out.Write("lerp(%s, %s, %s)", tevCInputTable[cc.a + 16], tevCInputTable[cc.b + 16], tevCInputTable[cc.c + 16]);
 
 		out.Write("%s", tevBiasTable[cc.bias]);
 
@@ -1038,7 +1025,7 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 				tevCInputTable[cc.c + 16]);
 	}
 	if (cc.clamp)
-		out.Write(", 0.0, 1.0)");
+		out.Write(", 0.0f, 1.0f)");
 	out.Write(";\n");
 
 	RegisterStates[ac.dest].AlphaNeedOverflowControl = (ac.clamp == 0);
@@ -1068,7 +1055,7 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		else if (ac.b == TEVALPHAARG_ZERO)
 			out.Write("%s.a*(1.0f-%s.a)", tevAInputTable[ac.a + 8], tevAInputTable[ac.c + 8]);
 		else
-			out.Write("%s(%s.a, %s.a, %s.a)", GLSLConvertFunctions[FUNC_LERP + bOpenGL], tevAInputTable[ac.a + 8], tevAInputTable[ac.b + 8], tevAInputTable[ac.c + 8]);
+			out.Write("lerp(%s.a, %s.a, %s.a)", tevAInputTable[ac.a + 8], tevAInputTable[ac.b + 8], tevAInputTable[ac.c + 8]);
 
 		out.Write("%s",tevBiasTable[ac.bias]);
 
@@ -1087,7 +1074,7 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 				tevAInputTable[ac.c + 8]);
 	}
 	if (ac.clamp)
-		out.Write(", 0.0, 1.0)");
+		out.Write(", 0.0f, 1.0f)");
 	out.Write(";\n\n");
 	out.Write("// TEV done\n");
 }
@@ -1191,10 +1178,8 @@ static const char *tevFogFuncsTable[] =
 };
 
 template<class T>
-static void WriteFog(T& out, pixel_shader_uid_data& uid_data, API_TYPE ApiType)
+static void WriteFog(T& out, pixel_shader_uid_data& uid_data)
 {
-	bool bOpenGL = ApiType == API_OPENGL;
-
 	uid_data.fog_fsel = bpmem.fog.c_proj_fsel.fsel;
 	if(bpmem.fog.c_proj_fsel.fsel == 0)
 		return; // no Fog
@@ -1227,7 +1212,7 @@ static void WriteFog(T& out, pixel_shader_uid_data& uid_data, API_TYPE ApiType)
 		out.Write("\tze *= x_adjust;\n");
 	}
 
-	out.Write("\tfloat fog = clamp(ze - " I_FOG"[1].z, 0.0, 1.0);\n");
+	out.Write("\tfloat fog = clamp(ze - " I_FOG"[1].z, 0.0f, 1.0f);\n");
 
 	if (bpmem.fog.c_proj_fsel.fsel > 3)
 	{
@@ -1239,7 +1224,7 @@ static void WriteFog(T& out, pixel_shader_uid_data& uid_data, API_TYPE ApiType)
 			WARN_LOG(VIDEO, "Unknown Fog Type! %08x", bpmem.fog.c_proj_fsel.fsel);
 	}
 
-	out.Write("\tprev.rgb = %s(prev.rgb, " I_FOG"[0].rgb, fog);\n", GLSLConvertFunctions[FUNC_LERP + bOpenGL]);
+	out.Write("\tprev.rgb = lerp(prev.rgb, " I_FOG"[0].rgb, fog);\n");
 }
 
 void GetPixelShaderUid(PixelShaderUid& object, DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index 07ba589469..c482c13900 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -525,6 +525,11 @@ void ProgramShaderCache::CreateHeader ( void )
 		"#define float3 vec3\n"
 		"#define float4 vec4\n"
 
+		// hlsl to glsl function translation
+		"#define frac(x) fract(x)\n"
+		"#define saturate(x) clamp(x, 0.0f, 1.0f)\n"
+		"#define lerp(x, y, z) mix(x, y, z)\n"
+
 		// glsl 120 hack
 		"%s\n"
 		"%s\n"

From d78f00971baf959dc1e16eb0f1f2b36a45b742c7 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 18 Jun 2013 10:13:37 -0400
Subject: [PATCH 170/352] Fix a free that should have been a delete.

---
 Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
index fc497c29a3..711ef135bb 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
@@ -232,7 +232,7 @@ void WiimoteScanner::FindWiimotes(std::vector<Wiimote*> & found_wiimotes, Wiimot
 			}
 			else
 			{
-				free(wm);
+				delete wm;
 			}
 		}
 

From f59f059fbf5b4b4ae5d7cf96833dc1ca7ad26dea Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 18 Jun 2013 10:45:57 -0400
Subject: [PATCH 171/352] Fix a char buffer destination size in Render.cpp for
 VideoDX11.

---
 Source/Plugins/Plugin_VideoDX11/Src/Render.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
index eab4ff08c2..761563264d 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
@@ -960,7 +960,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 	if (SConfig::GetInstance().m_ShowLag)
 	{
 		char lag[10];
-		StringCchPrintfA(lag, 1000, "Lag: %llu\n", Movie::g_currentLagCount);
+		StringCchPrintfA(lag, 10, "Lag: %llu\n", Movie::g_currentLagCount);
 		D3D::font.DrawTextScaled(0, 18, 20, 0.0f, 0xFF00FFFF, lag);
 	}
 

From fbb82ccab3a3561805cbe79b15e8d27f9af4f7f5 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 18 Jun 2013 10:48:16 -0400
Subject: [PATCH 172/352] Whoops, look like the previous commit was also the
 case with VideoDX9

---
 Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
index be13911fe9..625db5f44e 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
@@ -998,7 +998,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 	if (SConfig::GetInstance().m_ShowLag)
 	{
 		char lag[10];
-		StringCchPrintfA(lag, 1000, "Lag: %llu\n", Movie::g_currentLagCount);
+		StringCchPrintfA(lag, 10, "Lag: %llu\n", Movie::g_currentLagCount);
 		D3D::font.DrawTextScaled(0, 18, 20, 20, 0.0f, 0xFF00FFFF, lag);
 	}
 

From 6143594db6ed7ff803f4305e5ca39b8c5f1c2f34 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 18 Jun 2013 10:24:36 -0500
Subject: [PATCH 173/352] [Android] Qualcomm glGetShaderInfoLog returns a max
 of 1024 bytes(tested) for the log, and glGetShaderiv with GL_INFO_LOG_LENGTH
 /always/ returns 0 on compile failure.

---
 Source/Core/VideoCommon/Src/DriverDetails.cpp          |  1 +
 Source/Core/VideoCommon/Src/DriverDetails.h            | 10 ++++++++++
 .../Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | 10 ++++------
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/DriverDetails.cpp b/Source/Core/VideoCommon/Src/DriverDetails.cpp
index 8d3c2d9cf7..51b5275a5f 100644
--- a/Source/Core/VideoCommon/Src/DriverDetails.cpp
+++ b/Source/Core/VideoCommon/Src/DriverDetails.cpp
@@ -28,6 +28,7 @@ namespace DriverDetails
 	BugInfo m_qualcommbugs[] = {
 		{BUG_NODYNUBOACCESS, 300, 14.0, -1.0},
 		{BUG_BROKENCENTROID, 300, 14.0, -1.0},
+		{BUG_BROKENINFOLOG, 300, -1.0, -1.0},
 	};
 
 	std::map<std::pair<Vendor, Bug>, BugInfo> m_bugs;
diff --git a/Source/Core/VideoCommon/Src/DriverDetails.h b/Source/Core/VideoCommon/Src/DriverDetails.h
index 524825f10b..c3bfc25ec5 100644
--- a/Source/Core/VideoCommon/Src/DriverDetails.h
+++ b/Source/Core/VideoCommon/Src/DriverDetails.h
@@ -42,6 +42,16 @@ namespace DriverDetails
 		// When MSAA is disabled, it acts like a regular in/out
 		// Tends to cause the driver to render full white or black
 		BUG_BROKENCENTROID,
+		// Bug: INFO_LOG_LENGTH broken
+		// Affected devices: Qualcomm/Adreno
+		// Started Version: ? (Noticed on v14)
+		// Ended Version: -1
+		// When compiling a shader, it is important that when it fails, 
+		// you first get the length of the information log prior to grabbing it.
+		// This allows you to allocate an array to store all of the log
+		// Adreno devices /always/ return 0 when querying GL_INFO_LOG_LENGTH
+		// They also max out at 1024 bytes(1023 characters + null terminator) for the log
+		BUG_BROKENINFOLOG,
 	};
 	
 	// Initializes our internal vendor, device family, and driver version	
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index c482c13900..c16cf69aae 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -335,15 +335,13 @@ GLuint ProgramShaderCache::CompileSingleShader (GLuint type, const char* code )
 	glGetShaderiv(result, GL_COMPILE_STATUS, &compileStatus);
 	GLsizei length = 0;
 	glGetShaderiv(result, GL_INFO_LOG_LENGTH, &length);
+
+	if (DriverDetails::HasBug(DriverDetails::BUG_BROKENINFOLOG))
+		length = 1024;
+
 	if (compileStatus != GL_TRUE || (length > 1 && DEBUG_GLSL))
 	{
 		GLsizei charsWritten;
-#ifdef USE_GLES3
-		// This is a bug in the Qualcomm OpenGL Driver
-		// The length returned is garbage length so we need to set a default max
-		// XXX: Check if qualcomm driver here
-		length = 1024; // Qualcomm driver maxes out at 512 bytes returned from glGetShaderInfoLog anyway
-#endif
 		GLchar* infoLog = new GLchar[length];
 		glGetShaderInfoLog(result, length, &charsWritten, infoLog);
 		ERROR_LOG(VIDEO, "PS Shader info log:\n%s", infoLog);

From c4eb659fecd72bbf900731c1cb8dd22297651b41 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Tue, 18 Jun 2013 14:49:22 +0200
Subject: [PATCH 174/352] BPMemory: Assign a more descriptive name to a field
 in the genmode register.

---
 Source/Core/VideoCommon/Src/BPMemory.h    | 2 +-
 Source/Core/VideoCommon/Src/BPStructs.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/BPMemory.h b/Source/Core/VideoCommon/Src/BPMemory.h
index 5254ba7bd7..90fffc6c6c 100644
--- a/Source/Core/VideoCommon/Src/BPMemory.h
+++ b/Source/Core/VideoCommon/Src/BPMemory.h
@@ -567,7 +567,7 @@ union GenMode
 	{
 		u32 numtexgens : 4;    //     0xF
 		u32 numcolchans : 5;   //   0x1E0
-		u32 ms_en : 1;         //   0x200
+		u32 multisampling : 1; //   0x200
 		u32 numtevstages : 4;  //  0x3C00
 		u32 cullmode : 2;      //  0xC000
 		u32 numindstages : 3;  // 0x30000
diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp
index 31f873acc6..ce0346b523 100644
--- a/Source/Core/VideoCommon/Src/BPStructs.cpp
+++ b/Source/Core/VideoCommon/Src/BPStructs.cpp
@@ -149,9 +149,9 @@ void BPWritten(const BPCmd& bp)
 	{
 	case BPMEM_GENMODE: // Set the Generation Mode
 		{
-			PRIM_LOG("genmode: texgen=%d, col=%d, ms_en=%d, tev=%d, cullmode=%d, ind=%d, zfeeze=%d",
+			PRIM_LOG("genmode: texgen=%d, col=%d, multisampling=%d, tev=%d, cullmode=%d, ind=%d, zfeeze=%d",
 			bpmem.genMode.numtexgens, bpmem.genMode.numcolchans,
-			bpmem.genMode.ms_en, bpmem.genMode.numtevstages+1, bpmem.genMode.cullmode,
+			bpmem.genMode.multisampling, bpmem.genMode.numtevstages+1, bpmem.genMode.cullmode,
 			bpmem.genMode.numindstages, bpmem.genMode.zfreeze);
 			SetGenerationMode();
 			break;

From 9c32c923bc7a88c9ee6d2036275383726b359d25 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 18 Jun 2013 12:42:14 -0500
Subject: [PATCH 175/352] Remove saturate function define in GLSL since we use
 clamp everywhere instead. Change the function defines over to just regular
 defines since Qualcomm can't handle function defines at all it seems.

---
 Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index c16cf69aae..1da28f9cc5 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -524,9 +524,8 @@ void ProgramShaderCache::CreateHeader ( void )
 		"#define float4 vec4\n"
 
 		// hlsl to glsl function translation
-		"#define frac(x) fract(x)\n"
-		"#define saturate(x) clamp(x, 0.0f, 1.0f)\n"
-		"#define lerp(x, y, z) mix(x, y, z)\n"
+		"#define frac fract\n"
+		"#define lerp mix\n"
 
 		// glsl 120 hack
 		"%s\n"

From 02cbcc8ec49676739315223b8d2b0867867f7352 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 18 Jun 2013 12:44:06 -0500
Subject: [PATCH 176/352] [Android] When running OpenGL ES 3 backend, we've got
 to switch the screen coordinates or bad things happen. Adds a Driver bug that
 causes swap every single flush. Hard requirement currently to see /anything/
 on screen.

---
 Source/Android/.idea/workspace.xml            | 322 ++++++++++--------
 Source/Android/res/values/prefvalues.xml      |   2 +-
 .../dolphinemu/DolphinEmulator.java           |   6 +-
 .../dolphinemu/dolphinemu/GameListView.java   |   2 -
 Source/Core/VideoCommon/Src/DriverDetails.cpp |   1 +
 Source/Core/VideoCommon/Src/DriverDetails.h   |  10 +
 .../Plugin_VideoOGL/Src/VertexManager.cpp     |   3 +
 7 files changed, 203 insertions(+), 143 deletions(-)

diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index dee70dcfd4..f21f574f72 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -54,6 +54,7 @@
     <disable_hints />
   </component>
   <component name="DebuggerManager">
+    <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
     <breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
       <breakpoint>
         <option name="NOTIFY_CAUGHT" value="true" />
@@ -90,7 +91,6 @@
         <option name="LOG_MESSAGE" value="" />
       </breakpoint>
     </breakpoint_any>
-    <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
     <breakpoint_rules />
     <ui_properties />
   </component>
@@ -103,21 +103,27 @@
       <file leaf-file-name="DolphinEmulator.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="171" column="88" selection-start="5001" selection-end="5001" vertical-scroll-proportion="0.0" vertical-offset="705" max-vertical-offset="2790">
+            <state line="26" column="26" selection-start="717" selection-end="717" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2850">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="GameListView.java" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="prefvalues.xml" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="14" column="25" selection-start="386" selection-end="386" vertical-scroll-proportion="0.53984576" vertical-offset="0" max-vertical-offset="405">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="GameListView.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="151" column="32" selection-start="5433" selection-end="5433" vertical-scroll-proportion="0.7396907" vertical-offset="1228" max-vertical-offset="2745">
+            <state line="162" column="72" selection-start="5647" selection-end="5647" vertical-scroll-proportion="0.0" vertical-offset="780" max-vertical-offset="2685">
               <folding>
                 <element signature="method#Fill#0;class#GameListView#0" expanded="false" />
-                <element signature="e#5708#5722#0" expanded="true" />
-                <element signature="e#6166#7251#0" expanded="true" />
-                <element signature="e#7244#7245#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -126,7 +132,7 @@
       <file leaf-file-name="NativeLibrary.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeLibrary.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="11" column="56" selection-start="291" selection-end="291" vertical-scroll-proportion="0.0" vertical-offset="6" max-vertical-offset="615">
+            <state line="11" column="56" selection-start="291" selection-end="291" vertical-scroll-proportion="0.0" vertical-offset="150" max-vertical-offset="630">
               <folding />
             </state>
           </provider>
@@ -135,10 +141,8 @@
       <file leaf-file-name="InputConfigActivity.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="141" column="0" selection-start="4851" selection-end="4851" vertical-scroll-proportion="0.0" vertical-offset="1562" max-vertical-offset="2610">
-              <folding>
-                <element signature="e#3481#3488#0" expanded="true" />
-              </folding>
+            <state line="141" column="0" selection-start="4851" selection-end="4851" vertical-scroll-proportion="0.0" vertical-offset="2100" max-vertical-offset="2805">
+              <folding />
             </state>
           </provider>
         </entry>
@@ -167,7 +171,6 @@
     <option name="changedFiles">
       <list>
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java" />
-        <option value="$PROJECT_DIR$/res/values/prefvalues.xml" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigView.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfig.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java" />
@@ -179,9 +182,10 @@
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigItem.java" />
         <option value="$PROJECT_DIR$/assets/GCPadNew.ini" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeLibrary.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
+        <option value="$PROJECT_DIR$/res/values/prefvalues.xml" />
       </list>
     </option>
   </component>
@@ -235,49 +239,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scope">
-        <subPane subId="Project Files">
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="assets">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -316,46 +277,119 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
+      <pane id="Scope">
+        <subPane subId="Project Files">
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="res">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="values">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="res">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="assets">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="recentsLimit" value="5" />
-    <property name="options.splitter.main.proportions" value="0.3" />
-    <property name="AndroidRunProguardForReleaseBuild" value="false" />
-    <property name="dynamic.classpath" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="MemberChooser.sorted" value="false" />
     <property name="GoToClass.includeLibraries" value="false" />
-    <property name="ExportedModule" value="Android" />
-    <property name="options.searchVisible" value="true" />
-    <property name="FullScreen" value="false" />
     <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="ExportedApkPath" value="$USER_HOME$/Desktop/DolphinEmu-Pre0.6-Android2.3.apk" />
     <property name="options.lastSelected" value="android.dex.compiler" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="192.168.0.188:5555" />
-    <property name="restartRequiresConfirmation" value="true" />
-    <property name="last_opened_file_path" value="$USER_HOME$/my-release-key.keystore" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
+    <property name="GoToFile.includeJavaFiles" value="false" />
+    <property name="MemberChooser.copyJavadoc" value="false" />
     <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="last_opened_file_path" value="$USER_HOME$/my-release-key.keystore" />
+    <property name="AndroidRunProguardForReleaseBuild" value="false" />
+    <property name="MemberChooser.sorted" value="false" />
+    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="192.168.0.188:5555" />
+    <property name="ExportedModule" value="Android" />
+    <property name="ExportedApkPath" value="$USER_HOME$/Desktop/DolphinEmu-Pre0.6-Android2.3.apk" />
+    <property name="FullScreen" value="false" />
+    <property name="options.searchVisible" value="true" />
+    <property name="options.splitter.main.proportions" value="0.3" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
+    <property name="dynamic.classpath" value="false" />
+    <property name="restartRequiresConfirmation" value="true" />
   </component>
   <component name="RunManager" selected="Android Application.Dolphin Emulator">
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
+    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
-      <option name="TESTING_TYPE" value="0" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="PACKAGE_NAME" value="" />
+      <option name="ACTIVITY_CLASS" value="" />
+      <option name="MODE" value="default_activity" />
+      <option name="DEPLOY" value="true" />
       <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
       <option name="PREFERRED_AVD" value="" />
       <option name="USE_COMMAND_LINE" value="true" />
@@ -380,6 +414,20 @@
       <option name="ALTERNATIVE_JRE_PATH" />
       <method />
     </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+      <method />
+    </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
       <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -400,11 +448,13 @@
       <patterns />
       <method />
     </configuration>
-    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
+    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
       <module name="" />
-      <option name="ACTIVITY_CLASS" value="" />
-      <option name="MODE" value="default_activity" />
-      <option name="DEPLOY" value="true" />
+      <option name="TESTING_TYPE" value="0" />
+      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
+      <option name="METHOD_NAME" value="" />
+      <option name="CLASS_NAME" value="" />
+      <option name="PACKAGE_NAME" value="" />
       <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
       <option name="PREFERRED_AVD" value="" />
       <option name="USE_COMMAND_LINE" value="true" />
@@ -416,18 +466,12 @@
       <option name="CLEAR_LOGCAT" value="false" />
       <method />
     </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
       <method />
     </configuration>
     <configuration default="false" name="Dolphin Emulator" type="AndroidRunConfigurationType" factoryName="Android Application">
@@ -534,30 +578,30 @@
     <frame x="24" y="0" width="1342" height="744" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6912752" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.30536914" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2179289" sideWeight="0.69630873" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2179289" sideWeight="0.69463086" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6912752" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30536914" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2179289" sideWeight="0.29026845" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.30536914" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30369127" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="VcsContentAnnotationSettings">
@@ -674,9 +718,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/assets/GCPadNew.ini">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="3" column="20" selection-start="81" selection-end="81" vertical-scroll-proportion="0.11597938" vertical-offset="0" max-vertical-offset="525">
-          <folding />
-        </state>
+        <state line="3" column="20" selection-start="81" selection-end="81" vertical-scroll-proportion="0.11597938" vertical-offset="0" max-vertical-offset="525" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigItem.java">
@@ -696,31 +738,33 @@
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="141" column="0" selection-start="4851" selection-end="4851" vertical-scroll-proportion="0.0" vertical-offset="1562" max-vertical-offset="2610">
-          <folding>
-            <element signature="e#3481#3488#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="171" column="88" selection-start="5001" selection-end="5001" vertical-scroll-proportion="0.0" vertical-offset="2280" max-vertical-offset="2790">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="151" column="32" selection-start="5433" selection-end="5433" vertical-scroll-proportion="0.7396907" vertical-offset="1228" max-vertical-offset="2745">
+        <state line="162" column="72" selection-start="5647" selection-end="5647" vertical-scroll-proportion="0.0" vertical-offset="780" max-vertical-offset="2685">
           <folding>
             <element signature="method#Fill#0;class#GameListView#0" expanded="false" />
-            <element signature="e#5708#5722#0" expanded="true" />
-            <element signature="e#6166#7251#0" expanded="true" />
-            <element signature="e#7244#7245#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="26" column="26" selection-start="717" selection-end="717" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2850">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="14" column="25" selection-start="386" selection-end="386" vertical-scroll-proportion="0.53984576" vertical-offset="0" max-vertical-offset="405">
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
 
diff --git a/Source/Android/res/values/prefvalues.xml b/Source/Android/res/values/prefvalues.xml
index 77354f76a4..3ba1f1a09a 100644
--- a/Source/Android/res/values/prefvalues.xml
+++ b/Source/Android/res/values/prefvalues.xml
@@ -12,7 +12,7 @@
 
     <string-array name="gpuOptions">
         <item>Software Renderer</item>
-        <item>OpenGL</item>
+        <item>OpenGL ES 3</item>
     </string-array>
 
     <string-array name="gpuValues">
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index d8432b7e22..3c11ed76c6 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -129,7 +129,11 @@ public class DolphinEmulator<MainActivity> extends Activity
 			String FileName = data.getStringExtra("Select");
 			GLview = new NativeGLSurfaceView(this);
 			this.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-			GLview.SetDimensions(screenWidth, screenHeight);
+			String backend = NativeLibrary.GetConfig("Dolphin.ini", "Core", "GFXBackend", "OGL");
+			if (backend.equals("OGL"))
+				GLview.SetDimensions(screenHeight, screenWidth);
+			else
+				GLview.SetDimensions(screenWidth, screenHeight);
 			GLview.SetFileName(FileName);
 			setContentView(GLview);
 			Running = true;
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
index ac1329f6a9..4a88977a5b 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
@@ -161,8 +161,6 @@ public class GameListView extends ListActivity {
 		me = this;
 		 
 		mDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT);
-		 
-		
 		Fill();
 		 
 		List<SideMenuItem>dir = new ArrayList<SideMenuItem>();
diff --git a/Source/Core/VideoCommon/Src/DriverDetails.cpp b/Source/Core/VideoCommon/Src/DriverDetails.cpp
index 51b5275a5f..41f22be55c 100644
--- a/Source/Core/VideoCommon/Src/DriverDetails.cpp
+++ b/Source/Core/VideoCommon/Src/DriverDetails.cpp
@@ -29,6 +29,7 @@ namespace DriverDetails
 		{BUG_NODYNUBOACCESS, 300, 14.0, -1.0},
 		{BUG_BROKENCENTROID, 300, 14.0, -1.0},
 		{BUG_BROKENINFOLOG, 300, -1.0, -1.0},
+		{BUG_BROKENBUFFERS, 300, 14.0, -1.0},
 	};
 
 	std::map<std::pair<Vendor, Bug>, BugInfo> m_bugs;
diff --git a/Source/Core/VideoCommon/Src/DriverDetails.h b/Source/Core/VideoCommon/Src/DriverDetails.h
index c3bfc25ec5..bf831e29b9 100644
--- a/Source/Core/VideoCommon/Src/DriverDetails.h
+++ b/Source/Core/VideoCommon/Src/DriverDetails.h
@@ -52,6 +52,16 @@ namespace DriverDetails
 		// Adreno devices /always/ return 0 when querying GL_INFO_LOG_LENGTH
 		// They also max out at 1024 bytes(1023 characters + null terminator) for the log
 		BUG_BROKENINFOLOG,
+		// Bug: Uploading data with rendering causes issues
+		// Affected devices: Qualcomm/Adreno
+		// Started Version: 14
+		// Ended Version: -1
+		// When drawing our elements, the instruction buffer on Adreno devices
+		// becomes too long, causing the device to quickly run out of RAM
+		// I've watched the kernel module go up to ~700MB of RAM in a few seconds
+		// The "workaround" is calling swapbuffers every single time we flush
+		// This causes flickering, but it is the only known way to work around it
+		BUG_BROKENBUFFERS,
 	};
 	
 	// Initializes our internal vendor, device family, and driver version	
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
index 2f34723e58..eafe16736c 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
@@ -9,6 +9,7 @@
 
 #include "Fifo.h"
 
+#include "DriverDetails.h"
 #include "VideoConfig.h"
 #include "Statistics.h"
 #include "MemoryUtil.h"
@@ -267,6 +268,8 @@ void VertexManager::vFlush()
 
 	g_perf_query->EnableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
 	Draw(stride);
+	if (DriverDetails::HasBug(DriverDetails::BUG_BROKENBUFFERS))
+		GLInterface->Swap();
 	g_perf_query->DisableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
 	//ERROR_LOG(VIDEO, "PerfQuery result: %d", g_perf_query->GetQueryResult(bpmem.zcontrol.early_ztest ? PQ_ZCOMP_OUTPUT_ZCOMPLOC : PQ_ZCOMP_OUTPUT));
 

From fb310f224760b4b1920f35e6860513fa8c60026c Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Wed, 19 Jun 2013 09:17:33 +0200
Subject: [PATCH 177/352] Revert "Create our OGL context on the same thread in
 the OpenGL backend. Same issue with Qualcomm not working with threading
 correctly."

This reverts commit 2697b8c04f9e7c8d0a40bd42db95b4a534947c43.

The context creation may be moved to Video_Prepare, but the window creation isn't allowed to.
Eg we set the window title or read the mouse position, both need the window.
Also the readback of the window size didn't worked any more.
---
 Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp |  5 +---
 Source/Plugins/Plugin_VideoOGL/Src/main.cpp   | 23 ++++++++-----------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
index 7323f7f3e5..d7a891ecd1 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
@@ -24,10 +24,7 @@ namespace OGL
 // Draw messages on top of the screen
 unsigned int VideoBackend::PeekMessages()
 {
-	if (GLInterface)
-		return GLInterface->PeekMessages();
-	else 
-		return 0;
+	return GLInterface->PeekMessages();
 }
 
 // Show the current FPS
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
index 596a4cd86d..6d71994cf4 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
@@ -89,7 +89,6 @@ Make AA apply instantly during gameplay if possible
 
 namespace OGL
 {
-static void* m_windowhandle; 
 
 std::string VideoBackend::GetName()
 {
@@ -150,12 +149,12 @@ void VideoBackend::ShowConfig(void *_hParent)
 	diag.ShowModal();
 #endif
 }
+
 bool VideoBackend::Initialize(void *&window_handle)
 {
 	InitializeShared();
 	InitBackendInfo();
-	
-	m_windowhandle = window_handle;
+
 	frameCount = 0;
 
 	g_Config.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_opengl.ini").c_str());
@@ -164,7 +163,13 @@ bool VideoBackend::Initialize(void *&window_handle)
 	g_Config.VerifyValidity();
 	UpdateActiveConfig();
 
-	
+	InitInterface();
+	if (!GLInterface->Create(window_handle))
+		return false;
+
+	// Do our OSD callbacks	
+	OSD::DoCallbacks(OSD::OSD_INIT);
+
 	s_BackendInitialized = true;
 
 	return true;
@@ -174,16 +179,6 @@ bool VideoBackend::Initialize(void *&window_handle)
 // Run from the graphics thread
 void VideoBackend::Video_Prepare()
 {
-	InitInterface();
-	if (!GLInterface->Create(m_windowhandle))
-	{
-		INFO_LOG(VIDEO, "%s", "GLInterface::Create failed\n");
-		return;
-	}
-
-	// Do our OSD callbacks	
-	OSD::DoCallbacks(OSD::OSD_INIT);
-
 	GLInterface->MakeCurrent();
 
 	g_renderer = new Renderer;

From 010165b2c2ecb4e712ef3e2a601adba4001af8dc Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Thu, 20 Jun 2013 10:43:09 +0200
Subject: [PATCH 178/352] fix gcc warning, probably also the logic

comparing two char pointers doesn't compare the strings
---
 Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp b/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp
index 74015bd274..03c140b992 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp
+++ b/Source/Core/DolphinWX/Src/InputConfigDiagBitmaps.cpp
@@ -107,12 +107,12 @@ void InputConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
 							, d_of = box / 256.0
 							, x_of = box / 2.0;
 
-						if ((*g)->control_group->name == "Main Stick")
+						if (strcmp((*g)->control_group->name, "Main Stick") == 0)
 						{
 							max = (87.0 / 127.0) * 100;
 							diagonal = (55.0 / 127.0) * 100.0;
 						}
-						else if ((*g)->control_group->name == "C-Stick")
+						else if (strcmp((*g)->control_group->name,"C-Stick") == 0)
 						{
 							max = (74.0 / 127.0) * 100;
 							diagonal = (46.0 / 127.0) * 100;

From 716f656d286d24f32eca5316f6c9ea83c3455bb5 Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Thu, 20 Jun 2013 06:08:17 -0400
Subject: [PATCH 179/352] Save sync gpu setting to dtm header.

---
 Source/Core/Core/Src/BootManager.cpp | 1 +
 Source/Core/Core/Src/Movie.cpp       | 9 ++++++++-
 Source/Core/Core/Src/Movie.h         | 4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp
index e4ce413926..9e79de0d23 100644
--- a/Source/Core/Core/Src/BootManager.cpp
+++ b/Source/Core/Core/Src/BootManager.cpp
@@ -126,6 +126,7 @@ bool BootCore(const std::string& _rFilename)
 		StartUp.bProgressive = Movie::IsProgressive();
 		StartUp.bFastDiscSpeed = Movie::IsFastDiscSpeed();
 		StartUp.iCPUCore = Movie::GetCPUMode();
+		StartUp.bSyncGPU = Movie::IsSyncGPU();
 		if (Movie::IsUsingMemcard() && Movie::IsStartingFromClearSave() && !StartUp.bWii)
 		{
 			if (File::Exists("Movie.raw"))
diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp
index 5a81c7d904..df5be29fa0 100644
--- a/Source/Core/Core/Src/Movie.cpp
+++ b/Source/Core/Core/Src/Movie.cpp
@@ -51,7 +51,7 @@ u64 g_currentLagCount = 0, g_totalLagCount = 0; // just stats
 u64 g_currentInputCount = 0, g_totalInputCount = 0; // just stats
 u64 g_recordingStartTime; // seconds since 1970 that recording started
 bool bSaveConfig, bSkipIdle, bDualCore, bProgressive, bDSPHLE, bFastDiscSpeed = false;
-bool bMemcard, g_bClearSave = false;
+bool bMemcard, g_bClearSave, bSyncGPU = false;
 std::string videoBackend = "unknown";
 int iCPUCore = 1;
 bool g_bDiscChange = false;
@@ -353,6 +353,10 @@ bool IsUsingMemcard()
 {
 	return bMemcard;
 }
+bool IsSyncGPU()
+{
+	return bSyncGPU;
+}
 
 void ChangePads(bool instantly)
 {
@@ -675,6 +679,7 @@ void ReadHeader()
 		g_bClearSave = tmpHeader.bClearSave;
 		bMemcard = tmpHeader.bMemcard;
 		bongos = tmpHeader.bongos;
+		bSyncGPU = tmpHeader.bSyncGPU;
 		memcpy(revision, tmpHeader.revision, ARRAYSIZE(revision));
 	}
 	else
@@ -1111,6 +1116,7 @@ void SaveRecording(const char *filename)
 	header.bUseRealXFB = g_ActiveConfig.bUseRealXFB;
 	header.bMemcard = bMemcard;
 	header.bClearSave = g_bClearSave;
+	header.bSyncGPU = bSyncGPU;
 	strncpy((char *)header.discChange, g_discChange.c_str(),ARRAYSIZE(header.discChange));
 	strncpy((char *)header.author, author.c_str(),ARRAYSIZE(header.author));
 	memcpy(header.md5,MD5,16);
@@ -1169,6 +1175,7 @@ void GetSettings()
 	bDSPHLE = SConfig::GetInstance().m_LocalCoreStartupParameter.bDSPHLE;
 	bFastDiscSpeed = SConfig::GetInstance().m_LocalCoreStartupParameter.bFastDiscSpeed;
 	videoBackend = g_video_backend->GetName();
+	bSyncGPU = SConfig::GetInstance().m_LocalCoreStartupParameter.bSyncGPU;
 	iCPUCore = SConfig::GetInstance().m_LocalCoreStartupParameter.iCPUCore;
 	if (!Core::g_CoreStartupParameter.bWii)
 		g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA);
diff --git a/Source/Core/Core/Src/Movie.h b/Source/Core/Core/Src/Movie.h
index a29b47ae79..27ac18e1b6 100644
--- a/Source/Core/Core/Src/Movie.h
+++ b/Source/Core/Core/Src/Movie.h
@@ -106,7 +106,8 @@ struct DTMHeader {
 	bool bMemcard;
 	bool bClearSave;		// Create a new memory card when playing back a movie if true
 	u8 bongos;
-	u8 reserved[15];		// Padding for any new config options
+	bool bSyncGPU;
+	u8 reserved[14];		// Padding for any new config options
 	u8 discChange[40];		// Name of iso file to switch to, for two disc games.
 	u8 revision[20];		// Git hash
 	u8 reserved2[27];		// Make heading 256 bytes, just because we can
@@ -138,6 +139,7 @@ bool IsFastDiscSpeed();
 int GetCPUMode();
 bool IsStartingFromClearSave();
 bool IsUsingMemcard();
+bool IsSyncGPU();
 void SetGraphicsConfig();
 void GetSettings();
 

From 266236d6a436b570ad9606730818ac77d1ed6c86 Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Fri, 21 Jun 2013 01:53:50 -0400
Subject: [PATCH 180/352] When loading a save state in read only that
 mismatches the current movie, load the input prior to the save state from the
 save state's movie, instead of using the current movie's input up to that
 point.

This prevents desyncing before the save state.
---
 Source/Core/Core/Src/Movie.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp
index df5be29fa0..0e31be380f 100644
--- a/Source/Core/Core/Src/Movie.cpp
+++ b/Source/Core/Core/Src/Movie.cpp
@@ -850,6 +850,7 @@ void LoadInput(const char *filename)
 					{ 
 						// TODO: more detail
 						PanicAlertT("Warning: You loaded a save whose movie mismatches on byte %d (0x%X). You should load another save before continuing, or load this state with read-only mode off. Otherwise you'll probably get a desync.", i+256, i+256);
+						memcpy(tmpInput, movInput, g_currentByte);
 					}
 					else
 					{
@@ -871,6 +872,8 @@ void LoadInput(const char *filename)
 							(int)curPadState.Start, (int)curPadState.A, (int)curPadState.B, (int)curPadState.X, (int)curPadState.Y, (int)curPadState.Z, (int)curPadState.DPadUp, (int)curPadState.DPadDown, (int)curPadState.DPadLeft, (int)curPadState.DPadRight, (int)curPadState.L, (int)curPadState.R, (int)curPadState.TriggerL, (int)curPadState.TriggerR, (int)curPadState.AnalogStickX, (int)curPadState.AnalogStickY, (int)curPadState.CStickX, (int)curPadState.CStickY,
 							(int)frame,
 							(int)movPadState.Start, (int)movPadState.A, (int)movPadState.B, (int)movPadState.X, (int)movPadState.Y, (int)movPadState.Z, (int)movPadState.DPadUp, (int)movPadState.DPadDown, (int)movPadState.DPadLeft, (int)movPadState.DPadRight, (int)movPadState.L, (int)movPadState.R, (int)movPadState.TriggerL, (int)movPadState.TriggerR, (int)movPadState.AnalogStickX, (int)movPadState.AnalogStickY, (int)movPadState.CStickX, (int)movPadState.CStickY);
+
+						memcpy(tmpInput, movInput, g_currentByte);
 					}
 					break;
 				}

From 15943de3135dbc23fc337d00ae67d51d8fd389f3 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Sat, 22 Jun 2013 12:22:16 +0200
Subject: [PATCH 181/352] Revert "Added optimizations to ClassifyFloat/Double
 functions in Mathutil.cpp and to PPCCache.cpp"

This reverts commit 7aae9ccbc0494cd468a37413d7199061bd1981d2.

Reasons:
- no test results have been provided to prove the usefulness of the patch
- broken coding style
- the author hasn't replied to any criticism
---
 Source/Core/Common/Src/MathUtil.cpp       | 89 ++++++++++++-----------
 Source/Core/Core/Src/PowerPC/PPCCache.cpp | 48 ++++++------
 2 files changed, 73 insertions(+), 64 deletions(-)

diff --git a/Source/Core/Common/Src/MathUtil.cpp b/Source/Core/Common/Src/MathUtil.cpp
index fc79a54ef0..0e90328ee0 100644
--- a/Source/Core/Common/Src/MathUtil.cpp
+++ b/Source/Core/Common/Src/MathUtil.cpp
@@ -13,54 +13,61 @@ namespace MathUtil
 {
 
 u32 ClassifyDouble(double dvalue)
-    {
-        // TODO: Optimize the below to be as fast as possible.
-        u64 exp  = *(u64*)(&dvalue) & DOUBLE_EXP;
-        if (exp != DOUBLE_ZERO && exp != DOUBLE_EXP)
-        {
-            // Nice normalized number.
-            return *(u64*)(&dvalue)&DOUBLE_SIGN ? PPC_FPCLASS_NN : PPC_FPCLASS_PN;
-        }
-        else
-        {
-            if (*(u64*)(&dvalue) & DOUBLE_FRAC)
-            {
-                if (exp)
-                {
-                    return PPC_FPCLASS_QNAN;
-                }
-                else
-                {
-                    // Denormalized number.
-                    return *(u64*)(&dvalue)&DOUBLE_SIGN ? PPC_FPCLASS_ND : PPC_FPCLASS_PD;
-                }
-            }
-            else if (exp)
-            {
-                //Infinite
-                return *(u64*)(&dvalue)&DOUBLE_SIGN ? PPC_FPCLASS_NINF : PPC_FPCLASS_PINF;
-            }
-            else
-            {
-                //Zero
-                return *(u64*)(&dvalue)&DOUBLE_SIGN ? PPC_FPCLASS_NZ : PPC_FPCLASS_PZ;
-            }
-        }
-    }
-
+{
+	// TODO: Optimize the below to be as fast as possible.
+	IntDouble value;
+	value.d = dvalue;
+	u64 sign = value.i & DOUBLE_SIGN;
+	u64 exp  = value.i & DOUBLE_EXP;
+	if (exp > DOUBLE_ZERO && exp < DOUBLE_EXP) 
+	{
+		// Nice normalized number.
+		return sign ? PPC_FPCLASS_NN : PPC_FPCLASS_PN;
+	}
+	else
+	{
+		u64 mantissa = value.i & DOUBLE_FRAC;
+		if (mantissa)
+		{
+			if (exp)
+			{
+				return PPC_FPCLASS_QNAN;
+			}
+			else
+			{
+				// Denormalized number.
+				return sign ? PPC_FPCLASS_ND : PPC_FPCLASS_PD;
+			}
+		}
+		else if (exp)
+		{
+			//Infinite
+			return sign ? PPC_FPCLASS_NINF : PPC_FPCLASS_PINF;
+		}
+		else
+		{
+			//Zero
+			return sign ? PPC_FPCLASS_NZ : PPC_FPCLASS_PZ;
+		}
+	}
+}
 
 u32 ClassifyFloat(float fvalue)
 {
 	// TODO: Optimize the below to be as fast as possible.
-	u32 exp  = *(u32*)(&fvalue) & FLOAT_EXP;
+	IntFloat value;
+	value.f = fvalue;
+	u32 sign = value.i & FLOAT_SIGN;
+	u32 exp  = value.i & FLOAT_EXP;
 	if (exp > FLOAT_ZERO && exp < FLOAT_EXP) 
 	{
 		// Nice normalized number.
-		return *(u32*)(&fvalue) & FLOAT_SIGN ? PPC_FPCLASS_NN : PPC_FPCLASS_PN;
+		return sign ? PPC_FPCLASS_NN : PPC_FPCLASS_PN;
 	}
 	else
 	{
-		if (*(u32*)(&fvalue) & FLOAT_FRAC)
+		u32 mantissa = value.i & FLOAT_FRAC;
+		if (mantissa)
 		{
 			if (exp)
 			{
@@ -69,18 +76,18 @@ u32 ClassifyFloat(float fvalue)
 			else
 			{
 				// Denormalized number.
-				return *(u32*)(&fvalue) & FLOAT_SIGN ? PPC_FPCLASS_ND : PPC_FPCLASS_PD;
+				return sign ? PPC_FPCLASS_ND : PPC_FPCLASS_PD;
 			}
 		} 
 		else if (exp) 
 		{
 			// Infinite
-			return *(u32*)(&fvalue) & FLOAT_SIGN ? PPC_FPCLASS_NINF : PPC_FPCLASS_PINF;
+			return sign ? PPC_FPCLASS_NINF : PPC_FPCLASS_PINF;
 		} 
 		else 
 		{
 			//Zero
-			return *(u32*)(&fvalue) & FLOAT_SIGN ? PPC_FPCLASS_NZ : PPC_FPCLASS_PZ;
+			return sign ? PPC_FPCLASS_NZ : PPC_FPCLASS_PZ;
 		}
 	}
 }
diff --git a/Source/Core/Core/Src/PowerPC/PPCCache.cpp b/Source/Core/Core/Src/PowerPC/PPCCache.cpp
index e1940ec18c..4ead232b18 100644
--- a/Source/Core/Core/Src/PowerPC/PPCCache.cpp
+++ b/Source/Core/Core/Src/PowerPC/PPCCache.cpp
@@ -26,29 +26,31 @@ namespace PowerPC
 
 		for (u32 m = 0; m < 128; m++)
 		{
-            u32 w;
-            if(m & (1<<0))
-                if(m & (1<<2))
-                    if(m & (1<<6))
-                        w=7;
-                    else
-                        w=6;
-                    else
-                        if(m & (1<<5))
-                            w=5;
-                        else
-                            w=4;
-                        else
-                            if(m & (1<<1))
-                                if(m & (1<<4))
-                                    w=3;
-                                else
-                                    w=2;
-                                else
-                                    if(m & (1<<3))
-                                        w=1;
-                                    else
-                                        w=0;
+			u32 b[7];
+			for (int i = 0; i < 7; i++) b[i] = m & (1<<i);
+			u32 w;
+			if (b[0])
+				if (b[2])
+					if (b[6])
+						w = 7;
+					else
+						w = 6;
+				else
+					if (b[5])
+						w = 5;
+					else
+						w = 4;
+			else
+				if (b[1])
+					if (b[4])
+						w = 3;
+					else
+						w = 2;
+				else
+					if (b[3])
+						w = 1;
+					else
+						w = 0;
 			way_from_plru[m] = w;
 		}
 	}

From 2b9f79dff32b16c5f61dcf4da643cca67c599833 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sat, 22 Jun 2013 07:45:05 -0500
Subject: [PATCH 182/352] [Android] Remove SimonVT menudrawer library. Move to
 Google's support library for their navigation drawer support. Overall
 cleanup.

---
 Externals/android-menudrawer/.gitignore       |   30 -
 Externals/android-menudrawer/.travis.yml      |   18 -
 Externals/android-menudrawer/CHANGELOG.md     |   44 -
 Externals/android-menudrawer/LICENSE          |  202 ---
 Externals/android-menudrawer/README.md        |   96 --
 .../android-menudrawer/art/menu_arrow.svg     |   84 --
 Externals/android-menudrawer/checkstyle.xml   |  120 --
 .../library/AndroidManifest.xml               |    8 -
 .../android-menudrawer/library/build.xml      |   92 --
 Externals/android-menudrawer/library/pom.xml  |   36 -
 .../library/project.properties                |   16 -
 .../library/res/values/attrs.xml              |   43 -
 .../library/res/values/colors.xml             |    6 -
 .../library/res/values/ids.xml                |   20 -
 .../library/res/values/styles.xml             |   11 -
 .../net/simonvt/menudrawer/BottomDrawer.java  |  226 ----
 .../menudrawer/BottomStaticDrawer.java        |   85 --
 .../menudrawer/BuildLayerFrameLayout.java     |   99 --
 .../net/simonvt/menudrawer/ColorDrawable.java |  170 ---
 .../simonvt/menudrawer/DraggableDrawer.java   |  672 ----------
 .../net/simonvt/menudrawer/FloatScroller.java |  175 ---
 .../simonvt/menudrawer/HorizontalDrawer.java  |  207 ---
 .../net/simonvt/menudrawer/LeftDrawer.java    |  212 ---
 .../simonvt/menudrawer/LeftStaticDrawer.java  |   80 --
 .../net/simonvt/menudrawer/MenuDrawer.java    | 1151 -----------------
 .../menudrawer/NoClickThroughFrameLayout.java |   28 -
 .../simonvt/menudrawer/PeekInterpolator.java  |   28 -
 .../src/net/simonvt/menudrawer/Position.java  |   18 -
 .../net/simonvt/menudrawer/RightDrawer.java   |  234 ----
 .../simonvt/menudrawer/RightStaticDrawer.java |   87 --
 .../src/net/simonvt/menudrawer/Scroller.java  |  505 --------
 .../menudrawer/SinusoidalInterpolator.java    |   15 -
 .../menudrawer/SmoothInterpolator.java        |   12 -
 .../net/simonvt/menudrawer/StaticDrawer.java  |  208 ---
 .../src/net/simonvt/menudrawer/TopDrawer.java |  216 ----
 .../simonvt/menudrawer/TopStaticDrawer.java   |   82 --
 .../simonvt/menudrawer/VerticalDrawer.java    |  216 ----
 Externals/android-menudrawer/pom.xml          |  126 --
 .../samples/AndroidManifest.xml               |   48 -
 .../android-menudrawer/samples/build.xml      |   92 --
 .../samples/libs/android-support-v4-r10.jar   |  Bin 349252 -> 0 bytes
 Externals/android-menudrawer/samples/pom.xml  |   47 -
 .../samples/project.properties                |   15 -
 .../res/drawable-hdpi-v14/menu_arrow.png      |  Bin 1568 -> 0 bytes
 .../drawable-hdpi-v14/menu_arrow_bottom.png   |  Bin 1540 -> 0 bytes
 .../drawable-hdpi-v14/menu_arrow_right.png    |  Bin 1520 -> 0 bytes
 .../res/drawable-hdpi-v14/menu_arrow_top.png  |  Bin 1529 -> 0 bytes
 .../drawable-hdpi/ic_action_refresh_dark.png  |  Bin 3138 -> 0 bytes
 .../ic_action_select_all_dark.png             |  Bin 2861 -> 0 bytes
 .../samples/res/drawable-hdpi/ic_launcher.png |  Bin 9397 -> 0 bytes
 ...ic_menu_moreoverflow_normal_holo_light.png |  Bin 148 -> 0 bytes
 .../md__category_background.9.png             |  Bin 173 -> 0 bytes
 .../drawable-hdpi/md__list_focused_holo.9.png |  Bin 191 -> 0 bytes
 .../md__list_longpressed_holo.9.png           |  Bin 154 -> 0 bytes
 .../md__list_pressed_holo_dark.9.png          |  Bin 159 -> 0 bytes
 ...md__list_selector_disabled_holo_dark.9.png |  Bin 189 -> 0 bytes
 .../samples/res/drawable-hdpi/menu_arrow.png  |  Bin 1578 -> 0 bytes
 .../res/drawable-hdpi/menu_arrow_bottom.png   |  Bin 1508 -> 0 bytes
 .../res/drawable-hdpi/menu_arrow_right.png    |  Bin 1524 -> 0 bytes
 .../res/drawable-hdpi/menu_arrow_top.png      |  Bin 1483 -> 0 bytes
 .../res/drawable-mdpi-v14/menu_arrow.png      |  Bin 891 -> 0 bytes
 .../drawable-mdpi-v14/menu_arrow_bottom.png   |  Bin 904 -> 0 bytes
 .../drawable-mdpi-v14/menu_arrow_right.png    |  Bin 862 -> 0 bytes
 .../res/drawable-mdpi-v14/menu_arrow_top.png  |  Bin 878 -> 0 bytes
 .../drawable-mdpi/ic_action_refresh_dark.png  |  Bin 3033 -> 0 bytes
 .../samples/res/drawable-mdpi/ic_launcher.png |  Bin 5237 -> 0 bytes
 ...ic_menu_moreoverflow_normal_holo_light.png |  Bin 131 -> 0 bytes
 .../md__category_background.9.png             |  Bin 165 -> 0 bytes
 .../drawable-mdpi/md__list_focused_holo.9.png |  Bin 171 -> 0 bytes
 .../md__list_longpressed_holo.9.png           |  Bin 151 -> 0 bytes
 .../md__list_pressed_holo_dark.9.png          |  Bin 158 -> 0 bytes
 ...md__list_selector_disabled_holo_dark.9.png |  Bin 172 -> 0 bytes
 .../samples/res/drawable-mdpi/menu_arrow.png  |  Bin 869 -> 0 bytes
 .../res/drawable-mdpi/menu_arrow_bottom.png   |  Bin 887 -> 0 bytes
 .../res/drawable-mdpi/menu_arrow_right.png    |  Bin 855 -> 0 bytes
 .../res/drawable-mdpi/menu_arrow_top.png      |  Bin 835 -> 0 bytes
 .../res/drawable-xhdpi-v14/menu_arrow.png     |  Bin 1735 -> 0 bytes
 .../drawable-xhdpi-v14/menu_arrow_bottom.png  |  Bin 1650 -> 0 bytes
 .../drawable-xhdpi-v14/menu_arrow_right.png   |  Bin 1669 -> 0 bytes
 .../res/drawable-xhdpi-v14/menu_arrow_top.png |  Bin 1654 -> 0 bytes
 .../drawable-xhdpi/ic_action_refresh_dark.png |  Bin 3219 -> 0 bytes
 .../ic_action_select_all_dark.png             |  Bin 2856 -> 0 bytes
 .../res/drawable-xhdpi/ic_launcher.png        |  Bin 14383 -> 0 bytes
 ...ic_menu_moreoverflow_normal_holo_light.png |  Bin 184 -> 0 bytes
 .../md__category_background.9.png             |  Bin 179 -> 0 bytes
 .../md__list_focused_holo.9.png               |  Bin 203 -> 0 bytes
 .../md__list_longpressed_holo.9.png           |  Bin 158 -> 0 bytes
 .../md__list_pressed_holo_dark.9.png          |  Bin 163 -> 0 bytes
 ...md__list_selector_disabled_holo_dark.9.png |  Bin 190 -> 0 bytes
 .../samples/res/drawable-xhdpi/menu_arrow.png |  Bin 1723 -> 0 bytes
 .../res/drawable-xhdpi/menu_arrow_bottom.png  |  Bin 1592 -> 0 bytes
 .../res/drawable-xhdpi/menu_arrow_right.png   |  Bin 1694 -> 0 bytes
 .../res/drawable-xhdpi/menu_arrow_top.png     |  Bin 1581 -> 0 bytes
 ...lector_background_transition_holo_dark.xml |   20 -
 .../drawable/md__list_selector_holo_dark.xml  |   27 -
 .../res/layout/activity_bottommenu.xml        |   21 -
 .../res/layout/activity_contentsample.xml     |   24 -
 .../res/layout/activity_layoutsample.xml      |   63 -
 .../samples/res/layout/activity_rightmenu.xml |   19 -
 .../res/layout/activity_staticsample.xml      |   19 -
 .../samples/res/layout/activity_topmenu.xml   |   21 -
 .../res/layout/activity_viewpagersample.xml   |    5 -
 .../res/layout/activity_windowsample.xml      |   19 -
 .../samples/res/layout/list_row_sample.xml    |   26 -
 .../samples/res/layout/main.xml               |   33 -
 .../samples/res/layout/menu_bottom.xml        |   30 -
 .../samples/res/layout/menu_row_category.xml  |    5 -
 .../samples/res/layout/menu_row_item.xml      |    5 -
 .../samples/res/layout/menu_scrollview.xml    |   73 --
 .../samples/res/layout/menu_top.xml           |   30 -
 .../samples/res/values-v14/colors.xml         |    4 -
 .../samples/res/values-v14/themes.xml         |    7 -
 .../samples/res/values/colors.xml             |    6 -
 .../samples/res/values/strings.xml            |   34 -
 .../samples/res/values/styles.xml             |   55 -
 .../samples/res/values/themes.xml             |   23 -
 .../samples/ActionBarOverlaySample.java       |   13 -
 .../menudrawer/samples/BottomMenuSample.java  |   43 -
 .../menudrawer/samples/ContentSample.java     |  218 ----
 .../menudrawer/samples/LayoutSample.java      |   36 -
 .../samples/ListActivitySample.java           |   91 --
 .../menudrawer/samples/RightMenuSample.java   |  215 ---
 .../menudrawer/samples/SamplesActivity.java   |   99 --
 .../samples/StaticDrawerSample.java           |  175 ---
 .../menudrawer/samples/TopMenuSample.java     |   75 --
 .../menudrawer/samples/ViewPagerSample.java   |  300 -----
 .../menudrawer/samples/WindowSample.java      |   99 --
 Source/Android/.idea/misc.xml                 |   16 -
 Source/Android/.idea/modules.xml              |    1 -
 Source/Android/.idea/workspace.xml            |  538 ++++----
 Source/Android/Android.iml                    |   11 +-
 Source/Android/AndroidManifest.xml            |    8 +-
 Source/Android/libs/android-support-v13.jar   |  Bin 0 -> 501154 bytes
 .../Android/res/drawable/ic_drawer.png        |  Bin 2846 -> 2842 bytes
 Source/Android/res/layout/folderbrowser.xml   |   23 +-
 .../res/layout/folderbrowserfooter.xml        |    7 -
 .../Android/res/layout/gamelist_activity.xml  |   20 +
 .../layout/{main.xml => gamelist_layout.xml}  |    7 +-
 .../Android/res/layout/gamelist_listview.xml  |    7 +
 Source/Android/res/layout/sidemenu.xml        |    2 +-
 Source/Android/res/values/strings.xml         |    2 +
 .../dolphinemu/DolphinEmulator.java           |    2 +-
 .../dolphinemu/dolphinemu/FolderBrowser.java  |    4 +-
 .../dolphinemu/FolderBrowserAdapter.java      |   53 +
 .../dolphinemu/GameListActivity.java          |  292 +++++
 .../dolphinemu/GameListAdapter.java           |   10 +-
 .../dolphinemu/dolphinemu/GameListView.java   |  225 ----
 .../dolphinemu/InputConfigActivity.java       |    4 +-
 .../dolphinemu/InputConfigAdapter.java        |    4 +-
 .../dolphinemu/SideMenuAdapter.java           |    6 +-
 Source/Core/DolphinWX/CMakeLists.txt          |    5 +-
 151 files changed, 702 insertions(+), 8358 deletions(-)
 delete mode 100644 Externals/android-menudrawer/.gitignore
 delete mode 100644 Externals/android-menudrawer/.travis.yml
 delete mode 100644 Externals/android-menudrawer/CHANGELOG.md
 delete mode 100644 Externals/android-menudrawer/LICENSE
 delete mode 100644 Externals/android-menudrawer/README.md
 delete mode 100644 Externals/android-menudrawer/art/menu_arrow.svg
 delete mode 100644 Externals/android-menudrawer/checkstyle.xml
 delete mode 100644 Externals/android-menudrawer/library/AndroidManifest.xml
 delete mode 100644 Externals/android-menudrawer/library/build.xml
 delete mode 100644 Externals/android-menudrawer/library/pom.xml
 delete mode 100644 Externals/android-menudrawer/library/project.properties
 delete mode 100644 Externals/android-menudrawer/library/res/values/attrs.xml
 delete mode 100644 Externals/android-menudrawer/library/res/values/colors.xml
 delete mode 100644 Externals/android-menudrawer/library/res/values/ids.xml
 delete mode 100644 Externals/android-menudrawer/library/res/values/styles.xml
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BottomDrawer.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BottomStaticDrawer.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BuildLayerFrameLayout.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/ColorDrawable.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/DraggableDrawer.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/FloatScroller.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/HorizontalDrawer.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/LeftDrawer.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/LeftStaticDrawer.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/MenuDrawer.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/NoClickThroughFrameLayout.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/PeekInterpolator.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/Position.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/RightDrawer.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/RightStaticDrawer.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/Scroller.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/SinusoidalInterpolator.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/SmoothInterpolator.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/StaticDrawer.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/TopDrawer.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/TopStaticDrawer.java
 delete mode 100644 Externals/android-menudrawer/library/src/net/simonvt/menudrawer/VerticalDrawer.java
 delete mode 100644 Externals/android-menudrawer/pom.xml
 delete mode 100644 Externals/android-menudrawer/samples/AndroidManifest.xml
 delete mode 100644 Externals/android-menudrawer/samples/build.xml
 delete mode 100644 Externals/android-menudrawer/samples/libs/android-support-v4-r10.jar
 delete mode 100644 Externals/android-menudrawer/samples/pom.xml
 delete mode 100644 Externals/android-menudrawer/samples/project.properties
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow_bottom.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow_right.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow_top.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-hdpi/ic_action_refresh_dark.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-hdpi/ic_action_select_all_dark.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-hdpi/ic_launcher.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-hdpi/md__category_background.9.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_focused_holo.9.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_longpressed_holo.9.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_pressed_holo_dark.9.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_selector_disabled_holo_dark.9.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow_bottom.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow_right.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow_top.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow_bottom.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow_right.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow_top.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-mdpi/ic_action_refresh_dark.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-mdpi/ic_launcher.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-mdpi/md__category_background.9.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_focused_holo.9.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_longpressed_holo.9.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_pressed_holo_dark.9.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_selector_disabled_holo_dark.9.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow_bottom.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow_right.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow_top.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow_bottom.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow_right.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow_top.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_action_refresh_dark.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_action_select_all_dark.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_launcher.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_light.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-xhdpi/md__category_background.9.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_focused_holo.9.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_longpressed_holo.9.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_pressed_holo_dark.9.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_selector_disabled_holo_dark.9.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow_bottom.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow_right.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow_top.png
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable/md__list_selector_background_transition_holo_dark.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/drawable/md__list_selector_holo_dark.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/layout/activity_bottommenu.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/layout/activity_contentsample.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/layout/activity_layoutsample.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/layout/activity_rightmenu.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/layout/activity_staticsample.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/layout/activity_topmenu.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/layout/activity_viewpagersample.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/layout/activity_windowsample.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/layout/list_row_sample.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/layout/main.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/layout/menu_bottom.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/layout/menu_row_category.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/layout/menu_row_item.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/layout/menu_scrollview.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/layout/menu_top.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/values-v14/colors.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/values-v14/themes.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/values/colors.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/values/strings.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/values/styles.xml
 delete mode 100644 Externals/android-menudrawer/samples/res/values/themes.xml
 delete mode 100644 Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ActionBarOverlaySample.java
 delete mode 100644 Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/BottomMenuSample.java
 delete mode 100644 Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ContentSample.java
 delete mode 100644 Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/LayoutSample.java
 delete mode 100644 Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ListActivitySample.java
 delete mode 100644 Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/RightMenuSample.java
 delete mode 100644 Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/SamplesActivity.java
 delete mode 100644 Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/StaticDrawerSample.java
 delete mode 100644 Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/TopMenuSample.java
 delete mode 100644 Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ViewPagerSample.java
 delete mode 100644 Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/WindowSample.java
 create mode 100644 Source/Android/libs/android-support-v13.jar
 rename Externals/android-menudrawer/samples/res/drawable-mdpi/ic_action_select_all_dark.png => Source/Android/res/drawable/ic_drawer.png (94%)
 delete mode 100644 Source/Android/res/layout/folderbrowserfooter.xml
 create mode 100644 Source/Android/res/layout/gamelist_activity.xml
 rename Source/Android/res/layout/{main.xml => gamelist_layout.xml} (89%)
 create mode 100644 Source/Android/res/layout/gamelist_listview.xml
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
 delete mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java

diff --git a/Externals/android-menudrawer/.gitignore b/Externals/android-menudrawer/.gitignore
deleted file mode 100644
index fdb137a854..0000000000
--- a/Externals/android-menudrawer/.gitignore
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-
-!.gitignore
-!.travis.yml
-!CHANGELOG.md
-!README.md
-!LICENSE
-!checkstyle.xml
-!pom.xml
-
-!art/
-
-!library/
-library/*
-!library/src/
-!library/res/
-!library/AndroidManifest.xml
-!library/build.xml
-!library/pom.xml
-!library/project.properties
-
-!samples/
-samples/*
-!samples/src/
-!samples/res/
-!samples/libs/
-!samples/AndroidManifest.xml
-!samples/build.xml
-!samples/pom.xml
-!samples/project.properties
diff --git a/Externals/android-menudrawer/.travis.yml b/Externals/android-menudrawer/.travis.yml
deleted file mode 100644
index ee6ec5ca1f..0000000000
--- a/Externals/android-menudrawer/.travis.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-language: java
-
-notifications:
-  email: false
-
-before_install:
-  - wget http://dl.google.com/android/android-sdk_r21.0.1-linux.tgz
-  - tar -zxf android-sdk_r21.0.1-linux.tgz
-  - export ANDROID_HOME=~/builds/SimonVT/android-menudrawer/android-sdk-linux
-  - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
-  - TOOLS=$(android list sdk --no-ui | grep "Android SDK Platform-tools" | cut -d"-" -f1)
-  - android update sdk --filter "$TOOLS" --no-ui --force
-  - SDK=$(android list sdk --no-ui | grep ", API 16," | cut -d"-" -f1)
-  - android update sdk --filter "$SDK" --no-ui --force
-
-install:
-  - "mvn package --quiet -DskipTests"
-  - "mvn verify"
diff --git a/Externals/android-menudrawer/CHANGELOG.md b/Externals/android-menudrawer/CHANGELOG.md
deleted file mode 100644
index a570a8e420..0000000000
--- a/Externals/android-menudrawer/CHANGELOG.md
+++ /dev/null
@@ -1,44 +0,0 @@
-Change Log
-==========
-
-Version 2.0.2 *(2013-03-31)*
-----------------------------
- * Added listener that makes it possible to disabllow intercepting touch events over
-   certain views
- * Added setter for the maximum animation duration
- * Added getter for menu size
- * Added methods that enable/disable indicator animation
- * Fix: Removed log statements
- * Fix: Drawing the active indicator might cause crash if the active view is not a
-        child of the MenuDrawer
- * Fix: Crash in static drawer if no active indicator bitmap was set
-
-Version 2.0.1 *(2013-02-12)*
-----------------------------
- * Indicator now animates between active views
- * Fixed restoring state for right/bottom drawer
-
-Version 2.0.0 *(2013-01-23)*
-----------------------------
-
- * Major API changes
-
-    * All classes are now in the net.simonvt.menudrawer package.
-    * MenuDrawerManager no longet exists. Menu is added with MenuDrawer#attach(...).
-    * Drawer position is now selected with Position enums instead of int constants.
-    * Width methods/attributes have been renamed to 'size'.
-
- * Added top/bottom drawer.
- * Added static (non-draggable, always visible) drawers.
- * The touch bezel size is now configurable with MenuDrawer#setTouchBezelSize(int).
- * MenuDrawer#saveState() now only required when dragging the entire window.
- * Drawers can now be used in XML layouts.
- * Fix: Scroller class caused conflicts with other libraries.
- * Fix: No more overdraw when the drawer is closed.
- * Fix: Content no longer falls behind when slowly dragging.
-
-
-Version 1.0.0 *(2012-10-30)*
-----------------------------
-
-Initial release.
diff --git a/Externals/android-menudrawer/LICENSE b/Externals/android-menudrawer/LICENSE
deleted file mode 100644
index 7a4a3ea242..0000000000
--- a/Externals/android-menudrawer/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
diff --git a/Externals/android-menudrawer/README.md b/Externals/android-menudrawer/README.md
deleted file mode 100644
index 1773274860..0000000000
--- a/Externals/android-menudrawer/README.md
+++ /dev/null
@@ -1,96 +0,0 @@
-MenuDrawer
-==========
-
-A slide-out menu implementation, which allows users to navigate between views
-in your app. Most commonly the menu is revealed by either dragging the edge
-of the screen, or clicking the 'up' button in the action bar.
-
-
-Features
---------
-
- * The menu can be positioned along all four edges.
- * Supports attaching an always visible, non-draggable menu, which is useful
-   on e.g. tablets.
- * The menu can wrap both the content and the entire window.
- * Allows the drawer to be opened by dragging the edge, the entire screen or
-   not at all.
- * Can be used in XML layouts.
- * Indicator that shows which screen is currently visible.
-
-
-Usage
-=====
-
-This library is very simple to use. It requires no extension of custom classes,
-it's simply added to an activity by calling one of the `MenuDrawer#attach(...)`
-methods.
-
-For more examples on how to use this library, check out the sample app.
-
-
-Left menu
----------
-```java
-public class SampleActivity extends Activity {
-
-    private MenuDrawer mDrawer;
-
-    @Override
-    protected void onCreate(Bundle state) {
-        super.onCreate(state);
-        mDrawer = MenuDrawer.attach(this);
-        mDrawer.setContentView(R.layout.activity_sample);
-        mDrawer.setMenuView(R.layout.menu_sample);
-    }
-}
-```
-
-
-Right menu
-----------
-```java
-public class SampleActivity extends Activity {
-
-    private MenuDrawer mDrawer;
-
-    @Override
-    protected void onCreate(Bundle state) {
-        super.onCreate(state);
-        mDrawer = MenuDrawer.attach(this, Position.RIGHT);
-        mDrawer.setContentView(R.layout.activity_sample);
-        mDrawer.setMenuView(R.layout.menu_sample);
-    }
-}
-```
-
-
-Credits
-=======
-
- * Cyril Mottier for his [articles][1] on the pattern
-
-
-License
-=======
-
-    Copyright 2012 Simon Vig Therkildsen
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-
-
-
-
-
- [1]: http://android.cyrilmottier.com/?p=658
diff --git a/Externals/android-menudrawer/art/menu_arrow.svg b/Externals/android-menudrawer/art/menu_arrow.svg
deleted file mode 100644
index 05f205a3bf..0000000000
--- a/Externals/android-menudrawer/art/menu_arrow.svg
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="33"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="arrow dropshadow.svg"
-   inkscape:export-filename="C:\Users\SimonVT\Desktop\menu_arrow_hdpi.png"
-   inkscape:export-xdpi="135"
-   inkscape:export-ydpi="135">
-  <defs
-     id="defs4">
-    <filter
-       inkscape:collect="always"
-       id="filter3800"
-       x="-0.20999995"
-       width="1.4199999"
-       y="-0.084000008"
-       height="1.168">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.0500001"
-         id="feGaussianBlur3802" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="-0.29262145"
-     inkscape:cy="18.116185"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="998"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1019.3622)">
-    <path
-       style="fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter3800)"
-       d="M 13.999507,1050.8622 2,1035.8623 13.999517,1020.8622 c 4e-6,30.0455 0.0011,-0.01 -1e-5,30 z"
-       id="rect2989-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#e8e8e8;fill-opacity:1;fill-rule:evenodd;stroke:none"
-       d="M 15.999508,1050.8622 4,1035.8623 15.999517,1020.8622 c 4e-6,30.0455 0.0011,-0.01 -9e-6,30 z"
-       id="rect2989"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
diff --git a/Externals/android-menudrawer/checkstyle.xml b/Externals/android-menudrawer/checkstyle.xml
deleted file mode 100644
index beb2c4a7e6..0000000000
--- a/Externals/android-menudrawer/checkstyle.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<module name="Checker">
-    <module name="NewlineAtEndOfFile"/>
-    <module name="FileLength"/>
-    <module name="FileTabCharacter"/>
-
-    <!-- Trailing spaces -->
-    <module name="RegexpSingleline">
-        <property name="format" value="\s+$"/>
-        <property name="message" value="Line has trailing spaces."/>
-    </module>
-
-    <module name="TreeWalker">
-        <property name="cacheFile" value="${checkstyle.cache.file}"/>
-
-        <!-- Checks for Javadoc comments.                     -->
-        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-        <!--module name="JavadocMethod"/-->
-        <!--module name="JavadocType"/-->
-        <!--module name="JavadocVariable"/-->
-        <module name="JavadocStyle"/>
-
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
-        <module name="ConstantName"/>
-        <module name="LocalFinalVariableName"/>
-        <module name="LocalVariableName"/>
-        <module name="MemberName"/>
-        <module name="MethodName"/>
-        <module name="PackageName"/>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
-
-
-        <!-- Checks for imports                              -->
-        <!-- See http://checkstyle.sf.net/config_import.html -->
-        <module name="AvoidStarImport"/>
-        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
-        <module name="RedundantImport"/>
-        <module name="UnusedImports"/>
-
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-            <property name="max" value="120"/>
-        </module>
-        <module name="MethodLength"/>
-        <!--module name="ParameterNumber"/-->
-
-
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="GenericWhitespace"/>
-        <module name="EmptyForIteratorPad"/>
-        <module name="MethodParamPad"/>
-        <module name="NoWhitespaceAfter"/>
-        <module name="NoWhitespaceBefore"/>
-        <module name="OperatorWrap"/>
-        <module name="ParenPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="WhitespaceAfter"/>
-        <module name="WhitespaceAround"/>
-
-
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
-
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
-        <!--module name="AvoidNestedBlocks"/-->
-        <!--module name="EmptyBlock"/-->
-        <module name="LeftCurly"/>
-        <!--module name="NeedBraces"/-->
-        <module name="RightCurly"/>
-
-
-        <!-- Checks for common coding problems               -->
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
-        <!--module name="AvoidInlineConditionals"/-->
-        <module name="CovariantEquals"/>
-        <!--module name="DoubleCheckedLocking"/-->
-        <module name="EmptyStatement"/>
-        <module name="EqualsAvoidNull"/>
-        <module name="EqualsHashCode"/>
-        <!--module name="HiddenField"/-->
-        <module name="IllegalInstantiation"/>
-        <!--module name="InnerAssignment"/-->
-        <!--module name="MagicNumber"/-->
-        <!--module name="MissingSwitchDefault"/-->
-        <module name="RedundantThrows"/>
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-
-        <!-- Checks for class design                         -->
-        <!-- See http://checkstyle.sf.net/config_design.html -->
-        <!--module name="DesignForExtension"/-->
-        <module name="FinalClass"/>
-        <module name="HideUtilityClassConstructor"/>
-        <module name="InterfaceIsType"/>
-        <!--module name="VisibilityModifier"/-->
-
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
-        <module name="ArrayTypeStyle"/>
-        <!--module name="FinalParameters"/-->
-        <module name="TodoComment"/>
-        <module name="UpperEll"/>
-    </module>
-</module>
diff --git a/Externals/android-menudrawer/library/AndroidManifest.xml b/Externals/android-menudrawer/library/AndroidManifest.xml
deleted file mode 100644
index a77d28a931..0000000000
--- a/Externals/android-menudrawer/library/AndroidManifest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="net.simonvt.menudrawer"
-      android:versionCode="3"
-      android:versionName="2.0.1">
-
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16" />
-</manifest>
diff --git a/Externals/android-menudrawer/library/build.xml b/Externals/android-menudrawer/library/build.xml
deleted file mode 100644
index e5eb1dc0d0..0000000000
--- a/Externals/android-menudrawer/library/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="menudrawer" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/Externals/android-menudrawer/library/pom.xml b/Externals/android-menudrawer/library/pom.xml
deleted file mode 100644
index b5bd881040..0000000000
--- a/Externals/android-menudrawer/library/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>net.simonvt</groupId>
-        <artifactId>android-menudrawer-parent</artifactId>
-        <version>2.0.3-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>android-menudrawer</artifactId>
-    <name>Android MenuDrawer</name>
-    <packaging>apklib</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.google.android</groupId>
-            <artifactId>android</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <sourceDirectory>src</sourceDirectory>
-
-        <plugins>
-            <plugin>
-                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-                <artifactId>android-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/Externals/android-menudrawer/library/project.properties b/Externals/android-menudrawer/library/project.properties
deleted file mode 100644
index c81c2d97f5..0000000000
--- a/Externals/android-menudrawer/library/project.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-android.library=true
-# Project target.
-target=android-17
-
diff --git a/Externals/android-menudrawer/library/res/values/attrs.xml b/Externals/android-menudrawer/library/res/values/attrs.xml
deleted file mode 100644
index c8ec779700..0000000000
--- a/Externals/android-menudrawer/library/res/values/attrs.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<resources>
-
-    <!-- Reference to a style for the menu drawer. -->
-    <attr name="menuDrawerStyle" format="reference" />
-
-    <!-- Styleables used for styling the menu drawer. -->
-    <declare-styleable name="MenuDrawer">
-
-        <!-- Drawable to use for the background of the content. -->
-        <attr name="mdContentBackground" format="reference" />
-
-        <!-- Drawable to use for the background of the menu. -->
-        <attr name="mdMenuBackground" format="reference" />
-
-        <!-- The size of the menu. -->
-        <attr name="mdMenuSize" format="dimension" />
-
-        <!-- Drawable used as indicator for the active view. -->
-        <attr name="mdActiveIndicator" format="reference" />
-
-        <!-- Defines whether the content will have a dropshadow onto the menu. Default is true. -->
-        <attr name="mdDropShadowEnabled" format="boolean" />
-
-        <!-- The size of the drop shadow. Default is 6dp -->
-        <attr name="mdDropShadowSize" format="dimension" />
-
-        <!-- The color of the drop shadow. Default is #FF000000. -->
-        <attr name="mdDropShadowColor" format="color" />
-
-        <!-- Drawable used for the drop shadow. -->
-        <attr name="mdDropShadow" format="reference" />
-
-        <!-- The touch bezel size. -->
-        <attr name="mdTouchBezelSize" format="dimension" />
-
-        <!-- Whether the indicator should be animated between active views. -->
-        <attr name="mdAllowIndicatorAnimation" format="boolean" />
-
-        <!-- The maximum animation duration -->
-        <attr name="mdMaxAnimationDuration" format="integer" />
-    </declare-styleable>
-
-</resources>
diff --git a/Externals/android-menudrawer/library/res/values/colors.xml b/Externals/android-menudrawer/library/res/values/colors.xml
deleted file mode 100644
index 2866c6abe6..0000000000
--- a/Externals/android-menudrawer/library/res/values/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
-
-    <!-- The default background of the menu. -->
-    <color name="md__defaultBackground">#FF555555</color>
-
-</resources>
diff --git a/Externals/android-menudrawer/library/res/values/ids.xml b/Externals/android-menudrawer/library/res/values/ids.xml
deleted file mode 100644
index c6001910b0..0000000000
--- a/Externals/android-menudrawer/library/res/values/ids.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<resources>
-
-    <!-- ID used when defining the content layout in XML. -->
-    <item name="mdContent" type="id" />
-
-    <!-- ID used when defining the menu layout in XML. -->
-    <item name="mdMenu" type="id" />
-
-    <!-- The ID of the content container. -->
-    <item name="md__content" type="id" />
-
-    <!-- The ID of the menu container. -->
-    <item name="md__menu" type="id" />
-
-    <!-- The ID of the drawer. -->
-    <item name="md__drawer" type="id" />
-
-    <!-- Used with View#setTag(int) to specify a position for the active view. -->
-    <item name="mdActiveViewPosition" type="id" />
-</resources>
diff --git a/Externals/android-menudrawer/library/res/values/styles.xml b/Externals/android-menudrawer/library/res/values/styles.xml
deleted file mode 100644
index 415be6d229..0000000000
--- a/Externals/android-menudrawer/library/res/values/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<resources>
-
-    <style name="Widget" />
-
-    <!-- Base theme for the menu drawer. -->
-    <style name="Widget.MenuDrawer">
-        <item name="mdMenuBackground">@color/md__defaultBackground</item>
-        <item name="mdContentBackground">?android:attr/windowBackground</item>
-    </style>
-
-</resources>
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BottomDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BottomDrawer.java
deleted file mode 100644
index 17f41e2c4c..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BottomDrawer.java
+++ /dev/null
@@ -1,226 +0,0 @@
-package net.simonvt.menudrawer;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.drawable.GradientDrawable;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-
-public class BottomDrawer extends VerticalDrawer {
-
-    private int mIndicatorLeft;
-
-    BottomDrawer(Activity activity, int dragMode) {
-        super(activity, dragMode);
-    }
-
-    public BottomDrawer(Context context) {
-        super(context);
-    }
-
-    public BottomDrawer(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public BottomDrawer(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    public void openMenu(boolean animate) {
-        animateOffsetTo(-mMenuSize, 0, animate);
-    }
-
-    @Override
-    public void closeMenu(boolean animate) {
-        animateOffsetTo(0, 0, animate);
-    }
-
-    @Override
-    public void setDropShadowColor(int color) {
-        final int endColor = color & 0x00FFFFFF;
-        mDropShadowDrawable = new GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM,
-                new int[] {
-                        color,
-                        endColor,
-                });
-        invalidate();
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        final int width = r - l;
-        final int height = b - t;
-        final int offsetPixels = (int) mOffsetPixels;
-        final int menuSize = mMenuSize;
-
-        mMenuContainer.layout(0, height - menuSize, width, height);
-        offsetMenu(offsetPixels);
-
-        if (USE_TRANSLATIONS) {
-            mContentContainer.layout(0, 0, width, height);
-        } else {
-            mContentContainer.layout(0, offsetPixels, width, height + offsetPixels);
-        }
-    }
-
-    /**
-     * Offsets the menu relative to its original position based on the position of the content.
-     *
-     * @param offsetPixels The number of pixels the content if offset.
-     */
-    private void offsetMenu(int offsetPixels) {
-        if (mOffsetMenu && mMenuSize != 0) {
-            final int height = getHeight();
-            final int menuSize = mMenuSize;
-            final float openRatio = (menuSize + (float) offsetPixels) / menuSize;
-
-            if (USE_TRANSLATIONS) {
-                if (offsetPixels != 0) {
-                    final int offset = (int) (0.25f * (openRatio * menuSize));
-                    mMenuContainer.setTranslationY(offset);
-                } else {
-                    mMenuContainer.setTranslationY(height + menuSize);
-                }
-
-            } else {
-                final int oldMenuTop = mMenuContainer.getTop();
-                final int offsetBy = (int) (0.25f * (openRatio * menuSize));
-                final int offset = height - mMenuSize + offsetBy - oldMenuTop;
-                mMenuContainer.offsetTopAndBottom(offset);
-                mMenuContainer.setVisibility(offsetPixels == 0 ? INVISIBLE : VISIBLE);
-            }
-        }
-    }
-
-    @Override
-    protected void drawDropShadow(Canvas canvas, int offsetPixels) {
-        final int width = getWidth();
-        final int height = getHeight();
-
-        mDropShadowDrawable.setBounds(0, height + offsetPixels, width, height + offsetPixels + mDropShadowSize);
-        mDropShadowDrawable.draw(canvas);
-    }
-
-    @Override
-    protected void drawMenuOverlay(Canvas canvas, int offsetPixels) {
-        final int width = getWidth();
-        final int height = getHeight();
-        final float openRatio = ((float) Math.abs(offsetPixels)) / mMenuSize;
-
-        mMenuOverlay.setBounds(0, height + offsetPixels, width, height);
-        mMenuOverlay.setAlpha((int) (MAX_MENU_OVERLAY_ALPHA * (1.f - openRatio)));
-        mMenuOverlay.draw(canvas);
-    }
-
-    @Override
-    protected void drawIndicator(Canvas canvas, int offsetPixels) {
-        if (mActiveView != null && isViewDescendant(mActiveView)) {
-            Integer position = (Integer) mActiveView.getTag(R.id.mdActiveViewPosition);
-            final int pos = position == null ? 0 : position;
-
-            if (pos == mActivePosition) {
-                final int height = getHeight();
-                final int menuHeight = mMenuSize;
-                final int indicatorHeight = mActiveIndicator.getHeight();
-
-                final float openRatio = ((float) Math.abs(offsetPixels)) / menuHeight;
-
-                mActiveView.getDrawingRect(mActiveRect);
-                offsetDescendantRectToMyCoords(mActiveView, mActiveRect);
-                final int indicatorWidth = mActiveIndicator.getWidth();
-
-                final float interpolatedRatio = 1.f - INDICATOR_INTERPOLATOR.getInterpolation((1.f - openRatio));
-                final int interpolatedHeight = (int) (indicatorHeight * interpolatedRatio);
-
-                final int indicatorBottom = height + offsetPixels + interpolatedHeight;
-                final int indicatorTop = indicatorBottom - indicatorHeight;
-                if (mIndicatorAnimating) {
-                    final int finalLeft = mActiveRect.left + ((mActiveRect.width() - indicatorWidth) / 2);
-                    final int startLeft = mIndicatorStartPos;
-                    final int diff = finalLeft - startLeft;
-                    final int startOffset = (int) (diff * mIndicatorOffset);
-                    mIndicatorLeft = startLeft + startOffset;
-                } else {
-                    mIndicatorLeft = mActiveRect.left + ((mActiveRect.width() - indicatorWidth) / 2);
-                }
-
-                canvas.save();
-                canvas.clipRect(mIndicatorLeft, height + offsetPixels, mIndicatorLeft + indicatorWidth,
-                        indicatorBottom);
-                canvas.drawBitmap(mActiveIndicator, mIndicatorLeft, indicatorTop, null);
-                canvas.restore();
-            }
-        }
-    }
-
-    @Override
-    protected int getIndicatorStartPos() {
-        return mIndicatorLeft;
-    }
-
-    @Override
-    protected void initPeekScroller() {
-        final int dx = -mMenuSize / 3;
-        mPeekScroller.startScroll(0, 0, dx, 0, PEEK_DURATION);
-    }
-
-    @Override
-    protected void onOffsetPixelsChanged(int offsetPixels) {
-        if (USE_TRANSLATIONS) {
-            mContentContainer.setTranslationY(offsetPixels);
-            offsetMenu(offsetPixels);
-            invalidate();
-        } else {
-            mContentContainer.offsetTopAndBottom(offsetPixels - mContentContainer.getTop());
-            offsetMenu(offsetPixels);
-            invalidate();
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////
-    // Touch handling
-    //////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected boolean isContentTouch(MotionEvent ev) {
-        return ev.getY() < getHeight() + mOffsetPixels;
-    }
-
-    @Override
-    protected boolean onDownAllowDrag(MotionEvent ev) {
-        final int height = getHeight();
-        return (!mMenuVisible && mInitialMotionY >= height - mTouchSize)
-                || (mMenuVisible && mInitialMotionY <= height + mOffsetPixels);
-    }
-
-    @Override
-    protected boolean onMoveAllowDrag(MotionEvent ev, float diff) {
-        final int height = getHeight();
-        return (!mMenuVisible && mInitialMotionY >= height - mTouchSize && (diff < 0))
-                || (mMenuVisible && mInitialMotionY <= height + mOffsetPixels);
-    }
-
-    @Override
-    protected void onMoveEvent(float dx) {
-        setOffsetPixels(Math.max(Math.min(mOffsetPixels + dx, 0), -mMenuSize));
-    }
-
-    @Override
-    protected void onUpEvent(MotionEvent ev) {
-        final int offsetPixels = (int) mOffsetPixels;
-
-        if (mIsDragging) {
-            mVelocityTracker.computeCurrentVelocity(1000, mMaxVelocity);
-            final int initialVelocity = (int) mVelocityTracker.getXVelocity();
-            mLastMotionY = ev.getY();
-            animateOffsetTo(mVelocityTracker.getYVelocity() < 0 ? -mMenuSize : 0, initialVelocity,
-                    true);
-
-            // Close the menu when content is clicked while the menu is visible.
-        } else if (mMenuVisible && ev.getY() < getHeight() + offsetPixels) {
-            closeMenu();
-        }
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BottomStaticDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BottomStaticDrawer.java
deleted file mode 100644
index df4b5f4997..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BottomStaticDrawer.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package net.simonvt.menudrawer;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.drawable.GradientDrawable;
-import android.util.AttributeSet;
-
-public class BottomStaticDrawer extends StaticDrawer {
-
-    private int mIndicatorLeft;
-
-    BottomStaticDrawer(Activity activity, int dragMode) {
-        super(activity, dragMode);
-    }
-
-    public BottomStaticDrawer(Context context) {
-        super(context);
-    }
-
-    public BottomStaticDrawer(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public BottomStaticDrawer(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    protected void initDrawer(Context context, AttributeSet attrs, int defStyle) {
-        super.initDrawer(context, attrs, defStyle);
-        mPosition = Position.BOTTOM;
-    }
-
-    @Override
-    public void setDropShadowColor(int color) {
-        final int endColor = color & 0x00FFFFFF;
-        mDropShadowDrawable = new GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM, new int[] {
-                color,
-                endColor,
-        });
-        invalidate();
-    }
-
-    @Override
-    protected void drawIndicator(Canvas canvas) {
-        if (mActiveView != null && isViewDescendant(mActiveView)) {
-            Integer position = (Integer) mActiveView.getTag(R.id.mdActiveViewPosition);
-            final int pos = position == null ? 0 : position;
-
-            if (pos == mActivePosition) {
-                final int height = getHeight();
-                final int menuHeight = mMenuSize;
-                final int indicatorHeight = mActiveIndicator.getHeight();
-
-                mActiveView.getDrawingRect(mActiveRect);
-                offsetDescendantRectToMyCoords(mActiveView, mActiveRect);
-                final int indicatorWidth = mActiveIndicator.getWidth();
-
-                final int indicatorTop = height - menuHeight;
-                final int indicatorBottom = indicatorTop + indicatorHeight;
-                if (mIndicatorAnimating) {
-                    final int finalLeft = mActiveRect.left + ((mActiveRect.width() - indicatorWidth) / 2);
-                    final int startLeft = mIndicatorStartPos;
-                    final int diff = finalLeft - startLeft;
-                    final int startOffset = (int) (diff * mIndicatorOffset);
-                    mIndicatorLeft = startLeft + startOffset;
-                } else {
-                    mIndicatorLeft = mActiveRect.left + ((mActiveRect.width() - indicatorWidth) / 2);
-                }
-
-                canvas.save();
-                canvas.clipRect(mIndicatorLeft, indicatorTop, mIndicatorLeft + indicatorWidth,
-                        indicatorBottom);
-                canvas.drawBitmap(mActiveIndicator, mIndicatorLeft, indicatorTop, null);
-                canvas.restore();
-            }
-        }
-    }
-
-    @Override
-    protected int getIndicatorStartPos() {
-        return mIndicatorLeft;
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BuildLayerFrameLayout.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BuildLayerFrameLayout.java
deleted file mode 100644
index 45f5aa13c5..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/BuildLayerFrameLayout.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package net.simonvt.menudrawer;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.util.AttributeSet;
-import android.widget.FrameLayout;
-
-/**
- * FrameLayout which caches the hardware layer if available.
- * <p/>
- * If it's not posted twice the layer either wont be built on start, or it'll be built twice.
- */
-public class BuildLayerFrameLayout extends FrameLayout {
-
-    private boolean mChanged;
-
-    private boolean mHardwareLayersEnabled = true;
-
-    private boolean mAttached;
-
-    private boolean mFirst = true;
-
-    public BuildLayerFrameLayout(Context context) {
-        super(context);
-        if (MenuDrawer.USE_TRANSLATIONS) {
-            setLayerType(LAYER_TYPE_HARDWARE, null);
-        }
-    }
-
-    public BuildLayerFrameLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        if (MenuDrawer.USE_TRANSLATIONS) {
-            setLayerType(LAYER_TYPE_HARDWARE, null);
-        }
-    }
-
-    public BuildLayerFrameLayout(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        if (MenuDrawer.USE_TRANSLATIONS) {
-            setLayerType(LAYER_TYPE_HARDWARE, null);
-        }
-    }
-
-    void setHardwareLayersEnabled(boolean enabled) {
-        mHardwareLayersEnabled = enabled;
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        mAttached = true;
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        mAttached = false;
-    }
-
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        super.onSizeChanged(w, h, oldw, oldh);
-
-        if (MenuDrawer.USE_TRANSLATIONS && mHardwareLayersEnabled) {
-            post(new Runnable() {
-                @Override
-                public void run() {
-                    mChanged = true;
-                    invalidate();
-                }
-            });
-        }
-    }
-
-    @Override
-    protected void dispatchDraw(Canvas canvas) {
-        super.dispatchDraw(canvas);
-
-        if (mChanged && MenuDrawer.USE_TRANSLATIONS) {
-            post(new Runnable() {
-                @Override
-                public void run() {
-                    if (mAttached) {
-                        final int layerType = getLayerType();
-                        // If it's already a hardware layer, it'll be built anyway.
-                        if (layerType != LAYER_TYPE_HARDWARE || mFirst) {
-                            mFirst = false;
-                            setLayerType(LAYER_TYPE_HARDWARE, null);
-                            buildLayer();
-                            setLayerType(LAYER_TYPE_NONE, null);
-                        }
-                    }
-                }
-            });
-
-            mChanged = false;
-        }
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/ColorDrawable.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/ColorDrawable.java
deleted file mode 100644
index 10a35e7fae..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/ColorDrawable.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.simonvt.menudrawer;
-
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Paint;
-import android.graphics.PixelFormat;
-import android.graphics.drawable.Drawable;
-
-/**
- * A specialized Drawable that fills the Canvas with a specified color.
- * Note that a ColorDrawable ignores the ColorFilter.
- * <p/>
- * <p>It can be defined in an XML file with the <code>&lt;color></code> element.</p>
- *
- * @attr ref android.R.styleable#ColorDrawable_color
- */
-public class ColorDrawable extends Drawable {
-
-    private ColorState mState;
-    private final Paint mPaint = new Paint();
-
-    /** Creates a new black ColorDrawable. */
-    public ColorDrawable() {
-        this(null);
-    }
-
-    /**
-     * Creates a new ColorDrawable with the specified color.
-     *
-     * @param color The color to draw.
-     */
-    public ColorDrawable(int color) {
-        this(null);
-        setColor(color);
-    }
-
-    private ColorDrawable(ColorState state) {
-        mState = new ColorState(state);
-    }
-
-    @Override
-    public int getChangingConfigurations() {
-        return super.getChangingConfigurations() | mState.mChangingConfigurations;
-    }
-
-    @Override
-    public void draw(Canvas canvas) {
-        if ((mState.mUseColor >>> 24) != 0) {
-            mPaint.setColor(mState.mUseColor);
-            canvas.drawRect(getBounds(), mPaint);
-        }
-    }
-
-    /**
-     * Gets the drawable's color value.
-     *
-     * @return int The color to draw.
-     */
-    public int getColor() {
-        return mState.mUseColor;
-    }
-
-    /**
-     * Sets the drawable's color value. This action will clobber the results of prior calls to
-     * {@link #setAlpha(int)} on this object, which side-affected the underlying color.
-     *
-     * @param color The color to draw.
-     */
-    public void setColor(int color) {
-        if (mState.mBaseColor != color || mState.mUseColor != color) {
-            invalidateSelf();
-            mState.mBaseColor = mState.mUseColor = color;
-        }
-    }
-
-    /**
-     * Returns the alpha value of this drawable's color.
-     *
-     * @return A value between 0 and 255.
-     */
-    public int getAlpha() {
-        return mState.mUseColor >>> 24;
-    }
-
-    /**
-     * Sets the color's alpha value.
-     *
-     * @param alpha The alpha value to set, between 0 and 255.
-     */
-    public void setAlpha(int alpha) {
-        alpha += alpha >> 7;   // make it 0..256
-        int baseAlpha = mState.mBaseColor >>> 24;
-        int useAlpha = baseAlpha * alpha >> 8;
-        int oldUseColor = mState.mUseColor;
-        mState.mUseColor = (mState.mBaseColor << 8 >>> 8) | (useAlpha << 24);
-        if (oldUseColor != mState.mUseColor) {
-            invalidateSelf();
-        }
-    }
-
-    /**
-     * Setting a color filter on a ColorDrawable has no effect.
-     *
-     * @param colorFilter Ignore.
-     */
-    public void setColorFilter(ColorFilter colorFilter) {
-    }
-
-    public int getOpacity() {
-        switch (mState.mUseColor >>> 24) {
-            case 255:
-                return PixelFormat.OPAQUE;
-            case 0:
-                return PixelFormat.TRANSPARENT;
-        }
-        return PixelFormat.TRANSLUCENT;
-    }
-
-    @Override
-    public ConstantState getConstantState() {
-        mState.mChangingConfigurations = getChangingConfigurations();
-        return mState;
-    }
-
-    static final class ColorState extends ConstantState {
-
-        int mBaseColor; // base color, independent of setAlpha()
-        int mUseColor;  // basecolor modulated by setAlpha()
-        int mChangingConfigurations;
-
-        ColorState(ColorState state) {
-            if (state != null) {
-                mBaseColor = state.mBaseColor;
-                mUseColor = state.mUseColor;
-            }
-        }
-
-        @Override
-        public Drawable newDrawable() {
-            return new ColorDrawable(this);
-        }
-
-        @Override
-        public Drawable newDrawable(Resources res) {
-            return new ColorDrawable(this);
-        }
-
-        @Override
-        public int getChangingConfigurations() {
-            return mChangingConfigurations;
-        }
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/DraggableDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/DraggableDrawer.java
deleted file mode 100644
index 77fc98e5d3..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/DraggableDrawer.java
+++ /dev/null
@@ -1,672 +0,0 @@
-package net.simonvt.menudrawer;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.VelocityTracker;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.view.animation.AccelerateInterpolator;
-import android.view.animation.Interpolator;
-
-public abstract class DraggableDrawer extends MenuDrawer {
-
-    /**
-     * Key used when saving menu visibility state.
-     */
-    private static final String STATE_MENU_VISIBLE = "net.simonvt.menudrawer.MenuDrawer.menuVisible";
-
-    /**
-     * Interpolator used for stretching/retracting the active indicator.
-     */
-    protected static final Interpolator INDICATOR_INTERPOLATOR = new AccelerateInterpolator();
-
-    /**
-     * Interpolator used for peeking at the drawer.
-     */
-    private static final Interpolator PEEK_INTERPOLATOR = new PeekInterpolator();
-
-    /**
-     * The maximum alpha of the dark menu overlay used for dimming the menu.
-     */
-    protected static final int MAX_MENU_OVERLAY_ALPHA = 185;
-
-    /**
-     * Default delay from {@link #peekDrawer()} is called until first animation is run.
-     */
-    private static final long DEFAULT_PEEK_START_DELAY = 5000;
-
-    /**
-     * Default delay between each subsequent animation, after {@link #peekDrawer()} has been called.
-     */
-    private static final long DEFAULT_PEEK_DELAY = 10000;
-
-    /**
-     * The duration of the peek animation.
-     */
-    protected static final int PEEK_DURATION = 5000;
-
-    /**
-     * Distance in dp from closed position from where the drawer is considered closed with regards to touch events.
-     */
-    private static final int CLOSE_ENOUGH = 3;
-
-    /**
-     * Slop before starting a drag.
-     */
-    protected int mTouchSlop;
-
-    /**
-     * Runnable used when the peek animation is running.
-     */
-    protected final Runnable mPeekRunnable = new Runnable() {
-        @Override
-        public void run() {
-            peekDrawerInvalidate();
-        }
-    };
-
-    /**
-     * Runnable used when animating the drawer open/closed.
-     */
-    private final Runnable mDragRunnable = new Runnable() {
-        @Override
-        public void run() {
-            postAnimationInvalidate();
-        }
-    };
-
-    /**
-     * Current left position of the content.
-     */
-    protected float mOffsetPixels;
-
-    /**
-     * Indicates whether the drawer is currently being dragged.
-     */
-    protected boolean mIsDragging;
-
-    /**
-     * The initial X position of a drag.
-     */
-    protected float mInitialMotionX;
-
-    /**
-     * The initial Y position of a drag.
-     */
-    protected float mInitialMotionY;
-
-    /**
-     * The last X position of a drag.
-     */
-    protected float mLastMotionX = -1;
-
-    /**
-     * The last Y position of a drag.
-     */
-    protected float mLastMotionY = -1;
-
-    /**
-     * Default delay between each subsequent animation, after {@link #peekDrawer()} has been called.
-     */
-    protected long mPeekDelay;
-
-    /**
-     * Scroller used for the peek drawer animation.
-     */
-    protected Scroller mPeekScroller;
-
-    /**
-     * Velocity tracker used when animating the drawer open/closed after a drag.
-     */
-    protected VelocityTracker mVelocityTracker;
-
-    /**
-     * Maximum velocity allowed when animating the drawer open/closed.
-     */
-    protected int mMaxVelocity;
-
-    /**
-     * Indicates whether the menu should be offset when dragging the drawer.
-     */
-    protected boolean mOffsetMenu = true;
-
-    /**
-     * Distance in px from closed position from where the drawer is considered closed with regards to touch events.
-     */
-    protected int mCloseEnough;
-
-    /**
-     * Runnable used for first call to {@link #startPeek()} after {@link #peekDrawer()}  has been called.
-     */
-    private Runnable mPeekStartRunnable;
-
-    /**
-     * Scroller used when animating the drawer open/closed.
-     */
-    private Scroller mScroller;
-
-    /**
-     * Indicates whether the current layer type is {@link android.view.View#LAYER_TYPE_HARDWARE}.
-     */
-    private boolean mLayerTypeHardware;
-
-    DraggableDrawer(Activity activity, int dragMode) {
-        super(activity, dragMode);
-    }
-
-    public DraggableDrawer(Context context) {
-        super(context);
-    }
-
-    public DraggableDrawer(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public DraggableDrawer(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    protected void initDrawer(Context context, AttributeSet attrs, int defStyle) {
-        super.initDrawer(context, attrs, defStyle);
-
-        final ViewConfiguration configuration = ViewConfiguration.get(context);
-        mTouchSlop = configuration.getScaledTouchSlop();
-        mMaxVelocity = configuration.getScaledMaximumFlingVelocity();
-
-        mScroller = new Scroller(context, MenuDrawer.SMOOTH_INTERPOLATOR);
-        mPeekScroller = new Scroller(context, DraggableDrawer.PEEK_INTERPOLATOR);
-
-        mCloseEnough = dpToPx(DraggableDrawer.CLOSE_ENOUGH);
-    }
-
-    public void toggleMenu(boolean animate) {
-        if (mDrawerState == STATE_OPEN || mDrawerState == STATE_OPENING) {
-            closeMenu(animate);
-        } else if (mDrawerState == STATE_CLOSED || mDrawerState == STATE_CLOSING) {
-            openMenu(animate);
-        }
-    }
-
-    public boolean isMenuVisible() {
-        return mMenuVisible;
-    }
-
-    public void setMenuSize(final int size) {
-        mMenuSize = size;
-        mMenuSizeSet = true;
-        if (mDrawerState == STATE_OPEN || mDrawerState == STATE_OPENING) {
-            setOffsetPixels(mMenuSize);
-        }
-        requestLayout();
-        invalidate();
-    }
-
-    public void setOffsetMenuEnabled(boolean offsetMenu) {
-        if (offsetMenu != mOffsetMenu) {
-            mOffsetMenu = offsetMenu;
-            requestLayout();
-            invalidate();
-        }
-    }
-
-    public boolean getOffsetMenuEnabled() {
-        return mOffsetMenu;
-    }
-
-    public void peekDrawer() {
-        peekDrawer(DEFAULT_PEEK_START_DELAY, DEFAULT_PEEK_DELAY);
-    }
-
-    public void peekDrawer(long delay) {
-        peekDrawer(DEFAULT_PEEK_START_DELAY, delay);
-    }
-
-    public void peekDrawer(final long startDelay, final long delay) {
-        if (startDelay < 0) {
-            throw new IllegalArgumentException("startDelay must be zero or larger.");
-        }
-        if (delay < 0) {
-            throw new IllegalArgumentException("delay must be zero or larger");
-        }
-
-        removeCallbacks(mPeekRunnable);
-        removeCallbacks(mPeekStartRunnable);
-
-        mPeekDelay = delay;
-        mPeekStartRunnable = new Runnable() {
-            @Override
-            public void run() {
-                startPeek();
-            }
-        };
-        postDelayed(mPeekStartRunnable, startDelay);
-    }
-
-    public void setHardwareLayerEnabled(boolean enabled) {
-        if (enabled != mHardwareLayersEnabled) {
-            mHardwareLayersEnabled = enabled;
-            mMenuContainer.setHardwareLayersEnabled(enabled);
-            mContentContainer.setHardwareLayersEnabled(enabled);
-            stopLayerTranslation();
-        }
-    }
-
-    public int getTouchMode() {
-        return mTouchMode;
-    }
-
-    public void setTouchMode(int mode) {
-        if (mTouchMode != mode) {
-            mTouchMode = mode;
-            updateTouchAreaSize();
-        }
-    }
-
-    public void setTouchBezelSize(int size) {
-        mTouchBezelSize = size;
-    }
-
-    public int getTouchBezelSize() {
-        return mTouchBezelSize;
-    }
-
-    /**
-     * Sets the number of pixels the content should be offset.
-     *
-     * @param offsetPixels The number of pixels to offset the content by.
-     */
-    protected void setOffsetPixels(float offsetPixels) {
-        final int oldOffset = (int) mOffsetPixels;
-        final int newOffset = (int) offsetPixels;
-
-        mOffsetPixels = offsetPixels;
-
-        if (newOffset != oldOffset) {
-            onOffsetPixelsChanged(newOffset);
-            mMenuVisible = newOffset != 0;
-        }
-    }
-
-    /**
-     * Called when the number of pixels the content should be offset by has changed.
-     *
-     * @param offsetPixels The number of pixels to offset the content by.
-     */
-    protected abstract void onOffsetPixelsChanged(int offsetPixels);
-
-    /**
-     * If possible, set the layer type to {@link android.view.View#LAYER_TYPE_HARDWARE}.
-     */
-    protected void startLayerTranslation() {
-        if (USE_TRANSLATIONS && mHardwareLayersEnabled && !mLayerTypeHardware) {
-            mLayerTypeHardware = true;
-            mContentContainer.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-            mMenuContainer.setLayerType(View.LAYER_TYPE_HARDWARE, null);
-        }
-    }
-
-    /**
-     * If the current layer type is {@link android.view.View#LAYER_TYPE_HARDWARE}, this will set it to
-     * {@link View#LAYER_TYPE_NONE}.
-     */
-    private void stopLayerTranslation() {
-        if (mLayerTypeHardware) {
-            mLayerTypeHardware = false;
-            mContentContainer.setLayerType(View.LAYER_TYPE_NONE, null);
-            mMenuContainer.setLayerType(View.LAYER_TYPE_NONE, null);
-        }
-    }
-
-    /**
-     * Compute the touch area based on the touch mode.
-     */
-    protected void updateTouchAreaSize() {
-        if (mTouchMode == TOUCH_MODE_BEZEL) {
-            mTouchSize = mTouchBezelSize;
-        } else if (mTouchMode == TOUCH_MODE_FULLSCREEN) {
-            mTouchSize = getMeasuredWidth();
-        } else {
-            mTouchSize = 0;
-        }
-    }
-
-    /**
-     * Called when a drag has been ended.
-     */
-    protected void endDrag() {
-        mIsDragging = false;
-
-        if (mVelocityTracker != null) {
-            mVelocityTracker.recycle();
-            mVelocityTracker = null;
-        }
-    }
-
-    /**
-     * Stops ongoing animation of the drawer.
-     */
-    protected void stopAnimation() {
-        removeCallbacks(mDragRunnable);
-        mScroller.abortAnimation();
-        stopLayerTranslation();
-    }
-
-    /**
-     * Called when a drawer animation has successfully completed.
-     */
-    private void completeAnimation() {
-        mScroller.abortAnimation();
-        final int finalX = mScroller.getFinalX();
-        setOffsetPixels(finalX);
-        setDrawerState(finalX == 0 ? STATE_CLOSED : STATE_OPEN);
-        stopLayerTranslation();
-    }
-
-    /**
-     * Moves the drawer to the position passed.
-     *
-     * @param position The position the content is moved to.
-     * @param velocity Optional velocity if called by releasing a drag event.
-     * @param animate  Whether the move is animated.
-     */
-    protected void animateOffsetTo(int position, int velocity, boolean animate) {
-        endDrag();
-        endPeek();
-
-        final int startX = (int) mOffsetPixels;
-        final int dx = position - startX;
-        if (dx == 0 || !animate) {
-            setOffsetPixels(position);
-            setDrawerState(position == 0 ? STATE_CLOSED : STATE_OPEN);
-            stopLayerTranslation();
-            return;
-        }
-
-        int duration;
-
-        velocity = Math.abs(velocity);
-        if (velocity > 0) {
-            duration = 4 * Math.round(1000.f * Math.abs((float) dx / velocity));
-        } else {
-            duration = (int) (600.f * Math.abs((float) dx / mMenuSize));
-        }
-
-        duration = Math.min(duration, mMaxAnimationDuration);
-
-        if (dx > 0) {
-            setDrawerState(STATE_OPENING);
-            mScroller.startScroll(startX, 0, dx, 0, duration);
-        } else {
-            setDrawerState(STATE_CLOSING);
-            mScroller.startScroll(startX, 0, dx, 0, duration);
-        }
-
-        startLayerTranslation();
-
-        postAnimationInvalidate();
-    }
-
-    /**
-     * Callback when each frame in the drawer animation should be drawn.
-     */
-    private void postAnimationInvalidate() {
-        if (mScroller.computeScrollOffset()) {
-            final int oldX = (int) mOffsetPixels;
-            final int x = mScroller.getCurrX();
-
-            if (x != oldX) setOffsetPixels(x);
-            if (x != mScroller.getFinalX()) {
-                postOnAnimation(mDragRunnable);
-                return;
-            }
-        }
-
-        completeAnimation();
-    }
-
-    /**
-     * Starts peek drawer animation.
-     */
-    protected void startPeek() {
-        initPeekScroller();
-
-        startLayerTranslation();
-        peekDrawerInvalidate();
-    }
-
-    protected abstract void initPeekScroller();
-
-    /**
-     * Callback when each frame in the peek drawer animation should be drawn.
-     */
-    private void peekDrawerInvalidate() {
-        if (mPeekScroller.computeScrollOffset()) {
-            final int oldX = (int) mOffsetPixels;
-            final int x = mPeekScroller.getCurrX();
-            if (x != oldX) setOffsetPixels(x);
-
-            if (!mPeekScroller.isFinished()) {
-                postOnAnimation(mPeekRunnable);
-                return;
-
-            } else if (mPeekDelay > 0) {
-                mPeekStartRunnable = new Runnable() {
-                    @Override
-                    public void run() {
-                        startPeek();
-                    }
-                };
-                postDelayed(mPeekStartRunnable, mPeekDelay);
-            }
-        }
-
-        completePeek();
-    }
-
-    /**
-     * Called when the peek drawer animation has successfully completed.
-     */
-    private void completePeek() {
-        mPeekScroller.abortAnimation();
-
-        setOffsetPixels(0);
-
-        setDrawerState(STATE_CLOSED);
-        stopLayerTranslation();
-    }
-
-    /**
-     * Stops ongoing peek drawer animation.
-     */
-    protected void endPeek() {
-        removeCallbacks(mPeekStartRunnable);
-        removeCallbacks(mPeekRunnable);
-        stopLayerTranslation();
-    }
-
-    protected boolean isCloseEnough() {
-        return Math.abs(mOffsetPixels) <= mCloseEnough;
-    }
-
-    /**
-     * Returns true if the touch event occurs over the content.
-     *
-     * @param ev The motion event.
-     * @return True if the touch event occurred over the content, false otherwise.
-     */
-    protected abstract boolean isContentTouch(MotionEvent ev);
-
-    /**
-     * Returns true if dragging the content should be allowed.
-     *
-     * @param ev The motion event.
-     * @return True if dragging the content should be allowed, false otherwise.
-     */
-    protected abstract boolean onDownAllowDrag(MotionEvent ev);
-
-    /**
-     * Tests scrollability within child views of v given a delta of dx.
-     *
-     * @param v      View to test for horizontal scrollability
-     * @param checkV Whether the view should be checked for draggability
-     * @param dx     Delta scrolled in pixels
-     * @param x      X coordinate of the active touch point
-     * @param y      Y coordinate of the active touch point
-     * @return true if child views of v can be scrolled by delta of dx.
-     */
-    protected boolean canChildScrollHorizontally(View v, boolean checkV, int dx, int x, int y) {
-        if (v instanceof ViewGroup) {
-            final ViewGroup group = (ViewGroup) v;
-
-            final int count = group.getChildCount();
-            // Count backwards - let topmost views consume scroll distance first.
-            for (int i = count - 1; i >= 0; i--) {
-                final View child = group.getChildAt(i);
-
-                final int childLeft = child.getLeft() + supportGetTranslationX(child);
-                final int childRight = child.getRight() + supportGetTranslationX(child);
-                final int childTop = child.getTop() + supportGetTranslationY(child);
-                final int childBottom = child.getBottom() + supportGetTranslationY(child);
-
-                if (x >= childLeft && x < childRight && y >= childTop && y < childBottom
-                        &&  canChildScrollHorizontally(child, true, dx, x - childLeft, y - childTop)) {
-                    return true;
-                }
-            }
-        }
-
-        return checkV && mOnInterceptMoveEventListener.isViewDraggable(v, dx, x, y);
-    }
-
-    /**
-     * Tests scrollability within child views of v given a delta of dx.
-     *
-     * @param v      View to test for horizontal scrollability
-     * @param checkV Whether the view should be checked for draggability
-     * @param dx     Delta scrolled in pixels
-     * @param x      X coordinate of the active touch point
-     * @param y      Y coordinate of the active touch point
-     * @return true if child views of v can be scrolled by delta of dx.
-     */
-    protected boolean canChildScrollVertically(View v, boolean checkV, int dx, int x, int y) {
-        if (v instanceof ViewGroup) {
-            final ViewGroup group = (ViewGroup) v;
-
-            final int count = group.getChildCount();
-            // Count backwards - let topmost views consume scroll distance first.
-            for (int i = count - 1; i >= 0; i--) {
-                final View child = group.getChildAt(i);
-
-                final int childLeft = child.getLeft() + supportGetTranslationX(child);
-                final int childRight = child.getRight() + supportGetTranslationX(child);
-                final int childTop = child.getTop() + supportGetTranslationY(child);
-                final int childBottom = child.getBottom() + supportGetTranslationY(child);
-
-                if (x >= childLeft && x < childRight && y >= childTop && y < childBottom
-                        && canChildScrollVertically(child, true, dx, x - childLeft, y - childTop)) {
-                    return true;
-                }
-            }
-        }
-
-        return checkV && mOnInterceptMoveEventListener.isViewDraggable(v, dx, x, y);
-    }
-
-    private int supportGetTranslationY(View v) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            return (int) v.getTranslationY();
-        }
-
-        return 0;
-    }
-
-    private int supportGetTranslationX(View v) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-            return (int) v.getTranslationX();
-        }
-
-        return 0;
-    }
-
-    /**
-     * Returns true if dragging the content should be allowed.
-     *
-     * @param ev The motion event.
-     * @return True if dragging the content should be allowed, false otherwise.
-     */
-    protected abstract boolean onMoveAllowDrag(MotionEvent ev, float dx);
-
-    /**
-     * Called when a move event has happened while dragging the content is in progress.
-     *
-     * @param dx The X difference between the last motion event and the current motion event.
-     */
-    protected abstract void onMoveEvent(float dx);
-
-    /**
-     * Called when {@link android.view.MotionEvent#ACTION_UP} of {@link android.view.MotionEvent#ACTION_CANCEL} is
-     * delivered to {@link net.simonvt.menudrawer.MenuDrawer#onTouchEvent(android.view.MotionEvent)}.
-     *
-     * @param ev The motion event.
-     */
-    protected abstract void onUpEvent(MotionEvent ev);
-
-    @Override
-    protected void dispatchDraw(Canvas canvas) {
-        super.dispatchDraw(canvas);
-        final int offsetPixels = (int) mOffsetPixels;
-
-        if (offsetPixels != 0) drawMenuOverlay(canvas, offsetPixels);
-        if (mDropShadowEnabled) drawDropShadow(canvas, offsetPixels);
-        if (mActiveIndicator != null) drawIndicator(canvas, offsetPixels);
-    }
-
-    /**
-     * Called when the content drop shadow should be drawn.
-     *
-     * @param canvas       The canvas on which to draw.
-     * @param offsetPixels Value in pixels indicating the offset.
-     */
-    protected abstract void drawDropShadow(Canvas canvas, int offsetPixels);
-
-    /**
-     * Called when the menu overlay should be drawn.
-     *
-     * @param canvas       The canvas on which to draw.
-     * @param offsetPixels Value in pixels indicating the offset.
-     */
-    protected abstract void drawMenuOverlay(Canvas canvas, int offsetPixels);
-
-    /**
-     * Called when the active indicator should be drawn.
-     *
-     * @param canvas       The canvas on which to draw.
-     * @param offsetPixels Value in pixels indicating the offset.
-     */
-    protected abstract void drawIndicator(Canvas canvas, int offsetPixels);
-
-    void saveState(Bundle state) {
-        final boolean menuVisible = mDrawerState == STATE_OPEN || mDrawerState == STATE_OPENING;
-        state.putBoolean(STATE_MENU_VISIBLE, menuVisible);
-    }
-
-    public void restoreState(Parcelable in) {
-        super.restoreState(in);
-        Bundle state = (Bundle) in;
-        final boolean menuOpen = state.getBoolean(STATE_MENU_VISIBLE);
-        if (menuOpen) {
-            openMenu(false);
-        } else {
-            setOffsetPixels(0);
-        }
-        mDrawerState = menuOpen ? STATE_OPEN : STATE_CLOSED;
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/FloatScroller.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/FloatScroller.java
deleted file mode 100644
index df5b445cd7..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/FloatScroller.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.simonvt.menudrawer;
-
-import android.view.animation.AnimationUtils;
-import android.view.animation.Interpolator;
-
-/**
- * This class encapsulates scrolling.  The duration of the scroll
- * can be passed in the constructor and specifies the maximum time that
- * the scrolling animation should take.  Past this time, the scrolling is
- * automatically moved to its final stage and computeScrollOffset()
- * will always return false to indicate that scrolling is over.
- */
-public class FloatScroller {
-
-    private float mStart;
-    private float mFinal;
-
-    private float mCurr;
-    private long mStartTime;
-    private int mDuration;
-    private float mDurationReciprocal;
-    private float mDeltaX;
-    private boolean mFinished;
-    private Interpolator mInterpolator;
-
-    /**
-     * Create a Scroller with the specified interpolator. If the interpolator is
-     * null, the default (viscous) interpolator will be used. Specify whether or
-     * not to support progressive "flywheel" behavior in flinging.
-     */
-    public FloatScroller(Interpolator interpolator) {
-        mFinished = true;
-        mInterpolator = interpolator;
-    }
-
-    /**
-     * Returns whether the scroller has finished scrolling.
-     *
-     * @return True if the scroller has finished scrolling, false otherwise.
-     */
-    public final boolean isFinished() {
-        return mFinished;
-    }
-
-    /**
-     * Force the finished field to a particular value.
-     *
-     * @param finished The new finished value.
-     */
-    public final void forceFinished(boolean finished) {
-        mFinished = finished;
-    }
-
-    /**
-     * Returns how long the scroll event will take, in milliseconds.
-     *
-     * @return The duration of the scroll in milliseconds.
-     */
-    public final int getDuration() {
-        return mDuration;
-    }
-
-    /**
-     * Returns the current offset in the scroll.
-     *
-     * @return The new offset as an absolute distance from the origin.
-     */
-    public final float getCurr() {
-        return mCurr;
-    }
-
-    /**
-     * Returns the start offset in the scroll.
-     *
-     * @return The start offset as an absolute distance from the origin.
-     */
-    public final float getStart() {
-        return mStart;
-    }
-
-    /**
-     * Returns where the scroll will end. Valid only for "fling" scrolls.
-     *
-     * @return The final offset as an absolute distance from the origin.
-     */
-    public final float getFinal() {
-        return mFinal;
-    }
-
-    public boolean computeScrollOffset() {
-        if (mFinished) {
-            return false;
-        }
-
-        int timePassed = (int) (AnimationUtils.currentAnimationTimeMillis() - mStartTime);
-
-        if (timePassed < mDuration) {
-            float x = timePassed * mDurationReciprocal;
-            x = mInterpolator.getInterpolation(x);
-            mCurr = mStart + x * mDeltaX;
-
-        } else {
-            mCurr = mFinal;
-            mFinished = true;
-        }
-        return true;
-    }
-
-    public void startScroll(float start, float delta, int duration) {
-        mFinished = false;
-        mDuration = duration;
-        mStartTime = AnimationUtils.currentAnimationTimeMillis();
-        mStart = start;
-        mFinal = start + delta;
-        mDeltaX = delta;
-        mDurationReciprocal = 1.0f / (float) mDuration;
-    }
-
-    /**
-     * Stops the animation. Contrary to {@link #forceFinished(boolean)},
-     * aborting the animating cause the scroller to move to the final x and y
-     * position
-     *
-     * @see #forceFinished(boolean)
-     */
-    public void abortAnimation() {
-        mCurr = mFinal;
-        mFinished = true;
-    }
-
-    /**
-     * Extend the scroll animation. This allows a running animation to scroll
-     * further and longer, when used with {@link #setFinal(float)}.
-     *
-     * @param extend Additional time to scroll in milliseconds.
-     * @see #setFinal(float)
-     */
-    public void extendDuration(int extend) {
-        int passed = timePassed();
-        mDuration = passed + extend;
-        mDurationReciprocal = 1.0f / mDuration;
-        mFinished = false;
-    }
-
-    /**
-     * Returns the time elapsed since the beginning of the scrolling.
-     *
-     * @return The elapsed time in milliseconds.
-     */
-    public int timePassed() {
-        return (int) (AnimationUtils.currentAnimationTimeMillis() - mStartTime);
-    }
-
-    public void setFinal(float newVal) {
-        mFinal = newVal;
-        mDeltaX = mFinal - mStart;
-        mFinished = false;
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/HorizontalDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/HorizontalDrawer.java
deleted file mode 100644
index 6f1c8300f7..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/HorizontalDrawer.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package net.simonvt.menudrawer;
-
-import android.app.Activity;
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.VelocityTracker;
-
-public abstract class HorizontalDrawer extends DraggableDrawer {
-
-    private static final String TAG = "HorizontalDrawer";
-
-    HorizontalDrawer(Activity activity, int dragMode) {
-        super(activity, dragMode);
-    }
-
-    public HorizontalDrawer(Context context) {
-        super(context);
-    }
-
-    public HorizontalDrawer(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public HorizontalDrawer(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        final int widthMode = MeasureSpec.getMode(widthMeasureSpec);
-        final int heightMode = MeasureSpec.getMode(heightMeasureSpec);
-
-        if (widthMode != MeasureSpec.EXACTLY || heightMode != MeasureSpec.EXACTLY) {
-            throw new IllegalStateException("Must measure with an exact size");
-        }
-
-        final int width = MeasureSpec.getSize(widthMeasureSpec);
-        final int height = MeasureSpec.getSize(heightMeasureSpec);
-
-        if (!mMenuSizeSet) mMenuSize = (int) (width * 0.8f);
-        if (mOffsetPixels == -1) openMenu(false);
-
-        final int menuWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec, 0, mMenuSize);
-        final int menuHeightMeasureSpec = getChildMeasureSpec(widthMeasureSpec, 0, height);
-        mMenuContainer.measure(menuWidthMeasureSpec, menuHeightMeasureSpec);
-
-        final int contentWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec, 0, width);
-        final int contentHeightMeasureSpec = getChildMeasureSpec(widthMeasureSpec, 0, height);
-        mContentContainer.measure(contentWidthMeasureSpec, contentHeightMeasureSpec);
-
-        setMeasuredDimension(width, height);
-
-        updateTouchAreaSize();
-    }
-
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent ev) {
-        final int action = ev.getAction() & MotionEvent.ACTION_MASK;
-
-        if (action == MotionEvent.ACTION_DOWN && mMenuVisible && isCloseEnough()) {
-            setOffsetPixels(0);
-            stopAnimation();
-            endPeek();
-            setDrawerState(STATE_CLOSED);
-        }
-
-        // Always intercept events over the content while menu is visible.
-        if (mMenuVisible && isContentTouch(ev)) return true;
-
-        if (mTouchMode == TOUCH_MODE_NONE) {
-            return false;
-        }
-
-        if (action != MotionEvent.ACTION_DOWN) {
-            if (mIsDragging) return true;
-        }
-
-        switch (action) {
-            case MotionEvent.ACTION_DOWN: {
-                mLastMotionX = mInitialMotionX = ev.getX();
-                mLastMotionY = mInitialMotionY = ev.getY();
-                final boolean allowDrag = onDownAllowDrag(ev);
-
-                if (allowDrag) {
-                    setDrawerState(mMenuVisible ? STATE_OPEN : STATE_CLOSED);
-                    stopAnimation();
-                    endPeek();
-                    mIsDragging = false;
-                }
-                break;
-            }
-
-            case MotionEvent.ACTION_MOVE: {
-                final float x = ev.getX();
-                final float dx = x - mLastMotionX;
-                final float xDiff = Math.abs(dx);
-                final float y = ev.getY();
-                final float yDiff = Math.abs(y - mLastMotionY);
-
-                if (xDiff > mTouchSlop && xDiff > yDiff) {
-                    if (mOnInterceptMoveEventListener != null && mTouchMode == TOUCH_MODE_FULLSCREEN
-                            && canChildScrollHorizontally(mContentContainer, false, (int) dx, (int) x, (int) y)) {
-                        endDrag(); // Release the velocity tracker
-                        return false;
-                    }
-
-                    final boolean allowDrag = onMoveAllowDrag(ev, dx);
-
-                    if (allowDrag) {
-                        setDrawerState(STATE_DRAGGING);
-                        mIsDragging = true;
-                        mLastMotionX = x;
-                        mLastMotionY = y;
-                    }
-                }
-                break;
-            }
-
-            /**
-             * If you click really fast, an up or cancel event is delivered here.
-             * Just snap content to whatever is closest.
-             * */
-            case MotionEvent.ACTION_CANCEL:
-            case MotionEvent.ACTION_UP: {
-                if (Math.abs(mOffsetPixels) > mMenuSize / 2) {
-                    openMenu();
-                } else {
-                    closeMenu();
-                }
-                break;
-            }
-        }
-
-        if (mVelocityTracker == null) mVelocityTracker = VelocityTracker.obtain();
-        mVelocityTracker.addMovement(ev);
-
-        return mIsDragging;
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent ev) {
-        if (!mMenuVisible && !mIsDragging && (mTouchMode == TOUCH_MODE_NONE)) {
-            return false;
-        }
-        final int action = ev.getAction() & MotionEvent.ACTION_MASK;
-
-        if (mVelocityTracker == null) mVelocityTracker = VelocityTracker.obtain();
-        mVelocityTracker.addMovement(ev);
-
-        switch (action) {
-            case MotionEvent.ACTION_DOWN: {
-                mLastMotionX = mInitialMotionX = ev.getX();
-                mLastMotionY = mInitialMotionY = ev.getY();
-                final boolean allowDrag = onDownAllowDrag(ev);
-
-                if (allowDrag) {
-                    stopAnimation();
-                    endPeek();
-                    startLayerTranslation();
-                }
-                break;
-            }
-
-            case MotionEvent.ACTION_MOVE: {
-                if (!mIsDragging) {
-                    final float x = ev.getX();
-                    final float dx = x - mLastMotionX;
-                    final float xDiff = Math.abs(dx);
-                    final float y = ev.getY();
-                    final float yDiff = Math.abs(y - mLastMotionY);
-
-                    if (xDiff > mTouchSlop && xDiff > yDiff) {
-                        final boolean allowDrag = onMoveAllowDrag(ev, dx);
-
-                        if (allowDrag) {
-                            setDrawerState(STATE_DRAGGING);
-                            mIsDragging = true;
-                            mLastMotionX = x - mInitialMotionX > 0
-                                    ? mInitialMotionX + mTouchSlop
-                                    : mInitialMotionX - mTouchSlop;
-                        }
-                    }
-                }
-
-                if (mIsDragging) {
-                    startLayerTranslation();
-
-                    final float x = ev.getX();
-                    final float dx = x - mLastMotionX;
-
-                    mLastMotionX = x;
-                    onMoveEvent(dx);
-                }
-                break;
-            }
-
-            case MotionEvent.ACTION_CANCEL:
-            case MotionEvent.ACTION_UP: {
-                onUpEvent(ev);
-                break;
-            }
-        }
-
-        return true;
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/LeftDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/LeftDrawer.java
deleted file mode 100644
index 59a4fc4ce2..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/LeftDrawer.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package net.simonvt.menudrawer;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.drawable.GradientDrawable;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-
-public class LeftDrawer extends HorizontalDrawer {
-
-    private int mIndicatorTop;
-
-    LeftDrawer(Activity activity, int dragMode) {
-        super(activity, dragMode);
-    }
-
-    public LeftDrawer(Context context) {
-        super(context);
-    }
-
-    public LeftDrawer(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public LeftDrawer(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    public void openMenu(boolean animate) {
-        animateOffsetTo(mMenuSize, 0, animate);
-    }
-
-    @Override
-    public void closeMenu(boolean animate) {
-        animateOffsetTo(0, 0, animate);
-    }
-
-    @Override
-    public void setDropShadowColor(int color) {
-        final int endColor = color & 0x00FFFFFF;
-        mDropShadowDrawable = new GradientDrawable(GradientDrawable.Orientation.RIGHT_LEFT, new int[] {
-                color,
-                endColor,
-        });
-        invalidate();
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        final int width = r - l;
-        final int height = b - t;
-        final int offsetPixels = (int) mOffsetPixels;
-
-        mMenuContainer.layout(0, 0, mMenuSize, height);
-        offsetMenu(offsetPixels);
-
-        if (USE_TRANSLATIONS) {
-            mContentContainer.layout(0, 0, width, height);
-        } else {
-            mContentContainer.layout(offsetPixels, 0, width + offsetPixels, height);
-        }
-    }
-
-    /**
-     * Offsets the menu relative to its original position based on the position of the content.
-     *
-     * @param offsetPixels The number of pixels the content if offset.
-     */
-    private void offsetMenu(int offsetPixels) {
-        if (mOffsetMenu && mMenuSize != 0) {
-            final int menuWidth = mMenuSize;
-            final float openRatio = (menuWidth - (float) offsetPixels) / menuWidth;
-
-            if (USE_TRANSLATIONS) {
-                if (offsetPixels > 0) {
-                    final int menuLeft = (int) (0.25f * (-openRatio * menuWidth));
-                    mMenuContainer.setTranslationX(menuLeft);
-                } else {
-                    mMenuContainer.setTranslationX(-menuWidth);
-                }
-
-            } else {
-                final int oldMenuLeft = mMenuContainer.getLeft();
-                final int offset = (int) (0.25f * (-openRatio * menuWidth)) - oldMenuLeft;
-                mMenuContainer.offsetLeftAndRight(offset);
-                mMenuContainer.setVisibility(offsetPixels == 0 ? INVISIBLE : VISIBLE);
-            }
-        }
-    }
-
-    @Override
-    protected void drawDropShadow(Canvas canvas, int offsetPixels) {
-        final int height = getHeight();
-
-        mDropShadowDrawable.setBounds(offsetPixels - mDropShadowSize, 0, offsetPixels, height);
-        mDropShadowDrawable.draw(canvas);
-    }
-
-    @Override
-    protected void drawMenuOverlay(Canvas canvas, int offsetPixels) {
-        final int height = getHeight();
-        final float openRatio = ((float) offsetPixels) / mMenuSize;
-
-        mMenuOverlay.setBounds(0, 0, offsetPixels, height);
-        mMenuOverlay.setAlpha((int) (MAX_MENU_OVERLAY_ALPHA * (1.f - openRatio)));
-        mMenuOverlay.draw(canvas);
-    }
-
-    @Override
-    protected void drawIndicator(Canvas canvas, int offsetPixels) {
-        if (mActiveView != null && isViewDescendant(mActiveView)) {
-            Integer position = (Integer) mActiveView.getTag(R.id.mdActiveViewPosition);
-            final int pos = position == null ? 0 : position;
-
-            if (pos == mActivePosition) {
-                final float openRatio = ((float) offsetPixels) / mMenuSize;
-
-                mActiveView.getDrawingRect(mActiveRect);
-                offsetDescendantRectToMyCoords(mActiveView, mActiveRect);
-
-                final float interpolatedRatio = 1.f - INDICATOR_INTERPOLATOR.getInterpolation((1.f - openRatio));
-                final int interpolatedWidth = (int) (mActiveIndicator.getWidth() * interpolatedRatio);
-
-                if (mIndicatorAnimating) {
-                    final int indicatorFinalTop = mActiveRect.top + ((mActiveRect.height()
-                            - mActiveIndicator.getHeight()) / 2);
-                    final int indicatorStartTop = mIndicatorStartPos;
-                    final int diff = indicatorFinalTop - indicatorStartTop;
-                    final int startOffset = (int) (diff * mIndicatorOffset);
-                    mIndicatorTop = indicatorStartTop + startOffset;
-                } else {
-                    mIndicatorTop = mActiveRect.top + ((mActiveRect.height() - mActiveIndicator.getHeight()) / 2);
-                }
-                final int right = offsetPixels;
-                final int left = right - interpolatedWidth;
-
-                canvas.save();
-                canvas.clipRect(left, 0, right, getHeight());
-                canvas.drawBitmap(mActiveIndicator, left, mIndicatorTop, null);
-                canvas.restore();
-            }
-        }
-    }
-
-    @Override
-    protected int getIndicatorStartPos() {
-        return mIndicatorTop;
-    }
-
-    @Override
-    protected void initPeekScroller() {
-        final int dx = mMenuSize / 3;
-        mPeekScroller.startScroll(0, 0, dx, 0, PEEK_DURATION);
-    }
-
-    @Override
-    protected void onOffsetPixelsChanged(int offsetPixels) {
-        if (USE_TRANSLATIONS) {
-            mContentContainer.setTranslationX(offsetPixels);
-            offsetMenu(offsetPixels);
-            invalidate();
-        } else {
-            mContentContainer.offsetLeftAndRight(offsetPixels - mContentContainer.getLeft());
-            offsetMenu(offsetPixels);
-            invalidate();
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////
-    // Touch handling
-    //////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected boolean isContentTouch(MotionEvent ev) {
-        return ev.getX() > mOffsetPixels;
-    }
-
-    @Override
-    protected boolean onDownAllowDrag(MotionEvent ev) {
-        return (!mMenuVisible && mInitialMotionX <= mTouchSize)
-                || (mMenuVisible && mInitialMotionX >= mOffsetPixels);
-    }
-
-    @Override
-    protected boolean onMoveAllowDrag(MotionEvent ev, float diff) {
-        return (!mMenuVisible && mInitialMotionX <= mTouchSize && (diff > 0))
-                || (mMenuVisible && mInitialMotionX >= mOffsetPixels);
-    }
-
-    @Override
-    protected void onMoveEvent(float dx) {
-        setOffsetPixels(Math.min(Math.max(mOffsetPixels + dx, 0), mMenuSize));
-    }
-
-    @Override
-    protected void onUpEvent(MotionEvent ev) {
-        final int offsetPixels = (int) mOffsetPixels;
-
-        if (mIsDragging) {
-            mVelocityTracker.computeCurrentVelocity(1000, mMaxVelocity);
-            final int initialVelocity = (int) mVelocityTracker.getXVelocity();
-            mLastMotionX = ev.getX();
-            animateOffsetTo(mVelocityTracker.getXVelocity() > 0 ? mMenuSize : 0, initialVelocity, true);
-
-            // Close the menu when content is clicked while the menu is visible.
-        } else if (mMenuVisible && ev.getX() > offsetPixels) {
-            closeMenu();
-        }
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/LeftStaticDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/LeftStaticDrawer.java
deleted file mode 100644
index 47fa75a356..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/LeftStaticDrawer.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package net.simonvt.menudrawer;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.drawable.GradientDrawable;
-import android.util.AttributeSet;
-
-public class LeftStaticDrawer extends StaticDrawer {
-
-    private int mIndicatorTop;
-
-    LeftStaticDrawer(Activity activity, int dragMode) {
-        super(activity, dragMode);
-    }
-
-    public LeftStaticDrawer(Context context) {
-        super(context);
-    }
-
-    public LeftStaticDrawer(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public LeftStaticDrawer(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    protected void initDrawer(Context context, AttributeSet attrs, int defStyle) {
-        super.initDrawer(context, attrs, defStyle);
-        mPosition = Position.LEFT;
-    }
-
-    @Override
-    public void setDropShadowColor(int color) {
-        final int endColor = color & 0x00FFFFFF;
-        mDropShadowDrawable = new GradientDrawable(GradientDrawable.Orientation.RIGHT_LEFT, new int[] {
-                color,
-                endColor,
-        });
-        invalidate();
-    }
-
-    @Override
-    protected void drawIndicator(Canvas canvas) {
-        if (mActiveView != null && isViewDescendant(mActiveView)) {
-            Integer position = (Integer) mActiveView.getTag(R.id.mdActiveViewPosition);
-            final int pos = position == null ? 0 : position;
-
-            if (pos == mActivePosition) {
-                mActiveView.getDrawingRect(mActiveRect);
-                offsetDescendantRectToMyCoords(mActiveView, mActiveRect);
-
-                if (mIndicatorAnimating) {
-                    final int indicatorFinalTop = mActiveRect.top + ((mActiveRect.height()
-                            - mActiveIndicator.getHeight()) / 2);
-                    final int indicatorStartTop = mIndicatorStartPos;
-                    final int diff = indicatorFinalTop - indicatorStartTop;
-                    final int startOffset = (int) (diff * mIndicatorOffset);
-                    mIndicatorTop = indicatorStartTop + startOffset;
-                } else {
-                    mIndicatorTop = mActiveRect.top + ((mActiveRect.height() - mActiveIndicator.getHeight()) / 2);
-                }
-                final int right = mMenuSize;
-                final int left = right - mActiveIndicator.getWidth();
-
-                canvas.save();
-                canvas.clipRect(left, 0, right, getHeight());
-                canvas.drawBitmap(mActiveIndicator, left, mIndicatorTop, null);
-                canvas.restore();
-            }
-        }
-    }
-
-    @Override
-    protected int getIndicatorStartPos() {
-        return mIndicatorTop;
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/MenuDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/MenuDrawer.java
deleted file mode 100644
index 7f998e44b4..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/MenuDrawer.java
+++ /dev/null
@@ -1,1151 +0,0 @@
-package net.simonvt.menudrawer;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewParent;
-import android.view.ViewTreeObserver;
-import android.view.animation.Interpolator;
-
-public abstract class MenuDrawer extends ViewGroup {
-
-    /**
-     * Callback interface for changing state of the drawer.
-     */
-    public interface OnDrawerStateChangeListener {
-
-        /**
-         * Called when the drawer state changes.
-         *
-         * @param oldState The old drawer state.
-         * @param newState The new drawer state.
-         */
-        void onDrawerStateChange(int oldState, int newState);
-    }
-
-    /**
-     * Callback that is invoked when the drawer is in the process of deciding whether it should intercept the touch
-     * event. This lets the listener decide if the pointer is on a view that would disallow dragging of the drawer.
-     * This is only called when the touch mode is {@link #TOUCH_MODE_FULLSCREEN}.
-     */
-    public interface OnInterceptMoveEventListener {
-
-        /**
-         * Called for each child the pointer i on when the drawer is deciding whether to intercept the touch event.
-         *
-         * @param v  View to test for draggability
-         * @param dx Delta drag in pixels
-         * @param x  X coordinate of the active touch point
-         * @param y  Y coordinate of the active touch point
-         * @return true if view is draggable by delta dx.
-         */
-        boolean isViewDraggable(View v, int dx, int x, int y);
-    }
-
-    /**
-     * Tag used when logging.
-     */
-    private static final String TAG = "MenuDrawer";
-
-    /**
-     * Indicates whether debug code should be enabled.
-     */
-    private static final boolean DEBUG = false;
-
-    /**
-     * The time between each frame when animating the drawer.
-     */
-    protected static final int ANIMATION_DELAY = 1000 / 60;
-
-    /**
-     * The default touch bezel size of the drawer in dp.
-     */
-    private static final int DEFAULT_DRAG_BEZEL_DP = 24;
-
-    /**
-     * The default drop shadow size in dp.
-     */
-    private static final int DEFAULT_DROP_SHADOW_DP = 6;
-
-    /**
-     * Drag mode for sliding only the content view.
-     */
-    public static final int MENU_DRAG_CONTENT = 0;
-
-    /**
-     * Drag mode for sliding the entire window.
-     */
-    public static final int MENU_DRAG_WINDOW = 1;
-
-    /**
-     * Disallow opening the drawer by dragging the screen.
-     */
-    public static final int TOUCH_MODE_NONE = 0;
-
-    /**
-     * Allow opening drawer only by dragging on the edge of the screen.
-     */
-    public static final int TOUCH_MODE_BEZEL = 1;
-
-    /**
-     * Allow opening drawer by dragging anywhere on the screen.
-     */
-    public static final int TOUCH_MODE_FULLSCREEN = 2;
-
-    /**
-     * Indicates that the drawer is currently closed.
-     */
-    public static final int STATE_CLOSED = 0;
-
-    /**
-     * Indicates that the drawer is currently closing.
-     */
-    public static final int STATE_CLOSING = 1;
-
-    /**
-     * Indicates that the drawer is currently being dragged by the user.
-     */
-    public static final int STATE_DRAGGING = 2;
-
-    /**
-     * Indicates that the drawer is currently opening.
-     */
-    public static final int STATE_OPENING = 4;
-
-    /**
-     * Indicates that the drawer is currently open.
-     */
-    public static final int STATE_OPEN = 8;
-
-    /**
-     * Indicates whether to use {@link View#setTranslationX(float)} when positioning views.
-     */
-    static final boolean USE_TRANSLATIONS = Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR1;
-
-    /**
-     * Time to animate the indicator to the new active view.
-     */
-    static final int INDICATOR_ANIM_DURATION = 800;
-
-    /**
-     * The maximum animation duration.
-     */
-    private static final int DEFAULT_ANIMATION_DURATION = 600;
-
-    /**
-     * Interpolator used when animating the drawer open/closed.
-     */
-    protected static final Interpolator SMOOTH_INTERPOLATOR = new SmoothInterpolator();
-
-    /**
-     * Drawable used as menu overlay.
-     */
-    protected Drawable mMenuOverlay;
-
-    /**
-     * Defines whether the drop shadow is enabled.
-     */
-    protected boolean mDropShadowEnabled;
-
-    /**
-     * Drawable used as content drop shadow onto the menu.
-     */
-    protected Drawable mDropShadowDrawable;
-
-    /**
-     * The size of the content drop shadow.
-     */
-    protected int mDropShadowSize;
-
-    /**
-     * Bitmap used to indicate the active view.
-     */
-    protected Bitmap mActiveIndicator;
-
-    /**
-     * The currently active view.
-     */
-    protected View mActiveView;
-
-    /**
-     * Position of the active view. This is compared to View#getTag(R.id.mdActiveViewPosition) when drawing the
-     * indicator.
-     */
-    protected int mActivePosition;
-
-    /**
-     * Whether the indicator should be animated between positions.
-     */
-    private boolean mAllowIndicatorAnimation;
-
-    /**
-     * Used when reading the position of the active view.
-     */
-    protected final Rect mActiveRect = new Rect();
-
-    /**
-     * Temporary {@link Rect} used for deciding whether the view should be invalidated so the indicator can be redrawn.
-     */
-    private final Rect mTempRect = new Rect();
-
-    /**
-     * The custom menu view set by the user.
-     */
-    private View mMenuView;
-
-    /**
-     * The parent of the menu view.
-     */
-    protected BuildLayerFrameLayout mMenuContainer;
-
-    /**
-     * The parent of the content view.
-     */
-    protected BuildLayerFrameLayout mContentContainer;
-
-    /**
-     * The size of the menu (width or height depending on the gravity).
-     */
-    protected int mMenuSize;
-
-    /**
-     * Indicates whether the menu size has been set explicity either via the theme or by calling
-     * {@link #setMenuSize(int)}.
-     */
-    protected boolean mMenuSizeSet;
-
-    /**
-     * Indicates whether the menu is currently visible.
-     */
-    protected boolean mMenuVisible;
-
-    /**
-     * The drag mode of the drawer. Can be either {@link #MENU_DRAG_CONTENT} or {@link #MENU_DRAG_WINDOW}.
-     */
-    private int mDragMode = MENU_DRAG_CONTENT;
-
-    /**
-     * The current drawer state.
-     *
-     * @see #STATE_CLOSED
-     * @see #STATE_CLOSING
-     * @see #STATE_DRAGGING
-     * @see #STATE_OPENING
-     * @see #STATE_OPEN
-     */
-    protected int mDrawerState = STATE_CLOSED;
-
-    /**
-     * The touch bezel size of the drawer in px.
-     */
-    protected int mTouchBezelSize;
-
-    /**
-     * The touch area size of the drawer in px.
-     */
-    protected int mTouchSize;
-
-    /**
-     * Listener used to dispatch state change events.
-     */
-    private OnDrawerStateChangeListener mOnDrawerStateChangeListener;
-
-    /**
-     * Touch mode for the Drawer.
-     * Possible values are {@link #TOUCH_MODE_NONE}, {@link #TOUCH_MODE_BEZEL} or {@link #TOUCH_MODE_FULLSCREEN}
-     * Default: {@link #TOUCH_MODE_BEZEL}
-     */
-    protected int mTouchMode = TOUCH_MODE_BEZEL;
-
-    /**
-     * Indicates whether to use {@link View#LAYER_TYPE_HARDWARE} when animating the drawer.
-     */
-    protected boolean mHardwareLayersEnabled = true;
-
-    /**
-     * The Activity the drawer is attached to.
-     */
-    private Activity mActivity;
-
-    /**
-     * Scroller used when animating the indicator to a new position.
-     */
-    private FloatScroller mIndicatorScroller;
-
-    /**
-     * Runnable used when animating the indicator to a new position.
-     */
-    private Runnable mIndicatorRunnable = new Runnable() {
-        @Override
-        public void run() {
-            animateIndicatorInvalidate();
-        }
-    };
-
-    /**
-     * The start position of the indicator when animating it to a new position.
-     */
-    protected int mIndicatorStartPos;
-
-    /**
-     * [0..1] value indicating the current progress of the animation.
-     */
-    protected float mIndicatorOffset;
-
-    /**
-     * Whether the indicator is currently animating.
-     */
-    protected boolean mIndicatorAnimating;
-
-    /**
-     * Bundle used to hold the drawers state.
-     */
-    protected Bundle mState;
-
-    /**
-     * The maximum duration of open/close animations.
-     */
-    protected int mMaxAnimationDuration = DEFAULT_ANIMATION_DURATION;
-
-    /**
-     * Callback that lets the listener override intercepting of touch events.
-     */
-    protected OnInterceptMoveEventListener mOnInterceptMoveEventListener;
-
-    /**
-     * Attaches the MenuDrawer to the Activity.
-     *
-     * @param activity The activity that the MenuDrawer will be attached to.
-     * @return The created MenuDrawer instance.
-     */
-    public static MenuDrawer attach(Activity activity) {
-        return attach(activity, MENU_DRAG_CONTENT);
-    }
-
-    /**
-     * Attaches the MenuDrawer to the Activity.
-     *
-     * @param activity The activity the menu drawer will be attached to.
-     * @param dragMode The drag mode of the drawer. Can be either {@link MenuDrawer#MENU_DRAG_CONTENT}
-     *                 or {@link MenuDrawer#MENU_DRAG_WINDOW}.
-     * @return The created MenuDrawer instance.
-     */
-    public static MenuDrawer attach(Activity activity, int dragMode) {
-        return attach(activity, dragMode, Position.LEFT);
-    }
-
-    /**
-     * Attaches the MenuDrawer to the Activity.
-     *
-     * @param activity The activity the menu drawer will be attached to.
-     * @param position Where to position the menu.
-     * @return The created MenuDrawer instance.
-     */
-    public static MenuDrawer attach(Activity activity, Position position) {
-        return attach(activity, MENU_DRAG_CONTENT, position);
-    }
-
-    /**
-     * Attaches the MenuDrawer to the Activity.
-     *
-     * @param activity The activity the menu drawer will be attached to.
-     * @param dragMode The drag mode of the drawer. Can be either {@link MenuDrawer#MENU_DRAG_CONTENT}
-     *                 or {@link MenuDrawer#MENU_DRAG_WINDOW}.
-     * @param position Where to position the menu.
-     * @return The created MenuDrawer instance.
-     */
-    public static MenuDrawer attach(Activity activity, int dragMode, Position position) {
-        return attach(activity, dragMode, position, false);
-    }
-
-    /**
-     * Attaches the MenuDrawer to the Activity.
-     *
-     * @param activity     The activity the menu drawer will be attached to.
-     * @param dragMode     The drag mode of the drawer. Can be either {@link MenuDrawer#MENU_DRAG_CONTENT}
-     *                     or {@link MenuDrawer#MENU_DRAG_WINDOW}.
-     * @param position     Where to position the menu.
-     * @param attachStatic Whether a static (non-draggable, always visible) drawer should be used.
-     * @return The created MenuDrawer instance.
-     */
-    public static MenuDrawer attach(Activity activity, int dragMode, Position position, boolean attachStatic) {
-        MenuDrawer menuDrawer = createMenuDrawer(activity, dragMode, position, attachStatic);
-        menuDrawer.setId(R.id.md__drawer);
-
-        switch (dragMode) {
-            case MenuDrawer.MENU_DRAG_CONTENT:
-                attachToContent(activity, menuDrawer);
-                break;
-
-            case MenuDrawer.MENU_DRAG_WINDOW:
-                attachToDecor(activity, menuDrawer);
-                break;
-
-            default:
-                throw new RuntimeException("Unknown menu mode: " + dragMode);
-        }
-
-        return menuDrawer;
-    }
-
-    /**
-     * Constructs the appropriate MenuDrawer based on the position.
-     */
-    private static MenuDrawer createMenuDrawer(Activity activity, int dragMode, Position position,
-            boolean attachStatic) {
-        if (attachStatic) {
-            switch (position) {
-                case LEFT:
-                    return new LeftStaticDrawer(activity, dragMode);
-                case RIGHT:
-                    return new RightStaticDrawer(activity, dragMode);
-                case TOP:
-                    return new TopStaticDrawer(activity, dragMode);
-                case BOTTOM:
-                    return new BottomStaticDrawer(activity, dragMode);
-                default:
-                    throw new IllegalArgumentException("position must be one of LEFT, TOP, RIGHT or BOTTOM");
-            }
-        }
-
-        switch (position) {
-            case LEFT:
-                return new LeftDrawer(activity, dragMode);
-            case RIGHT:
-                return new RightDrawer(activity, dragMode);
-            case TOP:
-                return new TopDrawer(activity, dragMode);
-            case BOTTOM:
-                return new BottomDrawer(activity, dragMode);
-            default:
-                throw new IllegalArgumentException("position must be one of LEFT, TOP, RIGHT or BOTTOM");
-        }
-    }
-
-    /**
-     * Attaches the menu drawer to the content view.
-     */
-    private static void attachToContent(Activity activity, MenuDrawer menuDrawer) {
-        /**
-         * Do not call mActivity#setContentView.
-         * E.g. if using with a ListActivity, Activity#setContentView is overridden and dispatched to
-         * MenuDrawer#setContentView, which then again would call Activity#setContentView.
-         */
-        ViewGroup content = (ViewGroup) activity.findViewById(android.R.id.content);
-        content.removeAllViews();
-        content.addView(menuDrawer, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
-    }
-
-    /**
-     * Attaches the menu drawer to the window.
-     */
-    private static void attachToDecor(Activity activity, MenuDrawer menuDrawer) {
-        ViewGroup decorView = (ViewGroup) activity.getWindow().getDecorView();
-        ViewGroup decorChild = (ViewGroup) decorView.getChildAt(0);
-
-        decorView.removeAllViews();
-        decorView.addView(menuDrawer, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
-
-        menuDrawer.mContentContainer.addView(decorChild, decorChild.getLayoutParams());
-    }
-
-    MenuDrawer(Activity activity, int dragMode) {
-        this(activity);
-
-        mActivity = activity;
-        mDragMode = dragMode;
-    }
-
-    public MenuDrawer(Context context) {
-        this(context, null);
-    }
-
-    public MenuDrawer(Context context, AttributeSet attrs) {
-        this(context, attrs, R.attr.menuDrawerStyle);
-    }
-
-    public MenuDrawer(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        initDrawer(context, attrs, defStyle);
-    }
-
-    protected void initDrawer(Context context, AttributeSet attrs, int defStyle) {
-        setWillNotDraw(false);
-        setFocusable(false);
-
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.MenuDrawer, R.attr.menuDrawerStyle,
-                R.style.Widget_MenuDrawer);
-
-        final Drawable contentBackground = a.getDrawable(R.styleable.MenuDrawer_mdContentBackground);
-        final Drawable menuBackground = a.getDrawable(R.styleable.MenuDrawer_mdMenuBackground);
-
-        mMenuSize = a.getDimensionPixelSize(R.styleable.MenuDrawer_mdMenuSize, -1);
-        mMenuSizeSet = mMenuSize != -1;
-
-        final int indicatorResId = a.getResourceId(R.styleable.MenuDrawer_mdActiveIndicator, 0);
-        if (indicatorResId != 0) {
-            mActiveIndicator = BitmapFactory.decodeResource(getResources(), indicatorResId);
-        }
-
-        mDropShadowEnabled = a.getBoolean(R.styleable.MenuDrawer_mdDropShadowEnabled, true);
-
-        mDropShadowDrawable = a.getDrawable(R.styleable.MenuDrawer_mdDropShadow);
-
-        if (mDropShadowDrawable == null) {
-            final int dropShadowColor = a.getColor(R.styleable.MenuDrawer_mdDropShadowColor, 0xFF000000);
-            setDropShadowColor(dropShadowColor);
-        }
-
-        mDropShadowSize = a.getDimensionPixelSize(R.styleable.MenuDrawer_mdDropShadowSize,
-                dpToPx(DEFAULT_DROP_SHADOW_DP));
-
-        mTouchBezelSize = a.getDimensionPixelSize(R.styleable.MenuDrawer_mdTouchBezelSize,
-                dpToPx(DEFAULT_DRAG_BEZEL_DP));
-
-        mAllowIndicatorAnimation = a.getBoolean(R.styleable.MenuDrawer_mdAllowIndicatorAnimation, false);
-
-        mMaxAnimationDuration = a.getInt(R.styleable.MenuDrawer_mdMaxAnimationDuration, DEFAULT_ANIMATION_DURATION);
-
-        a.recycle();
-
-        mMenuContainer = new BuildLayerFrameLayout(context);
-        mMenuContainer.setId(R.id.md__menu);
-        mMenuContainer.setBackgroundDrawable(menuBackground);
-        super.addView(mMenuContainer, -1, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
-
-        mContentContainer = new NoClickThroughFrameLayout(context);
-        mContentContainer.setId(R.id.md__content);
-        mContentContainer.setBackgroundDrawable(contentBackground);
-        super.addView(mContentContainer, -1, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
-
-        mMenuOverlay = new ColorDrawable(0xFF000000);
-
-        mIndicatorScroller = new FloatScroller(SMOOTH_INTERPOLATOR);
-    }
-
-    @Override
-    public void addView(View child, int index, LayoutParams params) {
-        int childCount = mMenuContainer.getChildCount();
-        if (childCount == 0) {
-            mMenuContainer.addView(child, index, params);
-            return;
-        }
-
-        childCount = mContentContainer.getChildCount();
-        if (childCount == 0) {
-            mContentContainer.addView(child, index, params);
-            return;
-        }
-
-        throw new IllegalStateException("MenuDrawer can only hold two child views");
-    }
-
-    protected int dpToPx(int dp) {
-        return (int) (getResources().getDisplayMetrics().density * dp + 0.5f);
-    }
-
-    protected boolean isViewDescendant(View v) {
-        ViewParent parent = v.getParent();
-        while (parent != null) {
-            if (parent == this) {
-                return true;
-            }
-
-            parent = parent.getParent();
-        }
-
-        return false;
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        getViewTreeObserver().addOnScrollChangedListener(mScrollListener);
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        getViewTreeObserver().removeOnScrollChangedListener(mScrollListener);
-        super.onDetachedFromWindow();
-    }
-
-    /**
-     * Toggles the menu open and close with animation.
-     */
-    public void toggleMenu() {
-        toggleMenu(true);
-    }
-
-    /**
-     * Toggles the menu open and close.
-     *
-     * @param animate Whether open/close should be animated.
-     */
-    public abstract void toggleMenu(boolean animate);
-
-    /**
-     * Animates the menu open.
-     */
-    public void openMenu() {
-        openMenu(true);
-    }
-
-    /**
-     * Opens the menu.
-     *
-     * @param animate Whether open/close should be animated.
-     */
-    public abstract void openMenu(boolean animate);
-
-    /**
-     * Animates the menu closed.
-     */
-    public void closeMenu() {
-        closeMenu(true);
-    }
-
-    /**
-     * Closes the menu.
-     *
-     * @param animate Whether open/close should be animated.
-     */
-    public abstract void closeMenu(boolean animate);
-
-    /**
-     * Indicates whether the menu is currently visible.
-     *
-     * @return True if the menu is open, false otherwise.
-     */
-    public abstract boolean isMenuVisible();
-
-    /**
-     * Set the size of the menu drawer when open.
-     *
-     * @param size The size of the menu.
-     */
-    public abstract void setMenuSize(int size);
-
-    /**
-     * Returns the size of the menu.
-     *
-     * @return The size of the menu.
-     */
-    public int getMenuSize() {
-        return mMenuSize;
-    }
-
-    /**
-     * Set the active view.
-     * If the mdActiveIndicator attribute is set, this View will have the indicator drawn next to it.
-     *
-     * @param v The active view.
-     */
-    public void setActiveView(View v) {
-        setActiveView(v, 0);
-    }
-
-    /**
-     * Set the active view.
-     * If the mdActiveIndicator attribute is set, this View will have the indicator drawn next to it.
-     *
-     * @param v        The active view.
-     * @param position Optional position, usually used with ListView. v.setTag(R.id.mdActiveViewPosition, position)
-     *                 must be called first.
-     */
-    public void setActiveView(View v, int position) {
-        final View oldView = mActiveView;
-        mActiveView = v;
-        mActivePosition = position;
-
-        if (mAllowIndicatorAnimation && oldView != null) {
-            startAnimatingIndicator();
-        }
-
-        invalidate();
-    }
-
-    /**
-     * Sets whether the indicator should be animated between active views.
-     *
-     * @param animate Whether the indicator should be animated between active views.
-     */
-    public void setAllowIndicatorAnimation(boolean animate) {
-        if (animate != mAllowIndicatorAnimation) {
-            mAllowIndicatorAnimation = animate;
-            completeAnimatingIndicator();
-        }
-    }
-
-    /**
-     * Indicates whether the indicator should be animated between active views.
-     *
-     * @return Whether the indicator should be animated between active views.
-     */
-    public boolean getAllowIndicatorAnimation() {
-        return mAllowIndicatorAnimation;
-    }
-
-    /**
-     * Scroll listener that checks whether the active view has moved before the drawer is invalidated.
-     */
-    private ViewTreeObserver.OnScrollChangedListener mScrollListener = new ViewTreeObserver.OnScrollChangedListener() {
-        @Override
-        public void onScrollChanged() {
-            if (mActiveView != null && isViewDescendant(mActiveView)) {
-                mActiveView.getDrawingRect(mTempRect);
-                offsetDescendantRectToMyCoords(mActiveView, mTempRect);
-                if (mTempRect.left != mActiveRect.left || mTempRect.top != mActiveRect.top
-                        || mTempRect.right != mActiveRect.right || mTempRect.bottom != mActiveRect.bottom) {
-                    invalidate();
-                }
-            }
-        }
-    };
-
-    /**
-     * Starts animating the indicator to a new position.
-     */
-    private void startAnimatingIndicator() {
-        mIndicatorStartPos = getIndicatorStartPos();
-        mIndicatorAnimating = true;
-        mIndicatorScroller.startScroll(0.0f, 1.0f, INDICATOR_ANIM_DURATION);
-
-        animateIndicatorInvalidate();
-    }
-
-    /**
-     * Returns the start position of the indicator.
-     *
-     * @return The start position of the indicator.
-     */
-    protected abstract int getIndicatorStartPos();
-
-    /**
-     * Callback when each frame in the indicator animation should be drawn.
-     */
-    private void animateIndicatorInvalidate() {
-        if (mIndicatorScroller.computeScrollOffset()) {
-            mIndicatorOffset = mIndicatorScroller.getCurr();
-            invalidate();
-
-            if (!mIndicatorScroller.isFinished()) {
-                postOnAnimation(mIndicatorRunnable);
-                return;
-            }
-        }
-
-        completeAnimatingIndicator();
-    }
-
-    /**
-     * Called when the indicator animation has completed.
-     */
-    private void completeAnimatingIndicator() {
-        mIndicatorOffset = 1.0f;
-        mIndicatorAnimating = false;
-        invalidate();
-    }
-
-    /**
-     * Enables or disables offsetting the menu when dragging the drawer.
-     *
-     * @param offsetMenu True to offset the menu, false otherwise.
-     */
-    public abstract void setOffsetMenuEnabled(boolean offsetMenu);
-
-    /**
-     * Indicates whether the menu is being offset when dragging the drawer.
-     *
-     * @return True if the menu is being offset, false otherwise.
-     */
-    public abstract boolean getOffsetMenuEnabled();
-
-    public int getDrawerState() {
-        return mDrawerState;
-    }
-
-    /**
-     * Register a callback to be invoked when the drawer state changes.
-     *
-     * @param listener The callback that will run.
-     */
-    public void setOnDrawerStateChangeListener(OnDrawerStateChangeListener listener) {
-        mOnDrawerStateChangeListener = listener;
-    }
-
-    /**
-     * Register a callback that will be invoked when the drawer is about to intercept touch events.
-     *
-     * @param listener The callback that will be invoked.
-     */
-    public void setOnInterceptMoveEventListener(OnInterceptMoveEventListener listener) {
-        mOnInterceptMoveEventListener = listener;
-    }
-
-    /**
-     * Defines whether the drop shadow is enabled.
-     *
-     * @param enabled Whether the drop shadow is enabled.
-     */
-    public void setDropShadowEnabled(boolean enabled) {
-        mDropShadowEnabled = enabled;
-        invalidate();
-    }
-
-    /**
-     * Sets the color of the drop shadow.
-     *
-     * @param color The color of the drop shadow.
-     */
-    public abstract void setDropShadowColor(int color);
-
-    /**
-     * Sets the drawable of the drop shadow.
-     *
-     * @param drawable The drawable of the drop shadow.
-     */
-    public void setDropShadow(Drawable drawable) {
-        mDropShadowDrawable = drawable;
-        invalidate();
-    }
-
-    /**
-     * Sets the drawable of the drop shadow.
-     *
-     * @param resId The resource identifier of the the drawable.
-     */
-    public void setDropShadow(int resId) {
-        setDropShadow(getResources().getDrawable(resId));
-    }
-
-    /**
-     * Returns the drawable of the drop shadow.
-     */
-    public Drawable getDropShadow() {
-        return mDropShadowDrawable;
-    }
-
-    /**
-     * Sets the size of the drop shadow.
-     *
-     * @param size The size of the drop shadow in px.
-     */
-    public void setDropShadowSize(int size) {
-        mDropShadowSize = size;
-        invalidate();
-    }
-
-    /**
-     * Animates the drawer slightly open until the user opens the drawer.
-     */
-    public abstract void peekDrawer();
-
-    /**
-     * Animates the drawer slightly open. If delay is larger than 0, this happens until the user opens the drawer.
-     *
-     * @param delay The delay (in milliseconds) between each run of the animation. If 0, this animation is only run
-     *              once.
-     */
-    public abstract void peekDrawer(long delay);
-
-    /**
-     * Animates the drawer slightly open. If delay is larger than 0, this happens until the user opens the drawer.
-     *
-     * @param startDelay The delay (in milliseconds) until the animation is first run.
-     * @param delay      The delay (in milliseconds) between each run of the animation. If 0, this animation is only run
-     *                   once.
-     */
-    public abstract void peekDrawer(long startDelay, long delay);
-
-    /**
-     * Enables or disables the user of {@link View#LAYER_TYPE_HARDWARE} when animations views.
-     *
-     * @param enabled Whether hardware layers are enabled.
-     */
-    public abstract void setHardwareLayerEnabled(boolean enabled);
-
-    /**
-     * Sets the maximum duration of open/close animations.
-     * @param duration The maximum duration in milliseconds.
-     */
-    public void setMaxAnimationDuration(int duration) {
-        mMaxAnimationDuration = duration;
-    }
-
-    /**
-     * Returns the ViewGroup used as a parent for the menu view.
-     *
-     * @return The menu view's parent.
-     */
-    public ViewGroup getMenuContainer() {
-        return mMenuContainer;
-    }
-
-    /**
-     * Returns the ViewGroup used as a parent for the content view.
-     *
-     * @return The content view's parent.
-     */
-    public ViewGroup getContentContainer() {
-        if (mDragMode == MENU_DRAG_CONTENT) {
-            return mContentContainer;
-        } else {
-            return (ViewGroup) findViewById(android.R.id.content);
-        }
-    }
-
-    /**
-     * Set the menu view from a layout resource.
-     *
-     * @param layoutResId Resource ID to be inflated.
-     */
-    public void setMenuView(int layoutResId) {
-        mMenuContainer.removeAllViews();
-        mMenuView = LayoutInflater.from(getContext()).inflate(layoutResId, mMenuContainer, false);
-        mMenuContainer.addView(mMenuView);
-    }
-
-    /**
-     * Set the menu view to an explicit view.
-     *
-     * @param view The menu view.
-     */
-    public void setMenuView(View view) {
-        setMenuView(view, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
-    }
-
-    /**
-     * Set the menu view to an explicit view.
-     *
-     * @param view   The menu view.
-     * @param params Layout parameters for the view.
-     */
-    public void setMenuView(View view, LayoutParams params) {
-        mMenuView = view;
-        mMenuContainer.removeAllViews();
-        mMenuContainer.addView(view, params);
-    }
-
-    /**
-     * Returns the menu view.
-     *
-     * @return The menu view.
-     */
-    public View getMenuView() {
-        return mMenuView;
-    }
-
-    /**
-     * Set the content from a layout resource.
-     *
-     * @param layoutResId Resource ID to be inflated.
-     */
-    public void setContentView(int layoutResId) {
-        switch (mDragMode) {
-            case MenuDrawer.MENU_DRAG_CONTENT:
-                mContentContainer.removeAllViews();
-                LayoutInflater.from(getContext()).inflate(layoutResId, mContentContainer, true);
-                break;
-
-            case MenuDrawer.MENU_DRAG_WINDOW:
-                mActivity.setContentView(layoutResId);
-                break;
-        }
-    }
-
-    /**
-     * Set the content to an explicit view.
-     *
-     * @param view The desired content to display.
-     */
-    public void setContentView(View view) {
-        setContentView(view, new ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
-    }
-
-    /**
-     * Set the content to an explicit view.
-     *
-     * @param view   The desired content to display.
-     * @param params Layout parameters for the view.
-     */
-    public void setContentView(View view, LayoutParams params) {
-        switch (mDragMode) {
-            case MenuDrawer.MENU_DRAG_CONTENT:
-                mContentContainer.removeAllViews();
-                mContentContainer.addView(view, params);
-                break;
-
-            case MenuDrawer.MENU_DRAG_WINDOW:
-                mActivity.setContentView(view, params);
-                break;
-        }
-    }
-
-    protected void setDrawerState(int state) {
-        if (state != mDrawerState) {
-            final int oldState = mDrawerState;
-            mDrawerState = state;
-            if (mOnDrawerStateChangeListener != null) mOnDrawerStateChangeListener.onDrawerStateChange(oldState, state);
-            if (DEBUG) logDrawerState(state);
-        }
-    }
-
-    protected void logDrawerState(int state) {
-        switch (state) {
-            case STATE_CLOSED:
-                Log.d(TAG, "[DrawerState] STATE_CLOSED");
-                break;
-
-            case STATE_CLOSING:
-                Log.d(TAG, "[DrawerState] STATE_CLOSING");
-                break;
-
-            case STATE_DRAGGING:
-                Log.d(TAG, "[DrawerState] STATE_DRAGGING");
-                break;
-
-            case STATE_OPENING:
-                Log.d(TAG, "[DrawerState] STATE_OPENING");
-                break;
-
-            case STATE_OPEN:
-                Log.d(TAG, "[DrawerState] STATE_OPEN");
-                break;
-
-            default:
-                Log.d(TAG, "[DrawerState] Unknown: " + state);
-        }
-    }
-
-    /**
-     * Returns the touch mode.
-     */
-    public abstract int getTouchMode();
-
-    /**
-     * Sets the drawer touch mode. Possible values are {@link #TOUCH_MODE_NONE}, {@link #TOUCH_MODE_BEZEL} or
-     * {@link #TOUCH_MODE_FULLSCREEN}.
-     *
-     * @param mode The touch mode.
-     */
-    public abstract void setTouchMode(int mode);
-
-    /**
-     * Sets the size of the touch bezel.
-     *
-     * @param size The touch bezel size in px.
-     */
-    public abstract void setTouchBezelSize(int size);
-
-    /**
-     * Returns the size of the touch bezel in px.
-     */
-    public abstract int getTouchBezelSize();
-
-    @Override
-    public void postOnAnimation(Runnable action) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            super.postOnAnimation(action);
-        } else {
-            postDelayed(action, ANIMATION_DELAY);
-        }
-    }
-
-    @Override
-    protected boolean fitSystemWindows(Rect insets) {
-        if (mDragMode == MENU_DRAG_WINDOW) {
-            mMenuContainer.setPadding(0, insets.top, 0, 0);
-        }
-        return super.fitSystemWindows(insets);
-    }
-
-    /**
-     * Saves the state of the drawer.
-     *
-     * @return Returns a Parcelable containing the drawer state.
-     */
-    public final Parcelable saveState() {
-        if (mState == null) mState = new Bundle();
-        saveState(mState);
-        return mState;
-    }
-
-    void saveState(Bundle state) {
-        // State saving isn't required for subclasses.
-    }
-
-    /**
-     * Restores the state of the drawer.
-     *
-     * @param in A parcelable containing the drawer state.
-     */
-    public void restoreState(Parcelable in) {
-        mState = (Bundle) in;
-    }
-
-    @Override
-    protected Parcelable onSaveInstanceState() {
-        Parcelable superState = super.onSaveInstanceState();
-        SavedState state = new SavedState(superState);
-
-        if (mState == null) mState = new Bundle();
-        saveState(mState);
-
-        state.mState = mState;
-        return state;
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Parcelable state) {
-        SavedState savedState = (SavedState) state;
-        super.onRestoreInstanceState(savedState.getSuperState());
-
-        restoreState(savedState.mState);
-    }
-
-    static class SavedState extends BaseSavedState {
-
-        Bundle mState;
-
-        public SavedState(Parcelable superState) {
-            super(superState);
-        }
-
-        public SavedState(Parcel in) {
-            super(in);
-            mState = in.readBundle();
-        }
-
-        @Override
-        public void writeToParcel(Parcel dest, int flags) {
-            super.writeToParcel(dest, flags);
-            dest.writeBundle(mState);
-        }
-
-        @SuppressWarnings("UnusedDeclaration")
-        public static final Creator<SavedState> CREATOR = new Creator<SavedState>() {
-            @Override
-            public SavedState createFromParcel(Parcel in) {
-                return new SavedState(in);
-            }
-
-            @Override
-            public SavedState[] newArray(int size) {
-                return new SavedState[size];
-            }
-        };
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/NoClickThroughFrameLayout.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/NoClickThroughFrameLayout.java
deleted file mode 100644
index 9462282cb1..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/NoClickThroughFrameLayout.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package net.simonvt.menudrawer;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-
-/**
- * FrameLayout which doesn't let touch events propagate to views positioned behind it in the view hierarchy.
- */
-public class NoClickThroughFrameLayout extends BuildLayerFrameLayout {
-
-    public NoClickThroughFrameLayout(Context context) {
-        super(context);
-    }
-
-    public NoClickThroughFrameLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public NoClickThroughFrameLayout(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        return true;
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/PeekInterpolator.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/PeekInterpolator.java
deleted file mode 100644
index d0c7600f66..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/PeekInterpolator.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package net.simonvt.menudrawer;
-
-import android.view.animation.Interpolator;
-
-public class PeekInterpolator implements Interpolator {
-
-    private static final String TAG = "PeekInterpolator";
-
-    private static final SinusoidalInterpolator SINUSOIDAL_INTERPOLATOR = new SinusoidalInterpolator();
-
-    @Override
-    public float getInterpolation(float input) {
-        float result;
-
-        if (input < 1.f / 3.f) {
-            result = SINUSOIDAL_INTERPOLATOR.getInterpolation(input * 3);
-
-        } else if (input > 2.f / 3.f) {
-            final float val = ((input + 1.f / 3.f) - 1.f) * 3.f;
-            result = 1.f - SINUSOIDAL_INTERPOLATOR.getInterpolation(val);
-
-        } else {
-            result = 1.f;
-        }
-
-        return result;
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/Position.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/Position.java
deleted file mode 100644
index e1a3dd3a46..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/Position.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package net.simonvt.menudrawer;
-
-/**
- * Enums used for positioning the drawer.
- */
-public enum Position {
-    // Positions the drawer to the left of the content.
-    LEFT,
-
-    // Positions the drawer above the content.
-    TOP,
-
-    // Positions the drawer to the right of the content.
-    RIGHT,
-
-    // Positions the drawer below the content.
-    BOTTOM,
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/RightDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/RightDrawer.java
deleted file mode 100644
index 5d75904aac..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/RightDrawer.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package net.simonvt.menudrawer;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.drawable.GradientDrawable;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-
-public class RightDrawer extends HorizontalDrawer {
-
-    private int mIndicatorTop;
-
-    RightDrawer(Activity activity, int dragMode) {
-        super(activity, dragMode);
-    }
-
-    public RightDrawer(Context context) {
-        super(context);
-    }
-
-    public RightDrawer(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public RightDrawer(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    public void openMenu(boolean animate) {
-        animateOffsetTo(-mMenuSize, 0, animate);
-    }
-
-    @Override
-    public void closeMenu(boolean animate) {
-        animateOffsetTo(0, 0, animate);
-    }
-
-    @Override
-    public void setDropShadowColor(int color) {
-        final int endColor = color & 0x00FFFFFF;
-        mDropShadowDrawable = new GradientDrawable(GradientDrawable.Orientation.LEFT_RIGHT, new int[] {
-                color,
-                endColor,
-        });
-        invalidate();
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        final int width = r - l;
-        final int height = b - t;
-        final int offsetPixels = (int) mOffsetPixels;
-
-        mMenuContainer.layout(width - mMenuSize, 0, width, height);
-        offsetMenu(offsetPixels);
-
-        if (USE_TRANSLATIONS) {
-            mContentContainer.layout(0, 0, width, height);
-        } else {
-            mContentContainer.layout(offsetPixels, 0, width + offsetPixels, height);
-        }
-    }
-
-    /**
-     * Offsets the menu relative to its original position based on the position of the content.
-     *
-     * @param offsetPixels The number of pixels the content if offset.
-     */
-    private void offsetMenu(int offsetPixels) {
-        if (mOffsetMenu && mMenuSize != 0) {
-            final int menuWidth = mMenuSize;
-            final float openRatio = (menuWidth + (float) offsetPixels) / menuWidth;
-
-            if (USE_TRANSLATIONS) {
-                if (offsetPixels != 0) {
-                    final int offset = (int) (0.25f * (openRatio * menuWidth));
-                    mMenuContainer.setTranslationX(offset);
-                } else {
-                    mMenuContainer.setTranslationX(-menuWidth);
-                }
-
-            } else {
-                final int width = getWidth();
-                final int oldMenuRight = mMenuContainer.getRight();
-                final int newRight = width + (int) (0.25f * (openRatio * menuWidth));
-                final int offset = newRight - oldMenuRight;
-                mMenuContainer.offsetLeftAndRight(offset);
-                mMenuContainer.setVisibility(offsetPixels == 0 ? INVISIBLE : VISIBLE);
-            }
-        }
-    }
-
-    @Override
-    protected void drawDropShadow(Canvas canvas, int offsetPixels) {
-        final int height = getHeight();
-        final int width = getWidth();
-        final int left = width + offsetPixels;
-        final int right = left + mDropShadowSize;
-
-        mDropShadowDrawable.setBounds(left, 0, right, height);
-        mDropShadowDrawable.draw(canvas);
-    }
-
-    @Override
-    protected void drawMenuOverlay(Canvas canvas, int offsetPixels) {
-        final int height = getHeight();
-        final int width = getWidth();
-        final int left = width + offsetPixels;
-        final int right = width;
-        final float openRatio = ((float) Math.abs(offsetPixels)) / mMenuSize;
-
-        mMenuOverlay.setBounds(left, 0, right, height);
-        mMenuOverlay.setAlpha((int) (MAX_MENU_OVERLAY_ALPHA * (1.f - openRatio)));
-        mMenuOverlay.draw(canvas);
-    }
-
-    @Override
-    protected void drawIndicator(Canvas canvas, int offsetPixels) {
-        if (mActiveView != null && isViewDescendant(mActiveView)) {
-            Integer position = (Integer) mActiveView.getTag(R.id.mdActiveViewPosition);
-            final int pos = position == null ? 0 : position;
-
-            if (pos == mActivePosition) {
-                final int width = getWidth();
-                final int menuWidth = mMenuSize;
-                final int indicatorWidth = mActiveIndicator.getWidth();
-
-                final int contentRight = width + offsetPixels;
-                final float openRatio = ((float) Math.abs(offsetPixels)) / menuWidth;
-
-                mActiveView.getDrawingRect(mActiveRect);
-                offsetDescendantRectToMyCoords(mActiveView, mActiveRect);
-
-                final float interpolatedRatio = 1.f - INDICATOR_INTERPOLATOR.getInterpolation((1.f - openRatio));
-                final int interpolatedWidth = (int) (indicatorWidth * interpolatedRatio);
-
-                final int indicatorRight = contentRight + interpolatedWidth;
-                final int indicatorLeft = indicatorRight - indicatorWidth;
-
-                if (mIndicatorAnimating) {
-                    final int indicatorFinalTop = mActiveRect.top + ((mActiveRect.height()
-                            - mActiveIndicator.getHeight()) / 2);
-                    final int indicatorStartTop = mIndicatorStartPos;
-                    final int diff = indicatorFinalTop - indicatorStartTop;
-                    final int startOffset = (int) (diff * mIndicatorOffset);
-                    mIndicatorTop = indicatorStartTop + startOffset;
-                } else {
-                    mIndicatorTop = mActiveRect.top + ((mActiveRect.height() - mActiveIndicator.getHeight()) / 2);
-                }
-
-                canvas.save();
-                canvas.clipRect(contentRight, 0, indicatorRight, getHeight());
-                canvas.drawBitmap(mActiveIndicator, indicatorLeft, mIndicatorTop, null);
-                canvas.restore();
-            }
-        }
-    }
-
-    @Override
-    protected int getIndicatorStartPos() {
-        return mIndicatorTop;
-    }
-
-    @Override
-    protected void initPeekScroller() {
-        final int dx = -mMenuSize / 3;
-        mPeekScroller.startScroll(0, 0, dx, 0, PEEK_DURATION);
-    }
-
-    @Override
-    protected void onOffsetPixelsChanged(int offsetPixels) {
-        if (USE_TRANSLATIONS) {
-            mContentContainer.setTranslationX(offsetPixels);
-            offsetMenu(offsetPixels);
-            invalidate();
-        } else {
-            mContentContainer.offsetLeftAndRight(offsetPixels - mContentContainer.getLeft());
-            offsetMenu(offsetPixels);
-            invalidate();
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////
-    // Touch handling
-    //////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected boolean isContentTouch(MotionEvent ev) {
-        return ev.getX() < getWidth() + mOffsetPixels;
-    }
-
-    @Override
-    protected boolean onDownAllowDrag(MotionEvent ev) {
-        final int width = getWidth();
-        final int initialMotionX = (int) mInitialMotionX;
-
-        return (!mMenuVisible && initialMotionX >= width - mTouchSize)
-                || (mMenuVisible && initialMotionX <= width + mOffsetPixels);
-    }
-
-    @Override
-    protected boolean onMoveAllowDrag(MotionEvent ev, float diff) {
-        final int width = getWidth();
-        final int initialMotionX = (int) mInitialMotionX;
-
-        return (!mMenuVisible && initialMotionX >= width - mTouchSize && (diff < 0))
-                || (mMenuVisible && initialMotionX <= width + mOffsetPixels);
-    }
-
-    @Override
-    protected void onMoveEvent(float dx) {
-        final float newOffset = Math.max(Math.min(mOffsetPixels + dx, 0), -mMenuSize);
-        setOffsetPixels(newOffset);
-    }
-
-    @Override
-    protected void onUpEvent(MotionEvent ev) {
-        final int offsetPixels = (int) mOffsetPixels;
-        final int width = getWidth();
-
-        if (mIsDragging) {
-            mVelocityTracker.computeCurrentVelocity(1000, mMaxVelocity);
-            final int initialVelocity = (int) mVelocityTracker.getXVelocity();
-            mLastMotionX = ev.getX();
-            animateOffsetTo(mVelocityTracker.getXVelocity() > 0 ? 0 : -mMenuSize, initialVelocity, true);
-
-            // Close the menu when content is clicked while the menu is visible.
-        } else if (mMenuVisible && ev.getX() < width + offsetPixels) {
-            closeMenu();
-        }
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/RightStaticDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/RightStaticDrawer.java
deleted file mode 100644
index 2027b43acc..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/RightStaticDrawer.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package net.simonvt.menudrawer;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.drawable.GradientDrawable;
-import android.util.AttributeSet;
-
-public class RightStaticDrawer extends StaticDrawer {
-
-    private int mIndicatorTop;
-
-    RightStaticDrawer(Activity activity, int dragMode) {
-        super(activity, dragMode);
-    }
-
-    public RightStaticDrawer(Context context) {
-        super(context);
-    }
-
-    public RightStaticDrawer(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public RightStaticDrawer(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    protected void initDrawer(Context context, AttributeSet attrs, int defStyle) {
-        super.initDrawer(context, attrs, defStyle);
-        mPosition = Position.RIGHT;
-    }
-
-    @Override
-    public void setDropShadowColor(int color) {
-        final int endColor = color & 0x00FFFFFF;
-        mDropShadowDrawable = new GradientDrawable(GradientDrawable.Orientation.LEFT_RIGHT, new int[] {
-                color,
-                endColor,
-        });
-        invalidate();
-    }
-
-    @Override
-    protected void drawIndicator(Canvas canvas) {
-        if (mActiveView != null && isViewDescendant(mActiveView)) {
-            Integer position = (Integer) mActiveView.getTag(R.id.mdActiveViewPosition);
-            final int pos = position == null ? 0 : position;
-
-            if (pos == mActivePosition) {
-                final int width = getWidth();
-                final int menuWidth = mMenuSize;
-                final int indicatorWidth = mActiveIndicator.getWidth();
-
-                final int contentRight = width - menuWidth;
-
-                mActiveView.getDrawingRect(mActiveRect);
-                offsetDescendantRectToMyCoords(mActiveView, mActiveRect);
-
-                final int indicatorRight = contentRight + indicatorWidth;
-                final int indicatorLeft = contentRight;
-
-                if (mIndicatorAnimating) {
-                    final int indicatorFinalTop = mActiveRect.top + ((mActiveRect.height()
-                            - mActiveIndicator.getHeight()) / 2);
-                    final int indicatorStartTop = mIndicatorStartPos;
-                    final int diff = indicatorFinalTop - indicatorStartTop;
-                    final int startOffset = (int) (diff * mIndicatorOffset);
-                    mIndicatorTop = indicatorStartTop + startOffset;
-                } else {
-                    mIndicatorTop = mActiveRect.top + ((mActiveRect.height() - mActiveIndicator.getHeight()) / 2);
-                }
-
-                canvas.save();
-                canvas.clipRect(contentRight, 0, indicatorRight, getHeight());
-                canvas.drawBitmap(mActiveIndicator, indicatorLeft, mIndicatorTop, null);
-                canvas.restore();
-            }
-        }
-    }
-
-    @Override
-    protected int getIndicatorStartPos() {
-        return mIndicatorTop;
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/Scroller.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/Scroller.java
deleted file mode 100644
index 58f0fc54e5..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/Scroller.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.simonvt.menudrawer;
-
-import android.content.Context;
-import android.hardware.SensorManager;
-import android.os.Build;
-import android.util.FloatMath;
-import android.view.ViewConfiguration;
-import android.view.animation.AnimationUtils;
-import android.view.animation.Interpolator;
-
-
-/**
- * This class encapsulates scrolling.  The duration of the scroll
- * can be passed in the constructor and specifies the maximum time that
- * the scrolling animation should take.  Past this time, the scrolling is
- * automatically moved to its final stage and computeScrollOffset()
- * will always return false to indicate that scrolling is over.
- */
-public class Scroller  {
-    private int mMode;
-
-    private int mStartX;
-    private int mStartY;
-    private int mFinalX;
-    private int mFinalY;
-
-    private int mMinX;
-    private int mMaxX;
-    private int mMinY;
-    private int mMaxY;
-
-    private int mCurrX;
-    private int mCurrY;
-    private long mStartTime;
-    private int mDuration;
-    private float mDurationReciprocal;
-    private float mDeltaX;
-    private float mDeltaY;
-    private boolean mFinished;
-    private Interpolator mInterpolator;
-    private boolean mFlywheel;
-
-    private float mVelocity;
-
-    private static final int DEFAULT_DURATION = 250;
-    private static final int SCROLL_MODE = 0;
-    private static final int FLING_MODE = 1;
-
-    private static final float DECELERATION_RATE = (float) (Math.log(0.75) / Math.log(0.9));
-    private static final float ALPHA = 800; // pixels / seconds
-    private static final float START_TENSION = 0.4f; // Tension at start: (0.4 * total T, 1.0 * Distance)
-    private static final float END_TENSION = 1.0f - START_TENSION;
-    private static final int NB_SAMPLES = 100;
-    private static final float[] SPLINE = new float[NB_SAMPLES + 1];
-
-    private float mDeceleration;
-    private final float mPpi;
-
-    static {
-        float xMin = 0.0f;
-        for (int i = 0; i <= NB_SAMPLES; i++) {
-            final float t = (float) i / NB_SAMPLES;
-            float xMax = 1.0f;
-            float x, tx, coef;
-            while (true) {
-                x = xMin + (xMax - xMin) / 2.0f;
-                coef = 3.0f * x * (1.0f - x);
-                tx = coef * ((1.0f - x) * START_TENSION + x * END_TENSION) + x * x * x;
-                if (Math.abs(tx - t) < 1E-5) break;
-                if (tx > t) xMax = x;
-                else xMin = x;
-            }
-            final float d = coef + x * x * x;
-            SPLINE[i] = d;
-        }
-        SPLINE[NB_SAMPLES] = 1.0f;
-
-        // This controls the viscous fluid effect (how much of it)
-        sViscousFluidScale = 8.0f;
-        // must be set to 1.0 (used in viscousFluid())
-        sViscousFluidNormalize = 1.0f;
-        sViscousFluidNormalize = 1.0f / viscousFluid(1.0f);
-    }
-
-    private static float sViscousFluidScale;
-    private static float sViscousFluidNormalize;
-
-    /**
-     * Create a Scroller with the default duration and interpolator.
-     */
-    public Scroller(Context context) {
-        this(context, null);
-    }
-
-    /**
-     * Create a Scroller with the specified interpolator. If the interpolator is
-     * null, the default (viscous) interpolator will be used. "Flywheel" behavior will
-     * be in effect for apps targeting Honeycomb or newer.
-     */
-    public Scroller(Context context, Interpolator interpolator) {
-        this(context, interpolator,
-                context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.HONEYCOMB);
-    }
-
-    /**
-     * Create a Scroller with the specified interpolator. If the interpolator is
-     * null, the default (viscous) interpolator will be used. Specify whether or
-     * not to support progressive "flywheel" behavior in flinging.
-     */
-    public Scroller(Context context, Interpolator interpolator, boolean flywheel) {
-        mFinished = true;
-        mInterpolator = interpolator;
-        mPpi = context.getResources().getDisplayMetrics().density * 160.0f;
-        mDeceleration = computeDeceleration(ViewConfiguration.getScrollFriction());
-        mFlywheel = flywheel;
-    }
-
-    /**
-     * The amount of friction applied to flings. The default value
-     * is {@link android.view.ViewConfiguration#getScrollFriction}.
-     *
-     * @param friction A scalar dimension-less value representing the coefficient of
-     *         friction.
-     */
-    public final void setFriction(float friction) {
-        mDeceleration = computeDeceleration(friction);
-    }
-
-    private float computeDeceleration(float friction) {
-        return SensorManager.GRAVITY_EARTH   // g (m/s^2)
-                      * 39.37f               // inch/meter
-                      * mPpi                 // pixels per inch
-                      * friction;
-    }
-
-    /**
-     *
-     * Returns whether the scroller has finished scrolling.
-     *
-     * @return True if the scroller has finished scrolling, false otherwise.
-     */
-    public final boolean isFinished() {
-        return mFinished;
-    }
-
-    /**
-     * Force the finished field to a particular value.
-     *
-     * @param finished The new finished value.
-     */
-    public final void forceFinished(boolean finished) {
-        mFinished = finished;
-    }
-
-    /**
-     * Returns how long the scroll event will take, in milliseconds.
-     *
-     * @return The duration of the scroll in milliseconds.
-     */
-    public final int getDuration() {
-        return mDuration;
-    }
-
-    /**
-     * Returns the current X offset in the scroll.
-     *
-     * @return The new X offset as an absolute distance from the origin.
-     */
-    public final int getCurrX() {
-        return mCurrX;
-    }
-
-    /**
-     * Returns the current Y offset in the scroll.
-     *
-     * @return The new Y offset as an absolute distance from the origin.
-     */
-    public final int getCurrY() {
-        return mCurrY;
-    }
-
-    /**
-     * Returns the current velocity.
-     *
-     * @return The original velocity less the deceleration. Result may be
-     * negative.
-     */
-    public float getCurrVelocity() {
-        return mVelocity - mDeceleration * timePassed() / 2000.0f;
-    }
-
-    /**
-     * Returns the start X offset in the scroll.
-     *
-     * @return The start X offset as an absolute distance from the origin.
-     */
-    public final int getStartX() {
-        return mStartX;
-    }
-
-    /**
-     * Returns the start Y offset in the scroll.
-     *
-     * @return The start Y offset as an absolute distance from the origin.
-     */
-    public final int getStartY() {
-        return mStartY;
-    }
-
-    /**
-     * Returns where the scroll will end. Valid only for "fling" scrolls.
-     *
-     * @return The final X offset as an absolute distance from the origin.
-     */
-    public final int getFinalX() {
-        return mFinalX;
-    }
-
-    /**
-     * Returns where the scroll will end. Valid only for "fling" scrolls.
-     *
-     * @return The final Y offset as an absolute distance from the origin.
-     */
-    public final int getFinalY() {
-        return mFinalY;
-    }
-
-    /**
-     * Call this when you want to know the new location.  If it returns true,
-     * the animation is not yet finished.  loc will be altered to provide the
-     * new location.
-     */
-    public boolean computeScrollOffset() {
-        if (mFinished) {
-            return false;
-        }
-
-        int timePassed = (int) (AnimationUtils.currentAnimationTimeMillis() - mStartTime);
-
-        if (timePassed < mDuration) {
-            switch (mMode) {
-            case SCROLL_MODE:
-                float x = timePassed * mDurationReciprocal;
-
-                if (mInterpolator == null)
-                    x = viscousFluid(x);
-                else
-                    x = mInterpolator.getInterpolation(x);
-
-                mCurrX = mStartX + Math.round(x * mDeltaX);
-                mCurrY = mStartY + Math.round(x * mDeltaY);
-                break;
-            case FLING_MODE:
-                final float t = (float) timePassed / mDuration;
-                final int index = (int) (NB_SAMPLES * t);
-                final float tInf = (float) index / NB_SAMPLES;
-                final float tSup = (float) (index + 1) / NB_SAMPLES;
-                final float dInf = SPLINE[index];
-                final float dSup = SPLINE[index + 1];
-                final float distanceCoef = dInf + (t - tInf) / (tSup - tInf) * (dSup - dInf);
-
-                mCurrX = mStartX + Math.round(distanceCoef * (mFinalX - mStartX));
-                // Pin to mMinX <= mCurrX <= mMaxX
-                mCurrX = Math.min(mCurrX, mMaxX);
-                mCurrX = Math.max(mCurrX, mMinX);
-
-                mCurrY = mStartY + Math.round(distanceCoef * (mFinalY - mStartY));
-                // Pin to mMinY <= mCurrY <= mMaxY
-                mCurrY = Math.min(mCurrY, mMaxY);
-                mCurrY = Math.max(mCurrY, mMinY);
-
-                if (mCurrX == mFinalX && mCurrY == mFinalY) {
-                    mFinished = true;
-                }
-
-                break;
-            }
-        } else {
-            mCurrX = mFinalX;
-            mCurrY = mFinalY;
-            mFinished = true;
-        }
-        return true;
-    }
-
-    /**
-     * Start scrolling by providing a starting point and the distance to travel.
-     * The scroll will use the default value of 250 milliseconds for the
-     * duration.
-     *
-     * @param startX Starting horizontal scroll offset in pixels. Positive
-     *        numbers will scroll the content to the left.
-     * @param startY Starting vertical scroll offset in pixels. Positive numbers
-     *        will scroll the content up.
-     * @param dx Horizontal distance to travel. Positive numbers will scroll the
-     *        content to the left.
-     * @param dy Vertical distance to travel. Positive numbers will scroll the
-     *        content up.
-     */
-    public void startScroll(int startX, int startY, int dx, int dy) {
-        startScroll(startX, startY, dx, dy, DEFAULT_DURATION);
-    }
-
-    /**
-     * Start scrolling by providing a starting point and the distance to travel.
-     *
-     * @param startX Starting horizontal scroll offset in pixels. Positive
-     *        numbers will scroll the content to the left.
-     * @param startY Starting vertical scroll offset in pixels. Positive numbers
-     *        will scroll the content up.
-     * @param dx Horizontal distance to travel. Positive numbers will scroll the
-     *        content to the left.
-     * @param dy Vertical distance to travel. Positive numbers will scroll the
-     *        content up.
-     * @param duration Duration of the scroll in milliseconds.
-     */
-    public void startScroll(int startX, int startY, int dx, int dy, int duration) {
-        mMode = SCROLL_MODE;
-        mFinished = false;
-        mDuration = duration;
-        mStartTime = AnimationUtils.currentAnimationTimeMillis();
-        mStartX = startX;
-        mStartY = startY;
-        mFinalX = startX + dx;
-        mFinalY = startY + dy;
-        mDeltaX = dx;
-        mDeltaY = dy;
-        mDurationReciprocal = 1.0f / (float) mDuration;
-    }
-
-    /**
-     * Start scrolling based on a fling gesture. The distance travelled will
-     * depend on the initial velocity of the fling.
-     *
-     * @param startX Starting point of the scroll (X)
-     * @param startY Starting point of the scroll (Y)
-     * @param velocityX Initial velocity of the fling (X) measured in pixels per
-     *        second.
-     * @param velocityY Initial velocity of the fling (Y) measured in pixels per
-     *        second
-     * @param minX Minimum X value. The scroller will not scroll past this
-     *        point.
-     * @param maxX Maximum X value. The scroller will not scroll past this
-     *        point.
-     * @param minY Minimum Y value. The scroller will not scroll past this
-     *        point.
-     * @param maxY Maximum Y value. The scroller will not scroll past this
-     *        point.
-     */
-    public void fling(int startX, int startY, int velocityX, int velocityY,
-            int minX, int maxX, int minY, int maxY) {
-        // Continue a scroll or fling in progress
-        if (mFlywheel && !mFinished) {
-            float oldVel = getCurrVelocity();
-
-            float dx = (float) (mFinalX - mStartX);
-            float dy = (float) (mFinalY - mStartY);
-            float hyp = FloatMath.sqrt(dx * dx + dy * dy);
-
-            float ndx = dx / hyp;
-            float ndy = dy / hyp;
-
-            float oldVelocityX = ndx * oldVel;
-            float oldVelocityY = ndy * oldVel;
-            if (Math.signum(velocityX) == Math.signum(oldVelocityX)
-                    && Math.signum(velocityY) == Math.signum(oldVelocityY)) {
-                velocityX += oldVelocityX;
-                velocityY += oldVelocityY;
-            }
-        }
-
-        mMode = FLING_MODE;
-        mFinished = false;
-
-        float velocity = FloatMath.sqrt(velocityX * velocityX + velocityY * velocityY);
-
-        mVelocity = velocity;
-        final double l = Math.log(START_TENSION * velocity / ALPHA);
-        mDuration = (int) (1000.0 * Math.exp(l / (DECELERATION_RATE - 1.0)));
-        mStartTime = AnimationUtils.currentAnimationTimeMillis();
-        mStartX = startX;
-        mStartY = startY;
-
-        float coeffX = velocity == 0 ? 1.0f : velocityX / velocity;
-        float coeffY = velocity == 0 ? 1.0f : velocityY / velocity;
-
-        int totalDistance =
-                (int) (ALPHA * Math.exp(DECELERATION_RATE / (DECELERATION_RATE - 1.0) * l));
-
-        mMinX = minX;
-        mMaxX = maxX;
-        mMinY = minY;
-        mMaxY = maxY;
-
-        mFinalX = startX + Math.round(totalDistance * coeffX);
-        // Pin to mMinX <= mFinalX <= mMaxX
-        mFinalX = Math.min(mFinalX, mMaxX);
-        mFinalX = Math.max(mFinalX, mMinX);
-
-        mFinalY = startY + Math.round(totalDistance * coeffY);
-        // Pin to mMinY <= mFinalY <= mMaxY
-        mFinalY = Math.min(mFinalY, mMaxY);
-        mFinalY = Math.max(mFinalY, mMinY);
-    }
-
-    static float viscousFluid(float x) {
-        x *= sViscousFluidScale;
-        if (x < 1.0f) {
-            x -= (1.0f - (float) Math.exp(-x));
-        } else {
-            float start = 0.36787944117f;   // 1/e == exp(-1)
-            x = 1.0f - (float) Math.exp(1.0f - x);
-            x = start + x * (1.0f - start);
-        }
-        x *= sViscousFluidNormalize;
-        return x;
-    }
-
-    /**
-     * Stops the animation. Contrary to {@link #forceFinished(boolean)},
-     * aborting the animating cause the scroller to move to the final x and y
-     * position
-     *
-     * @see #forceFinished(boolean)
-     */
-    public void abortAnimation() {
-        mCurrX = mFinalX;
-        mCurrY = mFinalY;
-        mFinished = true;
-    }
-
-    /**
-     * Extend the scroll animation. This allows a running animation to scroll
-     * further and longer, when used with {@link #setFinalX(int)} or {@link #setFinalY(int)}.
-     *
-     * @param extend Additional time to scroll in milliseconds.
-     * @see #setFinalX(int)
-     * @see #setFinalY(int)
-     */
-    public void extendDuration(int extend) {
-        int passed = timePassed();
-        mDuration = passed + extend;
-        mDurationReciprocal = 1.0f / mDuration;
-        mFinished = false;
-    }
-
-    /**
-     * Returns the time elapsed since the beginning of the scrolling.
-     *
-     * @return The elapsed time in milliseconds.
-     */
-    public int timePassed() {
-        return (int) (AnimationUtils.currentAnimationTimeMillis() - mStartTime);
-    }
-
-    /**
-     * Sets the final position (X) for this scroller.
-     *
-     * @param newX The new X offset as an absolute distance from the origin.
-     * @see #extendDuration(int)
-     * @see #setFinalY(int)
-     */
-    public void setFinalX(int newX) {
-        mFinalX = newX;
-        mDeltaX = mFinalX - mStartX;
-        mFinished = false;
-    }
-
-    /**
-     * Sets the final position (Y) for this scroller.
-     *
-     * @param newY The new Y offset as an absolute distance from the origin.
-     * @see #extendDuration(int)
-     * @see #setFinalX(int)
-     */
-    public void setFinalY(int newY) {
-        mFinalY = newY;
-        mDeltaY = mFinalY - mStartY;
-        mFinished = false;
-    }
-
-    /**
-     * @hide
-     */
-    public boolean isScrollingInDirection(float xvel, float yvel) {
-        return !mFinished && Math.signum(xvel) == Math.signum(mFinalX - mStartX)
-                && Math.signum(yvel) == Math.signum(mFinalY - mStartY);
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/SinusoidalInterpolator.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/SinusoidalInterpolator.java
deleted file mode 100644
index e79051a06b..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/SinusoidalInterpolator.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package net.simonvt.menudrawer;
-
-import android.view.animation.Interpolator;
-
-/**
- * Interpolator which, when drawn from 0 to 1, looks like half a sine-wave. Used for smoother opening/closing when
- * peeking at the drawer.
- */
-public class SinusoidalInterpolator implements Interpolator {
-
-    @Override
-    public float getInterpolation(float input) {
-        return (float) (0.5f + 0.5f * Math.sin(input * Math.PI - Math.PI / 2.f));
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/SmoothInterpolator.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/SmoothInterpolator.java
deleted file mode 100644
index cfdcb69bf3..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/SmoothInterpolator.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package net.simonvt.menudrawer;
-
-import android.view.animation.Interpolator;
-
-public class SmoothInterpolator implements Interpolator {
-
-    @Override
-    public float getInterpolation(float t) {
-        t -= 1.0f;
-        return t * t * t * t * t + 1.0f;
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/StaticDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/StaticDrawer.java
deleted file mode 100644
index 879f2c9504..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/StaticDrawer.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package net.simonvt.menudrawer;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.util.AttributeSet;
-
-public abstract class StaticDrawer extends MenuDrawer {
-
-    protected Position mPosition;
-
-    StaticDrawer(Activity activity, int dragMode) {
-        super(activity, dragMode);
-    }
-
-    public StaticDrawer(Context context) {
-        super(context);
-    }
-
-    public StaticDrawer(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public StaticDrawer(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    protected void dispatchDraw(Canvas canvas) {
-        super.dispatchDraw(canvas);
-        if (mDropShadowEnabled) drawDropShadow(canvas);
-        if (mActiveIndicator != null) drawIndicator(canvas);
-    }
-
-    private void drawDropShadow(Canvas canvas) {
-        final int width = getWidth();
-        final int height = getHeight();
-        final int menuSize = mMenuSize;
-        final int dropShadowSize = mDropShadowSize;
-
-        switch (mPosition) {
-            case LEFT:
-                mDropShadowDrawable.setBounds(menuSize - dropShadowSize, 0, menuSize, height);
-                break;
-
-            case TOP:
-                mDropShadowDrawable.setBounds(0, menuSize - dropShadowSize, width, menuSize);
-                break;
-
-            case RIGHT:
-                mDropShadowDrawable.setBounds(width - menuSize, 0, width - menuSize + dropShadowSize, height);
-                break;
-
-            case BOTTOM:
-                mDropShadowDrawable.setBounds(0, height - menuSize, width, height - menuSize + dropShadowSize);
-                break;
-        }
-
-        mDropShadowDrawable.draw(canvas);
-    }
-
-    protected abstract void drawIndicator(Canvas canvas);
-
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        final int width = r - l;
-        final int height = b - t;
-
-        switch (mPosition) {
-            case LEFT:
-                mMenuContainer.layout(0, 0, mMenuSize, height);
-                mContentContainer.layout(mMenuSize, 0, width, height);
-                break;
-
-            case RIGHT:
-                mMenuContainer.layout(width - mMenuSize, 0, width, height);
-                mContentContainer.layout(0, 0, width - mMenuSize, height);
-                break;
-
-            case TOP:
-                mMenuContainer.layout(0, 0, width, mMenuSize);
-                mContentContainer.layout(0, mMenuSize, width, height);
-                break;
-
-            case BOTTOM:
-                mMenuContainer.layout(0, height - mMenuSize, width, height);
-                mContentContainer.layout(0, 0, width, height - mMenuSize);
-                break;
-        }
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        final int widthMode = MeasureSpec.getMode(widthMeasureSpec);
-        final int heightMode = MeasureSpec.getMode(heightMeasureSpec);
-
-        if (widthMode != MeasureSpec.EXACTLY || heightMode != MeasureSpec.EXACTLY) {
-            throw new IllegalStateException("Must measure with an exact size");
-        }
-
-        final int width = MeasureSpec.getSize(widthMeasureSpec);
-        final int height = MeasureSpec.getSize(heightMeasureSpec);
-
-        if (!mMenuSizeSet) mMenuSize = (int) (height * 0.25f);
-
-        switch (mPosition) {
-            case LEFT:
-            case RIGHT: {
-                final int childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY);
-
-                final int menuWidth = mMenuSize;
-                final int menuWidthMeasureSpec = MeasureSpec.makeMeasureSpec(menuWidth, MeasureSpec.EXACTLY);
-
-                final int contentWidth = width - menuWidth;
-                final int contentWidthMeasureSpec = MeasureSpec.makeMeasureSpec(contentWidth, MeasureSpec.EXACTLY);
-
-                mContentContainer.measure(contentWidthMeasureSpec, childHeightMeasureSpec);
-                mMenuContainer.measure(menuWidthMeasureSpec, childHeightMeasureSpec);
-                break;
-            }
-
-            case TOP:
-            case BOTTOM: {
-                final int childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY);
-
-                final int menuHeight = mMenuSize;
-                final int menuHeightMeasureSpec = MeasureSpec.makeMeasureSpec(menuHeight, MeasureSpec.EXACTLY);
-
-                final int contentHeight = height - menuHeight;
-                final int contentHeightMeasureSpec = MeasureSpec.makeMeasureSpec(contentHeight, MeasureSpec.EXACTLY);
-
-                mContentContainer.measure(childWidthMeasureSpec, contentHeightMeasureSpec);
-                mMenuContainer.measure(childWidthMeasureSpec, menuHeightMeasureSpec);
-                break;
-            }
-        }
-
-        setMeasuredDimension(width, height);
-    }
-
-    @Override
-    public void toggleMenu(boolean animate) {
-    }
-
-    @Override
-    public void openMenu(boolean animate) {
-    }
-
-    @Override
-    public void closeMenu(boolean animate) {
-    }
-
-    @Override
-    public boolean isMenuVisible() {
-        return true;
-    }
-
-    @Override
-    public void setMenuSize(int size) {
-        mMenuSize = size;
-        mMenuSizeSet = true;
-        requestLayout();
-        invalidate();
-    }
-
-    @Override
-    public void setOffsetMenuEnabled(boolean offsetMenu) {
-    }
-
-    @Override
-    public boolean getOffsetMenuEnabled() {
-        return false;
-    }
-
-    @Override
-    public void peekDrawer() {
-    }
-
-    @Override
-    public void peekDrawer(long delay) {
-    }
-
-    @Override
-    public void peekDrawer(long startDelay, long delay) {
-    }
-
-    @Override
-    public void setHardwareLayerEnabled(boolean enabled) {
-    }
-
-    @Override
-    public int getTouchMode() {
-        return TOUCH_MODE_NONE;
-    }
-
-    @Override
-    public void setTouchMode(int mode) {
-    }
-
-    @Override
-    public void setTouchBezelSize(int size) {
-    }
-
-    @Override
-    public int getTouchBezelSize() {
-        return 0;
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/TopDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/TopDrawer.java
deleted file mode 100644
index 0af2c6bad8..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/TopDrawer.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package net.simonvt.menudrawer;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.drawable.GradientDrawable;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-
-public class TopDrawer extends VerticalDrawer {
-
-    private int mIndicatorLeft;
-
-    TopDrawer(Activity activity, int dragMode) {
-        super(activity, dragMode);
-    }
-
-    public TopDrawer(Context context) {
-        super(context);
-    }
-
-    public TopDrawer(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public TopDrawer(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    public void openMenu(boolean animate) {
-        animateOffsetTo(mMenuSize, 0, animate);
-    }
-
-    @Override
-    public void closeMenu(boolean animate) {
-        animateOffsetTo(0, 0, animate);
-    }
-
-    @Override
-    public void setDropShadowColor(int color) {
-        final int endColor = color & 0x00FFFFFF;
-        mDropShadowDrawable = new GradientDrawable(GradientDrawable.Orientation.BOTTOM_TOP,
-                new int[] {
-                        color,
-                        endColor,
-                });
-        invalidate();
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        final int width = r - l;
-        final int height = b - t;
-        final int offsetPixels = (int) mOffsetPixels;
-
-        mMenuContainer.layout(0, 0, width, mMenuSize);
-        offsetMenu(offsetPixels);
-
-        if (USE_TRANSLATIONS) {
-            mContentContainer.layout(0, 0, width, height);
-        } else {
-            mContentContainer.layout(0, offsetPixels, width, height + offsetPixels);
-        }
-    }
-
-    /**
-     * Offsets the menu relative to its original position based on the position of the content.
-     *
-     * @param offsetPixels The number of pixels the content if offset.
-     */
-    private void offsetMenu(int offsetPixels) {
-        if (mOffsetMenu && mMenuSize != 0) {
-            final int menuSize = mMenuSize;
-            final float openRatio = (menuSize - (float) offsetPixels) / menuSize;
-
-            if (USE_TRANSLATIONS) {
-                if (offsetPixels > 0) {
-                    final int offset = (int) (0.25f * (-openRatio * menuSize));
-                    mMenuContainer.setTranslationY(offset);
-                } else {
-                    mMenuContainer.setTranslationY(-menuSize);
-                }
-
-            } else {
-                final int oldMenuTop = mMenuContainer.getTop();
-                final int offset = (int) (0.25f * (-openRatio * menuSize)) - oldMenuTop;
-                mMenuContainer.offsetTopAndBottom(offset);
-                mMenuContainer.setVisibility(offsetPixels == 0 ? INVISIBLE : VISIBLE);
-            }
-        }
-    }
-
-    @Override
-    protected void drawDropShadow(Canvas canvas, int offsetPixels) {
-        final int width = getWidth();
-
-        mDropShadowDrawable.setBounds(0, offsetPixels - mDropShadowSize, width, offsetPixels);
-        mDropShadowDrawable.draw(canvas);
-    }
-
-    @Override
-    protected void drawMenuOverlay(Canvas canvas, int offsetPixels) {
-        final int width = getWidth();
-        final float openRatio = ((float) offsetPixels) / mMenuSize;
-
-        mMenuOverlay.setBounds(0, 0, width, offsetPixels);
-        mMenuOverlay.setAlpha((int) (MAX_MENU_OVERLAY_ALPHA * (1.f - openRatio)));
-        mMenuOverlay.draw(canvas);
-    }
-
-    @Override
-    protected void drawIndicator(Canvas canvas, int offsetPixels) {
-        if (mActiveView != null && isViewDescendant(mActiveView)) {
-            Integer position = (Integer) mActiveView.getTag(R.id.mdActiveViewPosition);
-            final int pos = position == null ? 0 : position;
-
-            if (pos == mActivePosition) {
-                final int menuHeight = mMenuSize;
-                final int indicatorHeight = mActiveIndicator.getHeight();
-
-                final float openRatio = ((float) offsetPixels) / menuHeight;
-
-                mActiveView.getDrawingRect(mActiveRect);
-                offsetDescendantRectToMyCoords(mActiveView, mActiveRect);
-                final int indicatorWidth = mActiveIndicator.getWidth();
-
-                final float interpolatedRatio = 1.f - INDICATOR_INTERPOLATOR.getInterpolation((1.f - openRatio));
-                final int interpolatedHeight = (int) (indicatorHeight * interpolatedRatio);
-
-                final int indicatorTop = offsetPixels - interpolatedHeight;
-                if (mIndicatorAnimating) {
-                    final int finalLeft = mActiveRect.left + ((mActiveRect.width() - indicatorWidth) / 2);
-                    final int startLeft = mIndicatorStartPos;
-                    final int diff = finalLeft - startLeft;
-                    final int startOffset = (int) (diff * mIndicatorOffset);
-                    mIndicatorLeft = startLeft + startOffset;
-                } else {
-                    mIndicatorLeft = mActiveRect.left + ((mActiveRect.width() - indicatorWidth) / 2);
-                }
-
-                canvas.save();
-                canvas.clipRect(mIndicatorLeft, indicatorTop, mIndicatorLeft + indicatorWidth, offsetPixels);
-                canvas.drawBitmap(mActiveIndicator, mIndicatorLeft, indicatorTop, null);
-                canvas.restore();
-            }
-        }
-    }
-
-    @Override
-    protected int getIndicatorStartPos() {
-        return mIndicatorLeft;
-    }
-
-    @Override
-    protected void initPeekScroller() {
-        final int dx = mMenuSize / 3;
-        mPeekScroller.startScroll(0, 0, dx, 0, PEEK_DURATION);
-    }
-
-    @Override
-    protected void onOffsetPixelsChanged(int offsetPixels) {
-        if (USE_TRANSLATIONS) {
-            mContentContainer.setTranslationY(offsetPixels);
-            offsetMenu(offsetPixels);
-            invalidate();
-        } else {
-            mContentContainer.offsetTopAndBottom(offsetPixels - mContentContainer.getTop());
-            offsetMenu(offsetPixels);
-            invalidate();
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////
-    // Touch handling
-    //////////////////////////////////////////////////////////////////////
-
-    @Override
-    protected boolean isContentTouch(MotionEvent ev) {
-        return ev.getY() > mOffsetPixels;
-    }
-
-    @Override
-    protected boolean onDownAllowDrag(MotionEvent ev) {
-        return (!mMenuVisible && mInitialMotionY <= mTouchSize)
-                || (mMenuVisible && mInitialMotionY >= mOffsetPixels);
-    }
-
-    @Override
-    protected boolean onMoveAllowDrag(MotionEvent ev, float diff) {
-        return (!mMenuVisible && mInitialMotionY <= mTouchSize && (diff > 0))
-                || (mMenuVisible && mInitialMotionY >= mOffsetPixels);
-    }
-
-    @Override
-    protected void onMoveEvent(float dx) {
-        setOffsetPixels(Math.min(Math.max(mOffsetPixels + dx, 0), mMenuSize));
-    }
-
-    @Override
-    protected void onUpEvent(MotionEvent ev) {
-        final int offsetPixels = (int) mOffsetPixels;
-
-        if (mIsDragging) {
-            mVelocityTracker.computeCurrentVelocity(1000, mMaxVelocity);
-            final int initialVelocity = (int) mVelocityTracker.getXVelocity();
-            mLastMotionY = ev.getY();
-            animateOffsetTo(mVelocityTracker.getYVelocity() > 0 ? mMenuSize : 0, initialVelocity,
-                    true);
-
-            // Close the menu when content is clicked while the menu is visible.
-        } else if (mMenuVisible && ev.getY() > offsetPixels) {
-            closeMenu();
-        }
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/TopStaticDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/TopStaticDrawer.java
deleted file mode 100644
index ac846148b1..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/TopStaticDrawer.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package net.simonvt.menudrawer;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.drawable.GradientDrawable;
-import android.util.AttributeSet;
-
-public class TopStaticDrawer extends StaticDrawer {
-
-    private int mIndicatorLeft;
-
-    TopStaticDrawer(Activity activity, int dragMode) {
-        super(activity, dragMode);
-    }
-
-    public TopStaticDrawer(Context context) {
-        super(context);
-    }
-
-    public TopStaticDrawer(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public TopStaticDrawer(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    protected void initDrawer(Context context, AttributeSet attrs, int defStyle) {
-        super.initDrawer(context, attrs, defStyle);
-        mPosition = Position.TOP;
-    }
-
-    @Override
-    public void setDropShadowColor(int color) {
-        final int endColor = color & 0x00FFFFFF;
-        mDropShadowDrawable = new GradientDrawable(GradientDrawable.Orientation.BOTTOM_TOP, new int[] {
-                color,
-                endColor,
-        });
-        invalidate();
-    }
-
-    @Override
-    protected void drawIndicator(Canvas canvas) {
-        if (mActiveView != null && isViewDescendant(mActiveView)) {
-            Integer position = (Integer) mActiveView.getTag(R.id.mdActiveViewPosition);
-            final int pos = position == null ? 0 : position;
-
-            if (pos == mActivePosition) {
-                final int menuHeight = mMenuSize;
-                final int indicatorHeight = mActiveIndicator.getHeight();
-
-                mActiveView.getDrawingRect(mActiveRect);
-                offsetDescendantRectToMyCoords(mActiveView, mActiveRect);
-                final int indicatorWidth = mActiveIndicator.getWidth();
-
-                final int indicatorTop = menuHeight - indicatorHeight;
-                if (mIndicatorAnimating) {
-                    final int finalLeft = mActiveRect.left + ((mActiveRect.width() - indicatorWidth) / 2);
-                    final int startLeft = mIndicatorStartPos;
-                    final int diff = finalLeft - startLeft;
-                    final int startOffset = (int) (diff * mIndicatorOffset);
-                    mIndicatorLeft = startLeft + startOffset;
-                } else {
-                    mIndicatorLeft = mActiveRect.left + ((mActiveRect.width() - indicatorWidth) / 2);
-                }
-
-                canvas.save();
-                canvas.clipRect(mIndicatorLeft, indicatorTop, mIndicatorLeft + indicatorWidth, menuHeight);
-                canvas.drawBitmap(mActiveIndicator, mIndicatorLeft, indicatorTop, null);
-                canvas.restore();
-            }
-        }
-    }
-
-    @Override
-    protected int getIndicatorStartPos() {
-        return mIndicatorLeft;
-    }
-}
diff --git a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/VerticalDrawer.java b/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/VerticalDrawer.java
deleted file mode 100644
index 415d49896e..0000000000
--- a/Externals/android-menudrawer/library/src/net/simonvt/menudrawer/VerticalDrawer.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package net.simonvt.menudrawer;
-
-import android.app.Activity;
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.VelocityTracker;
-
-public abstract class VerticalDrawer extends DraggableDrawer {
-
-    VerticalDrawer(Activity activity, int dragMode) {
-        super(activity, dragMode);
-    }
-
-    public VerticalDrawer(Context context) {
-        super(context);
-    }
-
-    public VerticalDrawer(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public VerticalDrawer(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        final int widthMode = MeasureSpec.getMode(widthMeasureSpec);
-        final int heightMode = MeasureSpec.getMode(heightMeasureSpec);
-
-        if (widthMode != MeasureSpec.EXACTLY || heightMode != MeasureSpec.EXACTLY) {
-            throw new IllegalStateException("Must measure with an exact size");
-        }
-
-        final int width = MeasureSpec.getSize(widthMeasureSpec);
-        final int height = MeasureSpec.getSize(heightMeasureSpec);
-
-        if (!mMenuSizeSet) mMenuSize = (int) (height * 0.25f);
-        if (mOffsetPixels == -1) openMenu(false);
-
-        final int menuWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec, 0, width);
-        final int menuHeightMeasureSpec = getChildMeasureSpec(widthMeasureSpec, 0, mMenuSize);
-        mMenuContainer.measure(menuWidthMeasureSpec, menuHeightMeasureSpec);
-
-        final int contentWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec, 0, width);
-        final int contentHeightMeasureSpec = getChildMeasureSpec(widthMeasureSpec, 0, height);
-        mContentContainer.measure(contentWidthMeasureSpec, contentHeightMeasureSpec);
-
-        setMeasuredDimension(width, height);
-
-        updateTouchAreaSize();
-    }
-
-    @Override
-    public boolean onInterceptTouchEvent(MotionEvent ev) {
-        final int action = ev.getAction() & MotionEvent.ACTION_MASK;
-
-        if (action == MotionEvent.ACTION_DOWN && mMenuVisible && isCloseEnough()) {
-            setOffsetPixels(0);
-            stopAnimation();
-            endPeek();
-            setDrawerState(STATE_CLOSED);
-        }
-
-        // Always intercept events over the content while menu is visible.
-        if (mMenuVisible && isContentTouch(ev)) {
-            return true;
-        }
-
-        if (mTouchMode == TOUCH_MODE_NONE) {
-            return false;
-        }
-
-        if (action != MotionEvent.ACTION_DOWN) {
-            if (mIsDragging) {
-                return true;
-            }
-        }
-
-        switch (action) {
-            case MotionEvent.ACTION_DOWN: {
-                mLastMotionX = mInitialMotionX = ev.getX();
-                mLastMotionY = mInitialMotionY = ev.getY();
-                final boolean allowDrag = onDownAllowDrag(ev);
-
-                if (allowDrag) {
-                    setDrawerState(mMenuVisible ? STATE_OPEN : STATE_CLOSED);
-                    stopAnimation();
-                    endPeek();
-                    mIsDragging = false;
-                }
-                break;
-            }
-
-            case MotionEvent.ACTION_MOVE: {
-                final float x = ev.getX();
-                final float dx = x - mLastMotionX;
-                final float xDiff = Math.abs(dx);
-                final float y = ev.getY();
-                final float dy = y - mLastMotionY;
-                final float yDiff = Math.abs(dy);
-
-                if (yDiff > mTouchSlop && yDiff > xDiff) {
-                    if (mOnInterceptMoveEventListener != null && mTouchMode == TOUCH_MODE_FULLSCREEN
-                            && canChildScrollVertically(mContentContainer, false, (int) dx, (int) x, (int) y)) {
-                        endDrag(); // Release the velocity tracker
-                        return false;
-                    }
-
-                    final boolean allowDrag = onMoveAllowDrag(ev, dy);
-
-                    if (allowDrag) {
-                        setDrawerState(STATE_DRAGGING);
-                        mIsDragging = true;
-                        mLastMotionX = x;
-                        mLastMotionY = y;
-                    }
-                }
-                break;
-            }
-
-            /**
-             * If you click really fast, an up or cancel event is delivered here. Just snap content to
-             * whatever is closest.
-             */
-            case MotionEvent.ACTION_CANCEL:
-            case MotionEvent.ACTION_UP: {
-                if (Math.abs(mOffsetPixels) > mMenuSize / 2) {
-                    openMenu();
-                } else {
-                    closeMenu();
-                }
-                break;
-            }
-        }
-
-        if (mVelocityTracker == null) {
-            mVelocityTracker = VelocityTracker.obtain();
-        }
-        mVelocityTracker.addMovement(ev);
-
-        return mIsDragging;
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent ev) {
-        if (!mMenuVisible && !mIsDragging && (mTouchMode == TOUCH_MODE_NONE)) {
-            return false;
-        }
-        final int action = ev.getAction() & MotionEvent.ACTION_MASK;
-
-        if (mVelocityTracker == null) {
-            mVelocityTracker = VelocityTracker.obtain();
-        }
-        mVelocityTracker.addMovement(ev);
-
-        switch (action) {
-            case MotionEvent.ACTION_DOWN: {
-                mLastMotionX = mInitialMotionX = ev.getX();
-                mLastMotionY = mInitialMotionY = ev.getY();
-                final boolean allowDrag = onDownAllowDrag(ev);
-
-                if (allowDrag) {
-                    stopAnimation();
-                    endPeek();
-                    startLayerTranslation();
-                }
-                break;
-            }
-
-            case MotionEvent.ACTION_MOVE: {
-                if (!mIsDragging) {
-                    final float x = ev.getX();
-                    final float dx = x - mLastMotionX;
-                    final float xDiff = Math.abs(dx);
-                    final float y = ev.getY();
-                    final float dy = y - mLastMotionY;
-                    final float yDiff = Math.abs(dy);
-
-                    if (yDiff > mTouchSlop && yDiff > xDiff) {
-                        final boolean allowDrag = onMoveAllowDrag(ev, dy);
-
-                        if (allowDrag) {
-                            setDrawerState(STATE_DRAGGING);
-                            mIsDragging = true;
-                            mLastMotionY = y - mInitialMotionY > 0
-                                    ? mInitialMotionY + mTouchSlop
-                                    : mInitialMotionY - mTouchSlop;
-                        }
-                    }
-                }
-
-                if (mIsDragging) {
-                    startLayerTranslation();
-
-                    final float y = ev.getY();
-                    final float dy = y - mLastMotionY;
-
-                    mLastMotionY = y;
-                    onMoveEvent(dy);
-                }
-                break;
-            }
-
-            case MotionEvent.ACTION_CANCEL:
-            case MotionEvent.ACTION_UP: {
-                onUpEvent(ev);
-                break;
-            }
-        }
-
-        return true;
-    }
-
-}
diff --git a/Externals/android-menudrawer/pom.xml b/Externals/android-menudrawer/pom.xml
deleted file mode 100644
index eda6dd9125..0000000000
--- a/Externals/android-menudrawer/pom.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>7</version>
-    </parent>
-
-    <groupId>net.simonvt</groupId>
-    <artifactId>android-menudrawer-parent</artifactId>
-    <packaging>pom</packaging>
-    <version>2.0.3-SNAPSHOT</version>
-
-    <name>Android MenuDrawer (Parent)</name>
-    <description>A menu drawer implementation which allows dragging of both the content, and the entire window.</description>
-    <url>https://github.com/SimonVT/android-menudrawer</url>
-    <inceptionYear>2012</inceptionYear>
-
-    <modules>
-        <module>library</module>
-        <module>samples</module>
-    </modules>
-
-    <scm>
-        <url>http://github.com/SimonVT/android-menudrawer/</url>
-        <connection>scm:git:git://github.com/SimonVT/android-menudrawer.git</connection>
-        <developerConnection>scm:git:git@github.com:SimonVT/android-menudrawer.git</developerConnection>
-      <tag>HEAD</tag>
-  </scm>
-
-    <licenses>
-        <license>
-            <name>Apache License Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <issueManagement>
-        <system>GitHub Issues</system>
-        <url>https://github.com/SimonVT/android-menudrawer/issues</url>
-    </issueManagement>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-        <java.version>1.6</java.version>
-        <android.version>4.1.1.4</android.version>
-        <android.platform>16</android.platform>
-
-        <android-support.version>r7</android-support.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.google.android</groupId>
-                <artifactId>android</artifactId>
-                <version>${android.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.0</version>
-                    <configuration>
-                        <source>${java.version}</source>
-                        <target>${java.version}</target>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-                    <artifactId>android-maven-plugin</artifactId>
-                    <version>3.5.1</version>
-                    <configuration>
-                        <sdk>
-                            <platform>${android.platform}</platform>
-                        </sdk>
-                    </configuration>
-                    <extensions>true</extensions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <autoVersionSubmodules>true</autoVersionSubmodules>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.9.1</version>
-                <configuration>
-                    <failsOnError>true</failsOnError>
-                    <!-- Relative to module directory. -->
-                    <configLocation>../checkstyle.xml</configLocation>
-                    <consoleOutput>true</consoleOutput>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>checkstyle</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/Externals/android-menudrawer/samples/AndroidManifest.xml b/Externals/android-menudrawer/samples/AndroidManifest.xml
deleted file mode 100644
index 7323fa61b3..0000000000
--- a/Externals/android-menudrawer/samples/AndroidManifest.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.simonvt.menudrawer.samples"
-    android:versionCode="3"
-    android:versionName="2.0.1">
-
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="17" />
-
-    <application
-        android:label="@string/app_name"
-        android:icon="@drawable/ic_launcher"
-        android:theme="@style/SampleTheme">
-
-        <activity
-            android:name="SamplesActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleTop" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="net.simonvt.menudrawer.samples.WindowSample" />
-        <activity android:name="net.simonvt.menudrawer.samples.ContentSample" />
-        <activity android:name="net.simonvt.menudrawer.samples.ListActivitySample" />
-        <activity android:name="net.simonvt.menudrawer.samples.ActionBarOverlaySample" />
-        <activity android:name="net.simonvt.menudrawer.samples.ViewPagerSample" />
-        <activity
-            android:name="net.simonvt.menudrawer.samples.RightMenuSample"
-            android:theme="@style/SampleTheme.RightDrawer" />
-        <activity
-            android:name="net.simonvt.menudrawer.samples.TopMenuSample"
-            android:theme="@style/SampleTheme.TopDrawer">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="net.simonvt.menudrawer.samples.SamplesActivity" />
-        </activity>
-        <activity
-            android:name="net.simonvt.menudrawer.samples.BottomMenuSample"
-            android:theme="@style/SampleTheme.BottomDrawer" />
-        <activity
-            android:name="net.simonvt.menudrawer.samples.LayoutSample"
-            android:theme="@style/SampleTheme.TopDrawer" />
-        <activity android:name="net.simonvt.menudrawer.samples.StaticDrawerSample" />
-    </application>
-
-</manifest>
diff --git a/Externals/android-menudrawer/samples/build.xml b/Externals/android-menudrawer/samples/build.xml
deleted file mode 100644
index 9eb8fb98ea..0000000000
--- a/Externals/android-menudrawer/samples/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="menudrawersamples" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/Externals/android-menudrawer/samples/libs/android-support-v4-r10.jar b/Externals/android-menudrawer/samples/libs/android-support-v4-r10.jar
deleted file mode 100644
index feaf44f8018aba0e3e4f5f8e7115101dcb4d00ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 349252
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

diff --git a/Externals/android-menudrawer/samples/pom.xml b/Externals/android-menudrawer/samples/pom.xml
deleted file mode 100644
index 5baaac769b..0000000000
--- a/Externals/android-menudrawer/samples/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>net.simonvt</groupId>
-        <artifactId>android-menudrawer-parent</artifactId>
-        <version>2.0.3-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>android-menudrawer-sample</artifactId>
-    <name>Android MenuDrawer Sample</name>
-    <packaging>apk</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.google.android</groupId>
-            <artifactId>android</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.simonvt</groupId>
-            <artifactId>android-menudrawer</artifactId>
-            <version>${project.version}</version>
-            <type>apklib</type>
-        </dependency>
-        <dependency>
-            <groupId>com.google.android</groupId>
-            <artifactId>support-v4</artifactId>
-            <version>${android-support.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <sourceDirectory>src</sourceDirectory>
-
-        <plugins>
-            <plugin>
-                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-                <artifactId>android-maven-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/Externals/android-menudrawer/samples/project.properties b/Externals/android-menudrawer/samples/project.properties
deleted file mode 100644
index 1561d7a9a1..0000000000
--- a/Externals/android-menudrawer/samples/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-17
-android.library.reference.1=../library
diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow.png b/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow.png
deleted file mode 100644
index add3b361868afdf4ea5d15f8d3abe0d28d05e7d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1568
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
S*vb$90000<MNUMnLSTY*Jp*k3

diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow_bottom.png b/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow_bottom.png
deleted file mode 100644
index 47e9c9045c1df495f6e84942a753913d8021212f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1540
zcmV+f2K)JmP)<h;3K|Lk000e1NJLTq001%o000;W1^@s6xCpM{00004b3#c}2nYxW
zd<bNS00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGo!vFvj!vPg=
zO+o+w02y>eSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*00m@8L_t(oN7YzK
zNMl(P&Cg_IsFYKz45kxt!eJq;G`J942yS~*TbH5>aiieESr>xt+=w8E8y5}Iz0gK*
zA-E`T>Xky5MiY&RaY!_pd8%`N|1V!l%cMG1Sr4x7=l%EJzvta^-o0N&BoZ-XySux;
z<>u!8f$Kup&(ItmkLN>WW#u}YO-k@bTvb&iou8lgL?V&Ds;jGil}e?i*Nh|-3VocJ
znfcJ$+iTV7bjkDc^CU$>s?}=WplOoHWS&x~)J{!JbpYw_uMrHG^JiOI+hiaRIA<8<
z5}<ql5|Y%`)=FZr*c*V*pnnfDEi5ef5{X2prlzJyg7z8!MbW0Gr~gJ2KH^dokH;f$
zEtr*+6)r9=j!IlEmqaWUOW~{%2;af9xHfEWZ!0!7HiGr__4#VGn(qIw=61V7ot>Tk
zEG;d$;Y0{_jg9vJ%ylpr^dB4?#Avsfyu3UHgJPLXCcy+b##As37EmoNE+#4}D%3`!
z@rQs}UtbTkx3}BucKaoKI)gc2M~KELeD*>TL7&gZ0ukXNiCs@1WN`>Rjv+E?l5jXI
z!%idsQVFWb5V7wP8EmL%c6K%}I5>C&9k}q)1K1}r_;3Wj&cLJ_Fe-wv1Vazt26-nj
z7z}b~<Si!T<M%J<OVF3Ys5dn=H5ms61~e*_>P6A`{r=?8(2#FsW#t6#J%;VW{)KL-
zKSF<j4Zm?ZodhBd3`rIUH4copu&_{$G15yeKp6q1m;+OW-V9+GCMG8G&1SRsB|-xV
zCAzx0F059o6YJZ#C=duMoIfFLz_)<I;b0>{AXxu-AVM%DB_&dTP#~n);G!OLig2HR
zkQIT3#^K>%U1MXTER$eXS68F`{r#u6x3?6DLjjczp$8ZAa0M{I{r&xz5X2Wi1Yj6C
zma#i*e!*@OP&7Co<=By8fHSnVwi;ndMD2g!!TKT`tpV5x)^=iTD^ZC9V#oStlrO-7
z(AL%#>6ZfWAC<UvFCzDD2y}zpP~&Gl%mgdtsK)B1p`pPrGBT2_(P+L&H+0bS_4Qq?
zt*sH2?(_gZ_h84c3$Wr=sE5aP?MWa)s#z=+8K|bjm{2!7)hs5HNe|r=l$MsJ6`H-h
zJ<`M3@$oU8N;aNKydLn|11be<He2)|l^%lmDi9&ns2)S|A>F(~sP%XmuNykmia<dF
zPBeXUb2H_kXWR1fas(%n3+quNNDnNPu=XL=COup$6pG-^&JO9}3o4}z<c@<3L%S_O
zU6zGa-=Z{lkDheHQ;kkHV@pemv7@6y^;Bg8nu;bTC;fACb0laoUJrYqtsVKnjs6Dp
zQyBN?XiYr3E12+XM1+e7^9^=Q#p?!h*nGq3$5dBWXB-<F%g)Kkxu+Yi*PHC=>ABk6
z++_0u>41yGKCcHv#Q&Tg9s`yZ5CPT1yl&up4)kN7d;@0)Oc_N=uh$#K$Hxm$MYGid
zs@8aSclQ}Gv6FTlb0|ae`GHO<Z>oC82#~MnMh9msxKD>bIprRdHF{L5dU|Gbbkv0s
z$OY%`^nhy{B72&y9x?{xDc!&!EgUlw#n6|bHv>>E2i}8g$_bx{Qt0gvI(<{5t%r;Q
z5k!Zr(?~aPFc0H}=!>`rQQb!Ef{Oq}#DTe&->Qcf0V325l{WZXraCQ~KGFb0hx<9)
zi@g{>g$~>pzmm)4fyYXX$DB-MEN!trwJ3L@F_dorA`7%pLlYW|E9e<GAB1Lnpx-UP
zgj3BAseoWN^Fhgy>T^%dgX5HMsEU^1yIO{%#uk=HrcwMqAd0G$&(bO7hg2QPI1mBV
qD2EUzK9^9DN6tT+rBiiYIPWvu14f>ZI#<O20000<MNUMnLSTY2l(3Qj

diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow_right.png b/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow_right.png
deleted file mode 100644
index 4ae9df9b784aefdf8e37e415b6e68a33ffb0c3e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1520
zcmV<M1rPd(P)<h;3K|Lk000e1NJLTq000;O001%w1^@s6MnD^=00004b3#c}2nYxW
zd<bNS00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGo!vFvj!vPg=
zO+o+w02y>eSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*00mG<L_t(oN3~c@
zNUCWRR<klI$Lz;z+0`h!P>TkNm|+N7L~W;SiwdUOCfXIW=!bq5LG2=lYM|QAX0}0#
zAclb`m=*=MAJTrbv|C=Unq}!ckEmpsetyn;aCl!$&vVZ6oO9mSBoc{43X{R)_4W0c
zSZNu2KNt*3(zTHD+S*#V-EPmy&CQj&T&{ppsq|l5T=?;~X8;7Tihg7V2M3K$Pfytj
zg+lfG{9KrsnOXGs_^8rqwb{%>ibu3}Mz7Im{^;oF&?C@7zu&Kizw)fCEG@uPrKP1=
z{7gC^<X+#^)%81QDbC2q_$ZUfsse$4F*`e3i_G%%dVN|T1dxE9pBEMu`jJH$URJ?A
zVQ&Cf5mseYRh2wk3@Nh}0^n0qQ}gTR&!2z6)&Q#x+egr&K_)q<Fj0C$0SMC5)6-U0
zS66{8t(tVfd701WQ(G(+g&5Ie08l}h)6>&Gs@3W;L|#d%08$BUbgVKlqQ?L*3zVk<
zAVvU`zR;rr!k3`3@{C3!8&PoSz5yUeV`HPDudlBhTUta913-&FnUal(ecbQ9u7Y<z
z)ZN{!Y-wp>RYgT-kKncD{{B8ks2=YEuz|<M##EJ+m86QIf5LmFu;@P&7Z(fa^n__*
zHc4k^XN&Uk@?u1X@H+HIz7Wxq@@Oy^WD^q;AK)+|dNl;EV5eivO(uF$0E*V!+??6l
z+e<y7qO;S5h%N|#AOKJ{H8n8{BlUopC_1blk?4W}z`JB}a#CGhUapIX&OU+YrRel`
zMHdXfEL18LMK3{DGm~hi1DqPg6+I;Yf|yJu8OoPgu(C{W%*ks6XfZ{9J$X|GAV^zV
zTUKXhXGnB_ggPD0Io=C#8pd?GC;)==_xI;EG&Gd4nj%ezl_#Q_M=<uGlTb7OCaeTQ
zQLWSIN&&)Q$njnQ=URxKhm$Zg6h#9ti-Ljz>CDVb38uUb!5XLq>;ukrmDlSf0BSGI
z2Pa|1@bEB4hX$^ShzqbBJn3g3B(}6Oz`g2uYHG@csBZyy1G_^uXzqJn+=6KV+}+&;
z2L}i3;M@kM7J!&xSJ1@8+aUk~q5*JxN`{7poHm=y3a6*2phHyBsa!6<M$@^&S5NU7
z%+1Ytc6N3y;oO2qzaWDntQT0F0C`~ayw{4#V10f4acynw5>C$H;}Gj1GO!?nuef%4
z_xJao@P2?rkTSs0(NSQ0eB6fbUNUNA@P*u?xf}rT93LM)QQSy{r38SheQ;o4zz%0t
zI5;6Si24L}1(5GntMxHLP09dpA{iMOah{)_Gx}3HhaH1&D@6U~a5%{Oo8J?HGgw?)
z^loi!F>-U*`4K3h26yP%`*_X;Yp}Vw=?6eaR0>LC^}zWJGKdlNb$2Jt0GHmt=;$ap
zX7tD5iaC9Fc(|shX0tiev9BEq(!k^KP}Cc@+s%r3DJn-pTu}vQz~6o-N7u>82_p}Q
z%CZC{mx)9b46w4Y;@#NTAn)wd5bqQf>un-Y1p#btZ~Nxw=jkjeDuINEniSyr`r3yf
zW`?tfsO(e@Gdqq+cQR2E0$}X=;rt(`(-|WwCZ`SE>x$Q@?^RFSDq3D%Uf<i>qo6d7
zUv?@*b>b52d#{-ifkgWNC)1xxOG|&f6czh3P<0EC``z7LQU6wuUR_-Uk^bMUt*yhT
zd){;S!`lJg&v;T{{JL;>ycuH2sCh}z#p>$nZ@6YS!1WnvfuLq~DkA@$j&p)YLCsI?
z?d|&j$j9p(T>W?ud60n{6%}_v3XPthli^;o%_ELgf-?LHT5d?of8jh5$p88eseb{#
WCT8C}qZEGt0000<MNUMnLSTZFF~3Xz

diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow_top.png b/Externals/android-menudrawer/samples/res/drawable-hdpi-v14/menu_arrow_top.png
deleted file mode 100644
index ab4ed80eea6459084c10ef25f77d174148b97ea8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1529
zcmV<V1qS+wP)<h;3K|Lk000e1NJLTq001%o000;W1^@s6xCpM{00004b3#c}2nYxW
zd<bNS00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGo!vFvj!vPg=
zO+o+w02y>eSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*00mh|L_t(oN4;1}
zNF!Mk)qG7%GSN0_s**`U)HJ$KQD!H&a8S_2Y-Zs`+$e&$Q*hx2KMO%c1`))SxSdUJ
z1s8&@26d%kYeJieCPwXON0XTUoLf{$+Rt<}HB<1oRWGmJyXW0=-o2IlbUK|U_LYwd
zb5fJ=mX@G}Qe^28eND0F1O{?mVltWJ;c!^4QmN$RbR-gqtJUiG+1Xi~0AXDMCEArQ
z77!r{H8nM|L?WSlczDpn<8dAORa`jI>4;n|4;B;@+{<LL=)u83Ld@uh0)z)4si>%s
z#bPlvp7j7z2ItG+Y!SchH|W0r2tWF76$(Yz>2wkpicZc{%NYm{Ldr0VB9%%NN+gmG
zaLxp4gMU`sm+(NYG4>Q=zTo)`_AADOyk2h%&&gcD<OGD*gVbO!DB*|}v@yUz3;HWz
zt6(kYFD4+k58&Pn=Z|4eVBMhK75eY4uCAgyn0M>uT|hGR01>O;&`)rzoR2^ioO0ma
z22B`8Mn;STWO{nq2hI5KE=A-s+A$xY3v9qQ914+Kbn|8)f*!0^s~kEYJruz*0Ah#p
z4m?-ET8u^`Gdnw5T3uZ&B_M}~hsmL#p-Z37=fxN|#t@Lth@1<$@#6UgHhg+|Dx7L>
z(#@NIJk<l9OVG^lvx1^Pl!7%kHa4;|Gc)?4q9V#AkJru3O?r5E_;zP!=Nz3Lq8J|?
zC+_L_`n|fz8pu;UD3wY&l`L?CoOhtv(b%r8E_PsGpinC10`crhCX;!Ki;JPPwKW1m
z&BcQ`p-4reQU7~%^Ftu7=)nj|*x&%C2Q(Xa&Ww+b8(Ujj6)z%q(z(9A9-Ek$@IhZ*
z{Pd_BMC1$R_Ptd%{|e-(9<X3B^uUrHcn}1{YBrmVb8~a0m6es0)w8}%PEJyTgM*hI
zkH?3XPSK93@w%aC1+vx6t3WdK06J&{J@7i9D3C79O-)VA)YOz-r_+6>hiuUVgTeIZ
z=;-a%))qy^gXScvk$wc-fTs69$~Vt|2vlllXpp+yZbZ01haD=#<fI3VN*F^Y6w}+=
z%c7|fp=|wraUAB)TUl8Nqn%@JI>7|pP=qM=T!Ml@i^cM=yStl2-?PH=J0Jp;sMG+3
zC_m`28%D|r8C0@qG#Ykta<aU+xtS{n#kw{(H{)YtV;A@L_e3kw4M#P~Jzxdt<`z_o
zyj0pe0uex<YE{5-$`6@(ASzKbEOxt{fgVb*JGq7774%>M>E_zyauL<sJQyM0oWr*O
zd<&zBrqbrIPUC=N>H(3^B9v4g{S3?H2SE=lEiEigCS74+;k)#ZZRA3sP#Py%aARYG
z%Qu2<Kta;a->}z+%w48#gbyHTSy`D9;nQX02Z{jIOLjD-zrWwy-Q7)*%GRHp#?c0^
zuC9icmX;_{3c3-f#^oE(KIr%RxjK!qmXzoO5L$pJ<&&I1C7WKaXBHL~tQ{R4s{acF
z?EtM+Utce;tE<y&Z*M1|SI$>{cM_=M;_x|+>LG!XFGW8fN-`zT=>ejQFF9EB8)|E7
zOP80IKRO(af}FNDhnHEFm9@3CY4-Q`1K9l#rXp=b0U`n$L1dyRT$55dX2Cfn^q_{-
z!D=u-(bLmY0X;M!KPYqXLzGu>O3K>X+i8<MdwY9S%G_epzv1KT4ps954xl&@UWV@p
zE??ls5BRP&APNJhT7MJ83y~*575%BNuWu3m2hg|7SIRH=p5b_xXS3PTpjHxM*38e(
z|A7+xSCQ8jZ8~iF$Ii~qD){^9=;-KLtJTH;Bq^L)`9S(hadGjVSkWZfs{idoXMsTA
fcQEHKER+5Rbhsh!Oe!v^00000NkvXXu0mjf@-f3B

diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_action_refresh_dark.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_action_refresh_dark.png
deleted file mode 100644
index bb9d855f77692343e173f814ca1e546393b707d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3138
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
MSl>bq2X&7AABcbM^#A|>

diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_action_select_all_dark.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_action_select_all_dark.png
deleted file mode 100644
index c87c3f8370f1de51f35c46e1798638e415865406..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2861
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
LNkvXXu0mjfqD)P^

diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_launcher.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 96a442e5b8e9394ccf50bab9988cb2316026245d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9397
zcmV;mBud+fP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00006VoOIv00000
z008+zyMF)x010qNS#tmY7ZLyf7ZL$ypVCqQ000Sga6xAP002k;002k;&Ux?!001N2
zNkl<Zc-qaJdAuc6b??7x@2WcI+;iuin;sYiWJUx>L`9r|n3#ts(U@pVoQ)(ZPc(6i
z8k}N`MvWQ78F(rhG(?6FnFXYo>28{yZ}%O}TvdDT_5P?j=iW=V`8=UNc_}`JbG!ST
zs@lK(TWkH+P**sB$A`cEY%Y53cQ}1&6`x-M$Cz&{o9bLU^M-%^mY?+vedlvt$RT-^
zu|w7}IaWaljBq#|I%Mpo!Wc2bbZF3KF9|D%wZe{YFM=hJAv$>j>nhx`=W<S%JW3kP
zxAC0SJC-=M%)~?<M!5JZ-{eDYxZ{AVNe(1HS3hztd1j3@5<&>is#KG!cJA5x!4)f)
zezMz1?Vn$GnZNjbFXH(pK83nn!^3=+^*kTTs5rV9Dq^XS(IKO!mKt5!dSmb3IVCxZ
z8TTk5IE)F1V29$G7v#j9d-hy&_pdg8?kT4)zqr>?`}I%W>(?GO%*C&}?Fp|bI*<U}
zbi+2P)hexq!x-r<S!L|f74?s7dic@nqR8Cz?hBt|@7%D%zu@Ewfwno4*BZl;0M$^T
zi=(HpypkDx38Q>~2&KZ$%^B6R&1~2kA{`CWy+>F-x=z-f{_&vyu_3yp{jtw(*syi%
zu3t2|4{c~LJXRt2m>rMg2V_kLltCZ<`m>qcI?BPP?6hf``|e!rZEFszeYQ3f-*nAS
zZ+h<E{@Gl2Py3Q+qWS`FZC5kiPLms%<ld^|7n6caM2uKR&*!+A3a3p!;E(Q&$r@&O
z8kQ09e$s5)y+uYRV^_1)iynMn`-gA2X6Mx(f6G;8g5iR9oFTOltAGFDyZ+|^^tC%D
zXly!$ZJQj=dnM+WgXY4wzc>1$mFwy+7156lkB(k6)!1fUbJCxgIBK38$j<WgPF4KT
zfv`f+iV`H?R57Vyb}HuHpz+PB)t`=KzkU0ydcIE94hvwOw&l@XH{5#Nqph2-Za%Zo
z$nRcv_>j5cC$r&YXN)nr#PY=tJaLc?C_o?j+8H3Q>891JJ9&$l-r+-SG#q)*;r52%
z@nlKflb65o%s*Jt)!pw1k{vIoQIvoJ0Y&Msiw0X!q<qB~st|^P`r0pZU-^6d$mM&Q
zcU*q&9Xp<J+jZ0LT)EzSrc$lgi(mUP|A+6p3{~N4A3rb*vIi2NFJJKjR@4&CJnKok
z=ozQ0Ozci}cen1I-Whf+TNR!AoKuf@MG~7=1j$wj21n0(GKC;A*sBPSC!l!1k%eAp
zg|44AT{pct&6_U^X72YkJ+R~GyM8hKz4w1`;!nGFD1PgUZ*+2Sms6gxiu$;6)wdr#
zAZt2c47w*=Kq8~8=OiKyWk#>J)_47G*?aJ6bJFLh_4b$5&1k5wN>du*>6#i7R9T8;
z7>EHOV=ue7mo77SJPwER4(A+s?n0JjYK)b}Om6n>ke?0JR=jTI+RFBg_iwb7k%n*2
zR_M0DJ9x+0zxba4(B1y^JQ_Nj6dlP5PGXvSq8fF#mxrFYj3d9(V#jJwt+IqU9+8+D
z6C6Us1O<r;^8#qGjcGQLli_gWWaKW#<vDqt<D4f?ojT{W*Y&17C)>I$d8OF!3+Hm1
z<!vvT(3}Y*73JN({lr5369(w!?kgFoE+g}fNj;UwZncTv8%&+GoTI+iV(Umw>W5in
zXV^%U35HooOpSmeqlG6e0kUMYNonKp1vr|My9}4-WO+uOxe_c-o&}%voNYHkqtle%
z5yQ_^oozSUUNu30EQSAl!Q%(%3G1NXENSMjCL*<W*^YF)$Dg{2W4_a3YGjsOev%{Y
z9yVjCp(HfeLm)$OC`#Y|^j&oTJP;5x2pS9_7&I6(2q72<fMOBjqe>Vx-Td2~rk(}d
z8pT!HZe>1r5EGuz`pgsg@^yQEi=BIa#meLq0!?{TZ}q#}=7UC9_l=w|wv+pP!g4#!
zRys6EN$Jv}#U47$k&)pDzvks}LGfPku6P9p!56Py)~1)W(11n7n}`Wx!=;_JTiu#d
zpCqx=hEk@t4sp?!j{W}wP@V-=Pd=T^>6IKBy;#mLA7hCe{V7B3@I7Ipa}L`MbF|YQ
z)$BNWsiEnoNHrtJli|n<Ln1BTGjcL@<j&)APo4){9`H_aPH_&hG-o_Ik;&v_(lo`p
zV2y|~mLsA_Ke>8cOnn4NyF=8MbVxgof0>Uv%wM_j94a;8(LMjl<nRf0cYc4^n%;7D
zEm`^zCwZ9bZMRw8M)NvHS3bzf_{EHJJiF5C2--t21Xa8$UIShOE_l2PIPY<}!{r|5
z9L{;1^LPiH-YjeDFXfr*Kg?lEUW#bKmc9Q08k^uX<T=Mr?daUrZut8_?eXXSN_XD7
zjFX?WjGM2X`fp^Aui-Lf^^)iF)S<8YGhX`*W3>L~E(99gJ*2%Jt<E%)JewiAhCoi$
zuE3`i(ljIMIkH|(nr6kTmlv-zBkg8nX-<~r<e4MSJTCLNJdkCM*o*<7>NtAkD@j;^
za~Y~&j6uY{=R<G!mHEK$U*d27&avbfeExkK9@jD-cNF{9E$1?^60D7E2)S3)vq$PH
z{*N&xbkbeM`yP2{vBJKTlUKY41UAq9g!@~6L#;ZDh?K8#j})|gg%Ain;C&#3fcGBf
zJ;4RCyoU*Oo_pA*nH)Zh2RCluvYTJW*iu8U>v5S4joH*RW_m9N{ZSN0HhAwFyJNok
zS9kx$>wMf%tUi&Eb`6u0lWJ|k?A-42(lp2UmS(PrAc(24wexRiHUieMwf$o%m6$xs
zp#-SdBUu2D5`v;(9-sm&kN2M74c&AvKe_v@tQ|dzJ2qSgQHpnUP(iQ?J%Il;Jdyp#
z7}cpq6Kdm+FS~zS4Eo;fuO=DFP*UlpO|_CNt5&NUqBvQWxmg7#ARvMf=%#H@p%RZ`
zjK$hMbNb+vVP3UlkfIt&ptJ<00Ic{Ka+lF+&w;OEs1O2#V8~O|R<k8DQ=Oet+srZE
z=hG9*B5}P)XZOHmU%ltR0rZHz6D7l|BbE_zh3RyfNMbfVxE&PhL+~QzCC0id#i$1D
z2*|*MKrmua6;u^5QuqlLu%|p!L4(e-sC@T66pRXi;7VqB&|pfz=!?%e$W!QcQr)||
zEpvOqi&XWhxMHm_!GHY2e}qUzjd7Yf$D^Hx*uL{oW;;`?UUCR$9dyM$80^=?cIw4s
zM5MG?!ZK<yO0Gjxs52Dr;E|cFnDk&Wvq@A1BhiUz-bRe`NQlIkA{Uqb;==$e@q!mE
zV3C47IzVV1AO(U~LI?$m%J;%2X~`&8fTvori}DqG@F8+}ILTOdmG@qf_*fK&B{C^Z
zGMYrjYP*qXwYiS<$F1jEcRZV2TODtI*?bPSPZYZ^e>*Gq9TIgM&UqM&bZOXBwnbC?
zDr))NR&g>lwVgcmnx`K1$)PTTw3m}-T11^ZkY{}jQ@lGD$XzJIcVFkYBBW=o_}TUU
zt@yd{Jz;@~72x#!RG(#ira6}v-*J#<{@@^OI-Q2T^}=IKLubsa&V-%WwlF1s7fz~u
zMdQTV7SnRet#^`VO0V7H(?59X{uy+S`(sorO@2-+qioUdo9+6r4#|jb=?t50oh42R
z{}I>Krut|YKkOc|O|M>y#(3YA;I(i+MiHSfwbJA$jIUr$Y2i|u)*>@2eUYk`j4C5r
z>61dKu!AqM_E7#DoDzbd-bfT%AYXUUB{SS|{b{`5^?wz1{PVQgTlvyqOX8(#GTz(U
zNPhnj>$lC`xaD56`TjW&uW8p~qikP*F8kHFM0frzdk%UNGjb1O$%uLK`0-)2UsZ3L
z#+j+CI_8k4VslL%$aVR@joX>M-@odbX!os$xY$HDIOCokY?{Q0v2kQErf|ZlN>D9w
zC+2}E&?rDdi#%))$p%P4C_xGXu=@U~_<|V4L|{>TP$XBp$5pCPXLzK3!;gP>7=QNi
zkNOur`>xY=@VSpB#LsN9JKpOz({ANcdv>?K+D_*_HZ<;9>kplj^Ph5!e&&a#?(3vK
z_Q@}D_M5kGcx^AuaI~qKYUnb1Mj-n;MURXa)+x7<z0Docp0hjm>~e2gbMW|gw?5Rg
zTOMlo>6zIJ$VNVgn(@kTSL0eP)nR35IHpoHM2W#h6cNmTm@-9`dFJ$;k(S`7Lg@RY
zp!hNmb9un!O4<wbI)P5hleP_cC(*Q7mBw6m@18x=Z~fV2_kHt+_g_HT4o_RU+W&0H
zlJVimXsveqoNRACKzpto=4QHPYI}P5TVJyL6%CNDT)tc9W>Wt05ANDGirv(B14gW|
zwjP}C9bK{J`qZ_S2o)b`RonR-b8~y8)$H0`+gg6>#^wu8eCp9xA9B>>8(KRizI?+^
zAJ#i>*({qM-c4gBB~5dzg(wj!HA`hkh!aDl5>u&J;>2K#Ax<n&%wmTP_`JyXeDJtT
z>2)2wt|L!9X;(=*jy!`r4_FhCBoRxNj<M>XNv(~jG<w@#|D==bKdf25?EA~t$t#wx
zT%N^A61&_<x1G{zwL-g*hN+!twDqCZi&gp8O3m78UHxCb<AKE{_U)U`WBUVRWab_t
z#soriUhZd?c%Nm)#t9e*33=*i&b70>Q|%<}%K6RimaBJcP0v}oCgRN3B;oiM)opj?
zXm;;tv3q-yy}NqMOr^~3&1lW$w3}UK_IT2sCrkYx5$&6e2A%g;QZUX~A&L!2rFd0p
z5%men@^zN_Xw2|v%*c2|wQfkN4r6u&k;LxYY+w3{KY#cie)!iz>(yAgt=&-+Sy2V&
z9BJxI+VMKQ%dvY~x>gmEijj3ss_*NAT(8d1@DQ6e&#Ln&6Qk>wHrh>;V2nvomC`8&
z(w?`?*_^3u-TJrMzv2~7dH(XLJvUOXk4U8oW6Ol)YsawhIB{GdvIzu1hzMTrE)cvB
z%2GxMpaF89<9uF(?cfN(BNR?wwWvCZ6e6<FMv8ZyEc0Y(VQ$@apxyA&ZguE&-HPYR
z*X-Lq{wbelLZ10j78H)%Wkq!$I3alPszL~Y%Vl4H3<)bHk7DDN8$_f6*rxYV+)QbW
zAyCw2JVmHgGcvgz(vEa8A4uCRj0I!b7%Lbl{Ee{&Qwl_5E!G&s6z0`;=Aa0s*ofd4
zMXi3Q_pX!-&f{EJ0_m4RawX3dmqM>2+G_{$+;`yjgLj{(^z*zzwd;K3RElb*%=??P
zm+lLY0@Y}^kVdMYX5M)YJ~8h=i(S{q#NfU0xPTao4WPDQL=Y_;vg=p%iay1_`<0Ga
zMG&<(pOU+bI2u9_g8IJBTqGX*3@G$Zc`pj0f@)vd2?Aj`ms>DHg>;w~p}HXV(*VJX
zphd;fht9qL3E)D8h$$A;SGl22Ygv>`iU=A)z=1<WOu(7|w!alcS|LHo@0aIX<c1AK
z3@%G)b@wuytY*A=D7$7iV60NDj1)ixzj!fWUL0y^p4#6u)uK$RiUuRYjFbv}J}UMR
zng<C)$N)spb~Ee?5GcWT1i_TjZV-7Fh_^EQO8MuwI|4dainOQ%MhYs6f=Kyik%8zF
zF^Cv)*QJ+s7>ZYN$|2`*$`R)?KD>$tw_e9h_x~eX_udS~Q%yz?48i*aIa+_wx|j{B
zsG7mwZ)6M3dmvgMC3K-66;ML(9o2xU!F8+qF)>v{1;ip)6v_I)6law|rd_Dx2oV|n
z(Qm_PUnTTuKFG)w%s|)lS!w~Lm$k|Al=0djocyHU;>1H=!N}0E0lSV^b2^6~^lUco
zyoH+|_!l<qyq-LCsK&z>i3#e<G@}3s=HCZ9T3)fjE>uHd4TJS8=CLaHG9H8g&h3Xm
z#>BkpUBAmae(#)qO3)ZMG3irM=5IzA^s+)w86=tIMT{&?Awux<(k2>U#n`c&@Z?u=
z%=#BoO-9Nc^?)hz*YW~~tU8rLR-MZBJsY_7fp2r~mY>q-O;L%5Fp?}V6CK=F(18U3
znxB8ZR0TT{)T64RDt!+yFgp!JXGP0|It0Hz2Em#YfRv>O>8A?J=Sz!nq<|{&mW=?~
zDQT{S6PH0|jwy37t+0Ob6izz)JdRlNEUbyk>-K?}FOT=Dj9SuS_0nTFd+A^D?Bo83
zTkicXcW=IuZoZd(Dl;&#`LI;_s?e;OH9quf?*XuV0O$Qh0j~HWKpA|PXV4&<S3K1O
zj2Miu7%|c}J$;NrE6!QKHntT|(!yEl;6_9FJyd9QW_bGH@8ng_`w~a4dk%uZ2Uq$l
zyPzzx_~`qpLiaevhgWmfsqf%TFTa9edl<d6QU3e<Dj3{b@m8~=gE-y?W^kW<e+nqB
zspN=p+ArWO21o-hIsJ5uiOSv8-h8ER9;k)(4OAyiFU)fhh(XKHEaWa{&5~32r|*24
zi$C@Twr}5BZh$RnJqzt{KSwBijkOUV{QUYWdCeQ2#{+loVRB?WS(eT-DJVu_>b2zs
z@W5<)dtovIR<mGD<u&|#Td7|q*ax6jKj%yA*u57c7HeZvrCXjz7M^gS&5M}YpUz)z
z5Mc(NQONU@=N$JAE_(B&xM+$$df(Id{8uhwW@Z*+?7%-g7N|lfhJnDm^_Tz2n=U+)
zkNnN=bLN>Z<Wm>@gvsi$^s;v05(XwF3$lJ;wzYfE`46fnT7>!qt|hWHRE>yQP)i8=
zVbC|O{Ud6%kwGcch>>|pE-=?cW;TDR0lE5Nw7l66lr-zIYT3bj^ujCn$b0{ZO;gwK
z#}}W(*T3~in$6ZCpbB98pftPTo;!K>U;H*7_}t4m;;4i9#^2t`pS<=jsnx198);d3
z-M6Mx{7-c0A-jhJQ`5mB<gsfJBaxz#f}QWO?2kdQtrs^|*uDx2Lt}BaFfg~UFvLpf
zp$DpVP_77`+;su)A?Ji6&*W3@xsJEJ;p5!;(7*7<?|%y4yzGmlX@)Tt5irKGapQx$
z_d^%(?!S6IW6OjueB|f6`wzdu^2xP$?@H4Em(QmS1K%hE&E|%Ntrd}YUi-|WSVR;-
zRlW1QPVTy>y8TBnfbr2~sER5E5oz}=so34cg)GYarRWi8w#W$%G{?Z*4xDb#LX1B1
zg!4G{m~*)H_J8J^SNt`XU-fxjea`>p_$Qyn*Dn18*WdPCp8oWw^XU)%kfRQHMgfQh
z1j_ua@O4G%QK;&YH3Y9(q!hkgOUCkcVH5N0Ug(EPX%H6qCfPqg))qrd#ec^47dBu-
z=sRkmjGS>3K(tfRTo<YCdB-qMSt-O~P)}s5oO$XSdG<-?^ONhp%r`Ip0H68F3`ZYz
zJYV?u4>;zCXO-74hV;y1!vCN}v|w?AWR$YpYXs@Dr?iNLKD9s|2)0aHY!TKTYhwMI
z7b#54h!H6rUU9+xnL$g6h?t?Li5guXPY1g)$bI$~rHWP%QkY<DtDO71ck#!s{UA?1
zWs*<5{|b&d;#s9n@<?$%`<_K)UL1!0nWeu=pu(P+Erfw0oUc?a+(1==_j$*Ahe#M~
zz`g+4l2C;Y>J6Y-U^0C(@*$ruN2*zn0QRBOeVpgMFbT%k!Dn1*u#%J^y)enX1K;0~
z<!N!*1-eGWprOw&Ax(Sp+I4Vm`<RpFd6wmQM$n)kxL*U1u?PlhB8-VT{iJ-pMyw0i
zG0!S%<1&nv7aj=4eNAk?K$SwVXxn&xjc#1b9EEPLQ`V5?O<z?81%5$vXvEY6u>%3Q
zP(b%}P!Loj6M{v96(Qa~K!bq-V-P89U_K)0zHC_F#L==3IPh2hHG6&?rxvQ%|EljR
zfGIDyu=rIrl1dyjuMfwuh?pXZmARwNZ?GbW;5BH5D#nN|WbGm+UGAh7_AcG>4&|{0
zrg?k@h8zm!0A|5Zo%X%g|2tBPKHHB6`~4h?I@bepDe6?^f<i|_<o4A_^FNCkyw`kY
zcCH&mF}WL|m(KUa7BdI~Di{)s#9hGelcX-L4T-7*CA9UicfZJK{lCsg^jp&ZHG>8w
zBnzfOf|j{kR5m6BLRr0$!RZ$PHSk*)tyjkws*DpyHIiiL*8o(Smx(OKT7@D&Y3OI^
zEUMtKa2*SLjt(eJsZsLsrgV`A+xL(~JN#JU6+L)gCe%VuSNbCzTr09w>eZ#779SKV
z)m)@#TNVy|q3Tz_U`^7MY`l}`GU~OlQi|*cprX?tm@tIV+8kOGkaa=9Y<{N|RZ)ns
zHlgnz2S%qwK9wXjest~Ux$YNNA{0?6Xpv{_mqYt8D`g&7Yb~>lX+HP&AK<=+Zl_kO
z6a2g`^4=9W92GQ3e9Mk6?DlzlkIM`iOzwk*5L81TcuyYkI-<3^@49_+^XC7&N}SL1
zh$kIBxb`9+v}acfV?<wf)<pmhUwp^U?o2atnzfSq;A{wpcM`I$Xk&)B+t#b!``Oc2
zxokY{<aN*#VV)rx6dT3NbT;y-uf2xLe)3FSeeQ)k_2lOi7NFrV;OIW!6gsGo1MN<W
z%dh-8-@o#U?3vrb5l5|@2Xv96HbiEW5N6^^XBk;l-rQ+at{AJYU0O*J_1;S-Ym>FQ
zN#04eHe0*j{pz=zOj3#EHLrT3e)O;3xqpCWrl$e)PcD9jQ4P-8_zyZg^M7i|*kOuj
znsvlwNUsy5+01^P_sqMOjXjxKwHn4)$87t-MWZZ*5Dbit4|D9vL+spsJ0JPd?{Ms)
zFW^<@yqjZ=IvG%$ck_Cu9|b8CvoV%5P5IZWzs>i4`~`N+-p`7a6RbLHJ;nxtSB#Mb
z`1I552=9DrYWFNZ{-=Mt;SVo5@3cmv`IZT@@>#~zCe-=qENxsn+uHfL`e?SbT3IQ_
zt~e)Lcirs_S5^X#?hDYmgV%8QQDe+?>*1&0e^BnaeZz(&D~3<)#QuUL8h*NlXgtr|
z&a{_Z)o9FK_U5<0!E3N|yY1P2g%J9s*?!zF78+NSb%!ix)tbQ09oO&|U$~Bwk35^-
zec9VN^xz{043e^xD}WEmzh8d^-~Pd8**<d@D-RmuxI+&fC~RYjR6@&CLR984Rwbx!
z)+$51{IzE%Bg^AW*FA8<yS8oW+M}OD90~c@MBP{HlW^&T<Rp6gBR^)-gBw}4a%}$q
zZP~n)M>bEfd+I?HuO~n4SksoN8LRPUy={E<@BjRMUh?X71Xaey>t^$&Eq2B7)u_r$
z|IQwpG52G!F$J5fRo1LqLB7iKz_!bI@27skX~+Eze|Y}IBuRp?hR7z|eA~7B<99#7
zrX4r2a_tCDUb_}Cg)g!OEVeJ5AEVRyb!9~f4OL68qhZZRP0l*>MdkxvxXeGWx$T>+
zI^X!wnYQDnwK9?i)j)eLXJU2Cw>~>R?72@MecvT7;h~2gATow_cbc)$Ws+xNSB{++
zo^tTp^y*(-Y-XF=$XyoBJnMN9+p!Qrep1)%ym_v7zZH{;u~L>T=4XP!f^?uC4ULUR
zdl`>x+DVkHVd;|9#N*oubBFQEyRT#UK^0c7T}l)eEEFS)qvZl%f>#I;iCwAWb=kW0
z(e#lm51o?d>D|kgtTscVQCNDAXMAjxSX&{_Qf)T((wMHWWLb<o=q9G`K9PU;#2t(9
z*eB7s{;CIg-b;?>z6WpPXP0(3_SBWwI19Vx?$i6WUqP$4O|wjNbYzst$z{58`cBhm
z&F(N-KeXFzo#aC|6BbC($As#B8X=}ggpDyQUp|Q>9cG$47#>TQn%T(eHA`5se7KnZ
zF_dj<Da@+uyAAeOi!{YDPQ=oDc6P?jwRV2BTGy{FTfW>_6NN0xS-oZ%Nj%PTpK=MC
zw*4IMGls_v)mokI)Dph*p<g~0j{kay^R@3ffjF)p2#w}ma_2D;Q%fcgv7GpnW7xZA
zMwX8rtHCsuZry$7Rh?|d$#FHfYOQ7>D<)7prEF|j6I$2=XF=Ua3z;BN^yt&H@G%7&
zWnL7*e0S9svjSP>kuc;VCbZXUN3G7D8`G@!Qnjt=p=7yC?QH0tsa@RsuPMLj@wf-c
z|LV)H$Auga+MTAU#>)eeuh_L`!<SPxd$x^4>qC=Ls|{m}Cy)|w6#aP}w6_-ya~9LF
z{dQAPa-|&ME858gIK=}lVK7MLT~Oye&UM9y?0X=8Qmvb*)=X}iv%Me)Gqav+FWdGT
zuk&#ak~?2Kzf}w)xZuKGx%+`1?Ec<o({tbcv1gsz>oq?*H@EjFm%C6OT577vWKoJB
z$A^sIasm!5TGOFF<zd7W&2M7`jG(5h@s!1~a`rlk0+GqdZI3MNDkl4nIH`Q*^B3K9
z`B}d=VOFnLCs{8KwV^t3oG?0;0KYjvPw0WVi!S*s;;6z*V;jzA)N2#cYNT-_^=y26
z+50!#_aA?m<_$MGUXMmc#~2<Sqgojzj;mN3&-cCh?QB!bHi|J=Yl&=BRs;nl5P~Cj
zDZO5YR%=e%t)8@I)7k21@0`E;;2qb&EU$m>GmHkKNTE7KW3nveUq1bt4Uj)!1_6BJ
zU6=EoPrjVdk+pQX+j-GTpQS&&^43tT43kuRlvE8fGdYc!1|m)3WCuwlqB>NeQc0**
zYE&wTj*QpuPLfJ)j2$(`sI@k@oR!^9d(3&Kd6r3*<)pooPNzq=)1%#NQ;nAsF*5VR
zOYXQC;B^<C9u3z=+}kdAC71ler354NT8|%`Ckzn4$1nUL@A>4*Sik--jy?J`uDj-!
zSep}9YT4*SOrT2I6MF4H+EZFRPh+}^b4@i8OYk9Y&86o*Y4(`Ax1W4#t<mhV;YZrN
z;7w<I``!m{|6Nr=6j>X^5m6LjZPb61LF2?qBy?B_?1YE!nej)R5c8qG`2s_uF`Cu+
z`X_$#2Ur#!Pw0WVd60fYG8A#y55LDyJ!Yt$5G6Efb<6Nr%-BTC_|llMB?%*A5%rOX
z`fyBbD5g@4Ns^)P;F7zjv{t6u?k1J0kR*v#Dhair3iXjH^^qz=!xd`vm`W`oN-Wj_
zNML7~t!rR<Ta}3=EBWI4AJ}i${%>bc|9I0mUjpEgOJ9XGg<eT2mRg8#i4Y}9oG4jE
z>2;vjDZ;b~V638P!uVuejytg~ci-I(n9#M6AR=mQG0YjoLKGPgFp(jS4Pn7UJR)Et
z<umVj;*WzLaDcw>-8ZsqWsRLXri#f_BSeWIat3P+Q3Td1#ws={2CLGpDdvrgP#KD7
z&SnaR^#_Bsq;Xt;kyI^}iX~1WYzdHamc$tH1#Mz6f<2(WuH^s%^yXK78Gyg}{;LNA
zoW%$)#R!a0wv&q%qj%+~i3^k&1jY!ljfi82Vr$~W5G6u&$Wp0VqR3*bDIWLE4Y64K
ze08)CmeFrq2><T^2;ljzS%$HKwFVJUV+zf(uuY+{P^l{3+v0JiR58ZmgAzrC%Fqx&
zGU6oC>QGFSDAk%Rhs}$r*rJVNuoO(~AJ!PG{T~d_i(dQ;OsQc+q&tww<xqHG0);A$
z6N9>lJV|`Bv$N}R$K=uxCPyc!RBBXfRjRcZi5yAQk|YKj*>d`|Xw~ckP!!SW%^gsH
z4oDR1AJt?S?}B;<&e0TPFsNAMQwxCt69o{uA>=K^qd1+MST3tptj8GHnN(upgb*ji
zq`i%b+{{=o7ByB78@8!x_Gs&uqLOKv_6{gO2b4jbc8YT@EEzqBp!v_c?XXFx9D<OC
z;4NxI#9*xraTNPr=p|m~esIjmOQ+%_Htj|fDnk+?JA|0<&7tAsE!I{iZ7jK1HIa>q
zb{!I|Nu<;4kZbyl3*LDg#$f7`nKwT9p9|2|t&fmAe64Of^c3TKI%Q?_^+uxaj|?xL
zw5U4G#YlpQDngbfM)q85qt=DJt|y5nG){VqE;V8I&WBCAH+|pe@QT+};^BWB8(lGB
zqe!DD7Gq<wG&R%HyXl(UA2|5XL;j^+AD4$7zRlN%M)}4i4<1l}4(RU>I`0pj%h;hm
z;n?F&(5YS1X4{T?Hf24&;~ic?rDC*Zgk;*ga9b~Je`?R%gBQy3U5$!cEi-#s>T+d#
zWH}Mbv|6p1R<`wiiPB32Gn*u}EQxC^LGJIR?H}~g*|#s5IQY`pJzcYP=0El5RWIen
z8*k;5(^qldFJ}(enhxl1pnB_vPi5uu!@1|-9|Owd=%J>WPwQ>dkLW|!5WV<$<73Xb
z{0CRJT1OpP567)vYea*J7*!3_M-nC`C)l*@dKzsw^5El5v)K$c-nf?sZ)?i>Gc=yt
zg{xL=urnv{!j}h=hh{KFAjIS@=h9C<bRd_+{{{YNd_enrvvL3c03~!qSaf7zbY(hY
za%Ew3WdJfTF)=MLIW00WR4_R@Gcr0eGA%GSIxsM(l48sN001R)MObuXVRU6WZEs|0
vW_bWIFflPLFgYzTHdHV-Ix;spGd3+SH##sdcWUue00000NkvXXu0mjfsl$*y

diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_light.png
deleted file mode 100644
index bb6aef1d069a14a7fc1cea9780c919c61679e4fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 148
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtXipc%kc@k8uWjUIP~c#3xZ62X
z=G4p^oaPsfxfS0Jish)R3f(&WG9yqa14Evg(y_dGGlfCy2iXqR3?>_SEs{VyhV?DH
iJ0OaDc|iOR772{!kNsXaOPT8&i0|p@=d#Wzp$Py$I4IEo

diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/md__category_background.9.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/md__category_background.9.png
deleted file mode 100644
index 43a20adcb19dd73d32f7555dfd96e5294800bc82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 173
zcmeAS@N?(olHy`uVBq!ia0vp^+(2x^!3HF|ZYnwhDVAa<&kznEsNqQI0P;BtJR*yM
z>N-J~(fs7;wLn3CPZ!4!kIuJO4Y>{&@Hhvq{NlFv|INDNQ&?t6z4B$!f5v;Ln>B;0
zU-I<Ty={vZo&HfgbDz{ylXztd5ct7g<0Vw^cEQ_YQfw*Jzuz$4cl#mMVk0fM3}`fi
Mr>mdKI;Vst0HI7c0ssI2

diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_focused_holo.9.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_focused_holo.9.png
deleted file mode 100644
index 555270842a739eb45d404ab473ad38a4c730240c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 191
zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhEX7WqAsj$Z!;#Vf<Z~8yL>2?p
zbb>IW`N`93fr5#iE{-7*Q>RY2$k|}P<MRH9uFPS>UG3I8+hq?M&UySt({#?YOY9F7
zV)|4jusAQAw~U49z^wIm)#n)N-o9e&+IDtd30r~4TeZ_)uKQd*6*KFj^h@OhGw-CF
i@bOgmX?1Mk5ox7hDXx8`mUDoXF?hQAxvX<aXaWEy&_TKY

diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_longpressed_holo.9.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_longpressed_holo.9.png
deleted file mode 100644
index 4ea7afa00e2bfe057472ed5a196080fc80ad7383..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhEX7WqAsj$Z!;#Vf<Z~8yL>2?p
zbb>IW`N`93fr2)kE{-7*Q<D>BRJJkl{&7FVVepxUS$Rt1LT2VAvn7lLLt0oo!v4%(
tpjG6n=4tr&fORvYRP%q%M>EqU82;Q9of*be(FHVz!PC{xWt~$(699PnDoy|Z

diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_pressed_holo_dark.9.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_pressed_holo_dark.9.png
deleted file mode 100644
index 5654cd69429fd0a3502a05b5f827bffab89cc7e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1|(OmDOUqhEX7WqAsj$Z!;#Vf<Z~8yL>2?p
zbb>IW`N`93fr5^nE{-7*Q<Dwu{hGqa`^WuILBgJ|n#{^m425Iatt?*a&OPShA!wu!
y`LVuf)d|y?Do1;m-}A6#@cdJ6>D_LZ%D`aoRl?HIGCc%n7=x#)pUXO@geCyJM=ZAh

diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_selector_disabled_holo_dark.9.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/md__list_selector_disabled_holo_dark.9.png
deleted file mode 100644
index f6fd30dcdc9c39c836e509486854f9da03486892..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 189
zcmeAS@N?(olHy`uVBq!ia0vp^;y~=k!3HF){@Qy1DVAa<&kznEsNqQI0P;BtJR*x3
z7`Qt@n9=;?>9s(?cuyC{kcif|*A4j^95`Gq9-KV8B6o6ra`I!Z80pW;7d5zZGhRBg
zm{FnhT6Xzih3ZMUGkfBc^kAT_eS7{3zPQ8d#DAm<io?Kv`8bDFS-+SWt}uSPFIbXz
SldBhK6@#a%pUXO@geCxddpX$v

diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow.png
deleted file mode 100644
index c28d98f3bb435334b7852718214161d780896fce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1578
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

diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow_bottom.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow_bottom.png
deleted file mode 100644
index 4cbe8cbed4e706342ce22921e58c0832852e2da5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1508
zcmV<A1snQ_P)<h;3K|Lk000e1NJLTq001%o000;W1^@s6xCpM{00004b3#c}2nYxW
zd<bNS00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGo!vFvj!vPg=
zO+o+w02y>eSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*00l%zL_t(oN7YzO
zOCwnn&9|MjvF+A$n?y&0jv|6CR2Xn0h`11BHm(Ih5OEaU2>t*;@B<wX!L2({20;cF
z?sUe5Fr#3L-D;w(iMC%cF<-{SKBuOtDKi-pd(zX+gUd_3SM}<gckg-kRul?_LJ3oy
zpP&B_jYdD*{ZAUP5;L)j92BauvNBysNr`cIc(~N>_y6|Pxez0<5;L)r485T-nM}{n
zGC&~9U@(|wW@dgWFE9TQb5E{qY;63}+}!*#$eb#b%JX0_=s7(-4XP_EE7iBRx6eQ#
z1N|FV-t_de2iL)>sw$fr?J2Oixw#3Cj*kA?+1dGfI2=|)B9R+F3#6r`g$fG`!)lky
zrB<m_8h|x`;R~1vzb&h)tNN9dl|XH6ZMM;9<oq{lz!+?4Y58MrZtesig0L%W^aaRV
z1p)!z-rn9Vg%U+Lg)!mNXf&6&K80Ptd~0iKzWVxl$MW(rAO0qd?<NLfAtn*qDX|hW
zv6F)kHXe`XE<HUx3YSH2Lj*%KHgzZz($3D#M&Uw3b#=8C9{W!S0i<GLV#43k({lhF
zxbV_F*gG09901oxM3NWYx*-uIAHW3BsVx?Z4jM7yhHPAahrS4X35<PSV`HOrWMm`*
zq`xYg>+9>g-rio%!otE4-unTz1KY-t%l-iU88+PObUH~Q!c$ft!X}bY<>uz<Fh;$+
z0x2uV6pCbu(dXmHvrJ7*WkX;L%apg>-Q8$gTie<8_O=s??~7g_iCus{qBelde|UH(
zc!DGZ{1Op4nWCa14M^zW(oCETX53@LJc-b35WjV7Y%Hgtp+TEUCX0)U;qLD4W3Sgs
zPuN8g3?(~+?LvxhgG^v&XXjQ<f*9`Ys>m*i8^c*ySw4_CXFTG*E!dx;y@l)dT3cHk
zLqkJ;?9{*J!Zo-S*W}t*@U859Tf{&t#6)bdB>v_RIU>1kup8;P&W7c|z86DH&`n)k
zon?G{JQMAUbmMlr@4C9W+)GPK45iO{z^1;3v1B?!R9wsT5O3%1g;wkhl5PqL3bfb}
z1LozrkwUG&X0w^0o7bhKrH|6h*47sF@X>C!^Hg$3p(N=6*B1ySzr*2(>xFw8FV{$1
zrhlDiO4KwOBp>SL1r7i+UMA^=r<zT#*IRI+nVXuLSo<Vw^YimJIGJ2nlb)a+wn+qQ
z+p#wFaD_Dko12@|gHZlGwCIB#i3v6Cwi<O=8rC!-ue?E@k1;9Kc)D5J+uN=E{r%7X
zsj@+sDh37ye3O%t6f|vDB=H`5wvYU9g5HbzDTHwztx1V6X(A*g*9~^<xuhFR3He6U
zPhL$;jTOl(6XLw58<gF59UUERls-a!pbkV5JCYvY5nm!b#EqOpp%wd3tZs1q68f<)
z-(W40DW<2aRx9((>xzmBp?X+fUyo1^M@L6a?mX_{u`1;UC$2A()k8{%$UGCPn;d{C
zz&sCu66PMAPG=q*95nNpzP>&eDp(hDf}{uhcEGd8kJUrUh)4?o$UWTvkO{!@8Di**
z(dUEEE0O#Ke(%F`?-)|(_i=FWo8r-WNI8*sx&go}jOU`ai5_Cz#&#xpfF3yn(ep3W
z!&f09BcozzgYaRUmdTGa5Xr&(OYy~*7(a#%PB899*!km?8u36TGxn%c>!Ah3LqO0C
zNTeZb((zf4fpI;b1NeYetMwrKu0bZ0Y<@_Fgs_>9J+%@oEb4|;v=-mhS|l~0uteeu
z^CJjVtCXda$`6U&_gSy0CL#+p;cq5xmiRJeW`a+crIQ6OzwZ;D0F~@#!)7x80000<
KMNUMnLSTZ-2)DNY

diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow_right.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow_right.png
deleted file mode 100644
index 2fb6a937e65bbb2e4d380f0fbf81fd953f6ec870..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1524
zcmV<Q1q=F#P)<h;3K|Lk000e1NJLTq000;O001%w1^@s6MnD^=00004b3#c}2nYxW
zd<bNS00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGo!vFvj!vPg=
zO+o+w02y>eSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*00mS@L_t(oN3~ep
zFJpNauBy`dSkz9Zm~Dk2B0(bA?BY&D#7FkVg<BIMl9g~nWUnP|BwQfzC%D;2T)1#Y
zHoLKzVbZY-qlUJst#<mQTH1Y{vno`zr|mk)o8LL7?fd-R_j$j5l}IF#42TpWYierB
z!b-{H`*1icNmm5rb#-;Ji;D|+Zf>s3<#L6TN@eiu>@0}SZUGR+n(`&J+wDKz+}vd6
z<m43G-rlORva(77fk1&;t<I(;8Mso`&fOOk6|D>n4V7b~s$ei!4t;Ora=98{1*N5>
za(*Wr5c)ZMb#?VeV`JlQUaz+dk5p=f(ystC1Iz_?1@JDEin~azM4?dpyt1<LD-@LB
zu?kXyd#zL|Ey1d+s;ZLR1w+!_5&(GB*Vq3tHa6CRTP>vePJVzT#o$PR2uq0%!9@`e
zkQ?ml>-&3qd)te5$B^AnDD)Al0U&mp&32V+WIX~PklAeZx3{+&oKB}1*q`v~J*@ad
zP5|aGnM~Ko@Nw^=h!q-*CTD4BNe6|c5BR8n@>htgJe^L*L=+vmPXGwi+S-~kIXU?T
zx0DDUT7Z_oRZ1o%?qmKoItrfs(#Xh&va73$QFTu`a|F-D2x|paQKUcN;NcED9#6Qp
zx7WJAzyAgA1wKeR!uJ?Ca%r_%{fS7AYi3?vUdHnBa!G!Eei?RO31u}<UJ2140P@9T
zdO|-|R#r;q=H^~QVTAN*SW%Ikovp^2n~3y;0CZVLM@JTtkbK;e&P*3Wx+nmGjE|2i
z+uGV_g^sR*yd~+7qIjgoB{@3ekbL3p?rzI5E_|jZ>9FJ@Ku(?`U9<%RD=aJ|>90^6
zX~{#<$x%$wlL8<}ZEdY|c6L^STSnGfC}!o=p<#Vb(xWSH(f|ZOZpep+hXv9BB4j$0
zv%ITNFdt=lN&p0znwrXOX=!1DVy4&78m#Pyg>1pN7dm0e0GXMYl7)qZ!m_fmQh=}+
zR>Oh{C|CRa{=D+?a-k@u3_vSXDwRMw+NuVd)shRyYeZCm&*vk6G%WyvG&D41&dkiP
zbQI&U1X2Vr1ezj!3!?KR)^pkx?Ck8^PE1UgvFl3!*dUJo29+xgZsD{5FtmjS2L~?@
znryEp05L$$F}%4r9ReVfG634A1Wn0lG#X7%dW;A<KqMW@WHJkq&T}_<rf$LX^t5+t
zYs<(wgq`lgg3nmbusQ*9KNzHB!RqR20E2-M3QwW%0P6uPIDrLrgse}m*WciMh@>Y~
zP5Fbpy}eLRPtPexWE*8A6~-DQ*C~{Liymu|vVi59q(Zp~%8%$8?D`0D4iGn#Kbc`g
z13-ynbad2-R$zu=_Je)MA^dFusoyXF(C<&q6QTi7qJ0}18{E0!PWfl}nH)Hfwa<=}
zqBvMzUk?rp3{WxMvIF@5m;8fJHDdQ}gTWApkQ$xM2?36djzSo~jF^$WusuS-dqj*L
zq<)P>YBWGx7jf_csW!LUZG`fNq_Q-`Bvmv3r+Q2hE=+awyFe<F38d03&yp${0L{d=
zwzkG(Vx|hoL{hO{#v@e}2b-Il{{H@cW+sW<C8^9Yk_zRnc%&u-c+mq0k5HHvJ~$kX
zN2FrsW<-rER;EVpI4%eC^YiOCpOH`s%P%vPq&l@)ZNgDK7TA3r?C$RV-r3ptC%*I@
ziHrbXdN_yQJ%@*f!RL}Go)s^D5XY|078e)aVa%|?*E~rcB2x|5*Vh)f$DPh8pO$5y
zum05B+^h#cKAsgI8kk`(GSy?TSYlSlM8rP)T#Di8FSa;F3H)ux&}8HP6aR<u2+)iE
aA@wiBdJJAOxe^cn0000<MNUMnLSTYQUA9~R

diff --git a/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow_top.png b/Externals/android-menudrawer/samples/res/drawable-hdpi/menu_arrow_top.png
deleted file mode 100644
index 41f6c6a8597f61331d20b2545f251d5e9e5f6a3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1483
zcmV;+1vL7JP)<h;3K|Lk000e1NJLTq001%o000;W1^@s6xCpM{00004b3#c}2nYxW
zd<bNS00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGo!vFvj!vPg=
zO+o+w02y>eSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*00k>aL_t(oN7YwL
zODjnj)w~lEN3TXrqLYL;1`%|j$binug$qFj)Sn=TFp6#ze}L#hMF&K1<KE36xDa*e
z;Kqf5h+aiAnyA;u%}u;X%yZ6Zx+T}g+?X`OOhHlI)zw|+^mk5uRr#q@Do^f`kAiQq
zD#VskaH1qz7TM>N`<viE@QTXHN_8j{QtS14H9?2N;h4c-h+SM<#7GG9l9X&EUoIk2
z6zb~gRPlIR8;L}Wu~@7S{dyrBsZ?04RtI!C-GfS{dfeaNkINYyS%`=v6xG$$s%SK7
zz<m+OlmmPPz!r<Y{WJQnK;jzxevL*GIzB!o8Ac~(spU*WB%!ogt(s&qS)foTN&v1B
ztrPehxGoim++yq*#+>5*0_`2feD(Q!QQRkTC6f~o(GN<q*{lT+6J%osKs)+>LR*8@
zj{XlMg6n%+djS3j?MJj8$nOUI!JC_#N0Cg{zR8M6x*uR-JplaxU=?BnY5>ZOYbWGm
znVg)okjTi$$R%WViFX;1L)0TNLRa_!U$7{IbMei)iAa8MI2>yDfPN@OYXuP(z`Jo@
zgVt`d*{q9;i)9TB4N4N(-Q7*}_V#}Adc8i3@n8&z93pZj@Qn}mpV5ZS&d#J&?Onck
z7m??Fz<nud6>wHF3X~Mus+N`(+x+}|QAtS&bIDV=ySq#E_xJm^wzj<JJg3CO=p5sk
z_qW;lCSxMc{h-xqxhmNKgy7w%E>v4zU!QGkY^*@36aw+0Boc|d@$vDm3kwS*!+Ii;
z`N&8;K0aP&<D2gidBYDDNWuvKf*(+w(71JadfL+2*{OMz!L!blm6ho5@bD!(=EI{W
z-ykBV`1a*{ee;h*p8Ek4et;ir^n*x(L>x}1(?UPg*48qsXIu^r4wCfE>FMbuUOGcP
zVikSEXx(S(n>UH1`vGz=N`4T1z$nlcRc&o;*15U4B9w3ZkSQC#-=7*781QdyZZb0G
zsK=BV{UiAXGJW`7zIj1Jl2T)1qtfH?Ai}yr{Gl>@oPH3bgfU#9tV2UXHps((2xW@<
z)p7WK9%LDsnVIq8+g!mU-!MYVJ)f||2kdrxWM^k5fxZ_T&u@rGQsPzv5@LQR!r!nk
zC!|TqX)>8?v$L}m?d|QthET4uwzd`<92~p~27{CpeIrPXxd*DCZ~Ty2__eLg6A_67
zcC8u!XMRZc1Es`h*xhb7^Fyi2<;pD#Z?Hc(IiYWE4-XG1HIGO}$~RtMy9c%qcG2A0
zJnhp2BI$lWBuoe;_eVdX74n1RhmMX88zfL@G#az=L#B~?cz8%bvVqmrRUzL<zJUbk
zpTE%FA~L~r-$(}_WqEnI7U3&Q%MXkI_e(BR>*(lc6_Obvl_{Q_#_<OusfH#dCYUHC
z-$+su@(pAkxW2v?_G!#oO3Dc&OdwGvCOJt;&f?-?>(bJaqr1CX|8J4tAK+Zg&CP05
z<Hp8D0)7>+ihn1LvrP<`W55>=1OiFnG{=)1UMzsDcy=(Oa>rWG)YMe4zP|2gZEe-%
z^m}u7nR62Zu@IAp%}lJsOzh;K<T4A*Y2gP0+CsEOJkVfit)7~i`UUwxn*$D6Ud1Y@
z>gwt$2e$L=?QL#l{7}vp?5=~@QADut#3*<b&J#kuz{3)ptIf;H%fHpv*Z(RD3YkB$
zx3~94PfyS9hy>3vcg!z1&qO$l0_SWEmQ@oXP>TV73fbmAT!@iaiJ92RLGTqXu*Lov
l(&7s7zbM2?%p!^WzX8N+Us^9}!C?RZ002ovPDHLkV1g&8wJ!hw

diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow.png b/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow.png
deleted file mode 100644
index 26d775951649d52d79bb1457d292f46060cdb187..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 891
zcmV->1BCpEP)<h;3K|Lk000e1NJLTq000mG001Ef1^@s6(A6tx00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10{BTpK~zYIm6lCU6Hyd~-*fMjqNN(r8QMjiRzxMX5z|^E1b>2I
z$CjlFmV5-lnn3vY0kUIDNC+GLfrLP4&>#yXAz%|AZPQ3$WbDiw7g8g1Xve!g?~`+%
z$vJn3nc?*ikw~Z0vREw2P$*>Y?Ce<N6+lE3kH`InVLX&lHVYvxR#sL5!fUvrqob)@
zE{CL)&xH_4P1B;WSZrDG5(c1@%jJhYpYItFWdJCPi;M4t5N{d+00>>zTTIh@EQIJL
zqSr%1Lt$Ol-vU5g01*jQRqvao8C4V|#mqgKOeQ%vIM`mTxf4J{6pcpx0K&FycLC^)
zL?SPzrlw+2%D?VhC03;|bI5U=1QGT6e7;w+v$L^KC?s#(&n=8=X#k!9=pmxi#KgqY
zWHKpl*SmEfbX{)&@R*sq0dx-x47}*?@AtcPdjoJ=8i1ZuDwP}_9uB&Nfqx{rNehR=
zT{AN?nxfqOu|zfOCT(tR?vbjhbY~iX_+M#m9Z-9F`+XvcF>?kDq}2ctiG*SpMk^6@
z0!XLR=|nwgHGs>@OF=~U0I1BYjf{+_^`zAR0)c?T%s&AXh$uflKVPsc%QHac^LcJ-
zYjY}<3KLQD$;rus^Ye4HudmOO0|@}7QppYk0;ZJG0?@p_zuyvxM6}M%&W3jp{AZ_G
z!C>$QfUf{HnK?T>J^gKOZ_jQB003s@gM))#L{t<)d|~E|N~N+pIy(BjP$<-0ntx}3
znK_rsnO9d=XO8210<dv*cJ^s}d^}%I>WyJyW~Wdn7=FJ$XIWMjz-Bg^-CI~#D0>22
zALsb^_yWKo5p4n3T3%k>Ut3!<Jpuk#s_RO-OX}Fz*io@qv>O7dklRvEPftHjPEH=$
zw(T?oTtjN4Zf|ezE-fv6tkyJq8>{;w91gb<Q9=ljAtGgUb+t#=^>>~g*XqV9l}c(;
zQ_~Y6L{QVT-1_?Z2Tya$%uGbT;_-OVFboSob3UKHI668S@cg`AcT)3z@Eb<VfDnkF
RC>H<#002ovPDHLkV1ngIe8d0%

diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow_bottom.png b/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow_bottom.png
deleted file mode 100644
index af8e7b909de1ea441ae012126f5560e43022ab06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 904
zcmV;319$w1P)<h;3K|Lk000e1NJLTq001EX000mO1^@s6n8Frk00004b3#c}2nYxW
zd<bNS00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGh*8l(w*8xH(
zn|J^K02y>eSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*00QVqL_t(YOTAQ0
zPa07aWoGy)f|Ir&rXr+D8&ZfgklN~hXx#A=T(Bde(M4BXXaf8JR%~UZX<WH+(MVeY
z!4zt-6oX=v01=@M9}Yv$Go`UsMa6cKo5y>Pckj99+<PgJNJND~p+SSe5Tt4PCHDX2
z69nO7CX;cDjg9S6cDr42aB$G8(P(sjzyGaXuYdioQS9vOyqlbye3Q@Tv;F=3Wkx2G
zNqL@sP_0&ti;IiAL?V%njEoF|73!|RG@DH!5D2`VnwnbUIIapdN{vQ?V}^%^sZyyV
zp(sj)ppU}gFdK`-WT1&vC=~Qv0Vx)XO$6UwT3Y(vYPGVkG(hFR1jp>}?~5P>4<>5J
zz78<d-rk;cb#+y4wOV`o`ue&C5|785PNy@IOeQ}gsZU@ad~$M<QYw{)o12?F14J#C
z%henh7^vebV|&Cf40n8dELvGv5d$D=GMU7;Wn_7Ixjr*9lPs6ZVdS@l>_hOi#j@;S
zI-PEi_!R8aKVbli7=@_>7#&!#;%FRZb2uE&K&477zCISznaJn!Rf56b7sQCd*1^CA
zYA}n!{DD|J0dN|-4dM(CTCG+q<Z`(dkIXoK1sk>5Y?g(E1r6>x7HpwVXwA;f=A+SQ
zoX`*ZfTR+&S}lh=4tt>u;4ctu%8@;-)9GaR<3pT1#X3sBXti3a$Kx5aSS-wC@(}%}
zr>A#wx!eW`4qpVs7S>`mo2|o_aQ^KdOq{(W@)(UqX{AzOasC)m*szYHg`dyO%{`fz
zn2?=!M)aSbpZ|uUi{Wk^l0>m?t5m9^R4R3<|3%<01#y!)xrzQa2GOZbFm26lw_EM?
zdJB<AByk=6Zw2CtI(dORI~dkLxjcSHu!cM7-xY{9EA2W#Km*K#b2Y30FkfMrPWpEZ
z;%uD^4Gk$U|L+6HJp`{}#FODe+V6M&U)Dj_?vAS*{2FYO*=!bLveG?0JwhUp;PHku
ez=a)fmA{{-63}t;R+!lU0000<MNUMnLSTX?dXp9a

diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow_right.png b/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow_right.png
deleted file mode 100644
index 21deedfcac7d3b13b0f4c25c7af3a59c83bff87a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 862
zcmV-k1EKthP)<h;3K|Lk000e1NJLTq000mG001Ef1^@s6(A6tx00004b3#c}2nYxW
zd<bNS00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGh*8l(w*8xH(
zn|J^K02y>eSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*00O>AL_t(YOQn`g
zYZ^fq$92_ewYIb>dN67veW6MXifKr{KrcnSc=hJRV^k8Pry`0kU%;DJZ_>}uB#kJs
zXz5EZ_;QG-gkrT?UAO-!Bvg&F3td=tXPp0UpZPz}%qSL#L}HiACGGe75{*W~mP#d-
z<G4Bc1zpVX@$tsx<>md!WTJ1iT8}Ii%N;Q;L23+Q%w}_5r_&i3hOtW|lBa{gK(n>A
zB^Ux7^D>*wz5~pG5AVukvL}E%KwBy#5{86oGMU~4gTdDjxB=Wj*CzVzkqG&wax=j1
z_rG$x-P;iCN~KaKJTYpuS|y-V$jy(KKNE|^HVp>D3qbY|i9?}K=#56BoHmsOI?^af
zCX;6Punp1Pd_K1!rBqW_!n51$lEcHp#{f9VbZ}Emy>)&bk4NtF`JO|(g9xamt~F?X
ze_!o%I_-R>t_2_yqC_I0)9dvPnyJ(jA&ufxDz!l~mA6p%OyvcTN?bD4jSQKsR;!Y%
zWI+G|A*N#4+wkfF;Mr(2dT6uRq=Es&)KDm-MOt-$XaTu991a=5fZ1#&N~hC32)h9E
z0Q#j;spf(KnM`JY-Kqw03F0qGrShs)tIY%f3WdTXpU;1W_!JQo0ch0g^%2?}FQ8hj
zvhjHQJ49s&PH=xytJOd7oS}~n==FMBI2>+Gr_(cxJ;D;NA%gz-`T1`mCfQjV0Wt01
z;Go;-bSfBkgr!{>kH?*MyFIxUQvt-Za=Bb3VFOl{%jIoEG+N&BZ;fEdv{OJXn$6}<
zJXg+(6#$=U%bV;10H+fhi9{MS)7Ao5mYqkV(F>eXpJ=A71>|zM55;2fjL)=XfEZuo
zV9<N7*LwnoXGj;Rv>MWPbzLmWqJP^A1Rn!|z*}@yAUwhR7b=Y={#yr)M#I<bcH00|
o;lo#y=|ZLP0mw1_U;hvO0I=1h($acvb^rhX07*qoM6N<$f^hkNlmGw#

diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow_top.png b/Externals/android-menudrawer/samples/res/drawable-mdpi-v14/menu_arrow_top.png
deleted file mode 100644
index 1f5d61a278e0b804d6b9ab93fa7d90f9e1bbfbcd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 878
zcmV-!1CjiRP)<h;3K|Lk000e1NJLTq001EX000mO1^@s6n8Frk00004b3#c}2nYxW
zd<bNS00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGh*8l(w*8xH(
zn|J^K02y>eSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*00PcQL_t(YORbgN
zP8v}V$6<E?3#HWvVp_iHS4bhE5NR=K!;KAGdB<g6fJ>qgUqAxkj#nTt-0=cls+E+~
z2AXOO6(j^AXc}bskb?h1ps|g>uIWim=IqX#ncvRL*(2<9Is(2!h=DyqqtVDzt5r%S
zleJT+R15Fmj=w`8-#tA5W@cta%ChVPo}a)+O)8aMr_*T`AT7QiydVg`+}xbFQmH)0
zQio|kPz7cQfxlyB<Z}71v$L}%9}vzE2uP{bY6+ZABIp9-3ZxZM3Ed^upCRLrr;z1b
zF4usr&85`TC?oRq7_>s6kiqsP9FxFnSbwlut?zetci$07p2>TnCw9c1?CX_pXqcgy
z=+|GX)jn-B8fuE7%y_qoX>q&Vuf1NcoM9M2tJM;OLZM1D8vO={1m=Fb-9DB`B)M!h
zdo!v}214AgKb*WmFbm|WNF-YF`F!*1>+6z#KQ9)GHFkD(e%#*Pet~Wua0$qtqx$4Q
zhzII#gR{3PmC76p1~n#=i5`^SWHR}CV`Jl@SS%jH<`BM)M)k>G5WVzMsHb#nY)ple
z8cA?Wo5f-=`Tc$+bmSi~bd*Y^&eqn}Wg?MC!jM25qLit6y<UWl9OL%=)AI*{YyC$7
z^!0rDqzmzw`g4Wh(kCRflwPkVKcGo8-2&3qt^f4&^kN_o&<(3UR}j)Co12@NLZR@L
zlm=x!Li3)YVaw;|=S>=CoGF*f69AY8z#C*`#b&cDhQnd7=?69-R{&x+H8n*!oz7<`
zCnw^3K2MRWho)(^*=*hz42A}cvn&SLH~=(IzVLWFOWWJqW?V}D1)vX$yM=POT;pP~
z_$nTcrxEKK^9mp=Jv%!q#7!tvDwTprB=XVWaI67n<O$%DiM}oIyS%)t0}Q*jw->9`
zY9(Z;-o26!4h}Rroi0ks@fhci*@NtV%49NbyWM_q2d841GUbA(y8r+H07*qoM6N<$
Ef(G@71^@s6

diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/ic_action_refresh_dark.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/ic_action_refresh_dark.png
deleted file mode 100644
index bd611e8e24d2e211a94d1658a49c823c4201716f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3033
zcmb7G<yRE`)BPYwEZrpv(kq?PuuFF=?gA>!f{3IdAh>i2BGN8`NSA^xE+yS8CAox@
z2z-G@LQv|5f5J28+_^7i=A1kC%!`RPH`Swsa6te7v<CXxmY2-?50s>rS^IrL_a#yJ
z=-c=MK+W_IBxCborvO0AJm7G1b9e6mZ+~}hA6^4EoY%+C+s)&lD*#Vtu~uk=)dri|
z(ZT`DC=T=5$lH>YlGhTJh+#<;g7Q%@7{>7x%&=OtG3w}$arfrOktQc&l2|RoXc8dP
z6svsik|PV_68cY;LJB=6n~r`AoqwKEU$5N9)(um%QqpAT%UZ}|Xv$#M8NWyNbapST
zN@#{d1bhGkWt|J3{~13CI1W=)y>+vdq6LsV9jB%QttPpxQrBWH=r>{6cS$f&B&`9d
zw~Z(<EI>0j8CDE5bxAPTEFmk9PX-(YoSjyHxj1kTe*R+|V6ey8Atb==H6JTUek$N)
zc8${p?kb>i_)dZjKuG}>H=|A^Ff9(G43KX6;6puVB`{Fe0!kVnWf2!G3dll$LoYx7
zQxKI6SakQ0s=sbkGps`|oyx9N#S19ugxgVy`%)m064ylt2JE+36dbQO=4eW^2W4~0
zgv-%?-yZ}ZKb7@z+x@er1iEShK_MAOXD`0_mHgtSlhexi+Hi%BCICwTVWa0_l671d
z6>^N%`8&ZKGWYw``Hznh-D>GIKZE>@S>(RYKW}sjUgBqF)>c=i4Lf0Wj{V5cb9B3X
zEAs5&pD@+aqr>kl%L3st_rmqaj=#4L9vBy08-7I<<uvyrMenqp`r?#l{AQ<t6CMR+
zS+QX9P1epy+LtN184r6U+9f!4;j+9ac0#JYC=Wh7P$vmV6)(N#O#0hMm;n{gx_kt{
zUZZ#0HxWuwjC<tLaNxzR#+hEeAi%g8yz&L$zP5k_qQ6d~hw}0S^TVMZw73u2IK*1X
zueDvBYok7OP>6yFbhg77U=SC~H9rT@$_SW9%+LoOsDtD;O&+;c3-_2bA3BM4>o0U_
zKJ<SbDf8Myn!>5bw0bF-9r<SCNSqQ-{K=H;+0n;*ZTe(Pi2}TRaV!=$jZ)?Hr7aT>
zyw>_Wduo1Hlw$AdHl(Wb0-1=@m?k~x*WtAmYTsx+!||nxTv593s7G7^q;pc(@^eT0
zK5?lfDHN=aRJha6rl`Yvq*{M+P{?*Zl#=M~fPK6zMwR9~@bP9PO+`1?hdY&|jq!)h
z!yg05n8I~hsT9ZpVZ4slwe(TODAQ^EQr>F<a*VT7id3Xg7VW|}(@Kp#2{kbO>Ev*d
zk&Z>_i}6n~r7%k}gv7x+6$O~$;WEPbmsbovzDJBPjp>d(vgF?oE6bJB=i*Q6n|1N5
zrBHe;#(S$bdKJ6cu`0XDy~?*|2f;dN`o2H5S{AYFe_+VD#;_*0M(&y=qh(!~V>w@1
zfMAqQv4vF?;4Et_VoRCj9_J_xMY0(f6;-`UALnvscR%u|`5Dl_IG=vqG;;(wHn5@h
zGxI0uK_Crn3~OXh99o1kmxF=>%^Ap1lVx1YIiASbgOE~`-pX3frqA}aMnQ4VXRN9H
zkaWXzp>%GjB%-XmxO}0U+Iru50FhF5-zv0P*IL$UrHtxZMul}b)_lu~+X`K#QW{&1
zF7-xeybrTEizm0~FzzsezqiQ$Xus0b%}edfS@%?o&y%(y=5e@ur_jftnP*R+jag?r
zjfraIWd%xbSwmT5o#p;(Hw}uFEZ^fd0j5;zA|;voVF?Q?yQ0gY+{JRncxl(Wp5+;t
z8K?^V3X2N8t!9Pl?GkKpvrePUNjRNWkD>5gVLfyT;VO3BYQ}251X99gqNaRUEm7`S
z#9h#+9r*Q8$xc>Y%Y96qv3JQrQ1klVYoU^7h%>LhC5L)6DDpZQ0dgV@fkU-R-q%}|
zN3w_b%L0C{Lla))nC_Ul6qSk}RV|#*eW6RA<k5Y1MPS9N+pD`!h+K$I$jD^VWGBbc
z1Yay#tYWNU+%q&d^loS}TRvA!dP-(JcRhD1cd_2V_NlEHt`zsh)u49Ow%BF|*Yqgb
zR>`IaWo>(}PPYnMB{<nw)mXw<f;UYwt;m~1cYOGT>%*1RbADKxCMQ<oyl|n8XeV}b
zeOGnIPFizXXhZ0WGc^j@*crMC9$TI;|4)7_%6F6(atLpBG(x)$GBza9s9}cTY1tJV
z^MGil2i7WgTo28T#`{O^$0f!aMGQz}s!QZ@chC1WuNnp%`rca#9y`S5*5$TumlA7s
z6m~pzV&~ot%DolMvyt^5>F9-jw^$q1pnjV!<+)fHW(GG4M}J=Dmvoj)MOICHs4ogE
zKXTk<SO2Z<_jW~nMOAS@X2HgOP_ebXw|>B^!#mGDdJ+Dd|H9=W_+k{4U<66fr19Ze
z;dWO}j)R}^eNEO-Cc6Hvo!Qn(%ExQ5YNbR}MXa?|@wxZ@_p*xbXg!ONO7NhIHV^wb
zIYQz1!!fZVj7B&*HX0eDk?a$P;u@9Cln)%8gZnRP|JBaWUdTmDn<>?Z8_Gk~%OxJD
z&MG#@HE488xY-O&ps*-|hep?wB%sv_j~=!xo^J2QE@PLeS3=mcBzy1q1Qih4528!h
z$|RV?lruDq<4kYA{y!}SXenEg;2v|JU@|1Aou?grQ*u;cG;SJx7kb@vPakR${OZ5d
zCix(NF4-cnHGGtC*~=zlTI2a#<vg~WC%j%VYRb*hk*`u;`ohZjOww@ZP4o}9Cj*tP
z(Y5DYj}q%8ucuS=dDgwGylNv3!NH1uB5XybpcJ)eSESq5q4<8KjEcNlL)(LO{lu4w
zZ+72aY%{epExp1O#TX&Qc~C!^D<3G;s`>^IAuFs`Z^hgpuT=e#fP;EXm{n{eGpoaz
zg@R2y!|%8CN3?w=@!X=ehO9-0Zp}??-!nr=+AMx{{2PPiR%eY*sAeIuXR<z@7MXjx
z#vSY3|22E=^{29mPQ1&o+nC$Nj|K5OJGzYW%paL_k7#FRKhZAU`LuobTZbr_IV3`C
zjKsn5g<n;_G`W`a5r$MW5bqHOh`$Jhow51Pj#I~vMt8VFntsduH$k*(IyzJDYav>b
zSes0^O}L&IoYWm@RL7TZ9A}((-K#S7^4;zs9V0!X;HSe);lEArjHw|kQzmb1>CyGv
zXgSC328z=v&|1HE)4j~^qaC!maYVIvbe&dt_DNDm<r2mCjVC;49?1u=oV^^~T&tWD
zJ14savqAOI$<2k}Q$6Ah`Zsc_HbI8_h(3?mjfn9y^xkk1HXR!pCh=#^f%py=vhGY+
zd_eEL+rSX8G^TTrxUSNqLb$v4C19_XxW<h9g3PH=w)ff$*i=1F8#n7|eAAdyjlb)O
z-wAI19O8Dg!JVf_m_KL^`o(rJIgzKNHs8D-?0wXAbhyYiALb`~Mi^+E2^8L`YBFoG
zKhWIPnt{*9PH5Pj&rR>nJ%7*|n7=<dr*}ji9XWiSdYD2FznYSrG7v)>vz2#ST}f$K
z!|!b4v;;ovGAxwGe*W%!pqiacGVFL_Yl<+MHCm9lmznm}>sis+X6qJb4Y9ku`+7^?
zQ(5Wz2X{`k+XCkTd3FmI>CIN3@je&1aR2l1&}yXQB#kpI?ShOnYyZ?)R-E|n`E=H|
zGyx!35CBXh0Dmqnc>{pQQUGi^0HB-&0K4}q`!3zfURiTvgwDnPKh_w2>RpaA23VR}
z0a`90SxpmLH-F5FoZ`CH!J3x7qRV2bfwmTcgL9%y>s1sli+0<U7Dz%z<AsNv!)PgE
zWr)n7|3jO>Ehf6=Kh5T6f;S++@y}RCB2~V;5$!f!d0bDbR4M}<A0pS5FEG#6t=6<;
zh71*tLQ0gqu~Q-)?>IHBUdms!q34uK*RsO6vGsBVZ8bG8-+7^s!}Lu+#FW1fs%1i^
zFwc=*2H~83yzcIow6W@UTg`|0@QO#tt;Q+hM?=DL*TL>Hu!N*WlFD(9TxtdeI;Psy
IFo%f$0VKS%G5`Po

diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/ic_launcher.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 359047dfa4ed206e41e2354f9c6b307e713efe32..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5237
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

diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_light.png
deleted file mode 100644
index 01d681697f799729aa60bcc03878b8718ef5f705..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 131
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzFHaZ8kch)?uW#gKP~c&9OkaNH
zNWhsXa}P0HP*CC8e>x;QVw%w1wevX{81fiqT9$oZHH(4a215zM2{s3I28IOo7eJ#J
d>KPlRN5&o6d@ywr|9haR44$rjF6*2UngC}HDAND{

diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/md__category_background.9.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/md__category_background.9.png
deleted file mode 100644
index af0bc168d5874115709681fbedafb07826a02351..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 165
zcmeAS@N?(olHy`uVBq!ia0vp^96+qZ!3HFgEN0vWQY^(zo*^7SP{WbZ0pxQQctjR6
zFmQK*Fr)d&(`$i(?w&4=Ar`%FCmV7xDDW@~e{}!%Klk~9W+&H!TiIp3`YtSG+Hzpd
z#y621Pt&Gs{iIU!vCNrEbIFEaRnCmSjNkVX9JU?iXTQVf_Cz%GW$8;tppguou6{1-
HoD!M<v(Yq&

diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_focused_holo.9.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_focused_holo.9.png
deleted file mode 100644
index 00f05d8c97e7963f23dc48a79ec0b09b88d52e20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zaCd?*qxs3xYk`8ko-U3d5>tD79C;fY1elknGfSSZkgss!Fq+WV_wb<Yv?oF{QsjJR
zFA6I7!J^9Wy6~-!#qUj9BLg$P3R$$RKlt3)>)ql1{DGd2)`S!@o4yre42YU?3urKd
Mr>mdKI;Vst081n_F8}}l

diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_longpressed_holo.9.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_longpressed_holo.9.png
deleted file mode 100644
index 3bf8e03623c94b68d31963ffe7e59c72c3dcc059..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 151
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zaCd?*qxs3xYk`86o-U3d5>t~CW>mH@a{g&g;s7!l1y4Byva-KaJLVIiI)OpBYodjS
ofJx&-C1HsL_x|*Yp0_#7zz}{&aC*>dO_0?Lp00i_>zopr00f~Zw*UYD

diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_pressed_holo_dark.9.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_pressed_holo_dark.9.png
deleted file mode 100644
index 6e77525d2dbbc1673145d60d775602c85264330d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zaCd?*qxs3xYk`6eo-U3d5>t~6?){p=$oZ!|i46oEul1LdSlBa@C*nY4{!0_J9HA2p
woHspUxHx7V@R-QS6OjM!cw6swyHo~-e~lvMp^1B@1I=RaboFyt=akR{0Ay(_r~m)}

diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_selector_disabled_holo_dark.9.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/md__list_selector_disabled_holo_dark.9.png
deleted file mode 100644
index 92da2f0dd3711a2ceb843768cafd6b91a2807b43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^{6MVD!3HFkzrK_Oq*#ibJVQ8upoSx*1IXtr@Q5sC
zVBqcqVMg<lr`G}n{XAV9Lp(a)UNPirFyL_x+^yc;{e827iq@4Cu@P@Ho8#TM116ql
zQn>#;uvX%d>fBtxy+SfFGJhTv9Z9>9n%%Tr7{oI+Q@DMao9hQt@O?p#8;eZd15IY|
MboFyt=akR{068-?^#A|>

diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow.png
deleted file mode 100644
index ecacda71130fb1e1b0b2ab9afbeb05c7c14532b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 869
zcmV-r1DgDaP)<h;3K|Lk000e1NJLTq000mG001Ef1^@s6(A6tx00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10^&(TK~zYIwU$j!6Hyd~-*fM@MN1{5LmS3gDUN7t6GQ|@f*TgH
za?g?#hVTPOSU_OGUua~-hNSohSg|5NL&8Umx=<1lY)GUfO;f0p&dhNkkRqiWV!Z2l
zpPcjLo^ywo8BPxoiSF)hd31Cn{eHi-xw&bQQveZBTU(o_SS&V4DI0_k$IHvhUg0#X
z>$<y8DEOt6PlOOLP18cUu76aVgaIgpLZQj!a&-_<4*+Fxaq+#B@>N{`01*y{8%w29
zL<rGKL@&q3$Aghb<P8ASbU;KxRaLK)vQ1HxerA5#-`^iwSXgLR6h+ho5D|q!p#}i=
zEz2^55QD9)t$j;NOAl35m6zq+6xMa!&CGt=wxdMU=XSfF&&|zU30DPFN(0aVz#yU*
zv$M00ySlpM-``iOK!n5LMgS3J?gh|0JUsktXlTe&wc1JtRiq6XhVeR)NCaFiSG7Ep
ziZF#jArF9{Wm%m7`ZP`JjK||GH-#@-s3Gk^AP}G%(*VS6rB$nd+S}Xj6466u?m-=C
z*8tIIR4EpV%|!GRK(}ES(W$8^pOY{Eh?A2OK}2@|sLb3lGc%*sl6DQ?^?Ge){skaQ
zM48FS$!xh?b_|f2Ooju2fL$(^nTQ(F>GZvPKCcc83^;Ni0U(#lSzfQVB&9R~G^A3g
zMorUNVzF4=aTomODw;l@FAv}wfFv_-O-xLD-`?J~>H+|OnR$12_l$^+gb-htdF|}%
zY-eO-<j3LRVa=s^IZVvV>2$hudV2cPw(S&vwS$9$)adAFrk2zz)5y$rHk&PaJf5^^
znp*&p$z<~L^z?MW5#apT`}_OH0QQJz1Hi`o{QTEMB2jV#xUJOxvlA~WsUr2$*x1;f
zX_|Ijz&Yfa)YaA1op?OHTDOJDRsbl$V6d5pqC$usB2rdXR*Xm_^3KuYda<!`xt!{D
vyB`T5e43`E*VorS{PXMV7;p}`_J8mjjFNU<Sl(fB00000NkvXXu0mjfU!RHY

diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow_bottom.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow_bottom.png
deleted file mode 100644
index 3dce461a3d2475b2b3862c9006030ae7793fe112..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 887
zcmV--1Bm>IP)<h;3K|Lk000e1NJLTq001EX000mO1^@s6n8Frk00004b3#c}2nYxW
zd<bNS00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGh*8l(w*8xH(
zn|J^K02y>eSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*00P%ZL_t(YOTAUg
zPFhhEy${}x-n8;iM4AX`nnGeI!H~}U1}6?pNH7ll0ge8HF>#_Zm^fk9Q5{H2N?Kzo
zg&ImDB^s4RD0q2zxpr+@8mmyKT5qy*xaXd;*V=2Zb6^;TVbkffLz1NU#XUZRN4SK~
z_<TO)@bK_}-|rvGX0y@z;6XTqN4SK~tJP{1SUsv#Dz3G)HA$&ds_<ci<2V*9@ALtV
zyu7@;6$}P9%jI%amgQoj(GYp3)5#W#MJ3C!Mj+Z^v6zrZB-9fV6M{~s<L-(@p-^Z7
z{7X0-{tUJAh-|ajJQ^Gv6#2u$L&j`2OVw(%hU)7e!{%~1RWusaK(YrzLqoSFvc0|C
zoSK^2PbQNeP}Ex}kT^d-&ln7b(^M)Y@#KNIxw$6#Q^)fiuO*)6MYM<6*w|25tyaO~
z@hEPpNF)-e&&<qxDwRqJ)VGQ1-yqkXAPA@MMuYHKL@PfjfI;DKI1C_Thbm*3dVzR8
zJw5$wVPU}tzx2%ol`@Nqi{<t8^^d@Kk9Z9QcHqH0l&&C=L<CycZ4#G=a3+&Ur_pGv
z*yP5105Kj21UxG%D`tzu($lcV$Hy15v$H4hczl=SN5oN7vR11d!5bpp<u-w9B-&-7
zdd_aQtFdqZb5Agi6B(P$HnzIDI^y+u`EHU>|3jhB*MozD9Rf!#BC&_@TRxw!BbR)2
zZ%5P7LTspMwb~OLt6lW*6_UJ!iMJ*vCsWktP9$iazSBBdPy1*;<)M6?2y|8Ak|KTi
z<X`&ViTod)=(ymgVY~Uny|lDsnxCI9p#RB!`hO!5fANVQ-+YkR44x<W{SITISO0HC
zqJ4T?E|&^dt^mNth^Lr0AqpUqM(i7n#!@DeX`TOW=Dj-KvmMtq{JKv@M@My{C_coi
z7I;-$@pSpn@%w%L{~L+6A{be>+pRb|JLB|vy^Jea!d&Z5xL@%0x*yGZsmUXL-`xNJ
N002ovPDHLkV1kRNn2-Pf

diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow_right.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow_right.png
deleted file mode 100644
index 3222d034e9d310f481d1dcded81587abfaa5ec5b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 855
zcmV-d1E~CoP)<h;3K|Lk000e1NJLTq000mG001Ef1^@s6(A6tx00004b3#c}2nYxW
zd<bNS00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGh*8l(w*8xH(
zn|J^K02y>eSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*00Os3L_t(YORbj8
zYZ^fq#&wNKHMUT#1!;_mZK3U<RuW3Vlb4G0tl-6yApQY@P(cs=3xX$)(rZrXv9+m9
zF~$;$w4z3>Ur|D^rhcv4XG#*{*X}~Pu&g^f?{A*>nVEMK3Iqb7*=%0xcDo{_Qc0)N
zX_{e}DcX5mR6d{IXf~U-hr{9hYPEV-r_)J<xOhdQ6J<0S-)S_O2NXp;6NyBRd%d0#
zZM-2u$Yn~U(vHPqN#W;YI-P#SGuLXhPBFlQd}mWbk&k-4{*B-7e+}hZP_j*$v|8;t
zQOK3bKLw=IWHOn$T&`j=nLGmMJ>HWvO_w{JPM^)xD*%C@Gi|fkjvI}}9#YwbCn+@l
zs?}<PRjJHKRH;;=SS+?Fkw~6H#VbIbB9PV8g&a*LlPD62JOtncMt_O>5oYENo@>jd
zcd1EEr&H>7yPqIv8wyxWo$=th<KyvI08l%XN`1!2yQ@rH2_Ud`yUp0`c4BIBm8q=r
ztX8XqFm;2?RL+IMWhy6tq%vpf7ChNB7z{G9lUY4jVrmPfe!$G^;Qom1U+1NOfW%_4
zARG>>5O@!-DyX>C@AoO*05Yw?V6cP06SC?7`XiUir@R57P^bs_IRvK>oR`UDr@35i
z!V8c{B!=;L{5yj8p@7tj<6^ORj(3I=kjZ4|Kp^lFK?evRyYq)ap*XuNHmm@$5<MPI
zbu=0s0<ec-lY@e8p->oIZts-<Vw%_MJ*n60S&T;NLv}D2v``y{*K5N{z=df?L^d|k
zfmAB3q2Qd)SEr?bIn(w5DOD<!-*_&Z7YhI`)8>op|Er0lD*JrC5={HXX4<@hs}!Qq
z=qFr<T&68e;YKGD4v#MmhvO~CSxiw1^FOoF=0{vmfYVuPwOadFDC>X?uu0C!<?_s8
hVS|uk{6_x|{sQWcB({!jI(+~D002ovPDHLkV1l11eX;-m

diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow_top.png b/Externals/android-menudrawer/samples/res/drawable-mdpi/menu_arrow_top.png
deleted file mode 100644
index cde43fd2b15284a1fb3657bc0a63a4eeeb683c5d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 835
zcmV-J1HAl+P)<h;3K|Lk000e1NJLTq001EX000mO1^@s6n8Frk00004b3#c}2nYxW
zd<bNS00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGh*8l(w*8xH(
zn|J^K02y>eSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*00N^)L_t(YOSM(o
zYFa@QjprOM^^zuN3|?ZanjlzWte8r%g+8=>)+b+m5&Qzd5718#`~dN}uRdEOrL`>z
zl8QAbLX9RAtMzWz4qB2D^;nvLVV{}Vv)4L%?U@lwr_+sfn*a@a1U8$E>vTGdOeUKY
z3WX8o5N`c|f_3-I2yiBoN!smpw=sTz7{8=a=~cO0?t;i@T_S6dAOaSPMbvJ$AL4T#
z-3m|@dK17!^mBzm@uO5K4b~yTn*;zEy<RUya3w$wVO_9J*d450;QIsYd)PDBR;^a+
zV{O7mYG#!a{XH71QmJI{)gdqezry!xx7+<9olZX|OJka+b@C&B+BcJLDa=w5bNvkl
z!zRnJ#_@RUMzlAWe;Eh_T&YxQ7sbhvr7_LZI{A@5?ZcQ`MP#8IH}yxLM;ymJfqf<t
ziH@Vu=z-tw7ytcxAk&XTB3}oC!6&S}8;wREVZW`alRHV=q5lbjxwTrYJ&{Q4IUEjl
zQGRo|+&CBvR_pcpXZU0h>vUC}+#)ec8v{M15{YDYGMU&29Q_2kKaR)aJ8HF>?uezW
z(P&IVq0mJ(o6W<KNMsp?DfD{1@6BeDj`8H?>G@L=JoE?tY68TL{2+~*Z=GCc;$QS%
zm5up2pE{w`GDf43E+C~)C_F^k=K3E&|NUk9^CdE?lXKL`7m@}tpALt^GZbvAQmG7B
zr_;%`TCHsmH~@jC$coG3@f;<SNu$|pURZ#936P&gqhWkL-)26a7geiOhMpcA;Vw?m
zPpj41XT@T%2+X!XU=NGha5#J%i^c46x%|Hnn3KiZ!g#&jE#O^dGMO^4uFx+*q`QGk
z2z5H0(&cj5@c_NOeg^Nk5f0%IF5weVL9tjg;9|+%Gxn|Ugh#l9{~J&eHV#uN2yp-a
N002ovPDHLkV1n$TZdU*R

diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow.png
deleted file mode 100644
index 6bdcc62e1a554be900ba3fbc2784e88db70a160d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1735
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

diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow_bottom.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow_bottom.png
deleted file mode 100644
index aba9001f33921d082f81ae35ef8011e4a4780968..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1650
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

diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow_right.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow_right.png
deleted file mode 100644
index 85591b81d5911d09543213e38f17ecfc58b0b726..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1669
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
P00000NkvXXu0mjf^D*{*

diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow_top.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi-v14/menu_arrow_top.png
deleted file mode 100644
index b81c74749dd04192b11d99990800287fa089c693..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1654
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
Ad;kCd

diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_action_refresh_dark.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_action_refresh_dark.png
deleted file mode 100644
index a7fdc0dfcb1dc50bd0ebd2527d174398b8470797..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3219
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

diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_action_select_all_dark.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_action_select_all_dark.png
deleted file mode 100644
index f193a8bb3189d555e19da136c81a892e879c67fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2856
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
GLSTY#Gfc1m

diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_launcher.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 71c6d760f05183ef8a47c614d8d13380c8528499..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14383
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

diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_light.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_light.png
deleted file mode 100644
index 930ca8d95e8bee5a1240fba645d9dab919abd734..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 184
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=^`0({Ar-gYUf;;epuoZ6aJO@&
z%&D0-IKvGL&8p&qV;O7KuliPO1yl(K>(rHwor_8Hg9|Y9Gj8!^hz0Vk4~QZ}ABcvv
nF)(akj$uTI?LshtEWgbR4Rf6*RPme*0Ev6L`njxgN@xNAEX^ml

diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__category_background.9.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__category_background.9.png
deleted file mode 100644
index 942d72e65b095ad900722a8e5e7385228ae0c783..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 179
zcmeAS@N?(olHy`uVBq!ia0vp^d_e5P!3HGLFFij7q*#ibJVQ8upoSx*1IXtr@Q5sC
zVBqcqVMg<lr`G}nLp@y_Lp(a)UN_`AV8G)XxblnJ&i^;-o=@TFoPJHAQT;R9!;?%~
zIM&acp1oOg-Ksxq(`K2yitycT%?1bmMDI;v=@CxZ9qi7$srE}eV;w_+wD{s4t`d-~
N44$rjF6*2UngCCoH_!k8

diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_focused_holo.9.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_focused_holo.9.png
deleted file mode 100644
index b545f8e57871c0a11cfeddb22bbd9d7f5014959b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xamSQK*5Dp-y;YjHK@;M7UB8wRq
zxI00Z(fs7;wLrmKPZ!4!jfs0F-sWsD;BkFFHSeKB-$mOyp5I?c^gWch-rv=K<HE1Y
z%#9NYI6M_NSyLX}o#MbS<I=t<IsLkQpFg-)T#Dy8aeDo-c?I&V3`wtDEGt9TJnAg@
u)LmfqM&90ftKXVS@k>-D=*+w0EX1GeE8VNeS)2#7n8DN4&t;ucLK6V`fk$Nk

diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_longpressed_holo.9.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_longpressed_holo.9.png
deleted file mode 100644
index eda10e6123e1e1383c4617228ec0c96680d60dc7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xamSQK*5Dp-y;YjHK@;M7UB8wRq
zxI00Z(fs7;wLn1!PZ!4!jfu$#Gb-B{xqtMx1s*(O%+nLV7IxRdaaX6Iu&3070|zpW
ye6d-ZyJWwc+pgOl@x443T>9p%`1p8cx&%YrImy|zOvgZGF?hQAxvX<aXaWGxT`;Bq

diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_pressed_holo_dark.9.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_pressed_holo_dark.9.png
deleted file mode 100644
index e4b33935a3aa4f1af3fa9e9e199b5c47d43f4b74..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT0xamSQK*5Dp-y;YjHK@;M7UB8wRq
zxI00Z(fs7;wLn2vPZ!4!jfu$y_kK-b<o?m$7TECd+H#(rfMY&6y9ygO-@BCQvn0cT
zjd`));m;=9C;pR?e3_?QYii^mY+1GFSa<JsyHo~-LknfBJ^yoS0S#pEboFyt=akR{
E03!}D^#A|>

diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_selector_disabled_holo_dark.9.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/md__list_selector_disabled_holo_dark.9.png
deleted file mode 100644
index 88726b69160589c8545759440e8d4e69dc984c67..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^azGr$!3HF6SgS1tQk(@Ik;M!Q+?^oIXnykaTA*No
zr;B4qM&sKXhJ1$tcw7#es=J@sd2yMiyW@jyg@u(<xldoV&fR?DHv6r#zMuP6%{QHF
zGbv|#_kraH5)34G*qRSQssCL1^*8KVpFh1e{lR<|gg8W6eAc#^Grj-M%uQ$CCL%O1
U<JjptK)V?{UHx3vIVCg!0CIFh(f|Me

diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow.png
deleted file mode 100644
index b15993723728c411ebcd61a16d4fbd718ee432d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1723
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
RdKv%#002ovPDHLkV1g_I`BVS^

diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow_bottom.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow_bottom.png
deleted file mode 100644
index 77a088fdce593e8698eb371931b06957bf719e71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1592
zcmV-82FLk{P)<h;3K|Lk000e1NJLTq002S&001Be1^@s6rf9CY00004b3#c}2nYxW
zd<bNS00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGvuK)lWuK`{f
zksJU302y>eSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*00o#yL_t(&L)}?T
zOCwnnjj2jvVtUMnNhVIZmBE!R#FZ;?;lj<h8_=Z)A|vwy6a?Mr515UJBCZtwfP)O<
zW)`l5LB#<V(w&b^V!j-c&UfaVXH}C<r>C_|#c09fRlRyux#zrlPrZAi)9G|=N|UnL
z>@Sr{C5QIXj~uZAx1{3N<AjHPU|>M%>FL?IxVZSKTrP)|@fX(-8!-|qF%!EWKqVm(
zi5MkGGLMao{j;>R^m96${`;k|Kup9&jKoUJDj5t5+2`{a(3?x8(ko2pL~nCCosPY|
zy<hwL`^R1aA?N4ke@sqJ{uYbH;=q^$#uWO0f$f9e?=R3bB(vEp!)4lW!wPY*W6YJ$
z=iNIyJE6|b&cfi};E#G7&yf%SE^TdX{XR1@^JgxX(^LF_qX;;;VzHP9?jk&;EMmlJ
zwaVy?ZEbC4%zK62f$J_b_tDW&<@EIQW^{DaOTwNL8Hq$9H$OlB*XHJCK(V_(4*<qn
z^l9{2^aT)6<SJJHuw*b8iXbl!ui#fBi^hj|7!D5)^W)>==O85WT!^5pw3)UO1MMaz
zVk1UkC1zshEkOkIpai$cV^RjLl0qNH_%&J#Ekzasfk1X*V&dKY{(idE$)Jt2l{V9M
z1p~2M6PtoDL(IfZ4j3A`P$;D9?(WvXMJkw7M*NiVKp7!Y#%&5J36sF0d~k43g3HMx
zBO@j-+ftkq3I*Nr^775v+FBU4CSY6yEr|9G?Jc13Jc@Y~%Z%M_&!3&02_o949RMuA
z_VxA2@pzm7EpQtf?zupU7x!M{{0*l0(DS-$czD>kzP@gExm<kq$&Y9>TA7=hOB^2`
zi<O71A=v6i|CU66gb>a@lHhPSa+jBvMcm_}-x0w>C4=8peqTWV$@mWUyU@NT8E9{m
zo@BVZUaw<gW20+mXy{2@<K*O|G&?(c4bNssN9p9M7qADm_h{Gfgc}f&al75BCkPS*
zewBzSGPuH$$Kx@|vfR$S1zzHWmw0gQQwhOXH_kmqqtU*)y6T#mnle3wTkP)c<`x$h
zqxjr26vDtm_ZMCOoBgnvV=?X-@VU%}!(oc22nUsf&xoic0~;+Fp3#mMSkc?Srbi(_
zcm}S0xc1=OIXyk?T3K1?fEP7|59$GaFTK6JO%I3xR2Vk;RZk!xxDLa{Bo_1*eHI%h
zhQeng)Fq;Z41I5JFWw^?@xvWp-Nujrc%d6gsL)HQb;G8$ZYX+?RP{g!1(F~<0VFUq
zqVU!v7ADP&)790L(1Th}P*?4f(5PNYMKd@g60%y|0K;C2r$PovX^L+ApB_*g;RO`M
zx_Uq`)#307-fE4g=hF%yEukBY(u2A<zeYqW=tiUU;G2nfO5M;x4<1EC6&X#_4XyOx
z(L{Vy*t?ymrn;e}9yE*yEp?+AdeBfJw9t)a=|RJZXn<}wk*A1a5A>jjd?8jZUwF*^
zpdM&Vh<K=OKwh}{`T@;_ou3UUvy1OoSXf}bki;ps%mILB>inR5;l7|XCE_8vfnDiq
zWt;BAa~+CdEch^I2w`_9>IV<a7g~mh`|1X_<{+aRfZYHqh`?AHV-bu684BN$FSHa9
zU(*fTcQT7rY8+hvZsju=V?mV#mG{gV=^gdz2b}w*e4*utsHYn!1sYf-2Vkc3{L8?B
zYa4pAGN09DY6NSF3Cy|0^@m_E$Rcvx)cG;MYoGmM_SvW(sY=@P{38h|y$Qt<3qyhp
z_l?Rb=NTSsD57MLI_LPu3!O!Ag1b_hMu+A^RE3IK7nM?}l)+>&u>!_AhxmN5w9dK#
zE6e;-3H3yJK~qQ&Hr^-uY{Vi|*EjG!7K-(mOhy6`;vX~+QMOntB@jUHYSTmy>fvb`
q5jDEOOA=690jK+ugr*Uo+Vvk;9w)Wo5px*;0000<MNUMnLSTY00_BMS

diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow_right.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow_right.png
deleted file mode 100644
index 17b5250d1d22cd6ea431b0cfccfbb686a7eb028b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1694
zcmV;P24VS$P)<h;3K|Lk000e1NJLTq001BW002S=1^@s6Hb&H?00004b3#c}2nYxW
zd<bNS00001b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGvuK)lWuK`{f
zksJU302y>eSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*00sU@L_t(&L&aLl
zOJipo%|jED%+$n~q-Go+AQse(JL#gEVqLirL^s6;SSek(b5~u6;;LH_e6$<E|Dd+u
zuDB4Ps8H(+VoWlLc{yV;=A}L7a<61EvB}N-f`O0k-i&(A_xqjud)?9NbUHm2KL+`l
z_YZ~Z0U!Bigl`1nGW7QL8gFiHjM;3KM06I5CGT`P^M{9r_qe^U6$yeH2_6oIO=h#%
z1Ojy=P+wo4OQ+MB#>U3%`T2RSRwN8}cXvNTA`#%#H{|pAmvwb@cB9eg0Fg$$UT=%V
zV&<-{E|N0fUU8Q&R~T^WU-tL+zs6s*0=N;Tc42uy$PF?MgTWw?pq1z@(In_^Q+Idw
zZxa&}ZLokH;BJ7t!nODQ{@z0pAZDeD=q}MD^oqEW$>iSy0|P%N5(ziHdx@0=SOg>j
zu);eKis3#P3WYM*^L$D~2=kEuoqBqD`sd)_;2*ej%1(}AzXXsERtRE`!#b&}t1FVr
ziy$C9a>}Qtr{~+n#l>%M-;C9Q^%|=U7H9!jGewH)hK`O7VWRwm0EtXZO??L|bl}p3
z^@;>Y1O&ds>7BV;?geyV5+%w{T%cGY9*?JohK5f4e*Yc5yT-b}I>+hXV5d7GsZ{F2
z_4RdHs~$eH07*C;4)eyw##bhjsR_3poV=BmfD2mrWMncKJIGi)9*^cHqa*>6=<DmV
zuCA^U*a`D1dUy>oUb+Wy;tRN<p|!PD(nFz^)Lj4XFOH6m+Mo${fhehmHjoe|%90u=
zJOM(oZftBUc5rYI!uNiFzlBBq#iAZAaUZr?tv86McPA$&%o(cULs`?o)Vj5`HAhQJ
zi=+o=K+*$s0Wo@@1v^OEs*RLo3D6oYmrK9CzTON`Isoj!SHeVD5do6u@9#G*FE2AT
zFiHv&WyJ(YVtjnuJUKZ@5=x}hEXuMXEPkY9QN|(4cOpco$^s-Ki_$Jil&T4c7G+fg
zM2fO%0-{8zT7;rSsmTH&M5&p88c}+^-g-H6K33O42vjOcpjwc=6%vv+g%KzvN&reV
zCDS)UI1(AlIW{^h@1;gZvk1$H61n*;GUgdmIN&aE9Y#0yUM}ZyLM>22lrEkgC-<_b
z#lJUUx3LF>6^LyRPM|=PPNZ);O^;JcRTapv^Rlt3Mo}wuSv4Ubi?VKIWrdm3Mo^G=
zfols$NFBH`2B;Z<Vr@KiUo!$nM@PB&`FZvfNt`+f9o*vjBdn3(>;a2|53!G-a!M%t
zVP<9~ivA&i@1g(?V~+qlK{DvBGALxF23NQRSg_2_&L)DvAiL>nfCl0J0DxJ*#7KaX
z7ffBG(T{Kf3kwTLR7>otX?{PzeIRj#Jp@a{QAwvb_93`%7wqipq_?)V2pqv;JMY8J
z_C82gfW$4#pT_BFerfO}ED}O=`H_*4ApFh-<`V0T9R1kH_;LCuPJbH+1UTT}>7@on
zhzn%VMF1Yh-z0%6k^rD&dIY2d2&4e6nEtVQ(oCR8bRhsr;PgAXY5F~ZM=t4hyGxFC
zG!rNk9Y6yBr{8@bLJdR_cIo#F`o@xTB~1j1MJM}S5*;452wd<17Pz~(xOj5VS+xi&
z5gnsoxv5%J7N}Ho<-n_o16oC=gllD2Z2_&K(?mdo=!ywcEJ9JDtI7f*MW>p8EV{Uy
zUR6iBVnEddFgt#)q}OU9ohAaiySvHF%}uGAVS245(v>6dqzI3Xk5j|L!#<W(2&;ZJ
z7{%$el1NvMK*>13VfFO%^gjS+SruYtE0ta=iFB$7Acf}V=H~vwq@0xv&Cls53k+W+
z>9rhSSrNkLzwhnsUEl|$nojn+k40rA=~XR(XMbh$>@Te(5u#`aEiEnm6pcn>@H1=q
z04rL2PZxv{jHH@Qgy>3XAaizh_WkzuHj79;a$#1nxaRA+5Xz}INTr^t>D2oCvt)!}
z!H@0j?Y{!hB6qQ7mg@k`U{8U-$EKzx*77xZfBft(uQ?>pA=~LXJ3AlHv*qDyo-~Uo
oMh5fXtX$33^!5F-{s)Ht0J0go`zvqTzW@LL07*qoM6N<$g51adY5)KL

diff --git a/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow_top.png b/Externals/android-menudrawer/samples/res/drawable-xhdpi/menu_arrow_top.png
deleted file mode 100644
index 2c2f7490089673f30609b955d561e52e18676584..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1581
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

diff --git a/Externals/android-menudrawer/samples/res/drawable/md__list_selector_background_transition_holo_dark.xml b/Externals/android-menudrawer/samples/res/drawable/md__list_selector_background_transition_holo_dark.xml
deleted file mode 100644
index 1d43396d8a..0000000000
--- a/Externals/android-menudrawer/samples/res/drawable/md__list_selector_background_transition_holo_dark.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<transition xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/md__list_pressed_holo_dark"  />
-    <item android:drawable="@drawable/md__list_longpressed_holo"  />
-</transition>
diff --git a/Externals/android-menudrawer/samples/res/drawable/md__list_selector_holo_dark.xml b/Externals/android-menudrawer/samples/res/drawable/md__list_selector_holo_dark.xml
deleted file mode 100644
index bd71aa8b6e..0000000000
--- a/Externals/android-menudrawer/samples/res/drawable/md__list_selector_holo_dark.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_window_focused="false" android:drawable="@color/md__transparent" />
-
-    <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
-    <item android:state_focused="true"  android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/md__list_selector_disabled_holo_dark" />
-    <item android:state_focused="true"  android:state_enabled="false"                              android:drawable="@drawable/md__list_selector_disabled_holo_dark" />
-    <item android:state_focused="true"                                android:state_pressed="true" android:drawable="@drawable/md__list_selector_background_transition_holo_dark" />
-    <item android:state_focused="false"                               android:state_pressed="true" android:drawable="@drawable/md__list_selector_background_transition_holo_dark" />
-    <item android:state_focused="true"                                                             android:drawable="@drawable/md__list_focused_holo" />
-</selector>
diff --git a/Externals/android-menudrawer/samples/res/layout/activity_bottommenu.xml b/Externals/android-menudrawer/samples/res/layout/activity_bottommenu.xml
deleted file mode 100644
index ee576195e2..0000000000
--- a/Externals/android-menudrawer/samples/res/layout/activity_bottommenu.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:orientation="vertical"
-    android:padding="16dp" >
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/sample_bottommenu" />
-
-    <TextView
-        android:id="@+id/contentText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:textStyle="bold" />
-
-</LinearLayout>
diff --git a/Externals/android-menudrawer/samples/res/layout/activity_contentsample.xml b/Externals/android-menudrawer/samples/res/layout/activity_contentsample.xml
deleted file mode 100644
index 54140e71e7..0000000000
--- a/Externals/android-menudrawer/samples/res/layout/activity_contentsample.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:orientation="vertical"
-    android:padding="16dp">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/sample_content" />
-
-    <TextView
-        android:id="@+id/contentText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <SeekBar
-        android:id="@+id/seekBar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/Externals/android-menudrawer/samples/res/layout/activity_layoutsample.xml b/Externals/android-menudrawer/samples/res/layout/activity_layoutsample.xml
deleted file mode 100644
index 83684116b4..0000000000
--- a/Externals/android-menudrawer/samples/res/layout/activity_layoutsample.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<net.simonvt.menudrawer.TopDrawer xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/drawer"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:mdMenuSize="64dp">
-
-    <LinearLayout
-        android:id="@id/mdMenu"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:padding="10dp" >
-
-        <TextView
-            android:id="@+id/item1"
-            style="@style/MenuDrawer.Widget.Title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:drawableLeft="@drawable/ic_action_refresh_dark"
-            android:onClick="onDrawerItemClick"
-            android:tag="Item no. 1"
-            android:text="Item 1" />
-
-        <TextView
-            android:id="@+id/item2"
-            style="@style/MenuDrawer.Widget.Title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:drawableLeft="@drawable/ic_action_select_all_dark"
-            android:onClick="onDrawerItemClick"
-            android:tag="Item no. 2"
-            android:text="Item 2" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@id/mdContent"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:padding="16dp" >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/sample_layout" />
-
-        <TextView
-            android:id="@+id/contentText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:textStyle="bold" />
-
-    </LinearLayout>
-
-</net.simonvt.menudrawer.TopDrawer>
diff --git a/Externals/android-menudrawer/samples/res/layout/activity_rightmenu.xml b/Externals/android-menudrawer/samples/res/layout/activity_rightmenu.xml
deleted file mode 100644
index ad1a6b7601..0000000000
--- a/Externals/android-menudrawer/samples/res/layout/activity_rightmenu.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:orientation="vertical"
-    android:padding="16dp">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/sample_rightmenu" />
-
-    <TextView
-        android:id="@+id/contentText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/Externals/android-menudrawer/samples/res/layout/activity_staticsample.xml b/Externals/android-menudrawer/samples/res/layout/activity_staticsample.xml
deleted file mode 100644
index e6cb5622c7..0000000000
--- a/Externals/android-menudrawer/samples/res/layout/activity_staticsample.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:orientation="vertical"
-    android:padding="16dp">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/sample_static" />
-
-    <TextView
-        android:id="@+id/contentText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/Externals/android-menudrawer/samples/res/layout/activity_topmenu.xml b/Externals/android-menudrawer/samples/res/layout/activity_topmenu.xml
deleted file mode 100644
index d288cfa5aa..0000000000
--- a/Externals/android-menudrawer/samples/res/layout/activity_topmenu.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:orientation="vertical"
-    android:padding="16dp" >
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/sample_topmenu" />
-
-    <TextView
-        android:id="@+id/contentText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:textStyle="bold" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Externals/android-menudrawer/samples/res/layout/activity_viewpagersample.xml b/Externals/android-menudrawer/samples/res/layout/activity_viewpagersample.xml
deleted file mode 100644
index 6efa747ebe..0000000000
--- a/Externals/android-menudrawer/samples/res/layout/activity_viewpagersample.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/view_pager"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
\ No newline at end of file
diff --git a/Externals/android-menudrawer/samples/res/layout/activity_windowsample.xml b/Externals/android-menudrawer/samples/res/layout/activity_windowsample.xml
deleted file mode 100644
index a23003f22b..0000000000
--- a/Externals/android-menudrawer/samples/res/layout/activity_windowsample.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:orientation="vertical"
-    android:padding="16dp">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/sample_window" />
-
-    <TextView
-        android:id="@+id/contentText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
diff --git a/Externals/android-menudrawer/samples/res/layout/list_row_sample.xml b/Externals/android-menudrawer/samples/res/layout/list_row_sample.xml
deleted file mode 100644
index edd6d1f67a..0000000000
--- a/Externals/android-menudrawer/samples/res/layout/list_row_sample.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="64dp"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:paddingTop="8dp"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <TextView
-        android:id="@+id/summary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="8dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
-</LinearLayout>
diff --git a/Externals/android-menudrawer/samples/res/layout/main.xml b/Externals/android-menudrawer/samples/res/layout/main.xml
deleted file mode 100644
index 6dd71bd26a..0000000000
--- a/Externals/android-menudrawer/samples/res/layout/main.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:orientation="vertical">
-
-    <Button
-        android:id="@+id/windowSample"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Window sample" />
-
-    <Button
-        android:id="@+id/overlayWindowSample"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Action Bar overlay window sample" />
-
-    <Button
-        android:id="@+id/contentSample"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Content sample" />
-
-    <Button
-        android:id="@+id/listActivitySample"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="ListActivity sample" />
-
-</LinearLayout>
-
diff --git a/Externals/android-menudrawer/samples/res/layout/menu_bottom.xml b/Externals/android-menudrawer/samples/res/layout/menu_bottom.xml
deleted file mode 100644
index 4ec6a6b993..0000000000
--- a/Externals/android-menudrawer/samples/res/layout/menu_bottom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:padding="10dp" >
-
-    <TextView
-        android:id="@+id/item1"
-        style="@style/MenuDrawer.Widget.Title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:drawableLeft="@drawable/ic_action_refresh_dark"
-        android:onClick="onDrawerItemClick"
-        android:tag="Item no. 1"
-        android:text="Item 1" />
-
-    <TextView
-        android:id="@+id/item2"
-        style="@style/MenuDrawer.Widget.Title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:drawableLeft="@drawable/ic_action_select_all_dark"
-        android:onClick="onDrawerItemClick"
-        android:tag="Item no. 2"
-        android:text="Item 2" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Externals/android-menudrawer/samples/res/layout/menu_row_category.xml b/Externals/android-menudrawer/samples/res/layout/menu_row_category.xml
deleted file mode 100644
index 36ffd58bac..0000000000
--- a/Externals/android-menudrawer/samples/res/layout/menu_row_category.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    style="@style/MenuDrawer.Widget.Category" />
diff --git a/Externals/android-menudrawer/samples/res/layout/menu_row_item.xml b/Externals/android-menudrawer/samples/res/layout/menu_row_item.xml
deleted file mode 100644
index b13619d08c..0000000000
--- a/Externals/android-menudrawer/samples/res/layout/menu_row_item.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    style="@style/MenuDrawer.Widget.Title" />
diff --git a/Externals/android-menudrawer/samples/res/layout/menu_scrollview.xml b/Externals/android-menudrawer/samples/res/layout/menu_scrollview.xml
deleted file mode 100644
index 5cb1ad9350..0000000000
--- a/Externals/android-menudrawer/samples/res/layout/menu_scrollview.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/scrollView"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/item1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/ic_action_refresh_dark"
-            android:text="Item 1"
-            style="@style/MenuDrawer.Widget.Title" />
-
-        <TextView
-            android:id="@+id/item2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/ic_action_select_all_dark"
-            android:text="Item 2"
-            style="@style/MenuDrawer.Widget.Title" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Cat 1"
-            style="@style/MenuDrawer.Widget.Category" />
-
-        <TextView
-            android:id="@+id/item3"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/ic_action_refresh_dark"
-            android:text="Item 3"
-            style="@style/MenuDrawer.Widget.Title" />
-
-        <TextView
-            android:id="@+id/item4"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/ic_action_select_all_dark"
-            android:text="Item 4"
-            style="@style/MenuDrawer.Widget.Title" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Cat 2"
-            style="@style/MenuDrawer.Widget.Category" />
-
-        <TextView
-            android:id="@+id/item5"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/ic_action_refresh_dark"
-            android:text="Item 5"
-            style="@style/MenuDrawer.Widget.Title" />
-
-        <TextView
-            android:id="@+id/item6"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/ic_action_select_all_dark"
-            android:text="Item 6"
-            style="@style/MenuDrawer.Widget.Title" />
-
-    </LinearLayout>
-</ScrollView>
diff --git a/Externals/android-menudrawer/samples/res/layout/menu_top.xml b/Externals/android-menudrawer/samples/res/layout/menu_top.xml
deleted file mode 100644
index 4ec6a6b993..0000000000
--- a/Externals/android-menudrawer/samples/res/layout/menu_top.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:padding="10dp" >
-
-    <TextView
-        android:id="@+id/item1"
-        style="@style/MenuDrawer.Widget.Title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:drawableLeft="@drawable/ic_action_refresh_dark"
-        android:onClick="onDrawerItemClick"
-        android:tag="Item no. 1"
-        android:text="Item 1" />
-
-    <TextView
-        android:id="@+id/item2"
-        style="@style/MenuDrawer.Widget.Title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:drawableLeft="@drawable/ic_action_select_all_dark"
-        android:onClick="onDrawerItemClick"
-        android:tag="Item no. 2"
-        android:text="Item 2" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Externals/android-menudrawer/samples/res/values-v14/colors.xml b/Externals/android-menudrawer/samples/res/values-v14/colors.xml
deleted file mode 100644
index 0c1ed99453..0000000000
--- a/Externals/android-menudrawer/samples/res/values-v14/colors.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
-
-    <color name="windowBackground">#FFE8E8E8</color>
-</resources>
diff --git a/Externals/android-menudrawer/samples/res/values-v14/themes.xml b/Externals/android-menudrawer/samples/res/values-v14/themes.xml
deleted file mode 100644
index bc74b6d378..0000000000
--- a/Externals/android-menudrawer/samples/res/values-v14/themes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources>
-
-    <style name="SampleBase" parent="@android:style/Theme.Holo.Light">
-        <item name="android:windowBackground">@color/windowBackground</item>
-    </style>
-
-</resources>
diff --git a/Externals/android-menudrawer/samples/res/values/colors.xml b/Externals/android-menudrawer/samples/res/values/colors.xml
deleted file mode 100644
index b98e21355e..0000000000
--- a/Externals/android-menudrawer/samples/res/values/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
-
-    <color name="md__transparent">#00000000</color>
-
-    <color name="md__defaultBackground">#FF555555</color>
-</resources>
diff --git a/Externals/android-menudrawer/samples/res/values/strings.xml b/Externals/android-menudrawer/samples/res/values/strings.xml
deleted file mode 100644
index 90f33a30a9..0000000000
--- a/Externals/android-menudrawer/samples/res/values/strings.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_name">MenuDrawerSamples</string>
-
-    <string name="sample_content">Sample of dragging the content.\nThe menu consists of a ListView, for which the
-        active position is saved through configuration changes.\nAdditionally, if the menu is open, a back press will
-        close it.
-    </string>
-
-    <string name="sample_window">Sample of dragging the entire window.\nThe menu is a simple ScrollView, with a click
-        listener set on each item.\nThe drawer will animate slightly open, to make it more discoverable.\nAdditionally,
-        if the menu is open, a back press will close it.
-    </string>
-
-    <string name="sample_listactivity">Sample of how to use the drawer with ListActivity.\nWhen running on ICS or
-        greater, the ActionBar up button will blink until clicked by the user. This is done to make the menu more
-        discoverable.\nAdditionally, if the menu is open, a back press will close it.
-    </string>
-
-    <string name="sample_rightmenu">This sample shows how to position the menu to the right of the content.\nRun on
-        an API14+ device to see how it interacts with the overflow button.
-    </string>
-
-    <string name="sample_topmenu">This sample shows how to position the menu above the content.</string>
-
-    <string name="sample_bottommenu">This sample shows how to position the menu below the content.</string>
-
-    <string name="sample_layout">This sample shows how to use the drawer in a layout file.
-        \nThe top drawer is used in this sample.
-    </string>
-
-    <string name="sample_static">This sample shows how to attach a drawer that is always visible.</string>
-</resources>
diff --git a/Externals/android-menudrawer/samples/res/values/styles.xml b/Externals/android-menudrawer/samples/res/values/styles.xml
deleted file mode 100644
index 04b6f5f355..0000000000
--- a/Externals/android-menudrawer/samples/res/values/styles.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<resources>
-
-    <style name="MenuDrawer" />
-
-    <style name="MenuDrawer.Widget" />
-
-    <style name="MenuDrawer.Widget.Category">
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColor">?android:attr/textColorSecondaryInverse</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textAllCaps">true</item>
-
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:background">@drawable/md__category_background</item>
-
-        <item name="android:singleLine">true</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
-    <style name="MenuDrawer.Widget.Title">
-        <item name="android:background">@drawable/md__list_selector_holo_dark</item>
-        <item name="android:textAppearance">?android:attr/textAppearance</item>
-        <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
-        <item name="android:textSize">18sp</item>
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">32dp</item>
-        <item name="android:paddingTop">8dp</item>
-        <item name="android:paddingBottom">8dp</item>
-        <item name="android:drawablePadding">16dp</item>
-        <item name="android:gravity">center_vertical</item>
-    </style>
-
-    <style name="MenuDrawerStyle" parent="Widget.MenuDrawer">
-        <item name="mdActiveIndicator">@drawable/menu_arrow</item>
-        <item name="mdMenuSize">250dp</item>
-    </style>
-
-    <style name="MenuDrawerStyle.Right" parent="Widget.MenuDrawer">
-        <item name="mdActiveIndicator">@drawable/menu_arrow_right</item>
-        <item name="mdMenuSize">150dp</item>
-    </style>
-
-    <style name="MenuDrawerStyle.Top" parent="Widget.MenuDrawer">
-        <item name="mdActiveIndicator">@drawable/menu_arrow_top</item>
-        <item name="mdMenuSize">64dp</item>
-        <item name="mdAllowIndicatorAnimation">true</item>
-    </style>
-
-    <style name="MenuDrawerStyle.Bottom" parent="Widget.MenuDrawer">
-        <item name="mdActiveIndicator">@drawable/menu_arrow_bottom</item>
-        <item name="mdMenuSize">64dp</item>
-    </style>
-
-</resources>
diff --git a/Externals/android-menudrawer/samples/res/values/themes.xml b/Externals/android-menudrawer/samples/res/values/themes.xml
deleted file mode 100644
index 653c78f39b..0000000000
--- a/Externals/android-menudrawer/samples/res/values/themes.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<resources>
-
-    <style name="SampleBase" parent="@android:style/Theme.Light" />
-
-    <style name="SampleTheme" parent="SampleBase">
-
-        <item name="menuDrawerStyle">@style/MenuDrawerStyle</item>
-    </style>
-
-    <style name="SampleTheme.RightDrawer" parent="SampleBase">
-
-        <item name="menuDrawerStyle">@style/MenuDrawerStyle.Right</item>
-    </style>
-
-    <style name="SampleTheme.TopDrawer" parent="SampleBase">
-        <item name="menuDrawerStyle">@style/MenuDrawerStyle.Top</item>
-    </style>
-
-    <style name="SampleTheme.BottomDrawer" parent="SampleBase">
-        <item name="menuDrawerStyle">@style/MenuDrawerStyle.Bottom</item>
-    </style>
-
-</resources>
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ActionBarOverlaySample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ActionBarOverlaySample.java
deleted file mode 100644
index e703a9506e..0000000000
--- a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ActionBarOverlaySample.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package net.simonvt.menudrawer.samples;
-
-import android.os.Bundle;
-import android.view.Window;
-
-public class ActionBarOverlaySample extends WindowSample {
-
-    @Override
-    public void onCreate(Bundle inState) {
-        requestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
-        super.onCreate(inState);
-    }
-}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/BottomMenuSample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/BottomMenuSample.java
deleted file mode 100644
index 66cd73d671..0000000000
--- a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/BottomMenuSample.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package net.simonvt.menudrawer.samples;
-
-import net.simonvt.menudrawer.MenuDrawer;
-import net.simonvt.menudrawer.Position;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.TextView;
-
-/**
- * Sample class illustrating how to add a menu drawer above the content area.
- */
-public class BottomMenuSample extends Activity implements OnClickListener {
-
-    private MenuDrawer mMenuDrawer;
-    private TextView mContentTextView;
-
-    @Override
-    protected void onCreate(Bundle inState) {
-        super.onCreate(inState);
-
-        mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT, Position.BOTTOM);
-        mMenuDrawer.setTouchMode(MenuDrawer.TOUCH_MODE_FULLSCREEN);
-        mMenuDrawer.setContentView(R.layout.activity_bottommenu);
-        mMenuDrawer.setMenuView(R.layout.menu_bottom);
-
-        mContentTextView = (TextView) findViewById(R.id.contentText);
-        findViewById(R.id.item1).setOnClickListener(this);
-        findViewById(R.id.item2).setOnClickListener(this);
-    }
-
-    /**
-     * Click handler for bottom drawer items.
-     */
-    @Override
-    public void onClick(View v) {
-        String tag = (String) v.getTag();
-        mContentTextView.setText(String.format("%s clicked.", tag));
-        mMenuDrawer.setActiveView(v);
-    }
-}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ContentSample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ContentSample.java
deleted file mode 100644
index b07019ce67..0000000000
--- a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ContentSample.java
+++ /dev/null
@@ -1,218 +0,0 @@
-package net.simonvt.menudrawer.samples;
-
-import net.simonvt.menudrawer.MenuDrawer;
-
-import android.app.Activity;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-import android.widget.SeekBar;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ContentSample extends Activity {
-
-    private static final String STATE_ACTIVE_POSITION = "net.simonvt.menudrawer.samples.ContentSample.activePosition";
-    private static final String STATE_CONTENT_TEXT = "net.simonvt.menudrawer.samples.ContentSample.contentText";
-
-    private MenuDrawer mMenuDrawer;
-
-    private MenuAdapter mAdapter;
-    private ListView mList;
-
-    private int mActivePosition = -1;
-    private String mContentText;
-    private TextView mContentTextView;
-
-    @Override
-    protected void onCreate(Bundle inState) {
-        super.onCreate(inState);
-
-        if (inState != null) {
-            mActivePosition = inState.getInt(STATE_ACTIVE_POSITION);
-            mContentText = inState.getString(STATE_CONTENT_TEXT);
-        }
-
-        mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT);
-        mMenuDrawer.setContentView(R.layout.activity_contentsample);
-        mMenuDrawer.setTouchMode(MenuDrawer.TOUCH_MODE_FULLSCREEN);
-
-        List<Object> items = new ArrayList<Object>();
-        items.add(new Item("Item 1", R.drawable.ic_action_refresh_dark));
-        items.add(new Item("Item 2", R.drawable.ic_action_select_all_dark));
-        items.add(new Category("Cat 1"));
-        items.add(new Item("Item 3", R.drawable.ic_action_refresh_dark));
-        items.add(new Item("Item 4", R.drawable.ic_action_select_all_dark));
-        items.add(new Category("Cat 2"));
-        items.add(new Item("Item 5", R.drawable.ic_action_refresh_dark));
-        items.add(new Item("Item 6", R.drawable.ic_action_select_all_dark));
-        items.add(new Category("Cat 3"));
-        items.add(new Item("Item 7", R.drawable.ic_action_refresh_dark));
-        items.add(new Item("Item 8", R.drawable.ic_action_select_all_dark));
-        items.add(new Category("Cat 4"));
-        items.add(new Item("Item 9", R.drawable.ic_action_refresh_dark));
-        items.add(new Item("Item 10", R.drawable.ic_action_select_all_dark));
-
-        mList = new ListView(this);
-        mAdapter = new MenuAdapter(items);
-        mList.setAdapter(mAdapter);
-        mList.setOnItemClickListener(mItemClickListener);
-
-        mMenuDrawer.setMenuView(mList);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-            getActionBar().setDisplayHomeAsUpEnabled(true);
-        }
-
-        mContentTextView = (TextView) findViewById(R.id.contentText);
-        mContentTextView.setText(mContentText);
-
-        mMenuDrawer.setOnInterceptMoveEventListener(new MenuDrawer.OnInterceptMoveEventListener() {
-            @Override
-            public boolean isViewDraggable(View v, int dx, int x, int y) {
-                return v instanceof SeekBar;
-            }
-        });
-    }
-
-    private AdapterView.OnItemClickListener mItemClickListener = new AdapterView.OnItemClickListener() {
-        @Override
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            mActivePosition = position;
-            mMenuDrawer.setActiveView(view, position);
-            mContentTextView.setText(((TextView) view).getText());
-            mMenuDrawer.closeMenu();
-        }
-    };
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt(STATE_ACTIVE_POSITION, mActivePosition);
-        outState.putString(STATE_CONTENT_TEXT, mContentText);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                mMenuDrawer.toggleMenu();
-                return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void onBackPressed() {
-        final int drawerState = mMenuDrawer.getDrawerState();
-        if (drawerState == MenuDrawer.STATE_OPEN || drawerState == MenuDrawer.STATE_OPENING) {
-            mMenuDrawer.closeMenu();
-            return;
-        }
-
-        super.onBackPressed();
-    }
-
-    private static class Item {
-
-        String mTitle;
-        int mIconRes;
-
-        Item(String title, int iconRes) {
-            mTitle = title;
-            mIconRes = iconRes;
-        }
-    }
-
-    private static class Category {
-
-        String mTitle;
-
-        Category(String title) {
-            mTitle = title;
-        }
-    }
-
-    private class MenuAdapter extends BaseAdapter {
-
-        private List<Object> mItems;
-
-        MenuAdapter(List<Object> items) {
-            mItems = items;
-        }
-
-        @Override
-        public int getCount() {
-            return mItems.size();
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return mItems.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public int getItemViewType(int position) {
-            return getItem(position) instanceof Item ? 0 : 1;
-        }
-
-        @Override
-        public int getViewTypeCount() {
-            return 2;
-        }
-
-        @Override
-        public boolean isEnabled(int position) {
-            return getItem(position) instanceof Item;
-        }
-
-        @Override
-        public boolean areAllItemsEnabled() {
-            return false;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            View v = convertView;
-            Object item = getItem(position);
-
-            if (item instanceof Category) {
-                if (v == null) {
-                    v = getLayoutInflater().inflate(R.layout.menu_row_category, parent, false);
-                }
-
-                ((TextView) v).setText(((Category) item).mTitle);
-
-            } else {
-                if (v == null) {
-                    v = getLayoutInflater().inflate(R.layout.menu_row_item, parent, false);
-                }
-
-                TextView tv = (TextView) v;
-                tv.setText(((Item) item).mTitle);
-                tv.setCompoundDrawablesWithIntrinsicBounds(((Item) item).mIconRes, 0, 0, 0);
-            }
-
-            v.setTag(R.id.mdActiveViewPosition, position);
-
-            if (position == mActivePosition) {
-                mMenuDrawer.setActiveView(v, position);
-            }
-
-            return v;
-        }
-    }
-}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/LayoutSample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/LayoutSample.java
deleted file mode 100644
index bb219960d1..0000000000
--- a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/LayoutSample.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package net.simonvt.menudrawer.samples;
-
-import net.simonvt.menudrawer.MenuDrawer;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.TextView;
-
-public class LayoutSample extends Activity implements View.OnClickListener {
-
-    private MenuDrawer mDrawer;
-    private TextView mContentTextView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_layoutsample);
-        mDrawer = (MenuDrawer) findViewById(R.id.drawer);
-        mDrawer.setTouchMode(MenuDrawer.TOUCH_MODE_FULLSCREEN);
-
-        mContentTextView = (TextView) findViewById(R.id.contentText);
-        findViewById(R.id.item1).setOnClickListener(this);
-        findViewById(R.id.item2).setOnClickListener(this);
-    }
-
-    /**
-     * Click handler for top drawer items.
-     */
-    @Override
-    public void onClick(View v) {
-        String tag = (String) v.getTag();
-        mContentTextView.setText(String.format("%s clicked.", tag));
-        mDrawer.setActiveView(v);
-    }
-}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ListActivitySample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ListActivitySample.java
deleted file mode 100644
index fb7e74925a..0000000000
--- a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ListActivitySample.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package net.simonvt.menudrawer.samples;
-
-import net.simonvt.menudrawer.MenuDrawer;
-
-import android.app.ListActivity;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.Gravity;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ListActivitySample extends ListActivity {
-
-    private static final String STATE_MENUDRAWER = "net.simonvt.menudrawer.samples.ListActivitySample.menuDrawer";
-
-    private MenuDrawer mMenuDrawer;
-
-    private Handler mHandler;
-    private Runnable mToggleUpRunnable;
-    private boolean mDisplayUp = true;
-
-    @Override
-    public void onCreate(Bundle inState) {
-        super.onCreate(inState);
-
-        mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT);
-
-        TextView menuView = new TextView(this);
-        menuView.setGravity(Gravity.CENTER);
-        menuView.setTextColor(0xFFFFFFFF);
-        final int padding = dpToPx(16);
-        menuView.setPadding(padding, padding, padding, padding);
-        menuView.setText(R.string.sample_listactivity);
-        mMenuDrawer.setMenuView(menuView);
-        mMenuDrawer.setOffsetMenuEnabled(false);
-
-        List<String> items = new ArrayList<String>();
-        for (int i = 1; i <= 20; i++) {
-            items.add("Item " + i);
-        }
-
-        setListAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, items));
-    }
-
-    private int dpToPx(int dp) {
-        return (int) (getResources().getDisplayMetrics().density * dp + 0.5f);
-    }
-
-    @Override
-    public void setContentView(int layoutResID) {
-        // This override is only needed when using MENU_DRAG_CONTENT.
-        mMenuDrawer.setContentView(layoutResID);
-        onContentChanged();
-    }
-
-    @Override
-    protected void onListItemClick(ListView l, View v, int position, long id) {
-        String str = (String) getListAdapter().getItem(position);
-        Toast.makeText(this, "Clicked: " + str, Toast.LENGTH_SHORT).show();
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                mMenuDrawer.toggleMenu();
-                return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void onBackPressed() {
-        final int drawerState = mMenuDrawer.getDrawerState();
-        if (drawerState == MenuDrawer.STATE_OPEN || drawerState == MenuDrawer.STATE_OPENING) {
-            mMenuDrawer.closeMenu();
-            return;
-        }
-
-        super.onBackPressed();
-    }
-}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/RightMenuSample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/RightMenuSample.java
deleted file mode 100644
index fda93d973e..0000000000
--- a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/RightMenuSample.java
+++ /dev/null
@@ -1,215 +0,0 @@
-package net.simonvt.menudrawer.samples;
-
-import net.simonvt.menudrawer.MenuDrawer;
-import net.simonvt.menudrawer.Position;
-
-import android.app.Activity;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class RightMenuSample extends Activity {
-
-    private static final String STATE_ACTIVE_POSITION = "net.simonvt.menudrawer.samples.RightMenuSample.activePosition";
-    private static final String STATE_CONTENT_TEXT = "net.simonvt.menudrawer.samples.RightMenuSample.contentText";
-
-    private static final int MENU_OVERFLOW = 1;
-
-    private MenuDrawer mMenuDrawer;
-
-    private MenuAdapter mAdapter;
-    private ListView mList;
-
-    private int mActivePosition = -1;
-    private String mContentText;
-    private TextView mContentTextView;
-
-    @Override
-    protected void onCreate(Bundle inState) {
-        super.onCreate(inState);
-
-        if (inState != null) {
-            mActivePosition = inState.getInt(STATE_ACTIVE_POSITION);
-            mContentText = inState.getString(STATE_CONTENT_TEXT);
-        }
-
-        mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT, Position.RIGHT);
-        mMenuDrawer.setContentView(R.layout.activity_rightmenu);
-
-        List<Object> items = new ArrayList<Object>();
-        items.add(new Item("Item 1", R.drawable.ic_action_refresh_dark));
-        items.add(new Item("Item 2", R.drawable.ic_action_select_all_dark));
-        items.add(new Category("Cat 1"));
-        items.add(new Item("Item 3", R.drawable.ic_action_refresh_dark));
-        items.add(new Item("Item 4", R.drawable.ic_action_select_all_dark));
-        items.add(new Category("Cat 2"));
-        items.add(new Item("Item 5", R.drawable.ic_action_refresh_dark));
-        items.add(new Item("Item 6", R.drawable.ic_action_select_all_dark));
-
-        // A custom ListView is needed so the drawer can be notified when it's scrolled. This is to update the position
-        // of the arrow indicator.
-        mList = new ListView(this);
-        mAdapter = new MenuAdapter(items);
-        mList.setAdapter(mAdapter);
-        mList.setOnItemClickListener(mItemClickListener);
-
-        mMenuDrawer.setMenuView(mList);
-
-        mContentTextView = (TextView) findViewById(R.id.contentText);
-        mContentTextView.setText(mContentText);
-    }
-
-    private AdapterView.OnItemClickListener mItemClickListener = new AdapterView.OnItemClickListener() {
-        @Override
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            mActivePosition = position;
-            mMenuDrawer.setActiveView(view, position);
-            mContentTextView.setText(((TextView) view).getText());
-            mMenuDrawer.closeMenu();
-        }
-    };
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt(STATE_ACTIVE_POSITION, mActivePosition);
-        outState.putString(STATE_CONTENT_TEXT, mContentText);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuItem overflowItem = menu.add(0, MENU_OVERFLOW, 0, null);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-            overflowItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-        }
-        overflowItem.setIcon(R.drawable.ic_menu_moreoverflow_normal_holo_light);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case MENU_OVERFLOW:
-                mMenuDrawer.toggleMenu();
-                return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void onBackPressed() {
-        final int drawerState = mMenuDrawer.getDrawerState();
-        if (drawerState == MenuDrawer.STATE_OPEN || drawerState == MenuDrawer.STATE_OPENING) {
-            mMenuDrawer.closeMenu();
-            return;
-        }
-
-        super.onBackPressed();
-    }
-
-    private static class Item {
-
-        String mTitle;
-        int mIconRes;
-
-        Item(String title, int iconRes) {
-            mTitle = title;
-            mIconRes = iconRes;
-        }
-    }
-
-    private static class Category {
-
-        String mTitle;
-
-        Category(String title) {
-            mTitle = title;
-        }
-    }
-
-    private class MenuAdapter extends BaseAdapter {
-
-        private List<Object> mItems;
-
-        MenuAdapter(List<Object> items) {
-            mItems = items;
-        }
-
-        @Override
-        public int getCount() {
-            return mItems.size();
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return mItems.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public int getItemViewType(int position) {
-            return getItem(position) instanceof Item ? 0 : 1;
-        }
-
-        @Override
-        public int getViewTypeCount() {
-            return 2;
-        }
-
-        @Override
-        public boolean isEnabled(int position) {
-            return getItem(position) instanceof Item;
-        }
-
-        @Override
-        public boolean areAllItemsEnabled() {
-            return false;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            View v = convertView;
-            Object item = getItem(position);
-
-            if (item instanceof Category) {
-                if (v == null) {
-                    v = getLayoutInflater().inflate(R.layout.menu_row_category, parent, false);
-                }
-
-                ((TextView) v).setText(((Category) item).mTitle);
-
-            } else {
-                if (v == null) {
-                    v = getLayoutInflater().inflate(R.layout.menu_row_item, parent, false);
-                }
-
-                TextView tv = (TextView) v;
-                tv.setText(((Item) item).mTitle);
-                tv.setCompoundDrawablesWithIntrinsicBounds(((Item) item).mIconRes, 0, 0, 0);
-            }
-
-            v.setTag(R.id.mdActiveViewPosition, position);
-
-            if (position == mActivePosition) {
-                mMenuDrawer.setActiveView(v, position);
-            }
-
-            return v;
-        }
-    }
-}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/SamplesActivity.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/SamplesActivity.java
deleted file mode 100644
index 32aa28fac1..0000000000
--- a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/SamplesActivity.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package net.simonvt.menudrawer.samples;
-
-import android.app.ListActivity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SamplesActivity extends ListActivity {
-
-    private SamplesAdapter mAdapter;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mAdapter = new SamplesAdapter();
-
-        mAdapter.addSample("Content sample", "Only the content area is dragged.", ContentSample.class);
-        mAdapter.addSample("ListActivity sample", "Shows how to use the drawer with a ListActivity.",
-                ListActivitySample.class);
-        mAdapter.addSample("Window sample", "The entire window is dragged.", WindowSample.class);
-        mAdapter.addSample("ActionBar overlay sample", "A window sample, where the ActionBar is an overlay",
-                ActionBarOverlaySample.class);
-        mAdapter.addSample("Right menu", "The menu is positioned to the right of the content", RightMenuSample.class);
-        mAdapter.addSample("Top menu", "The menu is positioned above the content", TopMenuSample.class);
-        mAdapter.addSample("Bottom menu", "The menu is positioned below the content", BottomMenuSample.class);
-        mAdapter.addSample("Touch Mode", "The menu touch behavior change according to different"
-                + " content view state (Ex: View Pager)", ViewPagerSample.class);
-        mAdapter.addSample("Layout xml", "The drawer and its menu and content is defined in XML", LayoutSample.class);
-        mAdapter.addSample("Static drawer", "The drawer is always visible", StaticDrawerSample.class);
-
-        setListAdapter(mAdapter);
-    }
-
-    @Override
-    protected void onListItemClick(ListView l, View v, int position, long id) {
-        SampleItem sample = (SampleItem) mAdapter.getItem(position);
-        Intent i = new Intent(this, sample.mClazz);
-        startActivity(i);
-    }
-
-    private static class SampleItem {
-
-        String mTitle;
-        String mSummary;
-        Class mClazz;
-
-        public SampleItem(String title, String summary, Class clazz) {
-            mTitle = title;
-            mSummary = summary;
-            mClazz = clazz;
-        }
-    }
-
-    public class SamplesAdapter extends BaseAdapter {
-
-        private List<SampleItem> mSamples = new ArrayList<SampleItem>();
-
-        public void addSample(String title, String summary, Class clazz) {
-            mSamples.add(new SampleItem(title, summary, clazz));
-        }
-
-        @Override
-        public int getCount() {
-            return mSamples.size();
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return mSamples.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            SampleItem sample = (SampleItem) getItem(position);
-
-            View v = convertView;
-            if (v == null) {
-                v = getLayoutInflater().inflate(R.layout.list_row_sample, parent, false);
-            }
-
-            ((TextView) v.findViewById(R.id.title)).setText(sample.mTitle);
-            ((TextView) v.findViewById(R.id.summary)).setText(sample.mSummary);
-
-            return v;
-        }
-    }
-}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/StaticDrawerSample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/StaticDrawerSample.java
deleted file mode 100644
index 5a4c52dc5f..0000000000
--- a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/StaticDrawerSample.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package net.simonvt.menudrawer.samples;
-
-import net.simonvt.menudrawer.MenuDrawer;
-import net.simonvt.menudrawer.Position;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class StaticDrawerSample extends Activity {
-
-    private static final String STATE_ACTIVE_POSITION = "net.simonvt.menudrawer.samples.ContentSample.activePosition";
-    private static final String STATE_CONTENT_TEXT = "net.simonvt.menudrawer.samples.ContentSample.contentText";
-
-    private MenuDrawer mMenuDrawer;
-
-    private MenuAdapter mAdapter;
-    private ListView mList;
-
-    private int mActivePosition = -1;
-    private String mContentText;
-    private TextView mContentTextView;
-
-    @Override
-    protected void onCreate(Bundle inState) {
-        super.onCreate(inState);
-
-        if (inState != null) {
-            mActivePosition = inState.getInt(STATE_ACTIVE_POSITION);
-            mContentText = inState.getString(STATE_CONTENT_TEXT);
-        }
-
-        mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT, Position.LEFT, true);
-        mMenuDrawer.setContentView(R.layout.activity_contentsample);
-
-        List<Object> items = new ArrayList<Object>();
-        items.add(new Item("Item 1", R.drawable.ic_action_refresh_dark));
-        items.add(new Item("Item 2", R.drawable.ic_action_select_all_dark));
-        items.add(new Category("Cat 1"));
-        items.add(new Item("Item 3", R.drawable.ic_action_refresh_dark));
-        items.add(new Item("Item 4", R.drawable.ic_action_select_all_dark));
-        items.add(new Category("Cat 2"));
-        items.add(new Item("Item 5", R.drawable.ic_action_refresh_dark));
-        items.add(new Item("Item 6", R.drawable.ic_action_select_all_dark));
-
-        mList = new ListView(this);
-        mAdapter = new MenuAdapter(items);
-        mList.setAdapter(mAdapter);
-        mList.setOnItemClickListener(mItemClickListener);
-
-        mMenuDrawer.setMenuView(mList);
-
-        mContentTextView = (TextView) findViewById(R.id.contentText);
-        mContentTextView.setText(mContentText);
-    }
-
-    private AdapterView.OnItemClickListener mItemClickListener = new AdapterView.OnItemClickListener() {
-        @Override
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            mActivePosition = position;
-            mMenuDrawer.setActiveView(view, position);
-            mContentTextView.setText(((TextView) view).getText());
-        }
-    };
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt(STATE_ACTIVE_POSITION, mActivePosition);
-        outState.putString(STATE_CONTENT_TEXT, mContentText);
-    }
-
-    private static class Item {
-
-        String mTitle;
-        int mIconRes;
-
-        Item(String title, int iconRes) {
-            mTitle = title;
-            mIconRes = iconRes;
-        }
-    }
-
-    private static class Category {
-
-        String mTitle;
-
-        Category(String title) {
-            mTitle = title;
-        }
-    }
-
-    private class MenuAdapter extends BaseAdapter {
-
-        private List<Object> mItems;
-
-        MenuAdapter(List<Object> items) {
-            mItems = items;
-        }
-
-        @Override
-        public int getCount() {
-            return mItems.size();
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return mItems.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public int getItemViewType(int position) {
-            return getItem(position) instanceof Item ? 0 : 1;
-        }
-
-        @Override
-        public int getViewTypeCount() {
-            return 2;
-        }
-
-        @Override
-        public boolean isEnabled(int position) {
-            return getItem(position) instanceof Item;
-        }
-
-        @Override
-        public boolean areAllItemsEnabled() {
-            return false;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            View v = convertView;
-            Object item = getItem(position);
-
-            if (item instanceof Category) {
-                if (v == null) {
-                    v = getLayoutInflater().inflate(R.layout.menu_row_category, parent, false);
-                }
-
-                ((TextView) v).setText(((Category) item).mTitle);
-
-            } else {
-                if (v == null) {
-                    v = getLayoutInflater().inflate(R.layout.menu_row_item, parent, false);
-                }
-
-                TextView tv = (TextView) v;
-                tv.setText(((Item) item).mTitle);
-                tv.setCompoundDrawablesWithIntrinsicBounds(((Item) item).mIconRes, 0, 0, 0);
-            }
-
-            v.setTag(R.id.mdActiveViewPosition, position);
-
-            if (position == mActivePosition) {
-                mMenuDrawer.setActiveView(v, position);
-            }
-
-            return v;
-        }
-    }
-}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/TopMenuSample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/TopMenuSample.java
deleted file mode 100644
index 1c87f888c2..0000000000
--- a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/TopMenuSample.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package net.simonvt.menudrawer.samples;
-
-import net.simonvt.menudrawer.MenuDrawer;
-import net.simonvt.menudrawer.Position;
-
-import android.app.Activity;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v4.app.NavUtils;
-import android.support.v4.view.MenuItemCompat;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.TextView;
-
-/**
- * Sample class illustrating how to add a menu drawer above the content area.
- */
-public class TopMenuSample extends Activity implements OnClickListener {
-
-    private static final int MENU_OVERFLOW = 1;
-
-    private MenuDrawer mMenuDrawer;
-    private TextView mContentTextView;
-
-    @Override
-    protected void onCreate(Bundle inState) {
-        super.onCreate(inState);
-
-        mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT, Position.TOP);
-        mMenuDrawer.setTouchMode(MenuDrawer.TOUCH_MODE_FULLSCREEN);
-        mMenuDrawer.setContentView(R.layout.activity_topmenu);
-        mMenuDrawer.setMenuView(R.layout.menu_top);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH)
-            getActionBar().setDisplayHomeAsUpEnabled(true);
-
-        mContentTextView = (TextView) findViewById(R.id.contentText);
-        findViewById(R.id.item1).setOnClickListener(this);
-        findViewById(R.id.item2).setOnClickListener(this);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuItem overflowItem = menu.add(0, MENU_OVERFLOW, 0, null);
-        MenuItemCompat.setShowAsAction(overflowItem, MenuItem.SHOW_AS_ACTION_ALWAYS);
-
-        overflowItem.setIcon(R.drawable.ic_menu_moreoverflow_normal_holo_light);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                NavUtils.navigateUpFromSameTask(this);
-                return true;
-            case MENU_OVERFLOW:
-                mMenuDrawer.toggleMenu();
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    /**
-     * Click handler for top drawer items.
-     */
-    @Override
-    public void onClick(View v) {
-        String tag = (String) v.getTag();
-        mContentTextView.setText(String.format("%s clicked.", tag));
-        mMenuDrawer.setActiveView(v);
-    }
-}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ViewPagerSample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ViewPagerSample.java
deleted file mode 100644
index 41f17c97d9..0000000000
--- a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/ViewPagerSample.java
+++ /dev/null
@@ -1,300 +0,0 @@
-package net.simonvt.menudrawer.samples;
-
-import net.simonvt.menudrawer.MenuDrawer;
-
-import android.content.Context;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.FrameLayout;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ViewPagerSample extends FragmentActivity {
-
-    private static final String STATE_ACTIVE_POSITION = "net.simonvt.menudrawer.samples.ContentSample.activePosition";
-
-    private MenuDrawer mMenuDrawer;
-
-    private MenuAdapter mAdapter;
-    private ListView mList;
-
-    private int mActivePosition = -1;
-    private PagerAdapter mPagerAdapter;
-    private ViewPager mViewPager;
-
-    @Override
-    protected void onCreate(Bundle inState) {
-        super.onCreate(inState);
-
-        if (inState != null) {
-            mActivePosition = inState.getInt(STATE_ACTIVE_POSITION);
-        }
-
-        mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT);
-        mMenuDrawer.setContentView(R.layout.activity_viewpagersample);
-
-        List<Object> items = new ArrayList<Object>();
-        items.add(new Item("Item 1", R.drawable.ic_action_refresh_dark));
-        items.add(new Item("Item 2", R.drawable.ic_action_select_all_dark));
-        items.add(new Category("Cat 1"));
-        items.add(new Item("Item 3", R.drawable.ic_action_refresh_dark));
-        items.add(new Item("Item 4", R.drawable.ic_action_select_all_dark));
-        items.add(new Category("Cat 2"));
-        items.add(new Item("Item 5", R.drawable.ic_action_refresh_dark));
-        items.add(new Item("Item 6", R.drawable.ic_action_select_all_dark));
-
-        // A custom ListView is needed so the drawer can be notified when it's
-        // scrolled. This is to update the position
-        // of the arrow indicator.
-        mList = new ListView(this);
-        mAdapter = new MenuAdapter(items);
-        mList.setAdapter(mAdapter);
-        mList.setOnItemClickListener(mItemClickListener);
-
-        mMenuDrawer.setMenuView(mList);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-            getActionBar().setDisplayHomeAsUpEnabled(true);
-        }
-
-        mMenuDrawer.setTouchMode(MenuDrawer.TOUCH_MODE_FULLSCREEN);
-
-        mViewPager = (ViewPager) findViewById(R.id.view_pager);
-        mViewPager
-                .setOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
-                    @Override
-                    public void onPageSelected(final int position) {
-                        mMenuDrawer.setTouchMode(position == 0
-                                ? MenuDrawer.TOUCH_MODE_FULLSCREEN
-                                : MenuDrawer.TOUCH_MODE_NONE);
-                    }
-                });
-
-        mPagerAdapter = new PagerAdapter(this);
-        mPagerAdapter.addTab(TextViewFragment.class, null);
-        mPagerAdapter.addTab(TextViewFragment.class, null);
-        mPagerAdapter.addTab(TextViewFragment.class, null);
-
-        mViewPager.setAdapter(mPagerAdapter);
-    }
-
-    private AdapterView.OnItemClickListener mItemClickListener = new AdapterView.OnItemClickListener() {
-        @Override
-        public void onItemClick(AdapterView<?> parent, View view, int position,
-                long id) {
-            mActivePosition = position;
-            mMenuDrawer.setActiveView(view, position);
-            mMenuDrawer.closeMenu();
-        }
-    };
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt(STATE_ACTIVE_POSITION, mActivePosition);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                mMenuDrawer.toggleMenu();
-                return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void onBackPressed() {
-        final int drawerState = mMenuDrawer.getDrawerState();
-        if (drawerState == MenuDrawer.STATE_OPEN
-                || drawerState == MenuDrawer.STATE_OPENING) {
-            mMenuDrawer.closeMenu();
-            return;
-        }
-
-        super.onBackPressed();
-    }
-
-    private static final class Item {
-
-        String mTitle;
-        int mIconRes;
-
-        Item(String title, int iconRes) {
-            mTitle = title;
-            mIconRes = iconRes;
-        }
-    }
-
-    private static final class Category {
-
-        String mTitle;
-
-        Category(String title) {
-            mTitle = title;
-        }
-    }
-
-    private class MenuAdapter extends BaseAdapter {
-
-        private List<Object> mItems;
-
-        MenuAdapter(List<Object> items) {
-            mItems = items;
-        }
-
-        @Override
-        public int getCount() {
-            return mItems.size();
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return mItems.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public int getItemViewType(int position) {
-            return getItem(position) instanceof Item ? 0 : 1;
-        }
-
-        @Override
-        public int getViewTypeCount() {
-            return 2;
-        }
-
-        @Override
-        public boolean isEnabled(int position) {
-            return getItem(position) instanceof Item;
-        }
-
-        @Override
-        public boolean areAllItemsEnabled() {
-            return false;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            View v = convertView;
-            Object item = getItem(position);
-
-            if (item instanceof Category) {
-                if (v == null) {
-                    v = getLayoutInflater().inflate(R.layout.menu_row_category,
-                            parent, false);
-                }
-
-                ((TextView) v).setText(((Category) item).mTitle);
-
-            } else {
-                if (v == null) {
-                    v = getLayoutInflater().inflate(R.layout.menu_row_item,
-                            parent, false);
-                }
-
-                TextView tv = (TextView) v;
-                tv.setText(((Item) item).mTitle);
-                tv.setCompoundDrawablesWithIntrinsicBounds(
-                        ((Item) item).mIconRes, 0, 0, 0);
-            }
-
-            v.setTag(R.id.mdActiveViewPosition, position);
-
-            if (position == mActivePosition) {
-                mMenuDrawer.setActiveView(v, position);
-            }
-
-            return v;
-        }
-    }
-
-    /**
-     * This is a helper class that implements the management of tabs and all
-     * details of connecting a ViewPager with associated TabHost. It relies on a
-     * trick. Normally a tab host has a simple API for supplying a View or
-     * Intent that each tab will show. This is not sufficient for switching
-     * between pages. So instead we make the content part of the tab host 0dp
-     * high (it is not shown) and the TabsAdapter supplies its own dummy view to
-     * show as the tab content. It listens to changes in tabs, and takes care of
-     * switch to the correct paged in the ViewPager whenever the selected tab
-     * changes.
-     */
-    public static class PagerAdapter extends FragmentPagerAdapter {
-
-        private final Context mContext;
-        private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>();
-
-        static final class TabInfo {
-
-            private final Class<?> mClss;
-            private final Bundle mArgs;
-
-            TabInfo(Class<?> aClass, Bundle args) {
-                mClss = aClass;
-                mArgs = args;
-            }
-        }
-
-        public PagerAdapter(FragmentActivity activity) {
-            super(activity.getSupportFragmentManager());
-            mContext = activity;
-        }
-
-        @Override
-        public int getCount() {
-            return mTabs.size();
-        }
-
-        @Override
-        public Fragment getItem(int position) {
-            TabInfo info = mTabs.get(position);
-            return Fragment.instantiate(mContext, info.mClss.getName(),
-                    info.mArgs);
-        }
-
-        public void addTab(Class<?> clss, Bundle args) {
-            TabInfo info = new TabInfo(clss, args);
-            mTabs.add(info);
-            notifyDataSetChanged();
-        }
-
-    }
-
-    public static class TextViewFragment extends Fragment {
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            FrameLayout frameLayout = new FrameLayout(getActivity());
-            frameLayout.setLayoutParams(new FrameLayout.LayoutParams(
-                    FrameLayout.LayoutParams.MATCH_PARENT,
-                    FrameLayout.LayoutParams.MATCH_PARENT, Gravity.CENTER));
-
-            TextView tv = new TextView(getActivity());
-            tv.setText("This is an example of a Fragment in a View Pager");
-            frameLayout.addView(tv);
-            return frameLayout;
-        }
-    }
-}
diff --git a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/WindowSample.java b/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/WindowSample.java
deleted file mode 100644
index cc433b77d5..0000000000
--- a/Externals/android-menudrawer/samples/src/net/simonvt/menudrawer/samples/WindowSample.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package net.simonvt.menudrawer.samples;
-
-import net.simonvt.menudrawer.MenuDrawer;
-
-import android.app.Activity;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.TextView;
-
-public class WindowSample extends Activity implements View.OnClickListener {
-
-    private static final String STATE_MENUDRAWER = "net.simonvt.menudrawer.samples.WindowSample.menuDrawer";
-    private static final String STATE_ACTIVE_VIEW_ID = "net.simonvt.menudrawer.samples.WindowSample.activeViewId";
-
-    private MenuDrawer mMenuDrawer;
-    private TextView mContentTextView;
-
-    private int mActiveViewId;
-
-    @Override
-    public void onCreate(Bundle inState) {
-        super.onCreate(inState);
-        if (inState != null) {
-            mActiveViewId = inState.getInt(STATE_ACTIVE_VIEW_ID);
-        }
-
-        mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_WINDOW);
-        mMenuDrawer.setContentView(R.layout.activity_windowsample);
-        mMenuDrawer.setMenuView(R.layout.menu_scrollview);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-            getActionBar().setDisplayHomeAsUpEnabled(true);
-        }
-
-        mContentTextView = (TextView) findViewById(R.id.contentText);
-
-        findViewById(R.id.item1).setOnClickListener(this);
-        findViewById(R.id.item2).setOnClickListener(this);
-        findViewById(R.id.item3).setOnClickListener(this);
-        findViewById(R.id.item4).setOnClickListener(this);
-        findViewById(R.id.item5).setOnClickListener(this);
-        findViewById(R.id.item6).setOnClickListener(this);
-
-        TextView activeView = (TextView) findViewById(mActiveViewId);
-        if (activeView != null) {
-            mMenuDrawer.setActiveView(activeView);
-            mContentTextView.setText("Active item: " + activeView.getText());
-        }
-
-        // This will animate the drawer open and closed until the user manually drags it. Usually this would only be
-        // called on first launch.
-        mMenuDrawer.peekDrawer();
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Bundle inState) {
-        super.onRestoreInstanceState(inState);
-        mMenuDrawer.restoreState(inState.getParcelable(STATE_MENUDRAWER));
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putParcelable(STATE_MENUDRAWER, mMenuDrawer.saveState());
-        outState.putInt(STATE_ACTIVE_VIEW_ID, mActiveViewId);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                mMenuDrawer.toggleMenu();
-                return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void onBackPressed() {
-        final int drawerState = mMenuDrawer.getDrawerState();
-        if (drawerState == MenuDrawer.STATE_OPEN || drawerState == MenuDrawer.STATE_OPENING) {
-            mMenuDrawer.closeMenu();
-            return;
-        }
-
-        super.onBackPressed();
-    }
-
-    @Override
-    public void onClick(View v) {
-        mMenuDrawer.setActiveView(v);
-        mContentTextView.setText("Active item: " + ((TextView) v).getText());
-        mMenuDrawer.closeMenu();
-        mActiveViewId = v.getId();
-    }
-}
diff --git a/Source/Android/.idea/misc.xml b/Source/Android/.idea/misc.xml
index 4304d8b8c8..1c9e3220c5 100644
--- a/Source/Android/.idea/misc.xml
+++ b/Source/Android/.idea/misc.xml
@@ -6,21 +6,5 @@
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android 4.2.2" project-jdk-type="Android SDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>Android 4.2.2</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
 </project>
 
diff --git a/Source/Android/.idea/modules.xml b/Source/Android/.idea/modules.xml
index e28a283f98..746019cd05 100644
--- a/Source/Android/.idea/modules.xml
+++ b/Source/Android/.idea/modules.xml
@@ -3,7 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Android.iml" filepath="$PROJECT_DIR$/Android.iml" />
-      <module fileurl="file://$PROJECT_DIR$/../../Externals/android-menudrawer/library/library.iml" filepath="$PROJECT_DIR$/../../Externals/android-menudrawer/library/library.iml" />
     </modules>
   </component>
 </project>
diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index f21f574f72..7fde93f443 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -20,7 +20,7 @@
           <theme>@android:style/Theme.Holo</theme>
         </config>
       </layout>
-      <layout url="file://$PROJECT_DIR$/res/layout/main.xml">
+      <layout url="file://$PROJECT_DIR$/res/layout/gamelist_layout.xml">
         <config>
           <device>Nexus 4</device>
           <theme>@android:style/Theme.Holo</theme>
@@ -103,45 +103,16 @@
       <file leaf-file-name="DolphinEmulator.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="26" column="26" selection-start="717" selection-end="717" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2850">
+            <state line="17" column="13" selection-start="433" selection-end="433" vertical-scroll-proportion="0.0" vertical-offset="240" max-vertical-offset="3045">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="prefvalues.xml" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
+      <file leaf-file-name="GameListActivity.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="14" column="25" selection-start="386" selection-end="386" vertical-scroll-proportion="0.53984576" vertical-offset="0" max-vertical-offset="405">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="GameListView.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="162" column="72" selection-start="5647" selection-end="5647" vertical-scroll-proportion="0.0" vertical-offset="780" max-vertical-offset="2685">
-              <folding>
-                <element signature="method#Fill#0;class#GameListView#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="NativeLibrary.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeLibrary.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="11" column="56" selection-start="291" selection-end="291" vertical-scroll-proportion="0.0" vertical-offset="150" max-vertical-offset="630">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="InputConfigActivity.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="141" column="0" selection-start="4851" selection-end="4851" vertical-scroll-proportion="0.0" vertical-offset="2100" max-vertical-offset="2805">
+            <state line="173" column="64" selection-start="5829" selection-end="5829" vertical-scroll-proportion="-2.3393178" vertical-offset="3478" max-vertical-offset="4035">
               <folding />
             </state>
           </provider>
@@ -170,22 +141,22 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigView.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfig.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputClass.java" />
-        <option value="$PROJECT_DIR$/AndroidManifest.xml" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigAdapter.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigItem.java" />
-        <option value="$PROJECT_DIR$/assets/GCPadNew.ini" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeLibrary.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java" />
+        <option value="$PROJECT_DIR$/res/layout/newmain.xml" />
+        <option value="$PROJECT_DIR$/res/layout/activity_main.xml" />
+        <option value="$PROJECT_DIR$/res/layout/gamelist_listview.xml" />
+        <option value="$PROJECT_DIR$/res/layout/gamelist_layout.xml" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListAdapter.java" />
+        <option value="$PROJECT_DIR$/res/layout/sidemenu.xml" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
-        <option value="$PROJECT_DIR$/res/values/prefvalues.xml" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigAdapter.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java" />
+        <option value="$PROJECT_DIR$/bin/AndroidManifest.xml" />
+        <option value="$PROJECT_DIR$/AndroidManifest.xml" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java" />
+        <option value="$PROJECT_DIR$/res/layout/folderbrowser.xml" />
       </list>
     </option>
   </component>
@@ -286,105 +257,49 @@
               <option name="myItemType" value="" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="res">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="values">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="res">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="assets">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
         </subPane>
       </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="recentsLimit" value="5" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="options.lastSelected" value="android.dex.compiler" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="options.splitter.details.proportions" value="0.2" />
-    <property name="last_opened_file_path" value="$USER_HOME$/my-release-key.keystore" />
-    <property name="AndroidRunProguardForReleaseBuild" value="false" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="192.168.0.188:5555" />
-    <property name="ExportedModule" value="Android" />
     <property name="ExportedApkPath" value="$USER_HOME$/Desktop/DolphinEmu-Pre0.6-Android2.3.apk" />
-    <property name="FullScreen" value="false" />
-    <property name="options.searchVisible" value="true" />
-    <property name="options.splitter.main.proportions" value="0.3" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
+    <property name="options.lastSelected" value="project.propCompiler" />
+    <property name="AndroidRunProguardForReleaseBuild" value="false" />
+    <property name="MemberChooser.copyJavadoc" value="false" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="978fa698" />
+    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
     <property name="dynamic.classpath" value="false" />
+    <property name="options.splitter.main.proportions" value="0.3" />
+    <property name="GoToFile.includeJavaFiles" value="false" />
+    <property name="options.searchVisible" value="true" />
+    <property name="last_opened_file_path" value="$USER_HOME$/NavigationDrawer/libs/android-support-v4.jar" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="MemberChooser.showClasses" value="true" />
+    <property name="FullScreen" value="false" />
+    <property name="ExportedModule" value="Android" />
+    <property name="project.structure.proportion" value="0.0" />
+    <property name="recentsLimit" value="5" />
     <property name="restartRequiresConfirmation" value="true" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
+    <property name="GoToClass.includeLibraries" value="false" />
+    <property name="project.structure.side.proportion" value="0.2" />
+    <property name="MemberChooser.sorted" value="false" />
   </component>
   <component name="RunManager" selected="Android Application.Dolphin Emulator">
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <method />
+    </configuration>
     <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
       <option name="ACTIVITY_CLASS" value="" />
@@ -401,31 +316,12 @@
       <option name="CLEAR_LOGCAT" value="false" />
       <method />
     </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <module name="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
       <method />
     </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
@@ -466,12 +362,18 @@
       <option name="CLEAR_LOGCAT" value="false" />
       <method />
     </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
       <method />
     </configuration>
     <configuration default="false" name="Dolphin Emulator" type="AndroidRunConfigurationType" factoryName="Android Application">
@@ -576,33 +478,59 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="24" y="0" width="1342" height="744" extended-state="0" />
-    <editor active="true" />
+    <editor active="false" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2179289" sideWeight="0.69630873" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6912752" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2179289" sideWeight="0.29026845" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.30536914" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30369127" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21406491" sideWeight="0.70302016" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29697987" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2179289" sideWeight="0.29026845" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6912752" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29865772" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
     </layout>
+    <layout-to-restore>
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2179289" sideWeight="0.7013423" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29865772" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2179289" sideWeight="0.29026845" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6912752" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29865772" sideWeight="0.5" order="11" side_tool="true" content_ui="tabs" />
+    </layout-to-restore>
   </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
@@ -665,106 +593,216 @@
     <breakpoint-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/res/layout/gamelist_activity.xml">
+      <provider editor-type-id="android-designer">
+        <state />
+      </provider>
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="545">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/layout/gamelist_listview.xml">
+      <provider editor-type-id="android-designer">
+        <state />
+      </provider>
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="1" column="29" selection-start="98" selection-end="98" vertical-scroll-proportion="0.040871933" vertical-offset="0" max-vertical-offset="367">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="43" column="40" selection-start="1231" selection-end="1231" vertical-scroll-proportion="0.6505102" vertical-offset="285" max-vertical-offset="780">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="17" column="13" selection-start="417" selection-end="417" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1290" />
+        <state line="18" column="25" selection-start="476" selection-end="476" vertical-scroll-proportion="0.19788918" vertical-offset="0" max-vertical-offset="1290">
+          <folding />
+        </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListAdapter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="12" column="13" selection-start="300" selection-end="300" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="825" />
+        <state line="12" column="13" selection-start="300" selection-end="300" vertical-scroll-proportion="-0.42091838" vertical-offset="225" max-vertical-offset="825">
+          <folding />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
+    <entry file="file://$PROJECT_DIR$/bin/AndroidManifest.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="10" column="13" selection-start="231" selection-end="231" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1050" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="11" column="13" selection-start="267" selection-end="267" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="720" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuItem.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="8" column="13" selection-start="168" selection-end="168" vertical-scroll-proportion="0.31007752" vertical-offset="0" max-vertical-offset="630" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="6" column="13" selection-start="150" selection-end="150" vertical-scroll-proportion="0.15503876" vertical-offset="0" max-vertical-offset="885" />
+        <state line="39" column="18" selection-start="1869" selection-end="1869" vertical-scroll-proportion="1.1336899" vertical-offset="161" max-vertical-offset="720">
+          <folding />
+        </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="6" column="69" selection-start="278" selection-end="278" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="810">
+        <state line="16" column="17" selection-start="696" selection-end="696" vertical-scroll-proportion="-0.23214285" vertical-offset="331" max-vertical-offset="780">
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="17" column="13" selection-start="433" selection-end="433" vertical-scroll-proportion="0.0" vertical-offset="2293" max-vertical-offset="2850">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/layout/gamelist_layout.xml">
+      <provider editor-type-id="android-designer">
+        <state />
+      </provider>
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="735">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/values/strings.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="570">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/drawable/ic_drawer.png">
+      <provider selected="true" editor-type-id="images">
+        <state />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/layout/folderbrowser.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="25" column="38" selection-start="1051" selection-end="1051" vertical-scroll-proportion="1.0190217" vertical-offset="0" max-vertical-offset="525">
+          <folding />
+        </state>
+      </provider>
+      <provider editor-type-id="android-designer">
+        <state />
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="13" column="13" selection-start="346" selection-end="346" vertical-scroll-proportion="0.33247423" vertical-offset="6" max-vertical-offset="630">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigAdapter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="28" column="0" selection-start="756" selection-end="756" vertical-scroll-proportion="0.46391752" vertical-offset="135" max-vertical-offset="825">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/assets/GCPadNew.ini">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="3" column="20" selection-start="81" selection-end="81" vertical-scroll-proportion="0.11597938" vertical-offset="0" max-vertical-offset="525" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigItem.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="11" column="0" selection-start="297" selection-end="297" vertical-scroll-proportion="-0.96649486" vertical-offset="540" max-vertical-offset="930">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeLibrary.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="11" column="56" selection-start="291" selection-end="291" vertical-scroll-proportion="0.0" vertical-offset="6" max-vertical-offset="615">
+        <state line="13" column="13" selection-start="346" selection-end="346" vertical-scroll-proportion="0.03816794" vertical-offset="120" max-vertical-offset="630">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="141" column="0" selection-start="4851" selection-end="4851" vertical-scroll-proportion="0.0" vertical-offset="1562" max-vertical-offset="2610">
+        <state line="58" column="8" selection-start="2544" selection-end="2544" vertical-scroll-proportion="-3.923664" vertical-offset="2217" max-vertical-offset="2610">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java">
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigAdapter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="162" column="72" selection-start="5647" selection-end="5647" vertical-scroll-proportion="0.0" vertical-offset="780" max-vertical-offset="2685">
-          <folding>
-            <element signature="method#Fill#0;class#GameListView#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="26" column="26" selection-start="717" selection-end="717" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2850">
+        <state line="16" column="13" selection-start="385" selection-end="385" vertical-scroll-proportion="-0.7557252" vertical-offset="432" max-vertical-offset="825">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="14" column="25" selection-start="386" selection-end="386" vertical-scroll-proportion="0.53984576" vertical-offset="0" max-vertical-offset="405">
+        <state line="173" column="64" selection-start="5829" selection-end="5829" vertical-scroll-proportion="-2.3393178" vertical-offset="3478" max-vertical-offset="4035">
           <folding />
         </state>
       </provider>
     </entry>
   </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ArtifactsStructureConfigurable.UI">
+        <settings>
+          <artifact-editor />
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="FacetStructureConfigurable.UI">
+        <settings>
+          <last-edited>Dolphin Emulator (Android)|Android</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="GlobalLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="JdkListConfigurable.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ModuleStructureConfigurable.UI">
+        <settings>
+          <last-edited>Android</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+                <option value="0.5" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>Android 4.2.2</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ProjectLibrariesConfigurable.UI">
+        <settings>
+          <last-edited>dexedLibs</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
 </project>
 
diff --git a/Source/Android/Android.iml b/Source/Android/Android.iml
index 5f8bb57f26..3ad11d598f 100644
--- a/Source/Android/Android.iml
+++ b/Source/Android/Android.iml
@@ -2,7 +2,14 @@
 <module type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android" name="Dolphin Emulator">
-      <configuration />
+      <configuration>
+        <notImportedProperties>
+          <property>MANIFEST_FILE_PATH</property>
+          <property>RESOURCES_DIR_PATH</property>
+          <property>ASSETS_DIR_PATH</property>
+          <property>NATIVE_LIBS_DIR_PATH</property>
+        </notImportedProperties>
+      </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
@@ -13,7 +20,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="library" />
+    <orderEntry type="library" name="android-support-v13" level="project" />
   </component>
 </module>
 
diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index 802f2f6cf6..33f35450d3 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -25,11 +25,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity 
-            android:name="org.dolphinemu.dolphinemu.GameListView"
-            android:label="@string/app_name"
-            android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
-        </activity>
         <activity
             android:name="org.dolphinemu.dolphinemu.FolderBrowser"
             android:label="@string/app_name"
@@ -43,6 +38,9 @@
         <activity
                 android:name=".PrefsActivity" >
         </activity>
+        <activity
+            android:name=".GameListActivity" >
+        </activity>
     </application>
 
 </manifest>
diff --git a/Source/Android/libs/android-support-v13.jar b/Source/Android/libs/android-support-v13.jar
new file mode 100644
index 0000000000000000000000000000000000000000..e75351a50777951e96f0c379c0cf6940e8bba122
GIT binary patch
literal 501154
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%0D^6Y?5QZwb
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
QJmVC`$`uR@!hb<r0AxKt*Z=?k

literal 0
HcmV?d00001

diff --git a/Externals/android-menudrawer/samples/res/drawable-mdpi/ic_action_select_all_dark.png b/Source/Android/res/drawable/ic_drawer.png
similarity index 94%
rename from Externals/android-menudrawer/samples/res/drawable-mdpi/ic_action_select_all_dark.png
rename to Source/Android/res/drawable/ic_drawer.png
index 252ecbb0ed5859936c521a24c6ac434da150f6de..ff7b1def9ac3f86488a855f502b965ac75b633fb 100644
GIT binary patch
delta 154
zcmbOyHcQN`Gr-TCmrII^fq{Y7)59eQNK1e)2OE%lP;UDJNO2Z;L>4nJa0`PlBg3pY
z5*y9BxT0J=T^vIyZYBNs|KFZjmr<Cxm(e@8So&t%iq&hAWD4YYYPlmMfS`Q~zeIbD
uoy6IU#ge%ui+j_yT<me<1)9t7|35Q>m8huUOY`YBL3~eFKbLh*2~7Z%Oe=E$

delta 158
zcmbOwHc!l~Gr-TCmrII^fq{Y7)59eQNGpIaBQucn-11^Okm4-xh%9Dc;1&X5#!GkW
z{%kbs;)-Jn@CkAK4+fz%Uvq#8nM#8Ef*H;{adch`<Y{`kIEHXsPfl=PU9@l^qrfx<
w3B`!|R}EL@Tgm8{$XZ-&jLcA5e5;#_;iihH`DJg;SfC~bPgg&ebxsLQ0I%CHi~s-t

diff --git a/Source/Android/res/layout/folderbrowser.xml b/Source/Android/res/layout/folderbrowser.xml
index ae480d0807..82b94e238f 100644
--- a/Source/Android/res/layout/folderbrowser.xml
+++ b/Source/Android/res/layout/folderbrowser.xml
@@ -3,42 +3,27 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical" >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:orientation="vertical" >
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-            </LinearLayout>
-
             <TextView
-                android:id="@+id/TextView01"
+                android:id="@+id/FolderTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="5dip"
                 android:layout_marginTop="5dip"
                 android:singleLine="true"
-                android:text="@+id/TextView01"
+                android:text="Title"
                 android:textStyle="bold" />
 
             <TextView
-                android:id="@+id/TextView02"
+                android:id="@+id/FolderSubTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dip"
-                android:text="@+id/TextView02" />
+                android:text="Subtitle" />
 
         </LinearLayout>
-
-    </LinearLayout>
-
-
-
 </LinearLayout>
diff --git a/Source/Android/res/layout/folderbrowserfooter.xml b/Source/Android/res/layout/folderbrowserfooter.xml
deleted file mode 100644
index 9c0e11d81b..0000000000
--- a/Source/Android/res/layout/folderbrowserfooter.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Source/Android/res/layout/gamelist_activity.xml b/Source/Android/res/layout/gamelist_activity.xml
new file mode 100644
index 0000000000..08a2c4eb5b
--- /dev/null
+++ b/Source/Android/res/layout/gamelist_activity.xml
@@ -0,0 +1,20 @@
+<android.support.v4.widget.DrawerLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/drawer_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    <FrameLayout
+            android:id="@+id/content_frame"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    <ListView
+            android:id="@+id/left_drawer"
+            android:layout_width="240dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="start"
+            android:choiceMode="singleChoice"
+            android:divider="@android:color/transparent"
+            android:dividerHeight="0dp"
+            android:background="#111"/>
+</android.support.v4.widget.DrawerLayout>
diff --git a/Source/Android/res/layout/main.xml b/Source/Android/res/layout/gamelist_layout.xml
similarity index 89%
rename from Source/Android/res/layout/main.xml
rename to Source/Android/res/layout/gamelist_layout.xml
index 1b19ad19fe..16596c3cec 100644
--- a/Source/Android/res/layout/main.xml
+++ b/Source/Android/res/layout/gamelist_layout.xml
@@ -9,7 +9,7 @@
         android:layout_height="wrap_content" >
 
         <ImageView
-            android:id="@+id/imageView1"
+            android:id="@+id/GameItemIcon"
             android:layout_width="96dp"
             android:layout_height="match_parent" />
 
@@ -19,7 +19,7 @@
             android:orientation="vertical" >
 
             <TextView
-                android:id="@+id/TextView01"
+                android:id="@+id/GameItemTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="5dip"
@@ -29,7 +29,7 @@
                 android:textStyle="bold" />
 
             <TextView
-                android:id="@+id/TextView02"
+                android:id="@+id/GameItemSubText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dip"
@@ -40,3 +40,4 @@
     </LinearLayout>
 
 </LinearLayout>
+
diff --git a/Source/Android/res/layout/gamelist_listview.xml b/Source/Android/res/layout/gamelist_listview.xml
new file mode 100644
index 0000000000..265a8f0b36
--- /dev/null
+++ b/Source/Android/res/layout/gamelist_listview.xml
@@ -0,0 +1,7 @@
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/gamelist"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:choiceMode="singleChoice"
+    android:divider="@android:color/transparent"
+    android:dividerHeight="0dp"/>
\ No newline at end of file
diff --git a/Source/Android/res/layout/sidemenu.xml b/Source/Android/res/layout/sidemenu.xml
index 57ab67e3ca..76bc937489 100644
--- a/Source/Android/res/layout/sidemenu.xml
+++ b/Source/Android/res/layout/sidemenu.xml
@@ -15,7 +15,7 @@
             android:orientation="vertical" >
 
             <TextView
-                android:id="@+id/TextView01"
+                android:id="@+id/SideMenuTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="5dip"
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
index 2cfdcb6e7e..40a14e3b4e 100644
--- a/Source/Android/res/values/strings.xml
+++ b/Source/Android/res/values/strings.xml
@@ -2,5 +2,7 @@
 <resources>
 
     <string name="app_name">Dolphin Emulator</string>
+    <string name="drawer_open">Open navigation drawer</string>
+    <string name="drawer_close">Close navigation drawer</string>
 
 </resources>
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index 3c11ed76c6..d8559c1393 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -77,7 +77,7 @@ public class DolphinEmulator<MainActivity> extends Activity
 		if (savedInstanceState == null)
 		{
 
-			Intent ListIntent = new Intent(this, GameListView.class);
+			Intent ListIntent = new Intent(this, GameListActivity.class);
 			startActivityForResult(ListIntent, 1);
 			
 			// Make the assets directory
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
index 0ff58cdb39..0ceb776a77 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
@@ -16,7 +16,7 @@ import java.util.Collections;
 import java.util.List;
 
 public class FolderBrowser extends ListActivity {
-	private GameListAdapter adapter;
+	private FolderBrowserAdapter adapter;
 	private static File currentDir = null;
 	private void Fill(File f)
     {
@@ -52,7 +52,7 @@ public class FolderBrowser extends ListActivity {
 	    if (!f.getPath().equalsIgnoreCase("/"))
 	        dir.add(0, new GameListItem(getApplicationContext(), "..", "Parent Directory", f.getParent()));
 
-         adapter = new GameListAdapter(this,R.layout.folderbrowser,dir);
+         adapter = new FolderBrowserAdapter(this,R.layout.folderbrowser,dir);
 		 this.setListAdapter(adapter);
     }
 
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java
new file mode 100644
index 0000000000..b201125a62
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java
@@ -0,0 +1,53 @@
+package org.dolphinemu.dolphinemu;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+import java.util.List;
+
+public class FolderBrowserAdapter extends ArrayAdapter<GameListItem>{
+
+	private Context c;
+	private int id;
+	private List<GameListItem>items;
+
+	public FolderBrowserAdapter(Context context, int textViewResourceId,
+	                       List<GameListItem> objects) {
+		super(context, textViewResourceId, objects);
+		c = context;
+		id = textViewResourceId;
+		items = objects;
+	}
+	public GameListItem getItem(int i)
+	{
+		return items.get(i);
+	}
+	@Override
+	public View getView(int position, View convertView, ViewGroup parent) {
+		View v = convertView;
+		if (v == null) {
+			LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+			v = vi.inflate(id, null);
+		}
+		final GameListItem o = items.get(position);
+		if (o != null) {
+			TextView t1 = (TextView) v.findViewById(R.id.FolderTitle);
+			TextView t2 = (TextView) v.findViewById(R.id.FolderSubTitle);
+
+			if(t1!=null)
+				t1.setText(o.getName());
+			if(t2!=null)
+				t2.setText(o.getData());
+
+		}
+		return v;
+	}
+
+
+
+}
+
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
new file mode 100644
index 0000000000..9e9de31dab
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
@@ -0,0 +1,292 @@
+package org.dolphinemu.dolphinemu;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v4.app.ActionBarDrawerToggle;
+import android.support.v4.widget.DrawerLayout;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.Toast;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2
+ * Refer to the license.txt file included.
+ */
+public class GameListActivity extends Activity {
+
+	enum keyTypes {TYPE_STRING, TYPE_BOOL};
+
+	private ActionBarDrawerToggle mDrawerToggle;
+	private DrawerLayout mDrawerLayout;
+	private SideMenuAdapter mDrawerAdapter;
+	private ListView mDrawerList;
+
+	private static GameListActivity me;
+
+	public static class GameListFragment extends Fragment {
+		private ListView mMainList;
+		private GameListAdapter mGameAdapter;
+
+		public GameListFragment() {
+			// Empty constructor required for fragment subclasses
+		}
+		private void Fill()
+		{
+			List<GameListItem>fls = new ArrayList<GameListItem>();
+			String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
+			int intDirectories = Integer.parseInt(Directories);
+			for (int a = 0; a < intDirectories; ++a)
+			{
+				String BrowseDir = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPath" + Integer.toString(a), "");
+				File currentDir = new File(BrowseDir);
+				File[]dirs = currentDir.listFiles();
+				try
+				{
+					for(File ff: dirs)
+					{
+						if (ff.getName().charAt(0) != '.')
+							if(!ff.isDirectory())
+								if (ff.getName().toLowerCase().contains(".gcm") ||
+										ff.getName().toLowerCase().contains(".iso") ||
+										ff.getName().toLowerCase().contains(".wbfs") ||
+										ff.getName().toLowerCase().contains(".gcz") ||
+										ff.getName().toLowerCase().contains(".dol") ||
+										ff.getName().toLowerCase().contains(".elf") ||
+										ff.getName().toLowerCase().contains(".dff"))
+									fls.add(new GameListItem(me.getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath()));
+					}
+				}
+				catch(Exception ignored)
+				{
+				}
+			}
+			Collections.sort(fls);
+
+			mGameAdapter = new GameListAdapter(me, R.layout.gamelist_layout, fls);
+			mMainList.setAdapter(mGameAdapter);
+		}
+
+		@Override
+		public View onCreateView(LayoutInflater inflater, ViewGroup container,
+		                         Bundle savedInstanceState) {
+			View rootView = inflater.inflate(R.layout.gamelist_listview, container, false);
+			mMainList = (ListView) rootView.findViewById(R.id.gamelist);
+			mMainList.setOnItemClickListener(mGameItemClickListener);
+
+			Fill();
+
+			return mMainList;
+		}
+		private AdapterView.OnItemClickListener mGameItemClickListener = new AdapterView.OnItemClickListener()
+		{
+			public void onItemClick(AdapterView<?> parent, View view, int position, long id)
+			{
+				GameListItem o = mGameAdapter.getItem(position);
+				if(!(o.getData().equalsIgnoreCase("folder")||o.getData().equalsIgnoreCase("parent directory")))
+				{
+					onFileClick(o.getPath());
+				}
+			}
+		};
+		private void onFileClick(String o)
+		{
+			Toast.makeText(me, "File Clicked: " + o, Toast.LENGTH_SHORT).show();
+
+			Intent intent = new Intent();
+			intent.putExtra("Select", o);
+			me.setResult(Activity.RESULT_OK, intent);
+
+			me.finish();
+		}
+	}
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.gamelist_activity);
+		me = this;
+
+		mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
+		mDrawerList = (ListView) findViewById(R.id.left_drawer);
+
+		List<SideMenuItem> dir = new ArrayList<SideMenuItem>();
+		dir.add(new SideMenuItem("Browse Folder", 0));
+		dir.add(new SideMenuItem("Settings", 1));
+		dir.add(new SideMenuItem("Gamepad Config", 2));
+
+		mDrawerAdapter = new SideMenuAdapter(this, R.layout.sidemenu, dir);
+		mDrawerList.setAdapter(mDrawerAdapter);
+		mDrawerList.setOnItemClickListener(mMenuItemClickListener);
+
+		// enable ActionBar app icon to behave as action to toggle nav drawer
+		getActionBar().setDisplayHomeAsUpEnabled(true);
+		getActionBar().setHomeButtonEnabled(true);
+
+		// ActionBarDrawerToggle ties together the the proper interactions
+		// between the sliding drawer and the action bar app icon
+		mDrawerToggle = new ActionBarDrawerToggle(
+				this,                  /* host Activity */
+				mDrawerLayout,         /* DrawerLayout object */
+				R.drawable.ic_drawer,  /* nav drawer image to replace 'Up' caret */
+				R.string.drawer_open,  /* "open drawer" description for accessibility */
+				R.string.drawer_close  /* "close drawer" description for accessibility */
+		) {
+		};
+		mDrawerLayout.setDrawerListener(mDrawerToggle);
+
+		recreateFragment();
+	}
+
+	private void recreateFragment()
+	{
+		Fragment fragment = new GameListFragment();
+		FragmentManager fragmentManager = getFragmentManager();
+		fragmentManager.beginTransaction().replace(R.id.content_frame, fragment).commit();
+	}
+
+	private AdapterView.OnItemClickListener mMenuItemClickListener = new AdapterView.OnItemClickListener()
+	{
+		public void onItemClick(AdapterView<?> parent, View view, int position, long id)
+		{
+			SideMenuItem o = mDrawerAdapter.getItem(position);
+			mDrawerLayout.closeDrawer(mDrawerList);
+
+			switch(o.getID())
+			{
+				case 0:
+					Toast.makeText(me, "Loading up the browser", Toast.LENGTH_SHORT).show();
+					Intent ListIntent = new Intent(me, FolderBrowser.class);
+					startActivityForResult(ListIntent, 1);
+					break;
+				case 1:
+					Toast.makeText(me, "Loading up settings", Toast.LENGTH_SHORT).show();
+					Intent SettingIntent = new Intent(me, PrefsActivity.class);
+					startActivityForResult(SettingIntent, 2);
+					break;
+				case 2:
+					Toast.makeText(me, "Loading up gamepad config", Toast.LENGTH_SHORT).show();
+					Intent ConfigIntent = new Intent(me, InputConfigActivity.class);
+					startActivityForResult(ConfigIntent, 3);
+					break;
+				default:
+					break;
+			}
+
+		}
+	};
+	@Override
+	public void onActivityResult(int requestCode, int resultCode, Intent data)
+	{
+		super.onActivityResult(requestCode, resultCode, data);
+
+		switch (requestCode)
+		{
+			// Browse
+			case 1:
+				if (resultCode == Activity.RESULT_OK)
+				{
+					String FileName = data.getStringExtra("Select");
+					Toast.makeText(this, "Folder Selected: " + FileName, Toast.LENGTH_SHORT).show();
+					String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
+					int intDirectories = Integer.parseInt(Directories);
+					Directories = Integer.toString(intDirectories + 1);
+					NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPathes", Directories);
+					NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPath" + Integer.toString(intDirectories), FileName);
+
+					recreateFragment();
+				}
+				break;
+			// Settings
+			case 2:
+
+				String Keys[] = {
+						"cpupref",
+						"dualcorepref",
+						"gpupref",
+				};
+				String ConfigKeys[] = {
+						"Core-CPUCore",
+						"Core-CPUThread",
+						"Core-GFXBackend",
+				};
+
+				keyTypes KeysTypes[] = {
+						keyTypes.TYPE_STRING,
+						keyTypes.TYPE_BOOL,
+						keyTypes.TYPE_STRING,
+				};
+				SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+
+				// Set our preferences here
+				for (int a = 0; a < Keys.length; ++a)
+				{
+					String ConfigValues[] = ConfigKeys[a].split("-");
+					String Key = ConfigValues[0];
+					String Value = ConfigValues[1];
+
+					switch(KeysTypes[a])
+					{
+						case TYPE_STRING:
+							String strPref = prefs.getString(Keys[a], "");
+							NativeLibrary.SetConfig("Dolphin.ini", Key, Value, strPref);
+							break;
+						case TYPE_BOOL:
+							boolean boolPref = prefs.getBoolean(Keys[a], true);
+							NativeLibrary.SetConfig("Dolphin.ini", Key, Value, boolPref ? "True" : "False");
+							break;
+					}
+
+				}
+				break;
+			case 3: // Gamepad settings
+		        /* Do Nothing */
+				break;
+		}
+	}
+	/**
+	 * When using the ActionBarDrawerToggle, you must call it during
+	 * onPostCreate() and onConfigurationChanged()...
+	 */
+
+	@Override
+	protected void onPostCreate(Bundle savedInstanceState) {
+		super.onPostCreate(savedInstanceState);
+		// Sync the toggle state after onRestoreInstanceState has occurred.
+		mDrawerToggle.syncState();
+	}
+
+	@Override
+	public void onConfigurationChanged(Configuration newConfig) {
+		super.onConfigurationChanged(newConfig);
+		// Pass any configuration change to the drawer toggls
+		mDrawerToggle.onConfigurationChanged(newConfig);
+	}
+
+	/* Called whenever we call invalidateOptionsMenu() */
+	@Override
+	public boolean onPrepareOptionsMenu(Menu menu) {
+		return super.onPrepareOptionsMenu(menu);
+	}
+	public void onBackPressed()
+	{
+
+	}
+
+
+}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListAdapter.java
index f0aa522a1f..a970db2f2a 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListAdapter.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListAdapter.java
@@ -1,7 +1,5 @@
 package org.dolphinemu.dolphinemu;
 
-import java.util.List;
-
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -10,6 +8,8 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import java.util.List;
+
 public class GameListAdapter extends ArrayAdapter<GameListItem>{
 
 	private Context c;
@@ -36,9 +36,9 @@ public class GameListAdapter extends ArrayAdapter<GameListItem>{
               }
               final GameListItem o = items.get(position);
               if (o != null) {
-                      TextView t1 = (TextView) v.findViewById(R.id.TextView01);
-                      TextView t2 = (TextView) v.findViewById(R.id.TextView02);
-                      ImageView v1 = (ImageView) v.findViewById(R.id.imageView1);
+                      TextView t1 = (TextView) v.findViewById(R.id.GameItemTitle);
+                      TextView t2 = (TextView) v.findViewById(R.id.GameItemSubText);
+                      ImageView v1 = (ImageView) v.findViewById(R.id.GameItemIcon);
                       
                       if(t1!=null)
                       	t1.setText(o.getName());
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
deleted file mode 100644
index 4a88977a5b..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListView.java
+++ /dev/null
@@ -1,225 +0,0 @@
-package org.dolphinemu.dolphinemu;
-
-import android.app.Activity;
-import android.app.ListActivity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-import android.widget.Toast;
-import net.simonvt.menudrawer.MenuDrawer;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class GameListView extends ListActivity {
-	private GameListAdapter adapter;
-	private MenuDrawer mDrawer;
-	
-    private SideMenuAdapter mAdapter;
-    private static GameListView me;
-
-    enum keyTypes {TYPE_STRING, TYPE_BOOL};
-	
-	private void Fill()
-    {
-		this.setTitle("Game List");
-		List<GameListItem>fls = new ArrayList<GameListItem>();
-		String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
-		int intDirectories = Integer.parseInt(Directories);
-		for (int a = 0; a < intDirectories; ++a)
-		{
-			String BrowseDir = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPath" + Integer.toString(a), "");
-			File currentDir = new File(BrowseDir);
-			File[]dirs = currentDir.listFiles();
-			try
-			{
-				for(File ff: dirs)
-				{
-					if (ff.getName().charAt(0) != '.')
-						if(!ff.isDirectory())
-			            	if (ff.getName().toLowerCase().contains(".gcm") ||
-			            		ff.getName().toLowerCase().contains(".iso") ||
-			            		ff.getName().toLowerCase().contains(".wbfs") ||
-			            		ff.getName().toLowerCase().contains(".gcz") ||
-			            		ff.getName().toLowerCase().contains(".dol") ||
-			            		ff.getName().toLowerCase().contains(".elf") ||
-			            		ff.getName().toLowerCase().contains(".dff"))
-			            			fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath()));
-				}
-			}
-			catch(Exception ignored)
-			{
-			}
-		}
-		Collections.sort(fls);
-		 
-		adapter = new GameListAdapter(this,R.layout.main, fls);
-		this.setListAdapter(adapter);
-    }
-	
-	@Override
-	protected void onListItemClick(ListView l, View v, int position, long id) {
-		super.onListItemClick(l, v, position, id);
-		GameListItem o = adapter.getItem(position);
-		if(!(o.getData().equalsIgnoreCase("folder")||o.getData().equalsIgnoreCase("parent directory")))
-        {
-			onFileClick(o.getPath());
-		}
-	}
-	
-	private void onFileClick(String o)
-    {
-    	Toast.makeText(this, "File Clicked: " + o, Toast.LENGTH_SHORT).show();
-    	
-        Intent intent = new Intent();
-        intent.putExtra("Select", o);
-        setResult(Activity.RESULT_OK, intent);
-        
-    	this.finish();
-    }
-	@Override
-	public void onActivityResult(int requestCode, int resultCode, Intent data)
-	{
-		super.onActivityResult(requestCode, resultCode, data);
-
-        switch (requestCode)
-        {
-            // Browse
-            case 1:
-                if (resultCode == Activity.RESULT_OK)
-                {
-                    String FileName = data.getStringExtra("Select");
-                    Toast.makeText(this, "Folder Selected: " + FileName, Toast.LENGTH_SHORT).show();
-                    String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
-                    int intDirectories = Integer.parseInt(Directories);
-                    Directories = Integer.toString(intDirectories + 1);
-	                NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPathes", Directories);
-	                NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPath" + Integer.toString(intDirectories), FileName);
-
-                    Fill();
-                }
-            break;
-            // Settings
-            case 2:
-
-                String Keys[] = {
-                        "cpupref",
-                        "dualcorepref",
-                        "gpupref",
-                };
-                String ConfigKeys[] = {
-                        "Core-CPUCore",
-                        "Core-CPUThread",
-                        "Core-GFXBackend",
-                };
-
-                keyTypes KeysTypes[] = {
-                        keyTypes.TYPE_STRING,
-                        keyTypes.TYPE_BOOL,
-                        keyTypes.TYPE_STRING,
-                };
-                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-
-                // Set our preferences here
-                for (int a = 0; a < Keys.length; ++a)
-                {
-                    String ConfigValues[] = ConfigKeys[a].split("-");
-                    String Key = ConfigValues[0];
-                    String Value = ConfigValues[1];
-
-                    switch(KeysTypes[a])
-                    {
-                        case TYPE_STRING:
-                            String strPref = prefs.getString(Keys[a], "");
-	                        NativeLibrary.SetConfig("Dolphin.ini", Key, Value, strPref);
-                        break;
-                        case TYPE_BOOL:
-                            boolean boolPref = prefs.getBoolean(Keys[a], true);
-                            NativeLibrary.SetConfig("Dolphin.ini", Key, Value, boolPref ? "True" : "False");
-                        break;
-                    }
-
-                }
-            break;
-	        case 3: // Gamepad settings
-		        /* Do Nothing */
-		    break;
-        }
-	}
-	
-	@Override
-	public void onCreate(Bundle savedInstanceState) 
-	{
-		super.onCreate(savedInstanceState);
-		me = this;
-		 
-		mDrawer = MenuDrawer.attach(this, MenuDrawer.MENU_DRAG_CONTENT);
-		Fill();
-		 
-		List<SideMenuItem>dir = new ArrayList<SideMenuItem>();
-		dir.add(new SideMenuItem("Browse Folder", 0));
-        dir.add(new SideMenuItem("Settings", 1));
-		dir.add(new SideMenuItem("Gamepad Config", 2));
-
-        ListView mList = new ListView(this);
-		mAdapter = new SideMenuAdapter(this,R.layout.sidemenu,dir);
-		mList.setAdapter(mAdapter);
-		mList.setOnItemClickListener(mItemClickListener);
-		
-		mDrawer.setMenuView(mList);
-	}
-    private AdapterView.OnItemClickListener mItemClickListener = new AdapterView.OnItemClickListener() {
-        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        	SideMenuItem o = mAdapter.getItem(position);
-        	
-        	switch(o.getID())
-        	{
-        		case 0:
-        			Toast.makeText(me, "Loading up the browser", Toast.LENGTH_SHORT).show();
-        			Intent ListIntent = new Intent(me, FolderBrowser.class);
-        			startActivityForResult(ListIntent, 1);
-        		break;
-                case 1:
-                    Toast.makeText(me, "Loading up settings", Toast.LENGTH_SHORT).show();
-                    Intent SettingIntent = new Intent(me, PrefsActivity.class);
-                    startActivityForResult(SettingIntent, 2);
-                break;
-		        case 2:
-			        Toast.makeText(me, "Loading up settings", Toast.LENGTH_SHORT).show();
-			        Intent ConfigIntent = new Intent(me, InputConfigActivity.class);
-			        startActivityForResult(ConfigIntent, 3);
-			    break;
-        		default:
-        		break;
-        	}
-            mDrawer.closeMenu();
-        }
-    };
-    @Override
-    public void setContentView(int layoutResID) {
-        // This override is only needed when using MENU_DRAG_CONTENT.
-    	mDrawer.setContentView(layoutResID);
-        onContentChanged();
-    }
-
-	@Override
-	public boolean onKeyUp(int keyCode, KeyEvent event) {
-		if (event.getAction() == KeyEvent.KEYCODE_MENU|| event.getAction() == KeyEvent.KEYCODE_BACK) {
-			final int drawerState = mDrawer.getDrawerState();
-			if (drawerState == MenuDrawer.STATE_OPEN || drawerState == MenuDrawer.STATE_OPENING) {
-				mDrawer.closeMenu();
-				return true;
-			}
-			mDrawer.openMenu();
-			return true;
-		}
-		return false;
-	}
-}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java
index 1df812b830..d7132a4aff 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java
@@ -55,8 +55,8 @@ public class InputConfigActivity extends ListActivity {
 		Input.add(a++, new InputConfigItem("Trigger L", "Android-InputL"));
 		Input.add(a++, new InputConfigItem("Trigger R", "Android-InputR"));
 
-		adapter = new InputConfigAdapter(this,R.layout.folderbrowser, Input);
-		this.setListAdapter(adapter);
+		adapter = new InputConfigAdapter(this, R.layout.folderbrowser, Input);
+		setListAdapter(adapter);
 	}
 	@Override
 	protected void onListItemClick(ListView l, View v, int position, long id) {
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigAdapter.java
index 4430126d46..b0984dd08a 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigAdapter.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigAdapter.java
@@ -40,8 +40,8 @@ public class InputConfigAdapter extends ArrayAdapter<InputConfigItem> {
 		}
 		final InputConfigItem o = items.get(position);
 		if (o != null) {
-			TextView t1 = (TextView) v.findViewById(R.id.TextView01);
-			TextView t2 = (TextView) v.findViewById(R.id.TextView02);
+			TextView t1 = (TextView) v.findViewById(R.id.FolderTitle);
+			TextView t2 = (TextView) v.findViewById(R.id.FolderSubTitle);
 
 			if(t1!=null)
 				t1.setText(o.getName());
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java
index e1c0ed5e31..599ce5007a 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java
@@ -1,7 +1,5 @@
 package org.dolphinemu.dolphinemu;
 
-import java.util.List;
-
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -9,6 +7,8 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
+import java.util.List;
+
 public class SideMenuAdapter extends ArrayAdapter<SideMenuItem>{
 
 	private Context c;
@@ -35,7 +35,7 @@ public class SideMenuAdapter extends ArrayAdapter<SideMenuItem>{
               }
               final SideMenuItem o = items.get(position);
               if (o != null) {
-                      TextView t1 = (TextView) v.findViewById(R.id.TextView01);
+                      TextView t1 = (TextView) v.findViewById(R.id.SideMenuTitle);
                       
                       if(t1!=null)
                       	t1.setText(o.getName());
diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
index 940f05d811..6207ac70d3 100644
--- a/Source/Core/DolphinWX/CMakeLists.txt
+++ b/Source/Core/DolphinWX/CMakeLists.txt
@@ -174,7 +174,10 @@ if(ANDROID)
 	"-Wl,--no-whole-archive"
 	)
 	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
-		COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/libs/armeabi-v7a/lib${DOLPHIN_EXE}.so ${CMAKE_SOURCE_DIR}/Source/Android/libs/armeabi-v7a
+		COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/libs/armeabi-v7a/
+	)
+	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
+		COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/libs/armeabi-v7a/lib${DOLPHIN_EXE}.so ${CMAKE_SOURCE_DIR}/Source/Android/libs/armeabi-v7a/
 	)
 else()
 	add_executable(${DOLPHIN_EXE} ${SRCS})

From d86185ca544abc34cc7dcedf90a04b5c2d0542a2 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sat, 22 Jun 2013 08:06:39 -0500
Subject: [PATCH 183/352] [Android] Fix ant build?

---
 Source/Android/.idea/workspace.xml | 84 +++++++++++++++++-------------
 Source/Android/project.properties  |  1 -
 2 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index 7fde93f443..dd3a4d6818 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -100,19 +100,19 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="DolphinEmulator.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
+      <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/build.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="17" column="13" selection-start="433" selection-end="433" vertical-scroll-proportion="0.0" vertical-offset="240" max-vertical-offset="3045">
+            <state line="26" column="0" selection-start="1180" selection-end="1180" vertical-scroll-proportion="0.0" vertical-offset="765" max-vertical-offset="1470">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="GameListActivity.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
+      <file leaf-file-name="project.properties" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/project.properties">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="173" column="64" selection-start="5829" selection-end="5829" vertical-scroll-proportion="-2.3393178" vertical-offset="3478" max-vertical-offset="4035">
+            <state line="13" column="17" selection-start="562" selection-end="562" vertical-scroll-proportion="0.34210527" vertical-offset="0" max-vertical-offset="570">
               <folding />
             </state>
           </provider>
@@ -141,7 +141,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/res/layout/newmain.xml" />
         <option value="$PROJECT_DIR$/res/layout/activity_main.xml" />
         <option value="$PROJECT_DIR$/res/layout/gamelist_listview.xml" />
         <option value="$PROJECT_DIR$/res/layout/gamelist_layout.xml" />
@@ -157,6 +156,7 @@
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java" />
         <option value="$PROJECT_DIR$/res/layout/folderbrowser.xml" />
+        <option value="$PROJECT_DIR$/project.properties" />
       </list>
     </option>
   </component>
@@ -256,6 +256,24 @@
               <option name="myItemId" value="" />
               <option name="myItemType" value="" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="libs">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
@@ -478,11 +496,11 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="24" y="0" width="1342" height="744" extended-state="0" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
       <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21406491" sideWeight="0.70302016" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21406491" sideWeight="0.70302016" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" />
@@ -593,26 +611,6 @@
     <breakpoint-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/res/layout/gamelist_activity.xml">
-      <provider editor-type-id="android-designer">
-        <state />
-      </provider>
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="545">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/res/layout/gamelist_listview.xml">
-      <provider editor-type-id="android-designer">
-        <state />
-      </provider>
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="1" column="29" selection-start="98" selection-end="98" vertical-scroll-proportion="0.040871933" vertical-offset="0" max-vertical-offset="367">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="43" column="40" selection-start="1231" selection-end="1231" vertical-scroll-proportion="0.6505102" vertical-offset="285" max-vertical-offset="780">
@@ -648,13 +646,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="17" column="13" selection-start="433" selection-end="433" vertical-scroll-proportion="0.0" vertical-offset="2293" max-vertical-offset="2850">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/res/layout/gamelist_layout.xml">
       <provider editor-type-id="android-designer">
         <state />
@@ -715,6 +706,27 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="17" column="13" selection-start="433" selection-end="433" vertical-scroll-proportion="0.026929982" vertical-offset="45" max-vertical-offset="2850">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="26" column="0" selection-start="1180" selection-end="1180" vertical-scroll-proportion="0.0" vertical-offset="765" max-vertical-offset="1470">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/project.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="13" column="17" selection-start="562" selection-end="562" vertical-scroll-proportion="0.34210527" vertical-offset="0" max-vertical-offset="570">
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/Source/Android/project.properties b/Source/Android/project.properties
index 91be165ce3..a3ee5ab64f 100644
--- a/Source/Android/project.properties
+++ b/Source/Android/project.properties
@@ -12,4 +12,3 @@
 
 # Project target.
 target=android-17
-android.library.reference.1=../../Externals/android-menudrawer/library

From 88d1195f9392cf18d5ef9d390ae0ab85e6dc0858 Mon Sep 17 00:00:00 2001
From: Tetsuo55 <akira146@hotmail.com>
Date: Sat, 22 Jun 2013 17:39:46 +0200
Subject: [PATCH 184/352] update zlib to v1.2.8

---
 Externals/zlib/CMakeLists.txt | 264 +++++++++++++++++++--
 Externals/zlib/ChangeLog      | 266 ++++++++++++++++++++-
 Externals/zlib/adler32.c      |  68 +++---
 Externals/zlib/compress.c     |   2 +-
 Externals/zlib/crc32.c        |  83 +++----
 Externals/zlib/crc32.h        |   2 +-
 Externals/zlib/deflate.c      | 261 +++++++++++++++-----
 Externals/zlib/deflate.h      |  12 +-
 Externals/zlib/gzguts.h       | 103 +++++++-
 Externals/zlib/gzlib.c        | 197 ++++++++++++----
 Externals/zlib/gzread.c       | 431 +++++++++++++++-------------------
 Externals/zlib/gzwrite.c      | 196 ++++++++++------
 Externals/zlib/infback.c      |  16 +-
 Externals/zlib/inffast.c      |   6 +-
 Externals/zlib/inffixed.h     |   6 +-
 Externals/zlib/inflate.c      | 136 +++++++----
 Externals/zlib/inftrees.c     |  54 ++---
 Externals/zlib/trees.c        |  54 ++---
 Externals/zlib/uncompr.c      |   2 +-
 Externals/zlib/zconf.h        | 201 +++++++++++-----
 Externals/zlib/zlib.h         | 343 +++++++++++++++++++--------
 Externals/zlib/zutil.c        |  26 +-
 Externals/zlib/zutil.h        | 103 ++++----
 23 files changed, 1920 insertions(+), 912 deletions(-)

diff --git a/Externals/zlib/CMakeLists.txt b/Externals/zlib/CMakeLists.txt
index 4d3d353479..0c0247cc51 100644
--- a/Externals/zlib/CMakeLists.txt
+++ b/Externals/zlib/CMakeLists.txt
@@ -1,17 +1,249 @@
-set(SRCS	adler32.c
-			compress.c
-			crc32.c
-			deflate.c
-			gzclose.c
-			gzlib.c
-			gzread.c
-			gzwrite.c
-			infback.c
-			inffast.c
-			inflate.c
-			inftrees.c
-			trees.c
-			uncompr.c
-			zutil.c)
+cmake_minimum_required(VERSION 2.4.4)
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
-add_library(z STATIC ${SRCS})
+project(zlib C)
+
+set(VERSION "1.2.8")
+
+option(ASM686 "Enable building i686 assembly implementation")
+option(AMD64 "Enable building amd64 assembly implementation")
+
+set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
+set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
+set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
+set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
+set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
+
+include(CheckTypeSize)
+include(CheckFunctionExists)
+include(CheckIncludeFile)
+include(CheckCSourceCompiles)
+enable_testing()
+
+check_include_file(sys/types.h HAVE_SYS_TYPES_H)
+check_include_file(stdint.h    HAVE_STDINT_H)
+check_include_file(stddef.h    HAVE_STDDEF_H)
+
+#
+# Check to see if we have large file support
+#
+set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
+# We add these other definitions here because CheckTypeSize.cmake
+# in CMake 2.4.x does not automatically do so and we want
+# compatibility with CMake 2.4.x.
+if(HAVE_SYS_TYPES_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
+endif()
+if(HAVE_STDINT_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
+endif()
+if(HAVE_STDDEF_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
+endif()
+check_type_size(off64_t OFF64_T)
+if(HAVE_OFF64_T)
+   add_definitions(-D_LARGEFILE64_SOURCE=1)
+endif()
+set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
+
+#
+# Check for fseeko
+#
+check_function_exists(fseeko HAVE_FSEEKO)
+if(NOT HAVE_FSEEKO)
+    add_definitions(-DNO_FSEEKO)
+endif()
+
+#
+# Check for unistd.h
+#
+check_include_file(unistd.h Z_HAVE_UNISTD_H)
+
+if(MSVC)
+    set(CMAKE_DEBUG_POSTFIX "d")
+    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+endif()
+
+if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
+    # If we're doing an out of source build and the user has a zconf.h
+    # in their source tree...
+    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
+        message(STATUS "Renaming")
+        message(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h")
+        message(STATUS "to 'zconf.h.included' because this file is included with zlib")
+        message(STATUS "but CMake generates it automatically in the build directory.")
+        file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included)
+  endif()
+endif()
+
+set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
+		${ZLIB_PC} @ONLY)
+configure_file(	${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
+		${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+
+
+#============================================================================
+# zlib
+#============================================================================
+
+set(ZLIB_PUBLIC_HDRS
+    ${CMAKE_CURRENT_BINARY_DIR}/zconf.h
+    zlib.h
+)
+set(ZLIB_PRIVATE_HDRS
+    crc32.h
+    deflate.h
+    gzguts.h
+    inffast.h
+    inffixed.h
+    inflate.h
+    inftrees.h
+    trees.h
+    zutil.h
+)
+set(ZLIB_SRCS
+    adler32.c
+    compress.c
+    crc32.c
+    deflate.c
+    gzclose.c
+    gzlib.c
+    gzread.c
+    gzwrite.c
+    inflate.c
+    infback.c
+    inftrees.c
+    inffast.c
+    trees.c
+    uncompr.c
+    zutil.c
+)
+
+if(NOT MINGW)
+    set(ZLIB_DLL_SRCS
+        win32/zlib1.rc # If present will override custom build rule below.
+    )
+endif()
+
+if(CMAKE_COMPILER_IS_GNUCC)
+    if(ASM686)
+        set(ZLIB_ASMS contrib/asm686/match.S)
+    elseif (AMD64)
+        set(ZLIB_ASMS contrib/amd64/amd64-match.S)
+    endif ()
+
+	if(ZLIB_ASMS)
+		add_definitions(-DASMV)
+		set_source_files_properties(${ZLIB_ASMS} PROPERTIES LANGUAGE C COMPILE_FLAGS -DNO_UNDERLINE)
+	endif()
+endif()
+
+if(MSVC)
+    if(ASM686)
+		ENABLE_LANGUAGE(ASM_MASM)
+        set(ZLIB_ASMS
+			contrib/masmx86/inffas32.asm
+			contrib/masmx86/match686.asm
+		)
+    elseif (AMD64)
+		ENABLE_LANGUAGE(ASM_MASM)
+        set(ZLIB_ASMS
+			contrib/masmx64/gvmat64.asm
+			contrib/masmx64/inffasx64.asm
+		)
+    endif()
+
+	if(ZLIB_ASMS)
+		add_definitions(-DASMV -DASMINF)
+	endif()
+endif()
+
+# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
+string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
+    "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
+
+if(MINGW)
+    # This gets us DLL resource information when compiling on MinGW.
+    if(NOT CMAKE_RC_COMPILER)
+        set(CMAKE_RC_COMPILER windres.exe)
+    endif()
+
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+                       COMMAND ${CMAKE_RC_COMPILER}
+                            -D GCC_WINDRES
+                            -I ${CMAKE_CURRENT_SOURCE_DIR}
+                            -I ${CMAKE_CURRENT_BINARY_DIR}
+                            -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+                            -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
+    set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
+endif(MINGW)
+
+add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
+set_target_properties(zlib PROPERTIES SOVERSION 1)
+
+if(NOT CYGWIN)
+    # This property causes shared libraries on Linux to have the full version
+    # encoded into their final filename.  We disable this on Cygwin because
+    # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
+    # seems to be the default.
+    #
+    # This has no effect with MSVC, on that platform the version info for
+    # the DLL comes from the resource file win32/zlib1.rc
+    set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
+endif()
+
+if(UNIX)
+    # On unix-like platforms the library is almost always called libz
+   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
+   if(NOT APPLE)
+     set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
+   endif()
+elseif(BUILD_SHARED_LIBS AND WIN32)
+    # Creates zlib1.dll when building shared library version
+    set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
+endif()
+
+if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
+    install(TARGETS zlib zlibstatic
+        RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
+        ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
+        LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
+endif()
+if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
+    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}")
+endif()
+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+    install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3")
+endif()
+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+    install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
+endif()
+
+#============================================================================
+# Example binaries
+#============================================================================
+
+add_executable(example test/example.c)
+target_link_libraries(example zlib)
+add_test(example example)
+
+add_executable(minigzip test/minigzip.c)
+target_link_libraries(minigzip zlib)
+
+if(HAVE_OFF64_T)
+    add_executable(example64 test/example.c)
+    target_link_libraries(example64 zlib)
+    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+    add_test(example64 example64)
+
+    add_executable(minigzip64 test/minigzip.c)
+    target_link_libraries(minigzip64 zlib)
+    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+endif()
diff --git a/Externals/zlib/ChangeLog b/Externals/zlib/ChangeLog
index f310bb0fcd..f22aabaef5 100644
--- a/Externals/zlib/ChangeLog
+++ b/Externals/zlib/ChangeLog
@@ -1,12 +1,276 @@
 
                 ChangeLog file for zlib
 
+Changes in 1.2.8 (28 Apr 2013)
+- Update contrib/minizip/iowin32.c for Windows RT [Vollant]
+- Do not force Z_CONST for C++
+- Clean up contrib/vstudio [Ro§]
+- Correct spelling error in zlib.h
+- Fix mixed line endings in contrib/vstudio
+
+Changes in 1.2.7.3 (13 Apr 2013)
+- Fix version numbers and DLL names in contrib/vstudio/*/zlib.rc
+
+Changes in 1.2.7.2 (13 Apr 2013)
+- Change check for a four-byte type back to hexadecimal
+- Fix typo in win32/Makefile.msc
+- Add casts in gzwrite.c for pointer differences
+
+Changes in 1.2.7.1 (24 Mar 2013)
+- Replace use of unsafe string functions with snprintf if available
+- Avoid including stddef.h on Windows for Z_SOLO compile [Niessink]
+- Fix gzgetc undefine when Z_PREFIX set [Turk]
+- Eliminate use of mktemp in Makefile (not always available)
+- Fix bug in 'F' mode for gzopen()
+- Add inflateGetDictionary() function
+- Correct comment in deflate.h
+- Use _snprintf for snprintf in Microsoft C
+- On Darwin, only use /usr/bin/libtool if libtool is not Apple
+- Delete "--version" file if created by "ar --version" [Richard G.]
+- Fix configure check for veracity of compiler error return codes
+- Fix CMake compilation of static lib for MSVC2010 x64
+- Remove unused variable in infback9.c
+- Fix argument checks in gzlog_compress() and gzlog_write()
+- Clean up the usage of z_const and respect const usage within zlib
+- Clean up examples/gzlog.[ch] comparisons of different types
+- Avoid shift equal to bits in type (caused endless loop)
+- Fix unintialized value bug in gzputc() introduced by const patches
+- Fix memory allocation error in examples/zran.c [Nor]
+- Fix bug where gzopen(), gzclose() would write an empty file
+- Fix bug in gzclose() when gzwrite() runs out of memory
+- Check for input buffer malloc failure in examples/gzappend.c
+- Add note to contrib/blast to use binary mode in stdio
+- Fix comparisons of differently signed integers in contrib/blast
+- Check for invalid code length codes in contrib/puff
+- Fix serious but very rare decompression bug in inftrees.c
+- Update inflateBack() comments, since inflate() can be faster
+- Use underscored I/O function names for WINAPI_FAMILY
+- Add _tr_flush_bits to the external symbols prefixed by --zprefix
+- Add contrib/vstudio/vc10 pre-build step for static only
+- Quote --version-script argument in CMakeLists.txt
+- Don't specify --version-script on Apple platforms in CMakeLists.txt
+- Fix casting error in contrib/testzlib/testzlib.c
+- Fix types in contrib/minizip to match result of get_crc_table()
+- Simplify contrib/vstudio/vc10 with 'd' suffix
+- Add TOP support to win32/Makefile.msc
+- Suport i686 and amd64 assembler builds in CMakeLists.txt
+- Fix typos in the use of _LARGEFILE64_SOURCE in zconf.h
+- Add vc11 and vc12 build files to contrib/vstudio
+- Add gzvprintf() as an undocumented function in zlib
+- Fix configure for Sun shell
+- Remove runtime check in configure for four-byte integer type
+- Add casts and consts to ease user conversion to C++
+- Add man pages for minizip and miniunzip
+- In Makefile uninstall, don't rm if preceding cd fails
+- Do not return Z_BUF_ERROR if deflateParam() has nothing to write
+
+Changes in 1.2.7 (2 May 2012)
+- Replace use of memmove() with a simple copy for portability
+- Test for existence of strerror
+- Restore gzgetc_ for backward compatibility with 1.2.6
+- Fix build with non-GNU make on Solaris
+- Require gcc 4.0 or later on Mac OS X to use the hidden attribute
+- Include unistd.h for Watcom C
+- Use __WATCOMC__ instead of __WATCOM__
+- Do not use the visibility attribute if NO_VIZ defined
+- Improve the detection of no hidden visibility attribute
+- Avoid using __int64 for gcc or solo compilation
+- Cast to char * in gzprintf to avoid warnings [Zinser]
+- Fix make_vms.com for VAX [Zinser]
+- Don't use library or built-in byte swaps
+- Simplify test and use of gcc hidden attribute
+- Fix bug in gzclose_w() when gzwrite() fails to allocate memory
+- Add "x" (O_EXCL) and "e" (O_CLOEXEC) modes support to gzopen()
+- Fix bug in test/minigzip.c for configure --solo
+- Fix contrib/vstudio project link errors [Mohanathas]
+- Add ability to choose the builder in make_vms.com [Schweda]
+- Add DESTDIR support to mingw32 win32/Makefile.gcc
+- Fix comments in win32/Makefile.gcc for proper usage
+- Allow overriding the default install locations for cmake
+- Generate and install the pkg-config file with cmake
+- Build both a static and a shared version of zlib with cmake
+- Include version symbols for cmake builds
+- If using cmake with MSVC, add the source directory to the includes
+- Remove unneeded EXTRA_CFLAGS from win32/Makefile.gcc [Truta]
+- Move obsolete emx makefile to old [Truta]
+- Allow the use of -Wundef when compiling or using zlib
+- Avoid the use of the -u option with mktemp
+- Improve inflate() documentation on the use of Z_FINISH
+- Recognize clang as gcc
+- Add gzopen_w() in Windows for wide character path names
+- Rename zconf.h in CMakeLists.txt to move it out of the way
+- Add source directory in CMakeLists.txt for building examples
+- Look in build directory for zlib.pc in CMakeLists.txt
+- Remove gzflags from zlibvc.def in vc9 and vc10
+- Fix contrib/minizip compilation in the MinGW environment
+- Update ./configure for Solaris, support --64 [Mooney]
+- Remove -R. from Solaris shared build (possible security issue)
+- Avoid race condition for parallel make (-j) running example
+- Fix type mismatch between get_crc_table() and crc_table
+- Fix parsing of version with "-" in CMakeLists.txt [Snider, Ziegler]
+- Fix the path to zlib.map in CMakeLists.txt
+- Force the native libtool in Mac OS X to avoid GNU libtool [Beebe]
+- Add instructions to win32/Makefile.gcc for shared install [Torri]
+
+Changes in 1.2.6.1 (12 Feb 2012)
+- Avoid the use of the Objective-C reserved name "id"
+- Include io.h in gzguts.h for Microsoft compilers
+- Fix problem with ./configure --prefix and gzgetc macro
+- Include gz_header definition when compiling zlib solo
+- Put gzflags() functionality back in zutil.c
+- Avoid library header include in crc32.c for Z_SOLO
+- Use name in GCC_CLASSIC as C compiler for coverage testing, if set
+- Minor cleanup in contrib/minizip/zip.c [Vollant]
+- Update make_vms.com [Zinser]
+- Remove unnecessary gzgetc_ function
+- Use optimized byte swap operations for Microsoft and GNU [Snyder]
+- Fix minor typo in zlib.h comments [Rzesniowiecki]
+
+Changes in 1.2.6 (29 Jan 2012)
+- Update the Pascal interface in contrib/pascal
+- Fix function numbers for gzgetc_ in zlibvc.def files
+- Fix configure.ac for contrib/minizip [Schiffer]
+- Fix large-entry detection in minizip on 64-bit systems [Schiffer]
+- Have ./configure use the compiler return code for error indication
+- Fix CMakeLists.txt for cross compilation [McClure]
+- Fix contrib/minizip/zip.c for 64-bit architectures [Dalsnes]
+- Fix compilation of contrib/minizip on FreeBSD [Marquez]
+- Correct suggested usages in win32/Makefile.msc [Shachar, Horvath]
+- Include io.h for Turbo C / Borland C on all platforms [Truta]
+- Make version explicit in contrib/minizip/configure.ac [Bosmans]
+- Avoid warning for no encryption in contrib/minizip/zip.c [Vollant]
+- Minor cleanup up contrib/minizip/unzip.c [Vollant]
+- Fix bug when compiling minizip with C++ [Vollant]
+- Protect for long name and extra fields in contrib/minizip [Vollant]
+- Avoid some warnings in contrib/minizip [Vollant]
+- Add -I../.. -L../.. to CFLAGS for minizip and miniunzip
+- Add missing libs to minizip linker command
+- Add support for VPATH builds in contrib/minizip
+- Add an --enable-demos option to contrib/minizip/configure
+- Add the generation of configure.log by ./configure
+- Exit when required parameters not provided to win32/Makefile.gcc
+- Have gzputc return the character written instead of the argument
+- Use the -m option on ldconfig for BSD systems [Tobias]
+- Correct in zlib.map when deflateResetKeep was added
+
+Changes in 1.2.5.3 (15 Jan 2012)
+- Restore gzgetc function for binary compatibility
+- Do not use _lseeki64 under Borland C++ [Truta]
+- Update win32/Makefile.msc to build test/*.c [Truta]
+- Remove old/visualc6 given CMakefile and other alternatives
+- Update AS400 build files and documentation [Monnerat]
+- Update win32/Makefile.gcc to build test/*.c [Truta]
+- Permit stronger flushes after Z_BLOCK flushes
+- Avoid extraneous empty blocks when doing empty flushes
+- Permit Z_NULL arguments to deflatePending
+- Allow deflatePrime() to insert bits in the middle of a stream
+- Remove second empty static block for Z_PARTIAL_FLUSH
+- Write out all of the available bits when using Z_BLOCK
+- Insert the first two strings in the hash table after a flush
+
+Changes in 1.2.5.2 (17 Dec 2011)
+- fix ld error: unable to find version dependency 'ZLIB_1.2.5'
+- use relative symlinks for shared libs
+- Avoid searching past window for Z_RLE strategy
+- Assure that high-water mark initialization is always applied in deflate
+- Add assertions to fill_window() in deflate.c to match comments
+- Update python link in README
+- Correct spelling error in gzread.c
+- Fix bug in gzgets() for a concatenated empty gzip stream
+- Correct error in comment for gz_make()
+- Change gzread() and related to ignore junk after gzip streams
+- Allow gzread() and related to continue after gzclearerr()
+- Allow gzrewind() and gzseek() after a premature end-of-file
+- Simplify gzseek() now that raw after gzip is ignored
+- Change gzgetc() to a macro for speed (~40% speedup in testing)
+- Fix gzclose() to return the actual error last encountered
+- Always add large file support for windows
+- Include zconf.h for windows large file support
+- Include zconf.h.cmakein for windows large file support
+- Update zconf.h.cmakein on make distclean
+- Merge vestigial vsnprintf determination from zutil.h to gzguts.h
+- Clarify how gzopen() appends in zlib.h comments
+- Correct documentation of gzdirect() since junk at end now ignored
+- Add a transparent write mode to gzopen() when 'T' is in the mode
+- Update python link in zlib man page
+- Get inffixed.h and MAKEFIXED result to match
+- Add a ./config --solo option to make zlib subset with no libary use
+- Add undocumented inflateResetKeep() function for CAB file decoding
+- Add --cover option to ./configure for gcc coverage testing
+- Add #define ZLIB_CONST option to use const in the z_stream interface
+- Add comment to gzdopen() in zlib.h to use dup() when using fileno()
+- Note behavior of uncompress() to provide as much data as it can
+- Add files in contrib/minizip to aid in building libminizip
+- Split off AR options in Makefile.in and configure
+- Change ON macro to Z_ARG to avoid application conflicts
+- Facilitate compilation with Borland C++ for pragmas and vsnprintf
+- Include io.h for Turbo C / Borland C++
+- Move example.c and minigzip.c to test/
+- Simplify incomplete code table filling in inflate_table()
+- Remove code from inflate.c and infback.c that is impossible to execute
+- Test the inflate code with full coverage
+- Allow deflateSetDictionary, inflateSetDictionary at any time (in raw)
+- Add deflateResetKeep and fix inflateResetKeep to retain dictionary
+- Fix gzwrite.c to accommodate reduced memory zlib compilation
+- Have inflate() with Z_FINISH avoid the allocation of a window
+- Do not set strm->adler when doing raw inflate
+- Fix gzeof() to behave just like feof() when read is not past end of file
+- Fix bug in gzread.c when end-of-file is reached
+- Avoid use of Z_BUF_ERROR in gz* functions except for premature EOF
+- Document gzread() capability to read concurrently written files
+- Remove hard-coding of resource compiler in CMakeLists.txt [Blammo]
+
+Changes in 1.2.5.1 (10 Sep 2011)
+- Update FAQ entry on shared builds (#13)
+- Avoid symbolic argument to chmod in Makefile.in
+- Fix bug and add consts in contrib/puff [Oberhumer]
+- Update contrib/puff/zeros.raw test file to have all block types
+- Add full coverage test for puff in contrib/puff/Makefile
+- Fix static-only-build install in Makefile.in
+- Fix bug in unzGetCurrentFileInfo() in contrib/minizip [Kuno]
+- Add libz.a dependency to shared in Makefile.in for parallel builds
+- Spell out "number" (instead of "nb") in zlib.h for total_in, total_out
+- Replace $(...) with `...` in configure for non-bash sh [Bowler]
+- Add darwin* to Darwin* and solaris* to SunOS\ 5* in configure [Groffen]
+- Add solaris* to Linux* in configure to allow gcc use [Groffen]
+- Add *bsd* to Linux* case in configure [Bar-Lev]
+- Add inffast.obj to dependencies in win32/Makefile.msc
+- Correct spelling error in deflate.h [Kohler]
+- Change libzdll.a again to libz.dll.a (!) in win32/Makefile.gcc
+- Add test to configure for GNU C looking for gcc in output of $cc -v
+- Add zlib.pc generation to win32/Makefile.gcc [Weigelt]
+- Fix bug in zlib.h for _FILE_OFFSET_BITS set and _LARGEFILE64_SOURCE not
+- Add comment in zlib.h that adler32_combine with len2 < 0 makes no sense
+- Make NO_DIVIDE option in adler32.c much faster (thanks to John Reiser)
+- Make stronger test in zconf.h to include unistd.h for LFS
+- Apply Darwin patches for 64-bit file offsets to contrib/minizip [Slack]
+- Fix zlib.h LFS support when Z_PREFIX used
+- Add updated as400 support (removed from old) [Monnerat]
+- Avoid deflate sensitivity to volatile input data
+- Avoid division in adler32_combine for NO_DIVIDE
+- Clarify the use of Z_FINISH with deflateBound() amount of space
+- Set binary for output file in puff.c
+- Use u4 type for crc_table to avoid conversion warnings
+- Apply casts in zlib.h to avoid conversion warnings
+- Add OF to prototypes for adler32_combine_ and crc32_combine_ [Miller]
+- Improve inflateSync() documentation to note indeterminancy
+- Add deflatePending() function to return the amount of pending output
+- Correct the spelling of "specification" in FAQ [Randers-Pehrson]
+- Add a check in configure for stdarg.h, use for gzprintf()
+- Check that pointers fit in ints when gzprint() compiled old style
+- Add dummy name before $(SHAREDLIBV) in Makefile [Bar-Lev, Bowler]
+- Delete line in configure that adds -L. libz.a to LDFLAGS [Weigelt]
+- Add debug records in assmebler code [Londer]
+- Update RFC references to use http://tools.ietf.org/html/... [Li]
+- Add --archs option, use of libtool to configure for Mac OS X [Borstel]
+
 Changes in 1.2.5 (19 Apr 2010)
 - Disable visibility attribute in win32/Makefile.gcc [Bar-Lev]
 - Default to libdir as sharedlibdir in configure [Nieder]
 - Update copyright dates on modified source files
 - Update trees.c to be able to generate modified trees.h
 - Exit configure for MinGW, suggesting win32/Makefile.gcc
+- Check for NULL path in gz_open [Homurlu]
 
 Changes in 1.2.4.5 (18 Apr 2010)
 - Set sharedlibdir in configure [Torok]
@@ -261,7 +525,7 @@ Changes in 1.2.3.4 (21 Dec 2009)
 - Clear bytes after deflate lookahead to avoid use of uninitialized data
 - Change a limit in inftrees.c to be more transparent to Coverity Prevent
 - Update win32/zlib.def with exported symbols from zlib.h
-- Correct spelling error in zlib.h [Willem]
+- Correct spelling errors in zlib.h [Willem, Sobrado]
 - Allow Z_BLOCK for deflate() to force a new block
 - Allow negative bits in inflatePrime() to delete existing bit buffer
 - Add Z_TREES flush option to inflate() to return at end of trees
diff --git a/Externals/zlib/adler32.c b/Externals/zlib/adler32.c
index 65ad6a5adc..a868f073d8 100644
--- a/Externals/zlib/adler32.c
+++ b/Externals/zlib/adler32.c
@@ -1,5 +1,5 @@
 /* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2007 Mark Adler
+ * Copyright (C) 1995-2011 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,9 +9,9 @@
 
 #define local static
 
-local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2);
+local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
 
-#define BASE 65521UL    /* largest prime smaller than 65536 */
+#define BASE 65521      /* largest prime smaller than 65536 */
 #define NMAX 5552
 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
 
@@ -21,39 +21,44 @@ local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2);
 #define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
 #define DO16(buf)   DO8(buf,0); DO8(buf,8);
 
-/* use NO_DIVIDE if your processor does not do division in hardware */
+/* use NO_DIVIDE if your processor does not do division in hardware --
+   try it both ways to see which is faster */
 #ifdef NO_DIVIDE
-#  define MOD(a) \
+/* note that this assumes BASE is 65521, where 65536 % 65521 == 15
+   (thank you to John Reiser for pointing this out) */
+#  define CHOP(a) \
     do { \
-        if (a >= (BASE << 16)) a -= (BASE << 16); \
-        if (a >= (BASE << 15)) a -= (BASE << 15); \
-        if (a >= (BASE << 14)) a -= (BASE << 14); \
-        if (a >= (BASE << 13)) a -= (BASE << 13); \
-        if (a >= (BASE << 12)) a -= (BASE << 12); \
-        if (a >= (BASE << 11)) a -= (BASE << 11); \
-        if (a >= (BASE << 10)) a -= (BASE << 10); \
-        if (a >= (BASE << 9)) a -= (BASE << 9); \
-        if (a >= (BASE << 8)) a -= (BASE << 8); \
-        if (a >= (BASE << 7)) a -= (BASE << 7); \
-        if (a >= (BASE << 6)) a -= (BASE << 6); \
-        if (a >= (BASE << 5)) a -= (BASE << 5); \
-        if (a >= (BASE << 4)) a -= (BASE << 4); \
-        if (a >= (BASE << 3)) a -= (BASE << 3); \
-        if (a >= (BASE << 2)) a -= (BASE << 2); \
-        if (a >= (BASE << 1)) a -= (BASE << 1); \
+        unsigned long tmp = a >> 16; \
+        a &= 0xffffUL; \
+        a += (tmp << 4) - tmp; \
+    } while (0)
+#  define MOD28(a) \
+    do { \
+        CHOP(a); \
         if (a >= BASE) a -= BASE; \
     } while (0)
-#  define MOD4(a) \
+#  define MOD(a) \
     do { \
-        if (a >= (BASE << 4)) a -= (BASE << 4); \
-        if (a >= (BASE << 3)) a -= (BASE << 3); \
-        if (a >= (BASE << 2)) a -= (BASE << 2); \
-        if (a >= (BASE << 1)) a -= (BASE << 1); \
+        CHOP(a); \
+        MOD28(a); \
+    } while (0)
+#  define MOD63(a) \
+    do { /* this assumes a is not negative */ \
+        z_off64_t tmp = a >> 32; \
+        a &= 0xffffffffL; \
+        a += (tmp << 8) - (tmp << 5) + tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
         if (a >= BASE) a -= BASE; \
     } while (0)
 #else
 #  define MOD(a) a %= BASE
-#  define MOD4(a) a %= BASE
+#  define MOD28(a) a %= BASE
+#  define MOD63(a) a %= BASE
 #endif
 
 /* ========================================================================= */
@@ -92,7 +97,7 @@ uLong ZEXPORT adler32(adler, buf, len)
         }
         if (adler >= BASE)
             adler -= BASE;
-        MOD4(sum2);             /* only added so many BASE's */
+        MOD28(sum2);            /* only added so many BASE's */
         return adler | (sum2 << 16);
     }
 
@@ -137,8 +142,13 @@ local uLong adler32_combine_(adler1, adler2, len2)
     unsigned long sum2;
     unsigned rem;
 
+    /* for negative len, return invalid adler32 as a clue for debugging */
+    if (len2 < 0)
+        return 0xffffffffUL;
+
     /* the derivation of this formula is left as an exercise for the reader */
-    rem = (unsigned)(len2 % BASE);
+    MOD63(len2);                /* assumes len2 >= 0 */
+    rem = (unsigned)len2;
     sum1 = adler1 & 0xffff;
     sum2 = rem * sum1;
     MOD(sum2);
diff --git a/Externals/zlib/compress.c b/Externals/zlib/compress.c
index ea4dfbe9d7..6e9762676a 100644
--- a/Externals/zlib/compress.c
+++ b/Externals/zlib/compress.c
@@ -29,7 +29,7 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
     z_stream stream;
     int err;
 
-    stream.next_in = (Bytef*)source;
+    stream.next_in = (z_const Bytef *)source;
     stream.avail_in = (uInt)sourceLen;
 #ifdef MAXSEG_64K
     /* Check for source > 64K on 16-bit machine: */
diff --git a/Externals/zlib/crc32.c b/Externals/zlib/crc32.c
index 91be372d22..979a7190a3 100644
--- a/Externals/zlib/crc32.c
+++ b/Externals/zlib/crc32.c
@@ -1,5 +1,5 @@
 /* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010 Mark Adler
+ * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  *
  * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
@@ -17,6 +17,8 @@
   of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
   first call get_crc_table() to initialize the tables before allowing more than
   one thread to use crc32().
+
+  DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
  */
 
 #ifdef MAKECRCH
@@ -30,31 +32,11 @@
 
 #define local static
 
-/* Find a four-byte integer type for crc32_little() and crc32_big(). */
-#ifndef NOBYFOUR
-#  ifdef STDC           /* need ANSI C limits.h to determine sizes */
-#    include <limits.h>
-#    define BYFOUR
-#    if (UINT_MAX == 0xffffffffUL)
-       typedef unsigned int u4;
-#    else
-#      if (ULONG_MAX == 0xffffffffUL)
-         typedef unsigned long u4;
-#      else
-#        if (USHRT_MAX == 0xffffffffUL)
-           typedef unsigned short u4;
-#        else
-#          undef BYFOUR     /* can't find a four-byte integer type! */
-#        endif
-#      endif
-#    endif
-#  endif /* STDC */
-#endif /* !NOBYFOUR */
-
 /* Definitions for doing the crc four data bytes at a time. */
+#if !defined(NOBYFOUR) && defined(Z_U4)
+#  define BYFOUR
+#endif
 #ifdef BYFOUR
-#  define REV(w) ((((w)>>24)&0xff)+(((w)>>8)&0xff00)+ \
-                (((w)&0xff00)<<8)+(((w)&0xff)<<24))
    local unsigned long crc32_little OF((unsigned long,
                         const unsigned char FAR *, unsigned));
    local unsigned long crc32_big OF((unsigned long,
@@ -68,16 +50,16 @@
 local unsigned long gf2_matrix_times OF((unsigned long *mat,
                                          unsigned long vec));
 local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
-local uLong crc32_combine_(uLong crc1, uLong crc2, z_off64_t len2);
+local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
 
 
 #ifdef DYNAMIC_CRC_TABLE
 
 local volatile int crc_table_empty = 1;
-local unsigned long FAR crc_table[TBLS][256];
+local z_crc_t FAR crc_table[TBLS][256];
 local void make_crc_table OF((void));
 #ifdef MAKECRCH
-   local void write_table OF((FILE *, const unsigned long FAR *));
+   local void write_table OF((FILE *, const z_crc_t FAR *));
 #endif /* MAKECRCH */
 /*
   Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
@@ -107,9 +89,9 @@ local void make_crc_table OF((void));
 */
 local void make_crc_table()
 {
-    unsigned long c;
+    z_crc_t c;
     int n, k;
-    unsigned long poly;                 /* polynomial exclusive-or pattern */
+    z_crc_t poly;                       /* polynomial exclusive-or pattern */
     /* terms of polynomial defining this crc (except x^32): */
     static volatile int first = 1;      /* flag to limit concurrent making */
     static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
@@ -121,13 +103,13 @@ local void make_crc_table()
         first = 0;
 
         /* make exclusive-or pattern from polynomial (0xedb88320UL) */
-        poly = 0UL;
-        for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)
-            poly |= 1UL << (31 - p[n]);
+        poly = 0;
+        for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
+            poly |= (z_crc_t)1 << (31 - p[n]);
 
         /* generate a crc for every 8-bit value */
         for (n = 0; n < 256; n++) {
-            c = (unsigned long)n;
+            c = (z_crc_t)n;
             for (k = 0; k < 8; k++)
                 c = c & 1 ? poly ^ (c >> 1) : c >> 1;
             crc_table[0][n] = c;
@@ -138,11 +120,11 @@ local void make_crc_table()
            and then the byte reversal of those as well as the first table */
         for (n = 0; n < 256; n++) {
             c = crc_table[0][n];
-            crc_table[4][n] = REV(c);
+            crc_table[4][n] = ZSWAP32(c);
             for (k = 1; k < 4; k++) {
                 c = crc_table[0][c & 0xff] ^ (c >> 8);
                 crc_table[k][n] = c;
-                crc_table[k + 4][n] = REV(c);
+                crc_table[k + 4][n] = ZSWAP32(c);
             }
         }
 #endif /* BYFOUR */
@@ -164,7 +146,7 @@ local void make_crc_table()
         if (out == NULL) return;
         fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
         fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
-        fprintf(out, "local const unsigned long FAR ");
+        fprintf(out, "local const z_crc_t FAR ");
         fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
         write_table(out, crc_table[0]);
 #  ifdef BYFOUR
@@ -184,12 +166,13 @@ local void make_crc_table()
 #ifdef MAKECRCH
 local void write_table(out, table)
     FILE *out;
-    const unsigned long FAR *table;
+    const z_crc_t FAR *table;
 {
     int n;
 
     for (n = 0; n < 256; n++)
-        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ", table[n],
+        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ",
+                (unsigned long)(table[n]),
                 n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
 }
 #endif /* MAKECRCH */
@@ -204,13 +187,13 @@ local void write_table(out, table)
 /* =========================================================================
  * This function can be used by asm versions of crc32()
  */
-const unsigned long FAR * ZEXPORT get_crc_table()
+const z_crc_t FAR * ZEXPORT get_crc_table()
 {
 #ifdef DYNAMIC_CRC_TABLE
     if (crc_table_empty)
         make_crc_table();
 #endif /* DYNAMIC_CRC_TABLE */
-    return (const unsigned long FAR *)crc_table;
+    return (const z_crc_t FAR *)crc_table;
 }
 
 /* ========================================================================= */
@@ -232,7 +215,7 @@ unsigned long ZEXPORT crc32(crc, buf, len)
 
 #ifdef BYFOUR
     if (sizeof(void *) == sizeof(ptrdiff_t)) {
-        u4 endian;
+        z_crc_t endian;
 
         endian = 1;
         if (*((unsigned char *)(&endian)))
@@ -266,17 +249,17 @@ local unsigned long crc32_little(crc, buf, len)
     const unsigned char FAR *buf;
     unsigned len;
 {
-    register u4 c;
-    register const u4 FAR *buf4;
+    register z_crc_t c;
+    register const z_crc_t FAR *buf4;
 
-    c = (u4)crc;
+    c = (z_crc_t)crc;
     c = ~c;
     while (len && ((ptrdiff_t)buf & 3)) {
         c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
         len--;
     }
 
-    buf4 = (const u4 FAR *)(const void FAR *)buf;
+    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
     while (len >= 32) {
         DOLIT32;
         len -= 32;
@@ -306,17 +289,17 @@ local unsigned long crc32_big(crc, buf, len)
     const unsigned char FAR *buf;
     unsigned len;
 {
-    register u4 c;
-    register const u4 FAR *buf4;
+    register z_crc_t c;
+    register const z_crc_t FAR *buf4;
 
-    c = REV((u4)crc);
+    c = ZSWAP32((z_crc_t)crc);
     c = ~c;
     while (len && ((ptrdiff_t)buf & 3)) {
         c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
         len--;
     }
 
-    buf4 = (const u4 FAR *)(const void FAR *)buf;
+    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
     buf4--;
     while (len >= 32) {
         DOBIG32;
@@ -333,7 +316,7 @@ local unsigned long crc32_big(crc, buf, len)
         c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
     } while (--len);
     c = ~c;
-    return (unsigned long)(REV(c));
+    return (unsigned long)(ZSWAP32(c));
 }
 
 #endif /* BYFOUR */
diff --git a/Externals/zlib/crc32.h b/Externals/zlib/crc32.h
index 8053b6117c..9e0c778102 100644
--- a/Externals/zlib/crc32.h
+++ b/Externals/zlib/crc32.h
@@ -2,7 +2,7 @@
  * Generated automatically by crc32.c
  */
 
-local const unsigned long FAR crc_table[TBLS][256] =
+local const z_crc_t FAR crc_table[TBLS][256] =
 {
   {
     0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
diff --git a/Externals/zlib/deflate.c b/Externals/zlib/deflate.c
index 5c4022f3d4..696957705b 100644
--- a/Externals/zlib/deflate.c
+++ b/Externals/zlib/deflate.c
@@ -1,5 +1,5 @@
 /* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
+ * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -37,7 +37,7 @@
  *  REFERENCES
  *
  *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- *      Available in http://www.ietf.org/rfc/rfc1951.txt
+ *      Available in http://tools.ietf.org/html/rfc1951
  *
  *      A description of the Rabin and Karp algorithm is given in the book
  *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
@@ -52,7 +52,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.2.5 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -155,6 +155,9 @@ local const config configuration_table[10] = {
 struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
 #endif
 
+/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
+#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0))
+
 /* ===========================================================================
  * Update a hash value with the given input byte
  * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
@@ -235,10 +238,19 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
 
     strm->msg = Z_NULL;
     if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
         strm->zalloc = zcalloc;
         strm->opaque = (voidpf)0;
+#endif
     }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zfree = zcfree;
+#endif
 
 #ifdef FASTEST
     if (level != 0) level = 1;
@@ -293,7 +305,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
         s->pending_buf == Z_NULL) {
         s->status = FINISH_STATE;
-        strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
+        strm->msg = ERR_MSG(Z_MEM_ERROR);
         deflateEnd (strm);
         return Z_MEM_ERROR;
     }
@@ -314,43 +326,70 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
     uInt  dictLength;
 {
     deflate_state *s;
-    uInt length = dictLength;
-    uInt n;
-    IPos hash_head = 0;
+    uInt str, n;
+    int wrap;
+    unsigned avail;
+    z_const unsigned char *next;
 
-    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||
-        strm->state->wrap == 2 ||
-        (strm->state->wrap == 1 && strm->state->status != INIT_STATE))
+    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL)
+        return Z_STREAM_ERROR;
+    s = strm->state;
+    wrap = s->wrap;
+    if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)
         return Z_STREAM_ERROR;
 
-    s = strm->state;
-    if (s->wrap)
+    /* when using zlib wrappers, compute Adler-32 for provided dictionary */
+    if (wrap == 1)
         strm->adler = adler32(strm->adler, dictionary, dictLength);
+    s->wrap = 0;                    /* avoid computing Adler-32 in read_buf */
 
-    if (length < MIN_MATCH) return Z_OK;
-    if (length > s->w_size) {
-        length = s->w_size;
-        dictionary += dictLength - length; /* use the tail of the dictionary */
+    /* if dictionary would fill window, just replace the history */
+    if (dictLength >= s->w_size) {
+        if (wrap == 0) {            /* already empty otherwise */
+            CLEAR_HASH(s);
+            s->strstart = 0;
+            s->block_start = 0L;
+            s->insert = 0;
+        }
+        dictionary += dictLength - s->w_size;  /* use the tail */
+        dictLength = s->w_size;
     }
-    zmemcpy(s->window, dictionary, length);
-    s->strstart = length;
-    s->block_start = (long)length;
 
-    /* Insert all strings in the hash table (except for the last two bytes).
-     * s->lookahead stays null, so s->ins_h will be recomputed at the next
-     * call of fill_window.
-     */
-    s->ins_h = s->window[0];
-    UPDATE_HASH(s, s->ins_h, s->window[1]);
-    for (n = 0; n <= length - MIN_MATCH; n++) {
-        INSERT_STRING(s, n, hash_head);
+    /* insert dictionary into window and hash */
+    avail = strm->avail_in;
+    next = strm->next_in;
+    strm->avail_in = dictLength;
+    strm->next_in = (z_const Bytef *)dictionary;
+    fill_window(s);
+    while (s->lookahead >= MIN_MATCH) {
+        str = s->strstart;
+        n = s->lookahead - (MIN_MATCH-1);
+        do {
+            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+            s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+            s->head[s->ins_h] = (Pos)str;
+            str++;
+        } while (--n);
+        s->strstart = str;
+        s->lookahead = MIN_MATCH-1;
+        fill_window(s);
     }
-    if (hash_head) hash_head = 0;  /* to make compiler happy */
+    s->strstart += s->lookahead;
+    s->block_start = (long)s->strstart;
+    s->insert = s->lookahead;
+    s->lookahead = 0;
+    s->match_length = s->prev_length = MIN_MATCH-1;
+    s->match_available = 0;
+    strm->next_in = next;
+    strm->avail_in = avail;
+    s->wrap = wrap;
     return Z_OK;
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateReset (strm)
+int ZEXPORT deflateResetKeep (strm)
     z_streamp strm;
 {
     deflate_state *s;
@@ -380,11 +419,22 @@ int ZEXPORT deflateReset (strm)
     s->last_flush = Z_NO_FLUSH;
 
     _tr_init(s);
-    lm_init(s);
 
     return Z_OK;
 }
 
+/* ========================================================================= */
+int ZEXPORT deflateReset (strm)
+    z_streamp strm;
+{
+    int ret;
+
+    ret = deflateResetKeep(strm);
+    if (ret == Z_OK)
+        lm_init(strm->state);
+    return ret;
+}
+
 /* ========================================================================= */
 int ZEXPORT deflateSetHeader (strm, head)
     z_streamp strm;
@@ -396,15 +446,43 @@ int ZEXPORT deflateSetHeader (strm, head)
     return Z_OK;
 }
 
+/* ========================================================================= */
+int ZEXPORT deflatePending (strm, pending, bits)
+    unsigned *pending;
+    int *bits;
+    z_streamp strm;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    if (pending != Z_NULL)
+        *pending = strm->state->pending;
+    if (bits != Z_NULL)
+        *bits = strm->state->bi_valid;
+    return Z_OK;
+}
+
 /* ========================================================================= */
 int ZEXPORT deflatePrime (strm, bits, value)
     z_streamp strm;
     int bits;
     int value;
 {
+    deflate_state *s;
+    int put;
+
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    strm->state->bi_valid = bits;
-    strm->state->bi_buf = (ush)(value & ((1 << bits) - 1));
+    s = strm->state;
+    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
+        return Z_BUF_ERROR;
+    do {
+        put = Buf_size - s->bi_valid;
+        if (put > bits)
+            put = bits;
+        s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
+        s->bi_valid += put;
+        _tr_flush_bits(s);
+        value >>= put;
+        bits -= put;
+    } while (bits);
     return Z_OK;
 }
 
@@ -435,6 +513,8 @@ int ZEXPORT deflateParams(strm, level, strategy)
         strm->total_in != 0) {
         /* Flush the last buffer: */
         err = deflate(strm, Z_BLOCK);
+        if (err == Z_BUF_ERROR && s->pending == 0)
+            err = Z_OK;
     }
     if (s->level != level) {
         s->level = level;
@@ -562,19 +642,22 @@ local void putShortMSB (s, b)
 local void flush_pending(strm)
     z_streamp strm;
 {
-    unsigned len = strm->state->pending;
+    unsigned len;
+    deflate_state *s = strm->state;
 
+    _tr_flush_bits(s);
+    len = s->pending;
     if (len > strm->avail_out) len = strm->avail_out;
     if (len == 0) return;
 
-    zmemcpy(strm->next_out, strm->state->pending_out, len);
+    zmemcpy(strm->next_out, s->pending_out, len);
     strm->next_out  += len;
-    strm->state->pending_out  += len;
+    s->pending_out  += len;
     strm->total_out += len;
     strm->avail_out  -= len;
-    strm->state->pending -= len;
-    if (strm->state->pending == 0) {
-        strm->state->pending_out = strm->state->pending_buf;
+    s->pending -= len;
+    if (s->pending == 0) {
+        s->pending_out = s->pending_buf;
     }
 }
 
@@ -801,7 +884,7 @@ int ZEXPORT deflate (strm, flush)
      * flushes. For repeated and useless calls with Z_FINISH, we keep
      * returning Z_STREAM_END instead of Z_BUF_ERROR.
      */
-    } else if (strm->avail_in == 0 && flush <= old_flush &&
+    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
                flush != Z_FINISH) {
         ERR_RETURN(strm, Z_BUF_ERROR);
     }
@@ -850,6 +933,7 @@ int ZEXPORT deflate (strm, flush)
                     if (s->lookahead == 0) {
                         s->strstart = 0;
                         s->block_start = 0L;
+                        s->insert = 0;
                     }
                 }
             }
@@ -945,12 +1029,12 @@ int ZEXPORT deflateCopy (dest, source)
 
     ss = source->state;
 
-    zmemcpy(dest, source, sizeof(z_stream));
+    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
 
     ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
     if (ds == Z_NULL) return Z_MEM_ERROR;
     dest->state = (struct internal_state FAR *) ds;
-    zmemcpy(ds, ss, sizeof(deflate_state));
+    zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));
     ds->strm = dest;
 
     ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
@@ -966,8 +1050,8 @@ int ZEXPORT deflateCopy (dest, source)
     }
     /* following zmemcpy do not work for 16-bit MSDOS */
     zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
-    zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));
-    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));
+    zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
+    zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
     zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
 
     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
@@ -1001,15 +1085,15 @@ local int read_buf(strm, buf, size)
 
     strm->avail_in  -= len;
 
+    zmemcpy(buf, strm->next_in, len);
     if (strm->state->wrap == 1) {
-        strm->adler = adler32(strm->adler, strm->next_in, len);
+        strm->adler = adler32(strm->adler, buf, len);
     }
 #ifdef GZIP
     else if (strm->state->wrap == 2) {
-        strm->adler = crc32(strm->adler, strm->next_in, len);
+        strm->adler = crc32(strm->adler, buf, len);
     }
 #endif
-    zmemcpy(buf, strm->next_in, len);
     strm->next_in  += len;
     strm->total_in += len;
 
@@ -1036,6 +1120,7 @@ local void lm_init (s)
     s->strstart = 0;
     s->block_start = 0L;
     s->lookahead = 0;
+    s->insert = 0;
     s->match_length = s->prev_length = MIN_MATCH-1;
     s->match_available = 0;
     s->ins_h = 0;
@@ -1310,6 +1395,8 @@ local void fill_window(s)
     unsigned more;    /* Amount of free space at the end of the window. */
     uInt wsize = s->w_size;
 
+    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
+
     do {
         more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
 
@@ -1362,7 +1449,7 @@ local void fill_window(s)
 #endif
             more += wsize;
         }
-        if (s->strm->avail_in == 0) return;
+        if (s->strm->avail_in == 0) break;
 
         /* If there was no sliding:
          *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
@@ -1381,12 +1468,24 @@ local void fill_window(s)
         s->lookahead += n;
 
         /* Initialize the hash value now that we have some input: */
-        if (s->lookahead >= MIN_MATCH) {
-            s->ins_h = s->window[s->strstart];
-            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
+        if (s->lookahead + s->insert >= MIN_MATCH) {
+            uInt str = s->strstart - s->insert;
+            s->ins_h = s->window[str];
+            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
 #if MIN_MATCH != 3
             Call UPDATE_HASH() MIN_MATCH-3 more times
 #endif
+            while (s->insert) {
+                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+#ifndef FASTEST
+                s->prev[str & s->w_mask] = s->head[s->ins_h];
+#endif
+                s->head[s->ins_h] = (Pos)str;
+                str++;
+                s->insert--;
+                if (s->lookahead + s->insert < MIN_MATCH)
+                    break;
+            }
         }
         /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
          * but this is not important since only literal bytes will be emitted.
@@ -1427,6 +1526,9 @@ local void fill_window(s)
             s->high_water += init;
         }
     }
+
+    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+           "not enough room for search");
 }
 
 /* ===========================================================================
@@ -1506,8 +1608,14 @@ local block_state deflate_stored(s, flush)
             FLUSH_BLOCK(s, 0);
         }
     }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if ((long)s->strstart > s->block_start)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
 }
 
 /* ===========================================================================
@@ -1603,8 +1711,14 @@ local block_state deflate_fast(s, flush)
         }
         if (bflush) FLUSH_BLOCK(s, 0);
     }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
 }
 
 #ifndef FASTEST
@@ -1728,8 +1842,14 @@ local block_state deflate_slow(s, flush)
         _tr_tally_lit(s, s->window[s->strstart-1], bflush);
         s->match_available = 0;
     }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
 }
 #endif /* FASTEST */
 
@@ -1749,11 +1869,11 @@ local block_state deflate_rle(s, flush)
     for (;;) {
         /* Make sure that we always have enough lookahead, except
          * at the end of the input file. We need MAX_MATCH bytes
-         * for the longest encodable run.
+         * for the longest run, plus one for the unrolled loop.
          */
-        if (s->lookahead < MAX_MATCH) {
+        if (s->lookahead <= MAX_MATCH) {
             fill_window(s);
-            if (s->lookahead < MAX_MATCH && flush == Z_NO_FLUSH) {
+            if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) {
                 return need_more;
             }
             if (s->lookahead == 0) break; /* flush the current block */
@@ -1776,6 +1896,7 @@ local block_state deflate_rle(s, flush)
                 if (s->match_length > s->lookahead)
                     s->match_length = s->lookahead;
             }
+            Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
         }
 
         /* Emit match if have run of MIN_MATCH or longer, else emit literal */
@@ -1796,8 +1917,14 @@ local block_state deflate_rle(s, flush)
         }
         if (bflush) FLUSH_BLOCK(s, 0);
     }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
 }
 
 /* ===========================================================================
@@ -1829,6 +1956,12 @@ local block_state deflate_huff(s, flush)
         s->strstart++;
         if (bflush) FLUSH_BLOCK(s, 0);
     }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
+    s->insert = 0;
+    if (flush == Z_FINISH) {
+        FLUSH_BLOCK(s, 1);
+        return finish_done;
+    }
+    if (s->last_lit)
+        FLUSH_BLOCK(s, 0);
+    return block_done;
 }
diff --git a/Externals/zlib/deflate.h b/Externals/zlib/deflate.h
index cbf0d1ea5d..ce0299edd1 100644
--- a/Externals/zlib/deflate.h
+++ b/Externals/zlib/deflate.h
@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2010 Jean-loup Gailly
+ * Copyright (C) 1995-2012 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -48,6 +48,9 @@
 #define MAX_BITS 15
 /* All codes must not exceed MAX_BITS bits */
 
+#define Buf_size 16
+/* size of bit buffer in bi_buf */
+
 #define INIT_STATE    42
 #define EXTRA_STATE   69
 #define NAME_STATE    73
@@ -101,7 +104,7 @@ typedef struct internal_state {
     int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
     gz_headerp  gzhead;  /* gzip header information to write */
     uInt   gzindex;      /* where in extra, name, or comment */
-    Byte  method;        /* STORED (for zip only) or DEFLATED */
+    Byte  method;        /* can only be DEFLATED */
     int   last_flush;    /* value of flush param for previous deflate call */
 
                 /* used by deflate.c: */
@@ -188,7 +191,7 @@ typedef struct internal_state {
     int nice_match; /* Stop searching when current match exceeds this */
 
                 /* used by trees.c: */
-    /* Didn't use ct_data typedef below to supress compiler warning */
+    /* Didn't use ct_data typedef below to suppress compiler warning */
     struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
     struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
     struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
@@ -244,7 +247,7 @@ typedef struct internal_state {
     ulg opt_len;        /* bit length of current block with optimal trees */
     ulg static_len;     /* bit length of current block with static trees */
     uInt matches;       /* number of string matches in current block */
-    int last_eob_len;   /* bit length of EOB code for last block */
+    uInt insert;        /* bytes at end of window left to insert */
 
 #ifdef DEBUG
     ulg compressed_len; /* total bit length of compressed file mod 2^32 */
@@ -294,6 +297,7 @@ void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
 int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
 void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
                         ulg stored_len, int last));
+void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
 void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
 void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
                         ulg stored_len, int last));
diff --git a/Externals/zlib/gzguts.h b/Externals/zlib/gzguts.h
index 0f8fb79f87..d87659d031 100644
--- a/Externals/zlib/gzguts.h
+++ b/Externals/zlib/gzguts.h
@@ -1,5 +1,5 @@
 /* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004, 2005, 2010 Mark Adler
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -12,7 +12,7 @@
 #  endif
 #endif
 
-#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
+#ifdef HAVE_HIDDEN
 #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
 #else
 #  define ZLIB_INTERNAL
@@ -27,13 +27,80 @@
 #endif
 #include <fcntl.h>
 
+#ifdef _WIN32
+#  include <stddef.h>
+#endif
+
+#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
+#  include <io.h>
+#endif
+
+#ifdef WINAPI_FAMILY
+#  define open _open
+#  define read _read
+#  define write _write
+#  define close _close
+#endif
+
 #ifdef NO_DEFLATE       /* for compatibility with old definition */
 #  define NO_GZCOMPRESS
 #endif
 
+#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#if defined(__CYGWIN__)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+
+#ifndef HAVE_VSNPRINTF
+#  ifdef MSDOS
+/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
+   but for now we just assume it doesn't. */
+#    define NO_vsnprintf
+#  endif
+#  ifdef __TURBOC__
+#    define NO_vsnprintf
+#  endif
+#  ifdef WIN32
+/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
+#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
+#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
+#         define vsnprintf _vsnprintf
+#      endif
+#    endif
+#  endif
+#  ifdef __SASC
+#    define NO_vsnprintf
+#  endif
+#  ifdef VMS
+#    define NO_vsnprintf
+#  endif
+#  ifdef __OS400__
+#    define NO_vsnprintf
+#  endif
+#  ifdef __MVS__
+#    define NO_vsnprintf
+#  endif
+#endif
+
+/* unlike snprintf (which is required in C99, yet still not supported by
+   Microsoft more than a decade later!), _snprintf does not guarantee null
+   termination of the result -- however this is only used in gzlib.c where
+   the result is assured to fit in the space provided */
 #ifdef _MSC_VER
-#  include <io.h>
-#  define vsnprintf _vsnprintf
+#  define snprintf _snprintf
 #endif
 
 #ifndef local
@@ -52,7 +119,7 @@
 #  include <windows.h>
 #  define zstrerror() gz_strwinerror((DWORD)GetLastError())
 #else
-#  ifdef STDC
+#  ifndef NO_STRERROR
 #    include <errno.h>
 #    define zstrerror() strerror(errno)
 #  else
@@ -68,7 +135,15 @@
     ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
 #endif
 
-/* default i/o buffer size -- double this for output when reading */
+/* default memLevel */
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
+
+/* default i/o buffer size -- double this for output when reading (this and
+   twice this must be able to fit in an unsigned type) */
 #define GZBUFSIZE 8192
 
 /* gzip modes, also provide a little integrity check on the passed structure */
@@ -84,23 +159,25 @@
 
 /* internal gzip file state data structure */
 typedef struct {
+        /* exposed contents for gzgetc() macro */
+    struct gzFile_s x;      /* "x" for exposed */
+                            /* x.have: number of bytes available at x.next */
+                            /* x.next: next output data to deliver or write */
+                            /* x.pos: current position in uncompressed data */
         /* used for both reading and writing */
     int mode;               /* see gzip modes above */
     int fd;                 /* file descriptor */
     char *path;             /* path or fd for error messages */
-    z_off64_t pos;          /* current position in uncompressed data */
     unsigned size;          /* buffer size, zero if not allocated yet */
     unsigned want;          /* requested buffer size, default is GZBUFSIZE */
     unsigned char *in;      /* input buffer */
     unsigned char *out;     /* output buffer (double-sized when reading) */
-    unsigned char *next;    /* next output data to deliver or write */
+    int direct;             /* 0 if processing gzip, 1 if transparent */
         /* just for reading */
-    unsigned have;          /* amount of output data unused at next */
-    int eof;                /* true if end of input file reached */
-    z_off64_t start;        /* where the gzip data started, for rewinding */
-    z_off64_t raw;          /* where the raw data started, for seeking */
     int how;                /* 0: get header, 1: copy, 2: decompress */
-    int direct;             /* true if last read direct, false if gzip */
+    z_off64_t start;        /* where the gzip data started, for rewinding */
+    int eof;                /* true if end of input file reached */
+    int past;               /* true if read requested past end */
         /* just for writing */
     int level;              /* compression level */
     int strategy;           /* compression strategy */
diff --git a/Externals/zlib/gzlib.c b/Externals/zlib/gzlib.c
index 603e60ed54..fae202ef89 100644
--- a/Externals/zlib/gzlib.c
+++ b/Externals/zlib/gzlib.c
@@ -1,19 +1,23 @@
 /* gzlib.c -- zlib functions common to reading and writing gzip files
- * Copyright (C) 2004, 2010 Mark Adler
+ * Copyright (C) 2004, 2010, 2011, 2012, 2013 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 #include "gzguts.h"
 
+#if defined(_WIN32) && !defined(__BORLANDC__)
+#  define LSEEK _lseeki64
+#else
 #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
 #  define LSEEK lseek64
 #else
 #  define LSEEK lseek
 #endif
+#endif
 
 /* Local functions */
 local void gz_reset OF((gz_statep));
-local gzFile gz_open OF((const char *, int, const char *));
+local gzFile gz_open OF((const void *, int, const char *));
 
 #if defined UNDER_CE
 
@@ -71,28 +75,40 @@ char ZLIB_INTERNAL *gz_strwinerror (error)
 local void gz_reset(state)
     gz_statep state;
 {
+    state->x.have = 0;              /* no output data available */
     if (state->mode == GZ_READ) {   /* for reading ... */
-        state->have = 0;            /* no output data available */
         state->eof = 0;             /* not at end of file */
+        state->past = 0;            /* have not read past end yet */
         state->how = LOOK;          /* look for gzip header */
-        state->direct = 1;          /* default for empty file */
     }
     state->seek = 0;                /* no seek request pending */
     gz_error(state, Z_OK, NULL);    /* clear error */
-    state->pos = 0;                 /* no uncompressed data yet */
+    state->x.pos = 0;               /* no uncompressed data yet */
     state->strm.avail_in = 0;       /* no input data yet */
 }
 
 /* Open a gzip file either by name or file descriptor. */
 local gzFile gz_open(path, fd, mode)
-    const char *path;
+    const void *path;
     int fd;
     const char *mode;
 {
     gz_statep state;
+    size_t len;
+    int oflag;
+#ifdef O_CLOEXEC
+    int cloexec = 0;
+#endif
+#ifdef O_EXCL
+    int exclusive = 0;
+#endif
+
+    /* check input */
+    if (path == NULL)
+        return NULL;
 
     /* allocate gzFile structure to return */
-    state = malloc(sizeof(gz_state));
+    state = (gz_statep)malloc(sizeof(gz_state));
     if (state == NULL)
         return NULL;
     state->size = 0;            /* no buffers allocated yet */
@@ -103,6 +119,7 @@ local gzFile gz_open(path, fd, mode)
     state->mode = GZ_NONE;
     state->level = Z_DEFAULT_COMPRESSION;
     state->strategy = Z_DEFAULT_STRATEGY;
+    state->direct = 0;
     while (*mode) {
         if (*mode >= '0' && *mode <= '9')
             state->level = *mode - '0';
@@ -124,6 +141,16 @@ local gzFile gz_open(path, fd, mode)
                 return NULL;
             case 'b':       /* ignore -- will request binary anyway */
                 break;
+#ifdef O_CLOEXEC
+            case 'e':
+                cloexec = 1;
+                break;
+#endif
+#ifdef O_EXCL
+            case 'x':
+                exclusive = 1;
+                break;
+#endif
             case 'f':
                 state->strategy = Z_FILTERED;
                 break;
@@ -135,6 +162,10 @@ local gzFile gz_open(path, fd, mode)
                 break;
             case 'F':
                 state->strategy = Z_FIXED;
+                break;
+            case 'T':
+                state->direct = 1;
+                break;
             default:        /* could consider as an error, but just ignore */
                 ;
             }
@@ -147,30 +178,71 @@ local gzFile gz_open(path, fd, mode)
         return NULL;
     }
 
+    /* can't force transparent read */
+    if (state->mode == GZ_READ) {
+        if (state->direct) {
+            free(state);
+            return NULL;
+        }
+        state->direct = 1;      /* for empty file */
+    }
+
     /* save the path name for error messages */
-    state->path = malloc(strlen(path) + 1);
+#ifdef _WIN32
+    if (fd == -2) {
+        len = wcstombs(NULL, path, 0);
+        if (len == (size_t)-1)
+            len = 0;
+    }
+    else
+#endif
+        len = strlen((const char *)path);
+    state->path = (char *)malloc(len + 1);
     if (state->path == NULL) {
         free(state);
         return NULL;
     }
-    strcpy(state->path, path);
+#ifdef _WIN32
+    if (fd == -2)
+        if (len)
+            wcstombs(state->path, path, len + 1);
+        else
+            *(state->path) = 0;
+    else
+#endif
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+        snprintf(state->path, len + 1, "%s", (const char *)path);
+#else
+        strcpy(state->path, path);
+#endif
 
-    /* open the file with the appropriate mode (or just use fd) */
-    state->fd = fd != -1 ? fd :
-        open(path,
+    /* compute the flags for open() */
+    oflag =
 #ifdef O_LARGEFILE
-            O_LARGEFILE |
+        O_LARGEFILE |
 #endif
 #ifdef O_BINARY
-            O_BINARY |
+        O_BINARY |
 #endif
-            (state->mode == GZ_READ ?
-                O_RDONLY :
-                (O_WRONLY | O_CREAT | (
-                    state->mode == GZ_WRITE ?
-                        O_TRUNC :
-                        O_APPEND))),
-            0666);
+#ifdef O_CLOEXEC
+        (cloexec ? O_CLOEXEC : 0) |
+#endif
+        (state->mode == GZ_READ ?
+         O_RDONLY :
+         (O_WRONLY | O_CREAT |
+#ifdef O_EXCL
+          (exclusive ? O_EXCL : 0) |
+#endif
+          (state->mode == GZ_WRITE ?
+           O_TRUNC :
+           O_APPEND)));
+
+    /* open the file with the appropriate flags (or just use fd) */
+    state->fd = fd > -1 ? fd : (
+#ifdef _WIN32
+        fd == -2 ? _wopen(path, oflag, 0666) :
+#endif
+        open((const char *)path, oflag, 0666));
     if (state->fd == -1) {
         free(state->path);
         free(state);
@@ -216,14 +288,28 @@ gzFile ZEXPORT gzdopen(fd, mode)
     char *path;         /* identifier for error messages */
     gzFile gz;
 
-    if (fd == -1 || (path = malloc(7 + 3 * sizeof(int))) == NULL)
+    if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL)
         return NULL;
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+    snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd); /* for debugging */
+#else
     sprintf(path, "<fd:%d>", fd);   /* for debugging */
+#endif
     gz = gz_open(path, fd, mode);
     free(path);
     return gz;
 }
 
+/* -- see zlib.h -- */
+#ifdef _WIN32
+gzFile ZEXPORT gzopen_w(path, mode)
+    const wchar_t *path;
+    const char *mode;
+{
+    return gz_open(path, -2, mode);
+}
+#endif
+
 /* -- see zlib.h -- */
 int ZEXPORT gzbuffer(file, size)
     gzFile file;
@@ -243,8 +329,8 @@ int ZEXPORT gzbuffer(file, size)
         return -1;
 
     /* check and set requested size */
-    if (size == 0)
-        return -1;
+    if (size < 2)
+        size = 2;               /* need two bytes to check magic header */
     state->want = size;
     return 0;
 }
@@ -261,7 +347,8 @@ int ZEXPORT gzrewind(file)
     state = (gz_statep)file;
 
     /* check that we're reading and that there's no error */
-    if (state->mode != GZ_READ || state->err != Z_OK)
+    if (state->mode != GZ_READ ||
+            (state->err != Z_OK && state->err != Z_BUF_ERROR))
         return -1;
 
     /* back up and start over */
@@ -289,7 +376,7 @@ z_off64_t ZEXPORT gzseek64(file, offset, whence)
         return -1;
 
     /* check that there's no error */
-    if (state->err != Z_OK)
+    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
         return -1;
 
     /* can only seek from start or relative to current position */
@@ -298,31 +385,32 @@ z_off64_t ZEXPORT gzseek64(file, offset, whence)
 
     /* normalize offset to a SEEK_CUR specification */
     if (whence == SEEK_SET)
-        offset -= state->pos;
+        offset -= state->x.pos;
     else if (state->seek)
         offset += state->skip;
     state->seek = 0;
 
     /* if within raw area while reading, just go there */
     if (state->mode == GZ_READ && state->how == COPY &&
-        state->pos + offset >= state->raw) {
-        ret = LSEEK(state->fd, offset - state->have, SEEK_CUR);
+            state->x.pos + offset >= 0) {
+        ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR);
         if (ret == -1)
             return -1;
-        state->have = 0;
+        state->x.have = 0;
         state->eof = 0;
+        state->past = 0;
         state->seek = 0;
         gz_error(state, Z_OK, NULL);
         state->strm.avail_in = 0;
-        state->pos += offset;
-        return state->pos;
+        state->x.pos += offset;
+        return state->x.pos;
     }
 
     /* calculate skip amount, rewinding if needed for back seek when reading */
     if (offset < 0) {
         if (state->mode != GZ_READ)         /* writing -- can't go backwards */
             return -1;
-        offset += state->pos;
+        offset += state->x.pos;
         if (offset < 0)                     /* before start of file! */
             return -1;
         if (gzrewind(file) == -1)           /* rewind, then skip to offset */
@@ -331,11 +419,11 @@ z_off64_t ZEXPORT gzseek64(file, offset, whence)
 
     /* if reading, skip what's in output buffer (one less gzgetc() check) */
     if (state->mode == GZ_READ) {
-        n = GT_OFF(state->have) || (z_off64_t)state->have > offset ?
-            (unsigned)offset : state->have;
-        state->have -= n;
-        state->next += n;
-        state->pos += n;
+        n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ?
+            (unsigned)offset : state->x.have;
+        state->x.have -= n;
+        state->x.next += n;
+        state->x.pos += n;
         offset -= n;
     }
 
@@ -344,7 +432,7 @@ z_off64_t ZEXPORT gzseek64(file, offset, whence)
         state->seek = 1;
         state->skip = offset;
     }
-    return state->pos + offset;
+    return state->x.pos + offset;
 }
 
 /* -- see zlib.h -- */
@@ -373,7 +461,7 @@ z_off64_t ZEXPORT gztell64(file)
         return -1;
 
     /* return position */
-    return state->pos + (state->seek ? state->skip : 0);
+    return state->x.pos + (state->seek ? state->skip : 0);
 }
 
 /* -- see zlib.h -- */
@@ -433,8 +521,7 @@ int ZEXPORT gzeof(file)
         return 0;
 
     /* return end-of-file state */
-    return state->mode == GZ_READ ?
-        (state->eof && state->strm.avail_in == 0 && state->have == 0) : 0;
+    return state->mode == GZ_READ ? state->past : 0;
 }
 
 /* -- see zlib.h -- */
@@ -454,7 +541,8 @@ const char * ZEXPORT gzerror(file, errnum)
     /* return error information */
     if (errnum != NULL)
         *errnum = state->err;
-    return state->msg == NULL ? "" : state->msg;
+    return state->err == Z_MEM_ERROR ? "out of memory" :
+                                       (state->msg == NULL ? "" : state->msg);
 }
 
 /* -- see zlib.h -- */
@@ -471,8 +559,10 @@ void ZEXPORT gzclearerr(file)
         return;
 
     /* clear error and end-of-file */
-    if (state->mode == GZ_READ)
+    if (state->mode == GZ_READ) {
         state->eof = 0;
+        state->past = 0;
+    }
     gz_error(state, Z_OK, NULL);
 }
 
@@ -494,26 +584,33 @@ void ZLIB_INTERNAL gz_error(state, err, msg)
         state->msg = NULL;
     }
 
+    /* if fatal, set state->x.have to 0 so that the gzgetc() macro fails */
+    if (err != Z_OK && err != Z_BUF_ERROR)
+        state->x.have = 0;
+
     /* set error code, and if no message, then done */
     state->err = err;
     if (msg == NULL)
         return;
 
-    /* for an out of memory error, save as static string */
-    if (err == Z_MEM_ERROR) {
-        state->msg = (char *)msg;
+    /* for an out of memory error, return literal string when requested */
+    if (err == Z_MEM_ERROR)
         return;
-    }
 
     /* construct error message with path */
-    if ((state->msg = malloc(strlen(state->path) + strlen(msg) + 3)) == NULL) {
+    if ((state->msg = (char *)malloc(strlen(state->path) + strlen(msg) + 3)) ==
+            NULL) {
         state->err = Z_MEM_ERROR;
-        state->msg = (char *)"out of memory";
         return;
     }
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
+    snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
+             "%s%s%s", state->path, ": ", msg);
+#else
     strcpy(state->msg, state->path);
     strcat(state->msg, ": ");
     strcat(state->msg, msg);
+#endif
     return;
 }
 
diff --git a/Externals/zlib/gzread.c b/Externals/zlib/gzread.c
index 548201ab00..bf4538eb27 100644
--- a/Externals/zlib/gzread.c
+++ b/Externals/zlib/gzread.c
@@ -1,5 +1,5 @@
 /* gzread.c -- zlib functions for reading gzip files
- * Copyright (C) 2004, 2005, 2010 Mark Adler
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -8,10 +8,9 @@
 /* Local functions */
 local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
 local int gz_avail OF((gz_statep));
-local int gz_next4 OF((gz_statep, unsigned long *));
-local int gz_head OF((gz_statep));
+local int gz_look OF((gz_statep));
 local int gz_decomp OF((gz_statep));
-local int gz_make OF((gz_statep));
+local int gz_fetch OF((gz_statep));
 local int gz_skip OF((gz_statep, z_off64_t));
 
 /* Use read() to load a buffer -- return -1 on error, otherwise 0.  Read from
@@ -46,73 +45,54 @@ local int gz_load(state, buf, len, have)
    error, 0 otherwise.  Note that the eof flag is set when the end of the input
    file is reached, even though there may be unused data in the buffer.  Once
    that data has been used, no more attempts will be made to read the file.
-   gz_avail() assumes that strm->avail_in == 0. */
+   If strm->avail_in != 0, then the current data is moved to the beginning of
+   the input buffer, and then the remainder of the buffer is loaded with the
+   available data from the input file. */
 local int gz_avail(state)
     gz_statep state;
 {
+    unsigned got;
     z_streamp strm = &(state->strm);
 
-    if (state->err != Z_OK)
+    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
         return -1;
     if (state->eof == 0) {
-        if (gz_load(state, state->in, state->size,
-                (unsigned *)&(strm->avail_in)) == -1)
+        if (strm->avail_in) {       /* copy what's there to the start */
+            unsigned char *p = state->in;
+            unsigned const char *q = strm->next_in;
+            unsigned n = strm->avail_in;
+            do {
+                *p++ = *q++;
+            } while (--n);
+        }
+        if (gz_load(state, state->in + strm->avail_in,
+                    state->size - strm->avail_in, &got) == -1)
             return -1;
+        strm->avail_in += got;
         strm->next_in = state->in;
     }
     return 0;
 }
 
-/* Get next byte from input, or -1 if end or error. */
-#define NEXT() ((strm->avail_in == 0 && gz_avail(state) == -1) ? -1 : \
-                (strm->avail_in == 0 ? -1 : \
-                 (strm->avail_in--, *(strm->next_in)++)))
-
-/* Get a four-byte little-endian integer and return 0 on success and the value
-   in *ret.  Otherwise -1 is returned and *ret is not modified. */
-local int gz_next4(state, ret)
-    gz_statep state;
-    unsigned long *ret;
-{
-    int ch;
-    unsigned long val;
-    z_streamp strm = &(state->strm);
-
-    val = NEXT();
-    val += (unsigned)NEXT() << 8;
-    val += (unsigned long)NEXT() << 16;
-    ch = NEXT();
-    if (ch == -1)
-        return -1;
-    val += (unsigned long)ch << 24;
-    *ret = val;
-    return 0;
-}
-
-/* Look for gzip header, set up for inflate or copy.  state->have must be zero.
+/* Look for gzip header, set up for inflate or copy.  state->x.have must be 0.
    If this is the first time in, allocate required memory.  state->how will be
    left unchanged if there is no more input data available, will be set to COPY
    if there is no gzip header and direct copying will be performed, or it will
-   be set to GZIP for decompression, and the gzip header will be skipped so
-   that the next available input data is the raw deflate stream.  If direct
-   copying, then leftover input data from the input buffer will be copied to
-   the output buffer.  In that case, all further file reads will be directly to
-   either the output buffer or a user buffer.  If decompressing, the inflate
-   state and the check value will be initialized.  gz_head() will return 0 on
-   success or -1 on failure.  Failures may include read errors or gzip header
-   errors.  */
-local int gz_head(state)
+   be set to GZIP for decompression.  If direct copying, then leftover input
+   data from the input buffer will be copied to the output buffer.  In that
+   case, all further file reads will be directly to either the output buffer or
+   a user buffer.  If decompressing, the inflate state will be initialized.
+   gz_look() will return 0 on success or -1 on failure. */
+local int gz_look(state)
     gz_statep state;
 {
     z_streamp strm = &(state->strm);
-    int flags;
-    unsigned len;
 
     /* allocate read buffers and inflate memory */
     if (state->size == 0) {
         /* allocate buffers */
-        state->in = malloc(state->want);
-        state->out = malloc(state->want << 1);
+        state->in = (unsigned char *)malloc(state->want);
+        state->out = (unsigned char *)malloc(state->want << 1);
         if (state->in == NULL || state->out == NULL) {
             if (state->out != NULL)
                 free(state->out);
@@ -129,7 +109,7 @@ local int gz_head(state)
         state->strm.opaque = Z_NULL;
         state->strm.avail_in = 0;
         state->strm.next_in = Z_NULL;
-        if (inflateInit2(&(state->strm), -15) != Z_OK) {    /* raw inflate */
+        if (inflateInit2(&(state->strm), 15 + 16) != Z_OK) {    /* gunzip */
             free(state->out);
             free(state->in);
             state->size = 0;
@@ -138,83 +118,45 @@ local int gz_head(state)
         }
     }
 
-    /* get some data in the input buffer */
-    if (strm->avail_in == 0) {
+    /* get at least the magic bytes in the input buffer */
+    if (strm->avail_in < 2) {
         if (gz_avail(state) == -1)
             return -1;
         if (strm->avail_in == 0)
             return 0;
     }
 
-    /* look for the gzip magic header bytes 31 and 139 */
-    if (strm->next_in[0] == 31) {
-        strm->avail_in--;
-        strm->next_in++;
-        if (strm->avail_in == 0 && gz_avail(state) == -1)
-            return -1;
-        if (strm->avail_in && strm->next_in[0] == 139) {
-            /* we have a gzip header, woo hoo! */
-            strm->avail_in--;
-            strm->next_in++;
-
-            /* skip rest of header */
-            if (NEXT() != 8) {      /* compression method */
-                gz_error(state, Z_DATA_ERROR, "unknown compression method");
-                return -1;
-            }
-            flags = NEXT();
-            if (flags & 0xe0) {     /* reserved flag bits */
-                gz_error(state, Z_DATA_ERROR, "unknown header flags set");
-                return -1;
-            }
-            NEXT();                 /* modification time */
-            NEXT();
-            NEXT();
-            NEXT();
-            NEXT();                 /* extra flags */
-            NEXT();                 /* operating system */
-            if (flags & 4) {        /* extra field */
-                len = (unsigned)NEXT();
-                len += (unsigned)NEXT() << 8;
-                while (len--)
-                    if (NEXT() < 0)
-                        break;
-            }
-            if (flags & 8)          /* file name */
-                while (NEXT() > 0)
-                    ;
-            if (flags & 16)         /* comment */
-                while (NEXT() > 0)
-                    ;
-            if (flags & 2) {        /* header crc */
-                NEXT();
-                NEXT();
-            }
-            /* an unexpected end of file is not checked for here -- it will be
-               noticed on the first request for uncompressed data */
-
-            /* set up for decompression */
-            inflateReset(strm);
-            strm->adler = crc32(0L, Z_NULL, 0);
-            state->how = GZIP;
-            state->direct = 0;
-            return 0;
-        }
-        else {
-            /* not a gzip file -- save first byte (31) and fall to raw i/o */
-            state->out[0] = 31;
-            state->have = 1;
-        }
+    /* look for gzip magic bytes -- if there, do gzip decoding (note: there is
+       a logical dilemma here when considering the case of a partially written
+       gzip file, to wit, if a single 31 byte is written, then we cannot tell
+       whether this is a single-byte file, or just a partially written gzip
+       file -- for here we assume that if a gzip file is being written, then
+       the header will be written in a single operation, so that reading a
+       single byte is sufficient indication that it is not a gzip file) */
+    if (strm->avail_in > 1 &&
+            strm->next_in[0] == 31 && strm->next_in[1] == 139) {
+        inflateReset(strm);
+        state->how = GZIP;
+        state->direct = 0;
+        return 0;
     }
 
-    /* doing raw i/o, save start of raw data for seeking, copy any leftover
-       input to output -- this assumes that the output buffer is larger than
-       the input buffer, which also assures space for gzungetc() */
-    state->raw = state->pos;
-    state->next = state->out;
+    /* no gzip header -- if we were decoding gzip before, then this is trailing
+       garbage.  Ignore the trailing garbage and finish. */
+    if (state->direct == 0) {
+        strm->avail_in = 0;
+        state->eof = 1;
+        state->x.have = 0;
+        return 0;
+    }
+
+    /* doing raw i/o, copy any leftover input to output -- this assumes that
+       the output buffer is larger than the input buffer, which also assures
+       space for gzungetc() */
+    state->x.next = state->out;
     if (strm->avail_in) {
-        memcpy(state->next + state->have, strm->next_in, strm->avail_in);
-        state->have += strm->avail_in;
+        memcpy(state->x.next, strm->next_in, strm->avail_in);
+        state->x.have = strm->avail_in;
         strm->avail_in = 0;
     }
     state->how = COPY;
@@ -223,19 +165,15 @@ local int gz_head(state)
 }
 
 /* Decompress from input to the provided next_out and avail_out in the state.
-   If the end of the compressed data is reached, then verify the gzip trailer
-   check value and length (modulo 2^32).  state->have and state->next are set
-   to point to the just decompressed data, and the crc is updated.  If the
-   trailer is verified, state->how is reset to LOOK to look for the next gzip
-   stream or raw data, once state->have is depleted.  Returns 0 on success, -1
-   on failure.  Failures may include invalid compressed data or a failed gzip
-   trailer verification. */
+   On return, state->x.have and state->x.next point to the just decompressed
+   data.  If the gzip stream completes, state->how is reset to LOOK to look for
+   the next gzip stream or raw data, once state->x.have is depleted.  Returns 0
+   on success, -1 on failure. */
 local int gz_decomp(state)
     gz_statep state;
 {
-    int ret;
+    int ret = Z_OK;
     unsigned had;
-    unsigned long crc, len;
     z_streamp strm = &(state->strm);
 
     /* fill output buffer up to end of deflate stream */
@@ -245,15 +183,15 @@ local int gz_decomp(state)
         if (strm->avail_in == 0 && gz_avail(state) == -1)
             return -1;
         if (strm->avail_in == 0) {
-            gz_error(state, Z_DATA_ERROR, "unexpected end of file");
-            return -1;
+            gz_error(state, Z_BUF_ERROR, "unexpected end of file");
+            break;
         }
 
         /* decompress and handle errors */
         ret = inflate(strm, Z_NO_FLUSH);
         if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) {
             gz_error(state, Z_STREAM_ERROR,
-                      "internal error: inflate stream corrupt");
+                     "internal error: inflate stream corrupt");
             return -1;
         }
         if (ret == Z_MEM_ERROR) {
@@ -262,67 +200,55 @@ local int gz_decomp(state)
         }
         if (ret == Z_DATA_ERROR) {              /* deflate stream invalid */
             gz_error(state, Z_DATA_ERROR,
-                      strm->msg == NULL ? "compressed data error" : strm->msg);
+                     strm->msg == NULL ? "compressed data error" : strm->msg);
             return -1;
         }
     } while (strm->avail_out && ret != Z_STREAM_END);
 
-    /* update available output and crc check value */
-    state->have = had - strm->avail_out;
-    state->next = strm->next_out - state->have;
-    strm->adler = crc32(strm->adler, state->next, state->have);
+    /* update available output */
+    state->x.have = had - strm->avail_out;
+    state->x.next = strm->next_out - state->x.have;
 
-    /* check gzip trailer if at end of deflate stream */
-    if (ret == Z_STREAM_END) {
-        if (gz_next4(state, &crc) == -1 || gz_next4(state, &len) == -1) {
-            gz_error(state, Z_DATA_ERROR, "unexpected end of file");
-            return -1;
-        }
-        if (crc != strm->adler) {
-            gz_error(state, Z_DATA_ERROR, "incorrect data check");
-            return -1;
-        }
-        if (len != (strm->total_out & 0xffffffffL)) {
-            gz_error(state, Z_DATA_ERROR, "incorrect length check");
-            return -1;
-        }
-        state->how = LOOK;      /* ready for next stream, once have is 0 (leave
-                                   state->direct unchanged to remember how) */
-    }
+    /* if the gzip stream completed successfully, look for another */
+    if (ret == Z_STREAM_END)
+        state->how = LOOK;
 
     /* good decompression */
     return 0;
 }
 
-/* Make data and put in the output buffer.  Assumes that state->have == 0.
+/* Fetch data and put it in the output buffer.  Assumes state->x.have is 0.
    Data is either copied from the input file or decompressed from the input
    file depending on state->how.  If state->how is LOOK, then a gzip header is
-   looked for (and skipped if found) to determine wither to copy or decompress.
-   Returns -1 on error, otherwise 0.  gz_make() will leave state->have as COPY
-   or GZIP unless the end of the input file has been reached and all data has
-   been processed.  */
-local int gz_make(state)
+   looked for to determine whether to copy or decompress.  Returns -1 on error,
+   otherwise 0.  gz_fetch() will leave state->how as COPY or GZIP unless the
+   end of the input file has been reached and all data has been processed.  */
+local int gz_fetch(state)
     gz_statep state;
 {
     z_streamp strm = &(state->strm);
 
-    if (state->how == LOOK) {           /* look for gzip header */
-        if (gz_head(state) == -1)
-            return -1;
-        if (state->have)                /* got some data from gz_head() */
+    do {
+        switch(state->how) {
+        case LOOK:      /* -> LOOK, COPY (only if never GZIP), or GZIP */
+            if (gz_look(state) == -1)
+                return -1;
+            if (state->how == LOOK)
+                return 0;
+            break;
+        case COPY:      /* -> COPY */
+            if (gz_load(state, state->out, state->size << 1, &(state->x.have))
+                    == -1)
+                return -1;
+            state->x.next = state->out;
             return 0;
-    }
-    if (state->how == COPY) {           /* straight copy */
-        if (gz_load(state, state->out, state->size << 1, &(state->have)) == -1)
-            return -1;
-        state->next = state->out;
-    }
-    else if (state->how == GZIP) {      /* decompress */
-        strm->avail_out = state->size << 1;
-        strm->next_out = state->out;
-        if (gz_decomp(state) == -1)
-            return -1;
-    }
+        case GZIP:      /* -> GZIP or LOOK (if end of gzip stream) */
+            strm->avail_out = state->size << 1;
+            strm->next_out = state->out;
+            if (gz_decomp(state) == -1)
+                return -1;
+        }
+    } while (state->x.have == 0 && (!state->eof || strm->avail_in));
     return 0;
 }
 
@@ -336,12 +262,12 @@ local int gz_skip(state, len)
     /* skip over len bytes or reach end-of-file, whichever comes first */
     while (len)
         /* skip over whatever is in output buffer */
-        if (state->have) {
-            n = GT_OFF(state->have) || (z_off64_t)state->have > len ?
-                (unsigned)len : state->have;
-            state->have -= n;
-            state->next += n;
-            state->pos += n;
+        if (state->x.have) {
+            n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ?
+                (unsigned)len : state->x.have;
+            state->x.have -= n;
+            state->x.next += n;
+            state->x.pos += n;
             len -= n;
         }
 
@@ -352,7 +278,7 @@ local int gz_skip(state, len)
         /* need more data to skip -- load up output buffer */
         else {
             /* get more output, looking for header if required */
-            if (gz_make(state) == -1)
+            if (gz_fetch(state) == -1)
                 return -1;
         }
     return 0;
@@ -374,14 +300,15 @@ int ZEXPORT gzread(file, buf, len)
     state = (gz_statep)file;
     strm = &(state->strm);
 
-    /* check that we're reading and that there's no error */
-    if (state->mode != GZ_READ || state->err != Z_OK)
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+            (state->err != Z_OK && state->err != Z_BUF_ERROR))
         return -1;
 
     /* since an int is returned, make sure len fits in one, otherwise return
        with an error (this avoids the flaw in the interface) */
     if ((int)len < 0) {
-        gz_error(state, Z_BUF_ERROR, "requested length does not fit in int");
+        gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
         return -1;
     }
 
@@ -400,49 +327,51 @@ int ZEXPORT gzread(file, buf, len)
     got = 0;
     do {
         /* first just try copying data from the output buffer */
-        if (state->have) {
-            n = state->have > len ? len : state->have;
-            memcpy(buf, state->next, n);
-            state->next += n;
-            state->have -= n;
+        if (state->x.have) {
+            n = state->x.have > len ? len : state->x.have;
+            memcpy(buf, state->x.next, n);
+            state->x.next += n;
+            state->x.have -= n;
         }
 
         /* output buffer empty -- return if we're at the end of the input */
-        else if (state->eof && strm->avail_in == 0)
+        else if (state->eof && strm->avail_in == 0) {
+            state->past = 1;        /* tried to read past end */
             break;
+        }
 
         /* need output data -- for small len or new stream load up our output
            buffer */
         else if (state->how == LOOK || len < (state->size << 1)) {
             /* get more output, looking for header if required */
-            if (gz_make(state) == -1)
+            if (gz_fetch(state) == -1)
                 return -1;
-            continue;       /* no progress yet -- go back to memcpy() above */
+            continue;       /* no progress yet -- go back to copy above */
             /* the copy above assures that we will leave with space in the
                output buffer, allowing at least one gzungetc() to succeed */
         }
 
         /* large len -- read directly into user buffer */
         else if (state->how == COPY) {      /* read directly */
-            if (gz_load(state, buf, len, &n) == -1)
+            if (gz_load(state, (unsigned char *)buf, len, &n) == -1)
                 return -1;
         }
 
         /* large len -- decompress directly into user buffer */
         else {  /* state->how == GZIP */
             strm->avail_out = len;
-            strm->next_out = buf;
+            strm->next_out = (unsigned char *)buf;
             if (gz_decomp(state) == -1)
                 return -1;
-            n = state->have;
-            state->have = 0;
+            n = state->x.have;
+            state->x.have = 0;
         }
 
         /* update progress */
         len -= n;
         buf = (char *)buf + n;
         got += n;
-        state->pos += n;
+        state->x.pos += n;
     } while (len);
 
     /* return number of bytes read into user buffer (will fit in int) */
@@ -450,6 +379,11 @@ int ZEXPORT gzread(file, buf, len)
 }
 
 /* -- see zlib.h -- */
+#ifdef Z_PREFIX_SET
+#  undef z_gzgetc
+#else
+#  undef gzgetc
+#endif
 int ZEXPORT gzgetc(file)
     gzFile file;
 {
@@ -462,15 +396,16 @@ int ZEXPORT gzgetc(file)
         return -1;
     state = (gz_statep)file;
 
-    /* check that we're reading and that there's no error */
-    if (state->mode != GZ_READ || state->err != Z_OK)
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+        (state->err != Z_OK && state->err != Z_BUF_ERROR))
         return -1;
 
     /* try output buffer (no need to check for skip request) */
-    if (state->have) {
-        state->have--;
-        state->pos++;
-        return *(state->next)++;
+    if (state->x.have) {
+        state->x.have--;
+        state->x.pos++;
+        return *(state->x.next)++;
     }
 
     /* nothing there -- try gzread() */
@@ -478,6 +413,12 @@ int ZEXPORT gzgetc(file)
     return ret < 1 ? -1 : buf[0];
 }
 
+int ZEXPORT gzgetc_(file)
+gzFile file;
+{
+    return gzgetc(file);
+}
+
 /* -- see zlib.h -- */
 int ZEXPORT gzungetc(c, file)
     int c;
@@ -490,8 +431,9 @@ int ZEXPORT gzungetc(c, file)
         return -1;
     state = (gz_statep)file;
 
-    /* check that we're reading and that there's no error */
-    if (state->mode != GZ_READ || state->err != Z_OK)
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+        (state->err != Z_OK && state->err != Z_BUF_ERROR))
         return -1;
 
     /* process a skip request */
@@ -506,32 +448,34 @@ int ZEXPORT gzungetc(c, file)
         return -1;
 
     /* if output buffer empty, put byte at end (allows more pushing) */
-    if (state->have == 0) {
-        state->have = 1;
-        state->next = state->out + (state->size << 1) - 1;
-        state->next[0] = c;
-        state->pos--;
+    if (state->x.have == 0) {
+        state->x.have = 1;
+        state->x.next = state->out + (state->size << 1) - 1;
+        state->x.next[0] = c;
+        state->x.pos--;
+        state->past = 0;
         return c;
     }
 
     /* if no room, give up (must have already done a gzungetc()) */
-    if (state->have == (state->size << 1)) {
-        gz_error(state, Z_BUF_ERROR, "out of room to push characters");
+    if (state->x.have == (state->size << 1)) {
+        gz_error(state, Z_DATA_ERROR, "out of room to push characters");
         return -1;
     }
 
     /* slide output data if needed and insert byte before existing data */
-    if (state->next == state->out) {
-        unsigned char *src = state->out + state->have;
+    if (state->x.next == state->out) {
+        unsigned char *src = state->out + state->x.have;
         unsigned char *dest = state->out + (state->size << 1);
         while (src > state->out)
             *--dest = *--src;
-        state->next = dest;
+        state->x.next = dest;
     }
-    state->have++;
-    state->next--;
-    state->next[0] = c;
-    state->pos--;
+    state->x.have++;
+    state->x.next--;
+    state->x.next[0] = c;
+    state->x.pos--;
+    state->past = 0;
     return c;
 }
 
@@ -551,8 +495,9 @@ char * ZEXPORT gzgets(file, buf, len)
         return NULL;
     state = (gz_statep)file;
 
-    /* check that we're reading and that there's no error */
-    if (state->mode != GZ_READ || state->err != Z_OK)
+    /* check that we're reading and that there's no (serious) error */
+    if (state->mode != GZ_READ ||
+        (state->err != Z_OK && state->err != Z_BUF_ERROR))
         return NULL;
 
     /* process a skip request */
@@ -569,32 +514,31 @@ char * ZEXPORT gzgets(file, buf, len)
     left = (unsigned)len - 1;
     if (left) do {
         /* assure that something is in the output buffer */
-        if (state->have == 0) {
-            if (gz_make(state) == -1)
-                return NULL;            /* error */
-            if (state->have == 0) {     /* end of file */
-                if (buf == str)         /* got bupkus */
-                    return NULL;
-                break;                  /* got something -- return it */
-            }
+        if (state->x.have == 0 && gz_fetch(state) == -1)
+            return NULL;                /* error */
+        if (state->x.have == 0) {       /* end of file */
+            state->past = 1;            /* read past end */
+            break;                      /* return what we have */
         }
 
         /* look for end-of-line in current output buffer */
-        n = state->have > left ? left : state->have;
-        eol = memchr(state->next, '\n', n);
+        n = state->x.have > left ? left : state->x.have;
+        eol = (unsigned char *)memchr(state->x.next, '\n', n);
         if (eol != NULL)
-            n = (unsigned)(eol - state->next) + 1;
+            n = (unsigned)(eol - state->x.next) + 1;
 
         /* copy through end-of-line, or remainder if not found */
-        memcpy(buf, state->next, n);
-        state->have -= n;
-        state->next += n;
-        state->pos += n;
+        memcpy(buf, state->x.next, n);
+        state->x.have -= n;
+        state->x.next += n;
+        state->x.pos += n;
         left -= n;
         buf += n;
     } while (left && eol == NULL);
 
-    /* found end-of-line or out of space -- terminate string and return it */
+    /* return terminated string, or if nothing, end of file */
+    if (buf == str)
+        return NULL;
     buf[0] = 0;
     return str;
 }
@@ -610,16 +554,12 @@ int ZEXPORT gzdirect(file)
         return 0;
     state = (gz_statep)file;
 
-    /* check that we're reading */
-    if (state->mode != GZ_READ)
-        return 0;
-
     /* if the state is not known, but we can find out, then do so (this is
        mainly for right after a gzopen() or gzdopen()) */
-    if (state->how == LOOK && state->have == 0)
-        (void)gz_head(state);
+    if (state->mode == GZ_READ && state->how == LOOK && state->x.have == 0)
+        (void)gz_look(state);
 
-    /* return 1 if reading direct, 0 if decompressing a gzip stream */
+    /* return 1 if transparent, 0 if processing a gzip stream */
     return state->direct;
 }
 
@@ -627,7 +567,7 @@ int ZEXPORT gzdirect(file)
 int ZEXPORT gzclose_r(file)
     gzFile file;
 {
-    int ret;
+    int ret, err;
     gz_statep state;
 
     /* get internal structure */
@@ -645,9 +585,10 @@ int ZEXPORT gzclose_r(file)
         free(state->out);
         free(state->in);
     }
+    err = state->err == Z_BUF_ERROR ? Z_BUF_ERROR : Z_OK;
     gz_error(state, Z_OK, NULL);
     free(state->path);
     ret = close(state->fd);
     free(state);
-    return ret ? Z_ERRNO : Z_OK;
+    return ret ? Z_ERRNO : err;
 }
diff --git a/Externals/zlib/gzwrite.c b/Externals/zlib/gzwrite.c
index e8defc6887..aa767fbf63 100644
--- a/Externals/zlib/gzwrite.c
+++ b/Externals/zlib/gzwrite.c
@@ -1,5 +1,5 @@
 /* gzwrite.c -- zlib functions for writing gzip files
- * Copyright (C) 2004, 2005, 2010 Mark Adler
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -18,44 +18,55 @@ local int gz_init(state)
     int ret;
     z_streamp strm = &(state->strm);
 
-    /* allocate input and output buffers */
-    state->in = malloc(state->want);
-    state->out = malloc(state->want);
-    if (state->in == NULL || state->out == NULL) {
-        if (state->out != NULL)
-            free(state->out);
-        if (state->in != NULL)
-            free(state->in);
+    /* allocate input buffer */
+    state->in = (unsigned char *)malloc(state->want);
+    if (state->in == NULL) {
         gz_error(state, Z_MEM_ERROR, "out of memory");
         return -1;
     }
 
-    /* allocate deflate memory, set up for gzip compression */
-    strm->zalloc = Z_NULL;
-    strm->zfree = Z_NULL;
-    strm->opaque = Z_NULL;
-    ret = deflateInit2(strm, state->level, Z_DEFLATED,
-                       15 + 16, 8, state->strategy);
-    if (ret != Z_OK) {
-        free(state->in);
-        gz_error(state, Z_MEM_ERROR, "out of memory");
-        return -1;
+    /* only need output buffer and deflate state if compressing */
+    if (!state->direct) {
+        /* allocate output buffer */
+        state->out = (unsigned char *)malloc(state->want);
+        if (state->out == NULL) {
+            free(state->in);
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
+
+        /* allocate deflate memory, set up for gzip compression */
+        strm->zalloc = Z_NULL;
+        strm->zfree = Z_NULL;
+        strm->opaque = Z_NULL;
+        ret = deflateInit2(strm, state->level, Z_DEFLATED,
+                           MAX_WBITS + 16, DEF_MEM_LEVEL, state->strategy);
+        if (ret != Z_OK) {
+            free(state->out);
+            free(state->in);
+            gz_error(state, Z_MEM_ERROR, "out of memory");
+            return -1;
+        }
     }
 
     /* mark state as initialized */
     state->size = state->want;
 
-    /* initialize write buffer */
-    strm->avail_out = state->size;
-    strm->next_out = state->out;
-    state->next = strm->next_out;
+    /* initialize write buffer if compressing */
+    if (!state->direct) {
+        strm->avail_out = state->size;
+        strm->next_out = state->out;
+        state->x.next = strm->next_out;
+    }
     return 0;
 }
 
 /* Compress whatever is at avail_in and next_in and write to the output file.
    Return -1 if there is an error writing to the output file, otherwise 0.
    flush is assumed to be a valid deflate() flush value.  If flush is Z_FINISH,
-   then the deflate() state is reset to start a new gzip stream. */
+   then the deflate() state is reset to start a new gzip stream.  If gz->direct
+   is true, then simply write to the output file without compressing, and
+   ignore flush. */
 local int gz_comp(state, flush)
     gz_statep state;
     int flush;
@@ -68,6 +79,17 @@ local int gz_comp(state, flush)
     if (state->size == 0 && gz_init(state) == -1)
         return -1;
 
+    /* write directly if requested */
+    if (state->direct) {
+        got = write(state->fd, strm->next_in, strm->avail_in);
+        if (got < 0 || (unsigned)got != strm->avail_in) {
+            gz_error(state, Z_ERRNO, zstrerror());
+            return -1;
+        }
+        strm->avail_in = 0;
+        return 0;
+    }
+
     /* run deflate() on provided input until it produces no more output */
     ret = Z_OK;
     do {
@@ -75,8 +97,8 @@ local int gz_comp(state, flush)
            doing Z_FINISH then don't write until we get to Z_STREAM_END */
         if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
             (flush != Z_FINISH || ret == Z_STREAM_END))) {
-            have = (unsigned)(strm->next_out - state->next);
-            if (have && ((got = write(state->fd, state->next, have)) < 0 ||
+            have = (unsigned)(strm->next_out - state->x.next);
+            if (have && ((got = write(state->fd, state->x.next, have)) < 0 ||
                          (unsigned)got != have)) {
                 gz_error(state, Z_ERRNO, zstrerror());
                 return -1;
@@ -85,7 +107,7 @@ local int gz_comp(state, flush)
                 strm->avail_out = state->size;
                 strm->next_out = state->out;
             }
-            state->next = strm->next_out;
+            state->x.next = strm->next_out;
         }
 
         /* compress */
@@ -131,7 +153,7 @@ local int gz_zero(state, len)
         }
         strm->avail_in = n;
         strm->next_in = state->in;
-        state->pos += n;
+        state->x.pos += n;
         if (gz_comp(state, Z_NO_FLUSH) == -1)
             return -1;
         len -= n;
@@ -146,7 +168,6 @@ int ZEXPORT gzwrite(file, buf, len)
     unsigned len;
 {
     unsigned put = len;
-    unsigned n;
     gz_statep state;
     z_streamp strm;
 
@@ -163,7 +184,7 @@ int ZEXPORT gzwrite(file, buf, len)
     /* since an int is returned, make sure len fits in one, otherwise return
        with an error (this avoids the flaw in the interface) */
     if ((int)len < 0) {
-        gz_error(state, Z_BUF_ERROR, "requested length does not fit in int");
+        gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
         return 0;
     }
 
@@ -186,16 +207,19 @@ int ZEXPORT gzwrite(file, buf, len)
     if (len < state->size) {
         /* copy to input buffer, compress when full */
         do {
+            unsigned have, copy;
+
             if (strm->avail_in == 0)
                 strm->next_in = state->in;
-            n = state->size - strm->avail_in;
-            if (n > len)
-                n = len;
-            memcpy(strm->next_in + strm->avail_in, buf, n);
-            strm->avail_in += n;
-            state->pos += n;
-            buf = (char *)buf + n;
-            len -= n;
+            have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
+            copy = state->size - have;
+            if (copy > len)
+                copy = len;
+            memcpy(state->in + have, buf, copy);
+            strm->avail_in += copy;
+            state->x.pos += copy;
+            buf = (const char *)buf + copy;
+            len -= copy;
             if (len && gz_comp(state, Z_NO_FLUSH) == -1)
                 return 0;
         } while (len);
@@ -207,8 +231,8 @@ int ZEXPORT gzwrite(file, buf, len)
 
         /* directly compress user buffer to file */
         strm->avail_in = len;
-        strm->next_in = (voidp)buf;
-        state->pos += len;
+        strm->next_in = (z_const Bytef *)buf;
+        state->x.pos += len;
         if (gz_comp(state, Z_NO_FLUSH) == -1)
             return 0;
     }
@@ -222,6 +246,7 @@ int ZEXPORT gzputc(file, c)
     gzFile file;
     int c;
 {
+    unsigned have;
     unsigned char buf[1];
     gz_statep state;
     z_streamp strm;
@@ -245,19 +270,23 @@ int ZEXPORT gzputc(file, c)
 
     /* try writing to input buffer for speed (state->size == 0 if buffer not
        initialized) */
-    if (strm->avail_in < state->size) {
+    if (state->size) {
         if (strm->avail_in == 0)
             strm->next_in = state->in;
-        strm->next_in[strm->avail_in++] = c;
-        state->pos++;
-        return c;
+        have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
+        if (have < state->size) {
+            state->in[have] = c;
+            strm->avail_in++;
+            state->x.pos++;
+            return c & 0xff;
+        }
     }
 
     /* no room in buffer or not initialized, use gz_write() */
     buf[0] = c;
     if (gzwrite(file, buf, 1) != 1)
         return -1;
-    return c;
+    return c & 0xff;
 }
 
 /* -- see zlib.h -- */
@@ -274,16 +303,15 @@ int ZEXPORT gzputs(file, str)
     return ret == 0 && len != 0 ? -1 : ret;
 }
 
-#ifdef STDC
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
 #include <stdarg.h>
 
 /* -- see zlib.h -- */
-int ZEXPORTVA gzprintf (gzFile file, const char *format, ...)
+int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
 {
     int size, len;
     gz_statep state;
     z_streamp strm;
-    va_list va;
 
     /* get internal structure */
     if (file == NULL)
@@ -313,25 +341,20 @@ int ZEXPORTVA gzprintf (gzFile file, const char *format, ...)
     /* do the printf() into the input buffer, put length in len */
     size = (int)(state->size);
     state->in[size - 1] = 0;
-    va_start(va, format);
 #ifdef NO_vsnprintf
 #  ifdef HAS_vsprintf_void
-    (void)vsprintf(state->in, format, va);
-    va_end(va);
+    (void)vsprintf((char *)(state->in), format, va);
     for (len = 0; len < size; len++)
         if (state->in[len] == 0) break;
 #  else
-    len = vsprintf(state->in, format, va);
-    va_end(va);
+    len = vsprintf((char *)(state->in), format, va);
 #  endif
 #else
 #  ifdef HAS_vsnprintf_void
-    (void)vsnprintf(state->in, size, format, va);
-    va_end(va);
-    len = strlen(state->in);
+    (void)vsnprintf((char *)(state->in), size, format, va);
+    len = strlen((char *)(state->in));
 #  else
     len = vsnprintf((char *)(state->in), size, format, va);
-    va_end(va);
 #  endif
 #endif
 
@@ -342,11 +365,22 @@ int ZEXPORTVA gzprintf (gzFile file, const char *format, ...)
     /* update buffer and position, defer compression until needed */
     strm->avail_in = (unsigned)len;
     strm->next_in = state->in;
-    state->pos += len;
+    state->x.pos += len;
     return len;
 }
 
-#else /* !STDC */
+int ZEXPORTVA gzprintf(gzFile file, const char *format, ...)
+{
+    va_list va;
+    int ret;
+
+    va_start(va, format);
+    ret = gzvprintf(file, format, va);
+    va_end(va);
+    return ret;
+}
+
+#else /* !STDC && !Z_HAVE_STDARG_H */
 
 /* -- see zlib.h -- */
 int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
@@ -366,6 +400,10 @@ int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
     state = (gz_statep)file;
     strm = &(state->strm);
 
+    /* check that can really pass pointer in ints */
+    if (sizeof(int) != sizeof(void *))
+        return 0;
+
     /* check that we're writing and that there's no error */
     if (state->mode != GZ_WRITE || state->err != Z_OK)
         return 0;
@@ -390,22 +428,23 @@ int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
     state->in[size - 1] = 0;
 #ifdef NO_snprintf
 #  ifdef HAS_sprintf_void
-    sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8,
+    sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
     for (len = 0; len < size; len++)
         if (state->in[len] == 0) break;
 #  else
-    len = sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8,
-                a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+    len = sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
+                  a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
 #  endif
 #else
 #  ifdef HAS_snprintf_void
-    snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8,
+    snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8,
              a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-    len = strlen(state->in);
+    len = strlen((char *)(state->in));
 #  else
-    len = snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8,
-                 a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+    len = snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6,
+                   a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18,
+                   a19, a20);
 #  endif
 #endif
 
@@ -416,7 +455,7 @@ int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
     /* update buffer and position, defer compression until needed */
     strm->avail_in = (unsigned)len;
     strm->next_in = state->in;
-    state->pos += len;
+    state->x.pos += len;
     return len;
 }
 
@@ -500,7 +539,7 @@ int ZEXPORT gzsetparams(file, level, strategy)
 int ZEXPORT gzclose_w(file)
     gzFile file;
 {
-    int ret = 0;
+    int ret = Z_OK;
     gz_statep state;
 
     /* get internal structure */
@@ -515,17 +554,24 @@ int ZEXPORT gzclose_w(file)
     /* check for seek request */
     if (state->seek) {
         state->seek = 0;
-        ret += gz_zero(state, state->skip);
+        if (gz_zero(state, state->skip) == -1)
+            ret = state->err;
     }
 
     /* flush, free memory, and close file */
-    ret += gz_comp(state, Z_FINISH);
-    (void)deflateEnd(&(state->strm));
-    free(state->out);
-    free(state->in);
+    if (gz_comp(state, Z_FINISH) == -1)
+        ret = state->err;
+    if (state->size) {
+        if (!state->direct) {
+            (void)deflateEnd(&(state->strm));
+            free(state->out);
+        }
+        free(state->in);
+    }
     gz_error(state, Z_OK, NULL);
     free(state->path);
-    ret += close(state->fd);
+    if (close(state->fd) == -1)
+        ret = Z_ERRNO;
     free(state);
-    return ret ? Z_ERRNO : Z_OK;
+    return ret;
 }
diff --git a/Externals/zlib/infback.c b/Externals/zlib/infback.c
index af3a8c965d..f3833c2e43 100644
--- a/Externals/zlib/infback.c
+++ b/Externals/zlib/infback.c
@@ -1,5 +1,5 @@
 /* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2009 Mark Adler
+ * Copyright (C) 1995-2011 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -42,10 +42,19 @@ int stream_size;
         return Z_STREAM_ERROR;
     strm->msg = Z_NULL;                 /* in case we return an error */
     if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
         strm->zalloc = zcalloc;
         strm->opaque = (voidpf)0;
+#endif
     }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+    strm->zfree = zcfree;
+#endif
     state = (struct inflate_state FAR *)ZALLOC(strm, 1,
                                                sizeof(struct inflate_state));
     if (state == Z_NULL) return Z_MEM_ERROR;
@@ -246,7 +255,7 @@ out_func out;
 void FAR *out_desc;
 {
     struct inflate_state FAR *state;
-    unsigned char FAR *next;    /* next input */
+    z_const unsigned char FAR *next;    /* next input */
     unsigned char FAR *put;     /* next output */
     unsigned have, left;        /* available input and output */
     unsigned long hold;         /* bit buffer */
@@ -394,7 +403,6 @@ void FAR *out_desc;
                     PULLBYTE();
                 }
                 if (here.val < 16) {
-                    NEEDBITS(here.bits);
                     DROPBITS(here.bits);
                     state->lens[state->have++] = here.val;
                 }
diff --git a/Externals/zlib/inffast.c b/Externals/zlib/inffast.c
index 2f1d60b43b..bda59ceb6a 100644
--- a/Externals/zlib/inffast.c
+++ b/Externals/zlib/inffast.c
@@ -1,5 +1,5 @@
 /* inffast.c -- fast decoding
- * Copyright (C) 1995-2008, 2010 Mark Adler
+ * Copyright (C) 1995-2008, 2010, 2013 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -69,8 +69,8 @@ z_streamp strm;
 unsigned start;         /* inflate()'s starting value for strm->avail_out */
 {
     struct inflate_state FAR *state;
-    unsigned char FAR *in;      /* local strm->next_in */
-    unsigned char FAR *last;    /* while in < last, enough input available */
+    z_const unsigned char FAR *in;      /* local strm->next_in */
+    z_const unsigned char FAR *last;    /* have enough input while in < last */
     unsigned char FAR *out;     /* local strm->next_out */
     unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
     unsigned char FAR *end;     /* while out < end, enough space available */
diff --git a/Externals/zlib/inffixed.h b/Externals/zlib/inffixed.h
index 75ed4b5978..d628327769 100644
--- a/Externals/zlib/inffixed.h
+++ b/Externals/zlib/inffixed.h
@@ -2,9 +2,9 @@
      * Generated automatically by makefixed().
      */
 
-    /* WARNING: this file should *not* be used by applications. It
-       is part of the implementation of the compression library and
-       is subject to change. Applications should only use zlib.h.
+    /* WARNING: this file should *not* be used by applications.
+       It is part of the implementation of this library and is
+       subject to change. Applications should only use zlib.h.
      */
 
     static const code lenfix[512] = {
diff --git a/Externals/zlib/inflate.c b/Externals/zlib/inflate.c
index a8431abeac..870f89bb4d 100644
--- a/Externals/zlib/inflate.c
+++ b/Externals/zlib/inflate.c
@@ -1,5 +1,5 @@
 /* inflate.c -- zlib decompression
- * Copyright (C) 1995-2010 Mark Adler
+ * Copyright (C) 1995-2012 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -93,14 +93,15 @@
 
 /* function prototypes */
 local void fixedtables OF((struct inflate_state FAR *state));
-local int updatewindow OF((z_streamp strm, unsigned out));
+local int updatewindow OF((z_streamp strm, const unsigned char FAR *end,
+                           unsigned copy));
 #ifdef BUILDFIXED
    void makefixed OF((void));
 #endif
-local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
+local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf,
                               unsigned len));
 
-int ZEXPORT inflateReset(strm)
+int ZEXPORT inflateResetKeep(strm)
 z_streamp strm;
 {
     struct inflate_state FAR *state;
@@ -109,15 +110,13 @@ z_streamp strm;
     state = (struct inflate_state FAR *)strm->state;
     strm->total_in = strm->total_out = state->total = 0;
     strm->msg = Z_NULL;
-    strm->adler = 1;        /* to support ill-conceived Java test suite */
+    if (state->wrap)        /* to support ill-conceived Java test suite */
+        strm->adler = state->wrap & 1;
     state->mode = HEAD;
     state->last = 0;
     state->havedict = 0;
     state->dmax = 32768U;
     state->head = Z_NULL;
-    state->wsize = 0;
-    state->whave = 0;
-    state->wnext = 0;
     state->hold = 0;
     state->bits = 0;
     state->lencode = state->distcode = state->next = state->codes;
@@ -127,6 +126,19 @@ z_streamp strm;
     return Z_OK;
 }
 
+int ZEXPORT inflateReset(strm)
+z_streamp strm;
+{
+    struct inflate_state FAR *state;
+
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+    state->wsize = 0;
+    state->whave = 0;
+    state->wnext = 0;
+    return inflateResetKeep(strm);
+}
+
 int ZEXPORT inflateReset2(strm, windowBits)
 z_streamp strm;
 int windowBits;
@@ -180,10 +192,19 @@ int stream_size;
     if (strm == Z_NULL) return Z_STREAM_ERROR;
     strm->msg = Z_NULL;                 /* in case we return an error */
     if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
         strm->zalloc = zcalloc;
         strm->opaque = (voidpf)0;
+#endif
     }
-    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zfree = zcfree;
+#endif
     state = (struct inflate_state FAR *)
             ZALLOC(strm, 1, sizeof(struct inflate_state));
     if (state == Z_NULL) return Z_MEM_ERROR;
@@ -321,8 +342,8 @@ void makefixed()
     low = 0;
     for (;;) {
         if ((low % 7) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits,
-               state.lencode[low].val);
+        printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op,
+               state.lencode[low].bits, state.lencode[low].val);
         if (++low == size) break;
         putchar(',');
     }
@@ -355,12 +376,13 @@ void makefixed()
    output will fall in the output data, making match copies simpler and faster.
    The advantage may be dependent on the size of the processor's data caches.
  */
-local int updatewindow(strm, out)
+local int updatewindow(strm, end, copy)
 z_streamp strm;
-unsigned out;
+const Bytef *end;
+unsigned copy;
 {
     struct inflate_state FAR *state;
-    unsigned copy, dist;
+    unsigned dist;
 
     state = (struct inflate_state FAR *)strm->state;
 
@@ -380,19 +402,18 @@ unsigned out;
     }
 
     /* copy state->wsize or less output bytes into the circular window */
-    copy = out - strm->avail_out;
     if (copy >= state->wsize) {
-        zmemcpy(state->window, strm->next_out - state->wsize, state->wsize);
+        zmemcpy(state->window, end - state->wsize, state->wsize);
         state->wnext = 0;
         state->whave = state->wsize;
     }
     else {
         dist = state->wsize - state->wnext;
         if (dist > copy) dist = copy;
-        zmemcpy(state->window + state->wnext, strm->next_out - copy, dist);
+        zmemcpy(state->window + state->wnext, end - copy, dist);
         copy -= dist;
         if (copy) {
-            zmemcpy(state->window, strm->next_out - copy, copy);
+            zmemcpy(state->window, end - copy, copy);
             state->wnext = copy;
             state->whave = state->wsize;
         }
@@ -499,11 +520,6 @@ unsigned out;
         bits -= bits & 7; \
     } while (0)
 
-/* Reverse the bytes in a 32-bit value */
-#define REVERSE(q) \
-    ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
-     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
-
 /*
    inflate() uses a state machine to process as much input data and generate as
    much output data as possible before returning.  The state machine is
@@ -591,7 +607,7 @@ z_streamp strm;
 int flush;
 {
     struct inflate_state FAR *state;
-    unsigned char FAR *next;    /* next input */
+    z_const unsigned char FAR *next;    /* next input */
     unsigned char FAR *put;     /* next output */
     unsigned have, left;        /* available input and output */
     unsigned long hold;         /* bit buffer */
@@ -797,7 +813,7 @@ int flush;
 #endif
         case DICTID:
             NEEDBITS(32);
-            strm->adler = state->check = REVERSE(hold);
+            strm->adler = state->check = ZSWAP32(hold);
             INITBITS();
             state->mode = DICT;
         case DICT:
@@ -905,7 +921,7 @@ int flush;
             while (state->have < 19)
                 state->lens[order[state->have++]] = 0;
             state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
+            state->lencode = (const code FAR *)(state->next);
             state->lenbits = 7;
             ret = inflate_table(CODES, state->lens, 19, &(state->next),
                                 &(state->lenbits), state->work);
@@ -925,7 +941,6 @@ int flush;
                     PULLBYTE();
                 }
                 if (here.val < 16) {
-                    NEEDBITS(here.bits);
                     DROPBITS(here.bits);
                     state->lens[state->have++] = here.val;
                 }
@@ -980,7 +995,7 @@ int flush;
                values here (9 and 6) without reading the comments in inftrees.h
                concerning the ENOUGH constants, which depend on those values */
             state->next = state->codes;
-            state->lencode = (code const FAR *)(state->next);
+            state->lencode = (const code FAR *)(state->next);
             state->lenbits = 9;
             ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
                                 &(state->lenbits), state->work);
@@ -989,7 +1004,7 @@ int flush;
                 state->mode = BAD;
                 break;
             }
-            state->distcode = (code const FAR *)(state->next);
+            state->distcode = (const code FAR *)(state->next);
             state->distbits = 6;
             ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
                             &(state->next), &(state->distbits), state->work);
@@ -1170,7 +1185,7 @@ int flush;
 #ifdef GUNZIP
                      state->flags ? hold :
 #endif
-                     REVERSE(hold)) != state->check) {
+                     ZSWAP32(hold)) != state->check) {
                     strm->msg = (char *)"incorrect data check";
                     state->mode = BAD;
                     break;
@@ -1214,8 +1229,9 @@ int flush;
      */
   inf_leave:
     RESTORE();
-    if (state->wsize || (state->mode < CHECK && out != strm->avail_out))
-        if (updatewindow(strm, out)) {
+    if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
+            (state->mode < CHECK || flush != Z_FINISH)))
+        if (updatewindow(strm, strm->next_out, out - strm->avail_out)) {
             state->mode = MEM;
             return Z_MEM_ERROR;
         }
@@ -1249,13 +1265,37 @@ z_streamp strm;
     return Z_OK;
 }
 
+int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength)
+z_streamp strm;
+Bytef *dictionary;
+uInt *dictLength;
+{
+    struct inflate_state FAR *state;
+
+    /* check state */
+    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* copy dictionary */
+    if (state->whave && dictionary != Z_NULL) {
+        zmemcpy(dictionary, state->window + state->wnext,
+                state->whave - state->wnext);
+        zmemcpy(dictionary + state->whave - state->wnext,
+                state->window, state->wnext);
+    }
+    if (dictLength != Z_NULL)
+        *dictLength = state->whave;
+    return Z_OK;
+}
+
 int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
 z_streamp strm;
 const Bytef *dictionary;
 uInt dictLength;
 {
     struct inflate_state FAR *state;
-    unsigned long id;
+    unsigned long dictid;
+    int ret;
 
     /* check state */
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
@@ -1263,29 +1303,21 @@ uInt dictLength;
     if (state->wrap != 0 && state->mode != DICT)
         return Z_STREAM_ERROR;
 
-    /* check for correct dictionary id */
+    /* check for correct dictionary identifier */
     if (state->mode == DICT) {
-        id = adler32(0L, Z_NULL, 0);
-        id = adler32(id, dictionary, dictLength);
-        if (id != state->check)
+        dictid = adler32(0L, Z_NULL, 0);
+        dictid = adler32(dictid, dictionary, dictLength);
+        if (dictid != state->check)
             return Z_DATA_ERROR;
     }
 
-    /* copy dictionary to window */
-    if (updatewindow(strm, strm->avail_out)) {
+    /* copy dictionary to window using updatewindow(), which will amend the
+       existing dictionary if appropriate */
+    ret = updatewindow(strm, dictionary + dictLength, dictLength);
+    if (ret) {
         state->mode = MEM;
         return Z_MEM_ERROR;
     }
-    if (dictLength > state->wsize) {
-        zmemcpy(state->window, dictionary + dictLength - state->wsize,
-                state->wsize);
-        state->whave = state->wsize;
-    }
-    else {
-        zmemcpy(state->window + state->wsize - dictLength, dictionary,
-                dictLength);
-        state->whave = dictLength;
-    }
     state->havedict = 1;
     Tracev((stderr, "inflate:   dictionary set\n"));
     return Z_OK;
@@ -1321,7 +1353,7 @@ gz_headerp head;
  */
 local unsigned syncsearch(have, buf, len)
 unsigned FAR *have;
-unsigned char FAR *buf;
+const unsigned char FAR *buf;
 unsigned len;
 {
     unsigned got;
@@ -1433,8 +1465,8 @@ z_streamp source;
     }
 
     /* copy state */
-    zmemcpy(dest, source, sizeof(z_stream));
-    zmemcpy(copy, state, sizeof(struct inflate_state));
+    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+    zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
     if (state->lencode >= state->codes &&
         state->lencode <= state->codes + ENOUGH - 1) {
         copy->lencode = copy->codes + (state->lencode - state->codes);
diff --git a/Externals/zlib/inftrees.c b/Externals/zlib/inftrees.c
index 11e9c52acc..44d89cf24e 100644
--- a/Externals/zlib/inftrees.c
+++ b/Externals/zlib/inftrees.c
@@ -1,5 +1,5 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2010 Mark Adler
+ * Copyright (C) 1995-2013 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.5 Copyright 1995-2010 Mark Adler ";
+   " inflate 1.2.8 Copyright 1995-2013 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -62,7 +62,7 @@ unsigned short FAR *work;
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 73, 195};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78};
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
@@ -208,8 +208,8 @@ unsigned short FAR *work;
     mask = used - 1;            /* mask for comparing low */
 
     /* check available table space */
-    if ((type == LENS && used >= ENOUGH_LENS) ||
-        (type == DISTS && used >= ENOUGH_DISTS))
+    if ((type == LENS && used > ENOUGH_LENS) ||
+        (type == DISTS && used > ENOUGH_DISTS))
         return 1;
 
     /* process all codes and make table entries */
@@ -277,8 +277,8 @@ unsigned short FAR *work;
 
             /* check for enough space */
             used += 1U << curr;
-            if ((type == LENS && used >= ENOUGH_LENS) ||
-                (type == DISTS && used >= ENOUGH_DISTS))
+            if ((type == LENS && used > ENOUGH_LENS) ||
+                (type == DISTS && used > ENOUGH_DISTS))
                 return 1;
 
             /* point entry in root table to sub-table */
@@ -289,38 +289,14 @@ unsigned short FAR *work;
         }
     }
 
-    /*
-       Fill in rest of table for incomplete codes.  This loop is similar to the
-       loop above in incrementing huff for table indices.  It is assumed that
-       len is equal to curr + drop, so there is no loop needed to increment
-       through high index bits.  When the current sub-table is filled, the loop
-       drops back to the root table to fill in any remaining entries there.
-     */
-    here.op = (unsigned char)64;                /* invalid code marker */
-    here.bits = (unsigned char)(len - drop);
-    here.val = (unsigned short)0;
-    while (huff != 0) {
-        /* when done with sub-table, drop back to root table */
-        if (drop != 0 && (huff & mask) != low) {
-            drop = 0;
-            len = root;
-            next = *table;
-            here.bits = (unsigned char)len;
-        }
-
-        /* put invalid code marker in table */
-        next[huff >> drop] = here;
-
-        /* backwards increment the len-bit code huff */
-        incr = 1U << (len - 1);
-        while (huff & incr)
-            incr >>= 1;
-        if (incr != 0) {
-            huff &= incr - 1;
-            huff += incr;
-        }
-        else
-            huff = 0;
+    /* fill in remaining table entry if code is incomplete (guaranteed to have
+       at most one remaining entry, since if the code is incomplete, the
+       maximum code length that was allowed to get this far is one bit) */
+    if (huff != 0) {
+        here.op = (unsigned char)64;            /* invalid code marker */
+        here.bits = (unsigned char)(len - drop);
+        here.val = (unsigned short)0;
+        next[huff] = here;
     }
 
     /* set return parameters */
diff --git a/Externals/zlib/trees.c b/Externals/zlib/trees.c
index 56e9bb1c11..1fd7759ef0 100644
--- a/Externals/zlib/trees.c
+++ b/Externals/zlib/trees.c
@@ -1,5 +1,5 @@
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2010 Jean-loup Gailly
+ * Copyright (C) 1995-2012 Jean-loup Gailly
  * detect_data_type() function provided freely by Cosmin Truta, 2006
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
@@ -74,11 +74,6 @@ local const uch bl_order[BL_CODES]
  * probability, to avoid transmitting the lengths for unused bit length codes.
  */
 
-#define Buf_size (8 * 2*sizeof(char))
-/* Number of bits used within bi_buf. (bi_buf might be implemented on
- * more than 16 bits on some systems.)
- */
-
 /* ===========================================================================
  * Local data. These are initialized only once.
  */
@@ -151,8 +146,8 @@ local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
 local int  build_bl_tree  OF((deflate_state *s));
 local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
                               int blcodes));
-local void compress_block OF((deflate_state *s, ct_data *ltree,
-                              ct_data *dtree));
+local void compress_block OF((deflate_state *s, const ct_data *ltree,
+                              const ct_data *dtree));
 local int  detect_data_type OF((deflate_state *s));
 local unsigned bi_reverse OF((unsigned value, int length));
 local void bi_windup      OF((deflate_state *s));
@@ -399,7 +394,6 @@ void ZLIB_INTERNAL _tr_init(s)
 
     s->bi_buf = 0;
     s->bi_valid = 0;
-    s->last_eob_len = 8; /* enough lookahead for inflate */
 #ifdef DEBUG
     s->compressed_len = 0L;
     s->bits_sent = 0L;
@@ -882,16 +876,18 @@ void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last)
     copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
 }
 
+/* ===========================================================================
+ * Flush the bits in the bit buffer to pending output (leaves at most 7 bits)
+ */
+void ZLIB_INTERNAL _tr_flush_bits(s)
+    deflate_state *s;
+{
+    bi_flush(s);
+}
+
 /* ===========================================================================
  * Send one empty static block to give enough lookahead for inflate.
  * This takes 10 bits, of which 7 may remain in the bit buffer.
- * The current inflate code requires 9 bits of lookahead. If the
- * last two codes for the previous block (real code plus EOB) were coded
- * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode
- * the last real code. In this case we send two empty static blocks instead
- * of one. (There are no problems if the previous block is stored or fixed.)
- * To simplify the code, we assume the worst case of last real code encoded
- * on one bit only.
  */
 void ZLIB_INTERNAL _tr_align(s)
     deflate_state *s;
@@ -902,20 +898,6 @@ void ZLIB_INTERNAL _tr_align(s)
     s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
 #endif
     bi_flush(s);
-    /* Of the 10 bits for the empty block, we have already sent
-     * (10 - bi_valid) bits. The lookahead for the last real code (before
-     * the EOB of the previous block) was thus at least one plus the length
-     * of the EOB plus what we have just sent of the empty static block.
-     */
-    if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {
-        send_bits(s, STATIC_TREES<<1, 3);
-        send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
-        s->compressed_len += 10L;
-#endif
-        bi_flush(s);
-    }
-    s->last_eob_len = 7;
 }
 
 /* ===========================================================================
@@ -990,7 +972,8 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
     } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
 #endif
         send_bits(s, (STATIC_TREES<<1)+last, 3);
-        compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
+        compress_block(s, (const ct_data *)static_ltree,
+                       (const ct_data *)static_dtree);
 #ifdef DEBUG
         s->compressed_len += 3 + s->static_len;
 #endif
@@ -998,7 +981,8 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
         send_bits(s, (DYN_TREES<<1)+last, 3);
         send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
                        max_blindex+1);
-        compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);
+        compress_block(s, (const ct_data *)s->dyn_ltree,
+                       (const ct_data *)s->dyn_dtree);
 #ifdef DEBUG
         s->compressed_len += 3 + s->opt_len;
 #endif
@@ -1075,8 +1059,8 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
  */
 local void compress_block(s, ltree, dtree)
     deflate_state *s;
-    ct_data *ltree; /* literal tree */
-    ct_data *dtree; /* distance tree */
+    const ct_data *ltree; /* literal tree */
+    const ct_data *dtree; /* distance tree */
 {
     unsigned dist;      /* distance of matched string */
     int lc;             /* match length or unmatched char (if dist == 0) */
@@ -1118,7 +1102,6 @@ local void compress_block(s, ltree, dtree)
     } while (lx < s->last_lit);
 
     send_code(s, END_BLOCK, ltree);
-    s->last_eob_len = ltree[END_BLOCK].Len;
 }
 
 /* ===========================================================================
@@ -1226,7 +1209,6 @@ local void copy_block(s, buf, len, header)
     int      header;  /* true if block header must be written */
 {
     bi_windup(s);        /* align on byte boundary */
-    s->last_eob_len = 8; /* enough lookahead for inflate */
 
     if (header) {
         put_short(s, (ush)len);
diff --git a/Externals/zlib/uncompr.c b/Externals/zlib/uncompr.c
index ad98be3a5d..242e9493df 100644
--- a/Externals/zlib/uncompr.c
+++ b/Externals/zlib/uncompr.c
@@ -30,7 +30,7 @@ int ZEXPORT uncompress (dest, destLen, source, sourceLen)
     z_stream stream;
     int err;
 
-    stream.next_in = (Bytef*)source;
+    stream.next_in = (z_const Bytef *)source;
     stream.avail_in = (uInt)sourceLen;
     /* Check for source > 64K on 16-bit machine: */
     if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
diff --git a/Externals/zlib/zconf.h b/Externals/zlib/zconf.h
index 02ce56c431..9987a77553 100644
--- a/Externals/zlib/zconf.h
+++ b/Externals/zlib/zconf.h
@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2010 Jean-loup Gailly.
+ * Copyright (C) 1995-2013 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -15,11 +15,13 @@
  * this permanently in zconf.h using "./configure --zprefix".
  */
 #ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
+#  define Z_PREFIX_SET
 
 /* all linked symbols */
 #  define _dist_code            z__dist_code
 #  define _length_code          z__length_code
 #  define _tr_align             z__tr_align
+#  define _tr_flush_bits        z__tr_flush_bits
 #  define _tr_flush_block       z__tr_flush_block
 #  define _tr_init              z__tr_init
 #  define _tr_stored_block      z__tr_stored_block
@@ -27,9 +29,11 @@
 #  define adler32               z_adler32
 #  define adler32_combine       z_adler32_combine
 #  define adler32_combine64     z_adler32_combine64
-#  define compress              z_compress
-#  define compress2             z_compress2
-#  define compressBound         z_compressBound
+#  ifndef Z_SOLO
+#    define compress              z_compress
+#    define compress2             z_compress2
+#    define compressBound         z_compressBound
+#  endif
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
@@ -40,44 +44,53 @@
 #  define deflateInit2_         z_deflateInit2_
 #  define deflateInit_          z_deflateInit_
 #  define deflateParams         z_deflateParams
+#  define deflatePending        z_deflatePending
 #  define deflatePrime          z_deflatePrime
 #  define deflateReset          z_deflateReset
+#  define deflateResetKeep      z_deflateResetKeep
 #  define deflateSetDictionary  z_deflateSetDictionary
 #  define deflateSetHeader      z_deflateSetHeader
 #  define deflateTune           z_deflateTune
 #  define deflate_copyright     z_deflate_copyright
 #  define get_crc_table         z_get_crc_table
-#  define gz_error              z_gz_error
-#  define gz_intmax             z_gz_intmax
-#  define gz_strwinerror        z_gz_strwinerror
-#  define gzbuffer              z_gzbuffer
-#  define gzclearerr            z_gzclearerr
-#  define gzclose               z_gzclose
-#  define gzclose_r             z_gzclose_r
-#  define gzclose_w             z_gzclose_w
-#  define gzdirect              z_gzdirect
-#  define gzdopen               z_gzdopen
-#  define gzeof                 z_gzeof
-#  define gzerror               z_gzerror
-#  define gzflush               z_gzflush
-#  define gzgetc                z_gzgetc
-#  define gzgets                z_gzgets
-#  define gzoffset              z_gzoffset
-#  define gzoffset64            z_gzoffset64
-#  define gzopen                z_gzopen
-#  define gzopen64              z_gzopen64
-#  define gzprintf              z_gzprintf
-#  define gzputc                z_gzputc
-#  define gzputs                z_gzputs
-#  define gzread                z_gzread
-#  define gzrewind              z_gzrewind
-#  define gzseek                z_gzseek
-#  define gzseek64              z_gzseek64
-#  define gzsetparams           z_gzsetparams
-#  define gztell                z_gztell
-#  define gztell64              z_gztell64
-#  define gzungetc              z_gzungetc
-#  define gzwrite               z_gzwrite
+#  ifndef Z_SOLO
+#    define gz_error              z_gz_error
+#    define gz_intmax             z_gz_intmax
+#    define gz_strwinerror        z_gz_strwinerror
+#    define gzbuffer              z_gzbuffer
+#    define gzclearerr            z_gzclearerr
+#    define gzclose               z_gzclose
+#    define gzclose_r             z_gzclose_r
+#    define gzclose_w             z_gzclose_w
+#    define gzdirect              z_gzdirect
+#    define gzdopen               z_gzdopen
+#    define gzeof                 z_gzeof
+#    define gzerror               z_gzerror
+#    define gzflush               z_gzflush
+#    define gzgetc                z_gzgetc
+#    define gzgetc_               z_gzgetc_
+#    define gzgets                z_gzgets
+#    define gzoffset              z_gzoffset
+#    define gzoffset64            z_gzoffset64
+#    define gzopen                z_gzopen
+#    define gzopen64              z_gzopen64
+#    ifdef _WIN32
+#      define gzopen_w              z_gzopen_w
+#    endif
+#    define gzprintf              z_gzprintf
+#    define gzvprintf             z_gzvprintf
+#    define gzputc                z_gzputc
+#    define gzputs                z_gzputs
+#    define gzread                z_gzread
+#    define gzrewind              z_gzrewind
+#    define gzseek                z_gzseek
+#    define gzseek64              z_gzseek64
+#    define gzsetparams           z_gzsetparams
+#    define gztell                z_gztell
+#    define gztell64              z_gztell64
+#    define gzungetc              z_gzungetc
+#    define gzwrite               z_gzwrite
+#  endif
 #  define inflate               z_inflate
 #  define inflateBack           z_inflateBack
 #  define inflateBackEnd        z_inflateBackEnd
@@ -92,16 +105,22 @@
 #  define inflateReset          z_inflateReset
 #  define inflateReset2         z_inflateReset2
 #  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateSync           z_inflateSync
 #  define inflateSyncPoint      z_inflateSyncPoint
 #  define inflateUndermine      z_inflateUndermine
+#  define inflateResetKeep      z_inflateResetKeep
 #  define inflate_copyright     z_inflate_copyright
 #  define inflate_fast          z_inflate_fast
 #  define inflate_table         z_inflate_table
-#  define uncompress            z_uncompress
+#  ifndef Z_SOLO
+#    define uncompress            z_uncompress
+#  endif
 #  define zError                z_zError
-#  define zcalloc               z_zcalloc
-#  define zcfree                z_zcfree
+#  ifndef Z_SOLO
+#    define zcalloc               z_zcalloc
+#    define zcfree                z_zcfree
+#  endif
 #  define zlibCompileFlags      z_zlibCompileFlags
 #  define zlibVersion           z_zlibVersion
 
@@ -111,7 +130,9 @@
 #  define alloc_func            z_alloc_func
 #  define charf                 z_charf
 #  define free_func             z_free_func
-#  define gzFile                z_gzFile
+#  ifndef Z_SOLO
+#    define gzFile                z_gzFile
+#  endif
 #  define gz_header             z_gz_header
 #  define gz_headerp            z_gz_headerp
 #  define in_func               z_in_func
@@ -197,6 +218,12 @@
 #  endif
 #endif
 
+#if defined(ZLIB_CONST) && !defined(z_const)
+#  define z_const const
+#else
+#  define z_const
+#endif
+
 /* Some Mac compilers merge all .h files incorrectly: */
 #if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
 #  define NO_DUMMY_DECL
@@ -243,6 +270,14 @@
 #  endif
 #endif
 
+#ifndef Z_ARG /* function prototypes for stdarg */
+#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#    define Z_ARG(args)  args
+#  else
+#    define Z_ARG(args)  ()
+#  endif
+#endif
+
 /* The following definitions for FAR are needed only for MSDOS mixed
  * model programming (small or medium model with some far allocations).
  * This was tested only with MSC; for other MSDOS compilers you may have
@@ -356,12 +391,47 @@ typedef uLong FAR uLongf;
    typedef Byte       *voidp;
 #endif
 
+#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+#  include <limits.h>
+#  if (UINT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned
+#  elif (ULONG_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned long
+#  elif (USHRT_MAX == 0xffffffffUL)
+#    define Z_U4 unsigned short
+#  endif
+#endif
+
+#ifdef Z_U4
+   typedef Z_U4 z_crc_t;
+#else
+   typedef unsigned long z_crc_t;
+#endif
+
 #ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
 #  define Z_HAVE_UNISTD_H
 #endif
 
+#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
+#  define Z_HAVE_STDARG_H
+#endif
+
 #ifdef STDC
-#  include <sys/types.h>    /* for off_t */
+#  ifndef Z_SOLO
+#    include <sys/types.h>      /* for off_t */
+#  endif
+#endif
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+#    include <stdarg.h>         /* for va_list */
+#  endif
+#endif
+
+#ifdef _WIN32
+#  ifndef Z_SOLO
+#    include <stddef.h>         /* for wchar_t */
+#  endif
 #endif
 
 /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
@@ -370,21 +440,38 @@ typedef uLong FAR uLongf;
  * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
  * equivalently requesting no 64-bit operations
  */
-#if -_LARGEFILE64_SOURCE - -1 == 1
+#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
 #  undef _LARGEFILE64_SOURCE
 #endif
 
-#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#  include <unistd.h>       /* for SEEK_* and off_t */
-#  ifdef VMS
-#    include <unixio.h>     /* for off_t */
-#  endif
-#  ifndef z_off_t
-#    define z_off_t off_t
+#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
+#  define Z_HAVE_UNISTD_H
+#endif
+#ifndef Z_SOLO
+#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
+#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+#    ifdef VMS
+#      include <unixio.h>       /* for off_t */
+#    endif
+#    ifndef z_off_t
+#      define z_off_t off_t
+#    endif
 #  endif
 #endif
 
-#ifndef SEEK_SET
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
+#  define Z_LFS64
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
+#  define Z_LARGE64
+#endif
+
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
+#  define Z_WANT64
+#endif
+
+#if !defined(SEEK_SET) && !defined(Z_SOLO)
 #  define SEEK_SET        0       /* Seek from beginning of file.  */
 #  define SEEK_CUR        1       /* Seek from current position.  */
 #  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
@@ -394,18 +481,14 @@ typedef uLong FAR uLongf;
 #  define z_off_t long
 #endif
 
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+#if !defined(_WIN32) && defined(Z_LARGE64)
 #  define z_off64_t off64_t
 #else
-#  define z_off64_t z_off_t
-#endif
-
-#if defined(__OS400__)
-#  define NO_vsnprintf
-#endif
-
-#if defined(__MVS__)
-#  define NO_vsnprintf
+#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+#    define z_off64_t __int64
+#  else
+#    define z_off64_t z_off_t
+#  endif
 #endif
 
 /* MVS linker does not support external names larger than 8 bytes */
diff --git a/Externals/zlib/zlib.h b/Externals/zlib/zlib.h
index bfbba83e8e..3e0c7672ac 100644
--- a/Externals/zlib/zlib.h
+++ b/Externals/zlib/zlib.h
@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.5, April 19th, 2010
+  version 1.2.8, April 28th, 2013
 
-  Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -24,8 +24,8 @@
 
 
   The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
+  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
+  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
 */
 
 #ifndef ZLIB_H
@@ -37,11 +37,11 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.5"
-#define ZLIB_VERNUM 0x1250
+#define ZLIB_VERSION "1.2.8"
+#define ZLIB_VERNUM 0x1280
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 5
+#define ZLIB_VER_REVISION 8
 #define ZLIB_VER_SUBREVISION 0
 
 /*
@@ -83,15 +83,15 @@ typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
 struct internal_state;
 
 typedef struct z_stream_s {
-    Bytef    *next_in;  /* next input byte */
+    z_const Bytef *next_in;     /* next input byte */
     uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total nb of input bytes read so far */
+    uLong    total_in;  /* total number of input bytes read so far */
 
     Bytef    *next_out; /* next output byte should be put there */
     uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total nb of bytes output so far */
+    uLong    total_out; /* total number of bytes output so far */
 
-    char     *msg;      /* last error message, NULL if no error */
+    z_const char *msg;  /* last error message, NULL if no error */
     struct internal_state FAR *state; /* not visible by applications */
 
     alloc_func zalloc;  /* used to allocate the internal state */
@@ -327,8 +327,9 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
 
     Z_FINISH can be used immediately after deflateInit if all the compression
   is to be done in a single step.  In this case, avail_out must be at least the
-  value returned by deflateBound (see below).  If deflate does not return
-  Z_STREAM_END, then it must be called again as described above.
+  value returned by deflateBound (see below).  Then deflate is guaranteed to
+  return Z_STREAM_END.  If not enough output space is provided, deflate will
+  not return Z_STREAM_END, and it must be called again as described above.
 
     deflate() sets strm->adler to the adler32 checksum of all input read
   so far (that is, total_in bytes).
@@ -451,23 +452,29 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   error.  However if all decompression is to be performed in a single step (a
   single call of inflate), the parameter flush should be set to Z_FINISH.  In
   this case all pending input is processed and all pending output is flushed;
-  avail_out must be large enough to hold all the uncompressed data.  (The size
-  of the uncompressed data may have been saved by the compressor for this
-  purpose.) The next operation on this stream must be inflateEnd to deallocate
-  the decompression state.  The use of Z_FINISH is never required, but can be
-  used to inform inflate that a faster approach may be used for the single
-  inflate() call.
+  avail_out must be large enough to hold all of the uncompressed data for the
+  operation to complete.  (The size of the uncompressed data may have been
+  saved by the compressor for this purpose.) The use of Z_FINISH is not
+  required to perform an inflation in one step.  However it may be used to
+  inform inflate that a faster approach can be used for the single inflate()
+  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
+  stream completes, which reduces inflate's memory footprint.  If the stream
+  does not complete, either because not all of the stream is provided or not
+  enough output space is provided, then a sliding window will be allocated and
+  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
+  been used.
 
      In this implementation, inflate() always flushes as much output as
   possible to the output buffer, and always uses the faster approach on the
-  first call.  So the only effect of the flush parameter in this implementation
-  is on the return value of inflate(), as noted below, or when it returns early
-  because Z_BLOCK or Z_TREES is used.
+  first call.  So the effects of the flush parameter in this implementation are
+  on the return value of inflate() as noted below, when inflate() returns early
+  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
+  memory for a sliding window when Z_FINISH is used.
 
      If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the adler32 checksum of the dictionary
+  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
   chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the adler32 checksum of all output produced so far (that is,
+  strm->adler to the Adler-32 checksum of all output produced so far (that is,
   total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
   below.  At the end of the stream, inflate() checks that its computed adler32
   checksum is equal to that saved by the compressor and returns Z_STREAM_END
@@ -478,7 +485,9 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   initializing with inflateInit2().  Any information contained in the gzip
   header is not retained, so applications that need that information should
   instead use raw inflate, see inflateInit2() below, or inflateBack() and
-  perform their own processing of the gzip header and trailer.
+  perform their own processing of the gzip header and trailer.  When processing
+  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
+  producted so far.  The CRC-32 is checked against the gzip trailer.
 
     inflate() returns Z_OK if some progress has been made (more input processed
   or more output produced), Z_STREAM_END if the end of the compressed data has
@@ -580,10 +589,15 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
                                              uInt  dictLength));
 /*
      Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output.  This function must be called
-   immediately after deflateInit, deflateInit2 or deflateReset, before any call
-   of deflate.  The compressor and decompressor must use exactly the same
-   dictionary (see inflateSetDictionary).
+   without producing any compressed output.  When using the zlib format, this
+   function must be called immediately after deflateInit, deflateInit2 or
+   deflateReset, and before any call of deflate.  When doing raw deflate, this
+   function must be called either before any call of deflate, or immediately
+   after the completion of a deflate block, i.e. after all input has been
+   consumed and all output has been delivered when using any of the flush
+   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
+   compressor and decompressor must use exactly the same dictionary (see
+   inflateSetDictionary).
 
      The dictionary should consist of strings (byte sequences) that are likely
    to be encountered later in the data to be compressed, with the most commonly
@@ -610,8 +624,8 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
      deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
    parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
    inconsistent (for example if deflate has already been called for this stream
-   or if the compression method is bsort).  deflateSetDictionary does not
-   perform any compression: this will be done by deflate().
+   or if not at a block boundary for raw deflate).  deflateSetDictionary does
+   not perform any compression: this will be done by deflate().
 */
 
 ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
@@ -688,9 +702,29 @@ ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
    deflation of sourceLen bytes.  It must be called after deflateInit() or
    deflateInit2(), and after deflateSetHeader(), if used.  This would be used
    to allocate an output buffer for deflation in a single pass, and so would be
-   called before deflate().
+   called before deflate().  If that first deflate() call is provided the
+   sourceLen input bytes, an output buffer allocated to the size returned by
+   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
+   to return Z_STREAM_END.  Note that it is possible for the compressed size to
+   be larger than the value returned by deflateBound() if flush options other
+   than Z_FINISH or Z_NO_FLUSH are used.
 */
 
+ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
+                                       unsigned *pending,
+                                       int *bits));
+/*
+     deflatePending() returns the number of bytes and bits of output that have
+   been generated, but not yet provided in the available output.  The bytes not
+   provided would be due to the available output space having being consumed.
+   The number of bits of output not provided are between 0 and 7, where they
+   await more bits to join them in order to fill out a full byte.  If pending
+   or bits are Z_NULL, then those values are not set.
+
+     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+ */
+
 ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
                                      int bits,
                                      int value));
@@ -703,8 +737,9 @@ ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
    than or equal to 16, and that many of the least significant bits of value
    will be inserted in the output.
 
-     deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
+     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
+   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
+   source stream state was inconsistent.
 */
 
 ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
@@ -790,10 +825,11 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
    if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
    can be determined from the adler32 value returned by that call of inflate.
    The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called
-   immediately after inflateInit2() or inflateReset() and before any call of
-   inflate() to set the dictionary.  The application must insure that the
-   dictionary that was used for compression is provided.
+   deflateSetDictionary).  For raw inflate, this function can be called at any
+   time to set the dictionary.  If the provided dictionary is smaller than the
+   window and there is already data in the window, then the provided dictionary
+   will amend what's there.  The application must insure that the dictionary
+   that was used for compression is provided.
 
      inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
    parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
@@ -803,19 +839,38 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
    inflate().
 */
 
+ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
+                                             Bytef *dictionary,
+                                             uInt  *dictLength));
+/*
+     Returns the sliding dictionary being maintained by inflate.  dictLength is
+   set to the number of bytes in the dictionary, and that many bytes are copied
+   to dictionary.  dictionary must have enough space, where 32768 bytes is
+   always enough.  If inflateGetDictionary() is called with dictionary equal to
+   Z_NULL, then only the dictionary length is returned, and nothing is copied.
+   Similary, if dictLength is Z_NULL, then it is not set.
+
+     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+   stream state is inconsistent.
+*/
+
 ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
 /*
-     Skips invalid compressed data until a full flush point (see above the
-   description of deflate with Z_FULL_FLUSH) can be found, or until all
+     Skips invalid compressed data until a possible full flush point (see above
+   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
    available input is skipped.  No output is provided.
 
-     inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-   if no more input was provided, Z_DATA_ERROR if no flush point has been
-   found, or Z_STREAM_ERROR if the stream structure was inconsistent.  In the
-   success case, the application may save the current current value of total_in
-   which indicates where valid compressed data was found.  In the error case,
-   the application may repeatedly call inflateSync, providing more input each
-   time, until success or end of the input data.
+     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
+   All full flush points have this pattern, but not all occurrences of this
+   pattern are full flush points.
+
+     inflateSync returns Z_OK if a possible full flush point has been found,
+   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
+   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
+   In the success case, the application may save the current current value of
+   total_in which indicates where valid compressed data was found.  In the
+   error case, the application may repeatedly call inflateSync, providing more
+   input each time, until success or end of the input data.
 */
 
 ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
@@ -962,12 +1017,13 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
      See inflateBack() for the usage of these routines.
 
      inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the paramaters are invalid, Z_MEM_ERROR if the internal state could not be
+   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
    allocated, or Z_VERSION_ERROR if the version of the library does not match
    the version of the header file.
 */
 
-typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
+typedef unsigned (*in_func) OF((void FAR *,
+                                z_const unsigned char FAR * FAR *));
 typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
 
 ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
@@ -975,11 +1031,12 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
                                     out_func out, void FAR *out_desc));
 /*
      inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is more efficient than inflate() for
-   file i/o applications in that it avoids copying between the output and the
-   sliding window by simply making the window itself the output buffer.  This
-   function trusts the application to not change the output buffer passed by
-   the output function, at least until inflateBack() returns.
+   interface for input and output.  This is potentially more efficient than
+   inflate() for file i/o applications, in that it avoids copying between the
+   output and the sliding window by simply making the window itself the output
+   buffer.  inflate() can be faster on modern CPUs when used with large
+   buffers.  inflateBack() trusts the application to not change the output
+   buffer passed by the output function, at least until inflateBack() returns.
 
      inflateBackInit() must be called first to allocate the internal state
    and to initialize the state with the user-provided window buffer.
@@ -1088,6 +1145,7 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
      27-31: 0 (reserved)
  */
 
+#ifndef Z_SOLO
 
                         /* utility functions */
 
@@ -1149,10 +1207,11 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
 
      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
+   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
+   the case where there is not enough room, uncompress() will fill the output
+   buffer with the uncompressed data up to that point.
 */
 
-
                         /* gzip file access functions */
 
 /*
@@ -1162,7 +1221,7 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
    wrapper, documented in RFC 1952, wrapped around a deflate stream.
 */
 
-typedef voidp gzFile;       /* opaque gzip file descriptor */
+typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
 
 /*
 ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
@@ -1172,13 +1231,28 @@ ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
    a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
    compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
    for fixed code compression as in "wb9F".  (See the description of
-   deflateInit2 for more information about the strategy parameter.) Also "a"
-   can be used instead of "w" to request that the gzip stream that will be
-   written be appended to the file.  "+" will result in an error, since reading
-   and writing to the same gzip file is not supported.
+   deflateInit2 for more information about the strategy parameter.)  'T' will
+   request transparent writing or appending with no compression and not using
+   the gzip format.
+
+     "a" can be used instead of "w" to request that the gzip stream that will
+   be written be appended to the file.  "+" will result in an error, since
+   reading and writing to the same gzip file is not supported.  The addition of
+   "x" when writing will create the file exclusively, which fails if the file
+   already exists.  On systems that support it, the addition of "e" when
+   reading or writing will set the flag to close the file on an execve() call.
+
+     These functions, as well as gzip, will read and decode a sequence of gzip
+   streams in a file.  The append function of gzopen() can be used to create
+   such a file.  (Also see gzflush() for another way to do this.)  When
+   appending, gzopen does not test whether the file begins with a gzip stream,
+   nor does it look for the end of the gzip streams to begin appending.  gzopen
+   will simply append a gzip stream to the existing file.
 
      gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.
+   case gzread will directly read from the file without decompression.  When
+   reading, this will be detected automatically by looking for the magic two-
+   byte gzip header.
 
      gzopen returns NULL if the file could not be opened, if there was
    insufficient memory to allocate the gzFile state, or if an invalid mode was
@@ -1197,7 +1271,11 @@ ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
    descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
    fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
    mode);.  The duplicated descriptor should be saved to avoid a leak, since
-   gzdopen does not close fd if it fails.
+   gzdopen does not close fd if it fails.  If you are using fileno() to get the
+   file descriptor from a FILE *, then you will have to use dup() to avoid
+   double-close()ing the file descriptor.  Both gzclose() and fclose() will
+   close the associated file descriptor, so they need to have different file
+   descriptors.
 
      gzdopen returns NULL if there was insufficient memory to allocate the
    gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
@@ -1235,14 +1313,26 @@ ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
 ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
 /*
      Reads the given number of uncompressed bytes from the compressed file.  If
-   the input file was not in gzip format, gzread copies the given number of
-   bytes into the buffer.
+   the input file is not in gzip format, gzread copies the given number of
+   bytes into the buffer directly from the file.
 
      After reaching the end of a gzip stream in the input, gzread will continue
-   to read, looking for another gzip stream, or failing that, reading the rest
-   of the input file directly without decompression.  The entire input file
-   will be read if gzread is called until it returns less than the requested
-   len.
+   to read, looking for another gzip stream.  Any number of gzip streams may be
+   concatenated in the input file, and will all be decompressed by gzread().
+   If something other than a gzip stream is encountered after a gzip stream,
+   that remaining trailing garbage is ignored (and no error is returned).
+
+     gzread can be used to read a gzip file that is being concurrently written.
+   Upon reaching the end of the input, gzread will return with the available
+   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
+   gzclearerr can be used to clear the end of file indicator in order to permit
+   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
+   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
+   middle of a gzip stream.  Note that gzread does not return -1 in the event
+   of an incomplete gzip stream.  This error is deferred until gzclose(), which
+   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
+   stream.  Alternatively, gzerror can be used before gzclose to detect this
+   case.
 
      gzread returns the number of uncompressed bytes actually read, less than
    len for end of file, or -1 for error.
@@ -1256,7 +1346,7 @@ ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
    error.
 */
 
-ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...));
+ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
 /*
      Converts, formats, and writes the arguments to the compressed file under
    control of the format string, as in fprintf.  gzprintf returns the number of
@@ -1301,7 +1391,10 @@ ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
 ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
 /*
      Reads one byte from the compressed file.  gzgetc returns this byte or -1
-   in case of end of file or error.
+   in case of end of file or error.  This is implemented as a macro for speed.
+   As such, it does not do all of the checking the other functions do.  I.e.
+   it does not check to see if file is NULL, nor whether the structure file
+   points to has been clobbered or not.
 */
 
 ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
@@ -1397,9 +1490,7 @@ ZEXTERN int ZEXPORT gzeof OF((gzFile file));
 ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
 /*
      Returns true (1) if file is being copied directly while reading, or false
-   (0) if file is a gzip stream being decompressed.  This state can change from
-   false to true while reading the input file if the end of a gzip stream is
-   reached, but is followed by data that is not another gzip stream.
+   (0) if file is a gzip stream being decompressed.
 
      If the input file is empty, gzdirect() will return true, since the input
    does not contain a gzip stream.
@@ -1408,6 +1499,13 @@ ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
    cause buffers to be allocated to allow reading the file to determine if it
    is a gzip file.  Therefore if gzbuffer() is used, it should be called before
    gzdirect().
+
+     When writing, gzdirect() returns true (1) if transparent writing was
+   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
+   gzdirect() is not needed when writing.  Transparent writing must be
+   explicitly requested, so the application already knows the answer.  When
+   linking statically, using gzdirect() will include all of the zlib code for
+   gzip file reading and decompression, which may not be desired.)
 */
 
 ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
@@ -1419,7 +1517,8 @@ ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
    must not be called more than once on the same allocation.
 
      gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
-   file operation error, or Z_OK on success.
+   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
+   last read ended in the middle of a gzip stream, or Z_OK on success.
 */
 
 ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
@@ -1457,6 +1556,7 @@ ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
    file that is being written concurrently.
 */
 
+#endif /* !Z_SOLO */
 
                         /* checksum functions */
 
@@ -1492,16 +1592,17 @@ ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
      Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
    and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
    each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
+   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
+   that the z_off_t type (like off_t) is a signed integer.  If len2 is
+   negative, the result has no meaning or utility.
 */
 
 ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
 /*
      Update a running CRC-32 with the bytes buf[0..len-1] and return the
    updated CRC-32.  If buf is Z_NULL, this function returns the required
-   initial value for the for the crc.  Pre- and post-conditioning (one's
-   complement) is performed within this function so it shouldn't be done by the
-   application.
+   initial value for the crc.  Pre- and post-conditioning (one's complement) is
+   performed within this function so it shouldn't be done by the application.
 
    Usage example:
 
@@ -1544,17 +1645,42 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
                                          const char *version,
                                          int stream_size));
 #define deflateInit(strm, level) \
-        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
+        deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
 #define inflateInit(strm) \
-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
+        inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
 #define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
         deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
+                      (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
 #define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
+        inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                      (int)sizeof(z_stream))
 #define inflateBackInit(strm, windowBits, window) \
         inflateBackInit_((strm), (windowBits), (window), \
-                                            ZLIB_VERSION, sizeof(z_stream))
+                      ZLIB_VERSION, (int)sizeof(z_stream))
+
+#ifndef Z_SOLO
+
+/* gzgetc() macro and its supporting function and exposed data structure.  Note
+ * that the real internal state is much larger than the exposed structure.
+ * This abbreviated structure exposes just enough for the gzgetc() macro.  The
+ * user should not mess with these exposed elements, since their names or
+ * behavior could change in the future, perhaps even capriciously.  They can
+ * only be used by the gzgetc() macro.  You have been warned.
+ */
+struct gzFile_s {
+    unsigned have;
+    unsigned char *next;
+    z_off64_t pos;
+};
+ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
+#ifdef Z_PREFIX_SET
+#  undef z_gzgetc
+#  define z_gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+#else
+#  define gzgetc(g) \
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+#endif
 
 /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
  * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
@@ -1562,7 +1688,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
  * functions are changed to 64 bits) -- in case these are set on systems
  * without large file support, _LFS64_LARGEFILE must also be true
  */
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+#ifdef Z_LARGE64
    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
@@ -1571,14 +1697,23 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
 #endif
 
-#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
-#  define gzopen gzopen64
-#  define gzseek gzseek64
-#  define gztell gztell64
-#  define gzoffset gzoffset64
-#  define adler32_combine adler32_combine64
-#  define crc32_combine crc32_combine64
-#  ifdef _LARGEFILE64_SOURCE
+#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
+#  ifdef Z_PREFIX_SET
+#    define z_gzopen z_gzopen64
+#    define z_gzseek z_gzseek64
+#    define z_gztell z_gztell64
+#    define z_gzoffset z_gzoffset64
+#    define z_adler32_combine z_adler32_combine64
+#    define z_crc32_combine z_crc32_combine64
+#  else
+#    define gzopen gzopen64
+#    define gzseek gzseek64
+#    define gztell gztell64
+#    define gzoffset gzoffset64
+#    define adler32_combine adler32_combine64
+#    define crc32_combine crc32_combine64
+#  endif
+#  ifndef Z_LARGE64
      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
      ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
      ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
@@ -1595,6 +1730,13 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
    ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
 #endif
 
+#else /* Z_SOLO */
+
+   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+
+#endif /* !Z_SOLO */
+
 /* hack for buggy compilers */
 #if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
     struct internal_state {int dummy;};
@@ -1603,8 +1745,21 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
 /* undocumented functions */
 ZEXTERN const char   * ZEXPORT zError           OF((int));
 ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
-ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
+ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
 ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
+ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
+ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
+#if defined(_WIN32) && !defined(Z_SOLO)
+ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
+                                            const char *mode));
+#endif
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#  ifndef Z_SOLO
+ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
+                                                  const char *format,
+                                                  va_list va));
+#  endif
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/Externals/zlib/zutil.c b/Externals/zlib/zutil.c
index 898ed345b0..23d2ebef00 100644
--- a/Externals/zlib/zutil.c
+++ b/Externals/zlib/zutil.c
@@ -1,17 +1,20 @@
 /* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005, 2010 Jean-loup Gailly.
+ * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 /* @(#) $Id$ */
 
 #include "zutil.h"
+#ifndef Z_SOLO
+#  include "gzguts.h"
+#endif
 
 #ifndef NO_DUMMY_DECL
 struct internal_state      {int dummy;}; /* for buggy compilers */
 #endif
 
-const char * const z_errmsg[10] = {
+z_const char * const z_errmsg[10] = {
 "need dictionary",     /* Z_NEED_DICT       2  */
 "stream end",          /* Z_STREAM_END      1  */
 "",                    /* Z_OK              0  */
@@ -85,27 +88,27 @@ uLong ZEXPORT zlibCompileFlags()
 #ifdef FASTEST
     flags += 1L << 21;
 #endif
-#ifdef STDC
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
 #  ifdef NO_vsnprintf
-        flags += 1L << 25;
+    flags += 1L << 25;
 #    ifdef HAS_vsprintf_void
-        flags += 1L << 26;
+    flags += 1L << 26;
 #    endif
 #  else
 #    ifdef HAS_vsnprintf_void
-        flags += 1L << 26;
+    flags += 1L << 26;
 #    endif
 #  endif
 #else
-        flags += 1L << 24;
+    flags += 1L << 24;
 #  ifdef NO_snprintf
-        flags += 1L << 25;
+    flags += 1L << 25;
 #    ifdef HAS_sprintf_void
-        flags += 1L << 26;
+    flags += 1L << 26;
 #    endif
 #  else
 #    ifdef HAS_snprintf_void
-        flags += 1L << 26;
+    flags += 1L << 26;
 #    endif
 #  endif
 #endif
@@ -181,6 +184,7 @@ void ZLIB_INTERNAL zmemzero(dest, len)
 }
 #endif
 
+#ifndef Z_SOLO
 
 #ifdef SYS16BIT
 
@@ -316,3 +320,5 @@ void ZLIB_INTERNAL zcfree (opaque, ptr)
 }
 
 #endif /* MY_ZCALLOC */
+
+#endif /* !Z_SOLO */
diff --git a/Externals/zlib/zutil.h b/Externals/zlib/zutil.h
index 258fa88799..24ab06b1cf 100644
--- a/Externals/zlib/zutil.h
+++ b/Externals/zlib/zutil.h
@@ -1,5 +1,5 @@
 /* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2010 Jean-loup Gailly.
+ * Copyright (C) 1995-2013 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -13,7 +13,7 @@
 #ifndef ZUTIL_H
 #define ZUTIL_H
 
-#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
+#ifdef HAVE_HIDDEN
 #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
 #else
 #  define ZLIB_INTERNAL
@@ -21,7 +21,7 @@
 
 #include "zlib.h"
 
-#ifdef STDC
+#if defined(STDC) && !defined(Z_SOLO)
 #  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
 #    include <stddef.h>
 #  endif
@@ -29,6 +29,10 @@
 #  include <stdlib.h>
 #endif
 
+#ifdef Z_SOLO
+   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
+#endif
+
 #ifndef local
 #  define local static
 #endif
@@ -40,13 +44,13 @@ typedef unsigned short ush;
 typedef ush FAR ushf;
 typedef unsigned long  ulg;
 
-extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 /* (size given to avoid silly warnings with Visual C++) */
 
 #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
 
 #define ERR_RETURN(strm,err) \
-  return (strm->msg = (char*)ERR_MSG(err), (err))
+  return (strm->msg = ERR_MSG(err), (err))
 /* To be used only when the state is known to be valid */
 
         /* common constants */
@@ -78,16 +82,18 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 
 #if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
 #  define OS_CODE  0x00
-#  if defined(__TURBOC__) || defined(__BORLANDC__)
-#    if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
-       /* Allow compilation with ANSI keywords only enabled */
-       void _Cdecl farfree( void *block );
-       void *_Cdecl farmalloc( unsigned long nbytes );
-#    else
-#      include <alloc.h>
+#  ifndef Z_SOLO
+#    if defined(__TURBOC__) || defined(__BORLANDC__)
+#      if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
+         /* Allow compilation with ANSI keywords only enabled */
+         void _Cdecl farfree( void *block );
+         void *_Cdecl farmalloc( unsigned long nbytes );
+#      else
+#        include <alloc.h>
+#      endif
+#    else /* MSC or DJGPP */
+#      include <malloc.h>
 #    endif
-#  else /* MSC or DJGPP */
-#    include <malloc.h>
 #  endif
 #endif
 
@@ -107,18 +113,20 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 
 #ifdef OS2
 #  define OS_CODE  0x06
-#  ifdef M_I86
+#  if defined(M_I86) && !defined(Z_SOLO)
 #    include <malloc.h>
 #  endif
 #endif
 
 #if defined(MACOS) || defined(TARGET_OS_MAC)
 #  define OS_CODE  0x07
-#  if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#    include <unix.h> /* for fdopen */
-#  else
-#    ifndef fdopen
-#      define fdopen(fd,mode) NULL /* No fdopen() */
+#  ifndef Z_SOLO
+#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+#      include <unix.h> /* for fdopen */
+#    else
+#      ifndef fdopen
+#        define fdopen(fd,mode) NULL /* No fdopen() */
+#      endif
 #    endif
 #  endif
 #endif
@@ -153,14 +161,15 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  endif
 #endif
 
-#if defined(__BORLANDC__)
+#if defined(__BORLANDC__) && !defined(MSDOS)
   #pragma warn -8004
   #pragma warn -8008
   #pragma warn -8066
 #endif
 
 /* provide prototypes for these when building zlib without LFS */
-#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
+#if !defined(_WIN32) && \
+    (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
 #endif
@@ -177,42 +186,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 
          /* functions */
 
-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-#if defined(__CYGWIN__)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-#ifndef HAVE_VSNPRINTF
-#  ifdef MSDOS
-     /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
-        but for now we just assume it doesn't. */
-#    define NO_vsnprintf
-#  endif
-#  ifdef __TURBOC__
-#    define NO_vsnprintf
-#  endif
-#  ifdef WIN32
-     /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
-#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
-#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
-#         define vsnprintf _vsnprintf
-#      endif
-#    endif
-#  endif
-#  ifdef __SASC
-#    define NO_vsnprintf
-#  endif
-#endif
-#ifdef VMS
-#  define NO_vsnprintf
-#endif
-
-#if defined(pyr)
+#if defined(pyr) || defined(Z_SOLO)
 #  define NO_MEMCPY
 #endif
 #if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
@@ -261,14 +235,19 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  define Tracecv(c,x)
 #endif
 
-
-voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
-                        unsigned size));
-void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
+#ifndef Z_SOLO
+   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
+                                    unsigned size));
+   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
+#endif
 
 #define ZALLOC(strm, items, size) \
            (*((strm)->zalloc))((strm)->opaque, (items), (size))
 #define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
 #define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
 
+/* Reverse the bytes in a 32-bit value */
+#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
+                    (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
+
 #endif /* ZUTIL_H */

From d8f5ecf3ce3545c8168f7a6f95623feb8ace3916 Mon Sep 17 00:00:00 2001
From: Tetsuo55 <akira146@hotmail.com>
Date: Sat, 22 Jun 2013 20:19:27 +0200
Subject: [PATCH 185/352] update soundtouch to svn revision 173

---
 Externals/soundtouch/AAFilter.cpp         |  368 ++---
 Externals/soundtouch/AAFilter.h           |  182 +--
 Externals/soundtouch/BPMDetect.cpp        |  740 ++++-----
 Externals/soundtouch/BPMDetect.h          |  328 ++--
 Externals/soundtouch/FIFOSampleBuffer.cpp |  548 +++----
 Externals/soundtouch/FIFOSampleBuffer.h   |  356 ++---
 Externals/soundtouch/FIFOSamplePipe.h     |  468 +++---
 Externals/soundtouch/FIRFilter.cpp        |  581 +++----
 Externals/soundtouch/FIRFilter.h          |  291 ++--
 Externals/soundtouch/PeakFinder.cpp       |  552 +++----
 Externals/soundtouch/PeakFinder.h         |  194 +--
 Externals/soundtouch/RateTransposer.cpp   | 1374 +++++++++--------
 Externals/soundtouch/RateTransposer.h     |  319 ++--
 Externals/soundtouch/STTypes.h            |  385 ++---
 Externals/soundtouch/SoundTouch.cpp       | 1003 ++++++------
 Externals/soundtouch/SoundTouch.h         |  554 +++----
 Externals/soundtouch/TDStretch.cpp        | 1674 +++++++++++----------
 Externals/soundtouch/TDStretch.h          |  537 +++----
 Externals/soundtouch/cpu_detect.h         |  124 +-
 Externals/soundtouch/cpu_detect_x86.cpp   |  274 ++--
 Externals/soundtouch/mmx_optimized.cpp    |  634 ++++----
 Externals/soundtouch/sse_optimized.cpp    |  722 ++++-----
 22 files changed, 6229 insertions(+), 5979 deletions(-)

diff --git a/Externals/soundtouch/AAFilter.cpp b/Externals/soundtouch/AAFilter.cpp
index f099bced93..010fb511b2 100644
--- a/Externals/soundtouch/AAFilter.cpp
+++ b/Externals/soundtouch/AAFilter.cpp
@@ -1,184 +1,184 @@
-////////////////////////////////////////////////////////////////////////////////
-///
-/// FIR low-pass (anti-alias) filter with filter coefficient design routine and
-/// MMX optimization. 
-/// 
-/// Anti-alias filter is used to prevent folding of high frequencies when 
-/// transposing the sample rate with interpolation.
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2009-01-11 13:34:24 +0200 (Sun, 11 Jan 2009) $
-// File revision : $Revision: 4 $
-//
-// $Id: AAFilter.cpp 45 2009-01-11 11:34:24Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <memory.h>
-#include <assert.h>
-#include <math.h>
-#include <stdlib.h>
-#include "AAFilter.h"
-#include "FIRFilter.h"
-
-using namespace soundtouch;
-
-#define PI        3.141592655357989
-#define TWOPI    (2 * PI)
-
-/*****************************************************************************
- *
- * Implementation of the class 'AAFilter'
- *
- *****************************************************************************/
-
-AAFilter::AAFilter(uint len)
-{
-    pFIR = FIRFilter::newInstance();
-    cutoffFreq = 0.5;
-    setLength(len);
-}
-
-
-
-AAFilter::~AAFilter()
-{
-    delete pFIR;
-}
-
-
-
-// Sets new anti-alias filter cut-off edge frequency, scaled to
-// sampling frequency (nyquist frequency = 0.5).
-// The filter will cut frequencies higher than the given frequency.
-void AAFilter::setCutoffFreq(double newCutoffFreq)
-{
-    cutoffFreq = newCutoffFreq;
-    calculateCoeffs();
-}
-
-
-
-// Sets number of FIR filter taps
-void AAFilter::setLength(uint newLength)
-{
-    length = newLength;
-    calculateCoeffs();
-}
-
-
-
-// Calculates coefficients for a low-pass FIR filter using Hamming window
-void AAFilter::calculateCoeffs()
-{
-    uint i;
-    double cntTemp, temp, tempCoeff,h, w;
-    double fc2, wc;
-    double scaleCoeff, sum;
-    double *work;
-    SAMPLETYPE *coeffs;
-
-    assert(length >= 2);
-    assert(length % 4 == 0);
-    assert(cutoffFreq >= 0);
-    assert(cutoffFreq <= 0.5);
-
-    work = new double[length];
-    coeffs = new SAMPLETYPE[length];
-
-    fc2 = 2.0 * cutoffFreq; 
-    wc = PI * fc2;
-    tempCoeff = TWOPI / (double)length;
-
-    sum = 0;
-    for (i = 0; i < length; i ++) 
-    {
-        cntTemp = (double)i - (double)(length / 2);
-
-        temp = cntTemp * wc;
-        if (temp != 0) 
-        {
-            h = fc2 * sin(temp) / temp;                     // sinc function
-        } 
-        else 
-        {
-            h = 1.0;
-        }
-        w = 0.54 + 0.46 * cos(tempCoeff * cntTemp);       // hamming window
-
-        temp = w * h;
-        work[i] = temp;
-
-        // calc net sum of coefficients 
-        sum += temp;
-    }
-
-    // ensure the sum of coefficients is larger than zero
-    assert(sum > 0);
-
-    // ensure we've really designed a lowpass filter...
-    assert(work[length/2] > 0);
-    assert(work[length/2 + 1] > -1e-6);
-    assert(work[length/2 - 1] > -1e-6);
-
-    // Calculate a scaling coefficient in such a way that the result can be
-    // divided by 16384
-    scaleCoeff = 16384.0f / sum;
-
-    for (i = 0; i < length; i ++) 
-    {
-        // scale & round to nearest integer
-        temp = work[i] * scaleCoeff;
-        temp += (temp >= 0) ? 0.5 : -0.5;
-        // ensure no overfloods
-        assert(temp >= -32768 && temp <= 32767);
-        coeffs[i] = (SAMPLETYPE)temp;
-    }
-
-    // Set coefficients. Use divide factor 14 => divide result by 2^14 = 16384
-    pFIR->setCoefficients(coeffs, length, 14);
-
-    delete[] work;
-    delete[] coeffs;
-}
-
-
-// Applies the filter to the given sequence of samples. 
-// Note : The amount of outputted samples is by value of 'filter length' 
-// smaller than the amount of input samples.
-uint AAFilter::evaluate(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples, uint numChannels) const
-{
-    return pFIR->evaluate(dest, src, numSamples, numChannels);
-}
-
-
-uint AAFilter::getLength() const
-{
-    return pFIR->getLength();
-}
+////////////////////////////////////////////////////////////////////////////////
+///
+/// FIR low-pass (anti-alias) filter with filter coefficient design routine and
+/// MMX optimization. 
+/// 
+/// Anti-alias filter is used to prevent folding of high frequencies when 
+/// transposing the sample rate with interpolation.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2009-01-11 11:34:24 +0000 (Sun, 11 Jan 2009) $
+// File revision : $Revision: 4 $
+//
+// $Id: AAFilter.cpp 45 2009-01-11 11:34:24Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <memory.h>
+#include <assert.h>
+#include <math.h>
+#include <stdlib.h>
+#include "AAFilter.h"
+#include "FIRFilter.h"
+
+using namespace soundtouch;
+
+#define PI        3.141592655357989
+#define TWOPI    (2 * PI)
+
+/*****************************************************************************
+ *
+ * Implementation of the class 'AAFilter'
+ *
+ *****************************************************************************/
+
+AAFilter::AAFilter(uint len)
+{
+    pFIR = FIRFilter::newInstance();
+    cutoffFreq = 0.5;
+    setLength(len);
+}
+
+
+
+AAFilter::~AAFilter()
+{
+    delete pFIR;
+}
+
+
+
+// Sets new anti-alias filter cut-off edge frequency, scaled to
+// sampling frequency (nyquist frequency = 0.5).
+// The filter will cut frequencies higher than the given frequency.
+void AAFilter::setCutoffFreq(double newCutoffFreq)
+{
+    cutoffFreq = newCutoffFreq;
+    calculateCoeffs();
+}
+
+
+
+// Sets number of FIR filter taps
+void AAFilter::setLength(uint newLength)
+{
+    length = newLength;
+    calculateCoeffs();
+}
+
+
+
+// Calculates coefficients for a low-pass FIR filter using Hamming window
+void AAFilter::calculateCoeffs()
+{
+    uint i;
+    double cntTemp, temp, tempCoeff,h, w;
+    double fc2, wc;
+    double scaleCoeff, sum;
+    double *work;
+    SAMPLETYPE *coeffs;
+
+    assert(length >= 2);
+    assert(length % 4 == 0);
+    assert(cutoffFreq >= 0);
+    assert(cutoffFreq <= 0.5);
+
+    work = new double[length];
+    coeffs = new SAMPLETYPE[length];
+
+    fc2 = 2.0 * cutoffFreq; 
+    wc = PI * fc2;
+    tempCoeff = TWOPI / (double)length;
+
+    sum = 0;
+    for (i = 0; i < length; i ++) 
+    {
+        cntTemp = (double)i - (double)(length / 2);
+
+        temp = cntTemp * wc;
+        if (temp != 0) 
+        {
+            h = fc2 * sin(temp) / temp;                     // sinc function
+        } 
+        else 
+        {
+            h = 1.0;
+        }
+        w = 0.54 + 0.46 * cos(tempCoeff * cntTemp);       // hamming window
+
+        temp = w * h;
+        work[i] = temp;
+
+        // calc net sum of coefficients 
+        sum += temp;
+    }
+
+    // ensure the sum of coefficients is larger than zero
+    assert(sum > 0);
+
+    // ensure we've really designed a lowpass filter...
+    assert(work[length/2] > 0);
+    assert(work[length/2 + 1] > -1e-6);
+    assert(work[length/2 - 1] > -1e-6);
+
+    // Calculate a scaling coefficient in such a way that the result can be
+    // divided by 16384
+    scaleCoeff = 16384.0f / sum;
+
+    for (i = 0; i < length; i ++) 
+    {
+        // scale & round to nearest integer
+        temp = work[i] * scaleCoeff;
+        temp += (temp >= 0) ? 0.5 : -0.5;
+        // ensure no overfloods
+        assert(temp >= -32768 && temp <= 32767);
+        coeffs[i] = (SAMPLETYPE)temp;
+    }
+
+    // Set coefficients. Use divide factor 14 => divide result by 2^14 = 16384
+    pFIR->setCoefficients(coeffs, length, 14);
+
+    delete[] work;
+    delete[] coeffs;
+}
+
+
+// Applies the filter to the given sequence of samples. 
+// Note : The amount of outputted samples is by value of 'filter length' 
+// smaller than the amount of input samples.
+uint AAFilter::evaluate(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples, uint numChannels) const
+{
+    return pFIR->evaluate(dest, src, numSamples, numChannels);
+}
+
+
+uint AAFilter::getLength() const
+{
+    return pFIR->getLength();
+}
diff --git a/Externals/soundtouch/AAFilter.h b/Externals/soundtouch/AAFilter.h
index d0997570d3..d8b1cd2c66 100644
--- a/Externals/soundtouch/AAFilter.h
+++ b/Externals/soundtouch/AAFilter.h
@@ -1,91 +1,91 @@
-////////////////////////////////////////////////////////////////////////////////
-///
-/// Sampled sound tempo changer/time stretch algorithm. Changes the sound tempo 
-/// while maintaining the original pitch by using a time domain WSOLA-like method 
-/// with several performance-increasing tweaks.
-///
-/// Anti-alias filter is used to prevent folding of high frequencies when 
-/// transposing the sample rate with interpolation.
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2008-02-10 18:26:55 +0200 (Sun, 10 Feb 2008) $
-// File revision : $Revision: 4 $
-//
-// $Id: AAFilter.h 11 2008-02-10 16:26:55Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef AAFilter_H
-#define AAFilter_H
-
-#include "STTypes.h"
-
-namespace soundtouch
-{
-
-class AAFilter
-{
-protected:
-    class FIRFilter *pFIR;
-
-    /// Low-pass filter cut-off frequency, negative = invalid
-    double cutoffFreq;
-
-    /// num of filter taps
-    uint length;
-
-    /// Calculate the FIR coefficients realizing the given cutoff-frequency
-    void calculateCoeffs();
-public:
-    AAFilter(uint length);
-
-    ~AAFilter();
-
-    /// Sets new anti-alias filter cut-off edge frequency, scaled to sampling 
-    /// frequency (nyquist frequency = 0.5). The filter will cut off the 
-    /// frequencies than that.
-    void setCutoffFreq(double newCutoffFreq);
-
-    /// Sets number of FIR filter taps, i.e. ~filter complexity
-    void setLength(uint newLength);
-
-    uint getLength() const;
-
-    /// Applies the filter to the given sequence of samples. 
-    /// Note : The amount of outputted samples is by value of 'filter length' 
-    /// smaller than the amount of input samples.
-    uint evaluate(SAMPLETYPE *dest, 
-                  const SAMPLETYPE *src, 
-                  uint numSamples, 
-                  uint numChannels) const;
-};
-
-}
-
-#endif
+////////////////////////////////////////////////////////////////////////////////
+///
+/// Sampled sound tempo changer/time stretch algorithm. Changes the sound tempo 
+/// while maintaining the original pitch by using a time domain WSOLA-like method 
+/// with several performance-increasing tweaks.
+///
+/// Anti-alias filter is used to prevent folding of high frequencies when 
+/// transposing the sample rate with interpolation.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2008-02-10 16:26:55 +0000 (Sun, 10 Feb 2008) $
+// File revision : $Revision: 4 $
+//
+// $Id: AAFilter.h 11 2008-02-10 16:26:55Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef AAFilter_H
+#define AAFilter_H
+
+#include "STTypes.h"
+
+namespace soundtouch
+{
+
+class AAFilter
+{
+protected:
+    class FIRFilter *pFIR;
+
+    /// Low-pass filter cut-off frequency, negative = invalid
+    double cutoffFreq;
+
+    /// num of filter taps
+    uint length;
+
+    /// Calculate the FIR coefficients realizing the given cutoff-frequency
+    void calculateCoeffs();
+public:
+    AAFilter(uint length);
+
+    ~AAFilter();
+
+    /// Sets new anti-alias filter cut-off edge frequency, scaled to sampling 
+    /// frequency (nyquist frequency = 0.5). The filter will cut off the 
+    /// frequencies than that.
+    void setCutoffFreq(double newCutoffFreq);
+
+    /// Sets number of FIR filter taps, i.e. ~filter complexity
+    void setLength(uint newLength);
+
+    uint getLength() const;
+
+    /// Applies the filter to the given sequence of samples. 
+    /// Note : The amount of outputted samples is by value of 'filter length' 
+    /// smaller than the amount of input samples.
+    uint evaluate(SAMPLETYPE *dest, 
+                  const SAMPLETYPE *src, 
+                  uint numSamples, 
+                  uint numChannels) const;
+};
+
+}
+
+#endif
diff --git a/Externals/soundtouch/BPMDetect.cpp b/Externals/soundtouch/BPMDetect.cpp
index a48cbd97c3..be2478388f 100644
--- a/Externals/soundtouch/BPMDetect.cpp
+++ b/Externals/soundtouch/BPMDetect.cpp
@@ -1,370 +1,370 @@
-////////////////////////////////////////////////////////////////////////////////
-///
-/// Beats-per-minute (BPM) detection routine.
-///
-/// The beat detection algorithm works as follows:
-/// - Use function 'inputSamples' to input a chunks of samples to the class for
-///   analysis. It's a good idea to enter a large sound file or stream in smallish
-///   chunks of around few kilosamples in order not to extinguish too much RAM memory.
-/// - Inputted sound data is decimated to approx 500 Hz to reduce calculation burden,
-///   which is basically ok as low (bass) frequencies mostly determine the beat rate.
-///   Simple averaging is used for anti-alias filtering because the resulting signal
-///   quality isn't of that high importance.
-/// - Decimated sound data is enveloped, i.e. the amplitude shape is detected by
-///   taking absolute value that's smoothed by sliding average. Signal levels that
-///   are below a couple of times the general RMS amplitude level are cut away to
-///   leave only notable peaks there.
-/// - Repeating sound patterns (e.g. beats) are detected by calculating short-term 
-///   autocorrelation function of the enveloped signal.
-/// - After whole sound data file has been analyzed as above, the bpm level is 
-///   detected by function 'getBpm' that finds the highest peak of the autocorrelation 
-///   function, calculates it's precise location and converts this reading to bpm's.
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2012-08-30 22:45:25 +0300 (Thu, 30 Aug 2012) $
-// File revision : $Revision: 4 $
-//
-// $Id: BPMDetect.cpp 149 2012-08-30 19:45:25Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <math.h>
-#include <assert.h>
-#include <string.h>
-#include <stdio.h>
-#include "FIFOSampleBuffer.h"
-#include "PeakFinder.h"
-#include "BPMDetect.h"
-
-using namespace soundtouch;
-
-#define INPUT_BLOCK_SAMPLES       2048
-#define DECIMATED_BLOCK_SAMPLES   256
-
-/// decay constant for calculating RMS volume sliding average approximation 
-/// (time constant is about 10 sec)
-const float avgdecay = 0.99986f;
-
-/// Normalization coefficient for calculating RMS sliding average approximation.
-const float avgnorm = (1 - avgdecay);
-
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Enable following define to create bpm analysis file:
-
-// #define _CREATE_BPM_DEBUG_FILE
-
-#ifdef _CREATE_BPM_DEBUG_FILE
-
-    #define DEBUGFILE_NAME  "c:\\temp\\soundtouch-bpm-debug.txt"
-
-    static void _SaveDebugData(const float *data, int minpos, int maxpos, double coeff)
-    {
-        FILE *fptr = fopen(DEBUGFILE_NAME, "wt");
-        int i;
-
-        if (fptr)
-        {
-            printf("\n\nWriting BPM debug data into file " DEBUGFILE_NAME "\n\n");
-            for (i = minpos; i < maxpos; i ++)
-            {
-                fprintf(fptr, "%d\t%.1lf\t%f\n", i, coeff / (double)i, data[i]);
-            }
-            fclose(fptr);
-        }
-    }
-#else
-    #define _SaveDebugData(a,b,c,d)
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-
-
-BPMDetect::BPMDetect(int numChannels, int aSampleRate)
-{
-    this->sampleRate = aSampleRate;
-    this->channels = numChannels;
-
-    decimateSum = 0;
-    decimateCount = 0;
-
-    envelopeAccu = 0;
-
-    // Initialize RMS volume accumulator to RMS level of 1500 (out of 32768) that's
-    // safe initial RMS signal level value for song data. This value is then adapted
-    // to the actual level during processing.
-#ifdef SOUNDTOUCH_INTEGER_SAMPLES
-    // integer samples
-    RMSVolumeAccu = (1500 * 1500) / avgnorm;
-#else
-    // float samples, scaled to range [-1..+1[
-    RMSVolumeAccu = (0.045f * 0.045f) / avgnorm;
-#endif
-
-    // choose decimation factor so that result is approx. 1000 Hz
-    decimateBy = sampleRate / 1000;
-    assert(decimateBy > 0);
-    assert(INPUT_BLOCK_SAMPLES < decimateBy * DECIMATED_BLOCK_SAMPLES);
-
-    // Calculate window length & starting item according to desired min & max bpms
-    windowLen = (60 * sampleRate) / (decimateBy * MIN_BPM);
-    windowStart = (60 * sampleRate) / (decimateBy * MAX_BPM);
-
-    assert(windowLen > windowStart);
-
-    // allocate new working objects
-    xcorr = new float[windowLen];
-    memset(xcorr, 0, windowLen * sizeof(float));
-
-    // allocate processing buffer
-    buffer = new FIFOSampleBuffer();
-    // we do processing in mono mode
-    buffer->setChannels(1);
-    buffer->clear();
-}
-
-
-
-BPMDetect::~BPMDetect()
-{
-    delete[] xcorr;
-    delete buffer;
-}
-
-
-
-/// convert to mono, low-pass filter & decimate to about 500 Hz. 
-/// return number of outputted samples.
-///
-/// Decimation is used to remove the unnecessary frequencies and thus to reduce 
-/// the amount of data needed to be processed as calculating autocorrelation 
-/// function is a very-very heavy operation.
-///
-/// Anti-alias filtering is done simply by averaging the samples. This is really a 
-/// poor-man's anti-alias filtering, but it's not so critical in this kind of application
-/// (it'd also be difficult to design a high-quality filter with steep cut-off at very 
-/// narrow band)
-int BPMDetect::decimate(SAMPLETYPE *dest, const SAMPLETYPE *src, int numsamples)
-{
-    int count, outcount;
-    LONG_SAMPLETYPE out;
-
-    assert(channels > 0);
-    assert(decimateBy > 0);
-    outcount = 0;
-    for (count = 0; count < numsamples; count ++) 
-    {
-        int j;
-
-        // convert to mono and accumulate
-        for (j = 0; j < channels; j ++)
-        {
-            decimateSum += src[j];
-        }
-        src += j;
-
-        decimateCount ++;
-        if (decimateCount >= decimateBy) 
-        {
-            // Store every Nth sample only
-            out = (LONG_SAMPLETYPE)(decimateSum / (decimateBy * channels));
-            decimateSum = 0;
-            decimateCount = 0;
-#ifdef SOUNDTOUCH_INTEGER_SAMPLES
-            // check ranges for sure (shouldn't actually be necessary)
-            if (out > 32767) 
-            {
-                out = 32767;
-            } 
-            else if (out < -32768) 
-            {
-                out = -32768;
-            }
-#endif // SOUNDTOUCH_INTEGER_SAMPLES
-            dest[outcount] = (SAMPLETYPE)out;
-            outcount ++;
-        }
-    }
-    return outcount;
-}
-
-
-
-// Calculates autocorrelation function of the sample history buffer
-void BPMDetect::updateXCorr(int process_samples)
-{
-    int offs;
-    SAMPLETYPE *pBuffer;
-    
-    assert(buffer->numSamples() >= (uint)(process_samples + windowLen));
-
-    pBuffer = buffer->ptrBegin();
-    for (offs = windowStart; offs < windowLen; offs ++) 
-    {
-        LONG_SAMPLETYPE sum;
-        int i;
-
-        sum = 0;
-        for (i = 0; i < process_samples; i ++) 
-        {
-            sum += pBuffer[i] * pBuffer[i + offs];    // scaling the sub-result shouldn't be necessary
-        }
-//        xcorr[offs] *= xcorr_decay;   // decay 'xcorr' here with suitable coefficients 
-                                        // if it's desired that the system adapts automatically to
-                                        // various bpms, e.g. in processing continouos music stream.
-                                        // The 'xcorr_decay' should be a value that's smaller than but 
-                                        // close to one, and should also depend on 'process_samples' value.
-
-        xcorr[offs] += (float)sum;
-    }
-}
-
-
-// Calculates envelope of the sample data
-void BPMDetect::calcEnvelope(SAMPLETYPE *samples, int numsamples) 
-{
-    const static double decay = 0.7f;               // decay constant for smoothing the envelope
-    const static double norm = (1 - decay);
-
-    int i;
-    LONG_SAMPLETYPE out;
-    double val;
-
-    for (i = 0; i < numsamples; i ++) 
-    {
-        // calc average RMS volume
-        RMSVolumeAccu *= avgdecay;
-        val = (float)fabs((float)samples[i]);
-        RMSVolumeAccu += val * val;
-
-        // cut amplitudes that are below cutoff ~2 times RMS volume
-        // (we're interested in peak values, not the silent moments)
-        if (val < 0.5 * sqrt(RMSVolumeAccu * avgnorm))
-        {
-            val = 0;
-        }
-
-        // smooth amplitude envelope
-        envelopeAccu *= decay;
-        envelopeAccu += val;
-        out = (LONG_SAMPLETYPE)(envelopeAccu * norm);
-
-#ifdef SOUNDTOUCH_INTEGER_SAMPLES
-        // cut peaks (shouldn't be necessary though)
-        if (out > 32767) out = 32767;
-#endif // SOUNDTOUCH_INTEGER_SAMPLES
-        samples[i] = (SAMPLETYPE)out;
-    }
-}
-
-
-
-void BPMDetect::inputSamples(const SAMPLETYPE *samples, int numSamples)
-{
-    SAMPLETYPE decimated[DECIMATED_BLOCK_SAMPLES];
-
-    // iterate so that max INPUT_BLOCK_SAMPLES processed per iteration
-    while (numSamples > 0)
-    {
-        int block;
-        int decSamples;
-
-        block = (numSamples > INPUT_BLOCK_SAMPLES) ? INPUT_BLOCK_SAMPLES : numSamples;
-
-        // decimate. note that converts to mono at the same time
-        decSamples = decimate(decimated, samples, block);
-        samples += block * channels;
-        numSamples -= block;
-
-        // envelope new samples and add them to buffer
-        calcEnvelope(decimated, decSamples);
-        buffer->putSamples(decimated, decSamples);
-    }
-
-    // when the buffer has enought samples for processing...
-    if ((int)buffer->numSamples() > windowLen) 
-    {
-        int processLength;
-
-        // how many samples are processed
-        processLength = (int)buffer->numSamples() - windowLen;
-
-        // ... calculate autocorrelations for oldest samples...
-        updateXCorr(processLength);
-        // ... and remove them from the buffer
-        buffer->receiveSamples(processLength);
-    }
-}
-
-
-
-void BPMDetect::removeBias()
-{
-    int i;
-    float minval = 1e12f;   // arbitrary large number
-
-    for (i = windowStart; i < windowLen; i ++)
-    {
-        if (xcorr[i] < minval)
-        {
-            minval = xcorr[i];
-        }
-    }
-
-    for (i = windowStart; i < windowLen; i ++)
-    {
-        xcorr[i] -= minval;
-    }
-}
-
-
-float BPMDetect::getBpm()
-{
-    double peakPos;
-    double coeff;
-    PeakFinder peakFinder;
-
-    coeff = 60.0 * ((double)sampleRate / (double)decimateBy);
-
-    // save bpm debug analysis data if debug data enabled
-    _SaveDebugData(xcorr, windowStart, windowLen, coeff);
-
-    // remove bias from xcorr data
-    removeBias();
-
-    // find peak position
-    peakPos = peakFinder.detectPeak(xcorr, windowStart, windowLen);
-
-    assert(decimateBy != 0);
-    if (peakPos < 1e-9) return 0.0; // detection failed.
-
-    // calculate BPM
-    return (float) (coeff / peakPos);
-}
+////////////////////////////////////////////////////////////////////////////////
+///
+/// Beats-per-minute (BPM) detection routine.
+///
+/// The beat detection algorithm works as follows:
+/// - Use function 'inputSamples' to input a chunks of samples to the class for
+///   analysis. It's a good idea to enter a large sound file or stream in smallish
+///   chunks of around few kilosamples in order not to extinguish too much RAM memory.
+/// - Inputted sound data is decimated to approx 500 Hz to reduce calculation burden,
+///   which is basically ok as low (bass) frequencies mostly determine the beat rate.
+///   Simple averaging is used for anti-alias filtering because the resulting signal
+///   quality isn't of that high importance.
+/// - Decimated sound data is enveloped, i.e. the amplitude shape is detected by
+///   taking absolute value that's smoothed by sliding average. Signal levels that
+///   are below a couple of times the general RMS amplitude level are cut away to
+///   leave only notable peaks there.
+/// - Repeating sound patterns (e.g. beats) are detected by calculating short-term 
+///   autocorrelation function of the enveloped signal.
+/// - After whole sound data file has been analyzed as above, the bpm level is 
+///   detected by function 'getBpm' that finds the highest peak of the autocorrelation 
+///   function, calculates it's precise location and converts this reading to bpm's.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2012-08-30 19:45:25 +0000 (Thu, 30 Aug 2012) $
+// File revision : $Revision: 4 $
+//
+// $Id: BPMDetect.cpp 149 2012-08-30 19:45:25Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <math.h>
+#include <assert.h>
+#include <string.h>
+#include <stdio.h>
+#include "FIFOSampleBuffer.h"
+#include "PeakFinder.h"
+#include "BPMDetect.h"
+
+using namespace soundtouch;
+
+#define INPUT_BLOCK_SAMPLES       2048
+#define DECIMATED_BLOCK_SAMPLES   256
+
+/// decay constant for calculating RMS volume sliding average approximation 
+/// (time constant is about 10 sec)
+const float avgdecay = 0.99986f;
+
+/// Normalization coefficient for calculating RMS sliding average approximation.
+const float avgnorm = (1 - avgdecay);
+
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Enable following define to create bpm analysis file:
+
+// #define _CREATE_BPM_DEBUG_FILE
+
+#ifdef _CREATE_BPM_DEBUG_FILE
+
+    #define DEBUGFILE_NAME  "c:\\temp\\soundtouch-bpm-debug.txt"
+
+    static void _SaveDebugData(const float *data, int minpos, int maxpos, double coeff)
+    {
+        FILE *fptr = fopen(DEBUGFILE_NAME, "wt");
+        int i;
+
+        if (fptr)
+        {
+            printf("\n\nWriting BPM debug data into file " DEBUGFILE_NAME "\n\n");
+            for (i = minpos; i < maxpos; i ++)
+            {
+                fprintf(fptr, "%d\t%.1lf\t%f\n", i, coeff / (double)i, data[i]);
+            }
+            fclose(fptr);
+        }
+    }
+#else
+    #define _SaveDebugData(a,b,c,d)
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+
+
+BPMDetect::BPMDetect(int numChannels, int aSampleRate)
+{
+    this->sampleRate = aSampleRate;
+    this->channels = numChannels;
+
+    decimateSum = 0;
+    decimateCount = 0;
+
+    envelopeAccu = 0;
+
+    // Initialize RMS volume accumulator to RMS level of 1500 (out of 32768) that's
+    // safe initial RMS signal level value for song data. This value is then adapted
+    // to the actual level during processing.
+#ifdef SOUNDTOUCH_INTEGER_SAMPLES
+    // integer samples
+    RMSVolumeAccu = (1500 * 1500) / avgnorm;
+#else
+    // float samples, scaled to range [-1..+1[
+    RMSVolumeAccu = (0.045f * 0.045f) / avgnorm;
+#endif
+
+    // choose decimation factor so that result is approx. 1000 Hz
+    decimateBy = sampleRate / 1000;
+    assert(decimateBy > 0);
+    assert(INPUT_BLOCK_SAMPLES < decimateBy * DECIMATED_BLOCK_SAMPLES);
+
+    // Calculate window length & starting item according to desired min & max bpms
+    windowLen = (60 * sampleRate) / (decimateBy * MIN_BPM);
+    windowStart = (60 * sampleRate) / (decimateBy * MAX_BPM);
+
+    assert(windowLen > windowStart);
+
+    // allocate new working objects
+    xcorr = new float[windowLen];
+    memset(xcorr, 0, windowLen * sizeof(float));
+
+    // allocate processing buffer
+    buffer = new FIFOSampleBuffer();
+    // we do processing in mono mode
+    buffer->setChannels(1);
+    buffer->clear();
+}
+
+
+
+BPMDetect::~BPMDetect()
+{
+    delete[] xcorr;
+    delete buffer;
+}
+
+
+
+/// convert to mono, low-pass filter & decimate to about 500 Hz. 
+/// return number of outputted samples.
+///
+/// Decimation is used to remove the unnecessary frequencies and thus to reduce 
+/// the amount of data needed to be processed as calculating autocorrelation 
+/// function is a very-very heavy operation.
+///
+/// Anti-alias filtering is done simply by averaging the samples. This is really a 
+/// poor-man's anti-alias filtering, but it's not so critical in this kind of application
+/// (it'd also be difficult to design a high-quality filter with steep cut-off at very 
+/// narrow band)
+int BPMDetect::decimate(SAMPLETYPE *dest, const SAMPLETYPE *src, int numsamples)
+{
+    int count, outcount;
+    LONG_SAMPLETYPE out;
+
+    assert(channels > 0);
+    assert(decimateBy > 0);
+    outcount = 0;
+    for (count = 0; count < numsamples; count ++) 
+    {
+        int j;
+
+        // convert to mono and accumulate
+        for (j = 0; j < channels; j ++)
+        {
+            decimateSum += src[j];
+        }
+        src += j;
+
+        decimateCount ++;
+        if (decimateCount >= decimateBy) 
+        {
+            // Store every Nth sample only
+            out = (LONG_SAMPLETYPE)(decimateSum / (decimateBy * channels));
+            decimateSum = 0;
+            decimateCount = 0;
+#ifdef SOUNDTOUCH_INTEGER_SAMPLES
+            // check ranges for sure (shouldn't actually be necessary)
+            if (out > 32767) 
+            {
+                out = 32767;
+            } 
+            else if (out < -32768) 
+            {
+                out = -32768;
+            }
+#endif // SOUNDTOUCH_INTEGER_SAMPLES
+            dest[outcount] = (SAMPLETYPE)out;
+            outcount ++;
+        }
+    }
+    return outcount;
+}
+
+
+
+// Calculates autocorrelation function of the sample history buffer
+void BPMDetect::updateXCorr(int process_samples)
+{
+    int offs;
+    SAMPLETYPE *pBuffer;
+    
+    assert(buffer->numSamples() >= (uint)(process_samples + windowLen));
+
+    pBuffer = buffer->ptrBegin();
+    for (offs = windowStart; offs < windowLen; offs ++) 
+    {
+        LONG_SAMPLETYPE sum;
+        int i;
+
+        sum = 0;
+        for (i = 0; i < process_samples; i ++) 
+        {
+            sum += pBuffer[i] * pBuffer[i + offs];    // scaling the sub-result shouldn't be necessary
+        }
+//        xcorr[offs] *= xcorr_decay;   // decay 'xcorr' here with suitable coefficients 
+                                        // if it's desired that the system adapts automatically to
+                                        // various bpms, e.g. in processing continouos music stream.
+                                        // The 'xcorr_decay' should be a value that's smaller than but 
+                                        // close to one, and should also depend on 'process_samples' value.
+
+        xcorr[offs] += (float)sum;
+    }
+}
+
+
+// Calculates envelope of the sample data
+void BPMDetect::calcEnvelope(SAMPLETYPE *samples, int numsamples) 
+{
+    const static double decay = 0.7f;               // decay constant for smoothing the envelope
+    const static double norm = (1 - decay);
+
+    int i;
+    LONG_SAMPLETYPE out;
+    double val;
+
+    for (i = 0; i < numsamples; i ++) 
+    {
+        // calc average RMS volume
+        RMSVolumeAccu *= avgdecay;
+        val = (float)fabs((float)samples[i]);
+        RMSVolumeAccu += val * val;
+
+        // cut amplitudes that are below cutoff ~2 times RMS volume
+        // (we're interested in peak values, not the silent moments)
+        if (val < 0.5 * sqrt(RMSVolumeAccu * avgnorm))
+        {
+            val = 0;
+        }
+
+        // smooth amplitude envelope
+        envelopeAccu *= decay;
+        envelopeAccu += val;
+        out = (LONG_SAMPLETYPE)(envelopeAccu * norm);
+
+#ifdef SOUNDTOUCH_INTEGER_SAMPLES
+        // cut peaks (shouldn't be necessary though)
+        if (out > 32767) out = 32767;
+#endif // SOUNDTOUCH_INTEGER_SAMPLES
+        samples[i] = (SAMPLETYPE)out;
+    }
+}
+
+
+
+void BPMDetect::inputSamples(const SAMPLETYPE *samples, int numSamples)
+{
+    SAMPLETYPE decimated[DECIMATED_BLOCK_SAMPLES];
+
+    // iterate so that max INPUT_BLOCK_SAMPLES processed per iteration
+    while (numSamples > 0)
+    {
+        int block;
+        int decSamples;
+
+        block = (numSamples > INPUT_BLOCK_SAMPLES) ? INPUT_BLOCK_SAMPLES : numSamples;
+
+        // decimate. note that converts to mono at the same time
+        decSamples = decimate(decimated, samples, block);
+        samples += block * channels;
+        numSamples -= block;
+
+        // envelope new samples and add them to buffer
+        calcEnvelope(decimated, decSamples);
+        buffer->putSamples(decimated, decSamples);
+    }
+
+    // when the buffer has enought samples for processing...
+    if ((int)buffer->numSamples() > windowLen) 
+    {
+        int processLength;
+
+        // how many samples are processed
+        processLength = (int)buffer->numSamples() - windowLen;
+
+        // ... calculate autocorrelations for oldest samples...
+        updateXCorr(processLength);
+        // ... and remove them from the buffer
+        buffer->receiveSamples(processLength);
+    }
+}
+
+
+
+void BPMDetect::removeBias()
+{
+    int i;
+    float minval = 1e12f;   // arbitrary large number
+
+    for (i = windowStart; i < windowLen; i ++)
+    {
+        if (xcorr[i] < minval)
+        {
+            minval = xcorr[i];
+        }
+    }
+
+    for (i = windowStart; i < windowLen; i ++)
+    {
+        xcorr[i] -= minval;
+    }
+}
+
+
+float BPMDetect::getBpm()
+{
+    double peakPos;
+    double coeff;
+    PeakFinder peakFinder;
+
+    coeff = 60.0 * ((double)sampleRate / (double)decimateBy);
+
+    // save bpm debug analysis data if debug data enabled
+    _SaveDebugData(xcorr, windowStart, windowLen, coeff);
+
+    // remove bias from xcorr data
+    removeBias();
+
+    // find peak position
+    peakPos = peakFinder.detectPeak(xcorr, windowStart, windowLen);
+
+    assert(decimateBy != 0);
+    if (peakPos < 1e-9) return 0.0; // detection failed.
+
+    // calculate BPM
+    return (float) (coeff / peakPos);
+}
diff --git a/Externals/soundtouch/BPMDetect.h b/Externals/soundtouch/BPMDetect.h
index 72489894bd..f07cf54d7a 100644
--- a/Externals/soundtouch/BPMDetect.h
+++ b/Externals/soundtouch/BPMDetect.h
@@ -1,164 +1,164 @@
-////////////////////////////////////////////////////////////////////////////////
-///
-/// Beats-per-minute (BPM) detection routine.
-///
-/// The beat detection algorithm works as follows:
-/// - Use function 'inputSamples' to input a chunks of samples to the class for
-///   analysis. It's a good idea to enter a large sound file or stream in smallish
-///   chunks of around few kilosamples in order not to extinguish too much RAM memory.
-/// - Input sound data is decimated to approx 500 Hz to reduce calculation burden,
-///   which is basically ok as low (bass) frequencies mostly determine the beat rate.
-///   Simple averaging is used for anti-alias filtering because the resulting signal
-///   quality isn't of that high importance.
-/// - Decimated sound data is enveloped, i.e. the amplitude shape is detected by
-///   taking absolute value that's smoothed by sliding average. Signal levels that
-///   are below a couple of times the general RMS amplitude level are cut away to
-///   leave only notable peaks there.
-/// - Repeating sound patterns (e.g. beats) are detected by calculating short-term 
-///   autocorrelation function of the enveloped signal.
-/// - After whole sound data file has been analyzed as above, the bpm level is 
-///   detected by function 'getBpm' that finds the highest peak of the autocorrelation 
-///   function, calculates it's precise location and converts this reading to bpm's.
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2012-08-30 22:53:44 +0300 (Thu, 30 Aug 2012) $
-// File revision : $Revision: 4 $
-//
-// $Id: BPMDetect.h 150 2012-08-30 19:53:44Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef _BPMDetect_H_
-#define _BPMDetect_H_
-
-#include "STTypes.h"
-#include "FIFOSampleBuffer.h"
-
-namespace soundtouch
-{
-
-/// Minimum allowed BPM rate. Used to restrict accepted result above a reasonable limit.
-#define MIN_BPM 29
-
-/// Maximum allowed BPM rate. Used to restrict accepted result below a reasonable limit.
-#define MAX_BPM 200
-
-
-/// Class for calculating BPM rate for audio data.
-class BPMDetect
-{
-protected:
-    /// Auto-correlation accumulator bins.
-    float *xcorr;
-    
-    /// Amplitude envelope sliding average approximation level accumulator
-    double envelopeAccu;
-
-    /// RMS volume sliding average approximation level accumulator
-    double RMSVolumeAccu;
-
-    /// Sample average counter.
-    int decimateCount;
-
-    /// Sample average accumulator for FIFO-like decimation.
-    soundtouch::LONG_SAMPLETYPE decimateSum;
-
-    /// Decimate sound by this coefficient to reach approx. 500 Hz.
-    int decimateBy;
-
-    /// Auto-correlation window length
-    int windowLen;
-
-    /// Number of channels (1 = mono, 2 = stereo)
-    int channels;
-
-    /// sample rate
-    int sampleRate;
-
-    /// Beginning of auto-correlation window: Autocorrelation isn't being updated for
-    /// the first these many correlation bins.
-    int windowStart;
- 
-    /// FIFO-buffer for decimated processing samples.
-    soundtouch::FIFOSampleBuffer *buffer;
-
-    /// Updates auto-correlation function for given number of decimated samples that 
-    /// are read from the internal 'buffer' pipe (samples aren't removed from the pipe 
-    /// though).
-    void updateXCorr(int process_samples      /// How many samples are processed.
-                     );
-
-    /// Decimates samples to approx. 500 Hz.
-    ///
-    /// \return Number of output samples.
-    int decimate(soundtouch::SAMPLETYPE *dest,      ///< Destination buffer
-                 const soundtouch::SAMPLETYPE *src, ///< Source sample buffer
-                 int numsamples                     ///< Number of source samples.
-                 );
-
-    /// Calculates amplitude envelope for the buffer of samples.
-    /// Result is output to 'samples'.
-    void calcEnvelope(soundtouch::SAMPLETYPE *samples,  ///< Pointer to input/output data buffer
-                      int numsamples                    ///< Number of samples in buffer
-                      );
-
-    /// remove constant bias from xcorr data
-    void removeBias();
-
-public:
-    /// Constructor.
-    BPMDetect(int numChannels,  ///< Number of channels in sample data.
-              int sampleRate    ///< Sample rate in Hz.
-              );
-
-    /// Destructor.
-    virtual ~BPMDetect();
-
-    /// Inputs a block of samples for analyzing: Envelopes the samples and then
-    /// updates the autocorrelation estimation. When whole song data has been input
-    /// in smaller blocks using this function, read the resulting bpm with 'getBpm' 
-    /// function. 
-    /// 
-    /// Notice that data in 'samples' array can be disrupted in processing.
-    void inputSamples(const soundtouch::SAMPLETYPE *samples,    ///< Pointer to input/working data buffer
-                      int numSamples                            ///< Number of samples in buffer
-                      );
-
-
-    /// Analyzes the results and returns the BPM rate. Use this function to read result
-    /// after whole song data has been input to the class by consecutive calls of
-    /// 'inputSamples' function.
-    ///
-    /// \return Beats-per-minute rate, or zero if detection failed.
-    float getBpm();
-};
-
-}
-
-#endif // _BPMDetect_H_
+////////////////////////////////////////////////////////////////////////////////
+///
+/// Beats-per-minute (BPM) detection routine.
+///
+/// The beat detection algorithm works as follows:
+/// - Use function 'inputSamples' to input a chunks of samples to the class for
+///   analysis. It's a good idea to enter a large sound file or stream in smallish
+///   chunks of around few kilosamples in order not to extinguish too much RAM memory.
+/// - Input sound data is decimated to approx 500 Hz to reduce calculation burden,
+///   which is basically ok as low (bass) frequencies mostly determine the beat rate.
+///   Simple averaging is used for anti-alias filtering because the resulting signal
+///   quality isn't of that high importance.
+/// - Decimated sound data is enveloped, i.e. the amplitude shape is detected by
+///   taking absolute value that's smoothed by sliding average. Signal levels that
+///   are below a couple of times the general RMS amplitude level are cut away to
+///   leave only notable peaks there.
+/// - Repeating sound patterns (e.g. beats) are detected by calculating short-term 
+///   autocorrelation function of the enveloped signal.
+/// - After whole sound data file has been analyzed as above, the bpm level is 
+///   detected by function 'getBpm' that finds the highest peak of the autocorrelation 
+///   function, calculates it's precise location and converts this reading to bpm's.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2012-08-30 19:53:44 +0000 (Thu, 30 Aug 2012) $
+// File revision : $Revision: 4 $
+//
+// $Id: BPMDetect.h 150 2012-08-30 19:53:44Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef _BPMDetect_H_
+#define _BPMDetect_H_
+
+#include "STTypes.h"
+#include "FIFOSampleBuffer.h"
+
+namespace soundtouch
+{
+
+/// Minimum allowed BPM rate. Used to restrict accepted result above a reasonable limit.
+#define MIN_BPM 29
+
+/// Maximum allowed BPM rate. Used to restrict accepted result below a reasonable limit.
+#define MAX_BPM 200
+
+
+/// Class for calculating BPM rate for audio data.
+class BPMDetect
+{
+protected:
+    /// Auto-correlation accumulator bins.
+    float *xcorr;
+    
+    /// Amplitude envelope sliding average approximation level accumulator
+    double envelopeAccu;
+
+    /// RMS volume sliding average approximation level accumulator
+    double RMSVolumeAccu;
+
+    /// Sample average counter.
+    int decimateCount;
+
+    /// Sample average accumulator for FIFO-like decimation.
+    soundtouch::LONG_SAMPLETYPE decimateSum;
+
+    /// Decimate sound by this coefficient to reach approx. 500 Hz.
+    int decimateBy;
+
+    /// Auto-correlation window length
+    int windowLen;
+
+    /// Number of channels (1 = mono, 2 = stereo)
+    int channels;
+
+    /// sample rate
+    int sampleRate;
+
+    /// Beginning of auto-correlation window: Autocorrelation isn't being updated for
+    /// the first these many correlation bins.
+    int windowStart;
+ 
+    /// FIFO-buffer for decimated processing samples.
+    soundtouch::FIFOSampleBuffer *buffer;
+
+    /// Updates auto-correlation function for given number of decimated samples that 
+    /// are read from the internal 'buffer' pipe (samples aren't removed from the pipe 
+    /// though).
+    void updateXCorr(int process_samples      /// How many samples are processed.
+                     );
+
+    /// Decimates samples to approx. 500 Hz.
+    ///
+    /// \return Number of output samples.
+    int decimate(soundtouch::SAMPLETYPE *dest,      ///< Destination buffer
+                 const soundtouch::SAMPLETYPE *src, ///< Source sample buffer
+                 int numsamples                     ///< Number of source samples.
+                 );
+
+    /// Calculates amplitude envelope for the buffer of samples.
+    /// Result is output to 'samples'.
+    void calcEnvelope(soundtouch::SAMPLETYPE *samples,  ///< Pointer to input/output data buffer
+                      int numsamples                    ///< Number of samples in buffer
+                      );
+
+    /// remove constant bias from xcorr data
+    void removeBias();
+
+public:
+    /// Constructor.
+    BPMDetect(int numChannels,  ///< Number of channels in sample data.
+              int sampleRate    ///< Sample rate in Hz.
+              );
+
+    /// Destructor.
+    virtual ~BPMDetect();
+
+    /// Inputs a block of samples for analyzing: Envelopes the samples and then
+    /// updates the autocorrelation estimation. When whole song data has been input
+    /// in smaller blocks using this function, read the resulting bpm with 'getBpm' 
+    /// function. 
+    /// 
+    /// Notice that data in 'samples' array can be disrupted in processing.
+    void inputSamples(const soundtouch::SAMPLETYPE *samples,    ///< Pointer to input/working data buffer
+                      int numSamples                            ///< Number of samples in buffer
+                      );
+
+
+    /// Analyzes the results and returns the BPM rate. Use this function to read result
+    /// after whole song data has been input to the class by consecutive calls of
+    /// 'inputSamples' function.
+    ///
+    /// \return Beats-per-minute rate, or zero if detection failed.
+    float getBpm();
+};
+
+}
+
+#endif // _BPMDetect_H_
diff --git a/Externals/soundtouch/FIFOSampleBuffer.cpp b/Externals/soundtouch/FIFOSampleBuffer.cpp
index 7f088b80be..be6060e3c3 100644
--- a/Externals/soundtouch/FIFOSampleBuffer.cpp
+++ b/Externals/soundtouch/FIFOSampleBuffer.cpp
@@ -1,274 +1,274 @@
-////////////////////////////////////////////////////////////////////////////////
-///
-/// A buffer class for temporarily storaging sound samples, operates as a 
-/// first-in-first-out pipe.
-///
-/// Samples are added to the end of the sample buffer with the 'putSamples' 
-/// function, and are received from the beginning of the buffer by calling
-/// the 'receiveSamples' function. The class automatically removes the 
-/// outputted samples from the buffer, as well as grows the buffer size 
-/// whenever necessary.
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2012-11-08 20:53:01 +0200 (Thu, 08 Nov 2012) $
-// File revision : $Revision: 4 $
-//
-// $Id: FIFOSampleBuffer.cpp 160 2012-11-08 18:53:01Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <stdlib.h>
-#include <memory.h>
-#include <string.h>
-#include <assert.h>
-
-#include "FIFOSampleBuffer.h"
-
-using namespace soundtouch;
-
-// Constructor
-FIFOSampleBuffer::FIFOSampleBuffer(int numChannels)
-{
-    assert(numChannels > 0);
-    sizeInBytes = 0; // reasonable initial value
-    buffer = NULL;
-    bufferUnaligned = NULL;
-    samplesInBuffer = 0;
-    bufferPos = 0;
-    channels = (uint)numChannels;
-    ensureCapacity(32);     // allocate initial capacity 
-}
-
-
-// destructor
-FIFOSampleBuffer::~FIFOSampleBuffer()
-{
-    delete[] bufferUnaligned;
-    bufferUnaligned = NULL;
-    buffer = NULL;
-}
-
-
-// Sets number of channels, 1 = mono, 2 = stereo
-void FIFOSampleBuffer::setChannels(int numChannels)
-{
-    uint usedBytes;
-
-    assert(numChannels > 0);
-    usedBytes = channels * samplesInBuffer;
-    channels = (uint)numChannels;
-    samplesInBuffer = usedBytes / channels;
-}
-
-
-// if output location pointer 'bufferPos' isn't zero, 'rewinds' the buffer and
-// zeroes this pointer by copying samples from the 'bufferPos' pointer 
-// location on to the beginning of the buffer.
-void FIFOSampleBuffer::rewind()
-{
-    if (buffer && bufferPos) 
-    {
-        memmove(buffer, ptrBegin(), sizeof(SAMPLETYPE) * channels * samplesInBuffer);
-        bufferPos = 0;
-    }
-}
-
-
-// Adds 'numSamples' pcs of samples from the 'samples' memory position to 
-// the sample buffer.
-void FIFOSampleBuffer::putSamples(const SAMPLETYPE *samples, uint nSamples)
-{
-    memcpy(ptrEnd(nSamples), samples, sizeof(SAMPLETYPE) * nSamples * channels);
-    samplesInBuffer += nSamples;
-}
-
-
-// Increases the number of samples in the buffer without copying any actual
-// samples.
-//
-// This function is used to update the number of samples in the sample buffer
-// when accessing the buffer directly with 'ptrEnd' function. Please be 
-// careful though!
-void FIFOSampleBuffer::putSamples(uint nSamples)
-{
-    uint req;
-
-    req = samplesInBuffer + nSamples;
-    ensureCapacity(req);
-    samplesInBuffer += nSamples;
-}
-
-
-// Returns a pointer to the end of the used part of the sample buffer (i.e. 
-// where the new samples are to be inserted). This function may be used for 
-// inserting new samples into the sample buffer directly. Please be careful! 
-//
-// Parameter 'slackCapacity' tells the function how much free capacity (in
-// terms of samples) there _at least_ should be, in order to the caller to
-// succesfully insert all the required samples to the buffer. When necessary, 
-// the function grows the buffer size to comply with this requirement.
-//
-// When using this function as means for inserting new samples, also remember 
-// to increase the sample count afterwards, by calling  the 
-// 'putSamples(numSamples)' function.
-SAMPLETYPE *FIFOSampleBuffer::ptrEnd(uint slackCapacity) 
-{
-    ensureCapacity(samplesInBuffer + slackCapacity);
-    return buffer + samplesInBuffer * channels;
-}
-
-
-// Returns a pointer to the beginning of the currently non-outputted samples. 
-// This function is provided for accessing the output samples directly. 
-// Please be careful!
-//
-// When using this function to output samples, also remember to 'remove' the
-// outputted samples from the buffer by calling the 
-// 'receiveSamples(numSamples)' function
-SAMPLETYPE *FIFOSampleBuffer::ptrBegin()
-{
-    assert(buffer);
-    return buffer + bufferPos * channels;
-}
-
-
-// Ensures that the buffer has enought capacity, i.e. space for _at least_
-// 'capacityRequirement' number of samples. The buffer is grown in steps of
-// 4 kilobytes to eliminate the need for frequently growing up the buffer,
-// as well as to round the buffer size up to the virtual memory page size.
-void FIFOSampleBuffer::ensureCapacity(uint capacityRequirement)
-{
-    SAMPLETYPE *tempUnaligned, *temp;
-
-    if (capacityRequirement > getCapacity()) 
-    {
-        // enlarge the buffer in 4kbyte steps (round up to next 4k boundary)
-        sizeInBytes = (capacityRequirement * channels * sizeof(SAMPLETYPE) + 4095) & (uint)-4096;
-        assert(sizeInBytes % 2 == 0);
-        tempUnaligned = new SAMPLETYPE[sizeInBytes / sizeof(SAMPLETYPE) + 16 / sizeof(SAMPLETYPE)];
-        if (tempUnaligned == NULL)
-        {
-            ST_THROW_RT_ERROR("Couldn't allocate memory!\n");
-        }
-        // Align the buffer to begin at 16byte cache line boundary for optimal performance
-        temp = (SAMPLETYPE *)SOUNDTOUCH_ALIGN_POINTER_16(tempUnaligned);
-        if (samplesInBuffer)
-        {
-            memcpy(temp, ptrBegin(), samplesInBuffer * channels * sizeof(SAMPLETYPE));
-        }
-        delete[] bufferUnaligned;
-        buffer = temp;
-        bufferUnaligned = tempUnaligned;
-        bufferPos = 0;
-    } 
-    else 
-    {
-        // simply rewind the buffer (if necessary)
-        rewind();
-    }
-}
-
-
-// Returns the current buffer capacity in terms of samples
-uint FIFOSampleBuffer::getCapacity() const
-{
-    return sizeInBytes / (channels * sizeof(SAMPLETYPE));
-}
-
-
-// Returns the number of samples currently in the buffer
-uint FIFOSampleBuffer::numSamples() const
-{
-    return samplesInBuffer;
-}
-
-
-// Output samples from beginning of the sample buffer. Copies demanded number
-// of samples to output and removes them from the sample buffer. If there
-// are less than 'numsample' samples in the buffer, returns all available.
-//
-// Returns number of samples copied.
-uint FIFOSampleBuffer::receiveSamples(SAMPLETYPE *output, uint maxSamples)
-{
-    uint num;
-
-    num = (maxSamples > samplesInBuffer) ? samplesInBuffer : maxSamples;
-
-	memcpy(output, ptrBegin(), channels * sizeof(SAMPLETYPE) * num);
-    return receiveSamples(num);
-}
-
-
-// Removes samples from the beginning of the sample buffer without copying them
-// anywhere. Used to reduce the number of samples in the buffer, when accessing
-// the sample buffer with the 'ptrBegin' function.
-uint FIFOSampleBuffer::receiveSamples(uint maxSamples)
-{
-    if (maxSamples >= samplesInBuffer)
-    {
-        uint temp;
-
-        temp = samplesInBuffer;
-        samplesInBuffer = 0;
-        return temp;
-    }
-
-    samplesInBuffer -= maxSamples;
-    bufferPos += maxSamples;
-
-    return maxSamples;
-}
-
-
-// Returns nonzero if the sample buffer is empty
-int FIFOSampleBuffer::isEmpty() const
-{
-    return (samplesInBuffer == 0) ? 1 : 0;
-}
-
-
-// Clears the sample buffer
-void FIFOSampleBuffer::clear()
-{
-    samplesInBuffer = 0;
-    bufferPos = 0;
-}
-
-
-/// allow trimming (downwards) amount of samples in pipeline.
-/// Returns adjusted amount of samples
-uint FIFOSampleBuffer::adjustAmountOfSamples(uint numSamples)
-{
-    if (numSamples < samplesInBuffer)
-    {
-        samplesInBuffer = numSamples;
-    }
-    return samplesInBuffer;
-}
-
+////////////////////////////////////////////////////////////////////////////////
+///
+/// A buffer class for temporarily storaging sound samples, operates as a 
+/// first-in-first-out pipe.
+///
+/// Samples are added to the end of the sample buffer with the 'putSamples' 
+/// function, and are received from the beginning of the buffer by calling
+/// the 'receiveSamples' function. The class automatically removes the 
+/// outputted samples from the buffer, as well as grows the buffer size 
+/// whenever necessary.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2012-11-08 18:53:01 +0000 (Thu, 08 Nov 2012) $
+// File revision : $Revision: 4 $
+//
+// $Id: FIFOSampleBuffer.cpp 160 2012-11-08 18:53:01Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <stdlib.h>
+#include <memory.h>
+#include <string.h>
+#include <assert.h>
+
+#include "FIFOSampleBuffer.h"
+
+using namespace soundtouch;
+
+// Constructor
+FIFOSampleBuffer::FIFOSampleBuffer(int numChannels)
+{
+    assert(numChannels > 0);
+    sizeInBytes = 0; // reasonable initial value
+    buffer = NULL;
+    bufferUnaligned = NULL;
+    samplesInBuffer = 0;
+    bufferPos = 0;
+    channels = (uint)numChannels;
+    ensureCapacity(32);     // allocate initial capacity 
+}
+
+
+// destructor
+FIFOSampleBuffer::~FIFOSampleBuffer()
+{
+    delete[] bufferUnaligned;
+    bufferUnaligned = NULL;
+    buffer = NULL;
+}
+
+
+// Sets number of channels, 1 = mono, 2 = stereo
+void FIFOSampleBuffer::setChannels(int numChannels)
+{
+    uint usedBytes;
+
+    assert(numChannels > 0);
+    usedBytes = channels * samplesInBuffer;
+    channels = (uint)numChannels;
+    samplesInBuffer = usedBytes / channels;
+}
+
+
+// if output location pointer 'bufferPos' isn't zero, 'rewinds' the buffer and
+// zeroes this pointer by copying samples from the 'bufferPos' pointer 
+// location on to the beginning of the buffer.
+void FIFOSampleBuffer::rewind()
+{
+    if (buffer && bufferPos) 
+    {
+        memmove(buffer, ptrBegin(), sizeof(SAMPLETYPE) * channels * samplesInBuffer);
+        bufferPos = 0;
+    }
+}
+
+
+// Adds 'numSamples' pcs of samples from the 'samples' memory position to 
+// the sample buffer.
+void FIFOSampleBuffer::putSamples(const SAMPLETYPE *samples, uint nSamples)
+{
+    memcpy(ptrEnd(nSamples), samples, sizeof(SAMPLETYPE) * nSamples * channels);
+    samplesInBuffer += nSamples;
+}
+
+
+// Increases the number of samples in the buffer without copying any actual
+// samples.
+//
+// This function is used to update the number of samples in the sample buffer
+// when accessing the buffer directly with 'ptrEnd' function. Please be 
+// careful though!
+void FIFOSampleBuffer::putSamples(uint nSamples)
+{
+    uint req;
+
+    req = samplesInBuffer + nSamples;
+    ensureCapacity(req);
+    samplesInBuffer += nSamples;
+}
+
+
+// Returns a pointer to the end of the used part of the sample buffer (i.e. 
+// where the new samples are to be inserted). This function may be used for 
+// inserting new samples into the sample buffer directly. Please be careful! 
+//
+// Parameter 'slackCapacity' tells the function how much free capacity (in
+// terms of samples) there _at least_ should be, in order to the caller to
+// succesfully insert all the required samples to the buffer. When necessary, 
+// the function grows the buffer size to comply with this requirement.
+//
+// When using this function as means for inserting new samples, also remember 
+// to increase the sample count afterwards, by calling  the 
+// 'putSamples(numSamples)' function.
+SAMPLETYPE *FIFOSampleBuffer::ptrEnd(uint slackCapacity) 
+{
+    ensureCapacity(samplesInBuffer + slackCapacity);
+    return buffer + samplesInBuffer * channels;
+}
+
+
+// Returns a pointer to the beginning of the currently non-outputted samples. 
+// This function is provided for accessing the output samples directly. 
+// Please be careful!
+//
+// When using this function to output samples, also remember to 'remove' the
+// outputted samples from the buffer by calling the 
+// 'receiveSamples(numSamples)' function
+SAMPLETYPE *FIFOSampleBuffer::ptrBegin()
+{
+    assert(buffer);
+    return buffer + bufferPos * channels;
+}
+
+
+// Ensures that the buffer has enought capacity, i.e. space for _at least_
+// 'capacityRequirement' number of samples. The buffer is grown in steps of
+// 4 kilobytes to eliminate the need for frequently growing up the buffer,
+// as well as to round the buffer size up to the virtual memory page size.
+void FIFOSampleBuffer::ensureCapacity(uint capacityRequirement)
+{
+    SAMPLETYPE *tempUnaligned, *temp;
+
+    if (capacityRequirement > getCapacity()) 
+    {
+        // enlarge the buffer in 4kbyte steps (round up to next 4k boundary)
+        sizeInBytes = (capacityRequirement * channels * sizeof(SAMPLETYPE) + 4095) & (uint)-4096;
+        assert(sizeInBytes % 2 == 0);
+        tempUnaligned = new SAMPLETYPE[sizeInBytes / sizeof(SAMPLETYPE) + 16 / sizeof(SAMPLETYPE)];
+        if (tempUnaligned == NULL)
+        {
+            ST_THROW_RT_ERROR("Couldn't allocate memory!\n");
+        }
+        // Align the buffer to begin at 16byte cache line boundary for optimal performance
+        temp = (SAMPLETYPE *)SOUNDTOUCH_ALIGN_POINTER_16(tempUnaligned);
+        if (samplesInBuffer)
+        {
+            memcpy(temp, ptrBegin(), samplesInBuffer * channels * sizeof(SAMPLETYPE));
+        }
+        delete[] bufferUnaligned;
+        buffer = temp;
+        bufferUnaligned = tempUnaligned;
+        bufferPos = 0;
+    } 
+    else 
+    {
+        // simply rewind the buffer (if necessary)
+        rewind();
+    }
+}
+
+
+// Returns the current buffer capacity in terms of samples
+uint FIFOSampleBuffer::getCapacity() const
+{
+    return sizeInBytes / (channels * sizeof(SAMPLETYPE));
+}
+
+
+// Returns the number of samples currently in the buffer
+uint FIFOSampleBuffer::numSamples() const
+{
+    return samplesInBuffer;
+}
+
+
+// Output samples from beginning of the sample buffer. Copies demanded number
+// of samples to output and removes them from the sample buffer. If there
+// are less than 'numsample' samples in the buffer, returns all available.
+//
+// Returns number of samples copied.
+uint FIFOSampleBuffer::receiveSamples(SAMPLETYPE *output, uint maxSamples)
+{
+    uint num;
+
+    num = (maxSamples > samplesInBuffer) ? samplesInBuffer : maxSamples;
+
+    memcpy(output, ptrBegin(), channels * sizeof(SAMPLETYPE) * num);
+    return receiveSamples(num);
+}
+
+
+// Removes samples from the beginning of the sample buffer without copying them
+// anywhere. Used to reduce the number of samples in the buffer, when accessing
+// the sample buffer with the 'ptrBegin' function.
+uint FIFOSampleBuffer::receiveSamples(uint maxSamples)
+{
+    if (maxSamples >= samplesInBuffer)
+    {
+        uint temp;
+
+        temp = samplesInBuffer;
+        samplesInBuffer = 0;
+        return temp;
+    }
+
+    samplesInBuffer -= maxSamples;
+    bufferPos += maxSamples;
+
+    return maxSamples;
+}
+
+
+// Returns nonzero if the sample buffer is empty
+int FIFOSampleBuffer::isEmpty() const
+{
+    return (samplesInBuffer == 0) ? 1 : 0;
+}
+
+
+// Clears the sample buffer
+void FIFOSampleBuffer::clear()
+{
+    samplesInBuffer = 0;
+    bufferPos = 0;
+}
+
+
+/// allow trimming (downwards) amount of samples in pipeline.
+/// Returns adjusted amount of samples
+uint FIFOSampleBuffer::adjustAmountOfSamples(uint numSamples)
+{
+    if (numSamples < samplesInBuffer)
+    {
+        samplesInBuffer = numSamples;
+    }
+    return samplesInBuffer;
+}
+
diff --git a/Externals/soundtouch/FIFOSampleBuffer.h b/Externals/soundtouch/FIFOSampleBuffer.h
index 3789b4d307..e44d611eb7 100644
--- a/Externals/soundtouch/FIFOSampleBuffer.h
+++ b/Externals/soundtouch/FIFOSampleBuffer.h
@@ -1,178 +1,178 @@
-////////////////////////////////////////////////////////////////////////////////
-///
-/// A buffer class for temporarily storaging sound samples, operates as a 
-/// first-in-first-out pipe.
-///
-/// Samples are added to the end of the sample buffer with the 'putSamples' 
-/// function, and are received from the beginning of the buffer by calling
-/// the 'receiveSamples' function. The class automatically removes the 
-/// output samples from the buffer as well as grows the storage size 
-/// whenever necessary.
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2012-06-13 22:29:53 +0300 (Wed, 13 Jun 2012) $
-// File revision : $Revision: 4 $
-//
-// $Id: FIFOSampleBuffer.h 143 2012-06-13 19:29:53Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef FIFOSampleBuffer_H
-#define FIFOSampleBuffer_H
-
-#include "FIFOSamplePipe.h"
-
-namespace soundtouch
-{
-
-/// Sample buffer working in FIFO (first-in-first-out) principle. The class takes
-/// care of storage size adjustment and data moving during input/output operations.
-///
-/// Notice that in case of stereo audio, one sample is considered to consist of 
-/// both channel data.
-class FIFOSampleBuffer : public FIFOSamplePipe
-{
-private:
-    /// Sample buffer.
-    SAMPLETYPE *buffer;
-
-    // Raw unaligned buffer memory. 'buffer' is made aligned by pointing it to first
-    // 16-byte aligned location of this buffer
-    SAMPLETYPE *bufferUnaligned;
-
-    /// Sample buffer size in bytes
-    uint sizeInBytes;
-
-    /// How many samples are currently in buffer.
-    uint samplesInBuffer;
-
-    /// Channels, 1=mono, 2=stereo.
-    uint channels;
-
-    /// Current position pointer to the buffer. This pointer is increased when samples are 
-    /// removed from the pipe so that it's necessary to actually rewind buffer (move data)
-    /// only new data when is put to the pipe.
-    uint bufferPos;
-
-    /// Rewind the buffer by moving data from position pointed by 'bufferPos' to real 
-    /// beginning of the buffer.
-    void rewind();
-
-    /// Ensures that the buffer has capacity for at least this many samples.
-    void ensureCapacity(uint capacityRequirement);
-
-    /// Returns current capacity.
-    uint getCapacity() const;
-
-public:
-
-    /// Constructor
-    FIFOSampleBuffer(int numChannels = 2     ///< Number of channels, 1=mono, 2=stereo.
-                                              ///< Default is stereo.
-                     );
-
-    /// destructor
-    ~FIFOSampleBuffer();
-
-    /// Returns a pointer to the beginning of the output samples. 
-    /// This function is provided for accessing the output samples directly. 
-    /// Please be careful for not to corrupt the book-keeping!
-    ///
-    /// When using this function to output samples, also remember to 'remove' the
-    /// output samples from the buffer by calling the 
-    /// 'receiveSamples(numSamples)' function
-    virtual SAMPLETYPE *ptrBegin();
-
-    /// Returns a pointer to the end of the used part of the sample buffer (i.e. 
-    /// where the new samples are to be inserted). This function may be used for 
-    /// inserting new samples into the sample buffer directly. Please be careful
-    /// not corrupt the book-keeping!
-    ///
-    /// When using this function as means for inserting new samples, also remember 
-    /// to increase the sample count afterwards, by calling  the 
-    /// 'putSamples(numSamples)' function.
-    SAMPLETYPE *ptrEnd(
-                uint slackCapacity   ///< How much free capacity (in samples) there _at least_ 
-                                     ///< should be so that the caller can succesfully insert the 
-                                     ///< desired samples to the buffer. If necessary, the function 
-                                     ///< grows the buffer size to comply with this requirement.
-                );
-
-    /// Adds 'numSamples' pcs of samples from the 'samples' memory position to
-    /// the sample buffer.
-    virtual void putSamples(const SAMPLETYPE *samples,  ///< Pointer to samples.
-                            uint numSamples                         ///< Number of samples to insert.
-                            );
-
-    /// Adjusts the book-keeping to increase number of samples in the buffer without 
-    /// copying any actual samples.
-    ///
-    /// This function is used to update the number of samples in the sample buffer
-    /// when accessing the buffer directly with 'ptrEnd' function. Please be 
-    /// careful though!
-    virtual void putSamples(uint numSamples   ///< Number of samples been inserted.
-                            );
-
-    /// Output samples from beginning of the sample buffer. Copies requested samples to 
-    /// output buffer and removes them from the sample buffer. If there are less than 
-    /// 'numsample' samples in the buffer, returns all that available.
-    ///
-    /// \return Number of samples returned.
-    virtual uint receiveSamples(SAMPLETYPE *output, ///< Buffer where to copy output samples.
-                                uint maxSamples                 ///< How many samples to receive at max.
-                                );
-
-    /// Adjusts book-keeping so that given number of samples are removed from beginning of the 
-    /// sample buffer without copying them anywhere. 
-    ///
-    /// Used to reduce the number of samples in the buffer when accessing the sample buffer directly
-    /// with 'ptrBegin' function.
-    virtual uint receiveSamples(uint maxSamples   ///< Remove this many samples from the beginning of pipe.
-                                );
-
-    /// Returns number of samples currently available.
-    virtual uint numSamples() const;
-
-    /// Sets number of channels, 1 = mono, 2 = stereo.
-    void setChannels(int numChannels);
-
-    /// Returns nonzero if there aren't any samples available for outputting.
-    virtual int isEmpty() const;
-
-    /// Clears all the samples.
-    virtual void clear();
-
-    /// allow trimming (downwards) amount of samples in pipeline.
-    /// Returns adjusted amount of samples
-    uint adjustAmountOfSamples(uint numSamples);
-};
-
-}
-
-#endif
+////////////////////////////////////////////////////////////////////////////////
+///
+/// A buffer class for temporarily storaging sound samples, operates as a 
+/// first-in-first-out pipe.
+///
+/// Samples are added to the end of the sample buffer with the 'putSamples' 
+/// function, and are received from the beginning of the buffer by calling
+/// the 'receiveSamples' function. The class automatically removes the 
+/// output samples from the buffer as well as grows the storage size 
+/// whenever necessary.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2012-06-13 19:29:53 +0000 (Wed, 13 Jun 2012) $
+// File revision : $Revision: 4 $
+//
+// $Id: FIFOSampleBuffer.h 143 2012-06-13 19:29:53Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef FIFOSampleBuffer_H
+#define FIFOSampleBuffer_H
+
+#include "FIFOSamplePipe.h"
+
+namespace soundtouch
+{
+
+/// Sample buffer working in FIFO (first-in-first-out) principle. The class takes
+/// care of storage size adjustment and data moving during input/output operations.
+///
+/// Notice that in case of stereo audio, one sample is considered to consist of 
+/// both channel data.
+class FIFOSampleBuffer : public FIFOSamplePipe
+{
+private:
+    /// Sample buffer.
+    SAMPLETYPE *buffer;
+
+    // Raw unaligned buffer memory. 'buffer' is made aligned by pointing it to first
+    // 16-byte aligned location of this buffer
+    SAMPLETYPE *bufferUnaligned;
+
+    /// Sample buffer size in bytes
+    uint sizeInBytes;
+
+    /// How many samples are currently in buffer.
+    uint samplesInBuffer;
+
+    /// Channels, 1=mono, 2=stereo.
+    uint channels;
+
+    /// Current position pointer to the buffer. This pointer is increased when samples are 
+    /// removed from the pipe so that it's necessary to actually rewind buffer (move data)
+    /// only new data when is put to the pipe.
+    uint bufferPos;
+
+    /// Rewind the buffer by moving data from position pointed by 'bufferPos' to real 
+    /// beginning of the buffer.
+    void rewind();
+
+    /// Ensures that the buffer has capacity for at least this many samples.
+    void ensureCapacity(uint capacityRequirement);
+
+    /// Returns current capacity.
+    uint getCapacity() const;
+
+public:
+
+    /// Constructor
+    FIFOSampleBuffer(int numChannels = 2     ///< Number of channels, 1=mono, 2=stereo.
+                                              ///< Default is stereo.
+                     );
+
+    /// destructor
+    ~FIFOSampleBuffer();
+
+    /// Returns a pointer to the beginning of the output samples. 
+    /// This function is provided for accessing the output samples directly. 
+    /// Please be careful for not to corrupt the book-keeping!
+    ///
+    /// When using this function to output samples, also remember to 'remove' the
+    /// output samples from the buffer by calling the 
+    /// 'receiveSamples(numSamples)' function
+    virtual SAMPLETYPE *ptrBegin();
+
+    /// Returns a pointer to the end of the used part of the sample buffer (i.e. 
+    /// where the new samples are to be inserted). This function may be used for 
+    /// inserting new samples into the sample buffer directly. Please be careful
+    /// not corrupt the book-keeping!
+    ///
+    /// When using this function as means for inserting new samples, also remember 
+    /// to increase the sample count afterwards, by calling  the 
+    /// 'putSamples(numSamples)' function.
+    SAMPLETYPE *ptrEnd(
+                uint slackCapacity   ///< How much free capacity (in samples) there _at least_ 
+                                     ///< should be so that the caller can succesfully insert the 
+                                     ///< desired samples to the buffer. If necessary, the function 
+                                     ///< grows the buffer size to comply with this requirement.
+                );
+
+    /// Adds 'numSamples' pcs of samples from the 'samples' memory position to
+    /// the sample buffer.
+    virtual void putSamples(const SAMPLETYPE *samples,  ///< Pointer to samples.
+                            uint numSamples                         ///< Number of samples to insert.
+                            );
+
+    /// Adjusts the book-keeping to increase number of samples in the buffer without 
+    /// copying any actual samples.
+    ///
+    /// This function is used to update the number of samples in the sample buffer
+    /// when accessing the buffer directly with 'ptrEnd' function. Please be 
+    /// careful though!
+    virtual void putSamples(uint numSamples   ///< Number of samples been inserted.
+                            );
+
+    /// Output samples from beginning of the sample buffer. Copies requested samples to 
+    /// output buffer and removes them from the sample buffer. If there are less than 
+    /// 'numsample' samples in the buffer, returns all that available.
+    ///
+    /// \return Number of samples returned.
+    virtual uint receiveSamples(SAMPLETYPE *output, ///< Buffer where to copy output samples.
+                                uint maxSamples                 ///< How many samples to receive at max.
+                                );
+
+    /// Adjusts book-keeping so that given number of samples are removed from beginning of the 
+    /// sample buffer without copying them anywhere. 
+    ///
+    /// Used to reduce the number of samples in the buffer when accessing the sample buffer directly
+    /// with 'ptrBegin' function.
+    virtual uint receiveSamples(uint maxSamples   ///< Remove this many samples from the beginning of pipe.
+                                );
+
+    /// Returns number of samples currently available.
+    virtual uint numSamples() const;
+
+    /// Sets number of channels, 1 = mono, 2 = stereo.
+    void setChannels(int numChannels);
+
+    /// Returns nonzero if there aren't any samples available for outputting.
+    virtual int isEmpty() const;
+
+    /// Clears all the samples.
+    virtual void clear();
+
+    /// allow trimming (downwards) amount of samples in pipeline.
+    /// Returns adjusted amount of samples
+    uint adjustAmountOfSamples(uint numSamples);
+};
+
+}
+
+#endif
diff --git a/Externals/soundtouch/FIFOSamplePipe.h b/Externals/soundtouch/FIFOSamplePipe.h
index f26c57b0b2..ab8a9791a9 100644
--- a/Externals/soundtouch/FIFOSamplePipe.h
+++ b/Externals/soundtouch/FIFOSamplePipe.h
@@ -1,234 +1,234 @@
-////////////////////////////////////////////////////////////////////////////////
-///
-/// 'FIFOSamplePipe' : An abstract base class for classes that manipulate sound
-/// samples by operating like a first-in-first-out pipe: New samples are fed
-/// into one end of the pipe with the 'putSamples' function, and the processed
-/// samples are received from the other end with the 'receiveSamples' function.
-///
-/// 'FIFOProcessor' : A base class for classes the do signal processing with 
-/// the samples while operating like a first-in-first-out pipe. When samples
-/// are input with the 'putSamples' function, the class processes them
-/// and moves the processed samples to the given 'output' pipe object, which
-/// may be either another processing stage, or a fifo sample buffer object.
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2012-06-13 22:29:53 +0300 (Wed, 13 Jun 2012) $
-// File revision : $Revision: 4 $
-//
-// $Id: FIFOSamplePipe.h 143 2012-06-13 19:29:53Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef FIFOSamplePipe_H
-#define FIFOSamplePipe_H
-
-#include <assert.h>
-#include <stdlib.h>
-#include "STTypes.h"
-
-namespace soundtouch
-{
-
-/// Abstract base class for FIFO (first-in-first-out) sample processing classes.
-class FIFOSamplePipe
-{
-public:
-    // virtual default destructor
-    virtual ~FIFOSamplePipe() {}
-
-
-    /// Returns a pointer to the beginning of the output samples. 
-    /// This function is provided for accessing the output samples directly. 
-    /// Please be careful for not to corrupt the book-keeping!
-    ///
-    /// When using this function to output samples, also remember to 'remove' the
-    /// output samples from the buffer by calling the 
-    /// 'receiveSamples(numSamples)' function
-    virtual SAMPLETYPE *ptrBegin() = 0;
-
-    /// Adds 'numSamples' pcs of samples from the 'samples' memory position to
-    /// the sample buffer.
-    virtual void putSamples(const SAMPLETYPE *samples,  ///< Pointer to samples.
-                            uint numSamples             ///< Number of samples to insert.
-                            ) = 0;
-
-
-    // Moves samples from the 'other' pipe instance to this instance.
-    void moveSamples(FIFOSamplePipe &other  ///< Other pipe instance where from the receive the data.
-         )
-    {
-        int oNumSamples = other.numSamples();
-
-        putSamples(other.ptrBegin(), oNumSamples);
-        other.receiveSamples(oNumSamples);
-    };
-
-    /// Output samples from beginning of the sample buffer. Copies requested samples to 
-    /// output buffer and removes them from the sample buffer. If there are less than 
-    /// 'numsample' samples in the buffer, returns all that available.
-    ///
-    /// \return Number of samples returned.
-    virtual uint receiveSamples(SAMPLETYPE *output, ///< Buffer where to copy output samples.
-                                uint maxSamples                 ///< How many samples to receive at max.
-                                ) = 0;
-
-    /// Adjusts book-keeping so that given number of samples are removed from beginning of the 
-    /// sample buffer without copying them anywhere. 
-    ///
-    /// Used to reduce the number of samples in the buffer when accessing the sample buffer directly
-    /// with 'ptrBegin' function.
-    virtual uint receiveSamples(uint maxSamples   ///< Remove this many samples from the beginning of pipe.
-                                ) = 0;
-
-    /// Returns number of samples currently available.
-    virtual uint numSamples() const = 0;
-
-    // Returns nonzero if there aren't any samples available for outputting.
-    virtual int isEmpty() const = 0;
-
-    /// Clears all the samples.
-    virtual void clear() = 0;
-
-    /// allow trimming (downwards) amount of samples in pipeline.
-    /// Returns adjusted amount of samples
-    virtual uint adjustAmountOfSamples(uint numSamples) = 0;
-
-};
-
-
-
-/// Base-class for sound processing routines working in FIFO principle. With this base 
-/// class it's easy to implement sound processing stages that can be chained together,
-/// so that samples that are fed into beginning of the pipe automatically go through 
-/// all the processing stages.
-///
-/// When samples are input to this class, they're first processed and then put to 
-/// the FIFO pipe that's defined as output of this class. This output pipe can be
-/// either other processing stage or a FIFO sample buffer.
-class FIFOProcessor :public FIFOSamplePipe
-{
-protected:
-    /// Internal pipe where processed samples are put.
-    FIFOSamplePipe *output;
-
-    /// Sets output pipe.
-    void setOutPipe(FIFOSamplePipe *pOutput)
-    {
-        assert(output == NULL);
-        assert(pOutput != NULL);
-        output = pOutput;
-    }
-
-
-    /// Constructor. Doesn't define output pipe; it has to be set be 
-    /// 'setOutPipe' function.
-    FIFOProcessor()
-    {
-        output = NULL;
-    }
-
-
-    /// Constructor. Configures output pipe.
-    FIFOProcessor(FIFOSamplePipe *pOutput   ///< Output pipe.
-                 )
-    {
-        output = pOutput;
-    }
-
-
-    /// Destructor.
-    virtual ~FIFOProcessor()
-    {
-    }
-
-
-    /// Returns a pointer to the beginning of the output samples. 
-    /// This function is provided for accessing the output samples directly. 
-    /// Please be careful for not to corrupt the book-keeping!
-    ///
-    /// When using this function to output samples, also remember to 'remove' the
-    /// output samples from the buffer by calling the 
-    /// 'receiveSamples(numSamples)' function
-    virtual SAMPLETYPE *ptrBegin()
-    {
-        return output->ptrBegin();
-    }
-
-public:
-
-    /// Output samples from beginning of the sample buffer. Copies requested samples to 
-    /// output buffer and removes them from the sample buffer. If there are less than 
-    /// 'numsample' samples in the buffer, returns all that available.
-    ///
-    /// \return Number of samples returned.
-    virtual uint receiveSamples(SAMPLETYPE *outBuffer, ///< Buffer where to copy output samples.
-                                uint maxSamples                    ///< How many samples to receive at max.
-                                )
-    {
-        return output->receiveSamples(outBuffer, maxSamples);
-    }
-
-
-    /// Adjusts book-keeping so that given number of samples are removed from beginning of the 
-    /// sample buffer without copying them anywhere. 
-    ///
-    /// Used to reduce the number of samples in the buffer when accessing the sample buffer directly
-    /// with 'ptrBegin' function.
-    virtual uint receiveSamples(uint maxSamples   ///< Remove this many samples from the beginning of pipe.
-                                )
-    {
-        return output->receiveSamples(maxSamples);
-    }
-
-
-    /// Returns number of samples currently available.
-    virtual uint numSamples() const
-    {
-        return output->numSamples();
-    }
-
-
-    /// Returns nonzero if there aren't any samples available for outputting.
-    virtual int isEmpty() const
-    {
-        return output->isEmpty();
-    }
-
-    /// allow trimming (downwards) amount of samples in pipeline.
-    /// Returns adjusted amount of samples
-    virtual uint adjustAmountOfSamples(uint numSamples)
-    {
-        return output->adjustAmountOfSamples(numSamples);
-    }
-
-};
-
-}
-
-#endif
+////////////////////////////////////////////////////////////////////////////////
+///
+/// 'FIFOSamplePipe' : An abstract base class for classes that manipulate sound
+/// samples by operating like a first-in-first-out pipe: New samples are fed
+/// into one end of the pipe with the 'putSamples' function, and the processed
+/// samples are received from the other end with the 'receiveSamples' function.
+///
+/// 'FIFOProcessor' : A base class for classes the do signal processing with 
+/// the samples while operating like a first-in-first-out pipe. When samples
+/// are input with the 'putSamples' function, the class processes them
+/// and moves the processed samples to the given 'output' pipe object, which
+/// may be either another processing stage, or a fifo sample buffer object.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2012-06-13 19:29:53 +0000 (Wed, 13 Jun 2012) $
+// File revision : $Revision: 4 $
+//
+// $Id: FIFOSamplePipe.h 143 2012-06-13 19:29:53Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef FIFOSamplePipe_H
+#define FIFOSamplePipe_H
+
+#include <assert.h>
+#include <stdlib.h>
+#include "STTypes.h"
+
+namespace soundtouch
+{
+
+/// Abstract base class for FIFO (first-in-first-out) sample processing classes.
+class FIFOSamplePipe
+{
+public:
+    // virtual default destructor
+    virtual ~FIFOSamplePipe() {}
+
+
+    /// Returns a pointer to the beginning of the output samples. 
+    /// This function is provided for accessing the output samples directly. 
+    /// Please be careful for not to corrupt the book-keeping!
+    ///
+    /// When using this function to output samples, also remember to 'remove' the
+    /// output samples from the buffer by calling the 
+    /// 'receiveSamples(numSamples)' function
+    virtual SAMPLETYPE *ptrBegin() = 0;
+
+    /// Adds 'numSamples' pcs of samples from the 'samples' memory position to
+    /// the sample buffer.
+    virtual void putSamples(const SAMPLETYPE *samples,  ///< Pointer to samples.
+                            uint numSamples             ///< Number of samples to insert.
+                            ) = 0;
+
+
+    // Moves samples from the 'other' pipe instance to this instance.
+    void moveSamples(FIFOSamplePipe &other  ///< Other pipe instance where from the receive the data.
+         )
+    {
+        int oNumSamples = other.numSamples();
+
+        putSamples(other.ptrBegin(), oNumSamples);
+        other.receiveSamples(oNumSamples);
+    };
+
+    /// Output samples from beginning of the sample buffer. Copies requested samples to 
+    /// output buffer and removes them from the sample buffer. If there are less than 
+    /// 'numsample' samples in the buffer, returns all that available.
+    ///
+    /// \return Number of samples returned.
+    virtual uint receiveSamples(SAMPLETYPE *output, ///< Buffer where to copy output samples.
+                                uint maxSamples                 ///< How many samples to receive at max.
+                                ) = 0;
+
+    /// Adjusts book-keeping so that given number of samples are removed from beginning of the 
+    /// sample buffer without copying them anywhere. 
+    ///
+    /// Used to reduce the number of samples in the buffer when accessing the sample buffer directly
+    /// with 'ptrBegin' function.
+    virtual uint receiveSamples(uint maxSamples   ///< Remove this many samples from the beginning of pipe.
+                                ) = 0;
+
+    /// Returns number of samples currently available.
+    virtual uint numSamples() const = 0;
+
+    // Returns nonzero if there aren't any samples available for outputting.
+    virtual int isEmpty() const = 0;
+
+    /// Clears all the samples.
+    virtual void clear() = 0;
+
+    /// allow trimming (downwards) amount of samples in pipeline.
+    /// Returns adjusted amount of samples
+    virtual uint adjustAmountOfSamples(uint numSamples) = 0;
+
+};
+
+
+
+/// Base-class for sound processing routines working in FIFO principle. With this base 
+/// class it's easy to implement sound processing stages that can be chained together,
+/// so that samples that are fed into beginning of the pipe automatically go through 
+/// all the processing stages.
+///
+/// When samples are input to this class, they're first processed and then put to 
+/// the FIFO pipe that's defined as output of this class. This output pipe can be
+/// either other processing stage or a FIFO sample buffer.
+class FIFOProcessor :public FIFOSamplePipe
+{
+protected:
+    /// Internal pipe where processed samples are put.
+    FIFOSamplePipe *output;
+
+    /// Sets output pipe.
+    void setOutPipe(FIFOSamplePipe *pOutput)
+    {
+        assert(output == NULL);
+        assert(pOutput != NULL);
+        output = pOutput;
+    }
+
+
+    /// Constructor. Doesn't define output pipe; it has to be set be 
+    /// 'setOutPipe' function.
+    FIFOProcessor()
+    {
+        output = NULL;
+    }
+
+
+    /// Constructor. Configures output pipe.
+    FIFOProcessor(FIFOSamplePipe *pOutput   ///< Output pipe.
+                 )
+    {
+        output = pOutput;
+    }
+
+
+    /// Destructor.
+    virtual ~FIFOProcessor()
+    {
+    }
+
+
+    /// Returns a pointer to the beginning of the output samples. 
+    /// This function is provided for accessing the output samples directly. 
+    /// Please be careful for not to corrupt the book-keeping!
+    ///
+    /// When using this function to output samples, also remember to 'remove' the
+    /// output samples from the buffer by calling the 
+    /// 'receiveSamples(numSamples)' function
+    virtual SAMPLETYPE *ptrBegin()
+    {
+        return output->ptrBegin();
+    }
+
+public:
+
+    /// Output samples from beginning of the sample buffer. Copies requested samples to 
+    /// output buffer and removes them from the sample buffer. If there are less than 
+    /// 'numsample' samples in the buffer, returns all that available.
+    ///
+    /// \return Number of samples returned.
+    virtual uint receiveSamples(SAMPLETYPE *outBuffer, ///< Buffer where to copy output samples.
+                                uint maxSamples                    ///< How many samples to receive at max.
+                                )
+    {
+        return output->receiveSamples(outBuffer, maxSamples);
+    }
+
+
+    /// Adjusts book-keeping so that given number of samples are removed from beginning of the 
+    /// sample buffer without copying them anywhere. 
+    ///
+    /// Used to reduce the number of samples in the buffer when accessing the sample buffer directly
+    /// with 'ptrBegin' function.
+    virtual uint receiveSamples(uint maxSamples   ///< Remove this many samples from the beginning of pipe.
+                                )
+    {
+        return output->receiveSamples(maxSamples);
+    }
+
+
+    /// Returns number of samples currently available.
+    virtual uint numSamples() const
+    {
+        return output->numSamples();
+    }
+
+
+    /// Returns nonzero if there aren't any samples available for outputting.
+    virtual int isEmpty() const
+    {
+        return output->isEmpty();
+    }
+
+    /// allow trimming (downwards) amount of samples in pipeline.
+    /// Returns adjusted amount of samples
+    virtual uint adjustAmountOfSamples(uint numSamples)
+    {
+        return output->adjustAmountOfSamples(numSamples);
+    }
+
+};
+
+}
+
+#endif
diff --git a/Externals/soundtouch/FIRFilter.cpp b/Externals/soundtouch/FIRFilter.cpp
index 1570516b77..d57389108a 100644
--- a/Externals/soundtouch/FIRFilter.cpp
+++ b/Externals/soundtouch/FIRFilter.cpp
@@ -1,259 +1,322 @@
-////////////////////////////////////////////////////////////////////////////////
-///
-/// General FIR digital filter routines with MMX optimization. 
-///
-/// Note : MMX optimized functions reside in a separate, platform-specific file, 
-/// e.g. 'mmx_win.cpp' or 'mmx_gcc.cpp'
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2011-09-02 21:56:11 +0300 (Fri, 02 Sep 2011) $
-// File revision : $Revision: 4 $
-//
-// $Id: FIRFilter.cpp 131 2011-09-02 18:56:11Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <memory.h>
-#include <assert.h>
-#include <math.h>
-#include <stdlib.h>
-#include "FIRFilter.h"
-#include "cpu_detect.h"
-
-using namespace soundtouch;
-
-/*****************************************************************************
- *
- * Implementation of the class 'FIRFilter'
- *
- *****************************************************************************/
-
-FIRFilter::FIRFilter()
-{
-    resultDivFactor = 0;
-    resultDivider = 0;
-    length = 0;
-    lengthDiv8 = 0;
-    filterCoeffs = NULL;
-}
-
-
-FIRFilter::~FIRFilter()
-{
-    delete[] filterCoeffs;
-}
-
-// Usual C-version of the filter routine for stereo sound
-uint FIRFilter::evaluateFilterStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples) const
-{
-    uint i, j, end;
-    LONG_SAMPLETYPE suml, sumr;
-#ifdef SOUNDTOUCH_FLOAT_SAMPLES
-    // when using floating point samples, use a scaler instead of a divider
-    // because division is much slower operation than multiplying.
-    double dScaler = 1.0 / (double)resultDivider;
-#endif
-
-    assert(length != 0);
-    assert(src != NULL);
-    assert(dest != NULL);
-    assert(filterCoeffs != NULL);
-
-    end = 2 * (numSamples - length);
-
-    for (j = 0; j < end; j += 2) 
-    {
-        const SAMPLETYPE *ptr;
-
-        suml = sumr = 0;
-        ptr = src + j;
-
-        for (i = 0; i < length; i += 4) 
-        {
-            // loop is unrolled by factor of 4 here for efficiency
-            suml += ptr[2 * i + 0] * filterCoeffs[i + 0] +
-                    ptr[2 * i + 2] * filterCoeffs[i + 1] +
-                    ptr[2 * i + 4] * filterCoeffs[i + 2] +
-                    ptr[2 * i + 6] * filterCoeffs[i + 3];
-            sumr += ptr[2 * i + 1] * filterCoeffs[i + 0] +
-                    ptr[2 * i + 3] * filterCoeffs[i + 1] +
-                    ptr[2 * i + 5] * filterCoeffs[i + 2] +
-                    ptr[2 * i + 7] * filterCoeffs[i + 3];
-        }
-
-#ifdef SOUNDTOUCH_INTEGER_SAMPLES
-        suml >>= resultDivFactor;
-        sumr >>= resultDivFactor;
-        // saturate to 16 bit integer limits
-        suml = (suml < -32768) ? -32768 : (suml > 32767) ? 32767 : suml;
-        // saturate to 16 bit integer limits
-        sumr = (sumr < -32768) ? -32768 : (sumr > 32767) ? 32767 : sumr;
-#else
-        suml *= dScaler;
-        sumr *= dScaler;
-#endif // SOUNDTOUCH_INTEGER_SAMPLES
-        dest[j] = (SAMPLETYPE)suml;
-        dest[j + 1] = (SAMPLETYPE)sumr;
-    }
-    return numSamples - length;
-}
-
-
-
-
-// Usual C-version of the filter routine for mono sound
-uint FIRFilter::evaluateFilterMono(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples) const
-{
-    uint i, j, end;
-    LONG_SAMPLETYPE sum;
-#ifdef SOUNDTOUCH_FLOAT_SAMPLES
-    // when using floating point samples, use a scaler instead of a divider
-    // because division is much slower operation than multiplying.
-    double dScaler = 1.0 / (double)resultDivider;
-#endif
-
-
-    assert(length != 0);
-
-    end = numSamples - length;
-    for (j = 0; j < end; j ++) 
-    {
-        sum = 0;
-        for (i = 0; i < length; i += 4) 
-        {
-            // loop is unrolled by factor of 4 here for efficiency
-            sum += src[i + 0] * filterCoeffs[i + 0] + 
-                   src[i + 1] * filterCoeffs[i + 1] + 
-                   src[i + 2] * filterCoeffs[i + 2] + 
-                   src[i + 3] * filterCoeffs[i + 3];
-        }
-#ifdef SOUNDTOUCH_INTEGER_SAMPLES
-        sum >>= resultDivFactor;
-        // saturate to 16 bit integer limits
-        sum = (sum < -32768) ? -32768 : (sum > 32767) ? 32767 : sum;
-#else
-        sum *= dScaler;
-#endif // SOUNDTOUCH_INTEGER_SAMPLES
-        dest[j] = (SAMPLETYPE)sum;
-        src ++;
-    }
-    return end;
-}
-
-
-// Set filter coeffiecients and length.
-//
-// Throws an exception if filter length isn't divisible by 8
-void FIRFilter::setCoefficients(const SAMPLETYPE *coeffs, uint newLength, uint uResultDivFactor)
-{
-    assert(newLength > 0);
-    if (newLength % 8) ST_THROW_RT_ERROR("FIR filter length not divisible by 8");
-
-    lengthDiv8 = newLength / 8;
-    length = lengthDiv8 * 8;
-    assert(length == newLength);
-
-    resultDivFactor = uResultDivFactor;
-    resultDivider = (SAMPLETYPE)::pow(2.0, (int)resultDivFactor);
-
-    delete[] filterCoeffs;
-    filterCoeffs = new SAMPLETYPE[length];
-    memcpy(filterCoeffs, coeffs, length * sizeof(SAMPLETYPE));
-}
-
-
-uint FIRFilter::getLength() const
-{
-    return length;
-}
-
-
-
-// Applies the filter to the given sequence of samples. 
-//
-// Note : The amount of outputted samples is by value of 'filter_length' 
-// smaller than the amount of input samples.
-uint FIRFilter::evaluate(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples, uint numChannels) const
-{
-    assert(numChannels == 1 || numChannels == 2);
-
-    assert(length > 0);
-    assert(lengthDiv8 * 8 == length);
-    if (numSamples < length) return 0;
-    if (numChannels == 2) 
-    {
-        return evaluateFilterStereo(dest, src, numSamples);
-    } else {
-        return evaluateFilterMono(dest, src, numSamples);
-    }
-}
-
-
-
-// Operator 'new' is overloaded so that it automatically creates a suitable instance 
-// depending on if we've a MMX-capable CPU available or not.
-void * FIRFilter::operator new(size_t s)
-{
-    // Notice! don't use "new FIRFilter" directly, use "newInstance" to create a new instance instead!
-    ST_THROW_RT_ERROR("Error in FIRFilter::new: Don't use 'new FIRFilter', use 'newInstance' member instead!");
-    return newInstance();
-}
-
-
-FIRFilter * FIRFilter::newInstance()
-{
-    uint uExtensions;
-
-    uExtensions = detectCPUextensions();
-
-    // Check if MMX/SSE instruction set extensions supported by CPU
-
-#ifdef SOUNDTOUCH_ALLOW_MMX
-    // MMX routines available only with integer sample types
-    if (uExtensions & SUPPORT_MMX)
-    {
-        return ::new FIRFilterMMX;
-    }
-    else
-#endif // SOUNDTOUCH_ALLOW_MMX
-
-#ifdef SOUNDTOUCH_ALLOW_SSE
-    if (uExtensions & SUPPORT_SSE)
-    {
-        // SSE support
-        return ::new FIRFilterSSE;
-    }
-    else
-#endif // SOUNDTOUCH_ALLOW_SSE
-
-    {
-        // ISA optimizations not supported, use plain C version
-        return ::new FIRFilter;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////
+///
+/// General FIR digital filter routines with MMX optimization. 
+///
+/// Note : MMX optimized functions reside in a separate, platform-specific file, 
+/// e.g. 'mmx_win.cpp' or 'mmx_gcc.cpp'
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2013-06-12 15:24:44 +0000 (Wed, 12 Jun 2013) $
+// File revision : $Revision: 4 $
+//
+// $Id: FIRFilter.cpp 171 2013-06-12 15:24:44Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <memory.h>
+#include <assert.h>
+#include <math.h>
+#include <stdlib.h>
+#include "FIRFilter.h"
+#include "cpu_detect.h"
+
+using namespace soundtouch;
+
+/*****************************************************************************
+ *
+ * Implementation of the class 'FIRFilter'
+ *
+ *****************************************************************************/
+
+FIRFilter::FIRFilter()
+{
+    resultDivFactor = 0;
+    resultDivider = 0;
+    length = 0;
+    lengthDiv8 = 0;
+    filterCoeffs = NULL;
+}
+
+
+FIRFilter::~FIRFilter()
+{
+    delete[] filterCoeffs;
+}
+
+// Usual C-version of the filter routine for stereo sound
+uint FIRFilter::evaluateFilterStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples) const
+{
+    uint i, j, end;
+    LONG_SAMPLETYPE suml, sumr;
+#ifdef SOUNDTOUCH_FLOAT_SAMPLES
+    // when using floating point samples, use a scaler instead of a divider
+    // because division is much slower operation than multiplying.
+    double dScaler = 1.0 / (double)resultDivider;
+#endif
+
+    assert(length != 0);
+    assert(src != NULL);
+    assert(dest != NULL);
+    assert(filterCoeffs != NULL);
+
+    end = 2 * (numSamples - length);
+
+    for (j = 0; j < end; j += 2) 
+    {
+        const SAMPLETYPE *ptr;
+
+        suml = sumr = 0;
+        ptr = src + j;
+
+        for (i = 0; i < length; i += 4) 
+        {
+            // loop is unrolled by factor of 4 here for efficiency
+            suml += ptr[2 * i + 0] * filterCoeffs[i + 0] +
+                    ptr[2 * i + 2] * filterCoeffs[i + 1] +
+                    ptr[2 * i + 4] * filterCoeffs[i + 2] +
+                    ptr[2 * i + 6] * filterCoeffs[i + 3];
+            sumr += ptr[2 * i + 1] * filterCoeffs[i + 0] +
+                    ptr[2 * i + 3] * filterCoeffs[i + 1] +
+                    ptr[2 * i + 5] * filterCoeffs[i + 2] +
+                    ptr[2 * i + 7] * filterCoeffs[i + 3];
+        }
+
+#ifdef SOUNDTOUCH_INTEGER_SAMPLES
+        suml >>= resultDivFactor;
+        sumr >>= resultDivFactor;
+        // saturate to 16 bit integer limits
+        suml = (suml < -32768) ? -32768 : (suml > 32767) ? 32767 : suml;
+        // saturate to 16 bit integer limits
+        sumr = (sumr < -32768) ? -32768 : (sumr > 32767) ? 32767 : sumr;
+#else
+        suml *= dScaler;
+        sumr *= dScaler;
+#endif // SOUNDTOUCH_INTEGER_SAMPLES
+        dest[j] = (SAMPLETYPE)suml;
+        dest[j + 1] = (SAMPLETYPE)sumr;
+    }
+    return numSamples - length;
+}
+
+
+
+
+// Usual C-version of the filter routine for mono sound
+uint FIRFilter::evaluateFilterMono(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples) const
+{
+    uint i, j, end;
+    LONG_SAMPLETYPE sum;
+#ifdef SOUNDTOUCH_FLOAT_SAMPLES
+    // when using floating point samples, use a scaler instead of a divider
+    // because division is much slower operation than multiplying.
+    double dScaler = 1.0 / (double)resultDivider;
+#endif
+
+
+    assert(length != 0);
+
+    end = numSamples - length;
+    for (j = 0; j < end; j ++) 
+    {
+        sum = 0;
+        for (i = 0; i < length; i += 4) 
+        {
+            // loop is unrolled by factor of 4 here for efficiency
+            sum += src[i + 0] * filterCoeffs[i + 0] + 
+                   src[i + 1] * filterCoeffs[i + 1] + 
+                   src[i + 2] * filterCoeffs[i + 2] + 
+                   src[i + 3] * filterCoeffs[i + 3];
+        }
+#ifdef SOUNDTOUCH_INTEGER_SAMPLES
+        sum >>= resultDivFactor;
+        // saturate to 16 bit integer limits
+        sum = (sum < -32768) ? -32768 : (sum > 32767) ? 32767 : sum;
+#else
+        sum *= dScaler;
+#endif // SOUNDTOUCH_INTEGER_SAMPLES
+        dest[j] = (SAMPLETYPE)sum;
+        src ++;
+    }
+    return end;
+}
+
+
+uint FIRFilter::evaluateFilterMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples, uint numChannels) const
+{
+    uint i, j, end, c;
+    LONG_SAMPLETYPE *sum=(LONG_SAMPLETYPE*)alloca(numChannels*sizeof(*sum));
+#ifdef SOUNDTOUCH_FLOAT_SAMPLES
+    // when using floating point samples, use a scaler instead of a divider
+    // because division is much slower operation than multiplying.
+    double dScaler = 1.0 / (double)resultDivider;
+#endif
+
+    assert(length != 0);
+    assert(src != NULL);
+    assert(dest != NULL);
+    assert(filterCoeffs != NULL);
+
+    end = numChannels * (numSamples - length);
+
+    for (c = 0; c < numChannels; c ++)
+    {
+        sum[c] = 0;
+    }
+
+    for (j = 0; j < end; j += numChannels)
+    {
+        const SAMPLETYPE *ptr;
+
+        ptr = src + j;
+
+        for (i = 0; i < length; i ++)
+        {
+            SAMPLETYPE coef=filterCoeffs[i];
+            for (c = 0; c < numChannels; c ++)
+            {
+                sum[c] += ptr[0] * coef;
+                ptr ++;
+            }
+        }
+        
+        for (c = 0; c < numChannels; c ++)
+        {
+#ifdef SOUNDTOUCH_INTEGER_SAMPLES
+            sum[c] >>= resultDivFactor;
+#else
+            sum[c] *= dScaler;
+#endif // SOUNDTOUCH_INTEGER_SAMPLES
+            *dest = (SAMPLETYPE)sum[c];
+            dest++;
+            sum[c] = 0;
+        }
+    }
+    return numSamples - length;
+}
+
+
+// Set filter coeffiecients and length.
+//
+// Throws an exception if filter length isn't divisible by 8
+void FIRFilter::setCoefficients(const SAMPLETYPE *coeffs, uint newLength, uint uResultDivFactor)
+{
+    assert(newLength > 0);
+    if (newLength % 8) ST_THROW_RT_ERROR("FIR filter length not divisible by 8");
+
+    lengthDiv8 = newLength / 8;
+    length = lengthDiv8 * 8;
+    assert(length == newLength);
+
+    resultDivFactor = uResultDivFactor;
+    resultDivider = (SAMPLETYPE)::pow(2.0, (int)resultDivFactor);
+
+    delete[] filterCoeffs;
+    filterCoeffs = new SAMPLETYPE[length];
+    memcpy(filterCoeffs, coeffs, length * sizeof(SAMPLETYPE));
+}
+
+
+uint FIRFilter::getLength() const
+{
+    return length;
+}
+
+
+
+// Applies the filter to the given sequence of samples. 
+//
+// Note : The amount of outputted samples is by value of 'filter_length' 
+// smaller than the amount of input samples.
+uint FIRFilter::evaluate(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples, uint numChannels) const
+{
+    assert(length > 0);
+    assert(lengthDiv8 * 8 == length);
+
+    if (numSamples < length) return 0;
+
+#ifndef USE_MULTICH_ALWAYS
+    if (numChannels == 1)
+    {
+        return evaluateFilterMono(dest, src, numSamples);
+    } 
+    else if (numChannels == 2)
+    {
+        return evaluateFilterStereo(dest, src, numSamples);
+    }
+    else
+#endif // USE_MULTICH_ALWAYS
+    {
+        assert(numChannels > 0);
+        return evaluateFilterMulti(dest, src, numSamples, numChannels);
+    }
+}
+
+
+
+// Operator 'new' is overloaded so that it automatically creates a suitable instance 
+// depending on if we've a MMX-capable CPU available or not.
+void * FIRFilter::operator new(size_t s)
+{
+    // Notice! don't use "new FIRFilter" directly, use "newInstance" to create a new instance instead!
+    ST_THROW_RT_ERROR("Error in FIRFilter::new: Don't use 'new FIRFilter', use 'newInstance' member instead!");
+    return newInstance();
+}
+
+
+FIRFilter * FIRFilter::newInstance()
+{
+    uint uExtensions;
+
+    uExtensions = detectCPUextensions();
+
+    // Check if MMX/SSE instruction set extensions supported by CPU
+
+#ifdef SOUNDTOUCH_ALLOW_MMX
+    // MMX routines available only with integer sample types
+    if (uExtensions & SUPPORT_MMX)
+    {
+        return ::new FIRFilterMMX;
+    }
+    else
+#endif // SOUNDTOUCH_ALLOW_MMX
+
+#ifdef SOUNDTOUCH_ALLOW_SSE
+    if (uExtensions & SUPPORT_SSE)
+    {
+        // SSE support
+        return ::new FIRFilterSSE;
+    }
+    else
+#endif // SOUNDTOUCH_ALLOW_SSE
+
+    {
+        // ISA optimizations not supported, use plain C version
+        return ::new FIRFilter;
+    }
+}
diff --git a/Externals/soundtouch/FIRFilter.h b/Externals/soundtouch/FIRFilter.h
index e1563094af..a498032fe8 100644
--- a/Externals/soundtouch/FIRFilter.h
+++ b/Externals/soundtouch/FIRFilter.h
@@ -1,145 +1,146 @@
-////////////////////////////////////////////////////////////////////////////////
-///
-/// General FIR digital filter routines with MMX optimization. 
-///
-/// Note : MMX optimized functions reside in a separate, platform-specific file, 
-/// e.g. 'mmx_win.cpp' or 'mmx_gcc.cpp'
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2011-02-13 21:13:57 +0200 (Sun, 13 Feb 2011) $
-// File revision : $Revision: 4 $
-//
-// $Id: FIRFilter.h 104 2011-02-13 19:13:57Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef FIRFilter_H
-#define FIRFilter_H
-
-#include <stddef.h>
-#include "STTypes.h"
-
-namespace soundtouch
-{
-
-class FIRFilter 
-{
-protected:
-    // Number of FIR filter taps
-    uint length;    
-    // Number of FIR filter taps divided by 8
-    uint lengthDiv8;
-
-    // Result divider factor in 2^k format
-    uint resultDivFactor;
-
-    // Result divider value.
-    SAMPLETYPE resultDivider;
-
-    // Memory for filter coefficients
-    SAMPLETYPE *filterCoeffs;
-
-    virtual uint evaluateFilterStereo(SAMPLETYPE *dest, 
-                                      const SAMPLETYPE *src, 
-                                      uint numSamples) const;
-    virtual uint evaluateFilterMono(SAMPLETYPE *dest, 
-                                    const SAMPLETYPE *src, 
-                                    uint numSamples) const;
-
-public:
-    FIRFilter();
-    virtual ~FIRFilter();
-
-    /// Operator 'new' is overloaded so that it automatically creates a suitable instance 
-    /// depending on if we've a MMX-capable CPU available or not.
-    static void * operator new(size_t s);
-
-    static FIRFilter *newInstance();
-
-    /// Applies the filter to the given sequence of samples. 
-    /// Note : The amount of outputted samples is by value of 'filter_length' 
-    /// smaller than the amount of input samples.
-    ///
-    /// \return Number of samples copied to 'dest'.
-    uint evaluate(SAMPLETYPE *dest, 
-                  const SAMPLETYPE *src, 
-                  uint numSamples, 
-                  uint numChannels) const;
-
-    uint getLength() const;
-
-    virtual void setCoefficients(const SAMPLETYPE *coeffs, 
-                                 uint newLength, 
-                                 uint uResultDivFactor);
-};
-
-
-// Optional subclasses that implement CPU-specific optimizations:
-
-#ifdef SOUNDTOUCH_ALLOW_MMX
-
-/// Class that implements MMX optimized functions exclusive for 16bit integer samples type.
-    class FIRFilterMMX : public FIRFilter
-    {
-    protected:
-        short *filterCoeffsUnalign;
-        short *filterCoeffsAlign;
-
-        virtual uint evaluateFilterStereo(short *dest, const short *src, uint numSamples) const;
-    public:
-        FIRFilterMMX();
-        ~FIRFilterMMX();
-
-        virtual void setCoefficients(const short *coeffs, uint newLength, uint uResultDivFactor);
-    };
-
-#endif // SOUNDTOUCH_ALLOW_MMX
-
-
-#ifdef SOUNDTOUCH_ALLOW_SSE
-    /// Class that implements SSE optimized functions exclusive for floating point samples type.
-    class FIRFilterSSE : public FIRFilter
-    {
-    protected:
-        float *filterCoeffsUnalign;
-        float *filterCoeffsAlign;
-
-        virtual uint evaluateFilterStereo(float *dest, const float *src, uint numSamples) const;
-    public:
-        FIRFilterSSE();
-        ~FIRFilterSSE();
-
-        virtual void setCoefficients(const float *coeffs, uint newLength, uint uResultDivFactor);
-    };
-
-#endif // SOUNDTOUCH_ALLOW_SSE
-
-}
-
-#endif  // FIRFilter_H
+////////////////////////////////////////////////////////////////////////////////
+///
+/// General FIR digital filter routines with MMX optimization. 
+///
+/// Note : MMX optimized functions reside in a separate, platform-specific file, 
+/// e.g. 'mmx_win.cpp' or 'mmx_gcc.cpp'
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2013-06-12 15:24:44 +0000 (Wed, 12 Jun 2013) $
+// File revision : $Revision: 4 $
+//
+// $Id: FIRFilter.h 171 2013-06-12 15:24:44Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef FIRFilter_H
+#define FIRFilter_H
+
+#include <stddef.h>
+#include "STTypes.h"
+
+namespace soundtouch
+{
+
+class FIRFilter 
+{
+protected:
+    // Number of FIR filter taps
+    uint length;    
+    // Number of FIR filter taps divided by 8
+    uint lengthDiv8;
+
+    // Result divider factor in 2^k format
+    uint resultDivFactor;
+
+    // Result divider value.
+    SAMPLETYPE resultDivider;
+
+    // Memory for filter coefficients
+    SAMPLETYPE *filterCoeffs;
+
+    virtual uint evaluateFilterStereo(SAMPLETYPE *dest, 
+                                      const SAMPLETYPE *src, 
+                                      uint numSamples) const;
+    virtual uint evaluateFilterMono(SAMPLETYPE *dest, 
+                                    const SAMPLETYPE *src, 
+                                    uint numSamples) const;
+    virtual uint evaluateFilterMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples, uint numChannels) const;
+
+public:
+    FIRFilter();
+    virtual ~FIRFilter();
+
+    /// Operator 'new' is overloaded so that it automatically creates a suitable instance 
+    /// depending on if we've a MMX-capable CPU available or not.
+    static void * operator new(size_t s);
+
+    static FIRFilter *newInstance();
+
+    /// Applies the filter to the given sequence of samples. 
+    /// Note : The amount of outputted samples is by value of 'filter_length' 
+    /// smaller than the amount of input samples.
+    ///
+    /// \return Number of samples copied to 'dest'.
+    uint evaluate(SAMPLETYPE *dest, 
+                  const SAMPLETYPE *src, 
+                  uint numSamples, 
+                  uint numChannels) const;
+
+    uint getLength() const;
+
+    virtual void setCoefficients(const SAMPLETYPE *coeffs, 
+                                 uint newLength, 
+                                 uint uResultDivFactor);
+};
+
+
+// Optional subclasses that implement CPU-specific optimizations:
+
+#ifdef SOUNDTOUCH_ALLOW_MMX
+
+/// Class that implements MMX optimized functions exclusive for 16bit integer samples type.
+    class FIRFilterMMX : public FIRFilter
+    {
+    protected:
+        short *filterCoeffsUnalign;
+        short *filterCoeffsAlign;
+
+        virtual uint evaluateFilterStereo(short *dest, const short *src, uint numSamples) const;
+    public:
+        FIRFilterMMX();
+        ~FIRFilterMMX();
+
+        virtual void setCoefficients(const short *coeffs, uint newLength, uint uResultDivFactor);
+    };
+
+#endif // SOUNDTOUCH_ALLOW_MMX
+
+
+#ifdef SOUNDTOUCH_ALLOW_SSE
+    /// Class that implements SSE optimized functions exclusive for floating point samples type.
+    class FIRFilterSSE : public FIRFilter
+    {
+    protected:
+        float *filterCoeffsUnalign;
+        float *filterCoeffsAlign;
+
+        virtual uint evaluateFilterStereo(float *dest, const float *src, uint numSamples) const;
+    public:
+        FIRFilterSSE();
+        ~FIRFilterSSE();
+
+        virtual void setCoefficients(const float *coeffs, uint newLength, uint uResultDivFactor);
+    };
+
+#endif // SOUNDTOUCH_ALLOW_SSE
+
+}
+
+#endif  // FIRFilter_H
diff --git a/Externals/soundtouch/PeakFinder.cpp b/Externals/soundtouch/PeakFinder.cpp
index 47ed27cb50..0426b4a677 100644
--- a/Externals/soundtouch/PeakFinder.cpp
+++ b/Externals/soundtouch/PeakFinder.cpp
@@ -1,276 +1,276 @@
-////////////////////////////////////////////////////////////////////////////////
-///
-/// Peak detection routine. 
-///
-/// The routine detects highest value on an array of values and calculates the 
-/// precise peak location as a mass-center of the 'hump' around the peak value.
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2012-12-28 21:52:47 +0200 (Fri, 28 Dec 2012) $
-// File revision : $Revision: 4 $
-//
-// $Id: PeakFinder.cpp 164 2012-12-28 19:52:47Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <math.h>
-#include <assert.h>
-
-#include "PeakFinder.h"
-
-using namespace soundtouch;
-
-#define max(x, y) (((x) > (y)) ? (x) : (y))
-
-
-PeakFinder::PeakFinder()
-{
-    minPos = maxPos = 0;
-}
-
-
-// Finds real 'top' of a peak hump from neighnourhood of the given 'peakpos'.
-int PeakFinder::findTop(const float *data, int peakpos) const
-{
-    int i;
-    int start, end;
-    float refvalue;
-
-    refvalue = data[peakpos];
-
-    // seek within ±10 points
-    start = peakpos - 10;
-    if (start < minPos) start = minPos;
-    end = peakpos + 10;
-    if (end > maxPos) end = maxPos;
-
-    for (i = start; i <= end; i ++)
-    {
-        if (data[i] > refvalue)
-        {
-            peakpos = i;
-            refvalue = data[i];
-        }
-    }
-
-    // failure if max value is at edges of seek range => it's not peak, it's at slope.
-    if ((peakpos == start) || (peakpos == end)) return 0;
-
-    return peakpos;
-}
-
-
-// Finds 'ground level' of a peak hump by starting from 'peakpos' and proceeding
-// to direction defined by 'direction' until next 'hump' after minimum value will 
-// begin
-int PeakFinder::findGround(const float *data, int peakpos, int direction) const
-{
-    int lowpos;
-    int pos;
-    int climb_count;
-    float refvalue;
-    float delta;
-
-    climb_count = 0;
-    refvalue = data[peakpos];
-    lowpos = peakpos;
-
-    pos = peakpos;
-
-    while ((pos > minPos+1) && (pos < maxPos-1))
-    {
-        int prevpos;
-
-        prevpos = pos;
-        pos += direction;
-
-        // calculate derivate
-        delta = data[pos] - data[prevpos];
-        if (delta <= 0)
-        {
-            // going downhill, ok
-            if (climb_count)
-            {
-                climb_count --;  // decrease climb count
-            }
-
-            // check if new minimum found
-            if (data[pos] < refvalue)
-            {
-                // new minimum found
-                lowpos = pos;
-                refvalue = data[pos];
-            }
-        }
-        else
-        {
-            // going uphill, increase climbing counter
-            climb_count ++;
-            if (climb_count > 5) break;    // we've been climbing too long => it's next uphill => quit
-        }
-    }
-    return lowpos;
-}
-
-
-// Find offset where the value crosses the given level, when starting from 'peakpos' and
-// proceeds to direction defined in 'direction'
-int PeakFinder::findCrossingLevel(const float *data, float level, int peakpos, int direction) const
-{
-    float peaklevel;
-    int pos;
-
-    peaklevel = data[peakpos];
-    assert(peaklevel >= level);
-    pos = peakpos;
-    while ((pos >= minPos) && (pos < maxPos))
-    {
-        if (data[pos + direction] < level) return pos;   // crossing found
-        pos += direction;
-    }
-    return -1;  // not found
-}
-
-
-// Calculates the center of mass location of 'data' array items between 'firstPos' and 'lastPos'
-double PeakFinder::calcMassCenter(const float *data, int firstPos, int lastPos) const
-{
-    int i;
-    float sum;
-    float wsum;
-
-    sum = 0;
-    wsum = 0;
-    for (i = firstPos; i <= lastPos; i ++)
-    {
-        sum += (float)i * data[i];
-        wsum += data[i];
-    }
-
-    if (wsum < 1e-6) return 0;
-    return sum / wsum;
-}
-
-
-
-/// get exact center of peak near given position by calculating local mass of center
-double PeakFinder::getPeakCenter(const float *data, int peakpos) const
-{
-    float peakLevel;            // peak level
-    int crosspos1, crosspos2;   // position where the peak 'hump' crosses cutting level
-    float cutLevel;             // cutting value
-    float groundLevel;          // ground level of the peak
-    int gp1, gp2;               // bottom positions of the peak 'hump'
-
-    // find ground positions.
-    gp1 = findGround(data, peakpos, -1);
-    gp2 = findGround(data, peakpos, 1);
-
-    groundLevel = 0.5f * (data[gp1] + data[gp2]);
-    peakLevel = data[peakpos];
-
-    // calculate 70%-level of the peak
-    cutLevel = 0.70f * peakLevel + 0.30f * groundLevel;
-    // find mid-level crossings
-    crosspos1 = findCrossingLevel(data, cutLevel, peakpos, -1);
-    crosspos2 = findCrossingLevel(data, cutLevel, peakpos, 1);
-
-    if ((crosspos1 < 0) || (crosspos2 < 0)) return 0;   // no crossing, no peak..
-
-    // calculate mass center of the peak surroundings
-    return calcMassCenter(data, crosspos1, crosspos2);
-}
-
-
-
-double PeakFinder::detectPeak(const float *data, int aminPos, int amaxPos) 
-{
-
-    int i;
-    int peakpos;                // position of peak level
-    double highPeak, peak;
-
-    this->minPos = aminPos;
-    this->maxPos = amaxPos;
-
-    // find absolute peak
-    peakpos = minPos;
-    peak = data[minPos];
-    for (i = minPos + 1; i < maxPos; i ++)
-    {
-        if (data[i] > peak) 
-        {
-            peak = data[i];
-            peakpos = i;
-        }
-    }
-    
-    // Calculate exact location of the highest peak mass center
-    highPeak = getPeakCenter(data, peakpos);
-    peak = highPeak;
-
-    // Now check if the highest peak were in fact harmonic of the true base beat peak 
-    // - sometimes the highest peak can be Nth harmonic of the true base peak yet 
-    // just a slightly higher than the true base
-
-    for (i = 3; i < 10; i ++)
-    {
-        double peaktmp, harmonic;
-        int i1,i2;
-
-        harmonic = (double)i * 0.5;
-        peakpos = (int)(highPeak / harmonic + 0.5f);
-        if (peakpos < minPos) break;
-        peakpos = findTop(data, peakpos);   // seek true local maximum index
-        if (peakpos == 0) continue;         // no local max here
-
-        // calculate mass-center of possible harmonic peak
-        peaktmp = getPeakCenter(data, peakpos);
-
-        // accept harmonic peak if 
-        // (a) it is found
-        // (b) is within ±4% of the expected harmonic interval
-        // (c) has at least half x-corr value of the max. peak
-
-        double diff = harmonic * peaktmp / highPeak;
-        if ((diff < 0.96) || (diff > 1.04)) continue;   // peak too afar from expected
-
-        // now compare to highest detected peak
-        i1 = (int)(highPeak + 0.5);
-        i2 = (int)(peaktmp + 0.5);
-        if (data[i2] >= 0.4*data[i1])
-        {
-            // The harmonic is at least half as high primary peak,
-            // thus use the harmonic peak instead
-            peak = peaktmp;
-        }
-    }
-
-    return peak;
-}
+////////////////////////////////////////////////////////////////////////////////
+///
+/// Peak detection routine. 
+///
+/// The routine detects highest value on an array of values and calculates the 
+/// precise peak location as a mass-center of the 'hump' around the peak value.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2012-12-28 19:52:47 +0000 (Fri, 28 Dec 2012) $
+// File revision : $Revision: 4 $
+//
+// $Id: PeakFinder.cpp 164 2012-12-28 19:52:47Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <math.h>
+#include <assert.h>
+
+#include "PeakFinder.h"
+
+using namespace soundtouch;
+
+#define max(x, y) (((x) > (y)) ? (x) : (y))
+
+
+PeakFinder::PeakFinder()
+{
+    minPos = maxPos = 0;
+}
+
+
+// Finds real 'top' of a peak hump from neighnourhood of the given 'peakpos'.
+int PeakFinder::findTop(const float *data, int peakpos) const
+{
+    int i;
+    int start, end;
+    float refvalue;
+
+    refvalue = data[peakpos];
+
+    // seek within ±10 points
+    start = peakpos - 10;
+    if (start < minPos) start = minPos;
+    end = peakpos + 10;
+    if (end > maxPos) end = maxPos;
+
+    for (i = start; i <= end; i ++)
+    {
+        if (data[i] > refvalue)
+        {
+            peakpos = i;
+            refvalue = data[i];
+        }
+    }
+
+    // failure if max value is at edges of seek range => it's not peak, it's at slope.
+    if ((peakpos == start) || (peakpos == end)) return 0;
+
+    return peakpos;
+}
+
+
+// Finds 'ground level' of a peak hump by starting from 'peakpos' and proceeding
+// to direction defined by 'direction' until next 'hump' after minimum value will 
+// begin
+int PeakFinder::findGround(const float *data, int peakpos, int direction) const
+{
+    int lowpos;
+    int pos;
+    int climb_count;
+    float refvalue;
+    float delta;
+
+    climb_count = 0;
+    refvalue = data[peakpos];
+    lowpos = peakpos;
+
+    pos = peakpos;
+
+    while ((pos > minPos+1) && (pos < maxPos-1))
+    {
+        int prevpos;
+
+        prevpos = pos;
+        pos += direction;
+
+        // calculate derivate
+        delta = data[pos] - data[prevpos];
+        if (delta <= 0)
+        {
+            // going downhill, ok
+            if (climb_count)
+            {
+                climb_count --;  // decrease climb count
+            }
+
+            // check if new minimum found
+            if (data[pos] < refvalue)
+            {
+                // new minimum found
+                lowpos = pos;
+                refvalue = data[pos];
+            }
+        }
+        else
+        {
+            // going uphill, increase climbing counter
+            climb_count ++;
+            if (climb_count > 5) break;    // we've been climbing too long => it's next uphill => quit
+        }
+    }
+    return lowpos;
+}
+
+
+// Find offset where the value crosses the given level, when starting from 'peakpos' and
+// proceeds to direction defined in 'direction'
+int PeakFinder::findCrossingLevel(const float *data, float level, int peakpos, int direction) const
+{
+    float peaklevel;
+    int pos;
+
+    peaklevel = data[peakpos];
+    assert(peaklevel >= level);
+    pos = peakpos;
+    while ((pos >= minPos) && (pos < maxPos))
+    {
+        if (data[pos + direction] < level) return pos;   // crossing found
+        pos += direction;
+    }
+    return -1;  // not found
+}
+
+
+// Calculates the center of mass location of 'data' array items between 'firstPos' and 'lastPos'
+double PeakFinder::calcMassCenter(const float *data, int firstPos, int lastPos) const
+{
+    int i;
+    float sum;
+    float wsum;
+
+    sum = 0;
+    wsum = 0;
+    for (i = firstPos; i <= lastPos; i ++)
+    {
+        sum += (float)i * data[i];
+        wsum += data[i];
+    }
+
+    if (wsum < 1e-6) return 0;
+    return sum / wsum;
+}
+
+
+
+/// get exact center of peak near given position by calculating local mass of center
+double PeakFinder::getPeakCenter(const float *data, int peakpos) const
+{
+    float peakLevel;            // peak level
+    int crosspos1, crosspos2;   // position where the peak 'hump' crosses cutting level
+    float cutLevel;             // cutting value
+    float groundLevel;          // ground level of the peak
+    int gp1, gp2;               // bottom positions of the peak 'hump'
+
+    // find ground positions.
+    gp1 = findGround(data, peakpos, -1);
+    gp2 = findGround(data, peakpos, 1);
+
+    groundLevel = 0.5f * (data[gp1] + data[gp2]);
+    peakLevel = data[peakpos];
+
+    // calculate 70%-level of the peak
+    cutLevel = 0.70f * peakLevel + 0.30f * groundLevel;
+    // find mid-level crossings
+    crosspos1 = findCrossingLevel(data, cutLevel, peakpos, -1);
+    crosspos2 = findCrossingLevel(data, cutLevel, peakpos, 1);
+
+    if ((crosspos1 < 0) || (crosspos2 < 0)) return 0;   // no crossing, no peak..
+
+    // calculate mass center of the peak surroundings
+    return calcMassCenter(data, crosspos1, crosspos2);
+}
+
+
+
+double PeakFinder::detectPeak(const float *data, int aminPos, int amaxPos) 
+{
+
+    int i;
+    int peakpos;                // position of peak level
+    double highPeak, peak;
+
+    this->minPos = aminPos;
+    this->maxPos = amaxPos;
+
+    // find absolute peak
+    peakpos = minPos;
+    peak = data[minPos];
+    for (i = minPos + 1; i < maxPos; i ++)
+    {
+        if (data[i] > peak) 
+        {
+            peak = data[i];
+            peakpos = i;
+        }
+    }
+    
+    // Calculate exact location of the highest peak mass center
+    highPeak = getPeakCenter(data, peakpos);
+    peak = highPeak;
+
+    // Now check if the highest peak were in fact harmonic of the true base beat peak 
+    // - sometimes the highest peak can be Nth harmonic of the true base peak yet 
+    // just a slightly higher than the true base
+
+    for (i = 3; i < 10; i ++)
+    {
+        double peaktmp, harmonic;
+        int i1,i2;
+
+        harmonic = (double)i * 0.5;
+        peakpos = (int)(highPeak / harmonic + 0.5f);
+        if (peakpos < minPos) break;
+        peakpos = findTop(data, peakpos);   // seek true local maximum index
+        if (peakpos == 0) continue;         // no local max here
+
+        // calculate mass-center of possible harmonic peak
+        peaktmp = getPeakCenter(data, peakpos);
+
+        // accept harmonic peak if 
+        // (a) it is found
+        // (b) is within ±4% of the expected harmonic interval
+        // (c) has at least half x-corr value of the max. peak
+
+        double diff = harmonic * peaktmp / highPeak;
+        if ((diff < 0.96) || (diff > 1.04)) continue;   // peak too afar from expected
+
+        // now compare to highest detected peak
+        i1 = (int)(highPeak + 0.5);
+        i2 = (int)(peaktmp + 0.5);
+        if (data[i2] >= 0.4*data[i1])
+        {
+            // The harmonic is at least half as high primary peak,
+            // thus use the harmonic peak instead
+            peak = peaktmp;
+        }
+    }
+
+    return peak;
+}
diff --git a/Externals/soundtouch/PeakFinder.h b/Externals/soundtouch/PeakFinder.h
index d170b1c58b..e94a554ed3 100644
--- a/Externals/soundtouch/PeakFinder.h
+++ b/Externals/soundtouch/PeakFinder.h
@@ -1,97 +1,97 @@
-////////////////////////////////////////////////////////////////////////////////
-///
-/// The routine detects highest value on an array of values and calculates the 
-/// precise peak location as a mass-center of the 'hump' around the peak value.
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2011-12-30 22:33:46 +0200 (Fri, 30 Dec 2011) $
-// File revision : $Revision: 4 $
-//
-// $Id: PeakFinder.h 132 2011-12-30 20:33:46Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef _PeakFinder_H_
-#define _PeakFinder_H_
-
-namespace soundtouch
-{
-
-class PeakFinder
-{
-protected:
-    /// Min, max allowed peak positions within the data vector
-    int minPos, maxPos;
-
-    /// Calculates the mass center between given vector items.
-    double calcMassCenter(const float *data, ///< Data vector.
-                         int firstPos,      ///< Index of first vector item beloging to the peak.
-                         int lastPos        ///< Index of last vector item beloging to the peak.
-                         ) const;
-
-    /// Finds the data vector index where the monotoniously decreasing signal crosses the
-    /// given level.
-    int   findCrossingLevel(const float *data,  ///< Data vector.
-                            float level,        ///< Goal crossing level.
-                            int peakpos,        ///< Peak position index within the data vector.
-                            int direction       /// Direction where to proceed from the peak: 1 = right, -1 = left.
-                            ) const;
-
-    // Finds real 'top' of a peak hump from neighnourhood of the given 'peakpos'.
-    int findTop(const float *data, int peakpos) const;
-
-
-    /// Finds the 'ground' level, i.e. smallest level between two neighbouring peaks, to right- 
-    /// or left-hand side of the given peak position.
-    int   findGround(const float *data,     /// Data vector.
-                     int peakpos,           /// Peak position index within the data vector.
-                     int direction          /// Direction where to proceed from the peak: 1 = right, -1 = left.
-                     ) const;
-
-    /// get exact center of peak near given position by calculating local mass of center
-    double getPeakCenter(const float *data, int peakpos) const;
-
-public:
-    /// Constructor. 
-    PeakFinder();
-
-    /// Detect exact peak position of the data vector by finding the largest peak 'hump'
-    /// and calculating the mass-center location of the peak hump.
-    ///
-    /// \return The location of the largest base harmonic peak hump.
-    double detectPeak(const float *data, /// Data vector to be analyzed. The data vector has
-                                        /// to be at least 'maxPos' items long.
-                     int minPos,        ///< Min allowed peak location within the vector data.
-                     int maxPos         ///< Max allowed peak location within the vector data.
-                     );
-};
-
-}
-
-#endif // _PeakFinder_H_
+////////////////////////////////////////////////////////////////////////////////
+///
+/// The routine detects highest value on an array of values and calculates the 
+/// precise peak location as a mass-center of the 'hump' around the peak value.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2011-12-30 20:33:46 +0000 (Fri, 30 Dec 2011) $
+// File revision : $Revision: 4 $
+//
+// $Id: PeakFinder.h 132 2011-12-30 20:33:46Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef _PeakFinder_H_
+#define _PeakFinder_H_
+
+namespace soundtouch
+{
+
+class PeakFinder
+{
+protected:
+    /// Min, max allowed peak positions within the data vector
+    int minPos, maxPos;
+
+    /// Calculates the mass center between given vector items.
+    double calcMassCenter(const float *data, ///< Data vector.
+                         int firstPos,      ///< Index of first vector item beloging to the peak.
+                         int lastPos        ///< Index of last vector item beloging to the peak.
+                         ) const;
+
+    /// Finds the data vector index where the monotoniously decreasing signal crosses the
+    /// given level.
+    int   findCrossingLevel(const float *data,  ///< Data vector.
+                            float level,        ///< Goal crossing level.
+                            int peakpos,        ///< Peak position index within the data vector.
+                            int direction       /// Direction where to proceed from the peak: 1 = right, -1 = left.
+                            ) const;
+
+    // Finds real 'top' of a peak hump from neighnourhood of the given 'peakpos'.
+    int findTop(const float *data, int peakpos) const;
+
+
+    /// Finds the 'ground' level, i.e. smallest level between two neighbouring peaks, to right- 
+    /// or left-hand side of the given peak position.
+    int   findGround(const float *data,     /// Data vector.
+                     int peakpos,           /// Peak position index within the data vector.
+                     int direction          /// Direction where to proceed from the peak: 1 = right, -1 = left.
+                     ) const;
+
+    /// get exact center of peak near given position by calculating local mass of center
+    double getPeakCenter(const float *data, int peakpos) const;
+
+public:
+    /// Constructor. 
+    PeakFinder();
+
+    /// Detect exact peak position of the data vector by finding the largest peak 'hump'
+    /// and calculating the mass-center location of the peak hump.
+    ///
+    /// \return The location of the largest base harmonic peak hump.
+    double detectPeak(const float *data, /// Data vector to be analyzed. The data vector has
+                                        /// to be at least 'maxPos' items long.
+                     int minPos,        ///< Min allowed peak location within the vector data.
+                     int maxPos         ///< Max allowed peak location within the vector data.
+                     );
+};
+
+}
+
+#endif // _PeakFinder_H_
diff --git a/Externals/soundtouch/RateTransposer.cpp b/Externals/soundtouch/RateTransposer.cpp
index 3ad8d93e5c..4944c4bf4e 100644
--- a/Externals/soundtouch/RateTransposer.cpp
+++ b/Externals/soundtouch/RateTransposer.cpp
@@ -1,626 +1,748 @@
-////////////////////////////////////////////////////////////////////////////////
-/// 
-/// Sample rate transposer. Changes sample rate by using linear interpolation 
-/// together with anti-alias filtering (first order interpolation with anti-
-/// alias filtering should be quite adequate for this application)
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2011-09-02 21:56:11 +0300 (Fri, 02 Sep 2011) $
-// File revision : $Revision: 4 $
-//
-// $Id: RateTransposer.cpp 131 2011-09-02 18:56:11Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <memory.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include "RateTransposer.h"
-#include "AAFilter.h"
-
-using namespace soundtouch;
-
-
-/// A linear samplerate transposer class that uses integer arithmetics.
-/// for the transposing.
-class RateTransposerInteger : public RateTransposer
-{
-protected:
-    int iSlopeCount;
-    int iRate;
-    SAMPLETYPE sPrevSampleL, sPrevSampleR;
-
-    virtual void resetRegisters();
-
-    virtual uint transposeStereo(SAMPLETYPE *dest, 
-                         const SAMPLETYPE *src, 
-                         uint numSamples);
-    virtual uint transposeMono(SAMPLETYPE *dest, 
-                       const SAMPLETYPE *src, 
-                       uint numSamples);
-
-public:
-    RateTransposerInteger();
-    virtual ~RateTransposerInteger();
-
-    /// Sets new target rate. Normal rate = 1.0, smaller values represent slower 
-    /// rate, larger faster rates.
-    virtual void setRate(float newRate);
-
-};
-
-
-/// A linear samplerate transposer class that uses floating point arithmetics
-/// for the transposing.
-class RateTransposerFloat : public RateTransposer
-{
-protected:
-    float fSlopeCount;
-    SAMPLETYPE sPrevSampleL, sPrevSampleR;
-
-    virtual void resetRegisters();
-
-    virtual uint transposeStereo(SAMPLETYPE *dest, 
-                         const SAMPLETYPE *src, 
-                         uint numSamples);
-    virtual uint transposeMono(SAMPLETYPE *dest, 
-                       const SAMPLETYPE *src, 
-                       uint numSamples);
-
-public:
-    RateTransposerFloat();
-    virtual ~RateTransposerFloat();
-};
-
-
-
-
-// Operator 'new' is overloaded so that it automatically creates a suitable instance 
-// depending on if we've a MMX/SSE/etc-capable CPU available or not.
-void * RateTransposer::operator new(size_t s)
-{
-    ST_THROW_RT_ERROR("Error in RateTransoser::new: don't use \"new TDStretch\" directly, use \"newInstance\" to create a new instance instead!");
-    return newInstance();
-}
-
-
-RateTransposer *RateTransposer::newInstance()
-{
-#ifdef SOUNDTOUCH_INTEGER_SAMPLES
-    return ::new RateTransposerInteger;
-#else
-    return ::new RateTransposerFloat;
-#endif
-}
-
-
-// Constructor
-RateTransposer::RateTransposer() : FIFOProcessor(&outputBuffer)
-{
-    numChannels = 2;
-    bUseAAFilter = TRUE;
-    fRate = 0;
-
-    // Instantiates the anti-alias filter with default tap length
-    // of 32
-    pAAFilter = new AAFilter(32);
-}
-
-
-
-RateTransposer::~RateTransposer()
-{
-    delete pAAFilter;
-}
-
-
-
-/// Enables/disables the anti-alias filter. Zero to disable, nonzero to enable
-void RateTransposer::enableAAFilter(BOOL newMode)
-{
-    bUseAAFilter = newMode;
-}
-
-
-/// Returns nonzero if anti-alias filter is enabled.
-BOOL RateTransposer::isAAFilterEnabled() const
-{
-    return bUseAAFilter;
-}
-
-
-AAFilter *RateTransposer::getAAFilter()
-{
-    return pAAFilter;
-}
-
-
-
-// Sets new target iRate. Normal iRate = 1.0, smaller values represent slower 
-// iRate, larger faster iRates.
-void RateTransposer::setRate(float newRate)
-{
-    double fCutoff;
-
-    fRate = newRate;
-
-    // design a new anti-alias filter
-    if (newRate > 1.0f) 
-    {
-        fCutoff = 0.5f / newRate;
-    } 
-    else 
-    {
-        fCutoff = 0.5f * newRate;
-    }
-    pAAFilter->setCutoffFreq(fCutoff);
-}
-
-
-// Outputs as many samples of the 'outputBuffer' as possible, and if there's
-// any room left, outputs also as many of the incoming samples as possible.
-// The goal is to drive the outputBuffer empty.
-//
-// It's allowed for 'output' and 'input' parameters to point to the same
-// memory position.
-/*
-void RateTransposer::flushStoreBuffer()
-{
-    if (storeBuffer.isEmpty()) return;
-
-    outputBuffer.moveSamples(storeBuffer);
-}
-*/
-
-
-// Adds 'nSamples' pcs of samples from the 'samples' memory position into
-// the input of the object.
-void RateTransposer::putSamples(const SAMPLETYPE *samples, uint nSamples)
-{
-    processSamples(samples, nSamples);
-}
-
-
-
-// Transposes up the sample rate, causing the observed playback 'rate' of the
-// sound to decrease
-void RateTransposer::upsample(const SAMPLETYPE *src, uint nSamples)
-{
-    uint count, sizeTemp, num;
-
-    // If the parameter 'uRate' value is smaller than 'SCALE', first transpose
-    // the samples and then apply the anti-alias filter to remove aliasing.
-
-    // First check that there's enough room in 'storeBuffer' 
-    // (+16 is to reserve some slack in the destination buffer)
-    sizeTemp = (uint)((float)nSamples / fRate + 16.0f);
-
-    // Transpose the samples, store the result into the end of "storeBuffer"
-    count = transpose(storeBuffer.ptrEnd(sizeTemp), src, nSamples);
-    storeBuffer.putSamples(count);
-
-    // Apply the anti-alias filter to samples in "store output", output the
-    // result to "dest"
-    num = storeBuffer.numSamples();
-    count = pAAFilter->evaluate(outputBuffer.ptrEnd(num), 
-        storeBuffer.ptrBegin(), num, (uint)numChannels);
-    outputBuffer.putSamples(count);
-
-    // Remove the processed samples from "storeBuffer"
-    storeBuffer.receiveSamples(count);
-}
-
-
-// Transposes down the sample rate, causing the observed playback 'rate' of the
-// sound to increase
-void RateTransposer::downsample(const SAMPLETYPE *src, uint nSamples)
-{
-    uint count, sizeTemp;
-
-    // If the parameter 'uRate' value is larger than 'SCALE', first apply the
-    // anti-alias filter to remove high frequencies (prevent them from folding
-    // over the lover frequencies), then transpose.
-
-    // Add the new samples to the end of the storeBuffer
-    storeBuffer.putSamples(src, nSamples);
-
-    // Anti-alias filter the samples to prevent folding and output the filtered 
-    // data to tempBuffer. Note : because of the FIR filter length, the
-    // filtering routine takes in 'filter_length' more samples than it outputs.
-    assert(tempBuffer.isEmpty());
-    sizeTemp = storeBuffer.numSamples();
-
-    count = pAAFilter->evaluate(tempBuffer.ptrEnd(sizeTemp), 
-        storeBuffer.ptrBegin(), sizeTemp, (uint)numChannels);
-
-	if (count == 0) return;
-
-    // Remove the filtered samples from 'storeBuffer'
-    storeBuffer.receiveSamples(count);
-
-    // Transpose the samples (+16 is to reserve some slack in the destination buffer)
-    sizeTemp = (uint)((float)nSamples / fRate + 16.0f);
-    count = transpose(outputBuffer.ptrEnd(sizeTemp), tempBuffer.ptrBegin(), count);
-    outputBuffer.putSamples(count);
-}
-
-
-// Transposes sample rate by applying anti-alias filter to prevent folding. 
-// Returns amount of samples returned in the "dest" buffer.
-// The maximum amount of samples that can be returned at a time is set by
-// the 'set_returnBuffer_size' function.
-void RateTransposer::processSamples(const SAMPLETYPE *src, uint nSamples)
-{
-    uint count;
-    uint sizeReq;
-
-    if (nSamples == 0) return;
-    assert(pAAFilter);
-
-    // If anti-alias filter is turned off, simply transpose without applying
-    // the filter
-    if (bUseAAFilter == FALSE) 
-    {
-        sizeReq = (uint)((float)nSamples / fRate + 1.0f);
-        count = transpose(outputBuffer.ptrEnd(sizeReq), src, nSamples);
-        outputBuffer.putSamples(count);
-        return;
-    }
-
-    // Transpose with anti-alias filter
-    if (fRate < 1.0f) 
-    {
-        upsample(src, nSamples);
-    } 
-    else  
-    {
-        downsample(src, nSamples);
-    }
-}
-
-
-// Transposes the sample rate of the given samples using linear interpolation. 
-// Returns the number of samples returned in the "dest" buffer
-inline uint RateTransposer::transpose(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples)
-{
-    if (numChannels == 2) 
-    {
-        return transposeStereo(dest, src, nSamples);
-    } 
-    else 
-    {
-        return transposeMono(dest, src, nSamples);
-    }
-}
-
-
-// Sets the number of channels, 1 = mono, 2 = stereo
-void RateTransposer::setChannels(int nChannels)
-{
-    assert(nChannels > 0);
-    if (numChannels == nChannels) return;
-
-    assert(nChannels == 1 || nChannels == 2);
-    numChannels = nChannels;
-
-    storeBuffer.setChannels(numChannels);
-    tempBuffer.setChannels(numChannels);
-    outputBuffer.setChannels(numChannels);
-
-    // Inits the linear interpolation registers
-    resetRegisters();
-}
-
-
-// Clears all the samples in the object
-void RateTransposer::clear()
-{
-    outputBuffer.clear();
-    storeBuffer.clear();
-}
-
-
-// Returns nonzero if there aren't any samples available for outputting.
-int RateTransposer::isEmpty() const
-{
-    int res;
-
-    res = FIFOProcessor::isEmpty();
-    if (res == 0) return 0;
-    return storeBuffer.isEmpty();
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// RateTransposerInteger - integer arithmetic implementation
-// 
-
-/// fixed-point interpolation routine precision
-#define SCALE    65536
-
-// Constructor
-RateTransposerInteger::RateTransposerInteger() : RateTransposer()
-{
-    // Notice: use local function calling syntax for sake of clarity, 
-    // to indicate the fact that C++ constructor can't call virtual functions.
-    RateTransposerInteger::resetRegisters();
-    RateTransposerInteger::setRate(1.0f);
-}
-
-
-RateTransposerInteger::~RateTransposerInteger()
-{
-}
-
-
-void RateTransposerInteger::resetRegisters()
-{
-    iSlopeCount = 0;
-    sPrevSampleL = 
-    sPrevSampleR = 0;
-}
-
-
-
-// Transposes the sample rate of the given samples using linear interpolation. 
-// 'Mono' version of the routine. Returns the number of samples returned in 
-// the "dest" buffer
-uint RateTransposerInteger::transposeMono(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples)
-{
-    unsigned int i, used;
-    LONG_SAMPLETYPE temp, vol1;
-
-    if (nSamples == 0) return 0;  // no samples, no work
-
-	used = 0;    
-    i = 0;
-
-    // Process the last sample saved from the previous call first...
-    while (iSlopeCount <= SCALE) 
-    {
-        vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount);
-        temp = vol1 * sPrevSampleL + iSlopeCount * src[0];
-        dest[i] = (SAMPLETYPE)(temp / SCALE);
-        i++;
-        iSlopeCount += iRate;
-    }
-    // now always (iSlopeCount > SCALE)
-    iSlopeCount -= SCALE;
-
-    while (1)
-    {
-        while (iSlopeCount > SCALE) 
-        {
-            iSlopeCount -= SCALE;
-            used ++;
-            if (used >= nSamples - 1) goto end;
-        }
-        vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount);
-        temp = src[used] * vol1 + iSlopeCount * src[used + 1];
-        dest[i] = (SAMPLETYPE)(temp / SCALE);
-
-        i++;
-        iSlopeCount += iRate;
-    }
-end:
-    // Store the last sample for the next round
-    sPrevSampleL = src[nSamples - 1];
-
-    return i;
-}
-
-
-// Transposes the sample rate of the given samples using linear interpolation. 
-// 'Stereo' version of the routine. Returns the number of samples returned in 
-// the "dest" buffer
-uint RateTransposerInteger::transposeStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples)
-{
-    unsigned int srcPos, i, used;
-    LONG_SAMPLETYPE temp, vol1;
-
-    if (nSamples == 0) return 0;  // no samples, no work
-
-    used = 0;    
-    i = 0;
-
-    // Process the last sample saved from the sPrevSampleLious call first...
-    while (iSlopeCount <= SCALE) 
-    {
-        vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount);
-        temp = vol1 * sPrevSampleL + iSlopeCount * src[0];
-        dest[2 * i] = (SAMPLETYPE)(temp / SCALE);
-        temp = vol1 * sPrevSampleR + iSlopeCount * src[1];
-        dest[2 * i + 1] = (SAMPLETYPE)(temp / SCALE);
-        i++;
-        iSlopeCount += iRate;
-    }
-    // now always (iSlopeCount > SCALE)
-    iSlopeCount -= SCALE;
-
-    while (1)
-    {
-        while (iSlopeCount > SCALE) 
-        {
-            iSlopeCount -= SCALE;
-            used ++;
-            if (used >= nSamples - 1) goto end;
-        }
-        srcPos = 2 * used;
-        vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount);
-        temp = src[srcPos] * vol1 + iSlopeCount * src[srcPos + 2];
-        dest[2 * i] = (SAMPLETYPE)(temp / SCALE);
-        temp = src[srcPos + 1] * vol1 + iSlopeCount * src[srcPos + 3];
-        dest[2 * i + 1] = (SAMPLETYPE)(temp / SCALE);
-
-        i++;
-        iSlopeCount += iRate;
-    }
-end:
-    // Store the last sample for the next round
-    sPrevSampleL = src[2 * nSamples - 2];
-    sPrevSampleR = src[2 * nSamples - 1];
-
-    return i;
-}
-
-
-// Sets new target iRate. Normal iRate = 1.0, smaller values represent slower 
-// iRate, larger faster iRates.
-void RateTransposerInteger::setRate(float newRate)
-{
-    iRate = (int)(newRate * SCALE + 0.5f);
-    RateTransposer::setRate(newRate);
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// RateTransposerFloat - floating point arithmetic implementation
-// 
-//////////////////////////////////////////////////////////////////////////////
-
-// Constructor
-RateTransposerFloat::RateTransposerFloat() : RateTransposer()
-{
-    // Notice: use local function calling syntax for sake of clarity, 
-    // to indicate the fact that C++ constructor can't call virtual functions.
-    RateTransposerFloat::resetRegisters();
-    RateTransposerFloat::setRate(1.0f);
-}
-
-
-RateTransposerFloat::~RateTransposerFloat()
-{
-}
-
-
-void RateTransposerFloat::resetRegisters()
-{
-    fSlopeCount = 0;
-    sPrevSampleL = 
-    sPrevSampleR = 0;
-}
-
-
-
-// Transposes the sample rate of the given samples using linear interpolation. 
-// 'Mono' version of the routine. Returns the number of samples returned in 
-// the "dest" buffer
-uint RateTransposerFloat::transposeMono(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples)
-{
-    unsigned int i, used;
-
-    used = 0;    
-    i = 0;
-
-    // Process the last sample saved from the previous call first...
-    while (fSlopeCount <= 1.0f) 
-    {
-        dest[i] = (SAMPLETYPE)((1.0f - fSlopeCount) * sPrevSampleL + fSlopeCount * src[0]);
-        i++;
-        fSlopeCount += fRate;
-    }
-    fSlopeCount -= 1.0f;
-
-    if (nSamples > 1)
-    {
-        while (1)
-        {
-            while (fSlopeCount > 1.0f) 
-            {
-                fSlopeCount -= 1.0f;
-                used ++;
-                if (used >= nSamples - 1) goto end;
-            }
-            dest[i] = (SAMPLETYPE)((1.0f - fSlopeCount) * src[used] + fSlopeCount * src[used + 1]);
-            i++;
-            fSlopeCount += fRate;
-        }
-    }
-end:
-    // Store the last sample for the next round
-    sPrevSampleL = src[nSamples - 1];
-
-    return i;
-}
-
-
-// Transposes the sample rate of the given samples using linear interpolation. 
-// 'Mono' version of the routine. Returns the number of samples returned in 
-// the "dest" buffer
-uint RateTransposerFloat::transposeStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples)
-{
-    unsigned int srcPos, i, used;
-
-    if (nSamples == 0) return 0;  // no samples, no work
-
-    used = 0;    
-    i = 0;
-
-    // Process the last sample saved from the sPrevSampleLious call first...
-    while (fSlopeCount <= 1.0f) 
-    {
-        dest[2 * i] = (SAMPLETYPE)((1.0f - fSlopeCount) * sPrevSampleL + fSlopeCount * src[0]);
-        dest[2 * i + 1] = (SAMPLETYPE)((1.0f - fSlopeCount) * sPrevSampleR + fSlopeCount * src[1]);
-        i++;
-        fSlopeCount += fRate;
-    }
-    // now always (iSlopeCount > 1.0f)
-    fSlopeCount -= 1.0f;
-
-    if (nSamples > 1)
-    {
-        while (1)
-        {
-            while (fSlopeCount > 1.0f) 
-            {
-                fSlopeCount -= 1.0f;
-                used ++;
-                if (used >= nSamples - 1) goto end;
-            }
-            srcPos = 2 * used;
-
-            dest[2 * i] = (SAMPLETYPE)((1.0f - fSlopeCount) * src[srcPos] 
-                + fSlopeCount * src[srcPos + 2]);
-            dest[2 * i + 1] = (SAMPLETYPE)((1.0f - fSlopeCount) * src[srcPos + 1] 
-                + fSlopeCount * src[srcPos + 3]);
-
-            i++;
-            fSlopeCount += fRate;
-        }
-    }
-end:
-    // Store the last sample for the next round
-    sPrevSampleL = src[2 * nSamples - 2];
-    sPrevSampleR = src[2 * nSamples - 1];
-
-    return i;
-}
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Sample rate transposer. Changes sample rate by using linear interpolation 
+/// together with anti-alias filtering (first order interpolation with anti-
+/// alias filtering should be quite adequate for this application)
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2013-06-14 17:34:33 +0000 (Fri, 14 Jun 2013) $
+// File revision : $Revision: 4 $
+//
+// $Id: RateTransposer.cpp 172 2013-06-14 17:34:33Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <memory.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include "RateTransposer.h"
+#include "AAFilter.h"
+
+using namespace soundtouch;
+
+
+/// A linear samplerate transposer class that uses integer arithmetics.
+/// for the transposing.
+class RateTransposerInteger : public RateTransposer
+{
+protected:
+    int iSlopeCount;
+    int iRate;
+    SAMPLETYPE *sPrevSample;
+
+    virtual void resetRegisters();
+
+    virtual int transposeStereo(SAMPLETYPE *dest, 
+                         const SAMPLETYPE *src, 
+                         uint numSamples);
+    virtual int transposeMono(SAMPLETYPE *dest, 
+                       const SAMPLETYPE *src, 
+                       uint numSamples);
+    virtual int transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples);
+public:
+    RateTransposerInteger();
+    virtual ~RateTransposerInteger();
+
+    /// Sets new target rate. Normal rate = 1.0, smaller values represent slower 
+    /// rate, larger faster rates.
+    virtual void setRate(float newRate);
+
+};
+
+
+/// A linear samplerate transposer class that uses floating point arithmetics
+/// for the transposing.
+class RateTransposerFloat : public RateTransposer
+{
+protected:
+    float fSlopeCount;
+    SAMPLETYPE *sPrevSample;
+
+    virtual void resetRegisters();
+
+    virtual int transposeStereo(SAMPLETYPE *dest, 
+                         const SAMPLETYPE *src, 
+                         uint numSamples);
+    virtual int transposeMono(SAMPLETYPE *dest, 
+                       const SAMPLETYPE *src, 
+                       uint numSamples);
+    virtual int transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples);
+
+public:
+    RateTransposerFloat();
+    virtual ~RateTransposerFloat();
+};
+
+
+
+
+// Operator 'new' is overloaded so that it automatically creates a suitable instance 
+// depending on if we've a MMX/SSE/etc-capable CPU available or not.
+void * RateTransposer::operator new(size_t s)
+{
+    ST_THROW_RT_ERROR("Error in RateTransoser::new: don't use \"new TDStretch\" directly, use \"newInstance\" to create a new instance instead!");
+    return newInstance();
+}
+
+
+RateTransposer *RateTransposer::newInstance()
+{
+#ifdef SOUNDTOUCH_INTEGER_SAMPLES
+    return ::new RateTransposerInteger;
+#else
+    return ::new RateTransposerFloat;
+#endif
+}
+
+
+// Constructor
+RateTransposer::RateTransposer() : FIFOProcessor(&outputBuffer)
+{
+    numChannels = 2;
+    bUseAAFilter = TRUE;
+    fRate = 0;
+
+    // Instantiates the anti-alias filter with default tap length
+    // of 32
+    pAAFilter = new AAFilter(32);
+}
+
+
+
+RateTransposer::~RateTransposer()
+{
+    delete pAAFilter;
+}
+
+
+
+/// Enables/disables the anti-alias filter. Zero to disable, nonzero to enable
+void RateTransposer::enableAAFilter(BOOL newMode)
+{
+    bUseAAFilter = newMode;
+}
+
+
+/// Returns nonzero if anti-alias filter is enabled.
+BOOL RateTransposer::isAAFilterEnabled() const
+{
+    return bUseAAFilter;
+}
+
+
+AAFilter *RateTransposer::getAAFilter()
+{
+    return pAAFilter;
+}
+
+
+
+// Sets new target iRate. Normal iRate = 1.0, smaller values represent slower 
+// iRate, larger faster iRates.
+void RateTransposer::setRate(float newRate)
+{
+    double fCutoff;
+
+    fRate = newRate;
+
+    // design a new anti-alias filter
+    if (newRate > 1.0f) 
+    {
+        fCutoff = 0.5f / newRate;
+    } 
+    else 
+    {
+        fCutoff = 0.5f * newRate;
+    }
+    pAAFilter->setCutoffFreq(fCutoff);
+}
+
+
+// Outputs as many samples of the 'outputBuffer' as possible, and if there's
+// any room left, outputs also as many of the incoming samples as possible.
+// The goal is to drive the outputBuffer empty.
+//
+// It's allowed for 'output' and 'input' parameters to point to the same
+// memory position.
+/*
+void RateTransposer::flushStoreBuffer()
+{
+    if (storeBuffer.isEmpty()) return;
+
+    outputBuffer.moveSamples(storeBuffer);
+}
+*/
+
+
+// Adds 'nSamples' pcs of samples from the 'samples' memory position into
+// the input of the object.
+void RateTransposer::putSamples(const SAMPLETYPE *samples, uint nSamples)
+{
+    processSamples(samples, nSamples);
+}
+
+
+
+// Transposes up the sample rate, causing the observed playback 'rate' of the
+// sound to decrease
+void RateTransposer::upsample(const SAMPLETYPE *src, uint nSamples)
+{
+    uint count, sizeTemp, num;
+
+    // If the parameter 'uRate' value is smaller than 'SCALE', first transpose
+    // the samples and then apply the anti-alias filter to remove aliasing.
+
+    // First check that there's enough room in 'storeBuffer' 
+    // (+16 is to reserve some slack in the destination buffer)
+    sizeTemp = (uint)((float)nSamples / fRate + 16.0f);
+
+    // Transpose the samples, store the result into the end of "storeBuffer"
+    count = transpose(storeBuffer.ptrEnd(sizeTemp), src, nSamples);
+    storeBuffer.putSamples(count);
+
+    // Apply the anti-alias filter to samples in "store output", output the
+    // result to "dest"
+    num = storeBuffer.numSamples();
+    count = pAAFilter->evaluate(outputBuffer.ptrEnd(num), 
+        storeBuffer.ptrBegin(), num, (uint)numChannels);
+    outputBuffer.putSamples(count);
+
+    // Remove the processed samples from "storeBuffer"
+    storeBuffer.receiveSamples(count);
+}
+
+
+// Transposes down the sample rate, causing the observed playback 'rate' of the
+// sound to increase
+void RateTransposer::downsample(const SAMPLETYPE *src, uint nSamples)
+{
+    uint count, sizeTemp;
+
+    // If the parameter 'uRate' value is larger than 'SCALE', first apply the
+    // anti-alias filter to remove high frequencies (prevent them from folding
+    // over the lover frequencies), then transpose.
+
+    // Add the new samples to the end of the storeBuffer
+    storeBuffer.putSamples(src, nSamples);
+
+    // Anti-alias filter the samples to prevent folding and output the filtered 
+    // data to tempBuffer. Note : because of the FIR filter length, the
+    // filtering routine takes in 'filter_length' more samples than it outputs.
+    assert(tempBuffer.isEmpty());
+    sizeTemp = storeBuffer.numSamples();
+
+    count = pAAFilter->evaluate(tempBuffer.ptrEnd(sizeTemp), 
+        storeBuffer.ptrBegin(), sizeTemp, (uint)numChannels);
+
+    if (count == 0) return;
+
+    // Remove the filtered samples from 'storeBuffer'
+    storeBuffer.receiveSamples(count);
+
+    // Transpose the samples (+16 is to reserve some slack in the destination buffer)
+    sizeTemp = (uint)((float)nSamples / fRate + 16.0f);
+    count = transpose(outputBuffer.ptrEnd(sizeTemp), tempBuffer.ptrBegin(), count);
+    outputBuffer.putSamples(count);
+}
+
+
+// Transposes sample rate by applying anti-alias filter to prevent folding. 
+// Returns amount of samples returned in the "dest" buffer.
+// The maximum amount of samples that can be returned at a time is set by
+// the 'set_returnBuffer_size' function.
+void RateTransposer::processSamples(const SAMPLETYPE *src, uint nSamples)
+{
+    uint count;
+    uint sizeReq;
+
+    if (nSamples == 0) return;
+    assert(pAAFilter);
+
+    // If anti-alias filter is turned off, simply transpose without applying
+    // the filter
+    if (bUseAAFilter == FALSE) 
+    {
+        sizeReq = (uint)((float)nSamples / fRate + 1.0f);
+        count = transpose(outputBuffer.ptrEnd(sizeReq), src, nSamples);
+        outputBuffer.putSamples(count);
+        return;
+    }
+
+    // Transpose with anti-alias filter
+    if (fRate < 1.0f) 
+    {
+        upsample(src, nSamples);
+    } 
+    else  
+    {
+        downsample(src, nSamples);
+    }
+}
+
+
+// Transposes the sample rate of the given samples using linear interpolation. 
+// Returns the number of samples returned in the "dest" buffer
+inline int RateTransposer::transpose(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples)
+{
+#ifndef USE_MULTICH_ALWAYS
+    if (numChannels == 1)
+    {
+        return transposeMono(dest, src, nSamples);
+    }
+    else if (numChannels == 2) 
+    {
+        return transposeStereo(dest, src, nSamples);
+    } 
+    else 
+#endif // USE_MULTICH_ALWAYS
+    {
+        assert(numChannels > 0);
+        return transposeMulti(dest, src, nSamples);
+    }
+}
+
+
+// Sets the number of channels, 1 = mono, 2 = stereo
+void RateTransposer::setChannels(int nChannels)
+{
+    assert(nChannels > 0);
+    if (numChannels == nChannels) return;
+
+//    assert(nChannels == 1 || nChannels == 2);
+    numChannels = nChannels;
+
+    storeBuffer.setChannels(numChannels);
+    tempBuffer.setChannels(numChannels);
+    outputBuffer.setChannels(numChannels);
+
+    // Inits the linear interpolation registers
+    resetRegisters();
+}
+
+
+// Clears all the samples in the object
+void RateTransposer::clear()
+{
+    outputBuffer.clear();
+    storeBuffer.clear();
+}
+
+
+// Returns nonzero if there aren't any samples available for outputting.
+int RateTransposer::isEmpty() const
+{
+    int res;
+
+    res = FIFOProcessor::isEmpty();
+    if (res == 0) return 0;
+    return storeBuffer.isEmpty();
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// RateTransposerInteger - integer arithmetic implementation
+// 
+
+/// fixed-point interpolation routine precision
+#define SCALE    65536
+
+// Constructor
+RateTransposerInteger::RateTransposerInteger() : RateTransposer()
+{
+    // Notice: use local function calling syntax for sake of clarity, 
+    // to indicate the fact that C++ constructor can't call virtual functions.
+    sPrevSample=0;
+    RateTransposerInteger::resetRegisters();
+    RateTransposerInteger::setRate(1.0f);
+}
+
+
+RateTransposerInteger::~RateTransposerInteger()
+{
+    if (sPrevSample) delete[] sPrevSample;
+}
+
+
+void RateTransposerInteger::resetRegisters()
+{
+    iSlopeCount = 0;
+    delete[] sPrevSample;
+    sPrevSample = new SAMPLETYPE[numChannels];
+    memset(sPrevSample, 0, numChannels * sizeof(SAMPLETYPE));
+}
+
+
+
+// Transposes the sample rate of the given samples using linear interpolation. 
+// 'Mono' version of the routine. Returns the number of samples returned in 
+// the "dest" buffer
+int RateTransposerInteger::transposeMono(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples)
+{
+    int i, remain;
+    LONG_SAMPLETYPE temp, vol1;
+
+    if (nSamples == 0) return 0;  // no samples, no work
+
+    remain = nSamples - 1;
+    i = 0;
+
+    // Process the last sample saved from the previous call first...
+    while (iSlopeCount <= SCALE) 
+    {
+        vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount);
+        temp = vol1 * sPrevSample[0] + iSlopeCount * src[0];
+        dest[i] = (SAMPLETYPE)(temp / SCALE);
+        i++;
+        iSlopeCount += iRate;
+    }
+    // now always (iSlopeCount > SCALE)
+    iSlopeCount -= SCALE;
+
+    while (1)
+    {
+        while (iSlopeCount > SCALE) 
+        {
+            iSlopeCount -= SCALE;
+            src ++;
+            remain --;
+            if (remain == 0) goto end;
+        }
+        vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount);
+        temp = src[0] * vol1 + iSlopeCount * src[1];
+        dest[i] = (SAMPLETYPE)(temp / SCALE);
+
+        i++;
+        iSlopeCount += iRate;
+    }
+end:
+    // Store the last sample for the next round
+    sPrevSample[0] = src[0];
+
+    return i;
+}
+
+
+// Transposes the sample rate of the given samples using linear interpolation. 
+// 'Stereo' version of the routine. Returns the number of samples returned in 
+// the "dest" buffer
+int RateTransposerInteger::transposeStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples)
+{
+    int i, remain;
+    LONG_SAMPLETYPE temp, vol1;
+
+    if (nSamples == 0) return 0;  // no samples, no work
+
+    remain = nSamples - 1;
+    i = 0;
+
+    // Process the last sample saved from the sPrevSampleLious call first...
+    while (iSlopeCount <= SCALE) 
+    {
+        vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount);
+        temp = vol1 * sPrevSample[0] + iSlopeCount * src[0];
+        dest[2 * i] = (SAMPLETYPE)(temp / SCALE);
+        temp = vol1 * sPrevSample[1] + iSlopeCount * src[1];
+        dest[2 * i + 1] = (SAMPLETYPE)(temp / SCALE);
+        i++;
+        iSlopeCount += iRate;
+    }
+    // now always (iSlopeCount > SCALE)
+    iSlopeCount -= SCALE;
+
+    while (1)
+    {
+        while (iSlopeCount > SCALE) 
+        {
+            iSlopeCount -= SCALE;
+            remain --;
+            src += 2;
+            if (remain == 0) goto end;
+        }
+        vol1 = (LONG_SAMPLETYPE)(SCALE - iSlopeCount);
+        temp = src[0] * vol1 + iSlopeCount * src[2];
+        dest[2 * i] = (SAMPLETYPE)(temp / SCALE);
+        temp = src[1] * vol1 + iSlopeCount * src[3];
+        dest[2 * i + 1] = (SAMPLETYPE)(temp / SCALE);
+
+        i++;
+        iSlopeCount += iRate;
+    }
+end:
+    // Store the last sample for the next round
+    sPrevSample[0] = src[0];
+    sPrevSample[1] = src[1];
+
+    return i;
+}
+
+
+int RateTransposerInteger::transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples)
+{
+    int i, remaining;
+    LONG_SAMPLETYPE temp, vol1;
+
+    if (nSamples == 0) return 0;  // no samples, no work
+
+    remaining = nSamples - 1;
+    i = 0;
+
+    // Process the last sample saved from the sPrevSampleLious call first...
+    while (iSlopeCount <= SCALE)
+    {
+        for (int c = 0; c < numChannels; c ++)
+        {
+            vol1 = (SCALE - iSlopeCount);
+            temp = vol1 * sPrevSample[c] + iSlopeCount * src[c];
+            *dest = (SAMPLETYPE)(temp / SCALE);
+            dest ++;
+        }
+        i++;
+
+        iSlopeCount += iRate;
+    }
+    // now always (iSlopeCount > SCALE)
+    iSlopeCount -= SCALE;
+
+    while (1)
+    {
+        while (iSlopeCount > SCALE) 
+        {
+            iSlopeCount -= SCALE;
+            src += numChannels;
+            remaining --;
+            if (remaining == 0) goto end;
+        }
+
+        for (int c = 0; c < numChannels; c ++)
+        {
+            vol1 = (SCALE - iSlopeCount);
+            temp = src[c] * vol1 + iSlopeCount * src[c + numChannels];
+            *dest = (SAMPLETYPE)(temp / SCALE);
+            dest++;
+        }
+
+        i++;
+        iSlopeCount += iRate;
+    }
+end:
+    // Store the last sample for the next round
+    memcpy(sPrevSample, src, numChannels * sizeof(SAMPLETYPE));
+
+    return i;
+}
+
+// Sets new target iRate. Normal iRate = 1.0, smaller values represent slower 
+// iRate, larger faster iRates.
+void RateTransposerInteger::setRate(float newRate)
+{
+    iRate = (int)(newRate * SCALE + 0.5f);
+    RateTransposer::setRate(newRate);
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// RateTransposerFloat - floating point arithmetic implementation
+// 
+//////////////////////////////////////////////////////////////////////////////
+
+// Constructor
+RateTransposerFloat::RateTransposerFloat() : RateTransposer()
+{
+    // Notice: use local function calling syntax for sake of clarity, 
+    // to indicate the fact that C++ constructor can't call virtual functions.
+    sPrevSample = NULL;
+    RateTransposerFloat::resetRegisters();
+    RateTransposerFloat::setRate(1.0f);
+}
+
+
+RateTransposerFloat::~RateTransposerFloat()
+{
+    delete[] sPrevSample;
+}
+
+
+void RateTransposerFloat::resetRegisters()
+{
+    fSlopeCount = 0;
+    delete[] sPrevSample;
+    sPrevSample = new SAMPLETYPE[numChannels];
+    memset(sPrevSample, 0, numChannels * sizeof(SAMPLETYPE));
+}
+
+
+
+// Transposes the sample rate of the given samples using linear interpolation. 
+// 'Mono' version of the routine. Returns the number of samples returned in 
+// the "dest" buffer
+int RateTransposerFloat::transposeMono(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples)
+{
+    int i, remain;
+
+    remain = 0;
+    i = 0;
+
+    // Process the last sample saved from the previous call first...
+    while (fSlopeCount <= 1.0f) 
+    {
+        dest[i] = (SAMPLETYPE)((1.0f - fSlopeCount) * sPrevSample[0] + fSlopeCount * src[0]);
+        i++;
+        fSlopeCount += fRate;
+    }
+    fSlopeCount -= 1.0f;
+
+    if (nSamples > 1)
+    {
+        while (1)
+        {
+            while (fSlopeCount > 1.0f) 
+            {
+                fSlopeCount -= 1.0f;
+                src ++;
+                remain --;
+                if (remain == 0) goto end;
+            }
+            dest[i] = (SAMPLETYPE)((1.0f - fSlopeCount) * src[0] + fSlopeCount * src[1]);
+            i++;
+            fSlopeCount += fRate;
+        }
+    }
+end:
+    // Store the last sample for the next round
+    sPrevSample[0] = src[0];
+
+    return i;
+}
+
+
+// Transposes the sample rate of the given samples using linear interpolation. 
+// 'Mono' version of the routine. Returns the number of samples returned in 
+// the "dest" buffer
+int RateTransposerFloat::transposeStereo(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples)
+{
+    int i, remain;
+
+    if (nSamples == 0) return 0;  // no samples, no work
+
+    remain = nSamples - 1;
+    i = 0;
+
+    // Process the last sample saved from the sPrevSampleLious call first...
+    while (fSlopeCount <= 1.0f) 
+    {
+        dest[2 * i] = (SAMPLETYPE)((1.0f - fSlopeCount) * sPrevSample[0] + fSlopeCount * src[0]);
+        dest[2 * i + 1] = (SAMPLETYPE)((1.0f - fSlopeCount) * sPrevSample[1] + fSlopeCount * src[1]);
+        i++;
+        fSlopeCount += fRate;
+    }
+    // now always (iSlopeCount > 1.0f)
+    fSlopeCount -= 1.0f;
+
+    if (nSamples > 1)
+    {
+        while (1)
+        {
+            while (fSlopeCount > 1.0f) 
+            {
+                fSlopeCount -= 1.0f;
+                remain --;
+                src += 2;
+                if (remain == 0) goto end;
+            }
+
+            dest[2 * i] = (SAMPLETYPE)((1.0f - fSlopeCount) * src[0] 
+                + fSlopeCount * src[2]);
+            dest[2 * i + 1] = (SAMPLETYPE)((1.0f - fSlopeCount) * src[1] 
+                + fSlopeCount * src[3]);
+
+            i++;
+            fSlopeCount += fRate;
+        }
+    }
+end:
+    // Store the last sample for the next round
+    sPrevSample[0] = src[0];
+    sPrevSample[1] = src[1];
+
+    return i;
+}
+
+int RateTransposerFloat::transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples)
+{
+    int i, remaining;
+
+    if (nSamples == 0) return 0;  // no samples, no work
+
+    remaining = nSamples - 1;
+    i = 0;
+
+    // Process the last sample saved from the sPrevSampleLious call first...
+    while (fSlopeCount <= 1.0f) 
+    {
+        for (int c = 0; c < numChannels; c ++)
+        {
+            *dest = (SAMPLETYPE)((1.0f - fSlopeCount) * sPrevSample[c] + fSlopeCount * src[c]);
+            dest ++;
+        }
+        i++;
+        fSlopeCount += fRate;
+    }
+    // now always (iSlopeCount > 1.0f)
+    fSlopeCount -= 1.0f;
+
+    while (remaining > 0)
+    {
+        while (fSlopeCount > 1.0f) 
+        {
+            fSlopeCount -= 1.0f;
+            src += numChannels;
+            remaining --;
+            if (remaining == 0) goto end;
+        }
+
+        for (int c = 0; c < numChannels; c ++)
+        {
+            *dest = (SAMPLETYPE)((1.0f - fSlopeCount) * src[c] 
+                + fSlopeCount * src[c + numChannels]);
+            dest++;
+        }
+
+        i++;
+        fSlopeCount += fRate;
+    }
+
+end:
+    // Store the last sample for the next round
+    memcpy(sPrevSample, src, numChannels * sizeof(SAMPLETYPE));
+
+    return i;
+}
diff --git a/Externals/soundtouch/RateTransposer.h b/Externals/soundtouch/RateTransposer.h
index 48f7bed5c2..81cf28ba23 100644
--- a/Externals/soundtouch/RateTransposer.h
+++ b/Externals/soundtouch/RateTransposer.h
@@ -1,159 +1,160 @@
-////////////////////////////////////////////////////////////////////////////////
-/// 
-/// Sample rate transposer. Changes sample rate by using linear interpolation 
-/// together with anti-alias filtering (first order interpolation with anti-
-/// alias filtering should be quite adequate for this application).
-///
-/// Use either of the derived classes of 'RateTransposerInteger' or 
-/// 'RateTransposerFloat' for corresponding integer/floating point tranposing
-/// algorithm implementation.
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2009-02-21 18:00:14 +0200 (Sat, 21 Feb 2009) $
-// File revision : $Revision: 4 $
-//
-// $Id: RateTransposer.h 63 2009-02-21 16:00:14Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef RateTransposer_H
-#define RateTransposer_H
-
-#include <stddef.h>
-#include "AAFilter.h"
-#include "FIFOSamplePipe.h"
-#include "FIFOSampleBuffer.h"
-
-#include "STTypes.h"
-
-namespace soundtouch
-{
-
-/// A common linear samplerate transposer class.
-///
-/// Note: Use function "RateTransposer::newInstance()" to create a new class 
-/// instance instead of the "new" operator; that function automatically 
-/// chooses a correct implementation depending on if integer or floating 
-/// arithmetics are to be used.
-class RateTransposer : public FIFOProcessor
-{
-protected:
-    /// Anti-alias filter object
-    AAFilter *pAAFilter;
-
-    float fRate;
-
-    int numChannels;
-
-    /// Buffer for collecting samples to feed the anti-alias filter between
-    /// two batches
-    FIFOSampleBuffer storeBuffer;
-
-    /// Buffer for keeping samples between transposing & anti-alias filter
-    FIFOSampleBuffer tempBuffer;
-
-    /// Output sample buffer
-    FIFOSampleBuffer outputBuffer;
-
-    BOOL bUseAAFilter;
-
-    virtual void resetRegisters() = 0;
-
-    virtual uint transposeStereo(SAMPLETYPE *dest, 
-                         const SAMPLETYPE *src, 
-                         uint numSamples) = 0;
-    virtual uint transposeMono(SAMPLETYPE *dest, 
-                       const SAMPLETYPE *src, 
-                       uint numSamples) = 0;
-    inline uint transpose(SAMPLETYPE *dest, 
-                   const SAMPLETYPE *src, 
-                   uint numSamples);
-
-    void downsample(const SAMPLETYPE *src, 
-                    uint numSamples);
-    void upsample(const SAMPLETYPE *src, 
-                 uint numSamples);
-
-    /// Transposes sample rate by applying anti-alias filter to prevent folding. 
-    /// Returns amount of samples returned in the "dest" buffer.
-    /// The maximum amount of samples that can be returned at a time is set by
-    /// the 'set_returnBuffer_size' function.
-    void processSamples(const SAMPLETYPE *src, 
-                        uint numSamples);
-
-
-public:
-    RateTransposer();
-    virtual ~RateTransposer();
-
-    /// Operator 'new' is overloaded so that it automatically creates a suitable instance 
-    /// depending on if we're to use integer or floating point arithmetics.
-    static void *operator new(size_t s);
-
-    /// Use this function instead of "new" operator to create a new instance of this class. 
-    /// This function automatically chooses a correct implementation, depending on if 
-    /// integer ot floating point arithmetics are to be used.
-    static RateTransposer *newInstance();
-
-    /// Returns the output buffer object
-    FIFOSamplePipe *getOutput() { return &outputBuffer; };
-
-    /// Returns the store buffer object
-    FIFOSamplePipe *getStore() { return &storeBuffer; };
-
-    /// Return anti-alias filter object
-    AAFilter *getAAFilter();
-
-    /// Enables/disables the anti-alias filter. Zero to disable, nonzero to enable
-    void enableAAFilter(BOOL newMode);
-
-    /// Returns nonzero if anti-alias filter is enabled.
-    BOOL isAAFilterEnabled() const;
-
-    /// Sets new target rate. Normal rate = 1.0, smaller values represent slower 
-    /// rate, larger faster rates.
-    virtual void setRate(float newRate);
-
-    /// Sets the number of channels, 1 = mono, 2 = stereo
-    void setChannels(int channels);
-
-    /// Adds 'numSamples' pcs of samples from the 'samples' memory position into
-    /// the input of the object.
-    void putSamples(const SAMPLETYPE *samples, uint numSamples);
-
-    /// Clears all the samples in the object
-    void clear();
-
-    /// Returns nonzero if there aren't any samples available for outputting.
-    int isEmpty() const;
-};
-
-}
-
-#endif
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Sample rate transposer. Changes sample rate by using linear interpolation 
+/// together with anti-alias filtering (first order interpolation with anti-
+/// alias filtering should be quite adequate for this application).
+///
+/// Use either of the derived classes of 'RateTransposerInteger' or 
+/// 'RateTransposerFloat' for corresponding integer/floating point tranposing
+/// algorithm implementation.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2013-06-12 15:24:44 +0000 (Wed, 12 Jun 2013) $
+// File revision : $Revision: 4 $
+//
+// $Id: RateTransposer.h 171 2013-06-12 15:24:44Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef RateTransposer_H
+#define RateTransposer_H
+
+#include <stddef.h>
+#include "AAFilter.h"
+#include "FIFOSamplePipe.h"
+#include "FIFOSampleBuffer.h"
+
+#include "STTypes.h"
+
+namespace soundtouch
+{
+
+/// A common linear samplerate transposer class.
+///
+/// Note: Use function "RateTransposer::newInstance()" to create a new class 
+/// instance instead of the "new" operator; that function automatically 
+/// chooses a correct implementation depending on if integer or floating 
+/// arithmetics are to be used.
+class RateTransposer : public FIFOProcessor
+{
+protected:
+    /// Anti-alias filter object
+    AAFilter *pAAFilter;
+
+    float fRate;
+
+    int numChannels;
+
+    /// Buffer for collecting samples to feed the anti-alias filter between
+    /// two batches
+    FIFOSampleBuffer storeBuffer;
+
+    /// Buffer for keeping samples between transposing & anti-alias filter
+    FIFOSampleBuffer tempBuffer;
+
+    /// Output sample buffer
+    FIFOSampleBuffer outputBuffer;
+
+    BOOL bUseAAFilter;
+
+    virtual void resetRegisters() = 0;
+
+    virtual int transposeStereo(SAMPLETYPE *dest, 
+                         const SAMPLETYPE *src, 
+                         uint numSamples) = 0;
+    virtual int transposeMono(SAMPLETYPE *dest, 
+                       const SAMPLETYPE *src, 
+                       uint numSamples) = 0;
+    virtual int transposeMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, uint nSamples) = 0;
+    inline int transpose(SAMPLETYPE *dest, 
+                   const SAMPLETYPE *src, 
+                   uint numSamples);
+
+    void downsample(const SAMPLETYPE *src, 
+                    uint numSamples);
+    void upsample(const SAMPLETYPE *src, 
+                 uint numSamples);
+
+    /// Transposes sample rate by applying anti-alias filter to prevent folding. 
+    /// Returns amount of samples returned in the "dest" buffer.
+    /// The maximum amount of samples that can be returned at a time is set by
+    /// the 'set_returnBuffer_size' function.
+    void processSamples(const SAMPLETYPE *src, 
+                        uint numSamples);
+
+
+public:
+    RateTransposer();
+    virtual ~RateTransposer();
+
+    /// Operator 'new' is overloaded so that it automatically creates a suitable instance 
+    /// depending on if we're to use integer or floating point arithmetics.
+    static void *operator new(size_t s);
+
+    /// Use this function instead of "new" operator to create a new instance of this class. 
+    /// This function automatically chooses a correct implementation, depending on if 
+    /// integer ot floating point arithmetics are to be used.
+    static RateTransposer *newInstance();
+
+    /// Returns the output buffer object
+    FIFOSamplePipe *getOutput() { return &outputBuffer; };
+
+    /// Returns the store buffer object
+    FIFOSamplePipe *getStore() { return &storeBuffer; };
+
+    /// Return anti-alias filter object
+    AAFilter *getAAFilter();
+
+    /// Enables/disables the anti-alias filter. Zero to disable, nonzero to enable
+    void enableAAFilter(BOOL newMode);
+
+    /// Returns nonzero if anti-alias filter is enabled.
+    BOOL isAAFilterEnabled() const;
+
+    /// Sets new target rate. Normal rate = 1.0, smaller values represent slower 
+    /// rate, larger faster rates.
+    virtual void setRate(float newRate);
+
+    /// Sets the number of channels, 1 = mono, 2 = stereo
+    void setChannels(int channels);
+
+    /// Adds 'numSamples' pcs of samples from the 'samples' memory position into
+    /// the input of the object.
+    void putSamples(const SAMPLETYPE *samples, uint numSamples);
+
+    /// Clears all the samples in the object
+    void clear();
+
+    /// Returns nonzero if there aren't any samples available for outputting.
+    int isEmpty() const;
+};
+
+}
+
+#endif
diff --git a/Externals/soundtouch/STTypes.h b/Externals/soundtouch/STTypes.h
index 39bc68bd69..4405aa0c9f 100644
--- a/Externals/soundtouch/STTypes.h
+++ b/Externals/soundtouch/STTypes.h
@@ -1,191 +1,194 @@
-////////////////////////////////////////////////////////////////////////////////
-///
-/// Common type definitions for SoundTouch audio processing library.
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2012-12-28 16:53:56 +0200 (Fri, 28 Dec 2012) $
-// File revision : $Revision: 3 $
-//
-// $Id: STTypes.h 162 2012-12-28 14:53:56Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef STTypes_H
-#define STTypes_H
-
-typedef unsigned int    uint;
-typedef unsigned long   ulong;
-
-// Patch for MinGW: on Win64 long is 32-bit
-#ifdef _WIN64
-    typedef unsigned long long ulongptr;
-#else
-    typedef ulong ulongptr;
-#endif
-
-
-// Helper macro for aligning pointer up to next 16-byte boundary
-#define SOUNDTOUCH_ALIGN_POINTER_16(x)      ( ( (ulongptr)(x) + 15 ) & ~(ulongptr)15 )
-
-
-#if (defined(__GNUC__) && !defined(ANDROID))
-    // In GCC, include soundtouch_config.h made by config scritps.
-    // Skip this in Android compilation that uses GCC but without configure scripts.
-    //#include "soundtouch_config.h"
-#endif
-
-#ifndef _WINDEF_
-    // if these aren't defined already by Windows headers, define now
-#if defined(__APPLE__)
-	typedef signed char BOOL;
-#else
-    typedef int BOOL;
-#endif
-    #define FALSE   0
-    #define TRUE    1
-
-#endif  // _WINDEF_
-
-
-namespace soundtouch
-{
-    /// Activate these undef's to overrule the possible sampletype 
-    /// setting inherited from some other header file:
-    #undef SOUNDTOUCH_INTEGER_SAMPLES
-    #undef SOUNDTOUCH_FLOAT_SAMPLES
-
-    #if (defined(ANDROID) && defined(__SOFTFP__))
-        // For Android compilation: Force use of Integer samples in case that
-        // compilation uses soft-floating point emulation - soft-fp is way too slow
-        #undef  SOUNDTOUCH_FLOAT_SAMPLES
-        #define SOUNDTOUCH_INTEGER_SAMPLES      1
-    #endif
-
-    #if !(SOUNDTOUCH_INTEGER_SAMPLES || SOUNDTOUCH_FLOAT_SAMPLES)
-       
-        /// Choose either 32bit floating point or 16bit integer sampletype
-        /// by choosing one of the following defines, unless this selection 
-        /// has already been done in some other file.
-        ////
-        /// Notes:
-        /// - In Windows environment, choose the sample format with the
-        ///   following defines.
-        /// - In GNU environment, the floating point samples are used by 
-        ///   default, but integer samples can be chosen by giving the 
-        ///   following switch to the configure script:
-        ///       ./configure --enable-integer-samples
-        ///   However, if you still prefer to select the sample format here 
-        ///   also in GNU environment, then please #undef the INTEGER_SAMPLE
-        ///   and FLOAT_SAMPLE defines first as in comments above.
-        //#define SOUNDTOUCH_INTEGER_SAMPLES     1    //< 16bit integer samples
-        #define SOUNDTOUCH_FLOAT_SAMPLES       1    //< 32bit float samples
-     
-    #endif
-
-    #if (_M_IX86 || __i386__ || __x86_64__ || _M_X64)
-        /// Define this to allow X86-specific assembler/intrinsic optimizations. 
-        /// Notice that library contains also usual C++ versions of each of these
-        /// these routines, so if you're having difficulties getting the optimized 
-        /// routines compiled for whatever reason, you may disable these optimizations 
-        /// to make the library compile.
-
-        #define SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS     1
-
-        /// In GNU environment, allow the user to override this setting by
-        /// giving the following switch to the configure script:
-        /// ./configure --disable-x86-optimizations
-        /// ./configure --enable-x86-optimizations=no
-        #ifdef SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS
-            #undef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS
-        #endif
-    #else
-        /// Always disable optimizations when not using a x86 systems.
-        #undef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS
-
-    #endif
-
-    // If defined, allows the SIMD-optimized routines to take minor shortcuts 
-    // for improved performance. Undefine to require faithfully similar SIMD 
-    // calculations as in normal C implementation.
-    #define SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION    1
-
-
-    #ifdef SOUNDTOUCH_INTEGER_SAMPLES
-        // 16bit integer sample type
-        typedef short SAMPLETYPE;
-        // data type for sample accumulation: Use 32bit integer to prevent overflows
-        typedef long  LONG_SAMPLETYPE;
-
-        #ifdef SOUNDTOUCH_FLOAT_SAMPLES
-            // check that only one sample type is defined
-            #error "conflicting sample types defined"
-        #endif // SOUNDTOUCH_FLOAT_SAMPLES
-
-        #ifdef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS
-            // Allow MMX optimizations
-#ifndef _M_X64
-            #define SOUNDTOUCH_ALLOW_MMX   1
-#endif
-        #endif
-
-    #else
-
-        // floating point samples
-        typedef float  SAMPLETYPE;
-        // data type for sample accumulation: Use double to utilize full precision.
-        typedef double LONG_SAMPLETYPE;
-
-        #ifdef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS
-            // Allow SSE optimizations
-            #define SOUNDTOUCH_ALLOW_SSE       1
-        #endif
-
-    #endif  // SOUNDTOUCH_INTEGER_SAMPLES
-
-};
-
-// define ST_NO_EXCEPTION_HANDLING switch to disable throwing std exceptions:
-#define ST_NO_EXCEPTION_HANDLING    1
-#ifdef ST_NO_EXCEPTION_HANDLING
-    // Exceptions disabled. Throw asserts instead if enabled.
-    #include <assert.h>
-    #define ST_THROW_RT_ERROR(x)    {assert((const char *)x);}
-#else
-    // use c++ standard exceptions
-    #include <stdexcept>
-    #define ST_THROW_RT_ERROR(x)    {throw std::runtime_error(x);}
-#endif
-
-// When this #define is active, eliminates a clicking sound when the "rate" or "pitch" 
-// parameter setting crosses from value <1 to >=1 or vice versa during processing. 
-// Default is off as such crossover is untypical case and involves a slight sound 
-// quality compromise.
-//#define SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER   1
-
-#endif
+////////////////////////////////////////////////////////////////////////////////
+///
+/// Common type definitions for SoundTouch audio processing library.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2013-06-12 15:24:44 +0000 (Wed, 12 Jun 2013) $
+// File revision : $Revision: 3 $
+//
+// $Id: STTypes.h 171 2013-06-12 15:24:44Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef STTypes_H
+#define STTypes_H
+
+typedef unsigned int    uint;
+typedef unsigned long   ulong;
+
+// Patch for MinGW: on Win64 long is 32-bit
+#ifdef _WIN64
+    typedef unsigned long long ulongptr;
+#else
+    typedef ulong ulongptr;
+#endif
+
+
+// Helper macro for aligning pointer up to next 16-byte boundary
+#define SOUNDTOUCH_ALIGN_POINTER_16(x)      ( ( (ulongptr)(x) + 15 ) & ~(ulongptr)15 )
+
+
+#if (defined(__GNUC__) && !defined(ANDROID))
+    // In GCC, include soundtouch_config.h made by config scritps.
+    // Skip this in Android compilation that uses GCC but without configure scripts.
+    #include "soundtouch_config.h"
+#endif
+
+#ifndef _WINDEF_
+    // if these aren't defined already by Windows headers, define now
+
+    typedef int BOOL;
+
+    #define FALSE   0
+    #define TRUE    1
+
+#endif  // _WINDEF_
+
+
+namespace soundtouch
+{
+    /// Activate these undef's to overrule the possible sampletype 
+    /// setting inherited from some other header file:
+    //#undef SOUNDTOUCH_INTEGER_SAMPLES
+    //#undef SOUNDTOUCH_FLOAT_SAMPLES
+
+    /// If following flag is defined, always uses multichannel processing 
+    /// routines also for mono and stero sound. This is for routine testing 
+    /// purposes; output should be same with either routines, yet disabling 
+    /// the dedicated mono/stereo processing routines will result in slower 
+    /// runtime performance so recommendation is to keep this off.
+    // #define USE_MULTICH_ALWAYS
+
+    #if (defined(__SOFTFP__))
+        // For Android compilation: Force use of Integer samples in case that
+        // compilation uses soft-floating point emulation - soft-fp is way too slow
+        #undef  SOUNDTOUCH_FLOAT_SAMPLES
+        #define SOUNDTOUCH_INTEGER_SAMPLES      1
+    #endif
+
+    #if !(SOUNDTOUCH_INTEGER_SAMPLES || SOUNDTOUCH_FLOAT_SAMPLES)
+       
+        /// Choose either 32bit floating point or 16bit integer sampletype
+        /// by choosing one of the following defines, unless this selection 
+        /// has already been done in some other file.
+        ////
+        /// Notes:
+        /// - In Windows environment, choose the sample format with the
+        ///   following defines.
+        /// - In GNU environment, the floating point samples are used by 
+        ///   default, but integer samples can be chosen by giving the 
+        ///   following switch to the configure script:
+        ///       ./configure --enable-integer-samples
+        ///   However, if you still prefer to select the sample format here 
+        ///   also in GNU environment, then please #undef the INTEGER_SAMPLE
+        ///   and FLOAT_SAMPLE defines first as in comments above.
+        //#define SOUNDTOUCH_INTEGER_SAMPLES     1    //< 16bit integer samples
+        #define SOUNDTOUCH_FLOAT_SAMPLES       1    //< 32bit float samples
+     
+    #endif
+
+    #if (_M_IX86 || __i386__ || __x86_64__ || _M_X64)
+        /// Define this to allow X86-specific assembler/intrinsic optimizations. 
+        /// Notice that library contains also usual C++ versions of each of these
+        /// these routines, so if you're having difficulties getting the optimized 
+        /// routines compiled for whatever reason, you may disable these optimizations 
+        /// to make the library compile.
+
+        #define SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS     1
+
+        /// In GNU environment, allow the user to override this setting by
+        /// giving the following switch to the configure script:
+        /// ./configure --disable-x86-optimizations
+        /// ./configure --enable-x86-optimizations=no
+        #ifdef SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS
+            #undef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS
+        #endif
+    #else
+        /// Always disable optimizations when not using a x86 systems.
+        #undef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS
+
+    #endif
+
+    // If defined, allows the SIMD-optimized routines to take minor shortcuts 
+    // for improved performance. Undefine to require faithfully similar SIMD 
+    // calculations as in normal C implementation.
+    #define SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION    1
+
+
+    #ifdef SOUNDTOUCH_INTEGER_SAMPLES
+        // 16bit integer sample type
+        typedef short SAMPLETYPE;
+        // data type for sample accumulation: Use 32bit integer to prevent overflows
+        typedef long  LONG_SAMPLETYPE;
+
+        #ifdef SOUNDTOUCH_FLOAT_SAMPLES
+            // check that only one sample type is defined
+            #error "conflicting sample types defined"
+        #endif // SOUNDTOUCH_FLOAT_SAMPLES
+
+        #ifdef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS
+            // Allow MMX optimizations
+            #define SOUNDTOUCH_ALLOW_MMX   1
+        #endif
+
+    #else
+
+        // floating point samples
+        typedef float  SAMPLETYPE;
+        // data type for sample accumulation: Use double to utilize full precision.
+        typedef double LONG_SAMPLETYPE;
+
+        #ifdef SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS
+            // Allow SSE optimizations
+            #define SOUNDTOUCH_ALLOW_SSE       1
+        #endif
+
+    #endif  // SOUNDTOUCH_INTEGER_SAMPLES
+
+};
+
+// define ST_NO_EXCEPTION_HANDLING switch to disable throwing std exceptions:
+// #define ST_NO_EXCEPTION_HANDLING    1
+#ifdef ST_NO_EXCEPTION_HANDLING
+    // Exceptions disabled. Throw asserts instead if enabled.
+    #include <assert.h>
+    #define ST_THROW_RT_ERROR(x)    {assert((const char *)x);}
+#else
+    // use c++ standard exceptions
+    #include <stdexcept>
+    #define ST_THROW_RT_ERROR(x)    {throw std::runtime_error(x);}
+#endif
+
+// When this #define is active, eliminates a clicking sound when the "rate" or "pitch" 
+// parameter setting crosses from value <1 to >=1 or vice versa during processing. 
+// Default is off as such crossover is untypical case and involves a slight sound 
+// quality compromise.
+//#define SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER   1
+
+#endif
diff --git a/Externals/soundtouch/SoundTouch.cpp b/Externals/soundtouch/SoundTouch.cpp
index f9160ed56d..516d6b23d0 100644
--- a/Externals/soundtouch/SoundTouch.cpp
+++ b/Externals/soundtouch/SoundTouch.cpp
@@ -1,501 +1,502 @@
-//////////////////////////////////////////////////////////////////////////////
-///
-/// SoundTouch - main class for tempo/pitch/rate adjusting routines. 
-///
-/// Notes:
-/// - Initialize the SoundTouch object instance by setting up the sound stream 
-///   parameters with functions 'setSampleRate' and 'setChannels', then set 
-///   desired tempo/pitch/rate settings with the corresponding functions.
-///
-/// - The SoundTouch class behaves like a first-in-first-out pipeline: The 
-///   samples that are to be processed are fed into one of the pipe by calling
-///   function 'putSamples', while the ready processed samples can be read 
-///   from the other end of the pipeline with function 'receiveSamples'.
-/// 
-/// - The SoundTouch processing classes require certain sized 'batches' of 
-///   samples in order to process the sound. For this reason the classes buffer 
-///   incoming samples until there are enough of samples available for 
-///   processing, then they carry out the processing step and consequently
-///   make the processed samples available for outputting.
-/// 
-/// - For the above reason, the processing routines introduce a certain 
-///   'latency' between the input and output, so that the samples input to
-///   SoundTouch may not be immediately available in the output, and neither 
-///   the amount of outputtable samples may not immediately be in direct 
-///   relationship with the amount of previously input samples.
-///
-/// - The tempo/pitch/rate control parameters can be altered during processing.
-///   Please notice though that they aren't currently protected by semaphores,
-///   so in multi-thread application external semaphore protection may be
-///   required.
-///
-/// - This class utilizes classes 'TDStretch' for tempo change (without modifying
-///   pitch) and 'RateTransposer' for changing the playback rate (that is, both 
-///   tempo and pitch in the same ratio) of the sound. The third available control 
-///   'pitch' (change pitch but maintain tempo) is produced by a combination of
-///   combining the two other controls.
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2012-06-13 22:29:53 +0300 (Wed, 13 Jun 2012) $
-// File revision : $Revision: 4 $
-//
-// $Id: SoundTouch.cpp 143 2012-06-13 19:29:53Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <assert.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <math.h>
-#include <stdio.h>
-
-#include "SoundTouch.h"
-#include "TDStretch.h"
-#include "RateTransposer.h"
-#include "cpu_detect.h"
-
-using namespace soundtouch;
-    
-/// test if two floating point numbers are equal
-#define TEST_FLOAT_EQUAL(a, b)  (fabs(a - b) < 1e-10)
-
-
-/// Print library version string for autoconf
-extern "C" void soundtouch_ac_test()
-{
-    printf("SoundTouch Version: %s\n",SOUNDTOUCH_VERSION);
-} 
-
-
-SoundTouch::SoundTouch()
-{
-    // Initialize rate transposer and tempo changer instances
-
-    pRateTransposer = RateTransposer::newInstance();
-    pTDStretch = TDStretch::newInstance();
-
-    setOutPipe(pTDStretch);
-
-    rate = tempo = 0;
-
-    virtualPitch = 
-    virtualRate = 
-    virtualTempo = 1.0;
-
-    calcEffectiveRateAndTempo();
-
-    channels = 0;
-    bSrateSet = FALSE;
-}
-
-
-
-SoundTouch::~SoundTouch()
-{
-    delete pRateTransposer;
-    delete pTDStretch;
-}
-
-
-
-/// Get SoundTouch library version string
-const char *SoundTouch::getVersionString()
-{
-    static const char *_version = SOUNDTOUCH_VERSION;
-
-    return _version;
-}
-
-
-/// Get SoundTouch library version Id
-uint SoundTouch::getVersionId()
-{
-    return SOUNDTOUCH_VERSION_ID;
-}
-
-
-// Sets the number of channels, 1 = mono, 2 = stereo
-void SoundTouch::setChannels(uint numChannels)
-{
-    if (numChannels != 1 && numChannels != 2) 
-    {
-        ST_THROW_RT_ERROR("Illegal number of channels");
-    }
-    channels = numChannels;
-    pRateTransposer->setChannels((int)numChannels);
-    pTDStretch->setChannels((int)numChannels);
-}
-
-
-
-// Sets new rate control value. Normal rate = 1.0, smaller values
-// represent slower rate, larger faster rates.
-void SoundTouch::setRate(float newRate)
-{
-    virtualRate = newRate;
-    calcEffectiveRateAndTempo();
-}
-
-
-
-// Sets new rate control value as a difference in percents compared
-// to the original rate (-50 .. +100 %)
-void SoundTouch::setRateChange(float newRate)
-{
-    virtualRate = 1.0f + 0.01f * newRate;
-    calcEffectiveRateAndTempo();
-}
-
-
-
-// Sets new tempo control value. Normal tempo = 1.0, smaller values
-// represent slower tempo, larger faster tempo.
-void SoundTouch::setTempo(float newTempo)
-{
-    virtualTempo = newTempo;
-    calcEffectiveRateAndTempo();
-}
-
-
-
-// Sets new tempo control value as a difference in percents compared
-// to the original tempo (-50 .. +100 %)
-void SoundTouch::setTempoChange(float newTempo)
-{
-    virtualTempo = 1.0f + 0.01f * newTempo;
-    calcEffectiveRateAndTempo();
-}
-
-
-
-// Sets new pitch control value. Original pitch = 1.0, smaller values
-// represent lower pitches, larger values higher pitch.
-void SoundTouch::setPitch(float newPitch)
-{
-    virtualPitch = newPitch;
-    calcEffectiveRateAndTempo();
-}
-
-
-
-// Sets pitch change in octaves compared to the original pitch
-// (-1.00 .. +1.00)
-void SoundTouch::setPitchOctaves(float newPitch)
-{
-    virtualPitch = (float)exp(0.69314718056f * newPitch);
-    calcEffectiveRateAndTempo();
-}
-
-
-
-// Sets pitch change in semi-tones compared to the original pitch
-// (-12 .. +12)
-void SoundTouch::setPitchSemiTones(int newPitch)
-{
-    setPitchOctaves((float)newPitch / 12.0f);
-}
-
-
-
-void SoundTouch::setPitchSemiTones(float newPitch)
-{
-    setPitchOctaves(newPitch / 12.0f);
-}
-
-
-// Calculates 'effective' rate and tempo values from the
-// nominal control values.
-void SoundTouch::calcEffectiveRateAndTempo()
-{
-    float oldTempo = tempo;
-    float oldRate = rate;
-
-    tempo = virtualTempo / virtualPitch;
-    rate = virtualPitch * virtualRate;
-
-    if (!TEST_FLOAT_EQUAL(rate,oldRate)) pRateTransposer->setRate(rate);
-    if (!TEST_FLOAT_EQUAL(tempo, oldTempo)) pTDStretch->setTempo(tempo);
-
-#ifndef SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER
-    if (rate <= 1.0f) 
-    {
-        if (output != pTDStretch) 
-        {
-            FIFOSamplePipe *tempoOut;
-
-            assert(output == pRateTransposer);
-            // move samples in the current output buffer to the output of pTDStretch
-            tempoOut = pTDStretch->getOutput();
-            tempoOut->moveSamples(*output);
-            // move samples in pitch transposer's store buffer to tempo changer's input
-            pTDStretch->moveSamples(*pRateTransposer->getStore());
-
-            output = pTDStretch;
-        }
-    }
-    else
-#endif
-    {
-        if (output != pRateTransposer) 
-        {
-            FIFOSamplePipe *transOut;
-
-            assert(output == pTDStretch);
-            // move samples in the current output buffer to the output of pRateTransposer
-            transOut = pRateTransposer->getOutput();
-            transOut->moveSamples(*output);
-            // move samples in tempo changer's input to pitch transposer's input
-            pRateTransposer->moveSamples(*pTDStretch->getInput());
-
-            output = pRateTransposer;
-        }
-    } 
-}
-
-
-// Sets sample rate.
-void SoundTouch::setSampleRate(uint srate)
-{
-    bSrateSet = TRUE;
-    // set sample rate, leave other tempo changer parameters as they are.
-    pTDStretch->setParameters((int)srate);
-}
-
-
-// Adds 'numSamples' pcs of samples from the 'samples' memory position into
-// the input of the object.
-void SoundTouch::putSamples(const SAMPLETYPE *samples, uint nSamples)
-{
-    if (bSrateSet == FALSE) 
-    {
-        ST_THROW_RT_ERROR("SoundTouch : Sample rate not defined");
-    } 
-    else if (channels == 0) 
-    {
-        ST_THROW_RT_ERROR("SoundTouch : Number of channels not defined");
-    }
-
-    // Transpose the rate of the new samples if necessary
-    /* Bypass the nominal setting - can introduce a click in sound when tempo/pitch control crosses the nominal value...
-    if (rate == 1.0f) 
-    {
-        // The rate value is same as the original, simply evaluate the tempo changer. 
-        assert(output == pTDStretch);
-        if (pRateTransposer->isEmpty() == 0) 
-        {
-            // yet flush the last samples in the pitch transposer buffer
-            // (may happen if 'rate' changes from a non-zero value to zero)
-            pTDStretch->moveSamples(*pRateTransposer);
-        }
-        pTDStretch->putSamples(samples, nSamples);
-    } 
-    */
-#ifndef SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER
-    else if (rate <= 1.0f) 
-    {
-        // transpose the rate down, output the transposed sound to tempo changer buffer
-        assert(output == pTDStretch);
-        pRateTransposer->putSamples(samples, nSamples);
-        pTDStretch->moveSamples(*pRateTransposer);
-    } 
-    else 
-#endif
-    {
-        // evaluate the tempo changer, then transpose the rate up, 
-        assert(output == pRateTransposer);
-        pTDStretch->putSamples(samples, nSamples);
-        pRateTransposer->moveSamples(*pTDStretch);
-    }
-}
-
-
-// Flushes the last samples from the processing pipeline to the output.
-// Clears also the internal processing buffers.
-//
-// Note: This function is meant for extracting the last samples of a sound
-// stream. This function may introduce additional blank samples in the end
-// of the sound stream, and thus it's not recommended to call this function
-// in the middle of a sound stream.
-void SoundTouch::flush()
-{
-    int i;
-    int nUnprocessed;
-    int nOut;
-    SAMPLETYPE buff[64*2];   // note: allocate 2*64 to cater 64 sample frames of stereo sound
-
-    // check how many samples still await processing, and scale
-    // that by tempo & rate to get expected output sample count
-    nUnprocessed = numUnprocessedSamples();
-    nUnprocessed = (int)((double)nUnprocessed / (tempo * rate) + 0.5);
-
-    nOut = numSamples();        // ready samples currently in buffer ...
-    nOut += nUnprocessed;       // ... and how many we expect there to be in the end
-    
-    memset(buff, 0, 64 * channels * sizeof(SAMPLETYPE));
-    // "Push" the last active samples out from the processing pipeline by
-    // feeding blank samples into the processing pipeline until new, 
-    // processed samples appear in the output (not however, more than 
-    // 8ksamples in any case)
-    for (i = 0; i < 128; i ++) 
-    {
-        putSamples(buff, 64);
-        if ((int)numSamples() >= nOut) 
-        {
-            // Enough new samples have appeared into the output!
-            // As samples come from processing with bigger chunks, now truncate it
-            // back to maximum "nOut" samples to improve duration accuracy 
-            adjustAmountOfSamples(nOut);
-
-            // finish
-            break;  
-        }
-    }
-
-    // Clear working buffers
-    pRateTransposer->clear();
-    pTDStretch->clearInput();
-    // yet leave the 'tempoChanger' output intouched as that's where the
-    // flushed samples are!
-}
-
-
-// Changes a setting controlling the processing system behaviour. See the
-// 'SETTING_...' defines for available setting ID's.
-BOOL SoundTouch::setSetting(int settingId, int value)
-{
-    int sampleRate, sequenceMs, seekWindowMs, overlapMs;
-
-    // read current tdstretch routine parameters
-    pTDStretch->getParameters(&sampleRate, &sequenceMs, &seekWindowMs, &overlapMs);
-
-    switch (settingId) 
-    {
-        case SETTING_USE_AA_FILTER :
-            // enables / disabless anti-alias filter
-            pRateTransposer->enableAAFilter((value != 0) ? TRUE : FALSE);
-            return TRUE;
-
-        case SETTING_AA_FILTER_LENGTH :
-            // sets anti-alias filter length
-            pRateTransposer->getAAFilter()->setLength(value);
-            return TRUE;
-
-        case SETTING_USE_QUICKSEEK :
-            // enables / disables tempo routine quick seeking algorithm
-            pTDStretch->enableQuickSeek((value != 0) ? TRUE : FALSE);
-            return TRUE;
-
-        case SETTING_SEQUENCE_MS:
-            // change time-stretch sequence duration parameter
-            pTDStretch->setParameters(sampleRate, value, seekWindowMs, overlapMs);
-            return TRUE;
-
-        case SETTING_SEEKWINDOW_MS:
-            // change time-stretch seek window length parameter
-            pTDStretch->setParameters(sampleRate, sequenceMs, value, overlapMs);
-            return TRUE;
-
-        case SETTING_OVERLAP_MS:
-            // change time-stretch overlap length parameter
-            pTDStretch->setParameters(sampleRate, sequenceMs, seekWindowMs, value);
-            return TRUE;
-
-        default :
-            return FALSE;
-    }
-}
-
-
-// Reads a setting controlling the processing system behaviour. See the
-// 'SETTING_...' defines for available setting ID's.
-//
-// Returns the setting value.
-int SoundTouch::getSetting(int settingId) const
-{
-    int temp;
-
-    switch (settingId) 
-    {
-        case SETTING_USE_AA_FILTER :
-            return (uint)pRateTransposer->isAAFilterEnabled();
-
-        case SETTING_AA_FILTER_LENGTH :
-            return pRateTransposer->getAAFilter()->getLength();
-
-        case SETTING_USE_QUICKSEEK :
-            return (uint)   pTDStretch->isQuickSeekEnabled();
-
-        case SETTING_SEQUENCE_MS:
-            pTDStretch->getParameters(NULL, &temp, NULL, NULL);
-            return temp;
-
-        case SETTING_SEEKWINDOW_MS:
-            pTDStretch->getParameters(NULL, NULL, &temp, NULL);
-            return temp;
-
-        case SETTING_OVERLAP_MS:
-            pTDStretch->getParameters(NULL, NULL, NULL, &temp);
-            return temp;
-
-		case SETTING_NOMINAL_INPUT_SEQUENCE :
-			return pTDStretch->getInputSampleReq();
-
-		case SETTING_NOMINAL_OUTPUT_SEQUENCE :
-			return pTDStretch->getOutputBatchSize();
-
-		default :
-            return 0;
-    }
-}
-
-
-// Clears all the samples in the object's output and internal processing
-// buffers.
-void SoundTouch::clear()
-{
-    pRateTransposer->clear();
-    pTDStretch->clear();
-}
-
-
-
-/// Returns number of samples currently unprocessed.
-uint SoundTouch::numUnprocessedSamples() const
-{
-    FIFOSamplePipe * psp;
-    if (pTDStretch)
-    {
-        psp = pTDStretch->getInput();
-        if (psp)
-        {
-            return psp->numSamples();
-        }
-    }
-    return 0;
-}
+//////////////////////////////////////////////////////////////////////////////
+///
+/// SoundTouch - main class for tempo/pitch/rate adjusting routines. 
+///
+/// Notes:
+/// - Initialize the SoundTouch object instance by setting up the sound stream 
+///   parameters with functions 'setSampleRate' and 'setChannels', then set 
+///   desired tempo/pitch/rate settings with the corresponding functions.
+///
+/// - The SoundTouch class behaves like a first-in-first-out pipeline: The 
+///   samples that are to be processed are fed into one of the pipe by calling
+///   function 'putSamples', while the ready processed samples can be read 
+///   from the other end of the pipeline with function 'receiveSamples'.
+/// 
+/// - The SoundTouch processing classes require certain sized 'batches' of 
+///   samples in order to process the sound. For this reason the classes buffer 
+///   incoming samples until there are enough of samples available for 
+///   processing, then they carry out the processing step and consequently
+///   make the processed samples available for outputting.
+/// 
+/// - For the above reason, the processing routines introduce a certain 
+///   'latency' between the input and output, so that the samples input to
+///   SoundTouch may not be immediately available in the output, and neither 
+///   the amount of outputtable samples may not immediately be in direct 
+///   relationship with the amount of previously input samples.
+///
+/// - The tempo/pitch/rate control parameters can be altered during processing.
+///   Please notice though that they aren't currently protected by semaphores,
+///   so in multi-thread application external semaphore protection may be
+///   required.
+///
+/// - This class utilizes classes 'TDStretch' for tempo change (without modifying
+///   pitch) and 'RateTransposer' for changing the playback rate (that is, both 
+///   tempo and pitch in the same ratio) of the sound. The third available control 
+///   'pitch' (change pitch but maintain tempo) is produced by a combination of
+///   combining the two other controls.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2013-06-12 15:24:44 +0000 (Wed, 12 Jun 2013) $
+// File revision : $Revision: 4 $
+//
+// $Id: SoundTouch.cpp 171 2013-06-12 15:24:44Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <assert.h>
+#include <stdlib.h>
+#include <memory.h>
+#include <math.h>
+#include <stdio.h>
+
+#include "SoundTouch.h"
+#include "TDStretch.h"
+#include "RateTransposer.h"
+#include "cpu_detect.h"
+
+using namespace soundtouch;
+    
+/// test if two floating point numbers are equal
+#define TEST_FLOAT_EQUAL(a, b)  (fabs(a - b) < 1e-10)
+
+
+/// Print library version string for autoconf
+extern "C" void soundtouch_ac_test()
+{
+    printf("SoundTouch Version: %s\n",SOUNDTOUCH_VERSION);
+} 
+
+
+SoundTouch::SoundTouch()
+{
+    // Initialize rate transposer and tempo changer instances
+
+    pRateTransposer = RateTransposer::newInstance();
+    pTDStretch = TDStretch::newInstance();
+
+    setOutPipe(pTDStretch);
+
+    rate = tempo = 0;
+
+    virtualPitch = 
+    virtualRate = 
+    virtualTempo = 1.0;
+
+    calcEffectiveRateAndTempo();
+
+    channels = 0;
+    bSrateSet = FALSE;
+}
+
+
+
+SoundTouch::~SoundTouch()
+{
+    delete pRateTransposer;
+    delete pTDStretch;
+}
+
+
+
+/// Get SoundTouch library version string
+const char *SoundTouch::getVersionString()
+{
+    static const char *_version = SOUNDTOUCH_VERSION;
+
+    return _version;
+}
+
+
+/// Get SoundTouch library version Id
+uint SoundTouch::getVersionId()
+{
+    return SOUNDTOUCH_VERSION_ID;
+}
+
+
+// Sets the number of channels, 1 = mono, 2 = stereo
+void SoundTouch::setChannels(uint numChannels)
+{
+    /*if (numChannels != 1 && numChannels != 2) 
+    {
+        //ST_THROW_RT_ERROR("Illegal number of channels");
+		return;
+    }*/
+    channels = numChannels;
+    pRateTransposer->setChannels((int)numChannels);
+    pTDStretch->setChannels((int)numChannels);
+}
+
+
+
+// Sets new rate control value. Normal rate = 1.0, smaller values
+// represent slower rate, larger faster rates.
+void SoundTouch::setRate(float newRate)
+{
+    virtualRate = newRate;
+    calcEffectiveRateAndTempo();
+}
+
+
+
+// Sets new rate control value as a difference in percents compared
+// to the original rate (-50 .. +100 %)
+void SoundTouch::setRateChange(float newRate)
+{
+    virtualRate = 1.0f + 0.01f * newRate;
+    calcEffectiveRateAndTempo();
+}
+
+
+
+// Sets new tempo control value. Normal tempo = 1.0, smaller values
+// represent slower tempo, larger faster tempo.
+void SoundTouch::setTempo(float newTempo)
+{
+    virtualTempo = newTempo;
+    calcEffectiveRateAndTempo();
+}
+
+
+
+// Sets new tempo control value as a difference in percents compared
+// to the original tempo (-50 .. +100 %)
+void SoundTouch::setTempoChange(float newTempo)
+{
+    virtualTempo = 1.0f + 0.01f * newTempo;
+    calcEffectiveRateAndTempo();
+}
+
+
+
+// Sets new pitch control value. Original pitch = 1.0, smaller values
+// represent lower pitches, larger values higher pitch.
+void SoundTouch::setPitch(float newPitch)
+{
+    virtualPitch = newPitch;
+    calcEffectiveRateAndTempo();
+}
+
+
+
+// Sets pitch change in octaves compared to the original pitch
+// (-1.00 .. +1.00)
+void SoundTouch::setPitchOctaves(float newPitch)
+{
+    virtualPitch = (float)exp(0.69314718056f * newPitch);
+    calcEffectiveRateAndTempo();
+}
+
+
+
+// Sets pitch change in semi-tones compared to the original pitch
+// (-12 .. +12)
+void SoundTouch::setPitchSemiTones(int newPitch)
+{
+    setPitchOctaves((float)newPitch / 12.0f);
+}
+
+
+
+void SoundTouch::setPitchSemiTones(float newPitch)
+{
+    setPitchOctaves(newPitch / 12.0f);
+}
+
+
+// Calculates 'effective' rate and tempo values from the
+// nominal control values.
+void SoundTouch::calcEffectiveRateAndTempo()
+{
+    float oldTempo = tempo;
+    float oldRate = rate;
+
+    tempo = virtualTempo / virtualPitch;
+    rate = virtualPitch * virtualRate;
+
+    if (!TEST_FLOAT_EQUAL(rate,oldRate)) pRateTransposer->setRate(rate);
+    if (!TEST_FLOAT_EQUAL(tempo, oldTempo)) pTDStretch->setTempo(tempo);
+
+#ifndef SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER
+    if (rate <= 1.0f) 
+    {
+        if (output != pTDStretch) 
+        {
+            FIFOSamplePipe *tempoOut;
+
+            assert(output == pRateTransposer);
+            // move samples in the current output buffer to the output of pTDStretch
+            tempoOut = pTDStretch->getOutput();
+            tempoOut->moveSamples(*output);
+            // move samples in pitch transposer's store buffer to tempo changer's input
+            pTDStretch->moveSamples(*pRateTransposer->getStore());
+
+            output = pTDStretch;
+        }
+    }
+    else
+#endif
+    {
+        if (output != pRateTransposer) 
+        {
+            FIFOSamplePipe *transOut;
+
+            assert(output == pTDStretch);
+            // move samples in the current output buffer to the output of pRateTransposer
+            transOut = pRateTransposer->getOutput();
+            transOut->moveSamples(*output);
+            // move samples in tempo changer's input to pitch transposer's input
+            pRateTransposer->moveSamples(*pTDStretch->getInput());
+
+            output = pRateTransposer;
+        }
+    } 
+}
+
+
+// Sets sample rate.
+void SoundTouch::setSampleRate(uint srate)
+{
+    bSrateSet = TRUE;
+    // set sample rate, leave other tempo changer parameters as they are.
+    pTDStretch->setParameters((int)srate);
+}
+
+
+// Adds 'numSamples' pcs of samples from the 'samples' memory position into
+// the input of the object.
+void SoundTouch::putSamples(const SAMPLETYPE *samples, uint nSamples)
+{
+    if (bSrateSet == FALSE) 
+    {
+        ST_THROW_RT_ERROR("SoundTouch : Sample rate not defined");
+    } 
+    else if (channels == 0) 
+    {
+        ST_THROW_RT_ERROR("SoundTouch : Number of channels not defined");
+    }
+
+    // Transpose the rate of the new samples if necessary
+    /* Bypass the nominal setting - can introduce a click in sound when tempo/pitch control crosses the nominal value...
+    if (rate == 1.0f) 
+    {
+        // The rate value is same as the original, simply evaluate the tempo changer. 
+        assert(output == pTDStretch);
+        if (pRateTransposer->isEmpty() == 0) 
+        {
+            // yet flush the last samples in the pitch transposer buffer
+            // (may happen if 'rate' changes from a non-zero value to zero)
+            pTDStretch->moveSamples(*pRateTransposer);
+        }
+        pTDStretch->putSamples(samples, nSamples);
+    } 
+    */
+#ifndef SOUNDTOUCH_PREVENT_CLICK_AT_RATE_CROSSOVER
+    else if (rate <= 1.0f) 
+    {
+        // transpose the rate down, output the transposed sound to tempo changer buffer
+        assert(output == pTDStretch);
+        pRateTransposer->putSamples(samples, nSamples);
+        pTDStretch->moveSamples(*pRateTransposer);
+    } 
+    else 
+#endif
+    {
+        // evaluate the tempo changer, then transpose the rate up, 
+        assert(output == pRateTransposer);
+        pTDStretch->putSamples(samples, nSamples);
+        pRateTransposer->moveSamples(*pTDStretch);
+    }
+}
+
+
+// Flushes the last samples from the processing pipeline to the output.
+// Clears also the internal processing buffers.
+//
+// Note: This function is meant for extracting the last samples of a sound
+// stream. This function may introduce additional blank samples in the end
+// of the sound stream, and thus it's not recommended to call this function
+// in the middle of a sound stream.
+void SoundTouch::flush()
+{
+    int i;
+    int nUnprocessed;
+    int nOut;
+    SAMPLETYPE *buff=(SAMPLETYPE*)alloca(64*channels*sizeof(SAMPLETYPE));
+
+    // check how many samples still await processing, and scale
+    // that by tempo & rate to get expected output sample count
+    nUnprocessed = numUnprocessedSamples();
+    nUnprocessed = (int)((double)nUnprocessed / (tempo * rate) + 0.5);
+
+    nOut = numSamples();        // ready samples currently in buffer ...
+    nOut += nUnprocessed;       // ... and how many we expect there to be in the end
+    
+    memset(buff, 0, 64 * channels * sizeof(SAMPLETYPE));
+    // "Push" the last active samples out from the processing pipeline by
+    // feeding blank samples into the processing pipeline until new, 
+    // processed samples appear in the output (not however, more than 
+    // 8ksamples in any case)
+    for (i = 0; i < 128; i ++) 
+    {
+        putSamples(buff, 64);
+        if ((int)numSamples() >= nOut) 
+        {
+            // Enough new samples have appeared into the output!
+            // As samples come from processing with bigger chunks, now truncate it
+            // back to maximum "nOut" samples to improve duration accuracy 
+            adjustAmountOfSamples(nOut);
+
+            // finish
+            break;  
+        }
+    }
+
+    // Clear working buffers
+    pRateTransposer->clear();
+    pTDStretch->clearInput();
+    // yet leave the 'tempoChanger' output intouched as that's where the
+    // flushed samples are!
+}
+
+
+// Changes a setting controlling the processing system behaviour. See the
+// 'SETTING_...' defines for available setting ID's.
+BOOL SoundTouch::setSetting(int settingId, int value)
+{
+    int sampleRate, sequenceMs, seekWindowMs, overlapMs;
+
+    // read current tdstretch routine parameters
+    pTDStretch->getParameters(&sampleRate, &sequenceMs, &seekWindowMs, &overlapMs);
+
+    switch (settingId) 
+    {
+        case SETTING_USE_AA_FILTER :
+            // enables / disabless anti-alias filter
+            pRateTransposer->enableAAFilter((value != 0) ? TRUE : FALSE);
+            return TRUE;
+
+        case SETTING_AA_FILTER_LENGTH :
+            // sets anti-alias filter length
+            pRateTransposer->getAAFilter()->setLength(value);
+            return TRUE;
+
+        case SETTING_USE_QUICKSEEK :
+            // enables / disables tempo routine quick seeking algorithm
+            pTDStretch->enableQuickSeek((value != 0) ? TRUE : FALSE);
+            return TRUE;
+
+        case SETTING_SEQUENCE_MS:
+            // change time-stretch sequence duration parameter
+            pTDStretch->setParameters(sampleRate, value, seekWindowMs, overlapMs);
+            return TRUE;
+
+        case SETTING_SEEKWINDOW_MS:
+            // change time-stretch seek window length parameter
+            pTDStretch->setParameters(sampleRate, sequenceMs, value, overlapMs);
+            return TRUE;
+
+        case SETTING_OVERLAP_MS:
+            // change time-stretch overlap length parameter
+            pTDStretch->setParameters(sampleRate, sequenceMs, seekWindowMs, value);
+            return TRUE;
+
+        default :
+            return FALSE;
+    }
+}
+
+
+// Reads a setting controlling the processing system behaviour. See the
+// 'SETTING_...' defines for available setting ID's.
+//
+// Returns the setting value.
+int SoundTouch::getSetting(int settingId) const
+{
+    int temp;
+
+    switch (settingId) 
+    {
+        case SETTING_USE_AA_FILTER :
+            return (uint)pRateTransposer->isAAFilterEnabled();
+
+        case SETTING_AA_FILTER_LENGTH :
+            return pRateTransposer->getAAFilter()->getLength();
+
+        case SETTING_USE_QUICKSEEK :
+            return (uint)   pTDStretch->isQuickSeekEnabled();
+
+        case SETTING_SEQUENCE_MS:
+            pTDStretch->getParameters(NULL, &temp, NULL, NULL);
+            return temp;
+
+        case SETTING_SEEKWINDOW_MS:
+            pTDStretch->getParameters(NULL, NULL, &temp, NULL);
+            return temp;
+
+        case SETTING_OVERLAP_MS:
+            pTDStretch->getParameters(NULL, NULL, NULL, &temp);
+            return temp;
+
+		case SETTING_NOMINAL_INPUT_SEQUENCE :
+			return pTDStretch->getInputSampleReq();
+
+		case SETTING_NOMINAL_OUTPUT_SEQUENCE :
+			return pTDStretch->getOutputBatchSize();
+
+		default :
+            return 0;
+    }
+}
+
+
+// Clears all the samples in the object's output and internal processing
+// buffers.
+void SoundTouch::clear()
+{
+    pRateTransposer->clear();
+    pTDStretch->clear();
+}
+
+
+
+/// Returns number of samples currently unprocessed.
+uint SoundTouch::numUnprocessedSamples() const
+{
+    FIFOSamplePipe * psp;
+    if (pTDStretch)
+    {
+        psp = pTDStretch->getInput();
+        if (psp)
+        {
+            return psp->numSamples();
+        }
+    }
+    return 0;
+}
diff --git a/Externals/soundtouch/SoundTouch.h b/Externals/soundtouch/SoundTouch.h
index c6af895811..d76a7219fd 100644
--- a/Externals/soundtouch/SoundTouch.h
+++ b/Externals/soundtouch/SoundTouch.h
@@ -1,277 +1,277 @@
-//////////////////////////////////////////////////////////////////////////////
-///
-/// SoundTouch - main class for tempo/pitch/rate adjusting routines. 
-///
-/// Notes:
-/// - Initialize the SoundTouch object instance by setting up the sound stream 
-///   parameters with functions 'setSampleRate' and 'setChannels', then set 
-///   desired tempo/pitch/rate settings with the corresponding functions.
-///
-/// - The SoundTouch class behaves like a first-in-first-out pipeline: The 
-///   samples that are to be processed are fed into one of the pipe by calling
-///   function 'putSamples', while the ready processed samples can be read 
-///   from the other end of the pipeline with function 'receiveSamples'.
-/// 
-/// - The SoundTouch processing classes require certain sized 'batches' of 
-///   samples in order to process the sound. For this reason the classes buffer 
-///   incoming samples until there are enough of samples available for 
-///   processing, then they carry out the processing step and consequently
-///   make the processed samples available for outputting.
-/// 
-/// - For the above reason, the processing routines introduce a certain 
-///   'latency' between the input and output, so that the samples input to
-///   SoundTouch may not be immediately available in the output, and neither 
-///   the amount of outputtable samples may not immediately be in direct 
-///   relationship with the amount of previously input samples.
-///
-/// - The tempo/pitch/rate control parameters can be altered during processing.
-///   Please notice though that they aren't currently protected by semaphores,
-///   so in multi-thread application external semaphore protection may be
-///   required.
-///
-/// - This class utilizes classes 'TDStretch' for tempo change (without modifying
-///   pitch) and 'RateTransposer' for changing the playback rate (that is, both 
-///   tempo and pitch in the same ratio) of the sound. The third available control 
-///   'pitch' (change pitch but maintain tempo) is produced by a combination of
-///   combining the two other controls.
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2012-12-28 21:32:59 +0200 (Fri, 28 Dec 2012) $
-// File revision : $Revision: 4 $
-//
-// $Id: SoundTouch.h 163 2012-12-28 19:32:59Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef SoundTouch_H
-#define SoundTouch_H
-
-#include "FIFOSamplePipe.h"
-#include "STTypes.h"
-
-namespace soundtouch
-{
-
-/// Soundtouch library version string
-#define SOUNDTOUCH_VERSION          "1.7.1"
-
-/// SoundTouch library version id
-#define SOUNDTOUCH_VERSION_ID       (10701)
-
-//
-// Available setting IDs for the 'setSetting' & 'get_setting' functions:
-
-/// Enable/disable anti-alias filter in pitch transposer (0 = disable)
-#define SETTING_USE_AA_FILTER       0
-
-/// Pitch transposer anti-alias filter length (8 .. 128 taps, default = 32)
-#define SETTING_AA_FILTER_LENGTH    1
-
-/// Enable/disable quick seeking algorithm in tempo changer routine
-/// (enabling quick seeking lowers CPU utilization but causes a minor sound
-///  quality compromising)
-#define SETTING_USE_QUICKSEEK       2
-
-/// Time-stretch algorithm single processing sequence length in milliseconds. This determines 
-/// to how long sequences the original sound is chopped in the time-stretch algorithm. 
-/// See "STTypes.h" or README for more information.
-#define SETTING_SEQUENCE_MS         3
-
-/// Time-stretch algorithm seeking window length in milliseconds for algorithm that finds the 
-/// best possible overlapping location. This determines from how wide window the algorithm 
-/// may look for an optimal joining location when mixing the sound sequences back together. 
-/// See "STTypes.h" or README for more information.
-#define SETTING_SEEKWINDOW_MS       4
-
-/// Time-stretch algorithm overlap length in milliseconds. When the chopped sound sequences 
-/// are mixed back together, to form a continuous sound stream, this parameter defines over 
-/// how long period the two consecutive sequences are let to overlap each other. 
-/// See "STTypes.h" or README for more information.
-#define SETTING_OVERLAP_MS          5
-
-
-/// Call "getSetting" with this ID to query nominal average processing sequence
-/// size in samples. This value tells approcimate value how many input samples 
-/// SoundTouch needs to gather before it does DSP processing run for the sample batch.
-///
-/// Notices: 
-/// - This is read-only parameter, i.e. setSetting ignores this parameter
-/// - Returned value is approximate average value, exact processing batch
-///   size may wary from time to time
-/// - This parameter value is not constant but may change depending on 
-///   tempo/pitch/rate/samplerate settings.
-#define SETTING_NOMINAL_INPUT_SEQUENCE		6
-
-
-/// Call "getSetting" with this ID to query nominal average processing output 
-/// size in samples. This value tells approcimate value how many output samples 
-/// SoundTouch outputs once it does DSP processing run for a batch of input samples.
-///	
-/// Notices: 
-/// - This is read-only parameter, i.e. setSetting ignores this parameter
-/// - Returned value is approximate average value, exact processing batch
-///   size may wary from time to time
-/// - This parameter value is not constant but may change depending on 
-///   tempo/pitch/rate/samplerate settings.
-#define SETTING_NOMINAL_OUTPUT_SEQUENCE		7
-
-class SoundTouch : public FIFOProcessor
-{
-private:
-    /// Rate transposer class instance
-    class RateTransposer *pRateTransposer;
-
-    /// Time-stretch class instance
-    class TDStretch *pTDStretch;
-
-    /// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters.
-    float virtualRate;
-
-    /// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters.
-    float virtualTempo;
-
-    /// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters.
-    float virtualPitch;
-
-    /// Flag: Has sample rate been set?
-    BOOL  bSrateSet;
-
-    /// Calculates effective rate & tempo valuescfrom 'virtualRate', 'virtualTempo' and 
-    /// 'virtualPitch' parameters.
-    void calcEffectiveRateAndTempo();
-
-protected :
-    /// Number of channels
-    uint  channels;
-
-    /// Effective 'rate' value calculated from 'virtualRate', 'virtualTempo' and 'virtualPitch'
-    float rate;
-
-    /// Effective 'tempo' value calculated from 'virtualRate', 'virtualTempo' and 'virtualPitch'
-    float tempo;
-
-public:
-    SoundTouch();
-    virtual ~SoundTouch();
-
-    /// Get SoundTouch library version string
-    static const char *getVersionString();
-
-    /// Get SoundTouch library version Id
-    static uint getVersionId();
-
-    /// Sets new rate control value. Normal rate = 1.0, smaller values
-    /// represent slower rate, larger faster rates.
-    void setRate(float newRate);
-
-    /// Sets new tempo control value. Normal tempo = 1.0, smaller values
-    /// represent slower tempo, larger faster tempo.
-    void setTempo(float newTempo);
-
-    /// Sets new rate control value as a difference in percents compared
-    /// to the original rate (-50 .. +100 %)
-    void setRateChange(float newRate);
-
-    /// Sets new tempo control value as a difference in percents compared
-    /// to the original tempo (-50 .. +100 %)
-    void setTempoChange(float newTempo);
-
-    /// Sets new pitch control value. Original pitch = 1.0, smaller values
-    /// represent lower pitches, larger values higher pitch.
-    void setPitch(float newPitch);
-
-    /// Sets pitch change in octaves compared to the original pitch  
-    /// (-1.00 .. +1.00)
-    void setPitchOctaves(float newPitch);
-
-    /// Sets pitch change in semi-tones compared to the original pitch
-    /// (-12 .. +12)
-    void setPitchSemiTones(int newPitch);
-    void setPitchSemiTones(float newPitch);
-
-    /// Sets the number of channels, 1 = mono, 2 = stereo
-    void setChannels(uint numChannels);
-
-    /// Sets sample rate.
-    void setSampleRate(uint srate);
-
-    /// Flushes the last samples from the processing pipeline to the output.
-    /// Clears also the internal processing buffers.
-    //
-    /// Note: This function is meant for extracting the last samples of a sound
-    /// stream. This function may introduce additional blank samples in the end
-    /// of the sound stream, and thus it's not recommended to call this function
-    /// in the middle of a sound stream.
-    void flush();
-
-    /// Adds 'numSamples' pcs of samples from the 'samples' memory position into
-    /// the input of the object. Notice that sample rate _has_to_ be set before
-    /// calling this function, otherwise throws a runtime_error exception.
-    virtual void putSamples(
-            const SAMPLETYPE *samples,  ///< Pointer to sample buffer.
-            uint numSamples                         ///< Number of samples in buffer. Notice
-                                                    ///< that in case of stereo-sound a single sample
-                                                    ///< contains data for both channels.
-            );
-
-    /// Clears all the samples in the object's output and internal processing
-    /// buffers.
-    virtual void clear();
-
-    /// Changes a setting controlling the processing system behaviour. See the
-    /// 'SETTING_...' defines for available setting ID's.
-    /// 
-    /// \return 'TRUE' if the setting was succesfully changed
-    BOOL setSetting(int settingId,   ///< Setting ID number. see SETTING_... defines.
-                    int value        ///< New setting value.
-                    );
-
-    /// Reads a setting controlling the processing system behaviour. See the
-    /// 'SETTING_...' defines for available setting ID's.
-    ///
-    /// \return the setting value.
-    int getSetting(int settingId    ///< Setting ID number, see SETTING_... defines.
-                   ) const;
-
-    /// Returns number of samples currently unprocessed.
-    virtual uint numUnprocessedSamples() const;
-
-
-    /// Other handy functions that are implemented in the ancestor classes (see
-    /// classes 'FIFOProcessor' and 'FIFOSamplePipe')
-    ///
-    /// - receiveSamples() : Use this function to receive 'ready' processed samples from SoundTouch.
-    /// - numSamples()     : Get number of 'ready' samples that can be received with 
-    ///                      function 'receiveSamples()'
-    /// - isEmpty()        : Returns nonzero if there aren't any 'ready' samples.
-    /// - clear()          : Clears all samples from ready/processing buffers.
-};
-
-}
-#endif
+//////////////////////////////////////////////////////////////////////////////
+///
+/// SoundTouch - main class for tempo/pitch/rate adjusting routines. 
+///
+/// Notes:
+/// - Initialize the SoundTouch object instance by setting up the sound stream 
+///   parameters with functions 'setSampleRate' and 'setChannels', then set 
+///   desired tempo/pitch/rate settings with the corresponding functions.
+///
+/// - The SoundTouch class behaves like a first-in-first-out pipeline: The 
+///   samples that are to be processed are fed into one of the pipe by calling
+///   function 'putSamples', while the ready processed samples can be read 
+///   from the other end of the pipeline with function 'receiveSamples'.
+/// 
+/// - The SoundTouch processing classes require certain sized 'batches' of 
+///   samples in order to process the sound. For this reason the classes buffer 
+///   incoming samples until there are enough of samples available for 
+///   processing, then they carry out the processing step and consequently
+///   make the processed samples available for outputting.
+/// 
+/// - For the above reason, the processing routines introduce a certain 
+///   'latency' between the input and output, so that the samples input to
+///   SoundTouch may not be immediately available in the output, and neither 
+///   the amount of outputtable samples may not immediately be in direct 
+///   relationship with the amount of previously input samples.
+///
+/// - The tempo/pitch/rate control parameters can be altered during processing.
+///   Please notice though that they aren't currently protected by semaphores,
+///   so in multi-thread application external semaphore protection may be
+///   required.
+///
+/// - This class utilizes classes 'TDStretch' for tempo change (without modifying
+///   pitch) and 'RateTransposer' for changing the playback rate (that is, both 
+///   tempo and pitch in the same ratio) of the sound. The third available control 
+///   'pitch' (change pitch but maintain tempo) is produced by a combination of
+///   combining the two other controls.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2013-06-12 15:24:44 +0000 (Wed, 12 Jun 2013) $
+// File revision : $Revision: 4 $
+//
+// $Id: SoundTouch.h 171 2013-06-12 15:24:44Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef SoundTouch_H
+#define SoundTouch_H
+
+#include "FIFOSamplePipe.h"
+#include "STTypes.h"
+
+namespace soundtouch
+{
+
+/// Soundtouch library version string
+#define SOUNDTOUCH_VERSION          "1.7.2 (dev)"
+
+/// SoundTouch library version id
+#define SOUNDTOUCH_VERSION_ID       (10702)
+
+//
+// Available setting IDs for the 'setSetting' & 'get_setting' functions:
+
+/// Enable/disable anti-alias filter in pitch transposer (0 = disable)
+#define SETTING_USE_AA_FILTER       0
+
+/// Pitch transposer anti-alias filter length (8 .. 128 taps, default = 32)
+#define SETTING_AA_FILTER_LENGTH    1
+
+/// Enable/disable quick seeking algorithm in tempo changer routine
+/// (enabling quick seeking lowers CPU utilization but causes a minor sound
+///  quality compromising)
+#define SETTING_USE_QUICKSEEK       2
+
+/// Time-stretch algorithm single processing sequence length in milliseconds. This determines 
+/// to how long sequences the original sound is chopped in the time-stretch algorithm. 
+/// See "STTypes.h" or README for more information.
+#define SETTING_SEQUENCE_MS         3
+
+/// Time-stretch algorithm seeking window length in milliseconds for algorithm that finds the 
+/// best possible overlapping location. This determines from how wide window the algorithm 
+/// may look for an optimal joining location when mixing the sound sequences back together. 
+/// See "STTypes.h" or README for more information.
+#define SETTING_SEEKWINDOW_MS       4
+
+/// Time-stretch algorithm overlap length in milliseconds. When the chopped sound sequences 
+/// are mixed back together, to form a continuous sound stream, this parameter defines over 
+/// how long period the two consecutive sequences are let to overlap each other. 
+/// See "STTypes.h" or README for more information.
+#define SETTING_OVERLAP_MS          5
+
+
+/// Call "getSetting" with this ID to query nominal average processing sequence
+/// size in samples. This value tells approcimate value how many input samples 
+/// SoundTouch needs to gather before it does DSP processing run for the sample batch.
+///
+/// Notices: 
+/// - This is read-only parameter, i.e. setSetting ignores this parameter
+/// - Returned value is approximate average value, exact processing batch
+///   size may wary from time to time
+/// - This parameter value is not constant but may change depending on 
+///   tempo/pitch/rate/samplerate settings.
+#define SETTING_NOMINAL_INPUT_SEQUENCE		6
+
+
+/// Call "getSetting" with this ID to query nominal average processing output 
+/// size in samples. This value tells approcimate value how many output samples 
+/// SoundTouch outputs once it does DSP processing run for a batch of input samples.
+///	
+/// Notices: 
+/// - This is read-only parameter, i.e. setSetting ignores this parameter
+/// - Returned value is approximate average value, exact processing batch
+///   size may wary from time to time
+/// - This parameter value is not constant but may change depending on 
+///   tempo/pitch/rate/samplerate settings.
+#define SETTING_NOMINAL_OUTPUT_SEQUENCE		7
+
+class SoundTouch : public FIFOProcessor
+{
+private:
+    /// Rate transposer class instance
+    class RateTransposer *pRateTransposer;
+
+    /// Time-stretch class instance
+    class TDStretch *pTDStretch;
+
+    /// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters.
+    float virtualRate;
+
+    /// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters.
+    float virtualTempo;
+
+    /// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters.
+    float virtualPitch;
+
+    /// Flag: Has sample rate been set?
+    BOOL  bSrateSet;
+
+    /// Calculates effective rate & tempo valuescfrom 'virtualRate', 'virtualTempo' and 
+    /// 'virtualPitch' parameters.
+    void calcEffectiveRateAndTempo();
+
+protected :
+    /// Number of channels
+    uint  channels;
+
+    /// Effective 'rate' value calculated from 'virtualRate', 'virtualTempo' and 'virtualPitch'
+    float rate;
+
+    /// Effective 'tempo' value calculated from 'virtualRate', 'virtualTempo' and 'virtualPitch'
+    float tempo;
+
+public:
+    SoundTouch();
+    virtual ~SoundTouch();
+
+    /// Get SoundTouch library version string
+    static const char *getVersionString();
+
+    /// Get SoundTouch library version Id
+    static uint getVersionId();
+
+    /// Sets new rate control value. Normal rate = 1.0, smaller values
+    /// represent slower rate, larger faster rates.
+    void setRate(float newRate);
+
+    /// Sets new tempo control value. Normal tempo = 1.0, smaller values
+    /// represent slower tempo, larger faster tempo.
+    void setTempo(float newTempo);
+
+    /// Sets new rate control value as a difference in percents compared
+    /// to the original rate (-50 .. +100 %)
+    void setRateChange(float newRate);
+
+    /// Sets new tempo control value as a difference in percents compared
+    /// to the original tempo (-50 .. +100 %)
+    void setTempoChange(float newTempo);
+
+    /// Sets new pitch control value. Original pitch = 1.0, smaller values
+    /// represent lower pitches, larger values higher pitch.
+    void setPitch(float newPitch);
+
+    /// Sets pitch change in octaves compared to the original pitch  
+    /// (-1.00 .. +1.00)
+    void setPitchOctaves(float newPitch);
+
+    /// Sets pitch change in semi-tones compared to the original pitch
+    /// (-12 .. +12)
+    void setPitchSemiTones(int newPitch);
+    void setPitchSemiTones(float newPitch);
+
+    /// Sets the number of channels, 1 = mono, 2 = stereo
+    void setChannels(uint numChannels);
+
+    /// Sets sample rate.
+    void setSampleRate(uint srate);
+
+    /// Flushes the last samples from the processing pipeline to the output.
+    /// Clears also the internal processing buffers.
+    //
+    /// Note: This function is meant for extracting the last samples of a sound
+    /// stream. This function may introduce additional blank samples in the end
+    /// of the sound stream, and thus it's not recommended to call this function
+    /// in the middle of a sound stream.
+    void flush();
+
+    /// Adds 'numSamples' pcs of samples from the 'samples' memory position into
+    /// the input of the object. Notice that sample rate _has_to_ be set before
+    /// calling this function, otherwise throws a runtime_error exception.
+    virtual void putSamples(
+            const SAMPLETYPE *samples,  ///< Pointer to sample buffer.
+            uint numSamples                         ///< Number of samples in buffer. Notice
+                                                    ///< that in case of stereo-sound a single sample
+                                                    ///< contains data for both channels.
+            );
+
+    /// Clears all the samples in the object's output and internal processing
+    /// buffers.
+    virtual void clear();
+
+    /// Changes a setting controlling the processing system behaviour. See the
+    /// 'SETTING_...' defines for available setting ID's.
+    /// 
+    /// \return 'TRUE' if the setting was succesfully changed
+    BOOL setSetting(int settingId,   ///< Setting ID number. see SETTING_... defines.
+                    int value        ///< New setting value.
+                    );
+
+    /// Reads a setting controlling the processing system behaviour. See the
+    /// 'SETTING_...' defines for available setting ID's.
+    ///
+    /// \return the setting value.
+    int getSetting(int settingId    ///< Setting ID number, see SETTING_... defines.
+                   ) const;
+
+    /// Returns number of samples currently unprocessed.
+    virtual uint numUnprocessedSamples() const;
+
+
+    /// Other handy functions that are implemented in the ancestor classes (see
+    /// classes 'FIFOProcessor' and 'FIFOSamplePipe')
+    ///
+    /// - receiveSamples() : Use this function to receive 'ready' processed samples from SoundTouch.
+    /// - numSamples()     : Get number of 'ready' samples that can be received with 
+    ///                      function 'receiveSamples()'
+    /// - isEmpty()        : Returns nonzero if there aren't any 'ready' samples.
+    /// - clear()          : Clears all samples from ready/processing buffers.
+};
+
+}
+#endif
diff --git a/Externals/soundtouch/TDStretch.cpp b/Externals/soundtouch/TDStretch.cpp
index 779cf7aa65..292404a91a 100644
--- a/Externals/soundtouch/TDStretch.cpp
+++ b/Externals/soundtouch/TDStretch.cpp
@@ -1,808 +1,866 @@
-////////////////////////////////////////////////////////////////////////////////
-/// 
-/// Sampled sound tempo changer/time stretch algorithm. Changes the sound tempo 
-/// while maintaining the original pitch by using a time domain WSOLA-like 
-/// method with several performance-increasing tweaks.
-///
-/// Note : MMX optimized functions reside in a separate, platform-specific 
-/// file, e.g. 'mmx_win.cpp' or 'mmx_gcc.cpp'
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2012-11-08 20:53:01 +0200 (Thu, 08 Nov 2012) $
-// File revision : $Revision: 1.12 $
-//
-// $Id: TDStretch.cpp 160 2012-11-08 18:53:01Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <string.h>
-#include <limits.h>
-#include <assert.h>
-#include <math.h>
-#include <float.h>
-
-#include "STTypes.h"
-#include "cpu_detect.h"
-#include "TDStretch.h"
-
-#include <stdio.h>
-
-using namespace soundtouch;
-
-#define max(x, y) (((x) > (y)) ? (x) : (y))
-
-
-/*****************************************************************************
- *
- * Constant definitions
- *
- *****************************************************************************/
-
-// Table for the hierarchical mixing position seeking algorithm
-static const short _scanOffsets[5][24]={
-    { 124,  186,  248,  310,  372,  434,  496,  558,  620,  682,  744, 806,
-      868,  930,  992, 1054, 1116, 1178, 1240, 1302, 1364, 1426, 1488,   0},
-    {-100,  -75,  -50,  -25,   25,   50,   75,  100,    0,    0,    0,   0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   0},
-    { -20,  -15,  -10,   -5,    5,   10,   15,   20,    0,    0,    0,   0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   0},
-    {  -4,   -3,   -2,   -1,    1,    2,    3,    4,    0,    0,    0,   0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   0},
-    { 121,  114,   97,  114,   98,  105,  108,   32,  104,   99,  117,  111,
-      116,  100,  110,  117,  111,  115,    0,    0,    0,    0,    0,   0}};
-
-/*****************************************************************************
- *
- * Implementation of the class 'TDStretch'
- *
- *****************************************************************************/
-
-
-TDStretch::TDStretch() : FIFOProcessor(&outputBuffer)
-{
-    bQuickSeek = FALSE;
-    channels = 2;
-
-    pMidBuffer = NULL;
-    pMidBufferUnaligned = NULL;
-    overlapLength = 0;
-
-    bAutoSeqSetting = TRUE;
-    bAutoSeekSetting = TRUE;
-
-//    outDebt = 0;
-    skipFract = 0;
-
-    tempo = 1.0f;
-    setParameters(44100, DEFAULT_SEQUENCE_MS, DEFAULT_SEEKWINDOW_MS, DEFAULT_OVERLAP_MS);
-    setTempo(1.0f);
-
-    clear();
-}
-
-
-
-TDStretch::~TDStretch()
-{
-    delete[] pMidBufferUnaligned;
-}
-
-
-
-// Sets routine control parameters. These control are certain time constants
-// defining how the sound is stretched to the desired duration.
-//
-// 'sampleRate' = sample rate of the sound
-// 'sequenceMS' = one processing sequence length in milliseconds (default = 82 ms)
-// 'seekwindowMS' = seeking window length for scanning the best overlapping 
-//      position (default = 28 ms)
-// 'overlapMS' = overlapping length (default = 12 ms)
-
-void TDStretch::setParameters(int aSampleRate, int aSequenceMS, 
-                              int aSeekWindowMS, int aOverlapMS)
-{
-    // accept only positive parameter values - if zero or negative, use old values instead
-    if (aSampleRate > 0)   this->sampleRate = aSampleRate;
-    if (aOverlapMS > 0)    this->overlapMs = aOverlapMS;
-
-    if (aSequenceMS > 0)
-    {
-        this->sequenceMs = aSequenceMS;
-        bAutoSeqSetting = FALSE;
-    } 
-    else if (aSequenceMS == 0)
-    {
-        // if zero, use automatic setting
-        bAutoSeqSetting = TRUE;
-    }
-
-    if (aSeekWindowMS > 0) 
-    {
-        this->seekWindowMs = aSeekWindowMS;
-        bAutoSeekSetting = FALSE;
-    } 
-    else if (aSeekWindowMS == 0) 
-    {
-        // if zero, use automatic setting
-        bAutoSeekSetting = TRUE;
-    }
-
-    calcSeqParameters();
-
-    calculateOverlapLength(overlapMs);
-
-    // set tempo to recalculate 'sampleReq'
-    setTempo(tempo);
-
-}
-
-
-
-/// Get routine control parameters, see setParameters() function.
-/// Any of the parameters to this function can be NULL, in such case corresponding parameter
-/// value isn't returned.
-void TDStretch::getParameters(int *pSampleRate, int *pSequenceMs, int *pSeekWindowMs, int *pOverlapMs) const
-{
-    if (pSampleRate)
-    {
-        *pSampleRate = sampleRate;
-    }
-
-    if (pSequenceMs)
-    {
-        *pSequenceMs = (bAutoSeqSetting) ? (USE_AUTO_SEQUENCE_LEN) : sequenceMs;
-    }
-
-    if (pSeekWindowMs)
-    {
-        *pSeekWindowMs = (bAutoSeekSetting) ? (USE_AUTO_SEEKWINDOW_LEN) : seekWindowMs;
-    }
-
-    if (pOverlapMs)
-    {
-        *pOverlapMs = overlapMs;
-    }
-}
-
-
-// Overlaps samples in 'midBuffer' with the samples in 'pInput'
-void TDStretch::overlapMono(SAMPLETYPE *pOutput, const SAMPLETYPE *pInput) const
-{
-    int i;
-    SAMPLETYPE m1, m2;
-
-    m1 = (SAMPLETYPE)0;
-    m2 = (SAMPLETYPE)overlapLength;
-
-    for (i = 0; i < overlapLength ; i ++) 
-    {
-        pOutput[i] = (pInput[i] * m1 + pMidBuffer[i] * m2 ) / overlapLength;
-        m1 += 1;
-        m2 -= 1;
-    }
-}
-
-
-
-void TDStretch::clearMidBuffer()
-{
-    memset(pMidBuffer, 0, 2 * sizeof(SAMPLETYPE) * overlapLength);
-}
-
-
-void TDStretch::clearInput()
-{
-    inputBuffer.clear();
-    clearMidBuffer();
-}
-
-
-// Clears the sample buffers
-void TDStretch::clear()
-{
-    outputBuffer.clear();
-    clearInput();
-}
-
-
-
-// Enables/disables the quick position seeking algorithm. Zero to disable, nonzero
-// to enable
-void TDStretch::enableQuickSeek(BOOL enable)
-{
-    bQuickSeek = enable;
-}
-
-
-// Returns nonzero if the quick seeking algorithm is enabled.
-BOOL TDStretch::isQuickSeekEnabled() const
-{
-    return bQuickSeek;
-}
-
-
-// Seeks for the optimal overlap-mixing position.
-int TDStretch::seekBestOverlapPosition(const SAMPLETYPE *refPos)
-{
-    if (bQuickSeek) 
-    {
-        return seekBestOverlapPositionQuick(refPos);
-    } 
-    else 
-    {
-        return seekBestOverlapPositionFull(refPos);
-    }
-}
-
-
-// Overlaps samples in 'midBuffer' with the samples in 'pInputBuffer' at position
-// of 'ovlPos'.
-inline void TDStretch::overlap(SAMPLETYPE *pOutput, const SAMPLETYPE *pInput, uint ovlPos) const
-{
-    if (channels == 2) 
-    {
-        // stereo sound
-        overlapStereo(pOutput, pInput + 2 * ovlPos);
-    } else {
-        // mono sound.
-        overlapMono(pOutput, pInput + ovlPos);
-    }
-}
-
-
-
-// Seeks for the optimal overlap-mixing position. The 'stereo' version of the
-// routine
-//
-// The best position is determined as the position where the two overlapped
-// sample sequences are 'most alike', in terms of the highest cross-correlation
-// value over the overlapping period
-int TDStretch::seekBestOverlapPositionFull(const SAMPLETYPE *refPos) 
-{
-    int bestOffs;
-    double bestCorr, corr;
-    int i;
-
-    bestCorr = FLT_MIN;
-    bestOffs = 0;
-
-    // Scans for the best correlation value by testing each possible position
-    // over the permitted range.
-    for (i = 0; i < seekLength; i ++) 
-    {
-        // Calculates correlation value for the mixing position corresponding
-        // to 'i'
-        corr = calcCrossCorr(refPos + channels * i, pMidBuffer);
-        // heuristic rule to slightly favour values close to mid of the range
-        double tmp = (double)(2 * i - seekLength) / (double)seekLength;
-        corr = ((corr + 0.1) * (1.0 - 0.25 * tmp * tmp));
-
-        // Checks for the highest correlation value
-        if (corr > bestCorr) 
-        {
-            bestCorr = corr;
-            bestOffs = i;
-        }
-    }
-    // clear cross correlation routine state if necessary (is so e.g. in MMX routines).
-    clearCrossCorrState();
-
-    return bestOffs;
-}
-
-
-// Seeks for the optimal overlap-mixing position. The 'stereo' version of the
-// routine
-//
-// The best position is determined as the position where the two overlapped
-// sample sequences are 'most alike', in terms of the highest cross-correlation
-// value over the overlapping period
-int TDStretch::seekBestOverlapPositionQuick(const SAMPLETYPE *refPos) 
-{
-    int j;
-    int bestOffs;
-    double bestCorr, corr;
-    int scanCount, corrOffset, tempOffset;
-
-    bestCorr = FLT_MIN;
-    bestOffs = _scanOffsets[0][0];
-    corrOffset = 0;
-    tempOffset = 0;
-
-    // Scans for the best correlation value using four-pass hierarchical search.
-    //
-    // The look-up table 'scans' has hierarchical position adjusting steps.
-    // In first pass the routine searhes for the highest correlation with 
-    // relatively coarse steps, then rescans the neighbourhood of the highest
-    // correlation with better resolution and so on.
-    for (scanCount = 0;scanCount < 4; scanCount ++) 
-    {
-        j = 0;
-        while (_scanOffsets[scanCount][j]) 
-        {
-            tempOffset = corrOffset + _scanOffsets[scanCount][j];
-            if (tempOffset >= seekLength) break;
-
-            // Calculates correlation value for the mixing position corresponding
-            // to 'tempOffset'
-            corr = (double)calcCrossCorr(refPos + channels * tempOffset, pMidBuffer);
-            // heuristic rule to slightly favour values close to mid of the range
-            double tmp = (double)(2 * tempOffset - seekLength) / seekLength;
-            corr = ((corr + 0.1) * (1.0 - 0.25 * tmp * tmp));
-
-            // Checks for the highest correlation value
-            if (corr > bestCorr) 
-            {
-                bestCorr = corr;
-                bestOffs = tempOffset;
-            }
-            j ++;
-        }
-        corrOffset = bestOffs;
-    }
-    // clear cross correlation routine state if necessary (is so e.g. in MMX routines).
-    clearCrossCorrState();
-
-    return bestOffs;
-}
-
-
-
-/// clear cross correlation routine state if necessary 
-void TDStretch::clearCrossCorrState()
-{
-    // default implementation is empty.
-}
-
-
-/// Calculates processing sequence length according to tempo setting
-void TDStretch::calcSeqParameters()
-{
-    // Adjust tempo param according to tempo, so that variating processing sequence length is used
-    // at varius tempo settings, between the given low...top limits
-    #define AUTOSEQ_TEMPO_LOW   0.5     // auto setting low tempo range (-50%)
-    #define AUTOSEQ_TEMPO_TOP   2.0     // auto setting top tempo range (+100%)
-
-    // sequence-ms setting values at above low & top tempo
-    #define AUTOSEQ_AT_MIN      125.0
-    #define AUTOSEQ_AT_MAX      50.0
-    #define AUTOSEQ_K           ((AUTOSEQ_AT_MAX - AUTOSEQ_AT_MIN) / (AUTOSEQ_TEMPO_TOP - AUTOSEQ_TEMPO_LOW))
-    #define AUTOSEQ_C           (AUTOSEQ_AT_MIN - (AUTOSEQ_K) * (AUTOSEQ_TEMPO_LOW))
-
-    // seek-window-ms setting values at above low & top tempo
-    #define AUTOSEEK_AT_MIN     25.0
-    #define AUTOSEEK_AT_MAX     15.0
-    #define AUTOSEEK_K          ((AUTOSEEK_AT_MAX - AUTOSEEK_AT_MIN) / (AUTOSEQ_TEMPO_TOP - AUTOSEQ_TEMPO_LOW))
-    #define AUTOSEEK_C          (AUTOSEEK_AT_MIN - (AUTOSEEK_K) * (AUTOSEQ_TEMPO_LOW))
-
-    #define CHECK_LIMITS(x, mi, ma) (((x) < (mi)) ? (mi) : (((x) > (ma)) ? (ma) : (x)))
-
-    double seq, seek;
-    
-    if (bAutoSeqSetting)
-    {
-        seq = AUTOSEQ_C + AUTOSEQ_K * tempo;
-        seq = CHECK_LIMITS(seq, AUTOSEQ_AT_MAX, AUTOSEQ_AT_MIN);
-        sequenceMs = (int)(seq + 0.5);
-    }
-
-    if (bAutoSeekSetting)
-    {
-        seek = AUTOSEEK_C + AUTOSEEK_K * tempo;
-        seek = CHECK_LIMITS(seek, AUTOSEEK_AT_MAX, AUTOSEEK_AT_MIN);
-        seekWindowMs = (int)(seek + 0.5);
-    }
-
-    // Update seek window lengths
-    seekWindowLength = (sampleRate * sequenceMs) / 1000;
-    if (seekWindowLength < 2 * overlapLength) 
-    {
-        seekWindowLength = 2 * overlapLength;
-    }
-    seekLength = (sampleRate * seekWindowMs) / 1000;
-}
-
-
-
-// Sets new target tempo. Normal tempo = 'SCALE', smaller values represent slower 
-// tempo, larger faster tempo.
-void TDStretch::setTempo(float newTempo)
-{
-    int intskip;
-
-    tempo = newTempo;
-
-    // Calculate new sequence duration
-    calcSeqParameters();
-
-    // Calculate ideal skip length (according to tempo value) 
-    nominalSkip = tempo * (seekWindowLength - overlapLength);
-    intskip = (int)(nominalSkip + 0.5f);
-
-    // Calculate how many samples are needed in the 'inputBuffer' to 
-    // process another batch of samples
-    //sampleReq = max(intskip + overlapLength, seekWindowLength) + seekLength / 2;
-    sampleReq = max(intskip + overlapLength, seekWindowLength) + seekLength;
-}
-
-
-
-// Sets the number of channels, 1 = mono, 2 = stereo
-void TDStretch::setChannels(int numChannels)
-{
-    assert(numChannels > 0);
-    if (channels == numChannels) return;
-    assert(numChannels == 1 || numChannels == 2);
-
-    channels = numChannels;
-    inputBuffer.setChannels(channels);
-    outputBuffer.setChannels(channels);
-}
-
-
-// nominal tempo, no need for processing, just pass the samples through
-// to outputBuffer
-/*
-void TDStretch::processNominalTempo()
-{
-    assert(tempo == 1.0f);
-
-    if (bMidBufferDirty) 
-    {
-        // If there are samples in pMidBuffer waiting for overlapping,
-        // do a single sliding overlapping with them in order to prevent a 
-        // clicking distortion in the output sound
-        if (inputBuffer.numSamples() < overlapLength) 
-        {
-            // wait until we've got overlapLength input samples
-            return;
-        }
-        // Mix the samples in the beginning of 'inputBuffer' with the 
-        // samples in 'midBuffer' using sliding overlapping 
-        overlap(outputBuffer.ptrEnd(overlapLength), inputBuffer.ptrBegin(), 0);
-        outputBuffer.putSamples(overlapLength);
-        inputBuffer.receiveSamples(overlapLength);
-        clearMidBuffer();
-        // now we've caught the nominal sample flow and may switch to
-        // bypass mode
-    }
-
-    // Simply bypass samples from input to output
-    outputBuffer.moveSamples(inputBuffer);
-}
-*/
-
-#include <stdio.h>
-
-// Processes as many processing frames of the samples 'inputBuffer', store
-// the result into 'outputBuffer'
-void TDStretch::processSamples()
-{
-    int ovlSkip, offset;
-    int temp;
-
-    /* Removed this small optimization - can introduce a click to sound when tempo setting
-       crosses the nominal value
-    if (tempo == 1.0f) 
-    {
-        // tempo not changed from the original, so bypass the processing
-        processNominalTempo();
-        return;
-    }
-    */
-
-    // Process samples as long as there are enough samples in 'inputBuffer'
-    // to form a processing frame.
-    while ((int)inputBuffer.numSamples() >= sampleReq) 
-    {
-        // If tempo differs from the normal ('SCALE'), scan for the best overlapping
-        // position
-        offset = seekBestOverlapPosition(inputBuffer.ptrBegin());
-
-        // Mix the samples in the 'inputBuffer' at position of 'offset' with the 
-        // samples in 'midBuffer' using sliding overlapping
-        // ... first partially overlap with the end of the previous sequence
-        // (that's in 'midBuffer')
-        overlap(outputBuffer.ptrEnd((uint)overlapLength), inputBuffer.ptrBegin(), (uint)offset);
-        outputBuffer.putSamples((uint)overlapLength);
-
-        // ... then copy sequence samples from 'inputBuffer' to output:
-
-        // length of sequence
-        temp = (seekWindowLength - 2 * overlapLength);
-
-        // crosscheck that we don't have buffer overflow...
-        if ((int)inputBuffer.numSamples() < (offset + temp + overlapLength * 2))
-        {
-            continue;    // just in case, shouldn't really happen
-        }
-
-        outputBuffer.putSamples(inputBuffer.ptrBegin() + channels * (offset + overlapLength), (uint)temp);
-
-        // Copies the end of the current sequence from 'inputBuffer' to 
-        // 'midBuffer' for being mixed with the beginning of the next 
-        // processing sequence and so on
-        assert((offset + temp + overlapLength * 2) <= (int)inputBuffer.numSamples());
-        memcpy(pMidBuffer, inputBuffer.ptrBegin() + channels * (offset + temp + overlapLength), 
-            channels * sizeof(SAMPLETYPE) * overlapLength);
-
-        // Remove the processed samples from the input buffer. Update
-        // the difference between integer & nominal skip step to 'skipFract'
-        // in order to prevent the error from accumulating over time.
-        skipFract += nominalSkip;   // real skip size
-        ovlSkip = (int)skipFract;   // rounded to integer skip
-        skipFract -= ovlSkip;       // maintain the fraction part, i.e. real vs. integer skip
-        inputBuffer.receiveSamples((uint)ovlSkip);
-    }
-}
-
-
-// Adds 'numsamples' pcs of samples from the 'samples' memory position into
-// the input of the object.
-void TDStretch::putSamples(const SAMPLETYPE *samples, uint nSamples)
-{
-    // Add the samples into the input buffer
-    inputBuffer.putSamples(samples, nSamples);
-    // Process the samples in input buffer
-    processSamples();
-}
-
-
-
-/// Set new overlap length parameter & reallocate RefMidBuffer if necessary.
-void TDStretch::acceptNewOverlapLength(int newOverlapLength)
-{
-    int prevOvl;
-
-    assert(newOverlapLength >= 0);
-    prevOvl = overlapLength;
-    overlapLength = newOverlapLength;
-
-    if (overlapLength > prevOvl)
-    {
-        delete[] pMidBufferUnaligned;
-
-        pMidBufferUnaligned = new SAMPLETYPE[overlapLength * 2 + 16 / sizeof(SAMPLETYPE)];
-        // ensure that 'pMidBuffer' is aligned to 16 byte boundary for efficiency
-        pMidBuffer = (SAMPLETYPE *)SOUNDTOUCH_ALIGN_POINTER_16(pMidBufferUnaligned);
-
-        clearMidBuffer();
-    }
-}
-
-
-// Operator 'new' is overloaded so that it automatically creates a suitable instance 
-// depending on if we've a MMX/SSE/etc-capable CPU available or not.
-void * TDStretch::operator new(size_t s)
-{
-    // Notice! don't use "new TDStretch" directly, use "newInstance" to create a new instance instead!
-    ST_THROW_RT_ERROR("Error in TDStretch::new: Don't use 'new TDStretch' directly, use 'newInstance' member instead!");
-    return newInstance();
-}
-
-
-TDStretch * TDStretch::newInstance()
-{
-    uint uExtensions;
-
-    uExtensions = detectCPUextensions();
-
-    // Check if MMX/SSE instruction set extensions supported by CPU
-
-#ifdef SOUNDTOUCH_ALLOW_MMX
-    // MMX routines available only with integer sample types
-    if (uExtensions & SUPPORT_MMX)
-    {
-        return ::new TDStretchMMX;
-    }
-    else
-#endif // SOUNDTOUCH_ALLOW_MMX
-
-
-#ifdef SOUNDTOUCH_ALLOW_SSE
-    if (uExtensions & SUPPORT_SSE)
-    {
-        // SSE support
-        return ::new TDStretchSSE;
-    }
-    else
-#endif // SOUNDTOUCH_ALLOW_SSE
-
-    {
-        // ISA optimizations not supported, use plain C version
-        return ::new TDStretch;
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Integer arithmetics specific algorithm implementations.
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#ifdef SOUNDTOUCH_INTEGER_SAMPLES
-
-// Overlaps samples in 'midBuffer' with the samples in 'input'. The 'Stereo' 
-// version of the routine.
-void TDStretch::overlapStereo(short *poutput, const short *input) const
-{
-    int i;
-    short temp;
-    int cnt2;
-
-    for (i = 0; i < overlapLength ; i ++) 
-    {
-        temp = (short)(overlapLength - i);
-        cnt2 = 2 * i;
-        poutput[cnt2] = (input[cnt2] * i + pMidBuffer[cnt2] * temp )  / overlapLength;
-        poutput[cnt2 + 1] = (input[cnt2 + 1] * i + pMidBuffer[cnt2 + 1] * temp ) / overlapLength;
-    }
-}
-
-// Calculates the x having the closest 2^x value for the given value
-static int _getClosest2Power(double value)
-{
-    return (int)(log(value) / log(2.0) + 0.5);
-}
-
-
-/// Calculates overlap period length in samples.
-/// Integer version rounds overlap length to closest power of 2
-/// for a divide scaling operation.
-void TDStretch::calculateOverlapLength(int aoverlapMs)
-{
-    int newOvl;
-
-    assert(aoverlapMs >= 0);
-
-    // calculate overlap length so that it's power of 2 - thus it's easy to do
-    // integer division by right-shifting. Term "-1" at end is to account for 
-    // the extra most significatnt bit left unused in result by signed multiplication 
-    overlapDividerBits = _getClosest2Power((sampleRate * aoverlapMs) / 1000.0) - 1;
-    if (overlapDividerBits > 9) overlapDividerBits = 9;
-    if (overlapDividerBits < 3) overlapDividerBits = 3;
-    newOvl = (int)pow(2.0, (int)overlapDividerBits + 1);    // +1 => account for -1 above
-
-    acceptNewOverlapLength(newOvl);
-
-    // calculate sloping divider so that crosscorrelation operation won't 
-    // overflow 32-bit register. Max. sum of the crosscorrelation sum without 
-    // divider would be 2^30*(N^3-N)/3, where N = overlap length
-    slopingDivider = (newOvl * newOvl - 1) / 3;
-}
-
-
-double TDStretch::calcCrossCorr(const short *mixingPos, const short *compare) const
-{
-    long corr;
-    long norm;
-    int i;
-
-    corr = norm = 0;
-    // Same routine for stereo and mono. For stereo, unroll loop for better
-    // efficiency and gives slightly better resolution against rounding. 
-    // For mono it same routine, just  unrolls loop by factor of 4
-    for (i = 0; i < channels * overlapLength; i += 4) 
-    {
-        corr += (mixingPos[i] * compare[i] + 
-                 mixingPos[i + 1] * compare[i + 1] +
-                 mixingPos[i + 2] * compare[i + 2] + 
-                 mixingPos[i + 3] * compare[i + 3]) >> overlapDividerBits;
-        norm += (mixingPos[i] * mixingPos[i] + 
-                 mixingPos[i + 1] * mixingPos[i + 1] +
-                 mixingPos[i + 2] * mixingPos[i + 2] + 
-                 mixingPos[i + 3] * mixingPos[i + 3]) >> overlapDividerBits;
-    }
-
-    // Normalize result by dividing by sqrt(norm) - this step is easiest 
-    // done using floating point operation
-    if (norm == 0) norm = 1;    // to avoid div by zero
-    return (double)corr / sqrt((double)norm);
-}
-
-#endif // SOUNDTOUCH_INTEGER_SAMPLES
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Floating point arithmetics specific algorithm implementations.
-//
-
-#ifdef SOUNDTOUCH_FLOAT_SAMPLES
-
-// Overlaps samples in 'midBuffer' with the samples in 'pInput'
-void TDStretch::overlapStereo(float *pOutput, const float *pInput) const
-{
-    int i;
-    float fScale;
-    float f1;
-    float f2;
-
-    fScale = 1.0f / (float)overlapLength;
-
-    f1 = 0;
-    f2 = 1.0f;
-
-    for (i = 0; i < 2 * (int)overlapLength ; i += 2) 
-    {
-        pOutput[i + 0] = pInput[i + 0] * f1 + pMidBuffer[i + 0] * f2;
-        pOutput[i + 1] = pInput[i + 1] * f1 + pMidBuffer[i + 1] * f2;
-
-        f1 += fScale;
-        f2 -= fScale;
-    }
-}
-
-
-/// Calculates overlapInMsec period length in samples.
-void TDStretch::calculateOverlapLength(int overlapInMsec)
-{
-    int newOvl;
-
-    assert(overlapInMsec >= 0);
-    newOvl = (sampleRate * overlapInMsec) / 1000;
-    if (newOvl < 16) newOvl = 16;
-
-    // must be divisible by 8
-    newOvl -= newOvl % 8;
-
-    acceptNewOverlapLength(newOvl);
-}
-
-
-double TDStretch::calcCrossCorr(const float *mixingPos, const float *compare) const
-{
-    double corr;
-    double norm;
-    int i;
-
-    corr = norm = 0;
-    // Same routine for stereo and mono. For Stereo, unroll by factor of 2.
-    // For mono it's same routine yet unrollsd by factor of 4.
-    for (i = 0; i < channels * overlapLength; i += 4) 
-    {
-        corr += mixingPos[i] * compare[i] +
-                mixingPos[i + 1] * compare[i + 1];
-
-        norm += mixingPos[i] * mixingPos[i] + 
-                mixingPos[i + 1] * mixingPos[i + 1];
-
-        // unroll the loop for better CPU efficiency:
-        corr += mixingPos[i + 2] * compare[i + 2] +
-                mixingPos[i + 3] * compare[i + 3];
-
-        norm += mixingPos[i + 2] * mixingPos[i + 2] +
-                mixingPos[i + 3] * mixingPos[i + 3];
-    }
-
-    if (norm < 1e-9) norm = 1.0;    // to avoid div by zero
-    return corr / sqrt(norm);
-}
-
-#endif // SOUNDTOUCH_FLOAT_SAMPLES
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Sampled sound tempo changer/time stretch algorithm. Changes the sound tempo 
+/// while maintaining the original pitch by using a time domain WSOLA-like 
+/// method with several performance-increasing tweaks.
+///
+/// Note : MMX optimized functions reside in a separate, platform-specific 
+/// file, e.g. 'mmx_win.cpp' or 'mmx_gcc.cpp'
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2013-06-14 17:34:33 +0000 (Fri, 14 Jun 2013) $
+// File revision : $Revision: 1.12 $
+//
+// $Id: TDStretch.cpp 172 2013-06-14 17:34:33Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <string.h>
+#include <limits.h>
+#include <assert.h>
+#include <math.h>
+#include <float.h>
+
+#include "STTypes.h"
+#include "cpu_detect.h"
+#include "TDStretch.h"
+
+using namespace soundtouch;
+
+#define max(x, y) (((x) > (y)) ? (x) : (y))
+
+
+/*****************************************************************************
+ *
+ * Constant definitions
+ *
+ *****************************************************************************/
+
+// Table for the hierarchical mixing position seeking algorithm
+static const short _scanOffsets[5][24]={
+    { 124,  186,  248,  310,  372,  434,  496,  558,  620,  682,  744, 806,
+      868,  930,  992, 1054, 1116, 1178, 1240, 1302, 1364, 1426, 1488,   0},
+    {-100,  -75,  -50,  -25,   25,   50,   75,  100,    0,    0,    0,   0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   0},
+    { -20,  -15,  -10,   -5,    5,   10,   15,   20,    0,    0,    0,   0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   0},
+    {  -4,   -3,   -2,   -1,    1,    2,    3,    4,    0,    0,    0,   0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   0},
+    { 121,  114,   97,  114,   98,  105,  108,   32,  104,   99,  117,  111,
+      116,  100,  110,  117,  111,  115,    0,    0,    0,    0,    0,   0}};
+
+/*****************************************************************************
+ *
+ * Implementation of the class 'TDStretch'
+ *
+ *****************************************************************************/
+
+
+TDStretch::TDStretch() : FIFOProcessor(&outputBuffer)
+{
+    bQuickSeek = FALSE;
+    channels = 2;
+
+    pMidBuffer = NULL;
+    pMidBufferUnaligned = NULL;
+    overlapLength = 0;
+
+    bAutoSeqSetting = TRUE;
+    bAutoSeekSetting = TRUE;
+
+//    outDebt = 0;
+    skipFract = 0;
+
+    tempo = 1.0f;
+    setParameters(44100, DEFAULT_SEQUENCE_MS, DEFAULT_SEEKWINDOW_MS, DEFAULT_OVERLAP_MS);
+    setTempo(1.0f);
+
+    clear();
+}
+
+
+
+TDStretch::~TDStretch()
+{
+    delete[] pMidBufferUnaligned;
+}
+
+
+
+// Sets routine control parameters. These control are certain time constants
+// defining how the sound is stretched to the desired duration.
+//
+// 'sampleRate' = sample rate of the sound
+// 'sequenceMS' = one processing sequence length in milliseconds (default = 82 ms)
+// 'seekwindowMS' = seeking window length for scanning the best overlapping 
+//      position (default = 28 ms)
+// 'overlapMS' = overlapping length (default = 12 ms)
+
+void TDStretch::setParameters(int aSampleRate, int aSequenceMS, 
+                              int aSeekWindowMS, int aOverlapMS)
+{
+    // accept only positive parameter values - if zero or negative, use old values instead
+    if (aSampleRate > 0)   this->sampleRate = aSampleRate;
+    if (aOverlapMS > 0)    this->overlapMs = aOverlapMS;
+
+    if (aSequenceMS > 0)
+    {
+        this->sequenceMs = aSequenceMS;
+        bAutoSeqSetting = FALSE;
+    } 
+    else if (aSequenceMS == 0)
+    {
+        // if zero, use automatic setting
+        bAutoSeqSetting = TRUE;
+    }
+
+    if (aSeekWindowMS > 0) 
+    {
+        this->seekWindowMs = aSeekWindowMS;
+        bAutoSeekSetting = FALSE;
+    } 
+    else if (aSeekWindowMS == 0) 
+    {
+        // if zero, use automatic setting
+        bAutoSeekSetting = TRUE;
+    }
+
+    calcSeqParameters();
+
+    calculateOverlapLength(overlapMs);
+
+    // set tempo to recalculate 'sampleReq'
+    setTempo(tempo);
+}
+
+
+
+/// Get routine control parameters, see setParameters() function.
+/// Any of the parameters to this function can be NULL, in such case corresponding parameter
+/// value isn't returned.
+void TDStretch::getParameters(int *pSampleRate, int *pSequenceMs, int *pSeekWindowMs, int *pOverlapMs) const
+{
+    if (pSampleRate)
+    {
+        *pSampleRate = sampleRate;
+    }
+
+    if (pSequenceMs)
+    {
+        *pSequenceMs = (bAutoSeqSetting) ? (USE_AUTO_SEQUENCE_LEN) : sequenceMs;
+    }
+
+    if (pSeekWindowMs)
+    {
+        *pSeekWindowMs = (bAutoSeekSetting) ? (USE_AUTO_SEEKWINDOW_LEN) : seekWindowMs;
+    }
+
+    if (pOverlapMs)
+    {
+        *pOverlapMs = overlapMs;
+    }
+}
+
+
+// Overlaps samples in 'midBuffer' with the samples in 'pInput'
+void TDStretch::overlapMono(SAMPLETYPE *pOutput, const SAMPLETYPE *pInput) const
+{
+    int i;
+    SAMPLETYPE m1, m2;
+
+    m1 = (SAMPLETYPE)0;
+    m2 = (SAMPLETYPE)overlapLength;
+
+    for (i = 0; i < overlapLength ; i ++) 
+    {
+        pOutput[i] = (pInput[i] * m1 + pMidBuffer[i] * m2 ) / overlapLength;
+        m1 += 1;
+        m2 -= 1;
+    }
+}
+
+
+
+void TDStretch::clearMidBuffer()
+{
+    memset(pMidBuffer, 0, channels * sizeof(SAMPLETYPE) * overlapLength);
+}
+
+
+void TDStretch::clearInput()
+{
+    inputBuffer.clear();
+    clearMidBuffer();
+}
+
+
+// Clears the sample buffers
+void TDStretch::clear()
+{
+    outputBuffer.clear();
+    clearInput();
+}
+
+
+
+// Enables/disables the quick position seeking algorithm. Zero to disable, nonzero
+// to enable
+void TDStretch::enableQuickSeek(BOOL enable)
+{
+    bQuickSeek = enable;
+}
+
+
+// Returns nonzero if the quick seeking algorithm is enabled.
+BOOL TDStretch::isQuickSeekEnabled() const
+{
+    return bQuickSeek;
+}
+
+
+// Seeks for the optimal overlap-mixing position.
+int TDStretch::seekBestOverlapPosition(const SAMPLETYPE *refPos)
+{
+    if (bQuickSeek) 
+    {
+        return seekBestOverlapPositionQuick(refPos);
+    } 
+    else 
+    {
+        return seekBestOverlapPositionFull(refPos);
+    }
+}
+
+
+// Overlaps samples in 'midBuffer' with the samples in 'pInputBuffer' at position
+// of 'ovlPos'.
+inline void TDStretch::overlap(SAMPLETYPE *pOutput, const SAMPLETYPE *pInput, uint ovlPos) const
+{
+#ifndef USE_MULTICH_ALWAYS
+    if (channels == 1)
+    {
+        // mono sound.
+        overlapMono(pOutput, pInput + ovlPos);
+    }
+    else if (channels == 2)
+    {
+        // stereo sound
+        overlapStereo(pOutput, pInput + 2 * ovlPos);
+    } 
+    else 
+#endif // USE_MULTICH_ALWAYS
+    {
+        assert(channels > 0);
+        overlapMulti(pOutput, pInput + channels * ovlPos);
+    }
+}
+
+
+
+// Seeks for the optimal overlap-mixing position. The 'stereo' version of the
+// routine
+//
+// The best position is determined as the position where the two overlapped
+// sample sequences are 'most alike', in terms of the highest cross-correlation
+// value over the overlapping period
+int TDStretch::seekBestOverlapPositionFull(const SAMPLETYPE *refPos) 
+{
+    int bestOffs;
+    double bestCorr, corr;
+    int i;
+
+    bestCorr = FLT_MIN;
+    bestOffs = 0;
+
+    // Scans for the best correlation value by testing each possible position
+    // over the permitted range.
+    for (i = 0; i < seekLength; i ++) 
+    {
+        // Calculates correlation value for the mixing position corresponding
+        // to 'i'
+        corr = calcCrossCorr(refPos + channels * i, pMidBuffer);
+        // heuristic rule to slightly favour values close to mid of the range
+        double tmp = (double)(2 * i - seekLength) / (double)seekLength;
+        corr = ((corr + 0.1) * (1.0 - 0.25 * tmp * tmp));
+
+        // Checks for the highest correlation value
+        if (corr > bestCorr) 
+        {
+            bestCorr = corr;
+            bestOffs = i;
+        }
+    }
+    // clear cross correlation routine state if necessary (is so e.g. in MMX routines).
+    clearCrossCorrState();
+
+    return bestOffs;
+}
+
+
+// Seeks for the optimal overlap-mixing position. The 'stereo' version of the
+// routine
+//
+// The best position is determined as the position where the two overlapped
+// sample sequences are 'most alike', in terms of the highest cross-correlation
+// value over the overlapping period
+int TDStretch::seekBestOverlapPositionQuick(const SAMPLETYPE *refPos) 
+{
+    int j;
+    int bestOffs;
+    double bestCorr, corr;
+    int scanCount, corrOffset, tempOffset;
+
+    bestCorr = FLT_MIN;
+    bestOffs = _scanOffsets[0][0];
+    corrOffset = 0;
+    tempOffset = 0;
+
+    // Scans for the best correlation value using four-pass hierarchical search.
+    //
+    // The look-up table 'scans' has hierarchical position adjusting steps.
+    // In first pass the routine searhes for the highest correlation with 
+    // relatively coarse steps, then rescans the neighbourhood of the highest
+    // correlation with better resolution and so on.
+    for (scanCount = 0;scanCount < 4; scanCount ++) 
+    {
+        j = 0;
+        while (_scanOffsets[scanCount][j]) 
+        {
+            tempOffset = corrOffset + _scanOffsets[scanCount][j];
+            if (tempOffset >= seekLength) break;
+
+            // Calculates correlation value for the mixing position corresponding
+            // to 'tempOffset'
+            corr = (double)calcCrossCorr(refPos + channels * tempOffset, pMidBuffer);
+            // heuristic rule to slightly favour values close to mid of the range
+            double tmp = (double)(2 * tempOffset - seekLength) / seekLength;
+            corr = ((corr + 0.1) * (1.0 - 0.25 * tmp * tmp));
+
+            // Checks for the highest correlation value
+            if (corr > bestCorr) 
+            {
+                bestCorr = corr;
+                bestOffs = tempOffset;
+            }
+            j ++;
+        }
+        corrOffset = bestOffs;
+    }
+    // clear cross correlation routine state if necessary (is so e.g. in MMX routines).
+    clearCrossCorrState();
+
+    return bestOffs;
+}
+
+
+
+/// clear cross correlation routine state if necessary 
+void TDStretch::clearCrossCorrState()
+{
+    // default implementation is empty.
+}
+
+
+/// Calculates processing sequence length according to tempo setting
+void TDStretch::calcSeqParameters()
+{
+    // Adjust tempo param according to tempo, so that variating processing sequence length is used
+    // at varius tempo settings, between the given low...top limits
+    #define AUTOSEQ_TEMPO_LOW   0.5     // auto setting low tempo range (-50%)
+    #define AUTOSEQ_TEMPO_TOP   2.0     // auto setting top tempo range (+100%)
+
+    // sequence-ms setting values at above low & top tempo
+    #define AUTOSEQ_AT_MIN      125.0
+    #define AUTOSEQ_AT_MAX      50.0
+    #define AUTOSEQ_K           ((AUTOSEQ_AT_MAX - AUTOSEQ_AT_MIN) / (AUTOSEQ_TEMPO_TOP - AUTOSEQ_TEMPO_LOW))
+    #define AUTOSEQ_C           (AUTOSEQ_AT_MIN - (AUTOSEQ_K) * (AUTOSEQ_TEMPO_LOW))
+
+    // seek-window-ms setting values at above low & top tempo
+    #define AUTOSEEK_AT_MIN     25.0
+    #define AUTOSEEK_AT_MAX     15.0
+    #define AUTOSEEK_K          ((AUTOSEEK_AT_MAX - AUTOSEEK_AT_MIN) / (AUTOSEQ_TEMPO_TOP - AUTOSEQ_TEMPO_LOW))
+    #define AUTOSEEK_C          (AUTOSEEK_AT_MIN - (AUTOSEEK_K) * (AUTOSEQ_TEMPO_LOW))
+
+    #define CHECK_LIMITS(x, mi, ma) (((x) < (mi)) ? (mi) : (((x) > (ma)) ? (ma) : (x)))
+
+    double seq, seek;
+    
+    if (bAutoSeqSetting)
+    {
+        seq = AUTOSEQ_C + AUTOSEQ_K * tempo;
+        seq = CHECK_LIMITS(seq, AUTOSEQ_AT_MAX, AUTOSEQ_AT_MIN);
+        sequenceMs = (int)(seq + 0.5);
+    }
+
+    if (bAutoSeekSetting)
+    {
+        seek = AUTOSEEK_C + AUTOSEEK_K * tempo;
+        seek = CHECK_LIMITS(seek, AUTOSEEK_AT_MAX, AUTOSEEK_AT_MIN);
+        seekWindowMs = (int)(seek + 0.5);
+    }
+
+    // Update seek window lengths
+    seekWindowLength = (sampleRate * sequenceMs) / 1000;
+    if (seekWindowLength < 2 * overlapLength) 
+    {
+        seekWindowLength = 2 * overlapLength;
+    }
+    seekLength = (sampleRate * seekWindowMs) / 1000;
+}
+
+
+
+// Sets new target tempo. Normal tempo = 'SCALE', smaller values represent slower 
+// tempo, larger faster tempo.
+void TDStretch::setTempo(float newTempo)
+{
+    int intskip;
+
+    tempo = newTempo;
+
+    // Calculate new sequence duration
+    calcSeqParameters();
+
+    // Calculate ideal skip length (according to tempo value) 
+    nominalSkip = tempo * (seekWindowLength - overlapLength);
+    intskip = (int)(nominalSkip + 0.5f);
+
+    // Calculate how many samples are needed in the 'inputBuffer' to 
+    // process another batch of samples
+    //sampleReq = max(intskip + overlapLength, seekWindowLength) + seekLength / 2;
+    sampleReq = max(intskip + overlapLength, seekWindowLength) + seekLength;
+}
+
+
+
+// Sets the number of channels, 1 = mono, 2 = stereo
+void TDStretch::setChannels(int numChannels)
+{
+    assert(numChannels > 0);
+    if (channels == numChannels) return;
+//    assert(numChannels == 1 || numChannels == 2);
+
+    channels = numChannels;
+    inputBuffer.setChannels(channels);
+    outputBuffer.setChannels(channels);
+
+    // re-init overlap/buffer
+    overlapLength=0;
+    setParameters(sampleRate);
+}
+
+
+// nominal tempo, no need for processing, just pass the samples through
+// to outputBuffer
+/*
+void TDStretch::processNominalTempo()
+{
+    assert(tempo == 1.0f);
+
+    if (bMidBufferDirty) 
+    {
+        // If there are samples in pMidBuffer waiting for overlapping,
+        // do a single sliding overlapping with them in order to prevent a 
+        // clicking distortion in the output sound
+        if (inputBuffer.numSamples() < overlapLength) 
+        {
+            // wait until we've got overlapLength input samples
+            return;
+        }
+        // Mix the samples in the beginning of 'inputBuffer' with the 
+        // samples in 'midBuffer' using sliding overlapping 
+        overlap(outputBuffer.ptrEnd(overlapLength), inputBuffer.ptrBegin(), 0);
+        outputBuffer.putSamples(overlapLength);
+        inputBuffer.receiveSamples(overlapLength);
+        clearMidBuffer();
+        // now we've caught the nominal sample flow and may switch to
+        // bypass mode
+    }
+
+    // Simply bypass samples from input to output
+    outputBuffer.moveSamples(inputBuffer);
+}
+*/
+
+
+// Processes as many processing frames of the samples 'inputBuffer', store
+// the result into 'outputBuffer'
+void TDStretch::processSamples()
+{
+    int ovlSkip, offset;
+    int temp;
+
+    /* Removed this small optimization - can introduce a click to sound when tempo setting
+       crosses the nominal value
+    if (tempo == 1.0f) 
+    {
+        // tempo not changed from the original, so bypass the processing
+        processNominalTempo();
+        return;
+    }
+    */
+
+    // Process samples as long as there are enough samples in 'inputBuffer'
+    // to form a processing frame.
+    while ((int)inputBuffer.numSamples() >= sampleReq) 
+    {
+        // If tempo differs from the normal ('SCALE'), scan for the best overlapping
+        // position
+        offset = seekBestOverlapPosition(inputBuffer.ptrBegin());
+
+        // Mix the samples in the 'inputBuffer' at position of 'offset' with the 
+        // samples in 'midBuffer' using sliding overlapping
+        // ... first partially overlap with the end of the previous sequence
+        // (that's in 'midBuffer')
+        overlap(outputBuffer.ptrEnd((uint)overlapLength), inputBuffer.ptrBegin(), (uint)offset);
+        outputBuffer.putSamples((uint)overlapLength);
+
+        // ... then copy sequence samples from 'inputBuffer' to output:
+
+        // length of sequence
+        temp = (seekWindowLength - 2 * overlapLength);
+
+        // crosscheck that we don't have buffer overflow...
+        if ((int)inputBuffer.numSamples() < (offset + temp + overlapLength * 2))
+        {
+            continue;    // just in case, shouldn't really happen
+        }
+
+        outputBuffer.putSamples(inputBuffer.ptrBegin() + channels * (offset + overlapLength), (uint)temp);
+
+        // Copies the end of the current sequence from 'inputBuffer' to 
+        // 'midBuffer' for being mixed with the beginning of the next 
+        // processing sequence and so on
+        assert((offset + temp + overlapLength * 2) <= (int)inputBuffer.numSamples());
+        memcpy(pMidBuffer, inputBuffer.ptrBegin() + channels * (offset + temp + overlapLength), 
+            channels * sizeof(SAMPLETYPE) * overlapLength);
+
+        // Remove the processed samples from the input buffer. Update
+        // the difference between integer & nominal skip step to 'skipFract'
+        // in order to prevent the error from accumulating over time.
+        skipFract += nominalSkip;   // real skip size
+        ovlSkip = (int)skipFract;   // rounded to integer skip
+        skipFract -= ovlSkip;       // maintain the fraction part, i.e. real vs. integer skip
+        inputBuffer.receiveSamples((uint)ovlSkip);
+    }
+}
+
+
+// Adds 'numsamples' pcs of samples from the 'samples' memory position into
+// the input of the object.
+void TDStretch::putSamples(const SAMPLETYPE *samples, uint nSamples)
+{
+    // Add the samples into the input buffer
+    inputBuffer.putSamples(samples, nSamples);
+    // Process the samples in input buffer
+    processSamples();
+}
+
+
+
+/// Set new overlap length parameter & reallocate RefMidBuffer if necessary.
+void TDStretch::acceptNewOverlapLength(int newOverlapLength)
+{
+    int prevOvl;
+
+    assert(newOverlapLength >= 0);
+    prevOvl = overlapLength;
+    overlapLength = newOverlapLength;
+
+    if (overlapLength > prevOvl)
+    {
+        delete[] pMidBufferUnaligned;
+
+        pMidBufferUnaligned = new SAMPLETYPE[overlapLength * channels + 16 / sizeof(SAMPLETYPE)];
+        // ensure that 'pMidBuffer' is aligned to 16 byte boundary for efficiency
+        pMidBuffer = (SAMPLETYPE *)SOUNDTOUCH_ALIGN_POINTER_16(pMidBufferUnaligned);
+
+        clearMidBuffer();
+    }
+}
+
+
+// Operator 'new' is overloaded so that it automatically creates a suitable instance 
+// depending on if we've a MMX/SSE/etc-capable CPU available or not.
+void * TDStretch::operator new(size_t s)
+{
+    // Notice! don't use "new TDStretch" directly, use "newInstance" to create a new instance instead!
+    ST_THROW_RT_ERROR("Error in TDStretch::new: Don't use 'new TDStretch' directly, use 'newInstance' member instead!");
+    return newInstance();
+}
+
+
+TDStretch * TDStretch::newInstance()
+{
+    uint uExtensions;
+
+    uExtensions = detectCPUextensions();
+
+    // Check if MMX/SSE instruction set extensions supported by CPU
+
+#ifdef SOUNDTOUCH_ALLOW_MMX
+    // MMX routines available only with integer sample types
+    if (uExtensions & SUPPORT_MMX)
+    {
+        return ::new TDStretchMMX;
+    }
+    else
+#endif // SOUNDTOUCH_ALLOW_MMX
+
+
+#ifdef SOUNDTOUCH_ALLOW_SSE
+    if (uExtensions & SUPPORT_SSE)
+    {
+        // SSE support
+        return ::new TDStretchSSE;
+    }
+    else
+#endif // SOUNDTOUCH_ALLOW_SSE
+
+    {
+        // ISA optimizations not supported, use plain C version
+        return ::new TDStretch;
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Integer arithmetics specific algorithm implementations.
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#ifdef SOUNDTOUCH_INTEGER_SAMPLES
+
+// Overlaps samples in 'midBuffer' with the samples in 'input'. The 'Stereo' 
+// version of the routine.
+void TDStretch::overlapStereo(short *poutput, const short *input) const
+{
+    int i;
+    short temp;
+    int cnt2;
+
+    for (i = 0; i < overlapLength ; i ++) 
+    {
+        temp = (short)(overlapLength - i);
+        cnt2 = 2 * i;
+        poutput[cnt2] = (input[cnt2] * i + pMidBuffer[cnt2] * temp )  / overlapLength;
+        poutput[cnt2 + 1] = (input[cnt2 + 1] * i + pMidBuffer[cnt2 + 1] * temp ) / overlapLength;
+    }
+}
+
+
+// Overlaps samples in 'midBuffer' with the samples in 'input'. The 'Multi'
+// version of the routine.
+void TDStretch::overlapMulti(SAMPLETYPE *poutput, const SAMPLETYPE *input) const
+{
+    SAMPLETYPE m1=(SAMPLETYPE)0;
+    SAMPLETYPE m2;
+    int i=0;
+
+    for (m2 = (SAMPLETYPE)overlapLength; m2; m2 --)
+    {
+        for (int c = 0; c < channels; c ++)
+        {
+            poutput[i] = (input[i] * m1 + pMidBuffer[i] * m2)  / overlapLength;
+            i++;
+        }
+
+        m1++;
+    }
+}
+
+// Calculates the x having the closest 2^x value for the given value
+static int _getClosest2Power(double value)
+{
+    return (int)(log(value) / log(2.0) + 0.5);
+}
+
+
+/// Calculates overlap period length in samples.
+/// Integer version rounds overlap length to closest power of 2
+/// for a divide scaling operation.
+void TDStretch::calculateOverlapLength(int aoverlapMs)
+{
+    int newOvl;
+
+    assert(aoverlapMs >= 0);
+
+    // calculate overlap length so that it's power of 2 - thus it's easy to do
+    // integer division by right-shifting. Term "-1" at end is to account for 
+    // the extra most significatnt bit left unused in result by signed multiplication 
+    overlapDividerBits = _getClosest2Power((sampleRate * aoverlapMs) / 1000.0) - 1;
+    if (overlapDividerBits > 9) overlapDividerBits = 9;
+    if (overlapDividerBits < 3) overlapDividerBits = 3;
+    newOvl = (int)pow(2.0, (int)overlapDividerBits + 1);    // +1 => account for -1 above
+
+    acceptNewOverlapLength(newOvl);
+
+    // calculate sloping divider so that crosscorrelation operation won't 
+    // overflow 32-bit register. Max. sum of the crosscorrelation sum without 
+    // divider would be 2^30*(N^3-N)/3, where N = overlap length
+    slopingDivider = (newOvl * newOvl - 1) / 3;
+}
+
+
+double TDStretch::calcCrossCorr(const short *mixingPos, const short *compare) const
+{
+    long corr;
+    long norm;
+    int i;
+
+    corr = norm = 0;
+    // Same routine for stereo and mono. For stereo, unroll loop for better
+    // efficiency and gives slightly better resolution against rounding. 
+    // For mono it same routine, just  unrolls loop by factor of 4
+    for (i = 0; i < channels * overlapLength; i += 4) 
+    {
+        corr += (mixingPos[i] * compare[i] + 
+                 mixingPos[i + 1] * compare[i + 1] +
+                 mixingPos[i + 2] * compare[i + 2] + 
+                 mixingPos[i + 3] * compare[i + 3]) >> overlapDividerBits;
+        norm += (mixingPos[i] * mixingPos[i] + 
+                 mixingPos[i + 1] * mixingPos[i + 1] +
+                 mixingPos[i + 2] * mixingPos[i + 2] + 
+                 mixingPos[i + 3] * mixingPos[i + 3]) >> overlapDividerBits;
+    }
+
+    // Normalize result by dividing by sqrt(norm) - this step is easiest 
+    // done using floating point operation
+    if (norm == 0) norm = 1;    // to avoid div by zero
+    return (double)corr / sqrt((double)norm);
+}
+
+#endif // SOUNDTOUCH_INTEGER_SAMPLES
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Floating point arithmetics specific algorithm implementations.
+//
+
+#ifdef SOUNDTOUCH_FLOAT_SAMPLES
+
+// Overlaps samples in 'midBuffer' with the samples in 'pInput'
+void TDStretch::overlapStereo(float *pOutput, const float *pInput) const
+{
+    int i;
+    float fScale;
+    float f1;
+    float f2;
+
+    fScale = 1.0f / (float)overlapLength;
+
+    f1 = 0;
+    f2 = 1.0f;
+
+    for (i = 0; i < 2 * (int)overlapLength ; i += 2) 
+    {
+        pOutput[i + 0] = pInput[i + 0] * f1 + pMidBuffer[i + 0] * f2;
+        pOutput[i + 1] = pInput[i + 1] * f1 + pMidBuffer[i + 1] * f2;
+
+        f1 += fScale;
+        f2 -= fScale;
+    }
+}
+
+
+// Overlaps samples in 'midBuffer' with the samples in 'input'. 
+void TDStretch::overlapMulti(float *pOutput, const float *pInput) const
+{
+    int i;
+    float fScale;
+    float f1;
+    float f2;
+
+    fScale = 1.0f / (float)overlapLength;
+
+    f1 = 0;
+    f2 = 1.0f;
+
+    i=0;
+    for (int i2 = 0; i2 < overlapLength; i2 ++)
+    {
+        // note: Could optimize this slightly by taking into account that always channels > 2
+        for (int c = 0; c < channels; c ++)
+        {
+            pOutput[i] = pInput[i] * f1 + pMidBuffer[i] * f2;
+            i++;
+        }
+        f1 += fScale;
+        f2 -= fScale;
+    }
+}
+
+
+/// Calculates overlapInMsec period length in samples.
+void TDStretch::calculateOverlapLength(int overlapInMsec)
+{
+    int newOvl;
+
+    assert(overlapInMsec >= 0);
+    newOvl = (sampleRate * overlapInMsec) / 1000;
+    if (newOvl < 16) newOvl = 16;
+
+    // must be divisible by 8
+    newOvl -= newOvl % 8;
+
+    acceptNewOverlapLength(newOvl);
+}
+
+
+double TDStretch::calcCrossCorr(const float *mixingPos, const float *compare) const
+{
+    double corr;
+    double norm;
+    int i;
+
+    corr = norm = 0;
+    // Same routine for stereo and mono. For Stereo, unroll by factor of 2.
+    // For mono it's same routine yet unrollsd by factor of 4.
+    for (i = 0; i < channels * overlapLength; i += 4) 
+    {
+        corr += mixingPos[i] * compare[i] +
+                mixingPos[i + 1] * compare[i + 1];
+
+        norm += mixingPos[i] * mixingPos[i] + 
+                mixingPos[i + 1] * mixingPos[i + 1];
+
+        // unroll the loop for better CPU efficiency:
+        corr += mixingPos[i + 2] * compare[i + 2] +
+                mixingPos[i + 3] * compare[i + 3];
+
+        norm += mixingPos[i + 2] * mixingPos[i + 2] +
+                mixingPos[i + 3] * mixingPos[i + 3];
+    }
+
+    if (norm < 1e-9) norm = 1.0;    // to avoid div by zero
+    return corr / sqrt(norm);
+}
+
+#endif // SOUNDTOUCH_FLOAT_SAMPLES
diff --git a/Externals/soundtouch/TDStretch.h b/Externals/soundtouch/TDStretch.h
index 6d6e7359ff..43610c9d33 100644
--- a/Externals/soundtouch/TDStretch.h
+++ b/Externals/soundtouch/TDStretch.h
@@ -1,268 +1,269 @@
-////////////////////////////////////////////////////////////////////////////////
-/// 
-/// Sampled sound tempo changer/time stretch algorithm. Changes the sound tempo 
-/// while maintaining the original pitch by using a time domain WSOLA-like method 
-/// with several performance-increasing tweaks.
-///
-/// Note : MMX/SSE optimized functions reside in separate, platform-specific files 
-/// 'mmx_optimized.cpp' and 'sse_optimized.cpp'
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2012-04-01 22:49:30 +0300 (Sun, 01 Apr 2012) $
-// File revision : $Revision: 4 $
-//
-// $Id: TDStretch.h 137 2012-04-01 19:49:30Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef TDStretch_H
-#define TDStretch_H
-
-#include <stddef.h>
-#include "STTypes.h"
-#include "RateTransposer.h"
-#include "FIFOSamplePipe.h"
-
-namespace soundtouch
-{
-
-/// Default values for sound processing parameters:
-/// Notice that the default parameters are tuned for contemporary popular music 
-/// processing. For speech processing applications these parameters suit better:
-///     #define DEFAULT_SEQUENCE_MS     40
-///     #define DEFAULT_SEEKWINDOW_MS   15
-///     #define DEFAULT_OVERLAP_MS      8
-///
-
-/// Default length of a single processing sequence, in milliseconds. This determines to how 
-/// long sequences the original sound is chopped in the time-stretch algorithm.
-///
-/// The larger this value is, the lesser sequences are used in processing. In principle
-/// a bigger value sounds better when slowing down tempo, but worse when increasing tempo
-/// and vice versa.
-///
-/// Increasing this value reduces computational burden & vice versa.
-//#define DEFAULT_SEQUENCE_MS         40
-#define DEFAULT_SEQUENCE_MS         USE_AUTO_SEQUENCE_LEN
-
-/// Giving this value for the sequence length sets automatic parameter value
-/// according to tempo setting (recommended)
-#define USE_AUTO_SEQUENCE_LEN       0
-
-/// Seeking window default length in milliseconds for algorithm that finds the best possible 
-/// overlapping location. This determines from how wide window the algorithm may look for an 
-/// optimal joining location when mixing the sound sequences back together. 
-///
-/// The bigger this window setting is, the higher the possibility to find a better mixing
-/// position will become, but at the same time large values may cause a "drifting" artifact
-/// because consequent sequences will be taken at more uneven intervals.
-///
-/// If there's a disturbing artifact that sounds as if a constant frequency was drifting 
-/// around, try reducing this setting.
-///
-/// Increasing this value increases computational burden & vice versa.
-//#define DEFAULT_SEEKWINDOW_MS       15
-#define DEFAULT_SEEKWINDOW_MS       USE_AUTO_SEEKWINDOW_LEN
-
-/// Giving this value for the seek window length sets automatic parameter value
-/// according to tempo setting (recommended)
-#define USE_AUTO_SEEKWINDOW_LEN     0
-
-/// Overlap length in milliseconds. When the chopped sound sequences are mixed back together, 
-/// to form a continuous sound stream, this parameter defines over how long period the two 
-/// consecutive sequences are let to overlap each other. 
-///
-/// This shouldn't be that critical parameter. If you reduce the DEFAULT_SEQUENCE_MS setting 
-/// by a large amount, you might wish to try a smaller value on this.
-///
-/// Increasing this value increases computational burden & vice versa.
-#define DEFAULT_OVERLAP_MS      8
-
-
-/// Class that does the time-stretch (tempo change) effect for the processed
-/// sound.
-class TDStretch : public FIFOProcessor
-{
-protected:
-    int channels;
-    int sampleReq;
-    float tempo;
-
-    SAMPLETYPE *pMidBuffer;
-    SAMPLETYPE *pMidBufferUnaligned;
-    int overlapLength;
-    int seekLength;
-    int seekWindowLength;
-    int overlapDividerBits;
-    int slopingDivider;
-    float nominalSkip;
-    float skipFract;
-    FIFOSampleBuffer outputBuffer;
-    FIFOSampleBuffer inputBuffer;
-    BOOL bQuickSeek;
-
-    int sampleRate;
-    int sequenceMs;
-    int seekWindowMs;
-    int overlapMs;
-    BOOL bAutoSeqSetting;
-    BOOL bAutoSeekSetting;
-
-    void acceptNewOverlapLength(int newOverlapLength);
-
-    virtual void clearCrossCorrState();
-    void calculateOverlapLength(int overlapMs);
-
-    virtual double calcCrossCorr(const SAMPLETYPE *mixingPos, const SAMPLETYPE *compare) const;
-
-    virtual int seekBestOverlapPositionFull(const SAMPLETYPE *refPos);
-    virtual int seekBestOverlapPositionQuick(const SAMPLETYPE *refPos);
-    int seekBestOverlapPosition(const SAMPLETYPE *refPos);
-
-    virtual void overlapStereo(SAMPLETYPE *output, const SAMPLETYPE *input) const;
-    virtual void overlapMono(SAMPLETYPE *output, const SAMPLETYPE *input) const;
-
-    void clearMidBuffer();
-    void overlap(SAMPLETYPE *output, const SAMPLETYPE *input, uint ovlPos) const;
-
-    void calcSeqParameters();
-
-    /// Changes the tempo of the given sound samples.
-    /// Returns amount of samples returned in the "output" buffer.
-    /// The maximum amount of samples that can be returned at a time is set by
-    /// the 'set_returnBuffer_size' function.
-    void processSamples();
-    
-public:
-    TDStretch();
-    virtual ~TDStretch();
-
-    /// Operator 'new' is overloaded so that it automatically creates a suitable instance 
-    /// depending on if we've a MMX/SSE/etc-capable CPU available or not.
-    static void *operator new(size_t s);
-
-    /// Use this function instead of "new" operator to create a new instance of this class. 
-    /// This function automatically chooses a correct feature set depending on if the CPU
-    /// supports MMX/SSE/etc extensions.
-    static TDStretch *newInstance();
-    
-    /// Returns the output buffer object
-    FIFOSamplePipe *getOutput() { return &outputBuffer; };
-
-    /// Returns the input buffer object
-    FIFOSamplePipe *getInput() { return &inputBuffer; };
-
-    /// Sets new target tempo. Normal tempo = 'SCALE', smaller values represent slower 
-    /// tempo, larger faster tempo.
-    void setTempo(float newTempo);
-
-    /// Returns nonzero if there aren't any samples available for outputting.
-    virtual void clear();
-
-    /// Clears the input buffer
-    void clearInput();
-
-    /// Sets the number of channels, 1 = mono, 2 = stereo
-    void setChannels(int numChannels);
-
-    /// Enables/disables the quick position seeking algorithm. Zero to disable, 
-    /// nonzero to enable
-    void enableQuickSeek(BOOL enable);
-
-    /// Returns nonzero if the quick seeking algorithm is enabled.
-    BOOL isQuickSeekEnabled() const;
-
-    /// Sets routine control parameters. These control are certain time constants
-    /// defining how the sound is stretched to the desired duration.
-    //
-    /// 'sampleRate' = sample rate of the sound
-    /// 'sequenceMS' = one processing sequence length in milliseconds
-    /// 'seekwindowMS' = seeking window length for scanning the best overlapping 
-    ///      position
-    /// 'overlapMS' = overlapping length
-    void setParameters(int sampleRate,          ///< Samplerate of sound being processed (Hz)
-                       int sequenceMS = -1,     ///< Single processing sequence length (ms)
-                       int seekwindowMS = -1,   ///< Offset seeking window length (ms)
-                       int overlapMS = -1       ///< Sequence overlapping length (ms)
-                       );
-
-    /// Get routine control parameters, see setParameters() function.
-    /// Any of the parameters to this function can be NULL, in such case corresponding parameter
-    /// value isn't returned.
-    void getParameters(int *pSampleRate, int *pSequenceMs, int *pSeekWindowMs, int *pOverlapMs) const;
-
-    /// Adds 'numsamples' pcs of samples from the 'samples' memory position into
-    /// the input of the object.
-    virtual void putSamples(
-            const SAMPLETYPE *samples,  ///< Input sample data
-            uint numSamples                         ///< Number of samples in 'samples' so that one sample
-                                                    ///< contains both channels if stereo
-            );
-
-    /// return nominal input sample requirement for triggering a processing batch
-    int getInputSampleReq() const
-    {
-        return (int)(nominalSkip + 0.5);
-    }
-
-    /// return nominal output sample amount when running a processing batch
-    int getOutputBatchSize() const
-    {
-        return seekWindowLength - overlapLength;
-    }
-};
-
-
-
-// Implementation-specific class declarations:
-
-#ifdef SOUNDTOUCH_ALLOW_MMX
-    /// Class that implements MMX optimized routines for 16bit integer samples type.
-    class TDStretchMMX : public TDStretch
-    {
-    protected:
-        double calcCrossCorr(const short *mixingPos, const short *compare) const;
-        virtual void overlapStereo(short *output, const short *input) const;
-        virtual void clearCrossCorrState();
-    };
-#endif /// SOUNDTOUCH_ALLOW_MMX
-
-
-#ifdef SOUNDTOUCH_ALLOW_SSE
-    /// Class that implements SSE optimized routines for floating point samples type.
-    class TDStretchSSE : public TDStretch
-    {
-    protected:
-        double calcCrossCorr(const float *mixingPos, const float *compare) const;
-    };
-
-#endif /// SOUNDTOUCH_ALLOW_SSE
-
-}
-#endif  /// TDStretch_H
+////////////////////////////////////////////////////////////////////////////////
+/// 
+/// Sampled sound tempo changer/time stretch algorithm. Changes the sound tempo 
+/// while maintaining the original pitch by using a time domain WSOLA-like method 
+/// with several performance-increasing tweaks.
+///
+/// Note : MMX/SSE optimized functions reside in separate, platform-specific files 
+/// 'mmx_optimized.cpp' and 'sse_optimized.cpp'
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2013-06-12 15:24:44 +0000 (Wed, 12 Jun 2013) $
+// File revision : $Revision: 4 $
+//
+// $Id: TDStretch.h 171 2013-06-12 15:24:44Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef TDStretch_H
+#define TDStretch_H
+
+#include <stddef.h>
+#include "STTypes.h"
+#include "RateTransposer.h"
+#include "FIFOSamplePipe.h"
+
+namespace soundtouch
+{
+
+/// Default values for sound processing parameters:
+/// Notice that the default parameters are tuned for contemporary popular music 
+/// processing. For speech processing applications these parameters suit better:
+///     #define DEFAULT_SEQUENCE_MS     40
+///     #define DEFAULT_SEEKWINDOW_MS   15
+///     #define DEFAULT_OVERLAP_MS      8
+///
+
+/// Default length of a single processing sequence, in milliseconds. This determines to how 
+/// long sequences the original sound is chopped in the time-stretch algorithm.
+///
+/// The larger this value is, the lesser sequences are used in processing. In principle
+/// a bigger value sounds better when slowing down tempo, but worse when increasing tempo
+/// and vice versa.
+///
+/// Increasing this value reduces computational burden & vice versa.
+//#define DEFAULT_SEQUENCE_MS         40
+#define DEFAULT_SEQUENCE_MS         USE_AUTO_SEQUENCE_LEN
+
+/// Giving this value for the sequence length sets automatic parameter value
+/// according to tempo setting (recommended)
+#define USE_AUTO_SEQUENCE_LEN       0
+
+/// Seeking window default length in milliseconds for algorithm that finds the best possible 
+/// overlapping location. This determines from how wide window the algorithm may look for an 
+/// optimal joining location when mixing the sound sequences back together. 
+///
+/// The bigger this window setting is, the higher the possibility to find a better mixing
+/// position will become, but at the same time large values may cause a "drifting" artifact
+/// because consequent sequences will be taken at more uneven intervals.
+///
+/// If there's a disturbing artifact that sounds as if a constant frequency was drifting 
+/// around, try reducing this setting.
+///
+/// Increasing this value increases computational burden & vice versa.
+//#define DEFAULT_SEEKWINDOW_MS       15
+#define DEFAULT_SEEKWINDOW_MS       USE_AUTO_SEEKWINDOW_LEN
+
+/// Giving this value for the seek window length sets automatic parameter value
+/// according to tempo setting (recommended)
+#define USE_AUTO_SEEKWINDOW_LEN     0
+
+/// Overlap length in milliseconds. When the chopped sound sequences are mixed back together, 
+/// to form a continuous sound stream, this parameter defines over how long period the two 
+/// consecutive sequences are let to overlap each other. 
+///
+/// This shouldn't be that critical parameter. If you reduce the DEFAULT_SEQUENCE_MS setting 
+/// by a large amount, you might wish to try a smaller value on this.
+///
+/// Increasing this value increases computational burden & vice versa.
+#define DEFAULT_OVERLAP_MS      8
+
+
+/// Class that does the time-stretch (tempo change) effect for the processed
+/// sound.
+class TDStretch : public FIFOProcessor
+{
+protected:
+    int channels;
+    int sampleReq;
+    float tempo;
+
+    SAMPLETYPE *pMidBuffer;
+    SAMPLETYPE *pMidBufferUnaligned;
+    int overlapLength;
+    int seekLength;
+    int seekWindowLength;
+    int overlapDividerBits;
+    int slopingDivider;
+    float nominalSkip;
+    float skipFract;
+    FIFOSampleBuffer outputBuffer;
+    FIFOSampleBuffer inputBuffer;
+    BOOL bQuickSeek;
+
+    int sampleRate;
+    int sequenceMs;
+    int seekWindowMs;
+    int overlapMs;
+    BOOL bAutoSeqSetting;
+    BOOL bAutoSeekSetting;
+
+    void acceptNewOverlapLength(int newOverlapLength);
+
+    virtual void clearCrossCorrState();
+    void calculateOverlapLength(int overlapMs);
+
+    virtual double calcCrossCorr(const SAMPLETYPE *mixingPos, const SAMPLETYPE *compare) const;
+
+    virtual int seekBestOverlapPositionFull(const SAMPLETYPE *refPos);
+    virtual int seekBestOverlapPositionQuick(const SAMPLETYPE *refPos);
+    int seekBestOverlapPosition(const SAMPLETYPE *refPos);
+
+    virtual void overlapStereo(SAMPLETYPE *output, const SAMPLETYPE *input) const;
+    virtual void overlapMono(SAMPLETYPE *output, const SAMPLETYPE *input) const;
+    virtual void overlapMulti(SAMPLETYPE *output, const SAMPLETYPE *input) const;
+
+    void clearMidBuffer();
+    void overlap(SAMPLETYPE *output, const SAMPLETYPE *input, uint ovlPos) const;
+
+    void calcSeqParameters();
+
+    /// Changes the tempo of the given sound samples.
+    /// Returns amount of samples returned in the "output" buffer.
+    /// The maximum amount of samples that can be returned at a time is set by
+    /// the 'set_returnBuffer_size' function.
+    void processSamples();
+    
+public:
+    TDStretch();
+    virtual ~TDStretch();
+
+    /// Operator 'new' is overloaded so that it automatically creates a suitable instance 
+    /// depending on if we've a MMX/SSE/etc-capable CPU available or not.
+    static void *operator new(size_t s);
+
+    /// Use this function instead of "new" operator to create a new instance of this class. 
+    /// This function automatically chooses a correct feature set depending on if the CPU
+    /// supports MMX/SSE/etc extensions.
+    static TDStretch *newInstance();
+    
+    /// Returns the output buffer object
+    FIFOSamplePipe *getOutput() { return &outputBuffer; };
+
+    /// Returns the input buffer object
+    FIFOSamplePipe *getInput() { return &inputBuffer; };
+
+    /// Sets new target tempo. Normal tempo = 'SCALE', smaller values represent slower 
+    /// tempo, larger faster tempo.
+    void setTempo(float newTempo);
+
+    /// Returns nonzero if there aren't any samples available for outputting.
+    virtual void clear();
+
+    /// Clears the input buffer
+    void clearInput();
+
+    /// Sets the number of channels, 1 = mono, 2 = stereo
+    void setChannels(int numChannels);
+
+    /// Enables/disables the quick position seeking algorithm. Zero to disable, 
+    /// nonzero to enable
+    void enableQuickSeek(BOOL enable);
+
+    /// Returns nonzero if the quick seeking algorithm is enabled.
+    BOOL isQuickSeekEnabled() const;
+
+    /// Sets routine control parameters. These control are certain time constants
+    /// defining how the sound is stretched to the desired duration.
+    //
+    /// 'sampleRate' = sample rate of the sound
+    /// 'sequenceMS' = one processing sequence length in milliseconds
+    /// 'seekwindowMS' = seeking window length for scanning the best overlapping 
+    ///      position
+    /// 'overlapMS' = overlapping length
+    void setParameters(int sampleRate,          ///< Samplerate of sound being processed (Hz)
+                       int sequenceMS = -1,     ///< Single processing sequence length (ms)
+                       int seekwindowMS = -1,   ///< Offset seeking window length (ms)
+                       int overlapMS = -1       ///< Sequence overlapping length (ms)
+                       );
+
+    /// Get routine control parameters, see setParameters() function.
+    /// Any of the parameters to this function can be NULL, in such case corresponding parameter
+    /// value isn't returned.
+    void getParameters(int *pSampleRate, int *pSequenceMs, int *pSeekWindowMs, int *pOverlapMs) const;
+
+    /// Adds 'numsamples' pcs of samples from the 'samples' memory position into
+    /// the input of the object.
+    virtual void putSamples(
+            const SAMPLETYPE *samples,  ///< Input sample data
+            uint numSamples                         ///< Number of samples in 'samples' so that one sample
+                                                    ///< contains both channels if stereo
+            );
+
+    /// return nominal input sample requirement for triggering a processing batch
+    int getInputSampleReq() const
+    {
+        return (int)(nominalSkip + 0.5);
+    }
+
+    /// return nominal output sample amount when running a processing batch
+    int getOutputBatchSize() const
+    {
+        return seekWindowLength - overlapLength;
+    }
+};
+
+
+
+// Implementation-specific class declarations:
+
+#ifdef SOUNDTOUCH_ALLOW_MMX
+    /// Class that implements MMX optimized routines for 16bit integer samples type.
+    class TDStretchMMX : public TDStretch
+    {
+    protected:
+        double calcCrossCorr(const short *mixingPos, const short *compare) const;
+        virtual void overlapStereo(short *output, const short *input) const;
+        virtual void clearCrossCorrState();
+    };
+#endif /// SOUNDTOUCH_ALLOW_MMX
+
+
+#ifdef SOUNDTOUCH_ALLOW_SSE
+    /// Class that implements SSE optimized routines for floating point samples type.
+    class TDStretchSSE : public TDStretch
+    {
+    protected:
+        double calcCrossCorr(const float *mixingPos, const float *compare) const;
+    };
+
+#endif /// SOUNDTOUCH_ALLOW_SSE
+
+}
+#endif  /// TDStretch_H
diff --git a/Externals/soundtouch/cpu_detect.h b/Externals/soundtouch/cpu_detect.h
index 7859ffb55d..dc285e90fd 100644
--- a/Externals/soundtouch/cpu_detect.h
+++ b/Externals/soundtouch/cpu_detect.h
@@ -1,62 +1,62 @@
-////////////////////////////////////////////////////////////////////////////////
-///
-/// A header file for detecting the Intel MMX instructions set extension.
-///
-/// Please see 'mmx_win.cpp', 'mmx_cpp.cpp' and 'mmx_non_x86.cpp' for the 
-/// routine implementations for x86 Windows, x86 gnu version and non-x86 
-/// platforms, respectively.
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2008-02-10 18:26:55 +0200 (Sun, 10 Feb 2008) $
-// File revision : $Revision: 4 $
-//
-// $Id: cpu_detect.h 11 2008-02-10 16:26:55Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#ifndef _CPU_DETECT_H_
-#define _CPU_DETECT_H_
-
-#include "STTypes.h"
-
-#define SUPPORT_MMX         0x0001
-#define SUPPORT_3DNOW       0x0002
-#define SUPPORT_ALTIVEC     0x0004
-#define SUPPORT_SSE         0x0008
-#define SUPPORT_SSE2        0x0010
-
-/// Checks which instruction set extensions are supported by the CPU.
-///
-/// \return A bitmask of supported extensions, see SUPPORT_... defines.
-uint detectCPUextensions(void);
-
-/// Disables given set of instruction extensions. See SUPPORT_... defines.
-void disableExtensions(uint wDisableMask);
-
-#endif  // _CPU_DETECT_H_
+////////////////////////////////////////////////////////////////////////////////
+///
+/// A header file for detecting the Intel MMX instructions set extension.
+///
+/// Please see 'mmx_win.cpp', 'mmx_cpp.cpp' and 'mmx_non_x86.cpp' for the 
+/// routine implementations for x86 Windows, x86 gnu version and non-x86 
+/// platforms, respectively.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2008-02-10 16:26:55 +0000 (Sun, 10 Feb 2008) $
+// File revision : $Revision: 4 $
+//
+// $Id: cpu_detect.h 11 2008-02-10 16:26:55Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#ifndef _CPU_DETECT_H_
+#define _CPU_DETECT_H_
+
+#include "STTypes.h"
+
+#define SUPPORT_MMX         0x0001
+#define SUPPORT_3DNOW       0x0002
+#define SUPPORT_ALTIVEC     0x0004
+#define SUPPORT_SSE         0x0008
+#define SUPPORT_SSE2        0x0010
+
+/// Checks which instruction set extensions are supported by the CPU.
+///
+/// \return A bitmask of supported extensions, see SUPPORT_... defines.
+uint detectCPUextensions(void);
+
+/// Disables given set of instruction extensions. See SUPPORT_... defines.
+void disableExtensions(uint wDisableMask);
+
+#endif  // _CPU_DETECT_H_
diff --git a/Externals/soundtouch/cpu_detect_x86.cpp b/Externals/soundtouch/cpu_detect_x86.cpp
index 1103adab57..dff64d0b14 100644
--- a/Externals/soundtouch/cpu_detect_x86.cpp
+++ b/Externals/soundtouch/cpu_detect_x86.cpp
@@ -1,137 +1,137 @@
-////////////////////////////////////////////////////////////////////////////////
-///
-/// Generic version of the x86 CPU extension detection routine.
-///
-/// This file is for GNU & other non-Windows compilers, see 'cpu_detect_x86_win.cpp' 
-/// for the Microsoft compiler version.
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2012-11-08 20:44:37 +0200 (Thu, 08 Nov 2012) $
-// File revision : $Revision: 4 $
-//
-// $Id: cpu_detect_x86.cpp 159 2012-11-08 18:44:37Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include "cpu_detect.h"
-#include "STTypes.h"
-
-#if defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS)
-
-    #if defined(__GNUC__) && defined(__i386__)
-        // gcc
-        #include "cpuid.h"
-    #elif defined(_M_IX86)
-        // windows non-gcc
-        #include <intrin.h>
-    #endif
-
-	#define bit_MMX     (1 << 23)
-	#define bit_SSE     (1 << 25)
-	#define bit_SSE2    (1 << 26)
-#endif
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// processor instructions extension detection routines
-//
-//////////////////////////////////////////////////////////////////////////////
-
-// Flag variable indicating whick ISA extensions are disabled (for debugging)
-static uint _dwDisabledISA = 0x00;      // 0xffffffff; //<- use this to disable all extensions
-
-// Disables given set of instruction extensions. See SUPPORT_... defines.
-void disableExtensions(uint dwDisableMask)
-{
-    _dwDisabledISA = dwDisableMask;
-}
-
-
-
-/// Checks which instruction set extensions are supported by the CPU.
-uint detectCPUextensions(void)
-{
-/// If building for a 64bit system (no Itanium) and the user wants optimizations.
-/// Return the OR of SUPPORT_{MMX,SSE,SSE2}. 11001 or 0x19.
-/// Keep the _dwDisabledISA test (2 more operations, could be eliminated).
-#if ((defined(__GNUC__) && defined(__x86_64__)) \
-    || defined(_M_X64))  \
-    && defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS)
-    return 0x19 & ~_dwDisabledISA;
-
-/// If building for a 32bit system and the user wants optimizations.
-/// Keep the _dwDisabledISA test (2 more operations, could be eliminated).
-#elif ((defined(__GNUC__) && defined(__i386__)) \
-    || defined(_M_IX86))  \
-    && defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS)
-
-    if (_dwDisabledISA == 0xffffffff) return 0;
- 
-    uint res = 0;
- 
-#if defined(__GNUC__)
-    // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support.
-    uint eax, ebx, ecx, edx;  // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable.
-
-    // Check if no cpuid support.
-    if (!__get_cpuid (1, &eax, &ebx, &ecx, &edx)) return 0; // always disable extensions.
-
-    if (edx & bit_MMX)  res = res | SUPPORT_MMX;
-    if (edx & bit_SSE)  res = res | SUPPORT_SSE;
-    if (edx & bit_SSE2) res = res | SUPPORT_SSE2;
-
-#else
-    // Window / VS version of cpuid. Notice that Visual Studio 2005 or later required 
-    // for __cpuid intrinsic support.
-    int reg[4] = {-1};
-
-    // Check if no cpuid support.
-    __cpuid(reg,0);
-    if ((unsigned int)reg[0] == 0) return 0; // always disable extensions.
-
-    __cpuid(reg,1);
-    if ((unsigned int)reg[3] & bit_MMX)  res = res | SUPPORT_MMX;
-    if ((unsigned int)reg[3] & bit_SSE)  res = res | SUPPORT_SSE;
-    if ((unsigned int)reg[3] & bit_SSE2) res = res | SUPPORT_SSE2;
-
-#endif
-
-    return res & ~_dwDisabledISA;
-
-#else
-
-/// One of these is true:
-/// 1) We don't want optimizations.
-/// 2) Using an unsupported compiler.
-/// 3) Running on a non-x86 platform.
-    return 0;
-
-#endif
-}
+////////////////////////////////////////////////////////////////////////////////
+///
+/// Generic version of the x86 CPU extension detection routine.
+///
+/// This file is for GNU & other non-Windows compilers, see 'cpu_detect_x86_win.cpp' 
+/// for the Microsoft compiler version.
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2012-11-08 18:44:37 +0000 (Thu, 08 Nov 2012) $
+// File revision : $Revision: 4 $
+//
+// $Id: cpu_detect_x86.cpp 159 2012-11-08 18:44:37Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include "cpu_detect.h"
+#include "STTypes.h"
+
+#if defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS)
+
+    #if defined(__GNUC__) && defined(__i386__)
+        // gcc
+        #include "cpuid.h"
+    #elif defined(_M_IX86)
+        // windows non-gcc
+        #include <intrin.h>
+        #define bit_MMX     (1 << 23)
+        #define bit_SSE     (1 << 25)
+        #define bit_SSE2    (1 << 26)
+    #endif
+
+#endif
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// processor instructions extension detection routines
+//
+//////////////////////////////////////////////////////////////////////////////
+
+// Flag variable indicating whick ISA extensions are disabled (for debugging)
+static uint _dwDisabledISA = 0x00;      // 0xffffffff; //<- use this to disable all extensions
+
+// Disables given set of instruction extensions. See SUPPORT_... defines.
+void disableExtensions(uint dwDisableMask)
+{
+    _dwDisabledISA = dwDisableMask;
+}
+
+
+
+/// Checks which instruction set extensions are supported by the CPU.
+uint detectCPUextensions(void)
+{
+/// If building for a 64bit system (no Itanium) and the user wants optimizations.
+/// Return the OR of SUPPORT_{MMX,SSE,SSE2}. 11001 or 0x19.
+/// Keep the _dwDisabledISA test (2 more operations, could be eliminated).
+#if ((defined(__GNUC__) && defined(__x86_64__)) \
+    || defined(_M_X64))  \
+    && defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS)
+    return 0x19 & ~_dwDisabledISA;
+
+/// If building for a 32bit system and the user wants optimizations.
+/// Keep the _dwDisabledISA test (2 more operations, could be eliminated).
+#elif ((defined(__GNUC__) && defined(__i386__)) \
+    || defined(_M_IX86))  \
+    && defined(SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS)
+
+    if (_dwDisabledISA == 0xffffffff) return 0;
+ 
+    uint res = 0;
+ 
+#if defined(__GNUC__)
+    // GCC version of cpuid. Requires GCC 4.3.0 or later for __cpuid intrinsic support.
+    uint eax, ebx, ecx, edx;  // unsigned int is the standard type. uint is defined by the compiler and not guaranteed to be portable.
+
+    // Check if no cpuid support.
+    if (!__get_cpuid (1, &eax, &ebx, &ecx, &edx)) return 0; // always disable extensions.
+
+    if (edx & bit_MMX)  res = res | SUPPORT_MMX;
+    if (edx & bit_SSE)  res = res | SUPPORT_SSE;
+    if (edx & bit_SSE2) res = res | SUPPORT_SSE2;
+
+#else
+    // Window / VS version of cpuid. Notice that Visual Studio 2005 or later required 
+    // for __cpuid intrinsic support.
+    int reg[4] = {-1};
+
+    // Check if no cpuid support.
+    __cpuid(reg,0);
+    if ((unsigned int)reg[0] == 0) return 0; // always disable extensions.
+
+    __cpuid(reg,1);
+    if ((unsigned int)reg[3] & bit_MMX)  res = res | SUPPORT_MMX;
+    if ((unsigned int)reg[3] & bit_SSE)  res = res | SUPPORT_SSE;
+    if ((unsigned int)reg[3] & bit_SSE2) res = res | SUPPORT_SSE2;
+
+#endif
+
+    return res & ~_dwDisabledISA;
+
+#else
+
+/// One of these is true:
+/// 1) We don't want optimizations.
+/// 2) Using an unsupported compiler.
+/// 3) Running on a non-x86 platform.
+    return 0;
+
+#endif
+}
diff --git a/Externals/soundtouch/mmx_optimized.cpp b/Externals/soundtouch/mmx_optimized.cpp
index 0952fd4f84..9b1fc1a41d 100644
--- a/Externals/soundtouch/mmx_optimized.cpp
+++ b/Externals/soundtouch/mmx_optimized.cpp
@@ -1,317 +1,317 @@
-////////////////////////////////////////////////////////////////////////////////
-///
-/// MMX optimized routines. All MMX optimized functions have been gathered into 
-/// this single source code file, regardless to their class or original source 
-/// code file, in order to ease porting the library to other compiler and 
-/// processor platforms.
-///
-/// The MMX-optimizations are programmed using MMX compiler intrinsics that
-/// are supported both by Microsoft Visual C++ and GCC compilers, so this file
-/// should compile with both toolsets.
-///
-/// NOTICE: If using Visual Studio 6.0, you'll need to install the "Visual C++ 
-/// 6.0 processor pack" update to support compiler intrinsic syntax. The update
-/// is available for download at Microsoft Developers Network, see here:
-/// http://msdn.microsoft.com/en-us/vstudio/aa718349.aspx
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2012-11-08 20:53:01 +0200 (Thu, 08 Nov 2012) $
-// File revision : $Revision: 4 $
-//
-// $Id: mmx_optimized.cpp 160 2012-11-08 18:53:01Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include "STTypes.h"
-
-#ifdef SOUNDTOUCH_ALLOW_MMX
-// MMX routines available only with integer sample type
-
-using namespace soundtouch;
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// implementation of MMX optimized functions of class 'TDStretchMMX'
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "TDStretch.h"
-#include <mmintrin.h>
-#include <limits.h>
-#include <math.h>
-
-
-// Calculates cross correlation of two buffers
-double TDStretchMMX::calcCrossCorr(const short *pV1, const short *pV2) const
-{
-    const __m64 *pVec1, *pVec2;
-    __m64 shifter;
-    __m64 accu, normaccu;
-    long corr, norm;
-    int i;
-   
-    pVec1 = (__m64*)pV1;
-    pVec2 = (__m64*)pV2;
-
-    shifter = _m_from_int(overlapDividerBits);
-    normaccu = accu = _mm_setzero_si64();
-
-    // Process 4 parallel sets of 2 * stereo samples or 4 * mono samples 
-    // during each round for improved CPU-level parallellization.
-    for (i = 0; i < channels * overlapLength / 16; i ++)
-    {
-        __m64 temp, temp2;
-
-        // dictionary of instructions:
-        // _m_pmaddwd   : 4*16bit multiply-add, resulting two 32bits = [a0*b0+a1*b1 ; a2*b2+a3*b3]
-        // _mm_add_pi32 : 2*32bit add
-        // _m_psrad     : 32bit right-shift
-
-        temp = _mm_add_pi32(_mm_madd_pi16(pVec1[0], pVec2[0]),
-                            _mm_madd_pi16(pVec1[1], pVec2[1]));
-        temp2 = _mm_add_pi32(_mm_madd_pi16(pVec1[0], pVec1[0]),
-                             _mm_madd_pi16(pVec1[1], pVec1[1]));
-        accu = _mm_add_pi32(accu, _mm_sra_pi32(temp, shifter));
-        normaccu = _mm_add_pi32(normaccu, _mm_sra_pi32(temp2, shifter));
-
-        temp = _mm_add_pi32(_mm_madd_pi16(pVec1[2], pVec2[2]),
-                            _mm_madd_pi16(pVec1[3], pVec2[3]));
-        temp2 = _mm_add_pi32(_mm_madd_pi16(pVec1[2], pVec1[2]),
-                             _mm_madd_pi16(pVec1[3], pVec1[3]));
-        accu = _mm_add_pi32(accu, _mm_sra_pi32(temp, shifter));
-        normaccu = _mm_add_pi32(normaccu, _mm_sra_pi32(temp2, shifter));
-
-        pVec1 += 4;
-        pVec2 += 4;
-    }
-
-    // copy hi-dword of mm0 to lo-dword of mm1, then sum mmo+mm1
-    // and finally store the result into the variable "corr"
-
-    accu = _mm_add_pi32(accu, _mm_srli_si64(accu, 32));
-    corr = _m_to_int(accu);
-
-    normaccu = _mm_add_pi32(normaccu, _mm_srli_si64(normaccu, 32));
-    norm = _m_to_int(normaccu);
-
-    // Clear MMS state
-    _m_empty();
-
-    // Normalize result by dividing by sqrt(norm) - this step is easiest 
-    // done using floating point operation
-    if (norm == 0) norm = 1;    // to avoid div by zero
-
-    return (double)corr / sqrt((double)norm);
-    // Note: Warning about the missing EMMS instruction is harmless
-    // as it'll be called elsewhere.
-}
-
-
-
-void TDStretchMMX::clearCrossCorrState()
-{
-    // Clear MMS state
-    _m_empty();
-    //_asm EMMS;
-}
-
-
-
-// MMX-optimized version of the function overlapStereo
-void TDStretchMMX::overlapStereo(short *output, const short *input) const
-{
-    const __m64 *pVinput, *pVMidBuf;
-    __m64 *pVdest;
-    __m64 mix1, mix2, adder, shifter;
-    int i;
-
-    pVinput  = (const __m64*)input;
-    pVMidBuf = (const __m64*)pMidBuffer;
-    pVdest   = (__m64*)output;
-
-    // mix1  = mixer values for 1st stereo sample
-    // mix1  = mixer values for 2nd stereo sample
-    // adder = adder for updating mixer values after each round
-    
-    mix1  = _mm_set_pi16(0, overlapLength,   0, overlapLength);
-    adder = _mm_set_pi16(1, -1, 1, -1);
-    mix2  = _mm_add_pi16(mix1, adder);
-    adder = _mm_add_pi16(adder, adder);
-
-    // Overlaplength-division by shifter. "+1" is to account for "-1" deduced in
-    // overlapDividerBits calculation earlier.
-    shifter = _m_from_int(overlapDividerBits + 1);
-
-    for (i = 0; i < overlapLength / 4; i ++)
-    {
-        __m64 temp1, temp2;
-                
-        // load & shuffle data so that input & mixbuffer data samples are paired
-        temp1 = _mm_unpacklo_pi16(pVMidBuf[0], pVinput[0]);     // = i0l m0l i0r m0r
-        temp2 = _mm_unpackhi_pi16(pVMidBuf[0], pVinput[0]);     // = i1l m1l i1r m1r
-
-        // temp = (temp .* mix) >> shifter
-        temp1 = _mm_sra_pi32(_mm_madd_pi16(temp1, mix1), shifter);
-        temp2 = _mm_sra_pi32(_mm_madd_pi16(temp2, mix2), shifter);
-        pVdest[0] = _mm_packs_pi32(temp1, temp2); // pack 2*2*32bit => 4*16bit
-
-        // update mix += adder
-        mix1 = _mm_add_pi16(mix1, adder);
-        mix2 = _mm_add_pi16(mix2, adder);
-
-        // --- second round begins here ---
-
-        // load & shuffle data so that input & mixbuffer data samples are paired
-        temp1 = _mm_unpacklo_pi16(pVMidBuf[1], pVinput[1]);       // = i2l m2l i2r m2r
-        temp2 = _mm_unpackhi_pi16(pVMidBuf[1], pVinput[1]);       // = i3l m3l i3r m3r
-
-        // temp = (temp .* mix) >> shifter
-        temp1 = _mm_sra_pi32(_mm_madd_pi16(temp1, mix1), shifter);
-        temp2 = _mm_sra_pi32(_mm_madd_pi16(temp2, mix2), shifter);
-        pVdest[1] = _mm_packs_pi32(temp1, temp2); // pack 2*2*32bit => 4*16bit
-
-        // update mix += adder
-        mix1 = _mm_add_pi16(mix1, adder);
-        mix2 = _mm_add_pi16(mix2, adder);
-
-        pVinput  += 2;
-        pVMidBuf += 2;
-        pVdest   += 2;
-    }
-
-    _m_empty(); // clear MMS state
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// implementation of MMX optimized functions of class 'FIRFilter'
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "FIRFilter.h"
-
-
-FIRFilterMMX::FIRFilterMMX() : FIRFilter()
-{
-    filterCoeffsUnalign = NULL;
-}
-
-
-FIRFilterMMX::~FIRFilterMMX()
-{
-    delete[] filterCoeffsUnalign;
-}
-
-
-// (overloaded) Calculates filter coefficients for MMX routine
-void FIRFilterMMX::setCoefficients(const short *coeffs, uint newLength, uint uResultDivFactor)
-{
-    uint i;
-    FIRFilter::setCoefficients(coeffs, newLength, uResultDivFactor);
-
-    // Ensure that filter coeffs array is aligned to 16-byte boundary
-    delete[] filterCoeffsUnalign;
-    filterCoeffsUnalign = new short[2 * newLength + 8];
-    filterCoeffsAlign = (short *)SOUNDTOUCH_ALIGN_POINTER_16(filterCoeffsUnalign);
-
-    // rearrange the filter coefficients for mmx routines 
-    for (i = 0;i < length; i += 4) 
-    {
-        filterCoeffsAlign[2 * i + 0] = coeffs[i + 0];
-        filterCoeffsAlign[2 * i + 1] = coeffs[i + 2];
-        filterCoeffsAlign[2 * i + 2] = coeffs[i + 0];
-        filterCoeffsAlign[2 * i + 3] = coeffs[i + 2];
-
-        filterCoeffsAlign[2 * i + 4] = coeffs[i + 1];
-        filterCoeffsAlign[2 * i + 5] = coeffs[i + 3];
-        filterCoeffsAlign[2 * i + 6] = coeffs[i + 1];
-        filterCoeffsAlign[2 * i + 7] = coeffs[i + 3];
-    }
-}
-
-
-
-// mmx-optimized version of the filter routine for stereo sound
-uint FIRFilterMMX::evaluateFilterStereo(short *dest, const short *src, uint numSamples) const
-{
-    // Create stack copies of the needed member variables for asm routines :
-    uint i, j;
-    __m64 *pVdest = (__m64*)dest;
-
-    if (length < 2) return 0;
-
-    for (i = 0; i < (numSamples - length) / 2; i ++)
-    {
-        __m64 accu1;
-        __m64 accu2;
-        const __m64 *pVsrc = (const __m64*)src;
-        const __m64 *pVfilter = (const __m64*)filterCoeffsAlign;
-
-        accu1 = accu2 = _mm_setzero_si64();
-        for (j = 0; j < lengthDiv8 * 2; j ++)
-        {
-            __m64 temp1, temp2;
-
-            temp1 = _mm_unpacklo_pi16(pVsrc[0], pVsrc[1]);  // = l2 l0 r2 r0
-            temp2 = _mm_unpackhi_pi16(pVsrc[0], pVsrc[1]);  // = l3 l1 r3 r1
-
-            accu1 = _mm_add_pi32(accu1, _mm_madd_pi16(temp1, pVfilter[0]));  // += l2*f2+l0*f0 r2*f2+r0*f0
-            accu1 = _mm_add_pi32(accu1, _mm_madd_pi16(temp2, pVfilter[1]));  // += l3*f3+l1*f1 r3*f3+r1*f1
-
-            temp1 = _mm_unpacklo_pi16(pVsrc[1], pVsrc[2]);  // = l4 l2 r4 r2
-
-            accu2 = _mm_add_pi32(accu2, _mm_madd_pi16(temp2, pVfilter[0]));  // += l3*f2+l1*f0 r3*f2+r1*f0
-            accu2 = _mm_add_pi32(accu2, _mm_madd_pi16(temp1, pVfilter[1]));  // += l4*f3+l2*f1 r4*f3+r2*f1
-
-            // accu1 += l2*f2+l0*f0 r2*f2+r0*f0
-            //       += l3*f3+l1*f1 r3*f3+r1*f1
-
-            // accu2 += l3*f2+l1*f0 r3*f2+r1*f0
-            //          l4*f3+l2*f1 r4*f3+r2*f1
-
-            pVfilter += 2;
-            pVsrc += 2;
-        }
-        // accu >>= resultDivFactor
-        accu1 = _mm_srai_pi32(accu1, resultDivFactor);
-        accu2 = _mm_srai_pi32(accu2, resultDivFactor);
-
-        // pack 2*2*32bits => 4*16 bits
-        pVdest[0] = _mm_packs_pi32(accu1, accu2);
-        src += 4;
-        pVdest ++;
-    }
-
-   _m_empty();  // clear emms state
-
-    return (numSamples & 0xfffffffe) - length;
-}
-
-#endif  // SOUNDTOUCH_ALLOW_MMX
+////////////////////////////////////////////////////////////////////////////////
+///
+/// MMX optimized routines. All MMX optimized functions have been gathered into 
+/// this single source code file, regardless to their class or original source 
+/// code file, in order to ease porting the library to other compiler and 
+/// processor platforms.
+///
+/// The MMX-optimizations are programmed using MMX compiler intrinsics that
+/// are supported both by Microsoft Visual C++ and GCC compilers, so this file
+/// should compile with both toolsets.
+///
+/// NOTICE: If using Visual Studio 6.0, you'll need to install the "Visual C++ 
+/// 6.0 processor pack" update to support compiler intrinsic syntax. The update
+/// is available for download at Microsoft Developers Network, see here:
+/// http://msdn.microsoft.com/en-us/vstudio/aa718349.aspx
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2012-11-08 18:53:01 +0000 (Thu, 08 Nov 2012) $
+// File revision : $Revision: 4 $
+//
+// $Id: mmx_optimized.cpp 160 2012-11-08 18:53:01Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include "STTypes.h"
+
+#ifdef SOUNDTOUCH_ALLOW_MMX
+// MMX routines available only with integer sample type
+
+using namespace soundtouch;
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// implementation of MMX optimized functions of class 'TDStretchMMX'
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#include "TDStretch.h"
+#include <mmintrin.h>
+#include <limits.h>
+#include <math.h>
+
+
+// Calculates cross correlation of two buffers
+double TDStretchMMX::calcCrossCorr(const short *pV1, const short *pV2) const
+{
+    const __m64 *pVec1, *pVec2;
+    __m64 shifter;
+    __m64 accu, normaccu;
+    long corr, norm;
+    int i;
+   
+    pVec1 = (__m64*)pV1;
+    pVec2 = (__m64*)pV2;
+
+    shifter = _m_from_int(overlapDividerBits);
+    normaccu = accu = _mm_setzero_si64();
+
+    // Process 4 parallel sets of 2 * stereo samples or 4 * mono samples 
+    // during each round for improved CPU-level parallellization.
+    for (i = 0; i < channels * overlapLength / 16; i ++)
+    {
+        __m64 temp, temp2;
+
+        // dictionary of instructions:
+        // _m_pmaddwd   : 4*16bit multiply-add, resulting two 32bits = [a0*b0+a1*b1 ; a2*b2+a3*b3]
+        // _mm_add_pi32 : 2*32bit add
+        // _m_psrad     : 32bit right-shift
+
+        temp = _mm_add_pi32(_mm_madd_pi16(pVec1[0], pVec2[0]),
+                            _mm_madd_pi16(pVec1[1], pVec2[1]));
+        temp2 = _mm_add_pi32(_mm_madd_pi16(pVec1[0], pVec1[0]),
+                             _mm_madd_pi16(pVec1[1], pVec1[1]));
+        accu = _mm_add_pi32(accu, _mm_sra_pi32(temp, shifter));
+        normaccu = _mm_add_pi32(normaccu, _mm_sra_pi32(temp2, shifter));
+
+        temp = _mm_add_pi32(_mm_madd_pi16(pVec1[2], pVec2[2]),
+                            _mm_madd_pi16(pVec1[3], pVec2[3]));
+        temp2 = _mm_add_pi32(_mm_madd_pi16(pVec1[2], pVec1[2]),
+                             _mm_madd_pi16(pVec1[3], pVec1[3]));
+        accu = _mm_add_pi32(accu, _mm_sra_pi32(temp, shifter));
+        normaccu = _mm_add_pi32(normaccu, _mm_sra_pi32(temp2, shifter));
+
+        pVec1 += 4;
+        pVec2 += 4;
+    }
+
+    // copy hi-dword of mm0 to lo-dword of mm1, then sum mmo+mm1
+    // and finally store the result into the variable "corr"
+
+    accu = _mm_add_pi32(accu, _mm_srli_si64(accu, 32));
+    corr = _m_to_int(accu);
+
+    normaccu = _mm_add_pi32(normaccu, _mm_srli_si64(normaccu, 32));
+    norm = _m_to_int(normaccu);
+
+    // Clear MMS state
+    _m_empty();
+
+    // Normalize result by dividing by sqrt(norm) - this step is easiest 
+    // done using floating point operation
+    if (norm == 0) norm = 1;    // to avoid div by zero
+
+    return (double)corr / sqrt((double)norm);
+    // Note: Warning about the missing EMMS instruction is harmless
+    // as it'll be called elsewhere.
+}
+
+
+
+void TDStretchMMX::clearCrossCorrState()
+{
+    // Clear MMS state
+    _m_empty();
+    //_asm EMMS;
+}
+
+
+
+// MMX-optimized version of the function overlapStereo
+void TDStretchMMX::overlapStereo(short *output, const short *input) const
+{
+    const __m64 *pVinput, *pVMidBuf;
+    __m64 *pVdest;
+    __m64 mix1, mix2, adder, shifter;
+    int i;
+
+    pVinput  = (const __m64*)input;
+    pVMidBuf = (const __m64*)pMidBuffer;
+    pVdest   = (__m64*)output;
+
+    // mix1  = mixer values for 1st stereo sample
+    // mix1  = mixer values for 2nd stereo sample
+    // adder = adder for updating mixer values after each round
+    
+    mix1  = _mm_set_pi16(0, overlapLength,   0, overlapLength);
+    adder = _mm_set_pi16(1, -1, 1, -1);
+    mix2  = _mm_add_pi16(mix1, adder);
+    adder = _mm_add_pi16(adder, adder);
+
+    // Overlaplength-division by shifter. "+1" is to account for "-1" deduced in
+    // overlapDividerBits calculation earlier.
+    shifter = _m_from_int(overlapDividerBits + 1);
+
+    for (i = 0; i < overlapLength / 4; i ++)
+    {
+        __m64 temp1, temp2;
+                
+        // load & shuffle data so that input & mixbuffer data samples are paired
+        temp1 = _mm_unpacklo_pi16(pVMidBuf[0], pVinput[0]);     // = i0l m0l i0r m0r
+        temp2 = _mm_unpackhi_pi16(pVMidBuf[0], pVinput[0]);     // = i1l m1l i1r m1r
+
+        // temp = (temp .* mix) >> shifter
+        temp1 = _mm_sra_pi32(_mm_madd_pi16(temp1, mix1), shifter);
+        temp2 = _mm_sra_pi32(_mm_madd_pi16(temp2, mix2), shifter);
+        pVdest[0] = _mm_packs_pi32(temp1, temp2); // pack 2*2*32bit => 4*16bit
+
+        // update mix += adder
+        mix1 = _mm_add_pi16(mix1, adder);
+        mix2 = _mm_add_pi16(mix2, adder);
+
+        // --- second round begins here ---
+
+        // load & shuffle data so that input & mixbuffer data samples are paired
+        temp1 = _mm_unpacklo_pi16(pVMidBuf[1], pVinput[1]);       // = i2l m2l i2r m2r
+        temp2 = _mm_unpackhi_pi16(pVMidBuf[1], pVinput[1]);       // = i3l m3l i3r m3r
+
+        // temp = (temp .* mix) >> shifter
+        temp1 = _mm_sra_pi32(_mm_madd_pi16(temp1, mix1), shifter);
+        temp2 = _mm_sra_pi32(_mm_madd_pi16(temp2, mix2), shifter);
+        pVdest[1] = _mm_packs_pi32(temp1, temp2); // pack 2*2*32bit => 4*16bit
+
+        // update mix += adder
+        mix1 = _mm_add_pi16(mix1, adder);
+        mix2 = _mm_add_pi16(mix2, adder);
+
+        pVinput  += 2;
+        pVMidBuf += 2;
+        pVdest   += 2;
+    }
+
+    _m_empty(); // clear MMS state
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// implementation of MMX optimized functions of class 'FIRFilter'
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#include "FIRFilter.h"
+
+
+FIRFilterMMX::FIRFilterMMX() : FIRFilter()
+{
+    filterCoeffsUnalign = NULL;
+}
+
+
+FIRFilterMMX::~FIRFilterMMX()
+{
+    delete[] filterCoeffsUnalign;
+}
+
+
+// (overloaded) Calculates filter coefficients for MMX routine
+void FIRFilterMMX::setCoefficients(const short *coeffs, uint newLength, uint uResultDivFactor)
+{
+    uint i;
+    FIRFilter::setCoefficients(coeffs, newLength, uResultDivFactor);
+
+    // Ensure that filter coeffs array is aligned to 16-byte boundary
+    delete[] filterCoeffsUnalign;
+    filterCoeffsUnalign = new short[2 * newLength + 8];
+    filterCoeffsAlign = (short *)SOUNDTOUCH_ALIGN_POINTER_16(filterCoeffsUnalign);
+
+    // rearrange the filter coefficients for mmx routines 
+    for (i = 0;i < length; i += 4) 
+    {
+        filterCoeffsAlign[2 * i + 0] = coeffs[i + 0];
+        filterCoeffsAlign[2 * i + 1] = coeffs[i + 2];
+        filterCoeffsAlign[2 * i + 2] = coeffs[i + 0];
+        filterCoeffsAlign[2 * i + 3] = coeffs[i + 2];
+
+        filterCoeffsAlign[2 * i + 4] = coeffs[i + 1];
+        filterCoeffsAlign[2 * i + 5] = coeffs[i + 3];
+        filterCoeffsAlign[2 * i + 6] = coeffs[i + 1];
+        filterCoeffsAlign[2 * i + 7] = coeffs[i + 3];
+    }
+}
+
+
+
+// mmx-optimized version of the filter routine for stereo sound
+uint FIRFilterMMX::evaluateFilterStereo(short *dest, const short *src, uint numSamples) const
+{
+    // Create stack copies of the needed member variables for asm routines :
+    uint i, j;
+    __m64 *pVdest = (__m64*)dest;
+
+    if (length < 2) return 0;
+
+    for (i = 0; i < (numSamples - length) / 2; i ++)
+    {
+        __m64 accu1;
+        __m64 accu2;
+        const __m64 *pVsrc = (const __m64*)src;
+        const __m64 *pVfilter = (const __m64*)filterCoeffsAlign;
+
+        accu1 = accu2 = _mm_setzero_si64();
+        for (j = 0; j < lengthDiv8 * 2; j ++)
+        {
+            __m64 temp1, temp2;
+
+            temp1 = _mm_unpacklo_pi16(pVsrc[0], pVsrc[1]);  // = l2 l0 r2 r0
+            temp2 = _mm_unpackhi_pi16(pVsrc[0], pVsrc[1]);  // = l3 l1 r3 r1
+
+            accu1 = _mm_add_pi32(accu1, _mm_madd_pi16(temp1, pVfilter[0]));  // += l2*f2+l0*f0 r2*f2+r0*f0
+            accu1 = _mm_add_pi32(accu1, _mm_madd_pi16(temp2, pVfilter[1]));  // += l3*f3+l1*f1 r3*f3+r1*f1
+
+            temp1 = _mm_unpacklo_pi16(pVsrc[1], pVsrc[2]);  // = l4 l2 r4 r2
+
+            accu2 = _mm_add_pi32(accu2, _mm_madd_pi16(temp2, pVfilter[0]));  // += l3*f2+l1*f0 r3*f2+r1*f0
+            accu2 = _mm_add_pi32(accu2, _mm_madd_pi16(temp1, pVfilter[1]));  // += l4*f3+l2*f1 r4*f3+r2*f1
+
+            // accu1 += l2*f2+l0*f0 r2*f2+r0*f0
+            //       += l3*f3+l1*f1 r3*f3+r1*f1
+
+            // accu2 += l3*f2+l1*f0 r3*f2+r1*f0
+            //          l4*f3+l2*f1 r4*f3+r2*f1
+
+            pVfilter += 2;
+            pVsrc += 2;
+        }
+        // accu >>= resultDivFactor
+        accu1 = _mm_srai_pi32(accu1, resultDivFactor);
+        accu2 = _mm_srai_pi32(accu2, resultDivFactor);
+
+        // pack 2*2*32bits => 4*16 bits
+        pVdest[0] = _mm_packs_pi32(accu1, accu2);
+        src += 4;
+        pVdest ++;
+    }
+
+   _m_empty();  // clear emms state
+
+    return (numSamples & 0xfffffffe) - length;
+}
+
+#endif  // SOUNDTOUCH_ALLOW_MMX
diff --git a/Externals/soundtouch/sse_optimized.cpp b/Externals/soundtouch/sse_optimized.cpp
index ffb6706288..f77ea02dd3 100644
--- a/Externals/soundtouch/sse_optimized.cpp
+++ b/Externals/soundtouch/sse_optimized.cpp
@@ -1,361 +1,361 @@
-////////////////////////////////////////////////////////////////////////////////
-///
-/// SSE optimized routines for Pentium-III, Athlon-XP and later CPUs. All SSE 
-/// optimized functions have been gathered into this single source 
-/// code file, regardless to their class or original source code file, in order 
-/// to ease porting the library to other compiler and processor platforms.
-///
-/// The SSE-optimizations are programmed using SSE compiler intrinsics that
-/// are supported both by Microsoft Visual C++ and GCC compilers, so this file
-/// should compile with both toolsets.
-///
-/// NOTICE: If using Visual Studio 6.0, you'll need to install the "Visual C++ 
-/// 6.0 processor pack" update to support SSE instruction set. The update is 
-/// available for download at Microsoft Developers Network, see here:
-/// http://msdn.microsoft.com/en-us/vstudio/aa718349.aspx
-///
-/// If the above URL is expired or removed, go to "http://msdn.microsoft.com" and 
-/// perform a search with keywords "processor pack".
-///
-/// Author        : Copyright (c) Olli Parviainen
-/// Author e-mail : oparviai 'at' iki.fi
-/// SoundTouch WWW: http://www.surina.net/soundtouch
-///
-////////////////////////////////////////////////////////////////////////////////
-//
-// Last changed  : $Date: 2012-11-08 20:53:01 +0200 (Thu, 08 Nov 2012) $
-// File revision : $Revision: 4 $
-//
-// $Id: sse_optimized.cpp 160 2012-11-08 18:53:01Z oparviai $
-//
-////////////////////////////////////////////////////////////////////////////////
-//
-// License :
-//
-//  SoundTouch audio processing library
-//  Copyright (c) Olli Parviainen
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License, or (at your option) any later version.
-//
-//  This library 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
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include "cpu_detect.h"
-#include "STTypes.h"
-
-using namespace soundtouch;
-
-#ifdef SOUNDTOUCH_ALLOW_SSE
-
-// SSE routines available only with float sample type    
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// implementation of SSE optimized functions of class 'TDStretchSSE'
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "TDStretch.h"
-#include <xmmintrin.h>
-#include <math.h>
-
-// Calculates cross correlation of two buffers
-double TDStretchSSE::calcCrossCorr(const float *pV1, const float *pV2) const
-{
-    int i;
-    const float *pVec1;
-    const __m128 *pVec2;
-    __m128 vSum, vNorm;
-
-    // Note. It means a major slow-down if the routine needs to tolerate 
-    // unaligned __m128 memory accesses. It's way faster if we can skip 
-    // unaligned slots and use _mm_load_ps instruction instead of _mm_loadu_ps.
-    // This can mean up to ~ 10-fold difference (incl. part of which is
-    // due to skipping every second round for stereo sound though).
-    //
-    // Compile-time define SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION is provided
-    // for choosing if this little cheating is allowed.
-
-#ifdef SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION
-    // Little cheating allowed, return valid correlation only for 
-    // aligned locations, meaning every second round for stereo sound.
-
-    #define _MM_LOAD    _mm_load_ps
-
-    if (((ulongptr)pV1) & 15) return -1e50;    // skip unaligned locations
-
-#else
-    // No cheating allowed, use unaligned load & take the resulting
-    // performance hit.
-    #define _MM_LOAD    _mm_loadu_ps
-#endif 
-
-    // ensure overlapLength is divisible by 8
-    assert((overlapLength % 8) == 0);
-
-    // Calculates the cross-correlation value between 'pV1' and 'pV2' vectors
-    // Note: pV2 _must_ be aligned to 16-bit boundary, pV1 need not.
-    pVec1 = (const float*)pV1;
-    pVec2 = (const __m128*)pV2;
-    vSum = vNorm = _mm_setzero_ps();
-
-    // Unroll the loop by factor of 4 * 4 operations. Use same routine for
-    // stereo & mono, for mono it just means twice the amount of unrolling.
-    for (i = 0; i < channels * overlapLength / 16; i ++) 
-    {
-        __m128 vTemp;
-        // vSum += pV1[0..3] * pV2[0..3]
-        vTemp = _MM_LOAD(pVec1);
-        vSum  = _mm_add_ps(vSum,  _mm_mul_ps(vTemp ,pVec2[0]));
-        vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp));
-
-        // vSum += pV1[4..7] * pV2[4..7]
-        vTemp = _MM_LOAD(pVec1 + 4);
-        vSum  = _mm_add_ps(vSum, _mm_mul_ps(vTemp, pVec2[1]));
-        vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp));
-
-        // vSum += pV1[8..11] * pV2[8..11]
-        vTemp = _MM_LOAD(pVec1 + 8);
-        vSum  = _mm_add_ps(vSum, _mm_mul_ps(vTemp, pVec2[2]));
-        vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp));
-
-        // vSum += pV1[12..15] * pV2[12..15]
-        vTemp = _MM_LOAD(pVec1 + 12);
-        vSum  = _mm_add_ps(vSum, _mm_mul_ps(vTemp, pVec2[3]));
-        vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp));
-
-        pVec1 += 16;
-        pVec2 += 4;
-    }
-
-    // return value = vSum[0] + vSum[1] + vSum[2] + vSum[3]
-    float *pvNorm = (float*)&vNorm;
-    double norm = sqrt(pvNorm[0] + pvNorm[1] + pvNorm[2] + pvNorm[3]);
-    if (norm < 1e-9) norm = 1.0;    // to avoid div by zero
-
-    float *pvSum = (float*)&vSum;
-    return (double)(pvSum[0] + pvSum[1] + pvSum[2] + pvSum[3]) / norm;
-
-    /* This is approximately corresponding routine in C-language yet without normalization:
-    double corr, norm;
-    uint i;
-
-    // Calculates the cross-correlation value between 'pV1' and 'pV2' vectors
-    corr = norm = 0.0;
-    for (i = 0; i < channels * overlapLength / 16; i ++) 
-    {
-        corr += pV1[0] * pV2[0] +
-                pV1[1] * pV2[1] +
-                pV1[2] * pV2[2] +
-                pV1[3] * pV2[3] +
-                pV1[4] * pV2[4] +
-                pV1[5] * pV2[5] +
-                pV1[6] * pV2[6] +
-                pV1[7] * pV2[7] +
-                pV1[8] * pV2[8] +
-                pV1[9] * pV2[9] +
-                pV1[10] * pV2[10] +
-                pV1[11] * pV2[11] +
-                pV1[12] * pV2[12] +
-                pV1[13] * pV2[13] +
-                pV1[14] * pV2[14] +
-                pV1[15] * pV2[15];
-
-    for (j = 0; j < 15; j ++) norm += pV1[j] * pV1[j];
-
-        pV1 += 16;
-        pV2 += 16;
-    }
-    return corr / sqrt(norm);
-    */
-}
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// implementation of SSE optimized functions of class 'FIRFilter'
-//
-//////////////////////////////////////////////////////////////////////////////
-
-#include "FIRFilter.h"
-
-FIRFilterSSE::FIRFilterSSE() : FIRFilter()
-{
-    filterCoeffsAlign = NULL;
-    filterCoeffsUnalign = NULL;
-}
-
-
-FIRFilterSSE::~FIRFilterSSE()
-{
-    delete[] filterCoeffsUnalign;
-    filterCoeffsAlign = NULL;
-    filterCoeffsUnalign = NULL;
-}
-
-
-// (overloaded) Calculates filter coefficients for SSE routine
-void FIRFilterSSE::setCoefficients(const float *coeffs, uint newLength, uint uResultDivFactor)
-{
-    uint i;
-    float fDivider;
-
-    FIRFilter::setCoefficients(coeffs, newLength, uResultDivFactor);
-
-    // Scale the filter coefficients so that it won't be necessary to scale the filtering result
-    // also rearrange coefficients suitably for SSE
-    // Ensure that filter coeffs array is aligned to 16-byte boundary
-    delete[] filterCoeffsUnalign;
-    filterCoeffsUnalign = new float[2 * newLength + 4];
-    filterCoeffsAlign = (float *)SOUNDTOUCH_ALIGN_POINTER_16(filterCoeffsUnalign);
-
-    fDivider = (float)resultDivider;
-
-    // rearrange the filter coefficients for mmx routines 
-    for (i = 0; i < newLength; i ++)
-    {
-        filterCoeffsAlign[2 * i + 0] =
-        filterCoeffsAlign[2 * i + 1] = coeffs[i + 0] / fDivider;
-    }
-}
-
-
-
-// SSE-optimized version of the filter routine for stereo sound
-uint FIRFilterSSE::evaluateFilterStereo(float *dest, const float *source, uint numSamples) const
-{
-    int count = (int)((numSamples - length) & (uint)-2);
-    int j;
-
-    assert(count % 2 == 0);
-
-    if (count < 2) return 0;
-
-    assert(source != NULL);
-    assert(dest != NULL);
-    assert((length % 8) == 0);
-    assert(filterCoeffsAlign != NULL);
-    assert(((ulongptr)filterCoeffsAlign) % 16 == 0);
-
-    // filter is evaluated for two stereo samples with each iteration, thus use of 'j += 2'
-    for (j = 0; j < count; j += 2)
-    {
-        const float *pSrc;
-        const __m128 *pFil;
-        __m128 sum1, sum2;
-        uint i;
-
-        pSrc = (const float*)source;              // source audio data
-        pFil = (const __m128*)filterCoeffsAlign;  // filter coefficients. NOTE: Assumes coefficients 
-                                                  // are aligned to 16-byte boundary
-        sum1 = sum2 = _mm_setzero_ps();
-
-        for (i = 0; i < length / 8; i ++) 
-        {
-            // Unroll loop for efficiency & calculate filter for 2*2 stereo samples 
-            // at each pass
-
-            // sum1 is accu for 2*2 filtered stereo sound data at the primary sound data offset
-            // sum2 is accu for 2*2 filtered stereo sound data for the next sound sample offset.
-
-            sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc)    , pFil[0]));
-            sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 2), pFil[0]));
-
-            sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc + 4), pFil[1]));
-            sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 6), pFil[1]));
-
-            sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc + 8) ,  pFil[2]));
-            sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 10), pFil[2]));
-
-            sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc + 12), pFil[3]));
-            sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 14), pFil[3]));
-
-            pSrc += 16;
-            pFil += 4;
-        }
-
-        // Now sum1 and sum2 both have a filtered 2-channel sample each, but we still need
-        // to sum the two hi- and lo-floats of these registers together.
-
-        // post-shuffle & add the filtered values and store to dest.
-        _mm_storeu_ps(dest, _mm_add_ps(
-                    _mm_shuffle_ps(sum1, sum2, _MM_SHUFFLE(1,0,3,2)),   // s2_1 s2_0 s1_3 s1_2
-                    _mm_shuffle_ps(sum1, sum2, _MM_SHUFFLE(3,2,1,0))    // s2_3 s2_2 s1_1 s1_0
-                    ));
-        source += 4;
-        dest += 4;
-    }
-
-    // Ideas for further improvement:
-    // 1. If it could be guaranteed that 'source' were always aligned to 16-byte 
-    //    boundary, a faster aligned '_mm_load_ps' instruction could be used.
-    // 2. If it could be guaranteed that 'dest' were always aligned to 16-byte 
-    //    boundary, a faster '_mm_store_ps' instruction could be used.
-
-    return (uint)count;
-
-    /* original routine in C-language. please notice the C-version has differently 
-       organized coefficients though.
-    double suml1, suml2;
-    double sumr1, sumr2;
-    uint i, j;
-
-    for (j = 0; j < count; j += 2)
-    {
-        const float *ptr;
-        const float *pFil;
-
-        suml1 = sumr1 = 0.0;
-        suml2 = sumr2 = 0.0;
-        ptr = src;
-        pFil = filterCoeffs;
-        for (i = 0; i < lengthLocal; i ++) 
-        {
-            // unroll loop for efficiency.
-
-            suml1 += ptr[0] * pFil[0] + 
-                     ptr[2] * pFil[2] +
-                     ptr[4] * pFil[4] +
-                     ptr[6] * pFil[6];
-
-            sumr1 += ptr[1] * pFil[1] + 
-                     ptr[3] * pFil[3] +
-                     ptr[5] * pFil[5] +
-                     ptr[7] * pFil[7];
-
-            suml2 += ptr[8] * pFil[0] + 
-                     ptr[10] * pFil[2] +
-                     ptr[12] * pFil[4] +
-                     ptr[14] * pFil[6];
-
-            sumr2 += ptr[9] * pFil[1] + 
-                     ptr[11] * pFil[3] +
-                     ptr[13] * pFil[5] +
-                     ptr[15] * pFil[7];
-
-            ptr += 16;
-            pFil += 8;
-        }
-        dest[0] = (float)suml1;
-        dest[1] = (float)sumr1;
-        dest[2] = (float)suml2;
-        dest[3] = (float)sumr2;
-
-        src += 4;
-        dest += 4;
-    }
-    */
-}
-
-#endif  // SOUNDTOUCH_ALLOW_SSE
+////////////////////////////////////////////////////////////////////////////////
+///
+/// SSE optimized routines for Pentium-III, Athlon-XP and later CPUs. All SSE 
+/// optimized functions have been gathered into this single source 
+/// code file, regardless to their class or original source code file, in order 
+/// to ease porting the library to other compiler and processor platforms.
+///
+/// The SSE-optimizations are programmed using SSE compiler intrinsics that
+/// are supported both by Microsoft Visual C++ and GCC compilers, so this file
+/// should compile with both toolsets.
+///
+/// NOTICE: If using Visual Studio 6.0, you'll need to install the "Visual C++ 
+/// 6.0 processor pack" update to support SSE instruction set. The update is 
+/// available for download at Microsoft Developers Network, see here:
+/// http://msdn.microsoft.com/en-us/vstudio/aa718349.aspx
+///
+/// If the above URL is expired or removed, go to "http://msdn.microsoft.com" and 
+/// perform a search with keywords "processor pack".
+///
+/// Author        : Copyright (c) Olli Parviainen
+/// Author e-mail : oparviai 'at' iki.fi
+/// SoundTouch WWW: http://www.surina.net/soundtouch
+///
+////////////////////////////////////////////////////////////////////////////////
+//
+// Last changed  : $Date: 2012-11-08 18:53:01 +0000 (Thu, 08 Nov 2012) $
+// File revision : $Revision: 4 $
+//
+// $Id: sse_optimized.cpp 160 2012-11-08 18:53:01Z oparviai $
+//
+////////////////////////////////////////////////////////////////////////////////
+//
+// License :
+//
+//  SoundTouch audio processing library
+//  Copyright (c) Olli Parviainen
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License, or (at your option) any later version.
+//
+//  This library 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
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include "cpu_detect.h"
+#include "STTypes.h"
+
+using namespace soundtouch;
+
+#ifdef SOUNDTOUCH_ALLOW_SSE
+
+// SSE routines available only with float sample type    
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// implementation of SSE optimized functions of class 'TDStretchSSE'
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#include "TDStretch.h"
+#include <xmmintrin.h>
+#include <math.h>
+
+// Calculates cross correlation of two buffers
+double TDStretchSSE::calcCrossCorr(const float *pV1, const float *pV2) const
+{
+    int i;
+    const float *pVec1;
+    const __m128 *pVec2;
+    __m128 vSum, vNorm;
+
+    // Note. It means a major slow-down if the routine needs to tolerate 
+    // unaligned __m128 memory accesses. It's way faster if we can skip 
+    // unaligned slots and use _mm_load_ps instruction instead of _mm_loadu_ps.
+    // This can mean up to ~ 10-fold difference (incl. part of which is
+    // due to skipping every second round for stereo sound though).
+    //
+    // Compile-time define SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION is provided
+    // for choosing if this little cheating is allowed.
+
+#ifdef SOUNDTOUCH_ALLOW_NONEXACT_SIMD_OPTIMIZATION
+    // Little cheating allowed, return valid correlation only for 
+    // aligned locations, meaning every second round for stereo sound.
+
+    #define _MM_LOAD    _mm_load_ps
+
+    if (((ulongptr)pV1) & 15) return -1e50;    // skip unaligned locations
+
+#else
+    // No cheating allowed, use unaligned load & take the resulting
+    // performance hit.
+    #define _MM_LOAD    _mm_loadu_ps
+#endif 
+
+    // ensure overlapLength is divisible by 8
+    assert((overlapLength % 8) == 0);
+
+    // Calculates the cross-correlation value between 'pV1' and 'pV2' vectors
+    // Note: pV2 _must_ be aligned to 16-bit boundary, pV1 need not.
+    pVec1 = (const float*)pV1;
+    pVec2 = (const __m128*)pV2;
+    vSum = vNorm = _mm_setzero_ps();
+
+    // Unroll the loop by factor of 4 * 4 operations. Use same routine for
+    // stereo & mono, for mono it just means twice the amount of unrolling.
+    for (i = 0; i < channels * overlapLength / 16; i ++) 
+    {
+        __m128 vTemp;
+        // vSum += pV1[0..3] * pV2[0..3]
+        vTemp = _MM_LOAD(pVec1);
+        vSum  = _mm_add_ps(vSum,  _mm_mul_ps(vTemp ,pVec2[0]));
+        vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp));
+
+        // vSum += pV1[4..7] * pV2[4..7]
+        vTemp = _MM_LOAD(pVec1 + 4);
+        vSum  = _mm_add_ps(vSum, _mm_mul_ps(vTemp, pVec2[1]));
+        vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp));
+
+        // vSum += pV1[8..11] * pV2[8..11]
+        vTemp = _MM_LOAD(pVec1 + 8);
+        vSum  = _mm_add_ps(vSum, _mm_mul_ps(vTemp, pVec2[2]));
+        vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp));
+
+        // vSum += pV1[12..15] * pV2[12..15]
+        vTemp = _MM_LOAD(pVec1 + 12);
+        vSum  = _mm_add_ps(vSum, _mm_mul_ps(vTemp, pVec2[3]));
+        vNorm = _mm_add_ps(vNorm, _mm_mul_ps(vTemp ,vTemp));
+
+        pVec1 += 16;
+        pVec2 += 4;
+    }
+
+    // return value = vSum[0] + vSum[1] + vSum[2] + vSum[3]
+    float *pvNorm = (float*)&vNorm;
+    double norm = sqrt(pvNorm[0] + pvNorm[1] + pvNorm[2] + pvNorm[3]);
+    if (norm < 1e-9) norm = 1.0;    // to avoid div by zero
+
+    float *pvSum = (float*)&vSum;
+    return (double)(pvSum[0] + pvSum[1] + pvSum[2] + pvSum[3]) / norm;
+
+    /* This is approximately corresponding routine in C-language yet without normalization:
+    double corr, norm;
+    uint i;
+
+    // Calculates the cross-correlation value between 'pV1' and 'pV2' vectors
+    corr = norm = 0.0;
+    for (i = 0; i < channels * overlapLength / 16; i ++) 
+    {
+        corr += pV1[0] * pV2[0] +
+                pV1[1] * pV2[1] +
+                pV1[2] * pV2[2] +
+                pV1[3] * pV2[3] +
+                pV1[4] * pV2[4] +
+                pV1[5] * pV2[5] +
+                pV1[6] * pV2[6] +
+                pV1[7] * pV2[7] +
+                pV1[8] * pV2[8] +
+                pV1[9] * pV2[9] +
+                pV1[10] * pV2[10] +
+                pV1[11] * pV2[11] +
+                pV1[12] * pV2[12] +
+                pV1[13] * pV2[13] +
+                pV1[14] * pV2[14] +
+                pV1[15] * pV2[15];
+
+    for (j = 0; j < 15; j ++) norm += pV1[j] * pV1[j];
+
+        pV1 += 16;
+        pV2 += 16;
+    }
+    return corr / sqrt(norm);
+    */
+}
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// implementation of SSE optimized functions of class 'FIRFilter'
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#include "FIRFilter.h"
+
+FIRFilterSSE::FIRFilterSSE() : FIRFilter()
+{
+    filterCoeffsAlign = NULL;
+    filterCoeffsUnalign = NULL;
+}
+
+
+FIRFilterSSE::~FIRFilterSSE()
+{
+    delete[] filterCoeffsUnalign;
+    filterCoeffsAlign = NULL;
+    filterCoeffsUnalign = NULL;
+}
+
+
+// (overloaded) Calculates filter coefficients for SSE routine
+void FIRFilterSSE::setCoefficients(const float *coeffs, uint newLength, uint uResultDivFactor)
+{
+    uint i;
+    float fDivider;
+
+    FIRFilter::setCoefficients(coeffs, newLength, uResultDivFactor);
+
+    // Scale the filter coefficients so that it won't be necessary to scale the filtering result
+    // also rearrange coefficients suitably for SSE
+    // Ensure that filter coeffs array is aligned to 16-byte boundary
+    delete[] filterCoeffsUnalign;
+    filterCoeffsUnalign = new float[2 * newLength + 4];
+    filterCoeffsAlign = (float *)SOUNDTOUCH_ALIGN_POINTER_16(filterCoeffsUnalign);
+
+    fDivider = (float)resultDivider;
+
+    // rearrange the filter coefficients for mmx routines 
+    for (i = 0; i < newLength; i ++)
+    {
+        filterCoeffsAlign[2 * i + 0] =
+        filterCoeffsAlign[2 * i + 1] = coeffs[i + 0] / fDivider;
+    }
+}
+
+
+
+// SSE-optimized version of the filter routine for stereo sound
+uint FIRFilterSSE::evaluateFilterStereo(float *dest, const float *source, uint numSamples) const
+{
+    int count = (int)((numSamples - length) & (uint)-2);
+    int j;
+
+    assert(count % 2 == 0);
+
+    if (count < 2) return 0;
+
+    assert(source != NULL);
+    assert(dest != NULL);
+    assert((length % 8) == 0);
+    assert(filterCoeffsAlign != NULL);
+    assert(((ulongptr)filterCoeffsAlign) % 16 == 0);
+
+    // filter is evaluated for two stereo samples with each iteration, thus use of 'j += 2'
+    for (j = 0; j < count; j += 2)
+    {
+        const float *pSrc;
+        const __m128 *pFil;
+        __m128 sum1, sum2;
+        uint i;
+
+        pSrc = (const float*)source;              // source audio data
+        pFil = (const __m128*)filterCoeffsAlign;  // filter coefficients. NOTE: Assumes coefficients 
+                                                  // are aligned to 16-byte boundary
+        sum1 = sum2 = _mm_setzero_ps();
+
+        for (i = 0; i < length / 8; i ++) 
+        {
+            // Unroll loop for efficiency & calculate filter for 2*2 stereo samples 
+            // at each pass
+
+            // sum1 is accu for 2*2 filtered stereo sound data at the primary sound data offset
+            // sum2 is accu for 2*2 filtered stereo sound data for the next sound sample offset.
+
+            sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc)    , pFil[0]));
+            sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 2), pFil[0]));
+
+            sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc + 4), pFil[1]));
+            sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 6), pFil[1]));
+
+            sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc + 8) ,  pFil[2]));
+            sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 10), pFil[2]));
+
+            sum1 = _mm_add_ps(sum1, _mm_mul_ps(_mm_loadu_ps(pSrc + 12), pFil[3]));
+            sum2 = _mm_add_ps(sum2, _mm_mul_ps(_mm_loadu_ps(pSrc + 14), pFil[3]));
+
+            pSrc += 16;
+            pFil += 4;
+        }
+
+        // Now sum1 and sum2 both have a filtered 2-channel sample each, but we still need
+        // to sum the two hi- and lo-floats of these registers together.
+
+        // post-shuffle & add the filtered values and store to dest.
+        _mm_storeu_ps(dest, _mm_add_ps(
+                    _mm_shuffle_ps(sum1, sum2, _MM_SHUFFLE(1,0,3,2)),   // s2_1 s2_0 s1_3 s1_2
+                    _mm_shuffle_ps(sum1, sum2, _MM_SHUFFLE(3,2,1,0))    // s2_3 s2_2 s1_1 s1_0
+                    ));
+        source += 4;
+        dest += 4;
+    }
+
+    // Ideas for further improvement:
+    // 1. If it could be guaranteed that 'source' were always aligned to 16-byte 
+    //    boundary, a faster aligned '_mm_load_ps' instruction could be used.
+    // 2. If it could be guaranteed that 'dest' were always aligned to 16-byte 
+    //    boundary, a faster '_mm_store_ps' instruction could be used.
+
+    return (uint)count;
+
+    /* original routine in C-language. please notice the C-version has differently 
+       organized coefficients though.
+    double suml1, suml2;
+    double sumr1, sumr2;
+    uint i, j;
+
+    for (j = 0; j < count; j += 2)
+    {
+        const float *ptr;
+        const float *pFil;
+
+        suml1 = sumr1 = 0.0;
+        suml2 = sumr2 = 0.0;
+        ptr = src;
+        pFil = filterCoeffs;
+        for (i = 0; i < lengthLocal; i ++) 
+        {
+            // unroll loop for efficiency.
+
+            suml1 += ptr[0] * pFil[0] + 
+                     ptr[2] * pFil[2] +
+                     ptr[4] * pFil[4] +
+                     ptr[6] * pFil[6];
+
+            sumr1 += ptr[1] * pFil[1] + 
+                     ptr[3] * pFil[3] +
+                     ptr[5] * pFil[5] +
+                     ptr[7] * pFil[7];
+
+            suml2 += ptr[8] * pFil[0] + 
+                     ptr[10] * pFil[2] +
+                     ptr[12] * pFil[4] +
+                     ptr[14] * pFil[6];
+
+            sumr2 += ptr[9] * pFil[1] + 
+                     ptr[11] * pFil[3] +
+                     ptr[13] * pFil[5] +
+                     ptr[15] * pFil[7];
+
+            ptr += 16;
+            pFil += 8;
+        }
+        dest[0] = (float)suml1;
+        dest[1] = (float)sumr1;
+        dest[2] = (float)suml2;
+        dest[3] = (float)sumr2;
+
+        src += 4;
+        dest += 4;
+    }
+    */
+}
+
+#endif  // SOUNDTOUCH_ALLOW_SSE

From 16ada5fa3d0d21171c00060d08433f3a53d2a55c Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Sat, 22 Jun 2013 20:41:32 +0200
Subject: [PATCH 186/352] Compactify generated UID generator assembly and
 generally cleanup code by storing tev stage hash values in a struct.

---
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 62 +++++---------
 Source/Core/VideoCommon/Src/PixelShaderGen.h  | 80 ++++++-------------
 2 files changed, 45 insertions(+), 97 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 1ec80ba56d..dce8bfbe96 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -706,13 +706,11 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 
 	out.Write("// TEV stage %d\n", n);
 
-	uid_data.bHasIndStage |= bHasIndStage << n;
-	uid_data.tevorders_n_texcoord |= (u64)texcoord << (3 * n);
+	uid_data.stagehash[n].hasindstage = bHasIndStage;
+	uid_data.stagehash[n].tevorders_texcoord = texcoord;
 	if (bHasIndStage)
 	{
-		uid_data.tevind_n_bs |= bpmem.tevind[n].bs << (2*n);
-		uid_data.tevind_n_bt |= bpmem.tevind[n].bt << (2*n);
-		uid_data.tevind_n_fmt |= bpmem.tevind[n].fmt << (2*n);
+		uid_data.stagehash[n].tevind = bpmem.tevind[n].hex & 0x7FFFFF;
 
 		out.Write("// indirect op\n");
 		// perform the indirect op on the incoming regular coordinates using indtex%d as the offset coords
@@ -727,12 +725,10 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		out.Write("float3 indtevcrd%d = indtex%d * %s;\n", n, bpmem.tevind[n].bt, tevIndFmtScale[bpmem.tevind[n].fmt]);
 
 		// bias
-		uid_data.Set_tevind_bias(n, bpmem.tevind[n].bias);
 		if (bpmem.tevind[n].bias != ITB_NONE )
 			out.Write("indtevcrd%d.%s += %s;\n", n, tevIndBiasField[bpmem.tevind[n].bias], tevIndBiasAdd[bpmem.tevind[n].fmt]);
 
 		// multiply by offset matrix and scale
-		uid_data.Set_tevind_mid(n, bpmem.tevind[n].mid);
 		if (bpmem.tevind[n].mid != 0)
 		{
 			if (bpmem.tevind[n].mid <= 3)
@@ -769,9 +765,6 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		// ---------
 		// Wrapping
 		// ---------
-		uid_data.Set_tevind_sw(n, bpmem.tevind[n].sw);
-		uid_data.Set_tevind_tw(n, bpmem.tevind[n].tw);
-		uid_data.tevind_n_fb_addprev |= bpmem.tevind[n].fb_addprev << n;
 
 		// wrap S
 		if (bpmem.tevind[n].sw == ITW_OFF)
@@ -798,26 +791,8 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 	TevStageCombiner::ColorCombiner &cc = bpmem.combiners[n].colorC;
 	TevStageCombiner::AlphaCombiner &ac = bpmem.combiners[n].alphaC;
 
-	uid_data.cc_n_d |= (u64)cc.d << (4*n);
-	uid_data.cc_n_c |= (u64)cc.c << (4*n);
-	uid_data.cc_n_b |= (u64)cc.b << (4*n);
-	uid_data.cc_n_a |= (u64)cc.a << (4*n);
-	uid_data.cc_n_bias |= cc.bias << (2*n);
-	uid_data.cc_n_op |= cc.op << n;
-	uid_data.cc_n_clamp |= cc.clamp << n;
-	uid_data.cc_n_shift |= cc.shift << (2*n);
-	uid_data.cc_n_dest |= cc.dest << (2*n);
-	uid_data.ac_n_rswap |= ac.rswap << (2*n);
-	uid_data.ac_n_tswap |= ac.tswap << (2*n);
-	uid_data.ac_n_d |= (u64)ac.d << (3*n);
-	uid_data.ac_n_c |= (u64)ac.c << (3*n);
-	uid_data.ac_n_b |= (u64)ac.b << (3*n);
-	uid_data.ac_n_a |= (u64)ac.a << (3*n);
-	uid_data.ac_n_bias |= ac.bias << (2*n);
-	uid_data.ac_n_op |= ac.op << n;
-	uid_data.ac_n_clamp |= ac.clamp << n;
-	uid_data.ac_n_shift |= ac.shift << (2*n);
-	uid_data.ac_n_dest |= ac.dest << (2*n);
+	uid_data.stagehash[n].cc = cc.hex & 0xFFFFFF;
+	uid_data.stagehash[n].ac = ac.hex & 0xFFFFF0; // Storing rswap and tswap later
 
 	if(cc.a == TEVCOLORARG_RASA || cc.a == TEVCOLORARG_RASC
 		|| cc.b == TEVCOLORARG_RASA || cc.b == TEVCOLORARG_RASC
@@ -827,17 +802,19 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		|| ac.c == TEVALPHAARG_RASA || ac.d == TEVALPHAARG_RASA)
 	{
 		const int i = bpmem.combiners[n].alphaC.rswap;
-		uid_data.tevksel_n_swap1 |= bpmem.tevksel[i*2  ].swap1 << (2 * (i*2  ));
-		uid_data.tevksel_n_swap1 |= bpmem.tevksel[i*2+1].swap1 << (2 * (i*2+1));
-		uid_data.tevksel_n_swap2 |= bpmem.tevksel[i*2  ].swap2 << (2 * (i*2  ));
-		uid_data.tevksel_n_swap2 |= bpmem.tevksel[i*2+1].swap2 << (2 * (i*2+1));
+		uid_data.stagehash[n].ac |= bpmem.combiners[n].alphaC.rswap;
+		uid_data.stagehash[n].tevksel_swap1a = bpmem.tevksel[i*2].swap1;
+		uid_data.stagehash[n].tevksel_swap2a = bpmem.tevksel[i*2].swap2;
+		uid_data.stagehash[n].tevksel_swap1b = bpmem.tevksel[i*2+1].swap1;
+		uid_data.stagehash[n].tevksel_swap2b = bpmem.tevksel[i*2+1].swap2;
+		uid_data.stagehash[n].tevorders_colorchan = bpmem.tevorders[n / 2].getColorChan(n & 1);
 
 		char *rasswap = swapModeTable[bpmem.combiners[n].alphaC.rswap];
 		out.Write("rastemp = %s.%s;\n", tevRasTable[bpmem.tevorders[n / 2].getColorChan(n & 1)], rasswap);
 		out.Write("crastemp = frac(rastemp * (255.0f/256.0f)) * (256.0f/255.0f);\n");
 	}
 
-
+	uid_data.stagehash[n].tevorders_enable = bpmem.tevorders[n / 2].getEnable(n & 1);
 	if (bpmem.tevorders[n/2].getEnable(n&1))
 	{
 		if (!bHasIndStage)
@@ -850,10 +827,13 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 		}
 
 		const int i = bpmem.combiners[n].alphaC.tswap;
-		uid_data.tevksel_n_swap1 |= bpmem.tevksel[i*2  ].swap1 << (2 * (i*2  ));
-		uid_data.tevksel_n_swap1 |= bpmem.tevksel[i*2+1].swap1 << (2 * (i*2+1));
-		uid_data.tevksel_n_swap2 |= bpmem.tevksel[i*2  ].swap2 << (2 * (i*2  ));
-		uid_data.tevksel_n_swap2 |= bpmem.tevksel[i*2+1].swap2 << (2 * (i*2+1));
+		uid_data.stagehash[n].ac |= bpmem.combiners[n].alphaC.tswap << 2;
+		uid_data.stagehash[n].tevksel_swap1c = bpmem.tevksel[i*2].swap1;
+		uid_data.stagehash[n].tevksel_swap2c = bpmem.tevksel[i*2].swap2;
+		uid_data.stagehash[n].tevksel_swap1d = bpmem.tevksel[i*2+1].swap1;
+		uid_data.stagehash[n].tevksel_swap2d = bpmem.tevksel[i*2+1].swap2;
+
+		uid_data.stagehash[n].tevorders_texmap= bpmem.tevorders[n/2].getTexMap(n&1);
 
 		char *texswap = swapModeTable[bpmem.combiners[n].alphaC.tswap];
 		int texmap = bpmem.tevorders[n/2].getTexMap(n&1);
@@ -871,8 +851,8 @@ static void WriteStage(T& out, pixel_shader_uid_data& uid_data, int n, API_TYPE
 	{
 		int kc = bpmem.tevksel[n / 2].getKC(n & 1);
 		int ka = bpmem.tevksel[n / 2].getKA(n & 1);
-		uid_data.set_tevksel_kcsel(n/2, n & 1, kc);
-		uid_data.set_tevksel_kasel(n/2, n & 1, ka);
+		uid_data.stagehash[n].tevksel_kc = kc;
+		uid_data.stagehash[n].tevksel_ka = ka;
 		out.Write("konsttemp = float4(%s, %s);\n", tevKSelTableC[kc], tevKSelTableA[ka]);
 		if(kc > 7 || ka > 7)
 		{
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 826ec561d0..01b0ad3489 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -96,69 +96,38 @@ struct pixel_shader_uid_data
 		else if (index == 3) { tevindref_bi4 = texmap; }
 	}
 
-	u64 tevorders_n_texcoord : 48; // 16 x 3 bits
+	struct {
+		u32 cc : 24;
+		u32 ac : 24;
 
-	u64 tevind_n_sw : 48;         // 16 x 3 bits
-	u64 tevind_n_tw : 48;         // 16 x 3 bits
-	u32 tevind_n_fb_addprev : 16; // 16 x 1 bit
-	u32 tevind_n_bs : 32;         // 16 x 2 bits
-	u32 tevind_n_fmt : 32;        // 16 x 2 bits
-	u32 tevind_n_bt : 32;         // 16 x 2 bits
-	u64 tevind_n_bias : 48;       // 16 x 3 bits
-	u64 tevind_n_mid : 64;        // 16 x 4 bits
+		u32 tevorders_texmap : 3;
+		u32 tevorders_texcoord : 3;
+		u32 tevorders_enable : 1;
+		u32 tevorders_colorchan : 3;
+		u32 pad1 : 6;
 
-	// NOTE: These assume that the affected bits are zero before calling
-	void Set_tevind_sw(int index, u64 val)
-	{
-		tevind_n_sw |= val << (3*index);
-	}
-	void Set_tevind_tw(int index, u64 val)
-	{
-		tevind_n_tw |= val << (3*index);
-	}
-	void Set_tevind_bias(int index, u64 val)
-	{
-		tevind_n_bias |= val << (3*index);
-	}
-	void Set_tevind_mid(int index, u64 val)
-	{
-		tevind_n_mid |= val << (4*index);
-	}
+		u32 hasindstage : 1;
+		u32 tevind : 21;
+		u32 tevksel_swap1a : 2; // TODO: Doesn't fit here..
+		u32 tevksel_swap2a : 2; // TODO: Doesn't fit here..
+		u32 tevksel_swap1b : 2; // TODO: Doesn't fit here..
+		u32 tevksel_swap2b : 2; // TODO: Doesn't fit here..
+		u32 pad2 : 2;
 
-	u32 tevksel_n_swap1 : 16; // 8x2 bits
-	u32 tevksel_n_swap2 : 16; // 8x2 bits
-	u64 tevksel_n_kcsel0 : 40; // 8x5 bits
-	u64 tevksel_n_kasel0 : 40; // 8x5 bits
-	u64 tevksel_n_kcsel1 : 40; // 8x5 bits
-	u64 tevksel_n_kasel1 : 40; // 8x5 bits
-	void set_tevksel_kcsel(int index, int i, u64 value) { if (i) tevksel_n_kcsel1 |= value << (5*index); else tevksel_n_kcsel0 |= value << (5*index); }
-	void set_tevksel_kasel(int index, int i, u64 value) { if( i) tevksel_n_kasel1 |= value << (5*index); else tevksel_n_kasel0 |= value << (5*index); }
+		u32 tevksel_swap1c : 2; // TODO: Doesn't fit here..
+		u32 tevksel_swap2c : 2; // TODO: Doesn't fit here..
+		u32 tevksel_swap1d : 2; // TODO: Doesn't fit here..
+		u32 tevksel_swap2d : 2; // TODO: Doesn't fit here..
+		u32 tevksel_kc : 5;
+		u32 tevksel_ka : 5;
+		u32 pad3 : 14;
+	} stagehash[16];
 
-	u64 cc_n_d : 64; // 16x4 bits
-	u64 cc_n_c : 64; // 16x4 bits
-	u64 cc_n_b : 64; // 16x4 bits
-	u64 cc_n_a : 64; // 16x4 bits
-	u32 cc_n_bias : 32; // 16x2 bits
-	u32 cc_n_op : 16; // 16x1 bit
-	u32 cc_n_clamp : 16; // 16x1 bit
-	u32 cc_n_shift : 32; // 16x2 bits
-	u32 cc_n_dest : 32; // 16x2 bits
-
-	u32 ac_n_rswap : 32; // 16x2 bits
-	u32 ac_n_tswap : 32; // 16x2 bits
-	u64 ac_n_d : 48; // 16x3 bits
-	u64 ac_n_c : 48; // 16x3 bits
-	u64 ac_n_b : 48; // 16x3 bits
-	u64 ac_n_a : 48; // 16x3 bits
-	u32 ac_n_bias : 32; // 16x2 bits
-	u32 ac_n_op : 16; // 16x1 bit
-	u32 ac_n_clamp : 16; // 16x1 bit
-	u32 ac_n_shift : 32; // 16x2 bits
-	u32 ac_n_dest : 32; // 16x2 bits
 
 	u32 alpha_test_comp0 : 3;
 	u32 alpha_test_comp1 : 3;
 	u32 alpha_test_logic : 2;
+
 	u32 alpha_test_use_zcomploc_hack : 1;
 
 	u32 fog_proj : 1;
@@ -169,7 +138,6 @@ struct pixel_shader_uid_data
 
 	u32 fast_depth_calc : 1;
 	u32 per_pixel_depth : 1;
-	u32 bHasIndStage : 16;
 
 	u32 xfregs_numTexGen_numTexGens : 4;
 

From bdc28106eed06af0d9c0da4c8ee9672a59a7bf7e Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Sat, 22 Jun 2013 21:24:21 +0200
Subject: [PATCH 187/352] Optimize shader uid checks by checking the number of
 uid values which are actually used.

---
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   |  5 ++
 Source/Core/VideoCommon/Src/PixelShaderGen.h  | 59 ++++++++++---------
 Source/Core/VideoCommon/Src/ShaderGenCommon.h |  4 +-
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  |  2 +
 Source/Core/VideoCommon/Src/VertexShaderGen.h |  3 +
 5 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index dce8bfbe96..dd284ced7d 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -535,6 +535,11 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 	for (unsigned int i = 0; i < numStages; i++)
 		WriteStage<T>(out, uid_data, i, ApiType, RegisterStates); // build the equation for this stage
 
+#define MY_STRUCT_OFFSET(str,elem) ((u32)((u64)&(str).elem-(u64)&(str)))
+	bool enable_pl = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting;
+	uid_data.num_values = (enable_pl) ? sizeof(uid_data)/sizeof(32) : MY_STRUCT_OFFSET(uid_data,stagehash[numStages])/sizeof(u32);
+
+
 	if (numStages)
 	{
 		// The results of the last texenv stage are put onto the screen,
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 01b0ad3489..210dd9dd32 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -61,6 +61,9 @@ struct pixel_shader_uid_data
 {
 	// TODO: Optimize field order for easy access!
 
+	u32 num_values; // TODO: Shouldn't be a u32
+	u32 NumValues() const { return num_values; } // TODO: Can be optimized :)
+
 	u32 components;
 	u32 dstAlphaMode : 2;
 	u32 Pretest : 2;
@@ -96,34 +99,6 @@ struct pixel_shader_uid_data
 		else if (index == 3) { tevindref_bi4 = texmap; }
 	}
 
-	struct {
-		u32 cc : 24;
-		u32 ac : 24;
-
-		u32 tevorders_texmap : 3;
-		u32 tevorders_texcoord : 3;
-		u32 tevorders_enable : 1;
-		u32 tevorders_colorchan : 3;
-		u32 pad1 : 6;
-
-		u32 hasindstage : 1;
-		u32 tevind : 21;
-		u32 tevksel_swap1a : 2; // TODO: Doesn't fit here..
-		u32 tevksel_swap2a : 2; // TODO: Doesn't fit here..
-		u32 tevksel_swap1b : 2; // TODO: Doesn't fit here..
-		u32 tevksel_swap2b : 2; // TODO: Doesn't fit here..
-		u32 pad2 : 2;
-
-		u32 tevksel_swap1c : 2; // TODO: Doesn't fit here..
-		u32 tevksel_swap2c : 2; // TODO: Doesn't fit here..
-		u32 tevksel_swap1d : 2; // TODO: Doesn't fit here..
-		u32 tevksel_swap2d : 2; // TODO: Doesn't fit here..
-		u32 tevksel_kc : 5;
-		u32 tevksel_ka : 5;
-		u32 pad3 : 14;
-	} stagehash[16];
-
-
 	u32 alpha_test_comp0 : 3;
 	u32 alpha_test_comp1 : 3;
 	u32 alpha_test_logic : 2;
@@ -141,6 +116,34 @@ struct pixel_shader_uid_data
 
 	u32 xfregs_numTexGen_numTexGens : 4;
 
+	struct {
+		u32 cc : 24;
+		u32 ac : 24;
+
+		u32 tevorders_texmap : 3;
+		u32 tevorders_texcoord : 3;
+		u32 tevorders_enable : 1;
+		u32 tevorders_colorchan : 3;
+		u32 pad1 : 6;
+
+		// TODO: Clean up the swapXY mess
+		u32 hasindstage : 1;
+		u32 tevind : 21;
+		u32 tevksel_swap1a : 2;
+		u32 tevksel_swap2a : 2;
+		u32 tevksel_swap1b : 2;
+		u32 tevksel_swap2b : 2;
+		u32 pad2 : 2;
+
+		u32 tevksel_swap1c : 2;
+		u32 tevksel_swap2c : 2;
+		u32 tevksel_swap1d : 2;
+		u32 tevksel_swap2d : 2;
+		u32 tevksel_kc : 5;
+		u32 tevksel_ka : 5;
+		u32 pad3 : 14;
+	} stagehash[16];
+
 	// TODO: I think we're fine without an enablePixelLighting field, should probably double check, though..
 	LightingUidData lighting;
 };
diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index b8820e2e98..53f2405f8a 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -100,7 +100,7 @@ public:
 	bool operator < (const ShaderUid& obj) const
 	{
 		// TODO: Store last frame used and order by that? makes much more sense anyway...
-		for (unsigned int i = 0; i < sizeof(uid_data) / sizeof(u32); ++i)
+		for (unsigned int i = 0; i < data.NumValues(); ++i)
 		{
 			if (this->values[i] < obj.values[i])
 				return true;
@@ -212,6 +212,8 @@ struct LightingUidData
 	u32 diffusefunc : 8; // 4x2 bits
 	u32 attnfunc : 8; // 4x2 bits
 	u32 light_mask : 32; // 4x8 bits
+
+	u32 NumValues() const { return sizeof(LightingUidData) / sizeof(u32); }
 };
 #pragma pack()
 
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 3edb51c505..8c157dc030 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -74,6 +74,8 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 	vertex_shader_uid_data& uid_data = (&out.template GetUidData<vertex_shader_uid_data>() != NULL)
 											? out.template GetUidData<vertex_shader_uid_data>() : dummy_data;
 
+	uid_data.num_values = sizeof(uid_data)/sizeof(u32);
+
 	out.SetBuffer(text);
 #ifndef ANDROID
 	locale_t locale;
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h
index eb7236678a..3f3087783d 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h
@@ -67,6 +67,9 @@ const s_svar VSVar_Loc[] = {  {I_POSNORMALMATRIX, C_POSNORMALMATRIX, 6 },
 
 struct vertex_shader_uid_data
 {
+	u32 num_values; // TODO: Shouldn't be a u32
+
+	u32 NumValues() const { return num_values; }
 	u32 components;
 	u32 numColorChans : 2;
 	u32 numTexGens : 4;

From 1bd80d781ce6053cde4fe2bdbbed5474e660b4be Mon Sep 17 00:00:00 2001
From: Tetsuo55 <akira146@hotmail.com>
Date: Sat, 22 Jun 2013 21:51:11 +0200
Subject: [PATCH 188/352] fix deb-x64 and osx-x64 builds after soundtouch
 update

---
 Externals/soundtouch/STTypes.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Externals/soundtouch/STTypes.h b/Externals/soundtouch/STTypes.h
index 4405aa0c9f..efe34fdfa4 100644
--- a/Externals/soundtouch/STTypes.h
+++ b/Externals/soundtouch/STTypes.h
@@ -57,7 +57,7 @@ typedef unsigned long   ulong;
 #if (defined(__GNUC__) && !defined(ANDROID))
     // In GCC, include soundtouch_config.h made by config scritps.
     // Skip this in Android compilation that uses GCC but without configure scripts.
-    #include "soundtouch_config.h"
+    //#include "soundtouch_config.h"
 #endif
 
 #ifndef _WINDEF_
@@ -75,8 +75,8 @@ namespace soundtouch
 {
     /// Activate these undef's to overrule the possible sampletype 
     /// setting inherited from some other header file:
-    //#undef SOUNDTOUCH_INTEGER_SAMPLES
-    //#undef SOUNDTOUCH_FLOAT_SAMPLES
+    #undef SOUNDTOUCH_INTEGER_SAMPLES
+    #undef SOUNDTOUCH_FLOAT_SAMPLES
 
     /// If following flag is defined, always uses multichannel processing 
     /// routines also for mono and stero sound. This is for routine testing 
@@ -174,7 +174,7 @@ namespace soundtouch
 };
 
 // define ST_NO_EXCEPTION_HANDLING switch to disable throwing std exceptions:
-// #define ST_NO_EXCEPTION_HANDLING    1
+   #define ST_NO_EXCEPTION_HANDLING    1
 #ifdef ST_NO_EXCEPTION_HANDLING
     // Exceptions disabled. Throw asserts instead if enabled.
     #include <assert.h>

From 02351b77f9ac62d0151e119a268a3c6336a39084 Mon Sep 17 00:00:00 2001
From: Tetsuo55 <akira146@hotmail.com>
Date: Sat, 22 Jun 2013 22:44:27 +0200
Subject: [PATCH 189/352] replace alloca with malloc to fix windows builds

---
 Externals/soundtouch/FIRFilter.cpp  | 2 +-
 Externals/soundtouch/SoundTouch.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Externals/soundtouch/FIRFilter.cpp b/Externals/soundtouch/FIRFilter.cpp
index d57389108a..ddd2a87dec 100644
--- a/Externals/soundtouch/FIRFilter.cpp
+++ b/Externals/soundtouch/FIRFilter.cpp
@@ -170,7 +170,7 @@ uint FIRFilter::evaluateFilterMono(SAMPLETYPE *dest, const SAMPLETYPE *src, uint
 uint FIRFilter::evaluateFilterMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSamples, uint numChannels) const
 {
     uint i, j, end, c;
-    LONG_SAMPLETYPE *sum=(LONG_SAMPLETYPE*)alloca(numChannels*sizeof(*sum));
+    LONG_SAMPLETYPE *sum=(LONG_SAMPLETYPE*)malloc(numChannels*sizeof(*sum));
 #ifdef SOUNDTOUCH_FLOAT_SAMPLES
     // when using floating point samples, use a scaler instead of a divider
     // because division is much slower operation than multiplying.
diff --git a/Externals/soundtouch/SoundTouch.cpp b/Externals/soundtouch/SoundTouch.cpp
index 516d6b23d0..4fad740587 100644
--- a/Externals/soundtouch/SoundTouch.cpp
+++ b/Externals/soundtouch/SoundTouch.cpp
@@ -348,7 +348,7 @@ void SoundTouch::flush()
     int i;
     int nUnprocessed;
     int nOut;
-    SAMPLETYPE *buff=(SAMPLETYPE*)alloca(64*channels*sizeof(SAMPLETYPE));
+    SAMPLETYPE *buff=(SAMPLETYPE*)malloc(64*channels*sizeof(SAMPLETYPE));
 
     // check how many samples still await processing, and scale
     // that by tempo & rate to get expected output sample count

From 0c9c3c97372836e35c75a67758f8276879ea0ac4 Mon Sep 17 00:00:00 2001
From: Tetsuo55 <akira146@hotmail.com>
Date: Sun, 23 Jun 2013 00:14:45 +0200
Subject: [PATCH 190/352] forgot to add free() to the previous malloc change

---
 Externals/soundtouch/FIRFilter.cpp  | 1 +
 Externals/soundtouch/SoundTouch.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Externals/soundtouch/FIRFilter.cpp b/Externals/soundtouch/FIRFilter.cpp
index ddd2a87dec..54c808d006 100644
--- a/Externals/soundtouch/FIRFilter.cpp
+++ b/Externals/soundtouch/FIRFilter.cpp
@@ -217,6 +217,7 @@ uint FIRFilter::evaluateFilterMulti(SAMPLETYPE *dest, const SAMPLETYPE *src, uin
             sum[c] = 0;
         }
     }
+    free(sum);
     return numSamples - length;
 }
 
diff --git a/Externals/soundtouch/SoundTouch.cpp b/Externals/soundtouch/SoundTouch.cpp
index 4fad740587..7c35d86697 100644
--- a/Externals/soundtouch/SoundTouch.cpp
+++ b/Externals/soundtouch/SoundTouch.cpp
@@ -383,6 +383,7 @@ void SoundTouch::flush()
     pTDStretch->clearInput();
     // yet leave the 'tempoChanger' output intouched as that's where the
     // flushed samples are!
+    free(buff);
 }
 
 

From 911d73d85a6b20af90983e1959e393ed79fb87c9 Mon Sep 17 00:00:00 2001
From: Jordan Cristiano <jordan.cristi AT [Google mail]>
Date: Sun, 21 Apr 2013 02:17:03 -0400
Subject: [PATCH 191/352] added new license header to missed audio source files

---
 .../Core/AudioCommon/Src/AlsaSoundStream.cpp  | 19 +++----------------
 Source/Core/AudioCommon/Src/AlsaSoundStream.h | 19 +++----------------
 .../AudioCommon/Src/CoreAudioSoundStream.cpp  | 19 +++----------------
 .../AudioCommon/Src/CoreAudioSoundStream.h    | 19 +++----------------
 .../Core/AudioCommon/Src/OpenSLESStream.cpp   | 19 +++----------------
 Source/Core/AudioCommon/Src/OpenSLESStream.h  | 19 +++----------------
 .../Core/AudioCommon/Src/PulseAudioStream.cpp | 19 +++----------------
 .../Core/AudioCommon/Src/PulseAudioStream.h   | 19 +++----------------
 8 files changed, 24 insertions(+), 128 deletions(-)

diff --git a/Source/Core/AudioCommon/Src/AlsaSoundStream.cpp b/Source/Core/AudioCommon/Src/AlsaSoundStream.cpp
index d9b9016114..2ccf4d22ae 100644
--- a/Source/Core/AudioCommon/Src/AlsaSoundStream.cpp
+++ b/Source/Core/AudioCommon/Src/AlsaSoundStream.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program 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, version 2.0.
-
-// This program 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 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <functional>
 
diff --git a/Source/Core/AudioCommon/Src/AlsaSoundStream.h b/Source/Core/AudioCommon/Src/AlsaSoundStream.h
index 4eae261727..47c9e7ae82 100644
--- a/Source/Core/AudioCommon/Src/AlsaSoundStream.h
+++ b/Source/Core/AudioCommon/Src/AlsaSoundStream.h
@@ -1,19 +1,6 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program 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, version 2.0.
-
-// This program 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 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _ALSA_SOUND_STREAM_H
 #define _ALSA_SOUND_STREAM_H
diff --git a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp b/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp
index f6d5d31bed..967eaa4b0a 100644
--- a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp
+++ b/Source/Core/AudioCommon/Src/CoreAudioSoundStream.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program 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, version 2.0.
-
-// This program 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 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <CoreServices/CoreServices.h>
 
diff --git a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.h b/Source/Core/AudioCommon/Src/CoreAudioSoundStream.h
index 34db5ac837..27d8c62f7d 100644
--- a/Source/Core/AudioCommon/Src/CoreAudioSoundStream.h
+++ b/Source/Core/AudioCommon/Src/CoreAudioSoundStream.h
@@ -1,19 +1,6 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program 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, version 2.0.
-
-// This program 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 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _COREAUDIO_SOUND_STREAM_H
 #define _COREAUDIO_SOUND_STREAM_H
diff --git a/Source/Core/AudioCommon/Src/OpenSLESStream.cpp b/Source/Core/AudioCommon/Src/OpenSLESStream.cpp
index b0913a1895..0035b4adeb 100644
--- a/Source/Core/AudioCommon/Src/OpenSLESStream.cpp
+++ b/Source/Core/AudioCommon/Src/OpenSLESStream.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program 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, version 2.0.
-
-// This program 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 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifdef ANDROID
 #include "Common.h"
diff --git a/Source/Core/AudioCommon/Src/OpenSLESStream.h b/Source/Core/AudioCommon/Src/OpenSLESStream.h
index f49160c4bc..839b5dc4b9 100644
--- a/Source/Core/AudioCommon/Src/OpenSLESStream.h
+++ b/Source/Core/AudioCommon/Src/OpenSLESStream.h
@@ -1,19 +1,6 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program 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, version 2.0.
-
-// This program 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 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _OPENSLSTREAM_H_
 #define _OPENSLSTREAM_H_
diff --git a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp
index faa94c22e0..13307a8fe0 100644
--- a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp
+++ b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp
@@ -1,19 +1,6 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program 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, version 2.0.
-
-// This program 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 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #include <functional>
 
diff --git a/Source/Core/AudioCommon/Src/PulseAudioStream.h b/Source/Core/AudioCommon/Src/PulseAudioStream.h
index 38399e2506..62b7e86f82 100644
--- a/Source/Core/AudioCommon/Src/PulseAudioStream.h
+++ b/Source/Core/AudioCommon/Src/PulseAudioStream.h
@@ -1,19 +1,6 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program 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, version 2.0.
-
-// This program 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 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
+// Copyright 2013 Dolphin Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.
 
 #ifndef _PULSE_AUDIO_STREAM_H
 #define _PULSE_AUDIO_STREAM_H

From fafdc4fcef0d6845d94c4dcb4ac590bac7008553 Mon Sep 17 00:00:00 2001
From: Jordan Cristiano <jordan.cristi@gmail.com>
Date: Sat, 22 Jun 2013 23:23:53 -0400
Subject: [PATCH 192/352] DSBCAPS_GLOBALFOCUS allows sound to still play when
 the application is in the background. Other backends do this, so why not let
 dsound do it too.

---
 Source/Core/AudioCommon/Src/DSoundStream.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/AudioCommon/Src/DSoundStream.cpp b/Source/Core/AudioCommon/Src/DSoundStream.cpp
index a81c3d2f26..41a1dd9951 100644
--- a/Source/Core/AudioCommon/Src/DSoundStream.cpp
+++ b/Source/Core/AudioCommon/Src/DSoundStream.cpp
@@ -28,7 +28,7 @@ bool DSound::CreateBuffer()
 
 	// Fill out DSound buffer description.
 	dsbdesc.dwSize  = sizeof(DSBUFFERDESC);
-	dsbdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_STICKYFOCUS | DSBCAPS_CTRLVOLUME;
+	dsbdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRLVOLUME | DSBCAPS_GLOBALFOCUS;
 	dsbdesc.dwBufferBytes = bufferSize = BUFSIZE;
 	dsbdesc.lpwfxFormat = (WAVEFORMATEX *)&pcmwf;
 	dsbdesc.guid3DAlgorithm = DS3DALG_DEFAULT;

From 8cf515359c2474c9b304b99cf07bd88aa2b0f766 Mon Sep 17 00:00:00 2001
From: Jordan Cristiano <jordan.cristi@gmail.com>
Date: Fri, 21 Jun 2013 12:27:47 -0400
Subject: [PATCH 193/352] fixed uninitialzed audio_size variable in
 WaveFileWriter

---
 Source/Core/AudioCommon/Src/WaveFile.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Source/Core/AudioCommon/Src/WaveFile.cpp b/Source/Core/AudioCommon/Src/WaveFile.cpp
index c6db942bc3..7eabbb3b48 100644
--- a/Source/Core/AudioCommon/Src/WaveFile.cpp
+++ b/Source/Core/AudioCommon/Src/WaveFile.cpp
@@ -8,10 +8,11 @@
 
 enum {BUF_SIZE = 32*1024};
 
-WaveFileWriter::WaveFileWriter()
+WaveFileWriter::WaveFileWriter():
+	skip_silence(false),
+	audio_size(0),
+	conv_buffer(NULL)
 {
-	conv_buffer = 0;
-	skip_silence = false;
 }
 
 WaveFileWriter::~WaveFileWriter()
@@ -39,6 +40,8 @@ bool WaveFileWriter::Start(const char *filename, unsigned int HLESampleRate)
 		return false;
 	}
 
+	audio_size = 0;
+
 	// -----------------
 	// Write file header
 	// -----------------

From 6bb7cc5fea05c05388b0a7a1e81ab98d6127ef1f Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sat, 22 Jun 2013 22:54:28 -0500
Subject: [PATCH 194/352] [Android] Add an about screen that shows build
 revision.

---
 Source/Android/.idea/workspace.xml            | 247 ++++++++++++------
 Source/Android/AndroidManifest.xml            |   3 +
 .../dolphinemu/dolphinemu/AboutActivity.java  |  31 +++
 .../dolphinemu/GameListActivity.java          |   6 +
 .../dolphinemu/dolphinemu/GameListItem.java   |   2 +-
 .../dolphinemu/dolphinemu/NativeLibrary.java  |   1 +
 Source/Core/Common/Src/Version.cpp            |   4 +
 Source/Core/DolphinWX/Src/MainAndroid.cpp     |   4 +
 8 files changed, 210 insertions(+), 88 deletions(-)
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/AboutActivity.java

diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index dd3a4d6818..ae0ee19324 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -109,10 +109,58 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="project.properties" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="GameListActivity.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="191" column="26" selection-start="6574" selection-end="6574" vertical-scroll-proportion="0.0" vertical-offset="2160" max-vertical-offset="4125">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="project.properties" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/project.properties">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="13" column="17" selection-start="562" selection-end="562" vertical-scroll-proportion="0.34210527" vertical-offset="0" max-vertical-offset="570">
+            <state line="13" column="17" selection-start="562" selection-end="562" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="300">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PrefsActivity.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="8" column="0" selection-start="215" selection-end="332" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="630">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AboutActivity.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/AboutActivity.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="12" column="3" selection-start="265" selection-end="265" vertical-scroll-proportion="0.0" vertical-offset="162" max-vertical-offset="555">
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#590#604#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="GameListItem.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="22" column="36" selection-start="580" selection-end="580" vertical-scroll-proportion="0.3816794" vertical-offset="90" max-vertical-offset="1050">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="FolderBrowser.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="41" column="61" selection-start="1431" selection-end="1454" vertical-scroll-proportion="0.0" vertical-offset="405" max-vertical-offset="1290">
               <folding />
             </state>
           </provider>
@@ -141,9 +189,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/res/layout/activity_main.xml" />
-        <option value="$PROJECT_DIR$/res/layout/gamelist_listview.xml" />
-        <option value="$PROJECT_DIR$/res/layout/gamelist_layout.xml" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListAdapter.java" />
         <option value="$PROJECT_DIR$/res/layout/sidemenu.xml" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java" />
@@ -152,11 +197,14 @@
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java" />
         <option value="$PROJECT_DIR$/bin/AndroidManifest.xml" />
-        <option value="$PROJECT_DIR$/AndroidManifest.xml" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java" />
         <option value="$PROJECT_DIR$/res/layout/folderbrowser.xml" />
         <option value="$PROJECT_DIR$/project.properties" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeLibrary.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/AboutActivity.java" />
+        <option value="$PROJECT_DIR$/AndroidManifest.xml" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java" />
       </list>
     </option>
   </component>
@@ -261,6 +309,24 @@
               <option name="myItemType" value="" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="src">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="org/dolphinemu/dolphinemu">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT USER_OBJECT="Root">
               <option name="myItemId" value="" />
@@ -505,7 +571,7 @@
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29697987" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29697987" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2179289" sideWeight="0.29026845" order="3" side_tool="true" content_ui="tabs" />
@@ -611,63 +677,6 @@
     <breakpoint-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="43" column="40" selection-start="1231" selection-end="1231" vertical-scroll-proportion="0.6505102" vertical-offset="285" max-vertical-offset="780">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="18" column="25" selection-start="476" selection-end="476" vertical-scroll-proportion="0.19788918" vertical-offset="0" max-vertical-offset="1290">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListAdapter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="12" column="13" selection-start="300" selection-end="300" vertical-scroll-proportion="-0.42091838" vertical-offset="225" max-vertical-offset="825">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/bin/AndroidManifest.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="39" column="18" selection-start="1869" selection-end="1869" vertical-scroll-proportion="1.1336899" vertical-offset="161" max-vertical-offset="720">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="16" column="17" selection-start="696" selection-end="696" vertical-scroll-proportion="-0.23214285" vertical-offset="331" max-vertical-offset="780">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/res/layout/gamelist_layout.xml">
-      <provider editor-type-id="android-designer">
-        <state />
-      </provider>
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="735">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/res/values/strings.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="570">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/res/drawable/ic_drawer.png">
-      <provider selected="true" editor-type-id="images">
-        <state />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/res/layout/folderbrowser.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state line="25" column="38" selection-start="1051" selection-end="1051" vertical-scroll-proportion="1.0190217" vertical-offset="0" max-vertical-offset="525">
@@ -678,20 +687,6 @@
         <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="13" column="13" selection-start="346" selection-end="346" vertical-scroll-proportion="0.03816794" vertical-offset="120" max-vertical-offset="630">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="58" column="8" selection-start="2544" selection-end="2544" vertical-scroll-proportion="-3.923664" vertical-offset="2217" max-vertical-offset="2610">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigAdapter.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="16" column="13" selection-start="385" selection-end="385" vertical-scroll-proportion="-0.7557252" vertical-offset="432" max-vertical-offset="825">
@@ -699,13 +694,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="173" column="64" selection-start="5829" selection-end="5829" vertical-scroll-proportion="-2.3393178" vertical-offset="3478" max-vertical-offset="4035">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="17" column="13" selection-start="433" selection-end="433" vertical-scroll-proportion="0.026929982" vertical-offset="45" max-vertical-offset="2850">
@@ -720,9 +708,94 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListAdapter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="12" column="13" selection-start="300" selection-end="300" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="825">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeLibrary.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="16" column="58" selection-start="731" selection-end="731" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="630">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="57" column="0" selection-start="2469" selection-end="2571" vertical-scroll-proportion="0.0" vertical-offset="540" max-vertical-offset="2610">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigItem.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="7" column="13" selection-start="167" selection-end="167" vertical-scroll-proportion="0.18421052" vertical-offset="0" max-vertical-offset="930">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuItem.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="8" column="13" selection-start="168" selection-end="168" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="630">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="38" column="41" selection-start="1810" selection-end="1810" vertical-scroll-proportion="0.6315789" vertical-offset="210" max-vertical-offset="825">
+          <folding>
+            <element signature="e#659#677#0" expanded="true" />
+            <element signature="e#767#785#0" expanded="true" />
+            <element signature="e#1338#1356#0" expanded="true" />
+            <element signature="e#1603#1621#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="8" column="0" selection-start="215" selection-end="332" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="630">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/project.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="13" column="17" selection-start="562" selection-end="562" vertical-scroll-proportion="0.34210527" vertical-offset="0" max-vertical-offset="570">
+        <state line="13" column="17" selection-start="562" selection-end="562" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="300">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="191" column="26" selection-start="6574" selection-end="6574" vertical-scroll-proportion="0.0" vertical-offset="2160" max-vertical-offset="4125">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="41" column="61" selection-start="1431" selection-end="1454" vertical-scroll-proportion="0.0" vertical-offset="45" max-vertical-offset="1290">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/AboutActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="12" column="3" selection-start="265" selection-end="265" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="555">
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#590#604#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="22" column="36" selection-start="580" selection-end="580" vertical-scroll-proportion="0.3816794" vertical-offset="90" max-vertical-offset="1050">
           <folding />
         </state>
       </provider>
diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index 33f35450d3..27ea8a8256 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -41,6 +41,9 @@
         <activity
             android:name=".GameListActivity" >
         </activity>
+        <activity
+            android:name=".AboutActivity" >
+        </activity>
     </application>
 
 </manifest>
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/AboutActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/AboutActivity.java
new file mode 100644
index 0000000000..613523c8dd
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/AboutActivity.java
@@ -0,0 +1,31 @@
+package org.dolphinemu.dolphinemu;
+
+import android.app.ListActivity;
+import android.os.Bundle;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2
+ * Refer to the license.txt file included.
+ */
+public class AboutActivity extends ListActivity {
+	private FolderBrowserAdapter adapter;
+	private int configPosition = 0;
+	boolean Configuring = false;
+	boolean firstEvent = true;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+		List<GameListItem> Input = new ArrayList<GameListItem>();
+		int a = 0;
+
+		Input.add(a++, new GameListItem(getApplicationContext(), "Build Revision", NativeLibrary.GetVersionString(), ""));
+		adapter = new FolderBrowserAdapter(this, R.layout.folderbrowser, Input);
+		setListAdapter(adapter);
+	}
+}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
index 9e9de31dab..825ba5bdd2 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
@@ -129,6 +129,7 @@ public class GameListActivity extends Activity {
 		dir.add(new SideMenuItem("Browse Folder", 0));
 		dir.add(new SideMenuItem("Settings", 1));
 		dir.add(new SideMenuItem("Gamepad Config", 2));
+		dir.add(new SideMenuItem("About", 3));
 
 		mDrawerAdapter = new SideMenuAdapter(this, R.layout.sidemenu, dir);
 		mDrawerList.setAdapter(mDrawerAdapter);
@@ -184,6 +185,11 @@ public class GameListActivity extends Activity {
 					Intent ConfigIntent = new Intent(me, InputConfigActivity.class);
 					startActivityForResult(ConfigIntent, 3);
 					break;
+				case 3:
+					Toast.makeText(me, "Loading up About", Toast.LENGTH_SHORT).show();
+					Intent AboutIntent = new Intent(me, AboutActivity.class);
+					startActivityForResult(AboutIntent, 3);
+					break;
 				default:
 					break;
 			}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java
index 3018300b12..6e5bfea66f 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java
@@ -20,7 +20,7 @@ public class GameListItem implements Comparable<GameListItem>{
         data = d;
         path = p;
         File file = new File(path);
-        if (!file.isDirectory())
+        if (!file.isDirectory() && !path.equals(""))
         {
         	int[] Banner = NativeLibrary.GetBanner(path);
         	if (Banner[0] == 0)
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
index 52918a040a..499dc7867b 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java
@@ -16,6 +16,7 @@ public class NativeLibrary {
 	public static native void SetConfig(String configFile, String Key, String Value, String Default);
 	public static native int[] GetBanner(String filename);
 	public static native String GetTitle(String filename);
+	public static native String GetVersionString();
 
 	public static native void Run(String File, Surface surf, int width, int height);
 	public static native void UnPauseEmulation();
diff --git a/Source/Core/Common/Src/Version.cpp b/Source/Core/Common/Src/Version.cpp
index f2ed26b75a..db89a25a82 100644
--- a/Source/Core/Common/Src/Version.cpp
+++ b/Source/Core/Common/Src/Version.cpp
@@ -27,8 +27,12 @@ const char *scm_rev_str = "Dolphin "
 #ifdef _M_X64
 #define NP_ARCH "x64"
 #else
+#ifdef _M_ARM
+#define NP_ARCH "ARM"
+#else	
 #define NP_ARCH "x86"
 #endif
+#endif
 
 #ifdef _WIN32
 const char *netplay_dolphin_ver = SCM_DESC_STR " W" NP_ARCH;
diff --git a/Source/Core/DolphinWX/Src/MainAndroid.cpp b/Source/Core/DolphinWX/Src/MainAndroid.cpp
index 1639e3fcf0..295d13ccef 100644
--- a/Source/Core/DolphinWX/Src/MainAndroid.cpp
+++ b/Source/Core/DolphinWX/Src/MainAndroid.cpp
@@ -254,6 +254,10 @@ JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetTitle(
 	env->ReleaseStringUTFChars(jFile, File);
 	return env->NewStringUTF(Name.c_str());
 }
+JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetVersionString(JNIEnv *env, jobject obj)
+{
+	return env->NewStringUTF(scm_rev_str);
+}
 JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetConfig(JNIEnv *env, jobject obj, jstring jFile, jstring jKey, jstring jValue, jstring jDefault)
 {
 	IniFile ini;

From eb579e4264da9523f59b960526efd9e23c88883a Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sun, 23 Jun 2013 02:46:45 -0500
Subject: [PATCH 195/352] Merge in JP's change to fix audio stuttering with
 OpenAL.

---
 Source/Core/AudioCommon/Src/OpenALStream.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp
index 1c6467b801..ce59dc6c57 100644
--- a/Source/Core/AudioCommon/Src/OpenALStream.cpp
+++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp
@@ -231,7 +231,7 @@ void OpenALStream::SoundLoop()
 
 			unsigned int nSamples = soundTouch.receiveSamples(sampleBuffer, OAL_MAX_SAMPLES * numBuffers);
 
-			if (nSamples < minSamples)
+			if (nSamples <= minSamples)
 				continue;
 
 			// Remove the Buffer from the Queue.  (uiBuffer contains the Buffer ID for the unqueued Buffer)

From b9953f5d6a1f54b53198bf1bd2b59bac1a90425b Mon Sep 17 00:00:00 2001
From: Tetsuo55 <akira146@hotmail.com>
Date: Sun, 23 Jun 2013 11:03:30 +0200
Subject: [PATCH 196/352] fix warning: format '%x' expects argument of type
 'unsigned int*', but argument 3 has type 'u8* {aka unsigned char*}'

---
 Source/Core/Core/Src/Movie.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp
index 0e31be380f..7a175eb6b0 100644
--- a/Source/Core/Core/Src/Movie.cpp
+++ b/Source/Core/Core/Src/Movie.cpp
@@ -60,7 +60,7 @@ std::string author = "";
 u64 g_titleID = 0;
 unsigned char MD5[16];
 u8 bongos;
-u8 revision[20];
+u32 revision[5];
 
 bool g_bRecordingFromSaveState = false;
 bool g_bPolled = false;
@@ -1184,9 +1184,9 @@ void GetSettings()
 		g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA);
 	bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD;
 
-	for (int i = 0; i < 20; ++i)
+	for (int i = 0; i < 5; ++i)
 	{
-		sscanf(SCM_REV_STR + 2 * i, "%02x", &revision[i]);
+		sscanf(SCM_REV_STR + 8 * i, "%08x", &revision[i]);
 	}
 }
 

From a2e132dd4b53d636641ecc4e74fdab7444f4b68e Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Sun, 23 Jun 2013 14:38:25 +0200
Subject: [PATCH 197/352] small index generator optimiztions

- rewrite loops to not use divisions and multiplications
- remove warnings as the current implementations seems to be correct (ignore additional vertices)
---
 .../Core/VideoCommon/Src/IndexGenerator.cpp   | 41 +++++++------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/IndexGenerator.cpp b/Source/Core/VideoCommon/Src/IndexGenerator.cpp
index 3970d8c82f..25597862e0 100644
--- a/Source/Core/VideoCommon/Src/IndexGenerator.cpp
+++ b/Source/Core/VideoCommon/Src/IndexGenerator.cpp
@@ -80,14 +80,10 @@ template <bool pr> __forceinline void IndexGenerator::WriteTriangle(u32 index1,
 
 template <bool pr> void IndexGenerator::AddList(u32 const numVerts)
 {
-	auto const numTris = numVerts / 3;
-	for (u32 i = 0; i != numTris; ++i)
+	for (u32 i = 2; i < numVerts; i+=3)
 	{
-		WriteTriangle<pr>(index + i * 3, index + i * 3 + 1, index + i * 3 + 2);
+		WriteTriangle<pr>(index + i - 2, index + i - 1, index + i);
 	}
-	u32 remainingVerts = numVerts - numTris*3;
-	if(remainingVerts)
-		ERROR_LOG(VIDEO, "AddList: unknown count of vertices found");
 }
 
 template <bool pr> void IndexGenerator::AddStrip(u32 const numVerts)
@@ -189,50 +185,41 @@ template <bool pr> void IndexGenerator::AddFan(u32 numVerts)
  */
 template <bool pr> void IndexGenerator::AddQuads(u32 numVerts)
 {
-	auto const numQuads = numVerts / 4;
-	for (u32 i = 0; i != numQuads; ++i)
+	u32 i = 3;
+	for (; i < numVerts; i+=4)
 	{
 		if(pr)
 		{
-			*Tptr++ = index + i * 4 + 1;
-			*Tptr++ = index + i * 4 + 2;
-			*Tptr++ = index + i * 4 + 0;
-			*Tptr++ = index + i * 4 + 3;
+			*Tptr++ = index + i - 2;
+			*Tptr++ = index + i - 1;
+			*Tptr++ = index + i - 3;
+			*Tptr++ = index + i - 0;
 			*Tptr++ = s_primitive_restart;
 			numT += 2;
 		}
 		else
 		{
-			WriteTriangle<pr>(index + i * 4, index + i * 4 + 1, index + i * 4 + 2);
-			WriteTriangle<pr>(index + i * 4, index + i * 4 + 2, index + i * 4 + 3);
+			WriteTriangle<pr>(index + i - 3, index + i - 2, index + i - 1);
+			WriteTriangle<pr>(index + i - 3, index + i - 1, index + i - 0);
 		}
 	}
 
 	// three vertices remaining, so render a triangle
-	u32 remainingVerts = numVerts - numQuads*4;
-	if(remainingVerts == 3)
+	if(i == numVerts)
 	{
 		WriteTriangle<pr>(index+numVerts-3, index+numVerts-2, index+numVerts-1);
 	}
-	else if(remainingVerts)
-	{
-		ERROR_LOG(VIDEO, "AddQuads: unknown count of vertices found");
-	}
 }
 
 // Lines
 void IndexGenerator::AddLineList(u32 numVerts)
 {
-	auto const numLines = numVerts / 2;
-	for (u32 i = 0; i != numLines; ++i)
+	for (u32 i = 1; i < numVerts; i+=2)
 	{
-		*Lptr++ = index + i * 2;
-		*Lptr++ = index + i * 2 + 1;
+		*Lptr++ = index + i - 1;
+		*Lptr++ = index + i;
 		++numL;
 	}
-	u32 remainingVerts = numVerts - numLines*2;
-	if(remainingVerts)
-		ERROR_LOG(VIDEO, "AddLineList: unknown count of vertices found");
 	
 }
 

From 597a6b34cb146c9b3488af5006386c3a18109446 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Sun, 23 Jun 2013 19:28:36 +0200
Subject: [PATCH 198/352] Compactify VertexShader uid struct.

---
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  |  8 ++++----
 Source/Core/VideoCommon/Src/VertexShaderGen.h | 20 +++++++++----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 8c157dc030..a7e3a3d923 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -376,7 +376,7 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 				break;
 			case XF_TEXGEN_REGULAR:
 			default:
-				uid_data.texMtxInfo[i].projection = xfregs.texMtxInfo[i].projection;
+				uid_data.texMtxInfo_n_projection |= xfregs.texMtxInfo[i].projection << i;
 				if (components & (VB_HAS_TEXMTXIDX0<<i))
 				{
 					out.Write("int tmp = int(tex%d.z);\n", i);
@@ -395,13 +395,13 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 				break;
 		}
 
-		uid_data.dualTexTrans.enabled = xfregs.dualTexTrans.enabled;
+		uid_data.dualTexTrans_enabled = xfregs.dualTexTrans.enabled;
 		// CHECKME: does this only work for regular tex gen types?
 		if (xfregs.dualTexTrans.enabled && texinfo.texgentype == XF_TEXGEN_REGULAR)
 		{
 			const PostMtxInfo& postInfo = xfregs.postMtxInfo[i];
 
-			uid_data.postMtxInfo[i].index = xfregs.postMtxInfo[i].index;
+			uid_data.postMtxInfo[i] = xfregs.postMtxInfo[i].index;
 			int postidx = postInfo.index;
 			out.Write("float4 P0 = " I_POSTTRANSFORMMATRICES"[%d];\n"
 				"float4 P1 = " I_POSTTRANSFORMMATRICES"[%d];\n"
@@ -419,7 +419,7 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 			}
 			else
 			{
-				uid_data.postMtxInfo[i].normalize = xfregs.postMtxInfo[i].normalize;
+				uid_data.postMtxInfo[i] |= xfregs.postMtxInfo[i].normalize << 6;
 				if (postInfo.normalize)
 					out.Write("o.tex%d.xyz = normalize(o.tex%d.xyz);\n", i, i);
 
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h
index 3f3087783d..3b233a22fe 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h
@@ -63,32 +63,30 @@ const s_svar VSVar_Loc[] = {  {I_POSNORMALMATRIX, C_POSNORMALMATRIX, 6 },
 						{I_DEPTHPARAMS, C_DEPTHPARAMS, 1 },
 						};
 
-#pragma pack(4)
+#pragma pack(1)
 
 struct vertex_shader_uid_data
 {
-	u32 num_values; // TODO: Shouldn't be a u32
 
 	u32 NumValues() const { return num_values; }
+
 	u32 components;
+	u32 num_values : 16; // TODO: Shouldn't be a u32
 	u32 numColorChans : 2;
 	u32 numTexGens : 4;
 
+	u32 dualTexTrans_enabled : 1;
+
+	u32 texMtxInfo_n_projection : 16; // XF_TEXPROJ_X
 	struct {
-		u32 projection : 1; // XF_TEXPROJ_X
 		u32 inputform : 2; // XF_TEXINPUT_X
 		u32 texgentype : 3; // XF_TEXGEN_X
 		u32 sourcerow : 5; // XF_SRCGEOM_X
 		u32 embosssourceshift : 3; // what generated texcoord to use
 		u32 embosslightshift : 3; // light index that is used
-	} texMtxInfo[8];
-	struct {
-		u32 index : 6; // base row of dual transform matrix
-		u32 normalize : 1; // normalize before send operation
-	} postMtxInfo[8];
-	struct {
-		u32 enabled : 1;
-	} dualTexTrans;
+	} texMtxInfo[8]; // TODO: Wasting space
+
+	u8 postMtxInfo[8]; // index + normalize + 1 padding bit, TODO: Can be made a struct again..
 
 	LightingUidData lighting;
 };

From 06b98225e72e9131d03ff4dabc348ea96809ae8d Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sun, 23 Jun 2013 21:16:20 -0500
Subject: [PATCH 199/352] [Android] 0.6 Release

---
 Source/Android/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index 27ea8a8256..5574b269dd 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.dolphinemu.dolphinemu"
-    android:versionCode="5"
-    android:versionName="0.5" >
+    android:versionCode="6"
+    android:versionName="0.6" >
 
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14"/>
     

From ae395639b0dab9685664b12efb06fe9c0a795deb Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sun, 23 Jun 2013 21:16:55 -0500
Subject: [PATCH 200/352] [Android] Fix drawing on screen control setting being
 derpy at times.

---
 .../src/org/dolphinemu/dolphinemu/InputConfigActivity.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java
index d7132a4aff..6646865f03 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java
@@ -66,7 +66,7 @@ public class InputConfigActivity extends ListActivity {
 		{
 			case 0: // On screen controls
 				String newBind;
-				if (o.getBind() == "True")
+				if (o.getBind().equals("True"))
 				{
 					Toast.makeText(this, "Not Drawing on screen controls", Toast.LENGTH_SHORT).show();
 					newBind = "False";
@@ -111,9 +111,7 @@ public class InputConfigActivity extends ListActivity {
 			if (firstEvent)
 			{
 				m_values.clear();
-				for (int a = 0; a < motions.size(); ++a)
-				{
-					InputDevice.MotionRange range = motions.get(a);
+				for (InputDevice.MotionRange range : motions) {
 					m_values.add(event.getAxisValue(range.getAxis()));
 				}
 				firstEvent = false;

From 852698ceef5a4a48aff89e83a9356e7f03e4bf02 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sun, 23 Jun 2013 21:17:37 -0500
Subject: [PATCH 201/352] [Android] On first run, open up the navigation drawer
 so people realize that there is a drawer.

---
 .../org/dolphinemu/dolphinemu/GameListActivity.java    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
index 825ba5bdd2..25d3adb9fb 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
@@ -152,6 +152,16 @@ public class GameListActivity extends Activity {
 		mDrawerLayout.setDrawerListener(mDrawerToggle);
 
 		recreateFragment();
+
+		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+		boolean bFirstRun = prefs.getBoolean("FirstRun", true);
+		if (bFirstRun)
+		{
+			SharedPreferences.Editor editor = prefs.edit();
+			editor.putBoolean("FirstRun", false);
+			editor.commit();
+			mDrawerLayout.openDrawer(mDrawerList);
+		}
 	}
 
 	private void recreateFragment()

From 5f9199830285639a03d82e211de776e9d3e73a66 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Mon, 24 Jun 2013 01:23:24 -0500
Subject: [PATCH 202/352] [Android] Add default Android config file

---
 Source/Android/assets/Dolphin.ini             | 186 ++++++++++++++++++
 .../dolphinemu/DolphinEmulator.java           |  17 +-
 2 files changed, 200 insertions(+), 3 deletions(-)
 create mode 100644 Source/Android/assets/Dolphin.ini

diff --git a/Source/Android/assets/Dolphin.ini b/Source/Android/assets/Dolphin.ini
new file mode 100644
index 0000000000..1ccac4d26e
--- /dev/null
+++ b/Source/Android/assets/Dolphin.ini
@@ -0,0 +1,186 @@
+[General]
+GCMPathes = 0
+LastFilename = 
+ShowLag = False
+RecursiveGCMPaths = False
+NANDRoot = //sdcard/dolphin-emu/Wii
+WirelessMac = 
+[Core]
+CPUCore = 3
+CPUThread = False
+GFXBackend = Software Renderer
+HLE_BS2 = False
+Fastmem = True
+DSPThread = False
+DSPHLE = True
+SkipIdle = True
+DefaultGCM = 
+DVDRoot = 
+Apploader = 
+EnableCheats = False
+SelectedLanguage = 0
+DPL2Decoder = False
+Latency = 14
+MemcardA = 
+MemcardB = 
+SlotA = 1
+SlotB = 255
+SerialPort1 = 255
+BBA_MAC = 
+SIDevice0 = 6
+SIDevice1 = 0
+SIDevice2 = 0
+SIDevice3 = 0
+WiiSDCard = False
+WiiKeyboard = False
+WiimoteReconnectOnLoad = True
+WiimoteContinuousScanning = False
+WiimoteEnableSpeaker = True
+RunCompareServer = False
+RunCompareClient = False
+FrameLimit = 0x00000001
+UseFPS = False
+[Interface]
+ConfirmStop = False
+UsePanicHandlers = True
+OnScreenDisplayMessages = True
+HideCursor = False
+AutoHideCursor = False
+MainWindowPosX = 100
+MainWindowPosY = 100
+MainWindowWidth = 800
+MainWindowHeight = 600
+Language = 0
+ShowToolbar = True
+ShowStatusbar = True
+ShowLogWindow = False
+ShowLogConfigWindow = False
+ShowConsole = False
+ThemeName = Boomy
+[Hotkeys]
+Open = 79
+OpenModifier = 2
+ChangeDisc = 0
+ChangeDiscModifier = 0
+RefreshList = 0
+RefreshListModifier = 0
+PlayPause = 349
+PlayPauseModifier = 0
+Stop = 27
+StopModifier = 0
+Reset = 0
+ResetModifier = 0
+FrameAdvance = 0
+FrameAdvanceModifier = 0
+StartRecording = 0
+StartRecordingModifier = 0
+PlayRecording = 0
+PlayRecordingModifier = 0
+ExportRecording = 0
+ExportRecordingModifier = 0
+Readonlymode = 0
+ReadonlymodeModifier = 0
+ToggleFullscreen = 13
+ToggleFullscreenModifier = 1
+Screenshot = 348
+ScreenshotModifier = 0
+Exit = 0
+ExitModifier = 0
+Wiimote1Connect = 344
+Wiimote1ConnectModifier = 1
+Wiimote2Connect = 345
+Wiimote2ConnectModifier = 1
+Wiimote3Connect = 346
+Wiimote3ConnectModifier = 1
+Wiimote4Connect = 347
+Wiimote4ConnectModifier = 1
+LoadStateSlot1 = 340
+LoadStateSlot1Modifier = 0
+LoadStateSlot2 = 341
+LoadStateSlot2Modifier = 0
+LoadStateSlot3 = 342
+LoadStateSlot3Modifier = 0
+LoadStateSlot4 = 343
+LoadStateSlot4Modifier = 0
+LoadStateSlot5 = 344
+LoadStateSlot5Modifier = 0
+LoadStateSlot6 = 345
+LoadStateSlot6Modifier = 0
+LoadStateSlot7 = 346
+LoadStateSlot7Modifier = 0
+LoadStateSlot8 = 347
+LoadStateSlot8Modifier = 0
+SaveStateSlot1 = 340
+SaveStateSlot1Modifier = 4
+SaveStateSlot2 = 341
+SaveStateSlot2Modifier = 4
+SaveStateSlot3 = 342
+SaveStateSlot3Modifier = 4
+SaveStateSlot4 = 343
+SaveStateSlot4Modifier = 4
+SaveStateSlot5 = 344
+SaveStateSlot5Modifier = 4
+SaveStateSlot6 = 345
+SaveStateSlot6Modifier = 4
+SaveStateSlot7 = 346
+SaveStateSlot7Modifier = 4
+SaveStateSlot8 = 347
+SaveStateSlot8Modifier = 4
+LoadLastState1 = 0
+LoadLastState1Modifier = 0
+LoadLastState2 = 0
+LoadLastState2Modifier = 0
+LoadLastState3 = 0
+LoadLastState3Modifier = 0
+LoadLastState4 = 0
+LoadLastState4Modifier = 0
+LoadLastState5 = 0
+LoadLastState5Modifier = 0
+LoadLastState6 = 0
+LoadLastState6Modifier = 0
+LoadLastState7 = 0
+LoadLastState7Modifier = 0
+LoadLastState8 = 0
+LoadLastState8Modifier = 0
+SaveFirstState = 0
+SaveFirstStateModifier = 0
+UndoLoadState = 351
+UndoLoadStateModifier = 0
+UndoSaveState = 351
+UndoSaveStateModifier = 4
+[Display]
+FullscreenResolution = Auto
+Fullscreen = False
+RenderToMain = False
+RenderWindowXPos = -1
+RenderWindowYPos = -1
+RenderWindowWidth = 640
+RenderWindowHeight = 480
+RenderWindowAutoSize = False
+KeepWindowOnTop = False
+ProgressiveScan = False
+DisableScreenSaver = True
+ForceNTSCJ = False
+[GameList]
+ListDrives = False
+ListWad = True
+ListWii = True
+ListGC = True
+ListJap = True
+ListPal = True
+ListUsa = True
+ListFrance = True
+ListItaly = True
+ListKorea = True
+ListTaiwan = True
+ListUnknown = True
+ListSort = 3
+ListSortSecondary = 0
+[Movie]
+PauseMovie = False
+Author = 
+[DSP]
+EnableJIT = True
+DumpAudio = False
+Backend = OpenSLES
+Volume = 100
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index d8559c1393..2cc19d3955 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -3,8 +3,10 @@ package org.dolphinemu.dolphinemu;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Environment;
+import android.preference.PreferenceManager;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.InputDevice;
@@ -91,7 +93,8 @@ public class DolphinEmulator<MainActivity> extends Activity
 			
 			// Copy assets if needed
 			java.io.File file = new java.io.File(
-					Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu" + File.separator + "NoBanner.png");
+					Environment.getExternalStorageDirectory()+File.separator+
+							"dolphin-emu" + File.separator + "Config" + File.separator + "Dolphin.ini");
 			if(!file.exists())
 			{
 				CopyAsset("ButtonA.png", 
@@ -108,7 +111,15 @@ public class DolphinEmulator<MainActivity> extends Activity
 						"dolphin-emu" + File.separator + "NoBanner.png");
 				CopyAsset("GCPadNew.ini", 
 						Environment.getExternalStorageDirectory()+File.separator+
-						"dolphin-emu" + File.separator +"Config"+ File.separator +"GCPadNew.ini");
+						"dolphin-emu" + File.separator + "Config" + File.separator + "GCPadNew.ini");
+				CopyAsset("GCPadNew.ini",
+						Environment.getExternalStorageDirectory()+File.separator+
+						"dolphin-emu" + File.separator + "Config" + File.separator  +"Dolphin.ini");
+
+				SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+				SharedPreferences.Editor editor = prefs.edit();
+				editor.clear();
+				editor.commit();
 			}
 		}
 	}
@@ -129,7 +140,7 @@ public class DolphinEmulator<MainActivity> extends Activity
 			String FileName = data.getStringExtra("Select");
 			GLview = new NativeGLSurfaceView(this);
 			this.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-			String backend = NativeLibrary.GetConfig("Dolphin.ini", "Core", "GFXBackend", "OGL");
+			String backend = NativeLibrary.GetConfig("Dolphin.ini", "Core", "GFXBackend", "Software Renderer");
 			if (backend.equals("OGL"))
 				GLview.SetDimensions(screenHeight, screenWidth);
 			else

From f73a97b2429bb7aa6e2b2d02c4cbc0e776a84987 Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Mon, 24 Jun 2013 09:14:22 -0400
Subject: [PATCH 203/352] Revert "fix warning: format '%x' expects argument of
 type 'unsigned int*', but argument 3 has type 'u8* {aka unsigned char*}'"

This reverts commit b9953f5d6a1f54b53198bf1bd2b59bac1a90425b.
---
 Source/Core/Core/Src/Movie.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp
index 7a175eb6b0..0e31be380f 100644
--- a/Source/Core/Core/Src/Movie.cpp
+++ b/Source/Core/Core/Src/Movie.cpp
@@ -60,7 +60,7 @@ std::string author = "";
 u64 g_titleID = 0;
 unsigned char MD5[16];
 u8 bongos;
-u32 revision[5];
+u8 revision[20];
 
 bool g_bRecordingFromSaveState = false;
 bool g_bPolled = false;
@@ -1184,9 +1184,9 @@ void GetSettings()
 		g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA);
 	bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD;
 
-	for (int i = 0; i < 5; ++i)
+	for (int i = 0; i < 20; ++i)
 	{
-		sscanf(SCM_REV_STR + 8 * i, "%08x", &revision[i]);
+		sscanf(SCM_REV_STR + 2 * i, "%02x", &revision[i]);
 	}
 }
 

From 970661a0c5fc0c1ad481e0498dbe0320a704ed20 Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Mon, 24 Jun 2013 12:30:08 -0400
Subject: [PATCH 204/352] Warning fix.

---
 Source/Core/Core/Src/Movie.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp
index 0e31be380f..89a4b4fda6 100644
--- a/Source/Core/Core/Src/Movie.cpp
+++ b/Source/Core/Core/Src/Movie.cpp
@@ -1186,7 +1186,7 @@ void GetSettings()
 
 	for (int i = 0; i < 20; ++i)
 	{
-		sscanf(SCM_REV_STR + 2 * i, "%02x", &revision[i]);
+		sscanf(SCM_REV_STR + 2 * i, "%02hhx", &revision[i]);
 	}
 }
 

From 143d2eccb49b700ccd00dfa229b03d1d1a51533c Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Mon, 24 Jun 2013 12:16:59 -0500
Subject: [PATCH 205/352] [Android] Open drawer if there isn't anything in the
 game list, instead of on first run.

---
 .../dolphinemu/GameListActivity.java          | 116 +++--------------
 .../dolphinemu/GameListFragment.java          | 121 ++++++++++++++++++
 2 files changed, 137 insertions(+), 100 deletions(-)
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
index 25d3adb9fb..41b0ecfd9c 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
@@ -10,17 +10,13 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.widget.DrawerLayout;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.Toast;
 
-import java.io.File;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -28,7 +24,8 @@ import java.util.List;
  * Licensed under GPLv2
  * Refer to the license.txt file included.
  */
-public class GameListActivity extends Activity {
+public class GameListActivity extends Activity
+		implements GameListFragment.OnGameListZeroListener{
 
 	enum keyTypes {TYPE_STRING, TYPE_BOOL};
 
@@ -37,90 +34,19 @@ public class GameListActivity extends Activity {
 	private SideMenuAdapter mDrawerAdapter;
 	private ListView mDrawerList;
 
-	private static GameListActivity me;
+	private static GameListActivity mMe;
 
-	public static class GameListFragment extends Fragment {
-		private ListView mMainList;
-		private GameListAdapter mGameAdapter;
-
-		public GameListFragment() {
-			// Empty constructor required for fragment subclasses
-		}
-		private void Fill()
-		{
-			List<GameListItem>fls = new ArrayList<GameListItem>();
-			String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
-			int intDirectories = Integer.parseInt(Directories);
-			for (int a = 0; a < intDirectories; ++a)
-			{
-				String BrowseDir = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPath" + Integer.toString(a), "");
-				File currentDir = new File(BrowseDir);
-				File[]dirs = currentDir.listFiles();
-				try
-				{
-					for(File ff: dirs)
-					{
-						if (ff.getName().charAt(0) != '.')
-							if(!ff.isDirectory())
-								if (ff.getName().toLowerCase().contains(".gcm") ||
-										ff.getName().toLowerCase().contains(".iso") ||
-										ff.getName().toLowerCase().contains(".wbfs") ||
-										ff.getName().toLowerCase().contains(".gcz") ||
-										ff.getName().toLowerCase().contains(".dol") ||
-										ff.getName().toLowerCase().contains(".elf") ||
-										ff.getName().toLowerCase().contains(".dff"))
-									fls.add(new GameListItem(me.getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath()));
-					}
-				}
-				catch(Exception ignored)
-				{
-				}
-			}
-			Collections.sort(fls);
-
-			mGameAdapter = new GameListAdapter(me, R.layout.gamelist_layout, fls);
-			mMainList.setAdapter(mGameAdapter);
-		}
-
-		@Override
-		public View onCreateView(LayoutInflater inflater, ViewGroup container,
-		                         Bundle savedInstanceState) {
-			View rootView = inflater.inflate(R.layout.gamelist_listview, container, false);
-			mMainList = (ListView) rootView.findViewById(R.id.gamelist);
-			mMainList.setOnItemClickListener(mGameItemClickListener);
-
-			Fill();
-
-			return mMainList;
-		}
-		private AdapterView.OnItemClickListener mGameItemClickListener = new AdapterView.OnItemClickListener()
-		{
-			public void onItemClick(AdapterView<?> parent, View view, int position, long id)
-			{
-				GameListItem o = mGameAdapter.getItem(position);
-				if(!(o.getData().equalsIgnoreCase("folder")||o.getData().equalsIgnoreCase("parent directory")))
-				{
-					onFileClick(o.getPath());
-				}
-			}
-		};
-		private void onFileClick(String o)
-		{
-			Toast.makeText(me, "File Clicked: " + o, Toast.LENGTH_SHORT).show();
-
-			Intent intent = new Intent();
-			intent.putExtra("Select", o);
-			me.setResult(Activity.RESULT_OK, intent);
-
-			me.finish();
-		}
+	// Called from the game list fragment
+	public void onZeroFiles()
+	{
+		mDrawerLayout.openDrawer(mDrawerList);
 	}
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.gamelist_activity);
-		me = this;
+		mMe = this;
 
 		mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
 		mDrawerList = (ListView) findViewById(R.id.left_drawer);
@@ -152,16 +78,6 @@ public class GameListActivity extends Activity {
 		mDrawerLayout.setDrawerListener(mDrawerToggle);
 
 		recreateFragment();
-
-		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-		boolean bFirstRun = prefs.getBoolean("FirstRun", true);
-		if (bFirstRun)
-		{
-			SharedPreferences.Editor editor = prefs.edit();
-			editor.putBoolean("FirstRun", false);
-			editor.commit();
-			mDrawerLayout.openDrawer(mDrawerList);
-		}
 	}
 
 	private void recreateFragment()
@@ -181,23 +97,23 @@ public class GameListActivity extends Activity {
 			switch(o.getID())
 			{
 				case 0:
-					Toast.makeText(me, "Loading up the browser", Toast.LENGTH_SHORT).show();
-					Intent ListIntent = new Intent(me, FolderBrowser.class);
+					Toast.makeText(mMe, "Loading up the browser", Toast.LENGTH_SHORT).show();
+					Intent ListIntent = new Intent(mMe, FolderBrowser.class);
 					startActivityForResult(ListIntent, 1);
 					break;
 				case 1:
-					Toast.makeText(me, "Loading up settings", Toast.LENGTH_SHORT).show();
-					Intent SettingIntent = new Intent(me, PrefsActivity.class);
+					Toast.makeText(mMe, "Loading up settings", Toast.LENGTH_SHORT).show();
+					Intent SettingIntent = new Intent(mMe, PrefsActivity.class);
 					startActivityForResult(SettingIntent, 2);
 					break;
 				case 2:
-					Toast.makeText(me, "Loading up gamepad config", Toast.LENGTH_SHORT).show();
-					Intent ConfigIntent = new Intent(me, InputConfigActivity.class);
+					Toast.makeText(mMe, "Loading up gamepad config", Toast.LENGTH_SHORT).show();
+					Intent ConfigIntent = new Intent(mMe, InputConfigActivity.class);
 					startActivityForResult(ConfigIntent, 3);
 					break;
 				case 3:
-					Toast.makeText(me, "Loading up About", Toast.LENGTH_SHORT).show();
-					Intent AboutIntent = new Intent(me, AboutActivity.class);
+					Toast.makeText(mMe, "Loading up About", Toast.LENGTH_SHORT).show();
+					Intent AboutIntent = new Intent(mMe, AboutActivity.class);
 					startActivityForResult(AboutIntent, 3);
 					break;
 				default:
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java
new file mode 100644
index 0000000000..4d2e0d4236
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java
@@ -0,0 +1,121 @@
+package org.dolphinemu.dolphinemu;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.Toast;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2
+ * Refer to the license.txt file included.
+ */
+public class GameListFragment extends Fragment
+{
+	private ListView mMainList;
+	private GameListAdapter mGameAdapter;
+	private static GameListActivity mMe;
+	OnGameListZeroListener mCallback;
+
+	public interface OnGameListZeroListener {
+		public void onZeroFiles();
+	}
+
+	public GameListFragment() {
+		// Empty constructor required for fragment subclasses
+	}
+	private void Fill()
+	{
+		List<GameListItem> fls = new ArrayList<GameListItem>();
+		String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
+		int intDirectories = Integer.parseInt(Directories);
+		for (int a = 0; a < intDirectories; ++a)
+		{
+			String BrowseDir = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPath" + Integer.toString(a), "");
+			File currentDir = new File(BrowseDir);
+			File[]dirs = currentDir.listFiles();
+			try
+			{
+				for(File ff: dirs)
+				{
+					if (ff.getName().charAt(0) != '.')
+						if(!ff.isDirectory())
+							if (ff.getName().toLowerCase().contains(".gcm") ||
+									ff.getName().toLowerCase().contains(".iso") ||
+									ff.getName().toLowerCase().contains(".wbfs") ||
+									ff.getName().toLowerCase().contains(".gcz") ||
+									ff.getName().toLowerCase().contains(".dol") ||
+									ff.getName().toLowerCase().contains(".elf") ||
+									ff.getName().toLowerCase().contains(".dff"))
+								fls.add(new GameListItem(mMe.getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath()));
+				}
+			}
+			catch(Exception ignored)
+			{
+			}
+		}
+		Collections.sort(fls);
+
+		mGameAdapter = new GameListAdapter(mMe, R.layout.gamelist_layout, fls);
+		mMainList.setAdapter(mGameAdapter);
+		if (fls.size() == 0)
+			mCallback.onZeroFiles();
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+	                         Bundle savedInstanceState) {
+		View rootView = inflater.inflate(R.layout.gamelist_listview, container, false);
+		mMainList = (ListView) rootView.findViewById(R.id.gamelist);
+		mMainList.setOnItemClickListener(mGameItemClickListener);
+
+		Fill();
+
+		return mMainList;
+	}
+	private AdapterView.OnItemClickListener mGameItemClickListener = new AdapterView.OnItemClickListener()
+	{
+		public void onItemClick(AdapterView<?> parent, View view, int position, long id)
+		{
+			GameListItem o = mGameAdapter.getItem(position);
+			if(!(o.getData().equalsIgnoreCase("folder")||o.getData().equalsIgnoreCase("parent directory")))
+			{
+				onFileClick(o.getPath());
+			}
+		}
+	};
+	private void onFileClick(String o)
+	{
+		Toast.makeText(mMe, "File Clicked: " + o, Toast.LENGTH_SHORT).show();
+
+		Intent intent = new Intent();
+		intent.putExtra("Select", o);
+		mMe.setResult(Activity.RESULT_OK, intent);
+		mMe.finish();
+	}
+	@Override
+	public void onAttach(Activity activity) {
+		super.onAttach(activity);
+
+		// This makes sure that the container activity has implemented
+		// the callback interface. If not, it throws an exception
+		try {
+			mCallback = (OnGameListZeroListener) activity;
+			mMe = (GameListActivity) activity;
+		} catch (ClassCastException e) {
+			throw new ClassCastException(activity.toString()
+					+ " must implement OnGameListZeroListener");
+		}
+	}
+}
\ No newline at end of file

From 877106b027431c6edb2d2c702fa6d811dac3d250 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sun, 16 Jun 2013 20:07:10 -0400
Subject: [PATCH 206/352] InputCommon: Split Device stuff out

The ExpressionParser needs this to be out of here to prevent issues
with cyclic references.
---
 Source/Core/DolphinWX/Src/InputConfigDiag.cpp |  18 +-
 Source/Core/DolphinWX/Src/InputConfigDiag.h   |   2 +-
 Source/Core/InputCommon/CMakeLists.txt        |   3 +-
 Source/Core/InputCommon/InputCommon.vcxproj   |   4 +-
 .../InputCommon/InputCommon.vcxproj.filters   |   3 +
 Source/Core/InputCommon/Src/ControllerEmu.h   |   3 +-
 .../ControllerInterface/Android/Android.cpp   |   2 +-
 .../Src/ControllerInterface/Android/Android.h |   6 +-
 .../ControllerInterface.cpp                   | 186 +----------------
 .../ControllerInterface/ControllerInterface.h | 161 +--------------
 .../Src/ControllerInterface/DInput/DInput.cpp |  19 +-
 .../Src/ControllerInterface/DInput/DInput.h   |   4 +-
 .../DInput/DInputJoystick.cpp                 |  11 +-
 .../DInput/DInputJoystick.h                   |  13 +-
 .../DInput/DInputKeyboardMouse.cpp            |  17 +-
 .../DInput/DInputKeyboardMouse.h              |   6 +-
 .../Src/ControllerInterface/Device.cpp        | 193 ++++++++++++++++++
 .../Src/ControllerInterface/Device.h          | 171 ++++++++++++++++
 .../Src/ControllerInterface/OSX/OSX.h         |   4 +-
 .../Src/ControllerInterface/OSX/OSX.mm        |   9 +-
 .../Src/ControllerInterface/OSX/OSXJoystick.h |   4 +-
 .../ControllerInterface/OSX/OSXJoystick.mm    |   3 +-
 .../Src/ControllerInterface/OSX/OSXKeyboard.h |   4 +-
 .../ControllerInterface/OSX/OSXKeyboard.mm    |   3 +-
 .../Src/ControllerInterface/SDL/SDL.cpp       |  11 +-
 .../Src/ControllerInterface/SDL/SDL.h         |  10 +-
 .../Src/ControllerInterface/XInput/XInput.cpp |   7 +-
 .../Src/ControllerInterface/XInput/XInput.h   |  14 +-
 .../Src/ControllerInterface/Xlib/Xlib.cpp     |   2 +-
 .../Src/ControllerInterface/Xlib/Xlib.h       |   6 +-
 30 files changed, 448 insertions(+), 451 deletions(-)
 create mode 100644 Source/Core/InputCommon/Src/ControllerInterface/Device.cpp
 create mode 100644 Source/Core/InputCommon/Src/ControllerInterface/Device.h

diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
index ef4ae8d29b..ae52c7dbf1 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
@@ -184,13 +184,13 @@ void ControlDialog::UpdateListContents()
 {
 	control_lbox->Clear();
 
-	ControllerInterface::Device* const dev = g_controller_interface.FindDevice(m_devq);
+	Device* const dev = g_controller_interface.FindDevice(m_devq);
 	if (dev)
 	{
 		if (control_reference->is_input)
 		{
 			// for inputs
-			std::vector<ControllerInterface::Device::Input*>::const_iterator
+			std::vector<Device::Input*>::const_iterator
 				i = dev->Inputs().begin(),
 				e = dev->Inputs().end();
 			for (; i!=e; ++i)
@@ -199,7 +199,7 @@ void ControlDialog::UpdateListContents()
 		else
 		{
 			// for outputs
-			std::vector<ControllerInterface::Device::Output*>::const_iterator
+			std::vector<Device::Output*>::const_iterator
 				i = dev->Outputs().begin(),
 				e = dev->Outputs().end();
 			for (; i!=e; ++i)
@@ -418,7 +418,7 @@ void ControlDialog::DetectControl(wxCommandEvent& event)
 	wxButton* const btn = (wxButton*)event.GetEventObject();
 	const wxString lbl = btn->GetLabel();
 
-	ControllerInterface::Device* const dev = g_controller_interface.FindDevice(m_devq);
+	Device* const dev = g_controller_interface.FindDevice(m_devq);
 	if (dev)
 	{
 		btn->SetLabel(_("[ waiting ]"));
@@ -427,7 +427,7 @@ void ControlDialog::DetectControl(wxCommandEvent& event)
 		wxTheApp->Yield();
 
 		std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
-		ControllerInterface::Device::Control* const ctrl = control_reference->Detect(DETECT_WAIT_TIME, dev);
+		Device::Control* const ctrl = control_reference->Detect(DETECT_WAIT_TIME, dev);
 
 		// if we got input, select it in the list
 		if (ctrl)
@@ -442,7 +442,7 @@ void GamepadPage::DetectControl(wxCommandEvent& event)
 	ControlButton* btn = (ControlButton*)event.GetEventObject();
 
 	// find device :/
-	ControllerInterface::Device* const dev = g_controller_interface.FindDevice(controller->default_device);
+	Device* const dev = g_controller_interface.FindDevice(controller->default_device);
 	if (dev)
 	{
 		btn->SetLabel(_("[ waiting ]"));
@@ -451,7 +451,7 @@ void GamepadPage::DetectControl(wxCommandEvent& event)
 		wxTheApp->Yield();
 
 		std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
-		ControllerInterface::Device::Control* const ctrl = btn->control_reference->Detect(DETECT_WAIT_TIME, dev);
+		Device::Control* const ctrl = btn->control_reference->Detect(DETECT_WAIT_TIME, dev);
 
 		// if we got input, update expression and reference
 		if (ctrl)
@@ -614,11 +614,11 @@ void InputConfigDialog::UpdateDeviceComboBox()
 {
 	std::vector< GamepadPage* >::iterator i = m_padpages.begin(),
 		e = m_padpages.end();
-	ControllerInterface::DeviceQualifier dq;
+	DeviceQualifier dq;
 	for (; i != e; ++i)
 	{
 		(*i)->device_cbox->Clear();
-		std::vector<ControllerInterface::Device*>::const_iterator
+		std::vector<Device*>::const_iterator
 			di = g_controller_interface.Devices().begin(),
 			de = g_controller_interface.Devices().end();
 		for (; di!=de; ++di)
diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.h b/Source/Core/DolphinWX/Src/InputConfigDiag.h
index 882437452a..a11cea2cb3 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.h
+++ b/Source/Core/DolphinWX/Src/InputConfigDiag.h
@@ -112,7 +112,7 @@ public:
 private:
 	GamepadPage* const		m_parent;
 	wxStaticText*		m_bound_label;
-	ControllerInterface::DeviceQualifier	m_devq;
+	DeviceQualifier	m_devq;
 };
 
 class ExtensionButton : public wxButton
diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt
index f6995583ff..265f5a433d 100644
--- a/Source/Core/InputCommon/CMakeLists.txt
+++ b/Source/Core/InputCommon/CMakeLists.txt
@@ -2,7 +2,8 @@ set(SRCS	Src/ControllerEmu.cpp
 			Src/InputConfig.cpp
 			Src/UDPWiimote.cpp
 			Src/UDPWrapper.cpp
-			Src/ControllerInterface/ControllerInterface.cpp)
+			Src/ControllerInterface/ControllerInterface.cpp
+			Src/ControllerInterface/Device.cpp)
 
 if(WIN32)
 	set(SRCS	${SRCS}
diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj
index dc987d83a2..c3243854a2 100644
--- a/Source/Core/InputCommon/InputCommon.vcxproj
+++ b/Source/Core/InputCommon/InputCommon.vcxproj
@@ -166,6 +166,7 @@
   <ItemGroup>
     <ClCompile Include="Src\ControllerEmu.cpp" />
     <ClCompile Include="Src\ControllerInterface\ControllerInterface.cpp" />
+    <ClCompile Include="Src\ControllerInterface\Device.cpp" />
     <ClCompile Include="Src\ControllerInterface\DInput\DInput.cpp" />
     <ClCompile Include="Src\ControllerInterface\DInput\DInputJoystick.cpp" />
     <ClCompile Include="Src\ControllerInterface\DInput\DInputKeyboardMouse.cpp" />
@@ -178,6 +179,7 @@
   <ItemGroup>
     <ClInclude Include="Src\ControllerEmu.h" />
     <ClInclude Include="Src\ControllerInterface\ControllerInterface.h" />
+    <ClInclude Include="Src\ControllerInterface\Device.h" />
     <ClInclude Include="Src\ControllerInterface\DInput\DInput.h" />
     <ClInclude Include="Src\ControllerInterface\DInput\DInputJoystick.h" />
     <ClInclude Include="Src\ControllerInterface\DInput\DInputKeyboardMouse.h" />
@@ -195,4 +197,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/Core/InputCommon/InputCommon.vcxproj.filters b/Source/Core/InputCommon/InputCommon.vcxproj.filters
index 311476bc72..b4d5ff074f 100644
--- a/Source/Core/InputCommon/InputCommon.vcxproj.filters
+++ b/Source/Core/InputCommon/InputCommon.vcxproj.filters
@@ -39,6 +39,9 @@
     <ClInclude Include="Src\ControllerInterface\ControllerInterface.h">
       <Filter>ControllerInterface</Filter>
     </ClInclude>
+    <ClInclude Include="Src\ControllerInterface\Device.h">
+      <Filter>ControllerInterface\Device</Filter>
+    </ClInclude>
     <ClInclude Include="Src\ControllerInterface\DInput\NamedKeys.h">
       <Filter>ControllerInterface\DInput</Filter>
     </ClInclude>
diff --git a/Source/Core/InputCommon/Src/ControllerEmu.h b/Source/Core/InputCommon/Src/ControllerEmu.h
index cf87f2562e..5dc54b463f 100644
--- a/Source/Core/InputCommon/Src/ControllerEmu.h
+++ b/Source/Core/InputCommon/Src/ControllerEmu.h
@@ -449,8 +449,7 @@ public:
 
 	std::vector< ControlGroup* >		groups;
 
-	ControllerInterface::DeviceQualifier	default_device;
-
+	DeviceQualifier	default_device;
 };
 
 
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp
index 6469945971..ef95f9b363 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.cpp
@@ -23,7 +23,7 @@ namespace ciface
 namespace Android
 {
 
-void Init( std::vector<ControllerInterface::Device*>& devices )
+void Init( std::vector<Core::Device*>& devices )
 {
 	devices.push_back(new Touchscreen());
 }
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
index 21f35165f1..e38c6a221a 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Android/Android.h
@@ -17,7 +17,7 @@
 #ifndef _CIFACE_ANDROID_H_
 #define _CIFACE_ANDROID_H_
 
-#include "../ControllerInterface.h"
+#include "../Device.h"
 #include "Android/ButtonManager.h"
 
 namespace ciface
@@ -25,8 +25,8 @@ namespace ciface
 namespace Android
 {
 
-void Init( std::vector<ControllerInterface::Device*>& devices );
-class Touchscreen : public ControllerInterface::Device
+void Init( std::vector<Core::Device*>& devices );
+class Touchscreen : public Core::Device
 {
 private:
 	class Button : public Input
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
index 6db79605a7..e672e4598c 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
@@ -179,56 +179,6 @@ bool ControllerInterface::UpdateOutput(const bool force)
 	return (m_devices.size() == ok_count);
 }
 
-//
-//		Device :: ~Device
-//
-// Destructor, delete all inputs/outputs on device destruction
-//
-ControllerInterface::Device::~Device()
-{
-	{
-	// delete inputs
-	std::vector<Device::Input*>::iterator
-		i = m_inputs.begin(),
-		e = m_inputs.end();
-	for ( ;i!=e; ++i)
-		delete *i;
-	}
-
-	{
-	// delete outputs
-	std::vector<Device::Output*>::iterator
-		o = m_outputs.begin(),
-		e = m_outputs.end();
-	for ( ;o!=e; ++o)
-		delete *o;
-	}
-}
-
-void ControllerInterface::Device::AddInput(Input* const i)
-{
-	m_inputs.push_back(i);
-}
-
-void ControllerInterface::Device::AddOutput(Output* const o)
-{
-	m_outputs.push_back(o);
-}
-
-//
-//		Device :: ClearInputState
-//
-// Device classes should override this function
-// ControllerInterface will call this when the device returns failure during UpdateInput
-// used to try to set all buttons and axes to their default state when user unplugs a gamepad during play
-// buttons/axes that were held down at the time of unplugging should be seen as not pressed after unplugging
-//
-void ControllerInterface::Device::ClearInputState()
-{
-	// this is going to be called for every UpdateInput call that fails
-	// kinda slow but, w/e, should only happen when user unplugs a device while playing
-}
-
 //
 //		InputReference :: State
 //
@@ -303,72 +253,6 @@ ControlState ControllerInterface::OutputReference::State(const ControlState stat
 	return state;	// just return the output, watever
 }
 
-//
-//		DeviceQualifier :: ToString
-//
-// get string from a device qualifier / serialize
-//
-std::string ControllerInterface::DeviceQualifier::ToString() const
-{
-	if (source.empty() && (cid < 0) && name.empty())
-		return "";
-	std::ostringstream ss;
-	ss << source << '/';
-	if ( cid > -1 )
-		ss << cid;
-	ss << '/' << name;
-	return ss.str();
-}
-
-//
-//		DeviceQualifier	::	FromString
-//
-// set a device qualifier from a string / unserialize
-//
-void ControllerInterface::DeviceQualifier::FromString(const std::string& str)
-{
-	std::istringstream ss(str);
-
-	std::getline(ss, source = "", '/');
-
-	// silly
-	std::getline(ss, name, '/');
-	std::istringstream(name) >> (cid = -1);
-
-	std::getline(ss, name = "");
-}
-
-//
-//		DeviceQualifier :: FromDevice
-//
-// set a device qualifier from a device
-//
-void ControllerInterface::DeviceQualifier::FromDevice(const ControllerInterface::Device* const dev)
-{
-	name = dev->GetName();
-	cid = dev->GetId();
-	source= dev->GetSource();
-}
-
-bool ControllerInterface::DeviceQualifier::operator==(const ControllerInterface::Device* const dev) const
-{
-	if (dev->GetId() == cid)
-		if (dev->GetName() == name)
-			if (dev->GetSource() == source)
-				return true;
-	return false;
-}
-
-bool ControllerInterface::DeviceQualifier::operator==(const ControllerInterface::DeviceQualifier& devq) const
-{
-	if (cid == devq.cid)
-		if (name == devq.name)
-			if (source == devq.source)
-				return true;
-
-	return false;
-}
-
 //
 //		UpdateReference
 //
@@ -376,7 +260,7 @@ bool ControllerInterface::DeviceQualifier::operator==(const ControllerInterface:
 // need to call this to re-parse a control reference's expression after changing it
 //
 void ControllerInterface::UpdateReference(ControllerInterface::ControlReference* ref
-	, const ControllerInterface::DeviceQualifier& default_device) const
+	, const DeviceQualifier& default_device) const
 {
 	ref->m_controls.clear();
 
@@ -439,18 +323,6 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference*
 	}
 }
 
-ControllerInterface::Device* ControllerInterface::FindDevice(const ControllerInterface::DeviceQualifier& devq) const
-{
-	std::vector<ControllerInterface::Device*>::const_iterator
-		di = m_devices.begin(),
-		de = m_devices.end();
-	for (; di!=de; ++di)
-		if (devq == *di)
-			return *di;
-
-	return NULL;
-}
-
 //
 //		InputReference :: Detect
 //
@@ -461,7 +333,7 @@ ControllerInterface::Device* ControllerInterface::FindDevice(const ControllerInt
 // upon input, return pointer to detected Control
 // else return NULL
 //
-ControllerInterface::Device::Control* ControllerInterface::InputReference::Detect(const unsigned int ms, Device* const device)
+Device::Control* ControllerInterface::InputReference::Detect(const unsigned int ms, Device* const device)
 {
 	unsigned int time = 0;
 	std::vector<bool> states(device->Inputs().size());
@@ -511,7 +383,7 @@ ControllerInterface::Device::Control* ControllerInterface::InputReference::Detec
 //
 // set all binded outputs to <range> power for x milliseconds return false
 //
-ControllerInterface::Device::Control* ControllerInterface::OutputReference::Detect(const unsigned int ms, Device* const device)
+Device::Control* ControllerInterface::OutputReference::Detect(const unsigned int ms, Device* const device)
 {
 	// ignore device
 
@@ -534,55 +406,3 @@ ControllerInterface::Device::Control* ControllerInterface::OutputReference::Dete
 	}
 	return NULL;
 }
-
-ControllerInterface::Device::Input* ControllerInterface::Device::FindInput(const std::string &name) const
-{
-	std::vector<Input*>::const_iterator
-		it = m_inputs.begin(),
-		itend = m_inputs.end();
-	for (; it != itend; ++it)
-		if ((*it)->GetName() == name)
-			return *it;
-
-	return NULL;
-}
-
-ControllerInterface::Device::Output* ControllerInterface::Device::FindOutput(const std::string &name) const
-{
-	std::vector<Output*>::const_iterator
-		it = m_outputs.begin(),
-		itend = m_outputs.end();
-	for (; it != itend; ++it)
-		if ((*it)->GetName() == name)
-			return *it;
-
-	return NULL;
-}
-
-ControllerInterface::Device::Input* ControllerInterface::FindInput(const std::string& name, const Device* def_dev) const
-{
-	if (def_dev)
-	{
-		Device::Input* const inp = def_dev->FindInput(name);
-		if (inp)
-			return inp;
-	}
-
-	std::vector<Device*>::const_iterator
-		di = m_devices.begin(),
-		de = m_devices.end();
-	for (; di != de; ++di)
-	{
-		Device::Input* const i = (*di)->FindInput(name);
-
-		if (i)
-			return i;
-	}
-
-	return NULL;
-}
-
-ControllerInterface::Device::Output* ControllerInterface::FindOutput(const std::string& name, const Device* def_dev) const
-{
-	return def_dev->FindOutput(name);
-}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
index 8c1a044860..db3a82bf3b 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
@@ -9,18 +9,13 @@
 
 #include "Common.h"
 #include "Thread.h"
+#include "Device.h"
 
 // enable disable sources
 #ifdef _WIN32
 	#define CIFACE_USE_XINPUT
-	#define CIFACE_USE_DINPUT_JOYSTICK
-	#define CIFACE_USE_DINPUT_KBM
 	#define CIFACE_USE_DINPUT
-//#ifndef CIFACE_USE_DINPUT_JOYSTICK
-// enable SDL 1.2 in addition to DirectInput on windows,
-// to support a few gamepads that aren't behaving with DInput
 	#define CIFACE_USE_SDL
-//#endif
 #endif
 #if defined(HAVE_X11) && HAVE_X11
 	#define CIFACE_USE_XLIB
@@ -32,9 +27,8 @@
 #ifdef ANDROID
 	#define CIFACE_USE_ANDROID
 #endif
-		
-// idk in case I wanted to change it to double or something, idk what's best
-typedef float ControlState;
+
+using namespace ciface::Core;
 
 //
 //		ControllerInterface
@@ -42,148 +36,10 @@ typedef float ControlState;
 // some crazy shit I made to control different device inputs and outputs
 // from lots of different sources, hopefully more easily
 //
-class ControllerInterface
+class ControllerInterface : public DeviceContainer
 {
 public:
 
-	// Forward declarations
-	class DeviceQualifier;
-
-	//
-	//		Device
-	//
-	// a device class
-	//
-	class Device
-	{
-	public:
-		class Input;
-		class Output;
-
-		//
-		//		Control
-		//
-		//  control includes inputs and outputs
-		//
-		class Control		// input or output
-		{
-		public:
-			virtual std::string GetName() const = 0;
-			virtual ~Control() {}
-
-			virtual Input* ToInput() { return NULL; }
-			virtual Output* ToOutput() { return NULL; }
-		};
-
-		//
-		//		Input
-		//
-		// an input on a device
-		//
-		class Input : public Control
-		{
-		public:
-			// things like absolute axes/ absolute mouse position will override this
-			virtual bool IsDetectable() { return true; }
-
-			virtual ControlState GetState() const = 0;
-
-			Input* ToInput() { return this; }
-		};
-
-		//
-		//		Output
-		//
-		// an output on a device
-		//
-		class Output : public Control
-		{
-		public:
-			virtual ~Output() {}
-
-			virtual void SetState(ControlState state) = 0;
-
-			Output* ToOutput() { return this; }
-		};
-
-		virtual ~Device();
-		
-		virtual std::string GetName() const = 0;
-		virtual int GetId() const = 0;
-		virtual std::string GetSource() const = 0;
-		virtual bool UpdateInput() = 0;
-		virtual bool UpdateOutput() = 0;
-
-		virtual void ClearInputState();
-
-		const std::vector<Input*>& Inputs() const { return m_inputs; }
-		const std::vector<Output*>& Outputs() const { return m_outputs; }
-
-		Input* FindInput(const std::string& name) const;
-		Output* FindOutput(const std::string& name) const;
-
-	protected:
-		void AddInput(Input* const i);
-		void AddOutput(Output* const o);
-		
-		class FullAnalogSurface : public Input
-		{
-		public:
-			FullAnalogSurface(Input* low, Input* high)
-				: m_low(*low), m_high(*high)
-			{}
-
-			ControlState GetState() const
-			{
-				return (1 + m_high.GetState() - m_low.GetState()) / 2;
-			}
-
-			std::string GetName() const
-			{
-				return m_low.GetName() + *m_high.GetName().rbegin();
-			}
-
-		private:
-			Input& m_low;
-			Input& m_high;
-		};
-
-		void AddAnalogInputs(Input* low, Input* high)
-		{
-			AddInput(low);
-			AddInput(high);
-			AddInput(new FullAnalogSurface(low, high));
-			AddInput(new FullAnalogSurface(high, low));
-		}
-
-	private:
-		std::vector<Input*>		m_inputs;
-		std::vector<Output*>	m_outputs;
-	};
-
-	//
-	//		DeviceQualifier
-	//
-	// device qualifier used to match devices
-	// currently has ( source, id, name ) properties which match a device
-	//
-	class DeviceQualifier
-	{
-	public:
-		DeviceQualifier() : cid(-1) {}
-		DeviceQualifier(const std::string& _source, const int _id, const std::string& _name)
-			: source(_source), cid(_id), name(_name) {}
-		void FromDevice(const Device* const dev);
-		void FromString(const std::string& str);
-		std::string ToString() const;
-		bool operator==(const DeviceQualifier& devq) const;
-		bool operator==(const Device* const dev) const;
-
-		std::string		source;
-		int				cid;
-		std::string		name;
-	};
-
 	//
 	//		ControlReference
 	//
@@ -260,22 +116,13 @@ public:
 	bool UpdateInput(const bool force = false);
 	bool UpdateOutput(const bool force = false);
 
-	Device::Input* FindInput(const std::string& name, const Device* def_dev) const;
-	Device::Output* FindOutput(const std::string& name, const Device* def_dev) const;
-
-	const std::vector<Device*>& Devices() const { return m_devices; }
-	Device* FindDevice(const DeviceQualifier& devq) const;
-
 	std::recursive_mutex update_lock;
 
 private:
 	bool					m_is_init;
-	std::vector<Device*>	m_devices;
 	void*					m_hwnd;
 };
 
-typedef std::vector<ControllerInterface::Device*> DeviceList;
-
 extern ControllerInterface g_controller_interface;
 
 #endif
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.cpp
index 01baf9cf1a..6b7b492ea9 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.cpp
@@ -1,17 +1,10 @@
-#include "../ControllerInterface.h"
-
-#ifdef CIFACE_USE_DINPUT
 
 #include "DInput.h"
 
 #include "StringUtil.h"
 
-#ifdef CIFACE_USE_DINPUT_JOYSTICK
-	#include "DInputJoystick.h"
-#endif
-#ifdef CIFACE_USE_DINPUT_KBM
-	#include "DInputKeyboardMouse.h"
-#endif
+#include "DInputJoystick.h"
+#include "DInputKeyboardMouse.h"
 
 #pragma comment(lib, "Dinput8.lib")
 #pragma comment(lib, "dxguid.lib")
@@ -55,18 +48,14 @@ std::string GetDeviceName(const LPDIRECTINPUTDEVICE8 device)
 	return result;
 }
 
-void Init(std::vector<ControllerInterface::Device*>& devices, HWND hwnd)
+void Init(std::vector<Core::Device*>& devices, HWND hwnd)
 {
 	IDirectInput8* idi8;
 	if (FAILED(DirectInput8Create(GetModuleHandle(NULL), DIRECTINPUT_VERSION, IID_IDirectInput8, (LPVOID*)&idi8, NULL)))
 		return;
 
-#ifdef CIFACE_USE_DINPUT_KBM
 	InitKeyboardMouse(idi8, devices, hwnd);
-#endif
-#ifdef CIFACE_USE_DINPUT_JOYSTICK
 	InitJoystick(idi8, devices, hwnd);
-#endif
 
 	idi8->Release();
 
@@ -74,5 +63,3 @@ void Init(std::vector<ControllerInterface::Device*>& devices, HWND hwnd)
 
 }
 }
-
-#endif
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.h b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.h
index 9ee48c190f..86452c23ab 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInput.h
@@ -1,7 +1,7 @@
 #ifndef _CIFACE_DINPUT_H_
 #define _CIFACE_DINPUT_H_
 
-#include "../ControllerInterface.h"
+#include "../Device.h"
 
 #define DINPUT_SOURCE_NAME "DInput"
 
@@ -23,7 +23,7 @@ BOOL CALLBACK DIEnumDeviceObjectsCallback(LPCDIDEVICEOBJECTINSTANCE lpddoi, LPVO
 BOOL CALLBACK DIEnumDevicesCallback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef);
 std::string GetDeviceName(const LPDIRECTINPUTDEVICE8 device);
 
-void Init(std::vector<ControllerInterface::Device*>& devices, HWND hwnd);
+void Init(std::vector<Core::Device*>& devices, HWND hwnd);
 
 }
 }
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
index 916d142149..24502e7a8a 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
@@ -1,10 +1,11 @@
-#include "../ControllerInterface.h"
-
-#ifdef CIFACE_USE_DINPUT_JOYSTICK
 
 #include "DInputJoystick.h"
 #include "DInput.h"
 
+#include <map>
+#include <sstream>
+#include <algorithm>
+
 namespace ciface
 {
 namespace DInput
@@ -142,7 +143,7 @@ LCleanup:
 }
 #endif
 
-void InitJoystick(IDirectInput8* const idi8, std::vector<ControllerInterface::Device*>& devices, HWND hwnd)
+void InitJoystick(IDirectInput8* const idi8, std::vector<Core::Device*>& devices, HWND hwnd)
 {
 	std::list<DIDEVICEINSTANCE> joysticks;
 	idi8->EnumDevices( DI8DEVCLASS_GAMECTRL, DIEnumDevicesCallback, (LPVOID)&joysticks, DIEDFL_ATTACHEDONLY );
@@ -599,5 +600,3 @@ Joystick::Force<P>::Force(u8 index, EffectState& state)
 
 }
 }
-
-#endif
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.h b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.h
index a783381154..ad383bd764 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.h
@@ -1,7 +1,7 @@
 #ifndef _CIFACE_DINPUT_JOYSTICK_H_
 #define _CIFACE_DINPUT_JOYSTICK_H_
 
-#include "../ControllerInterface.h"
+#include "../Device.h"
 
 #define DIRECTINPUT_VERSION 0x0800
 #define WIN32_LEAN_AND_MEAN
@@ -11,21 +11,14 @@
 
 #include <list>
 
-#ifdef CIFACE_USE_XINPUT
-	// this takes so long, idk if it should be enabled :(
-	#define NO_DUPLICATE_DINPUT_XINPUT
-	#include <wbemidl.h>
-	#include <oleauto.h>
-#endif
-
 namespace ciface
 {
 namespace DInput
 {
 
-void InitJoystick(IDirectInput8* const idi8, std::vector<ControllerInterface::Device*>& devices, HWND hwnd);
+void InitJoystick(IDirectInput8* const idi8, std::vector<Core::Device*>& devices, HWND hwnd);
 
-class Joystick : public ControllerInterface::Device
+class Joystick : public Core::Device
 {
 private:
 	struct EffectState
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp
index ea6452376d..850ff27281 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.cpp
@@ -1,6 +1,3 @@
-#include "../ControllerInterface.h"
-
-#ifdef CIFACE_USE_DINPUT_KBM
 
 #include "DInputKeyboardMouse.h"
 #include "DInput.h"
@@ -42,7 +39,7 @@ static const struct
 // lil silly
 static HWND hwnd;
 
-void InitKeyboardMouse(IDirectInput8* const idi8, std::vector<ControllerInterface::Device*>& devices, HWND _hwnd)
+void InitKeyboardMouse(IDirectInput8* const idi8, std::vector<Core::Device*>& devices, HWND _hwnd)
 {
 	hwnd = _hwnd;
 
@@ -252,16 +249,6 @@ std::string KeyboardMouse::GetSource() const
 	return DINPUT_SOURCE_NAME;
 }
 
-//ControlState KeyboardMouse::GetInputState(const ControllerInterface::Device::Input* const input) const
-//{
-//	return (((Input*)input)->GetState(&m_state_in));
-//}
-//
-//void KeyboardMouse::SetOutputState(const ControllerInterface::Device::Output* const output, const ControlState state)
-//{
-//	((Output*)output)->SetState(state, m_state_out);
-//}
-
 // names
 std::string KeyboardMouse::Key::GetName() const
 {
@@ -322,5 +309,3 @@ void KeyboardMouse::Light::SetState(const ControlState state)
 
 }
 }
-
-#endif
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.h b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.h
index cacef516b0..73398ca1b1 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputKeyboardMouse.h
@@ -1,7 +1,7 @@
 #ifndef _CIFACE_DINPUT_KBM_H_
 #define _CIFACE_DINPUT_KBM_H_
 
-#include "../ControllerInterface.h"
+#include "../Device.h"
 
 #define DIRECTINPUT_VERSION 0x0800
 #define WIN32_LEAN_AND_MEAN
@@ -14,9 +14,9 @@ namespace ciface
 namespace DInput
 {
 
-void InitKeyboardMouse(IDirectInput8* const idi8, std::vector<ControllerInterface::Device*>& devices, HWND _hwnd);
+void InitKeyboardMouse(IDirectInput8* const idi8, std::vector<Core::Device*>& devices, HWND _hwnd);
 
-class KeyboardMouse : public ControllerInterface::Device
+class KeyboardMouse : public Core::Device
 {
 private:
 	struct State
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Device.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Device.cpp
new file mode 100644
index 0000000000..965ecfc817
--- /dev/null
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Device.cpp
@@ -0,0 +1,193 @@
+
+#include "Device.h"
+
+#include <string>
+#include <sstream>
+
+namespace ciface
+{
+namespace Core
+{
+
+//
+//		Device :: ~Device
+//
+// Destructor, delete all inputs/outputs on device destruction
+//
+Device::~Device()
+{
+	{
+	// delete inputs
+	std::vector<Device::Input*>::iterator
+		i = m_inputs.begin(),
+		e = m_inputs.end();
+	for ( ;i!=e; ++i)
+		delete *i;
+	}
+
+	{
+	// delete outputs
+	std::vector<Device::Output*>::iterator
+		o = m_outputs.begin(),
+		e = m_outputs.end();
+	for ( ;o!=e; ++o)
+		delete *o;
+	}
+}
+
+void Device::AddInput(Device::Input* const i)
+{
+	m_inputs.push_back(i);
+}
+
+void Device::AddOutput(Device::Output* const o)
+{
+	m_outputs.push_back(o);
+}
+
+Device::Input* Device::FindInput(const std::string &name) const
+{
+	std::vector<Input*>::const_iterator
+		it = m_inputs.begin(),
+		itend = m_inputs.end();
+	for (; it != itend; ++it)
+		if ((*it)->GetName() == name)
+			return *it;
+
+	return NULL;
+}
+
+Device::Output* Device::FindOutput(const std::string &name) const
+{
+	std::vector<Output*>::const_iterator
+		it = m_outputs.begin(),
+		itend = m_outputs.end();
+	for (; it != itend; ++it)
+		if ((*it)->GetName() == name)
+			return *it;
+
+	return NULL;
+}
+
+//
+//		Device :: ClearInputState
+//
+// Device classes should override this function
+// ControllerInterface will call this when the device returns failure during UpdateInput
+// used to try to set all buttons and axes to their default state when user unplugs a gamepad during play
+// buttons/axes that were held down at the time of unplugging should be seen as not pressed after unplugging
+//
+void Device::ClearInputState()
+{
+	// this is going to be called for every UpdateInput call that fails
+	// kinda slow but, w/e, should only happen when user unplugs a device while playing
+}
+
+//
+//		DeviceQualifier :: ToString
+//
+// get string from a device qualifier / serialize
+//
+std::string DeviceQualifier::ToString() const
+{
+	if (source.empty() && (cid < 0) && name.empty())
+		return "";
+	std::ostringstream ss;
+	ss << source << '/';
+	if ( cid > -1 )
+		ss << cid;
+	ss << '/' << name;
+	return ss.str();
+}
+
+//
+//		DeviceQualifier	::	FromString
+//
+// set a device qualifier from a string / unserialize
+//
+void DeviceQualifier::FromString(const std::string& str)
+{
+	std::istringstream ss(str);
+
+	std::getline(ss, source = "", '/');
+
+	// silly
+	std::getline(ss, name, '/');
+	std::istringstream(name) >> (cid = -1);
+
+	std::getline(ss, name = "");
+}
+
+//
+//		DeviceQualifier :: FromDevice
+//
+// set a device qualifier from a device
+//
+void DeviceQualifier::FromDevice(const Device* const dev)
+{
+	name = dev->GetName();
+	cid = dev->GetId();
+	source= dev->GetSource();
+}
+
+bool DeviceQualifier::operator==(const Device* const dev) const
+{
+	if (dev->GetId() == cid)
+		if (dev->GetName() == name)
+			if (dev->GetSource() == source)
+				return true;
+	return false;
+}
+
+bool DeviceQualifier::operator==(const DeviceQualifier& devq) const
+{
+	if (cid == devq.cid)
+		if (name == devq.name)
+			if (source == devq.source)
+				return true;
+
+	return false;
+}
+
+Device* DeviceContainer::FindDevice(const DeviceQualifier& devq) const
+{
+	std::vector<Device*>::const_iterator
+		di = m_devices.begin(),
+		de = m_devices.end();
+	for (; di!=de; ++di)
+		if (devq == *di)
+			return *di;
+
+	return NULL;
+}
+
+Device::Input* DeviceContainer::FindInput(const std::string& name, const Device* def_dev) const
+{
+	if (def_dev)
+	{
+		Device::Input* const inp = def_dev->FindInput(name);
+		if (inp)
+			return inp;
+	}
+
+	std::vector<Device*>::const_iterator
+		di = m_devices.begin(),
+		de = m_devices.end();
+	for (; di != de; ++di)
+	{
+		Device::Input* const i = (*di)->FindInput(name);
+
+		if (i)
+			return i;
+	}
+
+	return NULL;
+}
+
+Device::Output* DeviceContainer::FindOutput(const std::string& name, const Device* def_dev) const
+{
+	return def_dev->FindOutput(name);
+}
+
+}
+}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Device.h b/Source/Core/InputCommon/Src/ControllerInterface/Device.h
new file mode 100644
index 0000000000..a7c26b867d
--- /dev/null
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Device.h
@@ -0,0 +1,171 @@
+
+#ifndef _DEVICE_H_
+#define _DEVICE_H_
+
+#include <string>
+#include <vector>
+
+#include "Common.h"
+
+// idk in case I wanted to change it to double or something, idk what's best
+typedef float ControlState;
+
+namespace ciface
+{
+namespace Core
+{
+
+// Forward declarations
+class DeviceQualifier;
+
+//
+//		Device
+//
+// a device class
+//
+class Device
+{
+public:
+	class Input;
+	class Output;
+
+	//
+	//		Control
+	//
+	//  control includes inputs and outputs
+	//
+	class Control		// input or output
+	{
+	public:
+		virtual std::string GetName() const = 0;
+		virtual ~Control() {}
+
+		virtual Input* ToInput() { return NULL; }
+		virtual Output* ToOutput() { return NULL; }
+	};
+
+	//
+	//		Input
+	//
+	// an input on a device
+	//
+	class Input : public Control
+	{
+	public:
+		// things like absolute axes/ absolute mouse position will override this
+		virtual bool IsDetectable() { return true; }
+
+		virtual ControlState GetState() const = 0;
+
+		Input* ToInput() { return this; }
+	};
+
+	//
+	//		Output
+	//
+	// an output on a device
+	//
+	class Output : public Control
+	{
+	public:
+		virtual ~Output() {}
+
+		virtual void SetState(ControlState state) = 0;
+
+		Output* ToOutput() { return this; }
+	};
+
+	virtual ~Device();
+
+	virtual std::string GetName() const = 0;
+	virtual int GetId() const = 0;
+	virtual std::string GetSource() const = 0;
+	virtual bool UpdateInput() = 0;
+	virtual bool UpdateOutput() = 0;
+
+	virtual void ClearInputState();
+
+	const std::vector<Input*>& Inputs() const { return m_inputs; }
+	const std::vector<Output*>& Outputs() const { return m_outputs; }
+
+	Input* FindInput(const std::string& name) const;
+	Output* FindOutput(const std::string& name) const;
+
+protected:
+	void AddInput(Input* const i);
+	void AddOutput(Output* const o);
+
+	class FullAnalogSurface : public Input
+	{
+	public:
+		FullAnalogSurface(Input* low, Input* high)
+			: m_low(*low), m_high(*high)
+		{}
+
+		ControlState GetState() const
+		{
+			return (1 + m_high.GetState() - m_low.GetState()) / 2;
+		}
+
+		std::string GetName() const
+		{
+			return m_low.GetName() + *m_high.GetName().rbegin();
+		}
+
+	private:
+		Input& m_low;
+		Input& m_high;
+	};
+
+	void AddAnalogInputs(Input* low, Input* high)
+	{
+		AddInput(low);
+		AddInput(high);
+		AddInput(new FullAnalogSurface(low, high));
+		AddInput(new FullAnalogSurface(high, low));
+	}
+
+private:
+	std::vector<Input*>		m_inputs;
+	std::vector<Output*>	m_outputs;
+};
+
+//
+//		DeviceQualifier
+//
+// device qualifier used to match devices
+// currently has ( source, id, name ) properties which match a device
+//
+class DeviceQualifier
+{
+public:
+	DeviceQualifier() : cid(-1) {}
+	DeviceQualifier(const std::string& _source, const int _id, const std::string& _name)
+		: source(_source), cid(_id), name(_name) {}
+	void FromDevice(const Device* const dev);
+	void FromString(const std::string& str);
+	std::string ToString() const;
+	bool operator==(const DeviceQualifier& devq) const;
+	bool operator==(const Device* const dev) const;
+
+	std::string		source;
+	int				cid;
+	std::string		name;
+};
+
+class DeviceContainer
+{
+public:
+	Device::Input* FindInput(const std::string& name, const Device* def_dev) const;
+	Device::Output* FindOutput(const std::string& name, const Device* def_dev) const;
+
+	const std::vector<Device*>& Devices() const { return m_devices; }
+	Device* FindDevice(const DeviceQualifier& devq) const;
+protected:
+	std::vector<Device*> m_devices;
+};
+
+}
+}
+
+#endif
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.h b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.h
index 225906c35d..a922e3f2dd 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "../ControllerInterface.h"
+#include "../Device.h"
 
 namespace ciface
 {
 namespace OSX
 {
 
-void Init(std::vector<ControllerInterface::Device*>& devices, void *window);
+void Init(std::vector<Core::Device*>& devices, void *window);
 void DeInit();
 
 void DeviceElementDebugPrint(const void *, void *);
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.mm b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.mm
index aef8f283c1..8a859f46c8 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.mm
+++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSX.mm
@@ -2,11 +2,12 @@
 #include <IOKit/hid/IOHIDLib.h>
 #include <Cocoa/Cocoa.h>
 
-#include "../ControllerInterface.h"
 #include "OSX.h"
 #include "OSXKeyboard.h"
 #include "OSXJoystick.h"
 
+#include <map>
+
 namespace ciface
 {
 namespace OSX
@@ -145,8 +146,8 @@ static void DeviceMatching_callback(void* inContext,
 
 	DeviceDebugPrint(inIOHIDDeviceRef);
 
-	std::vector<ControllerInterface::Device*> *devices =
-		(std::vector<ControllerInterface::Device*> *)inContext;
+	std::vector<Core::Device*> *devices =
+		(std::vector<Core::Device*> *)inContext;
 
 	// Add to the devices vector if it's of a type we want
 	if (IOHIDDeviceConformsTo(inIOHIDDeviceRef,
@@ -164,7 +165,7 @@ static void DeviceMatching_callback(void* inContext,
 			name, joy_name_counts[name]++));
 }
 
-void Init(std::vector<ControllerInterface::Device*>& devices, void *window)
+void Init(std::vector<Core::Device*>& devices, void *window)
 {
 	HIDManager = IOHIDManagerCreate(kCFAllocatorDefault,
 		kIOHIDOptionsTypeNone);
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.h b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.h
index ecc443ad3a..ebe908522b 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.h
@@ -1,13 +1,13 @@
 #include <IOKit/hid/IOHIDLib.h>
 
-#include "../ControllerInterface.h"
+#include "../Device.h"
 
 namespace ciface
 {
 namespace OSX
 {
 
-class Joystick : public ControllerInterface::Device
+class Joystick : public Core::Device
 {
 private:
 	class Button : public Input
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm
index 0d89c2e393..ebd713d142 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm
+++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm
@@ -1,9 +1,10 @@
 #include <Foundation/Foundation.h>
 #include <IOKit/hid/IOHIDLib.h>
 
-#include "../ControllerInterface.h"
 #include "OSXJoystick.h"
 
+#include <sstream>
+
 namespace ciface
 {
 namespace OSX
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h
index d59651c98a..930f849a17 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.h
@@ -1,13 +1,13 @@
 #include <IOKit/hid/IOHIDLib.h>
 
-#include "../ControllerInterface.h"
+#include "../Device.h"
 
 namespace ciface
 {
 namespace OSX
 {
 
-class Keyboard : public ControllerInterface::Device
+class Keyboard : public Core::Device
 {
 private:
 	class Key : public Input
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm
index c22e267044..003240d4a9 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm
+++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm
@@ -3,9 +3,10 @@
 #include <Cocoa/Cocoa.h>
 #include <wx/wx.h> // wxWidgets
 
-#include "../ControllerInterface.h"
 #include "OSXKeyboard.h"
 
+#include <sstream>
+
 namespace ciface
 {
 namespace OSX
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
index 6c74c55d97..006b82d4ac 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp
@@ -1,10 +1,11 @@
-#include "../ControllerInterface.h"
-
-#ifdef CIFACE_USE_SDL
 
 #include "SDL.h"
 #include <StringUtil.h>
 
+#include <map>
+#include <sstream>
+#include <algorithm>
+
 #ifdef _WIN32
 	#if SDL_VERSION_ATLEAST(1, 3, 0)
 		#pragma comment(lib, "SDL.1.3.lib")
@@ -27,7 +28,7 @@ std::string GetJoystickName(int index)
 #endif
 }
 
-void Init( std::vector<ControllerInterface::Device*>& devices )
+void Init( std::vector<Core::Device*>& devices )
 {	
 	// this is used to number the joysticks
 	// multiple joysticks with the same name shall get unique ids starting at 0
@@ -399,5 +400,3 @@ ControlState Joystick::Hat::GetState() const
 
 }
 }
-
-#endif
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h
index fa770c403d..6a65efeedb 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.h
@@ -1,7 +1,7 @@
 #ifndef _CIFACE_SDL_H_
 #define _CIFACE_SDL_H_
 
-#include "../ControllerInterface.h"
+#include "../Device.h"
 
 #include <list>
 
@@ -23,9 +23,9 @@ namespace ciface
 namespace SDL
 {
 
-void Init( std::vector<ControllerInterface::Device*>& devices );
+void Init( std::vector<Core::Device*>& devices );
 
-class Joystick : public ControllerInterface::Device
+class Joystick : public Core::Device
 {
 private:
 
@@ -40,7 +40,7 @@ private:
 	};
 #endif
 
-	class Button : public Input
+	class Button : public Core::Device::Input
 	{
 	public:
 		std::string GetName() const;
@@ -51,7 +51,7 @@ private:
 		 const u8 m_index;
 	};
 
-	class Axis : public Input
+	class Axis : public Core::Device::Input
 	{
 	public:
 		std::string GetName() const;
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp b/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp
index 3c7f3c48ae..c687bef856 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.cpp
@@ -1,6 +1,3 @@
-#include "../ControllerInterface.h"
-
-#ifdef CIFACE_USE_XINPUT
 
 #include "XInput.h"
 
@@ -51,7 +48,7 @@ static const char* const named_motors[] =
 	"Motor R"
 };
 
-void Init(DeviceList& devices)
+void Init(std::vector<Core::Device*>& devices)
 {
 	XINPUT_CAPABILITIES caps;
 	for (int i = 0; i != 4; ++i)
@@ -210,5 +207,3 @@ void Device::Motor::SetState(ControlState state)
 
 }
 }
-
-#endif
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.h b/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.h
index eb51a58779..8fe6dd1dee 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/XInput/XInput.h
@@ -1,7 +1,7 @@
 #ifndef _CIFACE_XINPUT_H_
 #define _CIFACE_XINPUT_H_
 
-#include "../ControllerInterface.h"
+#include "../Device.h"
 
 #define NOMINMAX
 #include <Windows.h>
@@ -12,12 +12,12 @@ namespace ciface
 namespace XInput
 {
 
-void Init(DeviceList& devices);
+void Init(std::vector<Core::Device*>& devices);
 
-class Device : public ControllerInterface::Device
+class Device : public Core::Device
 {
 private:
-	class Button : public Input
+	class Button : public Core::Device::Input
 	{
 	public:
 		std::string GetName() const;
@@ -28,7 +28,7 @@ private:
 		u8 m_index;
 	};
 
-	class Axis : public Input
+	class Axis : public Core::Device::Input
 	{
 	public:
 		std::string GetName() const;
@@ -40,7 +40,7 @@ private:
 		const u8 m_index;
 	};
 
-	class Trigger : public Input
+	class Trigger : public Core::Device::Input
 	{
 	public:
 		std::string GetName() const;
@@ -52,7 +52,7 @@ private:
 		const u8 m_index;
 	};
 
-	class Motor : public Output
+	class Motor : public Core::Device::Output
 	{
 	public:
 		std::string GetName() const;
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp
index dad0c6bbf8..7016c4908b 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.cpp
@@ -7,7 +7,7 @@ namespace ciface
 namespace Xlib
 {
 
-void Init(std::vector<ControllerInterface::Device*>& devices, void* const hwnd)
+void Init(std::vector<Core::Device*>& devices, void* const hwnd)
 {
 	devices.push_back(new KeyboardMouse((Window)hwnd));
 }
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.h b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.h
index 2af95ff7f9..c178f1e9b4 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/Xlib.h
@@ -1,7 +1,7 @@
 #ifndef _CIFACE_XLIB_H_
 #define _CIFACE_XLIB_H_
 
-#include "../ControllerInterface.h"
+#include "../Device.h"
 
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
@@ -11,9 +11,9 @@ namespace ciface
 namespace Xlib
 {
 
-void Init(std::vector<ControllerInterface::Device*>& devices, void* const hwnd);
+void Init(std::vector<Core::Device*>& devices, void* const hwnd);
 
-class KeyboardMouse : public ControllerInterface::Device
+class KeyboardMouse : public Core::Device
 {
 
 private:

From 6246f6e81581339eb176cae044960e1f8437b488 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Thu, 13 Jun 2013 23:09:55 -0400
Subject: [PATCH 207/352] InputCommon: Add a new ExpressionParser to replace
 the old hack language

This contains a new, hand-written expression parser to replace the old
hack language based on string munging. The new approach is a simple
AST-based evaluation approach, instead of the "list of operations"
infix-based hack that there was before.

The new language for configuration has support for parentheses, and
counts "!" as a unary operator instead of the binary "NOT OR" operator
it was before. A simple example:

  (X & Y) | !B

Explicit device references, and complex device names ("Right Y+") are
handled with backticks and colons:

  (`SDL/0/6 axis joystick:Right X+` & `DInput/0/Keyboard Mouse:A`)

The basic editor UI that inserts tokens has not been updated to reflect
the new language.
---
 Source/Core/InputCommon/CMakeLists.txt        |   3 +-
 Source/Core/InputCommon/InputCommon.vcxproj   |   2 +
 .../InputCommon/InputCommon.vcxproj.filters   |  11 +-
 .../ControllerInterface.cpp                   | 128 +----
 .../ControllerInterface/ControllerInterface.h |  31 +-
 .../ControllerInterface/ExpressionParser.cpp  | 516 ++++++++++++++++++
 .../ControllerInterface/ExpressionParser.h    |  73 +++
 7 files changed, 634 insertions(+), 130 deletions(-)
 create mode 100644 Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
 create mode 100644 Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h

diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt
index 265f5a433d..518bdbb3ba 100644
--- a/Source/Core/InputCommon/CMakeLists.txt
+++ b/Source/Core/InputCommon/CMakeLists.txt
@@ -3,7 +3,8 @@ set(SRCS	Src/ControllerEmu.cpp
 			Src/UDPWiimote.cpp
 			Src/UDPWrapper.cpp
 			Src/ControllerInterface/ControllerInterface.cpp
-			Src/ControllerInterface/Device.cpp)
+			Src/ControllerInterface/Device.cpp
+			Src/ControllerInterface/ExpressionParser.cpp)
 
 if(WIN32)
 	set(SRCS	${SRCS}
diff --git a/Source/Core/InputCommon/InputCommon.vcxproj b/Source/Core/InputCommon/InputCommon.vcxproj
index c3243854a2..03aaf1b3ea 100644
--- a/Source/Core/InputCommon/InputCommon.vcxproj
+++ b/Source/Core/InputCommon/InputCommon.vcxproj
@@ -167,6 +167,7 @@
     <ClCompile Include="Src\ControllerEmu.cpp" />
     <ClCompile Include="Src\ControllerInterface\ControllerInterface.cpp" />
     <ClCompile Include="Src\ControllerInterface\Device.cpp" />
+    <ClCompile Include="Src\ControllerInterface\ExpressionParser.cpp" />
     <ClCompile Include="Src\ControllerInterface\DInput\DInput.cpp" />
     <ClCompile Include="Src\ControllerInterface\DInput\DInputJoystick.cpp" />
     <ClCompile Include="Src\ControllerInterface\DInput\DInputKeyboardMouse.cpp" />
@@ -180,6 +181,7 @@
     <ClInclude Include="Src\ControllerEmu.h" />
     <ClInclude Include="Src\ControllerInterface\ControllerInterface.h" />
     <ClInclude Include="Src\ControllerInterface\Device.h" />
+    <ClInclude Include="Src\ControllerInterface\ExpressionParser.h" />
     <ClInclude Include="Src\ControllerInterface\DInput\DInput.h" />
     <ClInclude Include="Src\ControllerInterface\DInput\DInputJoystick.h" />
     <ClInclude Include="Src\ControllerInterface\DInput\DInputKeyboardMouse.h" />
diff --git a/Source/Core/InputCommon/InputCommon.vcxproj.filters b/Source/Core/InputCommon/InputCommon.vcxproj.filters
index b4d5ff074f..ce4558f1ad 100644
--- a/Source/Core/InputCommon/InputCommon.vcxproj.filters
+++ b/Source/Core/InputCommon/InputCommon.vcxproj.filters
@@ -23,6 +23,12 @@
     <ClCompile Include="Src\ControllerInterface\DInput\DInput.cpp">
       <Filter>ControllerInterface\DInput</Filter>
     </ClCompile>
+    <ClCompile Include="Src\ControllerInterface\ExpressionParser.cpp">
+      <Filter>ControllerInterface</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\ControllerInterface\Device.cpp">
+      <Filter>ControllerInterface</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Src\ControllerEmu.h" />
@@ -42,6 +48,9 @@
     <ClInclude Include="Src\ControllerInterface\Device.h">
       <Filter>ControllerInterface\Device</Filter>
     </ClInclude>
+    <ClInclude Include="Src\ControllerInterface\ExpressionParser.h">
+      <Filter>ControllerInterface</Filter>
+    </ClInclude>
     <ClInclude Include="Src\ControllerInterface\DInput\NamedKeys.h">
       <Filter>ControllerInterface\DInput</Filter>
     </ClInclude>
@@ -72,4 +81,4 @@
       <UniqueIdentifier>{5a9c1b94-2eab-4357-b44f-87d5db50da3d}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
index e672e4598c..58e0653bbe 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
@@ -21,6 +21,8 @@
 
 #include "Thread.h"
 
+using namespace ciface::ExpressionParser;
+
 namespace
 {
 const float INPUT_DETECT_THRESHOLD = 0.55f;
@@ -187,48 +189,10 @@ bool ControllerInterface::UpdateOutput(const bool force)
 //
 ControlState ControllerInterface::InputReference::State( const ControlState ignore )
 {
-	//if (NULL == device)
-		//return 0;
-
-	ControlState state = 0;
-
-	std::vector<DeviceControl>::const_iterator
-		ci = m_controls.begin(),
-		ce = m_controls.end();
-
-	// bit of hax for "NOT" to work at start of expression
-	if (ci != ce)
-	{
-		if (ci->mode == 2)
-			state = 1;
-	}
-
-	for (; ci!=ce; ++ci)
-	{
-		const ControlState istate = ci->control->ToInput()->GetState();
-
-		switch (ci->mode)
-		{
-		// OR
-		case 0 :
-			state = std::max(state, istate);
-			break;
-		// AND
-		case 1 :
-			state = std::min(state, istate);
-			break;
-		// NOT
-		case 2 :
-			state = std::max(std::min(state, 1.0f - istate), 0.0f);
-			break;
-		// ADD
-		case 3 :
-			state += istate;
-			break;
-		}
-	}
-
-	return std::min(1.0f, state * range);
+	if (parsed_expression)
+		return parsed_expression->GetValue();
+	else
+		return 0.0f;
 }
 
 //
@@ -240,17 +204,9 @@ ControlState ControllerInterface::InputReference::State( const ControlState igno
 //
 ControlState ControllerInterface::OutputReference::State(const ControlState state)
 {
-	const ControlState tmp_state = std::min(1.0f, state * range);
-
-	// output ref just ignores the modes ( |&!... )
-
-	std::vector<DeviceControl>::iterator
-		ci = m_controls.begin(),
-		ce = m_controls.end();
-	for (; ci != ce; ++ci)
-		ci->control->ToOutput()->SetState(tmp_state);
-	
-	return state;	// just return the output, watever
+	if (parsed_expression)
+		parsed_expression->SetValue(state);
+	return 0.0f;
 }
 
 //
@@ -262,65 +218,13 @@ ControlState ControllerInterface::OutputReference::State(const ControlState stat
 void ControllerInterface::UpdateReference(ControllerInterface::ControlReference* ref
 	, const DeviceQualifier& default_device) const
 {
-	ref->m_controls.clear();
+	delete ref->parsed_expression;
+	ref->parsed_expression = NULL;
 
-	// adding | to parse the last item, silly
-	std::istringstream ss(ref->expression + '|');
-
-	const std::string mode_chars("|&!^");
-
-	ControlReference::DeviceControl	devc;
-
-	std::string	dev_str;
-	std::string ctrl_str;
-
-	char c = 0;
-	while (ss.read(&c, 1))
-	{
-		const size_t f = mode_chars.find(c);
-
-		if (mode_chars.npos != f)
-		{
-			// add ctrl
-			if (ctrl_str.size())
-			{
-				DeviceQualifier	devq;
-
-				// using default device or alterate device inside `backticks`
-				if (dev_str.empty())
-					devq = default_device;
-				else
-					devq.FromString(dev_str);
-
-				// find device
-				Device* const def_device = FindDevice(devq);
-
-				if (def_device)
-				{
-					if (ref->is_input)
-						devc.control = FindInput(ctrl_str, def_device);
-					else
-						devc.control = FindOutput(ctrl_str, def_device);
-
-					if (devc.control)
-						ref->m_controls.push_back(devc);
-				}
-			}
-			// reset stuff for next ctrl
-			devc.mode = (int)f;
-			ctrl_str.clear();
-		}
-		else if ('`' == c)
-		{
-			// different device
-			if (std::getline(ss, dev_str, '`').eof())
-				break;	// no terminating '`' character
-		}
-		else
-		{
-			ctrl_str += c;
-		}
-	}
+	ControlFinder finder(*this, default_device, ref->is_input);
+	ExpressionParseStatus status;
+	status = ParseExpression(ref->expression, finder, &ref->parsed_expression);
+	// XXX: do something with status?
 }
 
 //
@@ -388,7 +292,7 @@ Device::Control* ControllerInterface::OutputReference::Detect(const unsigned int
 	// ignore device
 
 	// don't hang if we don't even have any controls mapped
-	if (m_controls.size())
+	if (BoundCount() > 0)
 	{
 		State(1);
 		unsigned int slept = 0;
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
index db3a82bf3b..57903a08a7 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
@@ -9,6 +9,7 @@
 
 #include "Common.h"
 #include "Thread.h"
+#include "ExpressionParser.h"
 #include "Device.h"
 
 // enable disable sources
@@ -53,30 +54,28 @@ public:
 	class ControlReference
 	{
 		friend class ControllerInterface;
-
 	public:
-		virtual ~ControlReference() {}
-
 		virtual ControlState State(const ControlState state = 0) = 0;
 		virtual Device::Control* Detect(const unsigned int ms, Device* const device) = 0;
-		size_t BoundCount() const { return m_controls.size(); }
 
-		ControlState		range;
+		ControlState range;
 		std::string			expression;
 		const bool			is_input;
 
+		virtual ~ControlReference() {
+			delete parsed_expression;
+		}
+
+		int BoundCount() {
+			if (parsed_expression)
+				return parsed_expression->num_controls;
+			else
+				return 0;
+		}
+
 	protected:
-		ControlReference(const bool _is_input) : range(1), is_input(_is_input) {}
-
-		struct DeviceControl
-		{
-			DeviceControl() : control(NULL), mode(0) {}
-
-			Device::Control*	control;
-			int		mode;
-		};
-
-		std::vector<DeviceControl>	m_controls;
+		ControlReference(const bool _is_input) : range(1), is_input(_is_input), parsed_expression(NULL) {}
+		ciface::ExpressionParser::Expression *parsed_expression;
 	};
 
 	//
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
new file mode 100644
index 0000000000..81ceab5913
--- /dev/null
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
@@ -0,0 +1,516 @@
+
+#include "ExpressionParser.h"
+
+#include <cassert>
+#include <iostream>
+#include <string>
+#include <map>
+#include <vector>
+
+using namespace ciface::Core;
+
+namespace ciface
+{
+namespace ExpressionParser
+{
+
+enum TokenType
+{
+	TOK_DISCARD,
+	TOK_INVALID,
+	TOK_EOF,
+	TOK_LPAREN,
+	TOK_RPAREN,
+	TOK_AND,
+	TOK_OR,
+	TOK_NOT,
+	TOK_CONTROL,
+};
+
+inline std::string OpName(TokenType op)
+{
+	switch (op)
+	{
+	case TOK_AND:
+		return "And";
+	case TOK_OR:
+		return "Or";
+	case TOK_NOT:
+		return "Not";
+	default:
+		assert(false);
+		return "";
+	}
+}
+
+class Token
+{
+public:
+	TokenType type;
+	ControlQualifier qualifier;
+
+	Token(TokenType type_) : type(type_) {}
+	Token(TokenType type_, ControlQualifier qualifier_) : type(type_), qualifier(qualifier_) {}
+
+	operator std::string()
+	{
+		switch (type)
+		{
+		case TOK_INVALID:
+			return "Invalid";
+		case TOK_DISCARD:
+			return "Discard";
+		case TOK_EOF:
+			return "EOF";
+		case TOK_LPAREN:
+			return "(";
+		case TOK_RPAREN:
+			return ")";
+		case TOK_AND:
+			return "&";
+		case TOK_OR:
+			return "|";
+		case TOK_NOT:
+			return "!";
+		case TOK_CONTROL:
+			return "Device(" + (std::string)qualifier + ")";
+		}
+	}
+};
+
+class Lexer {
+public:
+	std::string expr;
+	std::string::iterator it;
+
+	Lexer(std::string expr_) : expr(expr_)
+	{
+		it = expr.begin();
+	}
+
+	bool FetchBacktickString(std::string &value, char otherDelim = 0)
+	{
+		while (it != expr.end())
+		{
+			char c = *it;
+			if (c == '`')
+				return false;
+			if (c > 0 && c == otherDelim)
+				return true;
+			value += c;
+			it++;
+		}
+		return false;
+	}
+
+	Token GetControlQualifier()
+	{
+		ControlQualifier qualifier;
+		std::string value;
+
+		if (FetchBacktickString(value, ':'))
+		{
+			// Found colon, this is the device name
+			qualifier.has_device = true;
+			qualifier.device_qualifier.FromString(value);
+			FetchBacktickString(value);
+		}
+
+		qualifier.control_name = value;
+
+		return Token(TOK_CONTROL, qualifier);
+	}
+
+	Token NextToken()
+	{
+		if (it == expr.end())
+			return Token(TOK_EOF);
+
+		char c = *it++;
+		switch (c)
+		{
+		case ' ':
+		case '\t':
+		case '\n':
+		case '\r':
+			return Token(TOK_DISCARD);
+		case '(':
+			return Token(TOK_LPAREN);
+		case ')':
+			return Token(TOK_RPAREN);
+		case '&':
+			return Token(TOK_AND);
+		case '|':
+			return Token(TOK_OR);
+		case '!':
+			return Token(TOK_NOT);
+		case '`':
+			return GetControlQualifier();
+		default:
+			return Token(TOK_INVALID);
+		}
+	}
+
+	ExpressionParseStatus Tokenize(std::vector<Token> &tokens)
+	{
+		while (true)
+		{
+			Token tok = NextToken();
+
+			if (tok.type == TOK_DISCARD)
+				continue;
+
+			if (tok.type == TOK_INVALID)
+			{
+				tokens.empty();
+				return EXPRESSION_PARSE_SYNTAX_ERROR;
+			}
+
+			tokens.push_back(tok);
+
+			if (tok.type == TOK_EOF)
+				break;
+		}
+		return EXPRESSION_PARSE_SUCCESS;
+	}
+};
+
+class ExpressionNode
+{
+public:
+	virtual ~ExpressionNode() {}
+	virtual ControlState GetValue() { return 0; }
+	virtual void SetValue(ControlState state) {}
+	virtual operator std::string() { return ""; }
+};
+
+class ControlExpression : public ExpressionNode
+{
+public:
+	ControlQualifier qualifier;
+	Device::Control *control;
+
+	ControlExpression(ControlQualifier qualifier_, Device::Control *control_) : qualifier(qualifier_), control(control_) {}
+
+	virtual ControlState GetValue()
+	{
+		return control->ToInput()->GetState();
+	}
+
+	virtual void SetValue(ControlState value)
+	{
+		control->ToOutput()->SetState(value);
+	}
+
+	virtual operator std::string()
+	{
+		return "`" + (std::string)qualifier + "`";
+	}
+};
+
+class BinaryExpression : public ExpressionNode
+{
+public:
+	TokenType op;
+	ExpressionNode *lhs;
+	ExpressionNode *rhs;
+
+	BinaryExpression(TokenType op_, ExpressionNode *lhs_, ExpressionNode *rhs_) : op(op_), lhs(lhs_), rhs(rhs_) {}
+	virtual ~BinaryExpression()
+	{
+		delete lhs;
+		delete rhs;
+	}
+
+	virtual ControlState GetValue()
+	{
+		ControlState lhsValue = lhs->GetValue();
+		ControlState rhsValue = rhs->GetValue();
+		switch (op)
+		{
+		case TOK_AND:
+			return std::min(lhsValue, rhsValue);
+		case TOK_OR:
+			return std::max(lhsValue, rhsValue);
+		default:
+			assert(false);
+			return 0;
+		}
+	}
+
+	virtual void SetValue(ControlState value)
+	{
+		// Don't do anything special with the op we have.
+		// Treat "A & B" the same as "A | B".
+		lhs->SetValue(value);
+		rhs->SetValue(value);
+	}
+
+	virtual operator std::string()
+	{
+		return OpName(op) + "(" + (std::string)(*lhs) + ", " + (std::string)(*rhs) + ")";
+	}
+};
+
+class UnaryExpression : public ExpressionNode
+{
+public:
+	TokenType op;
+	ExpressionNode *inner;
+
+	UnaryExpression(TokenType op_, ExpressionNode *inner_) : op(op_), inner(inner_) {}
+	virtual ~UnaryExpression()
+	{
+		delete inner;
+	}
+
+	virtual ControlState GetValue()
+	{
+		ControlState value = inner->GetValue();
+		switch (op)
+		{
+		case TOK_NOT:
+			return 1.0f - value;
+		default:
+			assert(false);
+			return 0;
+		}
+	}
+
+	virtual void SetValue(ControlState value)
+	{
+		switch (op)
+		{
+		case TOK_NOT:
+			inner->SetValue(1.0f - value);
+		default:
+			assert(false);
+		}
+	}
+
+	virtual operator std::string()
+	{
+		return OpName(op) + "(" + (std::string)(*inner) + ")";
+	}
+};
+
+Device *ControlFinder::FindDevice(ControlQualifier qualifier)
+{
+	if (qualifier.has_device)
+		return container.FindDevice(qualifier.device_qualifier);
+	else
+		return container.FindDevice(default_device);
+}
+
+Device::Control *ControlFinder::FindControl(ControlQualifier qualifier)
+{
+	Device *device = FindDevice(qualifier);
+	if (is_input)
+		return device->FindInput(qualifier.control_name);
+	else
+		return device->FindOutput(qualifier.control_name);
+}
+
+class Parser
+{
+public:
+
+	Parser(std::vector<Token> tokens_, ControlFinder &finder_) : tokens(tokens_), finder(finder_)
+	{
+		m_it = tokens.begin();
+	}
+
+	ExpressionParseStatus Parse(Expression **expr_out)
+	{
+		Expression *expr;
+		ExpressionNode *expr_node;
+		ExpressionParseStatus status = Toplevel(&expr_node);
+		if (status != EXPRESSION_PARSE_SUCCESS)
+			return status;
+
+		expr = new Expression();
+		expr->expr = expr_node;
+		expr->num_controls = CountNumControls();
+		*expr_out = expr;
+
+		return EXPRESSION_PARSE_SUCCESS;
+	}
+
+private:
+	std::vector<Token> tokens;
+	std::vector<Token>::iterator m_it;
+	ControlFinder &finder;
+
+	Token Chew()
+	{
+		return *m_it++;
+	}
+
+	Token Peek()
+	{
+		return *m_it;
+	}
+
+	bool Expects(TokenType type)
+	{
+		Token tok = Chew();
+		return tok.type == type;
+	}
+
+	ExpressionParseStatus Atom(ExpressionNode **expr_out)
+	{
+		Token tok = Chew();
+		switch (tok.type)
+		{
+		case TOK_CONTROL:
+			{
+				Device::Control *control = finder.FindControl(tok.qualifier);
+				if (control == NULL)
+					return EXPRESSION_PARSE_NO_DEVICE;
+
+				*expr_out = new ControlExpression(tok.qualifier, control);
+				return EXPRESSION_PARSE_SUCCESS;
+			}
+		case TOK_LPAREN:
+			return Paren(expr_out);
+		default:
+			return EXPRESSION_PARSE_SYNTAX_ERROR;
+		}
+	}
+
+	bool IsUnaryExpression(TokenType type)
+	{
+		switch (type)
+		{
+		case TOK_NOT:
+			return true;
+		default:
+			return false;
+		}
+	}
+
+	ExpressionParseStatus Unary(ExpressionNode **expr_out)
+	{
+		ExpressionParseStatus status;
+
+		if (IsUnaryExpression(Peek().type))
+		{
+			Token tok = Chew();
+			ExpressionNode *atom_expr;
+			if ((status = Atom(&atom_expr)) != EXPRESSION_PARSE_SUCCESS)
+				return status;
+			*expr_out = new UnaryExpression(tok.type, atom_expr);
+			return EXPRESSION_PARSE_SUCCESS;
+		}
+
+		return Atom(expr_out);
+	}
+
+	bool IsBinaryToken(TokenType type)
+	{
+		switch (type)
+		{
+		case TOK_AND:
+		case TOK_OR:
+			return true;
+		default:
+			return false;
+		}
+	}
+
+	ExpressionParseStatus Binary(ExpressionNode **expr_out)
+	{
+		ExpressionParseStatus status;
+
+		if ((status = Unary(expr_out)) != EXPRESSION_PARSE_SUCCESS)
+			return status;
+
+		while (IsBinaryToken(Peek().type))
+		{
+			Token tok = Chew();
+			ExpressionNode *unary_expr;
+			if ((status = Unary(&unary_expr)) != EXPRESSION_PARSE_SUCCESS)
+			{
+				delete *expr_out;
+				return status;
+			}
+
+			*expr_out = new BinaryExpression(tok.type, *expr_out, unary_expr);
+		}
+
+		return EXPRESSION_PARSE_SUCCESS;
+	}
+
+	ExpressionParseStatus Paren(ExpressionNode **expr_out)
+	{
+		ExpressionParseStatus status;
+
+		// lparen already chewed
+		if ((status = Toplevel(expr_out)) != EXPRESSION_PARSE_SUCCESS)
+			return status;
+
+		if (!Expects(TOK_RPAREN))
+		{
+			delete *expr_out;
+			return EXPRESSION_PARSE_SYNTAX_ERROR;
+		}
+
+		return EXPRESSION_PARSE_SUCCESS;
+	}
+
+	ExpressionParseStatus Toplevel(ExpressionNode **expr_out)
+	{
+		return Binary(expr_out);
+	}
+
+	int CountNumControls()
+	{
+		int count = 0;
+		for (std::vector<Token>::iterator it = tokens.begin(); it != tokens.end(); ++it)
+			if (it->type == TOK_CONTROL)
+				count++;
+		return count;
+	}
+};
+
+ControlState Expression::GetValue()
+{
+	return expr->GetValue();
+}
+
+void Expression::SetValue(ControlState value)
+{
+	expr->SetValue(value);
+}
+
+Expression::~Expression()
+{
+	delete expr;
+}
+
+ExpressionParseStatus ParseExpression(std::string str, ControlFinder &finder, Expression **expr_out)
+{
+	ExpressionParseStatus status;
+	Expression *expr;
+	*expr_out = NULL;
+
+	if (str == "")
+		return EXPRESSION_PARSE_SUCCESS;
+
+	Lexer l(str);
+	std::vector<Token> tokens;
+	status = l.Tokenize(tokens);
+	if (status != EXPRESSION_PARSE_SUCCESS)
+		return status;
+
+	Parser p(tokens, finder);
+	status = p.Parse(&expr);
+	if (status != EXPRESSION_PARSE_SUCCESS)
+		return status;
+
+	*expr_out = expr;
+	return EXPRESSION_PARSE_SUCCESS;
+}
+
+}
+}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h
new file mode 100644
index 0000000000..631c84cd9c
--- /dev/null
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h
@@ -0,0 +1,73 @@
+
+#ifndef _EXPRESSIONPARSER_H_
+#define _EXPRESSIONPARSER_H_
+
+#include <string>
+#include "Device.h"
+
+namespace ciface
+{
+namespace ExpressionParser
+{
+
+class ControlQualifier
+{
+public:
+	bool has_device;
+	Core::DeviceQualifier device_qualifier;
+	std::string control_name;
+
+	ControlQualifier() : has_device(false) {}
+
+	operator std::string()
+	{
+		if (has_device)
+			return device_qualifier.ToString() + ":" + control_name;
+		else
+			return control_name;
+	}
+};
+
+class ControlFinder
+{
+public:
+	ControlFinder(const Core::DeviceContainer &container_, const Core::DeviceQualifier &default_, const bool is_input_) : container(container_), default_device(default_), is_input(is_input_) {}
+	Core::Device::Control *FindControl(ControlQualifier qualifier);
+
+private:
+	Core::Device *FindDevice(ControlQualifier qualifier);
+	const Core::DeviceContainer &container;
+	const Core::DeviceQualifier &default_device;
+	bool is_input;
+};
+
+class Parser;
+class ExpressionNode;
+class Expression
+{
+	friend class Parser;
+
+public:
+	Expression() : expr(NULL) {}
+	~Expression();
+	ControlState GetValue();
+	void SetValue (ControlState state);
+	int num_controls;
+
+private:
+	ExpressionNode *expr;
+};
+
+enum ExpressionParseStatus
+{
+	EXPRESSION_PARSE_SUCCESS = 0,
+	EXPRESSION_PARSE_SYNTAX_ERROR,
+	EXPRESSION_PARSE_NO_DEVICE,
+};
+
+ExpressionParseStatus ParseExpression(std::string expr, ControlFinder &finder, Expression **expr_out);
+
+}
+}
+
+#endif

From d2753cce6617ea053c233289ec4213419913ed6b Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 14 Jun 2013 02:52:07 -0400
Subject: [PATCH 208/352] ExpressionParser: Add support for the add operator

Use "+" instead of "^" this time.
---
 .../Src/ControllerInterface/ExpressionParser.cpp       | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
index 81ceab5913..2cd7a59bf2 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
@@ -24,6 +24,7 @@ enum TokenType
 	TOK_AND,
 	TOK_OR,
 	TOK_NOT,
+	TOK_ADD,
 	TOK_CONTROL,
 };
 
@@ -37,6 +38,8 @@ inline std::string OpName(TokenType op)
 		return "Or";
 	case TOK_NOT:
 		return "Not";
+	case TOK_ADD:
+		return "Add";
 	default:
 		assert(false);
 		return "";
@@ -72,6 +75,8 @@ public:
 			return "|";
 		case TOK_NOT:
 			return "!";
+		case TOK_ADD:
+			return "+";
 		case TOK_CONTROL:
 			return "Device(" + (std::string)qualifier + ")";
 		}
@@ -144,6 +149,8 @@ public:
 			return Token(TOK_OR);
 		case '!':
 			return Token(TOK_NOT);
+		case '+':
+			return Token(TOK_ADD);
 		case '`':
 			return GetControlQualifier();
 		default:
@@ -232,6 +239,8 @@ public:
 			return std::min(lhsValue, rhsValue);
 		case TOK_OR:
 			return std::max(lhsValue, rhsValue);
+		case TOK_ADD:
+			return std::min(lhsValue + rhsValue, 1.0f);
 		default:
 			assert(false);
 			return 0;
@@ -412,6 +421,7 @@ private:
 		{
 		case TOK_AND:
 		case TOK_OR:
+		case TOK_ADD:
 			return true;
 		default:
 			return false;

From a42388d06108154fe424dc94cf1ed9f4842c5f2b Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 14 Jun 2013 03:10:27 -0400
Subject: [PATCH 209/352] ExpressionParser: Support bare words for simple
 control names

Using backticks for all control names can get a bit grating,
so support "A & B" instead of requiring "`A` & `B`".
---
 .../ControllerInterface/ExpressionParser.cpp  | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
index 2cd7a59bf2..2023debd56 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
@@ -108,7 +108,7 @@ public:
 		return false;
 	}
 
-	Token GetControlQualifier()
+	Token GetFullyQualifiedControl()
 	{
 		ControlQualifier qualifier;
 		std::string value;
@@ -126,6 +126,24 @@ public:
 		return Token(TOK_CONTROL, qualifier);
 	}
 
+	Token GetBarewordsControl(char c)
+	{
+		std::string name;
+		name += c;
+
+		while (it != expr.end()) {
+			c = *it;
+			if (!isalpha(c))
+				break;
+			name += c;
+			it++;
+		}
+
+		ControlQualifier qualifier;
+		qualifier.control_name = name;
+		return Token(TOK_CONTROL, qualifier);
+	}
+
 	Token NextToken()
 	{
 		if (it == expr.end())
@@ -152,9 +170,12 @@ public:
 		case '+':
 			return Token(TOK_ADD);
 		case '`':
-			return GetControlQualifier();
+			return GetFullyQualifiedControl();
 		default:
-			return Token(TOK_INVALID);
+			if (isalpha(c))
+				return GetBarewordsControl(c);
+			else
+				return Token(TOK_INVALID);
 		}
 	}
 

From 03a835ec076ae47e6f434b4c399e268277924f40 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Mon, 17 Jun 2013 05:55:21 -0400
Subject: [PATCH 210/352] InputConfigDiag: Update for the new expression
 language

Modify the buttons and editor interface for the new expression
language, like the new op name for add, the new device name syntax,
and add new editing features, like simple selection behavior on
unary ops.
---
 Source/Core/DolphinWX/Src/InputConfigDiag.cpp | 84 ++++++++++++-------
 Source/Core/DolphinWX/Src/InputConfigDiag.h   |  1 +
 2 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
index ae52c7dbf1..a8be1b56a4 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
@@ -239,10 +239,7 @@ void GamepadPage::UpdateGUI()
 		std::vector<ControlButton*>::const_iterator i = (*g)->control_buttons.begin()
 			, e = (*g)->control_buttons.end();
 		for (; i!=e; ++i)
-			//if (std::string::npos == (*i)->control_reference->expression.find_first_of("`|&!#"))
-				(*i)->SetLabel(StrToWxStr((*i)->control_reference->expression));
-			//else
-				//(*i)->SetLabel(wxT("..."));
+			(*i)->SetLabel(StrToWxStr((*i)->control_reference->expression));
 
 		// cboxes
 		std::vector<PadSetting*>::const_iterator si = (*g)->options.begin()
@@ -323,23 +320,45 @@ void ControlDialog::ClearControl(wxCommandEvent&)
 	UpdateGUI();
 }
 
-void ControlDialog::SetSelectedControl(wxCommandEvent&)
+inline bool IsAlphabetic(wxString &str)
+{
+    for (wxString::const_iterator it = str.begin(); it != str.end(); ++it)
+		if (!isalpha(*it))
+			return false;
+	return true;
+}
+
+bool ControlDialog::GetExpressionForSelectedControl(wxString &expr)
 {
 	const int num = control_lbox->GetSelection();
 
 	if (num < 0)
-		return;
+		return false;
 
-	wxString expr;
+	expr = "";
 
 	// non-default device
-	if (false == (m_devq == m_parent->controller->default_device))
-		expr.append(wxT('`')).append(StrToWxStr(m_devq.ToString())).append(wxT('`'));
+	if (!(m_devq == m_parent->controller->default_device))
+		expr += m_devq.ToString();
 
 	// append the control name
 	expr += control_lbox->GetString(num);
 
-	control_reference->expression = WxStrToStr(expr);
+	if (!IsAlphabetic(expr))
+		expr = wxString::Format("`%s`", expr);
+
+	return true;
+}
+
+void ControlDialog::SetSelectedControl(wxCommandEvent&)
+{
+	wxString expr;
+
+	if (!GetExpressionForSelectedControl(expr))
+		return;
+
+	textctrl->WriteText(expr);
+	control_reference->expression = textctrl->GetValue();
 
 	std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
 	g_controller_interface.UpdateReference(control_reference, m_parent->controller->default_device);
@@ -349,28 +368,30 @@ void ControlDialog::SetSelectedControl(wxCommandEvent&)
 
 void ControlDialog::AppendControl(wxCommandEvent& event)
 {
-	const int num = control_lbox->GetSelection();
+	wxString device_expr, expr;
 
-	if (num < 0)
+	const wxString lbl = ((wxButton*)event.GetEventObject())->GetLabel();
+	char op = lbl[0];
+
+	if (!GetExpressionForSelectedControl(device_expr))
 		return;
 
-	// o boy!, hax
-	const wxString lbl = ((wxButton*)event.GetEventObject())->GetLabel();
+	// Unary ops (that is, '!') are a special case. When there's a selection,
+	// put parens around it and prepend it with a '!', but when there's nothing,
+	// just add a '!device'.
+	if (op == '!')
+	{
+		wxString selection = textctrl->GetStringSelection();
+		if (selection == "")
+			expr = wxString::Format("%c%s", op, device_expr);
+		else
+			expr = wxString::Format("%c(%s)", op, selection);
+	}
+	else
+		expr = wxString::Format(" %c %s", op, device_expr);
 
-	wxString expr = textctrl->GetValue();
-
-	// append the operator to the expression
-	if (wxT('!') == lbl[0] || false == expr.empty())
-		expr += lbl[0];
-
-	// non-default device
-	if (false == (m_devq == m_parent->controller->default_device))
-		expr.append(wxT('`')).append(StrToWxStr(m_devq.ToString())).append(wxT('`'));
-
-	// append the control name
-	expr += control_lbox->GetString(num);
-
-	control_reference->expression = WxStrToStr(expr);
+	textctrl->WriteText(expr);
+	control_reference->expression = textctrl->GetValue();
 
 	std::lock_guard<std::recursive_mutex> lk(m_plugin.controls_lock);
 	g_controller_interface.UpdateReference(control_reference, m_parent->controller->default_device);
@@ -478,6 +499,9 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent)
 	wxButton* const select_button = new wxButton(this, -1, _("Select"));
 	select_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::SetSelectedControl, this);
 
+	wxButton* const not_button = new  wxButton(this, -1, _("! NOT"), wxDefaultPosition);
+	not_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this);
+
 	wxButton* const or_button = new  wxButton(this, -1, _("| OR"), wxDefaultPosition);
 	or_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this);
 
@@ -492,11 +516,9 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent)
 	{
 		// TODO: check if && is good on other OS
 		wxButton* const and_button = new  wxButton(this, -1, _("&& AND"), wxDefaultPosition);
-		wxButton* const not_button = new  wxButton(this, -1, _("! NOT"), wxDefaultPosition);
-		wxButton* const add_button = new  wxButton(this, -1, _("^ ADD"), wxDefaultPosition);
+		wxButton* const add_button = new  wxButton(this, -1, _("+ ADD"), wxDefaultPosition);
 
 		and_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this);
-		not_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this);
 		add_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::AppendControl, this);
 
 		button_sizer->Add(and_button, 1, 0, 5);
diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.h b/Source/Core/DolphinWX/Src/InputConfigDiag.h
index a11cea2cb3..475fa9ed5e 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.h
+++ b/Source/Core/DolphinWX/Src/InputConfigDiag.h
@@ -113,6 +113,7 @@ private:
 	GamepadPage* const		m_parent;
 	wxStaticText*		m_bound_label;
 	DeviceQualifier	m_devq;
+	bool GetExpressionForSelectedControl(wxString &expr);
 };
 
 class ExtensionButton : public wxButton

From 62281fbfde78317c7a1cf0b325d0b909983e61e7 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Mon, 17 Jun 2013 06:45:29 -0400
Subject: [PATCH 211/352] InputConfigDiag: Give the input text field a
 monospace font

---
 Source/Core/DolphinWX/Src/InputConfigDiag.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
index a8be1b56a4..aebc201bc9 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
@@ -489,7 +489,10 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent)
 {
 	wxStaticBoxSizer* const main_szr = new wxStaticBoxSizer(wxVERTICAL, this, control_reference->is_input ? _("Input") : _("Output"));
 
-	textctrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition, wxSize(-1, 48), wxTE_MULTILINE);
+	textctrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition, wxSize(-1, 48), wxTE_MULTILINE | wxTE_RICH2);
+	wxFont font = textctrl->GetFont();
+	font.SetFamily(wxFONTFAMILY_MODERN);
+	textctrl->SetFont(font);
 
 	wxButton* const detect_button = new wxButton(this, -1, control_reference->is_input ? _("Detect") : _("Test"));
 

From c5c86d17dc5f8fcb4421a9e745b443ea33f143c4 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Mon, 17 Jun 2013 06:52:03 -0400
Subject: [PATCH 212/352] InputConfigDiag: Use "..." for complicated
 expressions

The full expression is quite often too big for a simple button
label, so encourage people to use the full editor to edit it.
---
 Source/Core/DolphinWX/Src/InputConfigDiag.cpp   |  9 +++++++--
 .../ControllerInterface/ControllerInterface.h   |  7 +++++++
 .../ControllerInterface/ExpressionParser.cpp    | 17 +++++++++++++++++
 .../Src/ControllerInterface/ExpressionParser.h  |  1 +
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
index aebc201bc9..e036d5ec71 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
@@ -238,8 +238,13 @@ void GamepadPage::UpdateGUI()
 		// buttons
 		std::vector<ControlButton*>::const_iterator i = (*g)->control_buttons.begin()
 			, e = (*g)->control_buttons.end();
-		for (; i!=e; ++i)
-			(*i)->SetLabel(StrToWxStr((*i)->control_reference->expression));
+		for (; i!=e; ++i) {
+			ControllerInterface::ControlReference *r = (*i)->control_reference;
+			if (r->IsComplicated())
+				(*i)->SetLabel("...");
+			else
+				(*i)->SetLabel(StrToWxStr((*i)->control_reference->expression));
+		}
 
 		// cboxes
 		std::vector<PadSetting*>::const_iterator si = (*g)->options.begin()
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
index 57903a08a7..e130c951aa 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
@@ -73,6 +73,13 @@ public:
 				return 0;
 		}
 
+		bool IsComplicated() {
+			if (parsed_expression)
+				return parsed_expression->is_complicated;
+			else
+				return false;
+		}
+
 	protected:
 		ControlReference(const bool _is_input) : range(1), is_input(_is_input), parsed_expression(NULL) {}
 		ciface::ExpressionParser::Expression *parsed_expression;
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
index 2023debd56..91c275e71b 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
@@ -209,6 +209,7 @@ public:
 	virtual ~ExpressionNode() {}
 	virtual ControlState GetValue() { return 0; }
 	virtual void SetValue(ControlState state) {}
+	virtual bool IsComplicated() { return false; }
 	virtual operator std::string() { return ""; }
 };
 
@@ -230,6 +231,11 @@ public:
 		control->ToOutput()->SetState(value);
 	}
 
+	virtual bool IsComplicated()
+	{
+		return false;
+	}
+
 	virtual operator std::string()
 	{
 		return "`" + (std::string)qualifier + "`";
@@ -276,6 +282,11 @@ public:
 		rhs->SetValue(value);
 	}
 
+	virtual bool IsComplicated()
+	{
+		return true;
+	}
+
 	virtual operator std::string()
 	{
 		return OpName(op) + "(" + (std::string)(*lhs) + ", " + (std::string)(*rhs) + ")";
@@ -318,6 +329,11 @@ public:
 		}
 	}
 
+	virtual bool IsComplicated()
+	{
+		return true;
+	}
+
 	virtual operator std::string()
 	{
 		return OpName(op) + "(" + (std::string)(*inner) + ")";
@@ -361,6 +377,7 @@ public:
 		expr = new Expression();
 		expr->expr = expr_node;
 		expr->num_controls = CountNumControls();
+		expr->is_complicated = expr_node->IsComplicated();
 		*expr_out = expr;
 
 		return EXPRESSION_PARSE_SUCCESS;
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h
index 631c84cd9c..342f513f5c 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h
@@ -53,6 +53,7 @@ public:
 	ControlState GetValue();
 	void SetValue (ControlState state);
 	int num_controls;
+	bool is_complicated;
 
 private:
 	ExpressionNode *expr;

From 89e84163c2369c0839ee901015d992abacb1191c Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Tue, 25 Jun 2013 01:44:28 -0400
Subject: [PATCH 213/352] ExpressionParser: Fix delimiter scanning

We need to make sure we eat the delimiter, otherwise we'll notice
the colon / backtick and think it's either a new control or part
of the control name
---
 .../InputCommon/Src/ControllerInterface/ExpressionParser.cpp    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
index 91c275e71b..a259f303c8 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
@@ -98,12 +98,12 @@ public:
 		while (it != expr.end())
 		{
 			char c = *it;
+			it++;
 			if (c == '`')
 				return false;
 			if (c > 0 && c == otherDelim)
 				return true;
 			value += c;
-			it++;
 		}
 		return false;
 	}

From 54e1b58199e9f11e9d8015777ebfcd53c86d485d Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Tue, 25 Jun 2013 01:45:31 -0400
Subject: [PATCH 214/352] Core: Update default bound controls for new
 ExpressionParser

---
 Source/Core/Core/Src/HW/GCPadEmu.cpp          | 12 ++++-----
 .../Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp     | 26 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Source/Core/Core/Src/HW/GCPadEmu.cpp b/Source/Core/Core/Src/HW/GCPadEmu.cpp
index af4130b1bc..a183d27714 100644
--- a/Source/Core/Core/Src/HW/GCPadEmu.cpp
+++ b/Source/Core/Core/Src/HW/GCPadEmu.cpp
@@ -181,14 +181,14 @@ void GCPad::LoadDefaults(const ControllerInterface& ciface)
 	set_control(m_main_stick, 4, "LSHIFT");		// Modifier
 
 #elif __APPLE__
-	set_control(m_c_stick, 4, "Left Control");	// Modifier
+	set_control(m_c_stick, 4, "`Left Control`");	// Modifier
 
 	// Main Stick
-	set_control(m_main_stick, 0, "Up Arrow");		// Up
-	set_control(m_main_stick, 1, "Down Arrow");		// Down
-	set_control(m_main_stick, 2, "Left Arrow");		// Left
-	set_control(m_main_stick, 3, "Right Arrow");	// Right
-	set_control(m_main_stick, 4, "Left Shift");		// Modifier
+	set_control(m_main_stick, 0, "`Up Arrow");		// Up
+	set_control(m_main_stick, 1, "`Down Arrow`");		// Down
+	set_control(m_main_stick, 2, "`Left Arrow`");		// Left
+	set_control(m_main_stick, 3, "`Right Arrow`");	// Right
+	set_control(m_main_stick, 4, "`Left Shift`");		// Modifier
 #else
 	// not sure if these are right
 
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
index 5ccfb19b43..80c24bb078 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -894,11 +894,11 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
 
 	// Buttons
 #if defined HAVE_X11 && HAVE_X11
-	set_control(m_buttons, 0, "Click 1");		// A
-	set_control(m_buttons, 1, "Click 3");		// B
+	set_control(m_buttons, 0, "`Click 1`");		// A
+	set_control(m_buttons, 1, "`Click 3`");		// B
 #else
-	set_control(m_buttons, 0, "Click 0");		// A
-	set_control(m_buttons, 1, "Click 1");		// B
+	set_control(m_buttons, 0, "`Click 0`");		// A
+	set_control(m_buttons, 1, "`Click 1`");		// B
 #endif
 	set_control(m_buttons, 2, "1");		// 1
 	set_control(m_buttons, 3, "2");		// 2
@@ -913,13 +913,13 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
 
 	// Shake
 	for (size_t i = 0; i != 3; ++i)
-		set_control(m_shake, i, "Click 2");
+		set_control(m_shake, i, "`Click 2`");
 
 	// IR
-	set_control(m_ir, 0, "Cursor Y-");
-	set_control(m_ir, 1, "Cursor Y+");
-	set_control(m_ir, 2, "Cursor X-");
-	set_control(m_ir, 3, "Cursor X+");
+	set_control(m_ir, 0, "`Cursor Y-1");
+	set_control(m_ir, 1, "`Cursor Y+`");
+	set_control(m_ir, 2, "`Cursor X-`");
+	set_control(m_ir, 3, "`Cursor X+`");
 
 	// DPad
 #ifdef _WIN32
@@ -928,10 +928,10 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
 	set_control(m_dpad, 2, "LEFT");		// Left
 	set_control(m_dpad, 3, "RIGHT");	// Right
 #elif __APPLE__
-	set_control(m_dpad, 0, "Up Arrow");		// Up
-	set_control(m_dpad, 1, "Down Arrow");	// Down
-	set_control(m_dpad, 2, "Left Arrow");	// Left
-	set_control(m_dpad, 3, "Right Arrow");	// Right
+	set_control(m_dpad, 0, "`Up Arrow`");		// Up
+	set_control(m_dpad, 1, "`Down Arrow`");	// Down
+	set_control(m_dpad, 2, "`Left Arrow`");	// Left
+	set_control(m_dpad, 3, "`Right Arrow`");	// Right
 #else
 	set_control(m_dpad, 0, "Up");		// Up
 	set_control(m_dpad, 1, "Down");		// Down

From 748ee505361fda5d1affe76b482060fc725a24e3 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Tue, 25 Jun 2013 01:58:22 -0400
Subject: [PATCH 215/352] Core: Fix a typo in the binding of IR Up

Whoops.
---
 Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
index 80c24bb078..bf8a8e2893 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -916,7 +916,7 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
 		set_control(m_shake, i, "`Click 2`");
 
 	// IR
-	set_control(m_ir, 0, "`Cursor Y-1");
+	set_control(m_ir, 0, "`Cursor Y-`");
 	set_control(m_ir, 1, "`Cursor Y+`");
 	set_control(m_ir, 2, "`Cursor X-`");
 	set_control(m_ir, 3, "`Cursor X+`");

From ba310ce096da2f69fece62998076a00f5eb6272b Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Tue, 25 Jun 2013 13:37:38 +0200
Subject: [PATCH 216/352] PixelShaderManager: Revert code introduced mainly in
 revision 0fdeb81038d9.

The shader constant usage profile functionality is still buggy and the code using it wasn't ever meant to be merged to master.
---
 .../VideoCommon/Src/PixelShaderManager.cpp    | 100 ++++--------------
 1 file changed, 22 insertions(+), 78 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
index 9fbe096607..aef4baa14c 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
@@ -29,45 +29,19 @@ static u32 lastTexDims[8]; // width | height << 16 | wrap_s << 28 | wrap_t << 30
 static u32 lastZBias;
 static int nMaterialsChanged;
 
-static float s_constant_cache[C_PENVCONST_END*4];
-
 inline void SetPSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4)
 {
-//	if (s_constant_cache[const_number*4] == f1 && s_constant_cache[const_number*4+1] == f2 &&
-//	    s_constant_cache[const_number*4+2] == f3 && s_constant_cache[const_number*4+3] == f4)
-//		return;
-
 	g_renderer->SetPSConstant4f(const_number, f1, f2, f3, f4);
-	s_constant_cache[const_number*4] = f1;
-	s_constant_cache[const_number*4+1] = f2;
-	s_constant_cache[const_number*4+2] = f3;
-	s_constant_cache[const_number*4+3] = f4;
 }
 
 inline void SetPSConstant4fv(unsigned int const_number, const float *f)
 {
-//	if (s_constant_cache[const_number*4] == f[0] && s_constant_cache[const_number*4+1] == f[1] &&
-//	    s_constant_cache[const_number*4+2] == f[2] && s_constant_cache[const_number*4+3] == f[3])
-//		return;
-
 	g_renderer->SetPSConstant4fv(const_number, f);
-	s_constant_cache[const_number*4] = f[0];
-	s_constant_cache[const_number*4+1] = f[1];
-	s_constant_cache[const_number*4+2] = f[2];
-	s_constant_cache[const_number*4+3] = f[3];
 }
 
 inline void SetMultiPSConstant4fv(unsigned int const_number, unsigned int count, const float *f)
 {
-//	for (unsigned int i = 0; i < 4*count; ++i)
-//		if (s_constant_cache[const_number*4+i] != f[i])
-//			break;
-//		else if (i == 4*count-1)
-//			return;
-
 	g_renderer->SetMultiPSConstant4fv(const_number, count, f);
-	for (unsigned int i = 0; i < 4*count; ++i)
-		s_constant_cache[const_number*4+i] = f[i];
 }
 
 void PixelShaderManager::Init()
@@ -76,7 +50,6 @@ void PixelShaderManager::Init()
 	memset(lastTexDims, 0, sizeof(lastTexDims));
 	lastZBias = 0;
 	memset(lastRGBAfull, 0, sizeof(lastRGBAfull));
-	memset(s_constant_cache, 0, sizeof(s_constant_cache)); // TODO: Should reflect that on the GPU side....
 	Dirty();
 }
 
@@ -102,19 +75,6 @@ void PixelShaderManager::SetConstants(u32 components)
 	if (g_ActiveConfig.backend_info.APIType == API_OPENGL && !g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 		Dirty();
 
-	// TODO: Probably broken in the non-UBO path
-	PixelShaderConstantProfile constant_profile(C_PENVCONST_END);
-	/// TODO: dst alpha/api/components type parameter...
-	GetPixelShaderConstantProfile(constant_profile, DSTALPHA_DUAL_SOURCE_BLEND, API_OPENGL, components);
-
-	static int saved_updates = 0;
-	static int necessary_updates = 0;
-
-// TODO: Remove this!
-#define IncStuff() { \
-	saved_updates++; \
-	/*printf("Saved a constant update at line %d! Saved %d against %d now!\n", __LINE__, saved_updates, necessary_updates);*/ }
-
 	for (int i = 0; i < 2; ++i)
 	{
 		if (s_nColorsChanged[i])
@@ -122,12 +82,11 @@ void PixelShaderManager::SetConstants(u32 components)
 			int baseind = i ? C_KCOLORS : C_COLORS;
 			for (int j = 0; j < 4; ++j)
 			{
-				if ((s_nColorsChanged[i] & (1 << j)) && constant_profile.ConstantIsUsed(baseind+j))
+				if ((s_nColorsChanged[i] & (1 << j)))
 				{
 					SetPSConstant4fv(baseind+j, &lastRGBAfull[i][j][0]);
 					s_nColorsChanged[i] &= ~(1<<j);
-					++necessary_updates;
-				} else if ((s_nColorsChanged[i] & (1 << j))) IncStuff();
+				}
 			}
 		}
 	}
@@ -136,23 +95,21 @@ void PixelShaderManager::SetConstants(u32 components)
 	{
 		for (int i = 0; i < 8; ++i)
 		{
-            if ((s_nTexDimsChanged & (1<<i)) && constant_profile.ConstantIsUsed(C_TEXDIMS+i))
+            if ((s_nTexDimsChanged & (1<<i)))
 			{
-				++necessary_updates;
 				SetPSTextureDims(i);
 				s_nTexDimsChanged &= ~(1<<i);
-			}else if (s_nTexDimsChanged & (1<<i)) IncStuff();
+			}
         }
     }
 
-    if (s_bAlphaChanged && constant_profile.ConstantIsUsed(C_ALPHA))
+    if (s_bAlphaChanged)
 	{
-		++necessary_updates;
 		SetPSConstant4f(C_ALPHA, (lastAlpha&0xff)/255.0f, ((lastAlpha>>8)&0xff)/255.0f, 0, ((lastAlpha>>16)&0xff)/255.0f);
 		s_bAlphaChanged = false;
-    } else if (s_bAlphaChanged) IncStuff();
+    }
 
-	if (s_bZTextureTypeChanged && constant_profile.ConstantIsUsed(C_ZBIAS))
+	if (s_bZTextureTypeChanged)
 	{
 		float ftemp[4];
 		switch (bpmem.ztex2.type)
@@ -170,12 +127,11 @@ void PixelShaderManager::SetConstants(u32 components)
 				ftemp[0] = 16711680.0f/16777215.0f; ftemp[1] = 65280.0f/16777215.0f; ftemp[2] = 255.0f/16777215.0f; ftemp[3] = 0;
                 break;
         }
-		++necessary_updates;
 		SetPSConstant4fv(C_ZBIAS, ftemp);
 		s_bZTextureTypeChanged = false;
-	} else if (s_bZTextureTypeChanged) IncStuff();
+	}
 
-	if ((s_bZBiasChanged || s_bDepthRangeChanged) && constant_profile.ConstantIsUsed(C_ZBIAS+1))
+	if (s_bZBiasChanged || s_bDepthRangeChanged)
 	{
 		// reversed gxsetviewport(xorig, yorig, width, height, nearz, farz)
 		// [0] = width/2
@@ -186,10 +142,9 @@ void PixelShaderManager::SetConstants(u32 components)
 		// [5] = 16777215 * farz
 
 		//ERROR_LOG("pixel=%x,%x, bias=%x\n", bpmem.zcontrol.pixel_format, bpmem.ztex2.type, lastZBias);
-					++necessary_updates;
 		SetPSConstant4f(C_ZBIAS+1, xfregs.viewport.farZ / 16777216.0f, xfregs.viewport.zRange / 16777216.0f, 0, (float)(lastZBias)/16777215.0f);
 		s_bZBiasChanged = s_bDepthRangeChanged = false;
-    }else if ((s_bZBiasChanged || s_bDepthRangeChanged)) IncStuff();
+	}
 
 	// indirect incoming texture scales
 	if (s_nIndTexScaleChanged)
@@ -197,7 +152,7 @@ void PixelShaderManager::SetConstants(u32 components)
 		// set as two sets of vec4s, each containing S and T of two ind stages.
 		float f[8];
 
-        if ((s_nIndTexScaleChanged & 0x03) && constant_profile.ConstantIsUsed(C_INDTEXSCALE))
+        if (s_nIndTexScaleChanged & 0x03)
 		{
 			for (u32 i = 0; i < 2; ++i)
 			{
@@ -205,13 +160,10 @@ void PixelShaderManager::SetConstants(u32 components)
                 f[2 * i + 1] = bpmem.texscale[0].getScaleT(i & 1);
                 PRIM_LOG("tex indscale%d: %f %f\n", i, f[2 * i], f[2 * i + 1]);
             }
-			++necessary_updates;
 			SetPSConstant4fv(C_INDTEXSCALE, f);
-			s_nIndTexScaleChanged &= ~0x03;
         }
-        else if ((s_nIndTexScaleChanged & 0x03)) IncStuff();
 
-        if ((s_nIndTexScaleChanged & 0x0c) && constant_profile.ConstantIsUsed(C_INDTEXSCALE+1))
+		if (s_nIndTexScaleChanged & 0x0c)
 		{
             for (u32 i = 2; i < 4; ++i)
 			{
@@ -219,18 +171,16 @@ void PixelShaderManager::SetConstants(u32 components)
                 f[2 * i + 1] = bpmem.texscale[1].getScaleT(i & 1);
                 PRIM_LOG("tex indscale%d: %f %f\n", i, f[2 * i], f[2 * i + 1]);
             }
-			++necessary_updates;
 			SetPSConstant4fv(C_INDTEXSCALE+1, &f[4]);
-			s_nIndTexScaleChanged &= ~0x0c;
         }
-        else if ((s_nIndTexScaleChanged & 0x0c)) IncStuff();
+		s_nIndTexScaleChanged = 0;
     }
 
 	if (s_nIndTexMtxChanged)
 	{
 		for (int i = 0; i < 3; ++i)
 		{
-            if ((s_nIndTexMtxChanged & (1 << i)) && (constant_profile.ConstantIsUsed(C_INDTEXMTX+2*i) || constant_profile.ConstantIsUsed(C_INDTEXMTX+2*i+1)))
+            if (s_nIndTexMtxChanged & (1 << i))
 			{
                 int scale = ((u32)bpmem.indmtx[i].col0.s0 << 0) |
 					        ((u32)bpmem.indmtx[i].col1.s1 << 2) |
@@ -240,8 +190,6 @@ void PixelShaderManager::SetConstants(u32 components)
                 // xyz - static matrix
                 // TODO w - dynamic matrix scale / 256...... somehow / 4 works better
                 // rev 2972 - now using / 256.... verify that this works
-					++necessary_updates;
-					++necessary_updates;
 				SetPSConstant4f(C_INDTEXMTX + 2 * i,
 					bpmem.indmtx[i].col0.ma * fscale,
 					bpmem.indmtx[i].col1.mc * fscale,
@@ -259,20 +207,18 @@ void PixelShaderManager::SetConstants(u32 components)
                 	bpmem.indmtx[i].col0.mb * fscale, bpmem.indmtx[i].col1.md * fscale, bpmem.indmtx[i].col2.mf * fscale);
 
 				s_nIndTexMtxChanged &= ~(1 << i);
-            }else if ((s_nIndTexMtxChanged & (1 << i))) {IncStuff();IncStuff();}
+			}
         }
     }
 
-    if (s_bFogColorChanged && constant_profile.ConstantIsUsed(C_FOG))
+    if (s_bFogColorChanged)
 	{
-					++necessary_updates;
 		SetPSConstant4f(C_FOG, bpmem.fog.color.r / 255.0f, bpmem.fog.color.g / 255.0f, bpmem.fog.color.b / 255.0f, 0);
 		s_bFogColorChanged = false;
-    }else if (s_bFogColorChanged) IncStuff();
+    }
 
-    if (s_bFogParamChanged && constant_profile.ConstantIsUsed(C_FOG+1))
+    if (s_bFogParamChanged)
 	{
-					++necessary_updates;
 		if(!g_ActiveConfig.bDisableFog)
 		{
 			//downscale magnitude to 0.24 bits
@@ -285,11 +231,10 @@ void PixelShaderManager::SetConstants(u32 components)
 			SetPSConstant4f(C_FOG + 1, 0.0, 1.0, 0.0, 1.0);
 
         s_bFogParamChanged = false;
-    }else if ( s_bFogParamChanged) IncStuff();
+    }
 
-	if (s_bFogRangeAdjustChanged && constant_profile.ConstantIsUsed(C_FOG+2))
+	if (s_bFogRangeAdjustChanged)
 	{
-					++necessary_updates;
 		if(!g_ActiveConfig.bDisableFog && bpmem.fogRange.Base.Enabled == 1)
 		{
 			//bpmem.fogRange.Base.Center : center of the viewport in x axis. observation: bpmem.fogRange.Base.Center = realcenter + 342;
@@ -310,9 +255,8 @@ void PixelShaderManager::SetConstants(u32 components)
 		}
 
 		s_bFogRangeAdjustChanged = false;
-	}else if ( s_bFogRangeAdjustChanged) IncStuff();
+	}
 
-	// TODO: use constant profile here!
 	if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)  // config check added because the code in here was crashing for me inside SetPSConstant4f
 	{
 		if (nLightsChanged[0] >= 0)
@@ -372,7 +316,7 @@ void PixelShaderManager::SetConstants(u32 components)
 					SetPSConstant4fv(C_PMATERIALS + i, material);
 				}
 			}
-			
+
 			for (int i = 0; i < 2; ++i)
 			{
 				if (nMaterialsChanged & (1 << (i + 2)))

From 0fd3acd15278252b4b77db37c86da729c84ae23a Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Fri, 31 May 2013 07:12:59 +0200
Subject: [PATCH 217/352] Saving real Wiimote state

because that's simpler than reconnecting
---
 Source/Core/Common/Src/CommonFuncs.h          |   1 +
 Source/Core/Core/Src/ConfigManager.cpp        |   2 -
 Source/Core/Core/Src/ConfigManager.h          |   1 -
 Source/Core/Core/Src/Core.cpp                 |   2 +
 Source/Core/Core/Src/HW/Wiimote.cpp           |  23 +-
 Source/Core/Core/Src/HW/Wiimote.h             |   4 +
 .../Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp | 698 +++++++++++++++++-
 .../Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp     |   5 +-
 .../Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h  |  10 +
 Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp |   4 +
 .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp   |  95 ++-
 .../Core/Src/HW/WiimoteReal/WiimoteReal.h     |   4 +
 .../Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp    |  21 -
 .../Core/DolphinWX/Src/WiimoteConfigDiag.cpp  |   4 -
 Source/Core/DolphinWX/Src/WiimoteConfigDiag.h |   5 -
 15 files changed, 815 insertions(+), 64 deletions(-)

diff --git a/Source/Core/Common/Src/CommonFuncs.h b/Source/Core/Common/Src/CommonFuncs.h
index 4321e6dba0..7ea2c8e490 100644
--- a/Source/Core/Common/Src/CommonFuncs.h
+++ b/Source/Core/Common/Src/CommonFuncs.h
@@ -162,6 +162,7 @@ const char* GetLastErrorMsg();
 namespace Common
 {
 inline u8 swap8(u8 _data) {return _data;}
+inline u32 swap24(const u8* _data) {return (_data[0] << 16) | (_data[1] << 8) | _data[2];}
 
 #ifdef _WIN32
 inline u16 swap16(u16 _data) {return _byteswap_ushort(_data);}
diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp
index 2d4f566485..8917e20cc6 100644
--- a/Source/Core/Core/Src/ConfigManager.cpp
+++ b/Source/Core/Core/Src/ConfigManager.cpp
@@ -243,7 +243,6 @@ void SConfig::SaveSettings()
 
 	ini.Set("Core", "WiiSDCard", m_WiiSDCard);
 	ini.Set("Core", "WiiKeyboard", m_WiiKeyboard);
-	ini.Set("Core", "WiimoteReconnectOnLoad", m_WiimoteReconnectOnLoad);
 	ini.Set("Core", "WiimoteContinuousScanning", m_WiimoteContinuousScanning);
 	ini.Set("Core", "WiimoteEnableSpeaker", m_WiimoteEnableSpeaker);
 	ini.Set("Core", "RunCompareServer",	m_LocalCoreStartupParameter.bRunCompareServer);
@@ -400,7 +399,6 @@ void SConfig::LoadSettings()
 
 		ini.Get("Core", "WiiSDCard",		&m_WiiSDCard,									false);
 		ini.Get("Core", "WiiKeyboard",		&m_WiiKeyboard,									false);
-		ini.Get("Core", "WiimoteReconnectOnLoad",	&m_WiimoteReconnectOnLoad,				true);
 		ini.Get("Core", "WiimoteContinuousScanning", &m_WiimoteContinuousScanning,			false);
 		ini.Get("Core", "WiimoteEnableSpeaker", &m_WiimoteEnableSpeaker,					true);
 		ini.Get("Core", "RunCompareServer",	&m_LocalCoreStartupParameter.bRunCompareServer,	false);
diff --git a/Source/Core/Core/Src/ConfigManager.h b/Source/Core/Core/Src/ConfigManager.h
index badd90e4d6..6fc411a3ea 100644
--- a/Source/Core/Core/Src/ConfigManager.h
+++ b/Source/Core/Core/Src/ConfigManager.h
@@ -28,7 +28,6 @@ struct SConfig : NonCopyable
 	// Wii Devices
 	bool m_WiiSDCard;
 	bool m_WiiKeyboard;
-	bool m_WiimoteReconnectOnLoad;
 	bool m_WiimoteContinuousScanning;
 	bool m_WiimoteEnableSpeaker;
 
diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index 268d474ae6..e3addf2f59 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -504,9 +504,11 @@ void SetState(EState _State)
 		break;
 	case CORE_PAUSE:
 		CCPU::EnableStepping(true);  // Break
+		Wiimote::Pause();
 		break;
 	case CORE_RUN:
 		CCPU::EnableStepping(false);
+		Wiimote::Resume();
 		break;
 	default:
 		PanicAlertT("Invalid state");
diff --git a/Source/Core/Core/Src/HW/Wiimote.cpp b/Source/Core/Core/Src/HW/Wiimote.cpp
index 6723a26d28..8cbe62dfcd 100644
--- a/Source/Core/Core/Src/HW/Wiimote.cpp
+++ b/Source/Core/Core/Src/HW/Wiimote.cpp
@@ -32,8 +32,7 @@ void Shutdown()
 		delete *i;
 	g_plugin.controllers.clear();
 
-	// WiimoteReal is shutdown on app exit
-	//WiimoteReal::Shutdown();
+	WiimoteReal::Shutdown();
 
 	g_controller_interface.Shutdown();
 }
@@ -58,6 +57,17 @@ void Initialize(void* const hwnd)
 		Movie::ChangeWiiPads();
 }
 
+void Resume()
+{
+	WiimoteReal::Resume();
+}
+
+void Pause()
+{
+	WiimoteReal::Pause();
+}
+
+
 // __________________________________________________________________________________________________
 // Function: ControlChannel
 // Purpose:  An L2CAP packet is passed from the Core to the Wiimote,
@@ -72,11 +82,8 @@ void Initialize(void* const hwnd)
 //
 void ControlChannel(int _number, u16 _channelID, const void* _pData, u32 _Size)
 {
-	if (WIIMOTE_SRC_EMU & g_wiimote_sources[_number])
+	if (WIIMOTE_SRC_HYBRID & g_wiimote_sources[_number])
 		((WiimoteEmu::Wiimote*)g_plugin.controllers[_number])->ControlChannel(_channelID, _pData, _Size);
-
-	if (WIIMOTE_SRC_REAL & g_wiimote_sources[_number])
-		WiimoteReal::ControlChannel(_number, _channelID, _pData, _Size);
 }
 
 // __________________________________________________________________________________________________
@@ -93,10 +100,8 @@ void ControlChannel(int _number, u16 _channelID, const void* _pData, u32 _Size)
 //
 void InterruptChannel(int _number, u16 _channelID, const void* _pData, u32 _Size)
 {
-	if (WIIMOTE_SRC_EMU & g_wiimote_sources[_number])
+	if (WIIMOTE_SRC_HYBRID & g_wiimote_sources[_number])
 		((WiimoteEmu::Wiimote*)g_plugin.controllers[_number])->InterruptChannel(_channelID, _pData, _Size);
-	else
-		WiimoteReal::InterruptChannel(_number, _channelID, _pData, _Size);
 }
 
 // __________________________________________________________________________________________________
diff --git a/Source/Core/Core/Src/HW/Wiimote.h b/Source/Core/Core/Src/HW/Wiimote.h
index 51ab018417..fcab058828 100644
--- a/Source/Core/Core/Src/HW/Wiimote.h
+++ b/Source/Core/Core/Src/HW/Wiimote.h
@@ -36,6 +36,8 @@ namespace Wiimote
 
 void Shutdown();
 void Initialize(void* const hwnd);
+void Resume();
+void Pause();
 
 unsigned int GetAttached();
 void DoState(u8 **ptr, PointerWrap::Mode mode);
@@ -53,6 +55,8 @@ namespace WiimoteReal
 
 void Initialize();
 void Shutdown();
+void Resume();
+void Pause();
 void Refresh();
 
 void LoadSettings();
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp
index d3eab89c18..47d54725c0 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp
@@ -29,15 +29,662 @@
 
 #include "Attachment/Attachment.h"
 
-/* Bit shift conversions */
-static u32 swap24(const u8* src)
-{
-	return (src[0] << 16) | (src[1] << 8) | src[2];
-}
-
 namespace WiimoteEmu
 {
 
+void Spy(Wiimote* wm_, const void* data_, int size_)
+{
+#if 0
+	// enable log
+	bool logCom = true;
+	bool logData = true;
+	bool logMP = false;
+	bool logAudio = false;
+
+	std::string Name, TmpData;
+	static int c;
+	int size;
+	u16 SampleValue;
+	bool AudioData = false;
+	bool DataReport = false;
+	static std::queue<u32> dataRep;
+	static u8 dataReply[3] = {0};
+	bool emu = wm_;
+	static Wiimote* wm = 0;
+
+	// a container for f.e. the extension encryption key
+	if (!wm_ && !wm)
+		wm = new Wiimote(0);
+	else
+		wm = wm_;
+
+	// ignore emulated Wiimote data
+	if (emu) return;
+
+	const hid_packet* const hidp = (hid_packet*)data_;
+	const wm_report* const sr = (wm_report*)hidp->data;
+
+	// use a non-pointer array because that makes read syntax shorter
+	u8 data[32] = {};
+	memcpy(data, data_, size_);
+
+	switch(data[1])
+	{
+	case WM_RUMBLE:
+		size = 1;
+		if (logCom) Name.append("WM_RUMBLE");
+		break;
+
+	case WM_LEDS:
+		size = sizeof(wm_leds);
+		if (logCom) Name.append("WM_LEDS");
+		break;
+
+	case WM_REPORT_MODE:
+		size = sizeof(wm_report_mode);
+		if (logCom) Name.append("WM_REPORT_MODE");
+		ERROR_LOG(CONSOLE, "WM_REPORT_MODE: 0x%02x", data[3]);
+		break;
+
+	case WM_IR_PIXEL_CLOCK:
+		if (logCom) Name.append("WM_IR_PIXEL_CLOCK");
+		break;
+
+	case WM_SPEAKER_ENABLE:
+		if (logCom) Name.append("WM_SPEAKER_ENABLE");
+		NOTICE_LOG(CONSOLE, "Speaker on: %d", sr->enable);
+		break;
+
+	case WM_REQUEST_STATUS:
+		size = sizeof(wm_request_status);
+		if (logCom) Name.append("WM_REQUEST_STATUS");
+		NOTICE_LOG(CONSOLE, "WM_REQUEST_STATUS: %s", ArrayToString(data, size+2, 0).c_str());
+		break;
+
+	case WM_WRITE_DATA:
+	{
+		if (logCom) Name.append("W 0x16");
+		size = sizeof(wm_write_data);
+
+		wm_write_data* wd = (wm_write_data*)sr->data;
+		u32 address = Common::swap24(wd->address);
+		address &= ~0x010000;
+
+		switch(data[2] >> 0x01)
+		{
+		case WM_SPACE_EEPROM:
+			if (logCom) Name.append(" REG_EEPROM"); break;
+		case WM_SPACE_REGS1:
+		case WM_SPACE_REGS2: {
+
+			const u8 region_offset = (u8)address;
+			void *region_ptr = NULL;
+			int region_size = 0;
+
+			switch(data[3])
+			{
+			case 0xa2:
+				if (logCom)
+				{
+					Name.append(" REG_SPEAKER");
+					if(data[6] == 7)
+					{
+						//INFO_LOG(CONSOLE, "Sound configuration:");
+						if(data[8] == 0x00)
+						{
+							//memcpy(&SampleValue, &data[9], 2);
+							//NOTICE_LOG(CONSOLE, "    Data format: 4-bit ADPCM (%i Hz)", 6000000 / SampleValue);
+							//NOTICE_LOG(CONSOLE, "    Volume: %02i%%", (data[11] / 0x40) * 100);
+						}
+						else if (data[8] == 0x40)
+						{
+							//memcpy(&SampleValue, &data[9], 2);
+							//NOTICE_LOG(CONSOLE, "    Data format: 8-bit PCM (%i Hz)", 12000000 / SampleValue);
+							//NOTICE_LOG(CONSOLE, "    Volume: %02i%%", (data[11] / 0xff) * 100);
+						}
+					}
+				}
+				break;
+			case 0xa4:
+				if (logCom) Name.append(" REG_EXT");
+				// Update the encryption mode
+				if (data[5] == 0xf0) {
+					if (!emu)
+						wm->m_reg_ext.encryption = wd->data[0];
+					//NOTICE_LOG(CONSOLE, "Extension encryption: %u", wm->m_reg_ext.encryption);
+				}
+				region_ptr = &wm->m_reg_ext;
+				break;
+			case 0xa6 :
+				if (logCom) Name.append(" REG_M+");
+				// update the encryption mode
+				if (data[5] == 0xf0) {
+					if (!emu)
+						wm->m_reg_motion_plus.activated = wd->data[0];
+					//NOTICE_LOG(CONSOLE, "Extension enryption: %u", wm->m_reg_ext.encryption);
+				}
+				region_ptr = &wm->m_reg_motion_plus;
+				break;
+			case 0xb0:
+				 if (logCom) Name.append(" REG_IR"); break;
+			}
+
+			// save register
+			if (!emu && region_ptr)
+				memcpy((u8*)region_ptr + region_offset, wd->data, wd->size);
+			// save key
+			if (region_offset >= 0x40 && region_offset <= 0x4c) {
+				if(!emu)
+					wiimote_gen_key(&wm->m_ext_key, wm->m_reg_ext.encryption_key);
+				INFO_LOG(CONSOLE, "Writing key: %s", ArrayToString((u8*)&wm->m_ext_key, sizeof(wm->m_ext_key), 0, 30).c_str());
+			}
+			if (data[3] == 0xa4 || data[3] == 0xa6) {
+				//DEBUG_LOG(CONSOLE, "M+: %s", ArrayToString((u8*)&wm->m_reg_motion_plus, sizeof(wm->m_reg_motion_plus), 0, 30).c_str());
+				//DEBUG_LOG(CONSOLE, "M+: %s", ArrayToString((u8*)&wm->m_reg_motion_plus.ext_identifier, sizeof(wm->m_reg_motion_plus.ext_identifier), 0, 30).c_str());
+				NOTICE_LOG(CONSOLE, "W[0x%02x 0x%02x|%d]: %s", data[3], region_offset,  wd->size, ArrayToString(wd->data, wd->size, 0).c_str());
+			}
+			break;
+		}
+		}
+
+		break;
+	}
+
+	case WM_READ_DATA:
+	{
+		if (logCom) Name.append("R");
+		size = sizeof(wm_read_data);
+
+		wm_read_data* rd = (wm_read_data*)sr->data;
+		u32 address = Common::swap24(rd->address);
+		u8 addressLO = address & 0xFFFF;
+		address &= 0xFEFFFF;
+		u16 size = Common::swap16(rd->size);
+		u8 *const block = new u8[size];
+		void *region_ptr = NULL;
+
+		dataRep.push(((data[2]>>1)<<16) + ((data[3])<<8) + addressLO);
+
+		switch(data[2]>>1)
+		{
+		case WM_SPACE_EEPROM:
+			if (logCom) Name.append(" REG_EEPROM");
+			if (!emu)
+				memcpy(block, wm->m_eeprom + address, size);
+			break;
+		case WM_SPACE_REGS1:
+		case WM_SPACE_REGS2:
+			// ignore second byte for extension area
+			if (address>>16 == 0xA4) address &= 0xFF00FF;
+			const u8 region_offset = (u8)address;
+			switch(data[3])
+			{
+			case 0xa2:
+				if (logCom) Name.append(" REG_SPEAKER");
+				region_ptr = &wm->m_reg_speaker;
+				break;
+			case 0xa4:
+				 if (logCom) Name.append(" REG_EXT");
+				 region_ptr = &wm->m_reg_motion_plus;
+				 break;
+			case 0xa6:
+				 if (logCom) Name.append(" REG_M+");
+				 region_ptr = &wm->m_reg_motion_plus;
+				break;
+			case 0xb0:
+				if (logCom) Name.append(" REG_IR");
+				region_ptr = &wm->m_reg_ir;
+				break;
+			}
+			//if (!emu && region_ptr)
+				//memcpy(block, (u8*)region_ptr + region_offset, size);
+			//WARN_LOG(CONSOLE, "READING[0x%02x 0x%02x|%d]: %s", data[3], region_offset, size, ArrayToString(block, size, 0, 30).c_str());
+			break;
+		}
+
+		break;
+	}
+
+	case WM_WRITE_SPEAKER_DATA:
+		if (logCom) Name.append("WM_SPEAKER_DATA");
+		size = 21;
+		break;
+
+	case WM_SPEAKER_MUTE:
+		if (logCom) Name.append("WM_SPEAKER");
+		size = 1;
+		NOTICE_LOG(CONSOLE, "Speaker mute: %d", sr->enable);
+		break;
+
+	case WM_IR_LOGIC:
+		if (logCom) Name.append("WM_IR");
+		size = 1;
+		break;
+
+	case WM_STATUS_REPORT:
+		size = sizeof(wm_status_report);
+		Name = "WM_STATUS_REPORT";
+		//INFO_LOG(CONSOLE, "WM_STATUS_REPORT: %s", ArrayToString(data, size+2, 0).c_str());
+		{
+			wm_status_report* pStatus = (wm_status_report*)(data + 2);
+			ERROR_LOG(CONSOLE, ""
+				"Statusreport extension: %i",
+				//"Speaker enabled: %i"
+				//"IR camera enabled: %i"
+				//"LED 1: %i\n"
+				//"LED 2: %i\n"
+				//"LED 3: %i\n"
+				//"LED 4: %i\n"
+				//"Battery low: %i\n"
+				//"Battery level: %i",
+				pStatus->extension
+				//pStatus->speaker,
+				//pStatus->ir,
+				//(pStatus->leds >> 0),
+				//(pStatus->leds >> 1),
+				//(pStatus->leds >> 2),
+				//(pStatus->leds >> 3),
+				//pStatus->battery_low,
+				//pStatus->battery
+				);
+		}
+		break;
+
+	case WM_READ_DATA_REPLY:
+	{
+		size = sizeof(wm_read_data_reply);
+		Name = "R_REPLY";
+
+		u8 data2[32];
+		memset(data2, 0, sizeof(data2));
+		memcpy(data2, data, size_);
+		wm_read_data_reply* const rdr = (wm_read_data_reply*)(data2 + 2);
+
+		bool decrypted = false;
+		if(!dataRep.empty())
+		{
+			dataReply[0] = (dataRep.front()>>16)&0x00FF;
+			dataReply[1] = (dataRep.front()>>8)&0x00FF;
+			dataReply[2] = dataRep.front()&0x00FF;
+			dataRep.pop();
+		}
+
+		switch(dataReply[0])
+		{
+		case WM_SPACE_EEPROM:
+			if (logCom)
+				Name.append(" REG_EEPROM");
+			// Wiimote calibration
+			if(data[4] == 0xf0 && data[5] == 0x00 && data[6] == 0x10) {
+				if(data[6] == 0x10) {
+					accel_cal* calib = (accel_cal*)&rdr->data[6];
+					ERROR_LOG(CONSOLE, "Wiimote calibration:");
+					//SERROR_LOG(CONSOLE, "%s", ArrayToString(rdr->data, rdr->size).c_str());
+					ERROR_LOG(CONSOLE, "Cal_zero.x: %i", calib->zero_g.x);
+					ERROR_LOG(CONSOLE, "Cal_zero.y: %i", calib->zero_g.y);
+					ERROR_LOG(CONSOLE, "Cal_zero.z: %i", calib->zero_g.z);
+					ERROR_LOG(CONSOLE, "Cal_g.x: %i", calib->one_g.x);
+					ERROR_LOG(CONSOLE, "Cal_g.y: %i", calib->one_g.y);
+					ERROR_LOG(CONSOLE, "Cal_g.z: %i", calib->one_g.z);
+					// save
+					if (!emu)
+						memcpy(wm->m_eeprom + 0x16, rdr->data + 6, rdr->size);
+				}
+			}
+			break;
+
+		case WM_SPACE_REGS1:
+		case WM_SPACE_REGS2:
+			switch(dataReply[1])
+			{
+			case 0xa2: if (logCom) Name.append(" REG_SPEAKER"); break;
+			case 0xa4: if (logCom) Name.append(" REG_EXT"); break;
+			case 0xa6: if (logCom) Name.append(" REG_M+"); break;
+			case 0xb0: if (logCom) Name.append(" REG_IR"); break;
+			}
+		}
+
+		// save key
+		if (!emu && rdr->address>>8 == 0x40)
+		{
+			memcpy(((u8*)&wm->m_reg_ext.encryption_key), rdr->data, rdr->size+1);
+			wiimote_gen_key(&wm->m_ext_key, wm->m_reg_ext.encryption_key);
+			NOTICE_LOG(CONSOLE, "Reading key: %s", ArrayToString(((u8*)&wm->m_ext_key), sizeof(wm->m_ext_key), 0, 30).c_str());
+		}
+
+		// select decryption
+		//if(((!wm->GetMotionPlusActive() && ((u8*)&wm->m_reg_ext)[0xf0] == 0xaa) || (wm->GetMotionPlusActive() && ((u8*)&wm->m_reg_motion_plus)[0xf0] == 0xaa)) && rdr->address>>8 < 0xf0) {
+
+		//if(((((u8*)&wm->m_reg_ext)[0xf0] == 0xaa) || ((u8*)&wm->m_reg_motion_plus)[0xf0] == 0xaa) && rdr->address>>8 < 0xf0) {
+
+		//if(!wm->GetMotionPlusActive() && ((u8*)&wm->m_reg_ext)[0xf0] == 0xaa && rdr->address>>8 < 0xf0) {
+
+		//if(!wm->GetMotionPlusActive() && ((u8*)&wm->m_reg_ext)[0xf0] == 0xaa) {
+
+		//	SWARN_LOG(CONSOLE, "key %s", ArrayToString(((u8*)&wm->m_ext_key), sizeof(wm->m_ext_key), 0, 30).c_str());
+		//	SWARN_LOG(CONSOLE, "decrypt %s", ArrayToString(rdr->data, rdr->size+1, 0, 30).c_str());
+		//	wiimote_decrypt(&wm->m_ext_key, rdr->data, dataReply[2]&0xffff, rdr->size+1);
+		//	SWARN_LOG(CONSOLE, "decrypt %s", ArrayToString(rdr->data, rdr->size+1, 0, 30).c_str());
+		//	decrypted = true;
+		//}
+
+		// save data
+		if (!emu && !rdr->error)
+		{
+			//if (dataReply[1] == 0xa4 && wm->GetMotionPlusActive())
+				//memcpy(&((u8*)&wm->m_reg_motion_plus)[rdr->address>>8], rdr->data, rdr->size+1);
+			//if (dataReply[1] == 0xa4 && !wm->GetMotionPlusActive())
+			//if (dataReply[1] == 0xa4)
+			//	memcpy(&((u8*)&wm->m_reg_ext)[rdr->address>>8], rdr->data, rdr->size+1);
+			//if (!wm->GetMotionPlusActive() && wm->GetMotionPlusAttached())
+			//if (dataReply[1] == 0xa6)
+			//	memcpy(&((u8*)&wm->m_reg_motion_plus)[rdr->address>>8], rdr->data, rdr->size+1);
+			//INFO_LOG(CONSOLE, "Saving[0x%2x:0x%2x]: %s", dataReply[1], rdr->address>>8, ArrayToString(rdr->data, rdr->size+1).c_str());
+		}
+
+		if (!rdr->error && rdr->address>>8 >= 0xf0 && rdr->address>>8 <= 0xff)
+		{
+			//INFO_LOG(CONSOLE, "Extension ID: %s", ArrayToString(rdr->data, rdr->size+1).c_str());
+		}
+
+		// Nunchuck calibration
+		if(data[4] == 0xf0 && data[5] == 0x00 && (data[6] == 0x20 || data[6] == 0x30))
+		{
+			// log
+			//TmpData = StringFromFormat("Read[%s] (enc): %s", (Emu ? "Emu" : "Real"), ArrayToString(data, size + 2).c_str());
+
+			// decrypt
+			//if(((u8*)&wm->m_reg_ext)[0xf0] == 0xaa) {
+			//	wiimote_decrypt(&wm->m_ext_key, &data[0x07], 0x00, (data[4] >> 0x04) + 1);
+
+			//if (wm->m_extension->name == "NUNCHUCK") {
+			//	INFO_LOG(CONSOLE, "\nGame got the Nunchuck calibration:\n");
+			//	INFO_LOG(CONSOLE, "Cal_zero.x: %i\n", data[7 + 0]);
+			//	INFO_LOG(CONSOLE, "Cal_zero.y: %i\n", data[7 + 1]);
+			//	INFO_LOG(CONSOLE, "Cal_zero.z: %i\n",  data[7 + 2]);
+			//	INFO_LOG(CONSOLE, "Cal_g.x: %i\n", data[7 + 4]);
+			//	INFO_LOG(CONSOLE, "Cal_g.y: %i\n",  data[7 + 5]);
+			//	INFO_LOG(CONSOLE, "Cal_g.z: %i\n",  data[7 + 6]);
+			//	INFO_LOG(CONSOLE, "Js.Max.x: %i\n",  data[7 + 8]);
+			//	INFO_LOG(CONSOLE, "Js.Min.x: %i\n",  data[7 + 9]);
+			//	INFO_LOG(CONSOLE, "Js.Center.x: %i\n", data[7 + 10]);
+			//	INFO_LOG(CONSOLE, "Js.Max.y: %i\n",  data[7 + 11]);
+			//	INFO_LOG(CONSOLE, "Js.Min.y: %i\n",  data[7 + 12]);
+			//	INFO_LOG(CONSOLE, "JS.Center.y: %i\n\n", data[7 + 13]);
+			//}
+			//else // g_Config.bClassicControllerConnected {
+			//	INFO_LOG(CONSOLE, "\nGame got the Classic Controller calibration:\n");
+			//	INFO_LOG(CONSOLE, "Lx.Max: %i\n", data[7 + 0]);
+			//	INFO_LOG(CONSOLE, "Lx.Min: %i\n", data[7 + 1]);
+			//	INFO_LOG(CONSOLE, "Lx.Center: %i\n",  data[7 + 2]);
+			//	INFO_LOG(CONSOLE, "Ly.Max: %i\n", data[7 + 3]);
+			//	INFO_LOG(CONSOLE, "Ly.Min: %i\n",  data[7 + 4]);
+			//	INFO_LOG(CONSOLE, "Ly.Center: %i\n",  data[7 + 5]);
+			//	INFO_LOG(CONSOLE, "Rx.Max.x: %i\n",  data[7 + 6]);
+			//	INFO_LOG(CONSOLE, "Rx.Min.x: %i\n",  data[7 + 7]);
+			//	INFO_LOG(CONSOLE, "Rx.Center.x: %i\n", data[7 + 8]);
+			//	INFO_LOG(CONSOLE, "Ry.Max.y: %i\n",  data[7 + 9]);
+			//	INFO_LOG(CONSOLE, "Ry.Min: %i\n",  data[7 + 10]);
+			//	INFO_LOG(CONSOLE, "Ry.Center: %i\n\n", data[7 + 11]);
+			//	INFO_LOG(CONSOLE, "Lt.Neutral: %i\n",  data[7 + 12]);
+			//	INFO_LOG(CONSOLE, "Rt.Neutral %i\n\n", data[7 + 13]);
+			//}
+
+			// save values
+			if (!emu)
+			{
+				// Save to registry
+				if(data[7 + 0] != 0xff)
+				{
+					//memcpy((u8*)&wm->m_reg_ext.calibration, &data[7], 0x10);
+					//memcpy((u8*)&wm->m_reg_ext.unknown3, &data[7], 0x10);
+				}
+				// Save the default values that should work with Wireless Nunchucks
+				else
+				{
+					//WiimoteEmu::SetDefaultExtensionRegistry();
+				}
+				//WiimoteEmu::UpdateEeprom();
+			}
+			// third party Nunchuck
+			else if(data[7] == 0xff)
+			{
+				//memcpy(wm->m_reg_ext + 0x20, WiimoteEmu::wireless_nunchuck_calibration, sizeof(WiimoteEmu::wireless_nunchuck_calibration));
+				//memcpy(wm->m_reg_ext + 0x30, WiimoteEmu::wireless_nunchuck_calibration, sizeof(WiimoteEmu::wireless_nunchuck_calibration));
+			}
+
+			// print encrypted data
+			//INFO_LOG(CONSOLE, "WM_READ_DATA_REPLY: Extension calibration: %s", TmpData.c_str());
+		}
+
+		if (dataReply[1] == 0xa4 || dataReply[1] == 0xa6)
+		{
+			if(rdr->error == 7 || rdr->error == 8)
+			{
+				WARN_LOG(CONSOLE, "R%s[0x%02x 0x%02x]: e-%d", decrypted?"*":"", dataReply[1], rdr->address>>8, rdr->error);
+			}
+			else
+			{
+				WARN_LOG(CONSOLE, "R%s[0x%02x 0x%02x|%d]: %s", decrypted?"*":"", dataReply[1], rdr->address>>8, rdr->size+1, ArrayToString(rdr->data, rdr->size+1, 0).c_str());
+			}
+		}
+
+		break;
+	}
+
+	case WM_ACK_DATA:
+		size = sizeof(wm_acknowledge);
+		Name = "WM_ACK_DATA";
+		//INFO_LOG(CONSOLE, "ACK 0x%02x", data[4]);
+		break;
+
+	case WM_REPORT_CORE:
+		size = sizeof(wm_report_core);
+		DataReport = true;
+		break;
+	case WM_REPORT_CORE_ACCEL:
+		size = sizeof(wm_report_core_accel);
+		DataReport = true;
+		break;
+	case WM_REPORT_CORE_EXT8:
+		size = sizeof(wm_report_core_accel_ir12);
+		DataReport = true;
+		break;
+	case WM_REPORT_CORE_ACCEL_IR12:
+		size = sizeof(wm_report_core_accel_ir12);
+		DataReport = true;
+		break;
+	case WM_REPORT_CORE_EXT19:
+		size = sizeof(wm_report_core_accel_ext16);
+		DataReport = true;
+		break;
+	case WM_REPORT_CORE_ACCEL_EXT16:
+		size = sizeof(wm_report_core_accel_ext16);
+		DataReport = true;
+		break;
+	case WM_REPORT_CORE_IR10_EXT9:
+		size = sizeof(wm_report_core_accel_ir10_ext6);
+		DataReport = true;
+		break;
+	case WM_REPORT_CORE_ACCEL_IR10_EXT6:
+		size = sizeof(wm_report_core_accel_ir10_ext6);
+		DataReport = true;
+		break;
+
+	default:
+		size = 15;
+		NOTICE_LOG(CONSOLE, "Debugging[%s]: Unknown channel 0x%02x", (emu ? "E" : "R"), data[1]);
+		break;
+	}
+
+	//if (DataReport && wm->GetMotionPlusActive())
+	//{
+	//	if (data[1] == WM_REPORT_CORE_ACCEL_IR10_EXT6)
+	//		static bool extension = false;
+	//	if (extension != (bool)(data[17+4]&1))
+	//		ERROR_LOG(CONSOLE, "Datareport extension %d", data[17+4]&1);
+	//		extension = data[17+4]&1;
+	//}
+
+	if (!DataReport && logCom && size <= 30)
+	{
+		ERROR_LOG_S(CONSOLE, "Com[%s] %s: %s", (emu ? "E" : "R"), Name.c_str(), ArrayToString(data, size + 2, 0).c_str());
+	}
+
+	if (logAudio && AudioData)
+	{
+		//DEBUG_LOG(CONSOLE, "%s: %s\n", Name.c_str(), ArrayToString(data, std::min(10,size), 0, 30).c_str());
+	}
+
+	if (DataReport && (logData || logMP))
+	{
+		// decrypt extension data
+		//if (data[1] == 0x37 && !wm->GetMotionPlusActive())
+		//if (data[1] == 0x37)
+		//	wiimote_decrypt(&wm->m_ext_key, &data[17], 0x00, 0x06);
+		//if (data[1] == 0x35)
+		//	wiimote_decrypt(&wm->m_ext_key, &data[7], 0x00, 0x06);
+
+		//if (data[1] == 0x35 || data[1] == 0x37)
+		//{
+		//	if (!g_DebugMP && mp->is_mp_data) return;
+		//	if (!g_DebugData && !mp->is_mp_data) return;
+		//}
+
+		std::string SCore = "", SAcc = "", SIR = "", SExt = "", SExtID = "";
+
+		wm_core* core = (wm_core*)sr->data;
+		accel_cal* calib = (accel_cal*)&wm->m_eeprom[0x16];
+		wm_accel* accel = (wm_accel*)&data[4];
+
+		//SCore = StringFromFormat(
+		//	"%d %d %d %d ",
+		//	core->xL,
+		//	core->yL,
+		//	core->zL,
+		//	core->unknown);
+
+		SAcc = StringFromFormat(
+			//"%3d %3d %3d"
+			//" | %3d %3d %3d"
+			//" | %3d %3d %3d"
+			"| %5.2f %5.2f %5.2f"
+			//, calib->zero_g.x, calib->zero_g.y, calib->zero_g.z
+			//, (calib->zero_g.x<<2) + calib->zero_g.xL, (calib->zero_g.y<<2) + calib->zero_g.yL, (calib->zero_g.z<<2) + calib->zero_g.zL
+			//, calib->one_g.x, calib->one_g.y, calib->one_g.z
+			//, (calib->one_g.x<<2) + calib->one_g.xL, (calib->one_g.y<<2) + calib->one_g.yL, (calib->one_g.z<<2) + calib->one_g.zL
+			//, accel->x, accel->y, accel->z
+			//, (accel->x<<2) + core->xL, (accel->y<<2) + core->yL, (accel->z<<2) + core->zL
+			, (accel->x - calib->zero_g.x) / float(calib->one_g.x-calib->zero_g.x), (accel->y - calib->zero_g.y) / float(calib->one_g.y-calib->zero_g.y), (accel->z - calib->zero_g.z) / float(calib->one_g.z-calib->zero_g.z));
+
+		NOTICE_LOG(CONSOLE, "%d", size);
+
+		if (data[1] == WM_REPORT_CORE_ACCEL_IR12)
+		{
+			wm_ir_extended *ir = (wm_ir_extended*)&data[7];
+
+			SIR = StringFromFormat(
+				"%4u %4u | %u"
+				, ir->x | ir->xhi << 8
+				, ir->y | ir->yhi << 8
+				, ir->size);
+		}
+
+		if (data[1] == WM_REPORT_CORE_ACCEL_EXT16)
+		{
+			wm_extension *nc = (wm_extension*)&data[7];
+
+			SExt = StringFromFormat(
+				"%02x %02x | %02x %02x %02x | %02x"
+				, nc->jx, nc->jy
+				, nc->ax, nc->ay, nc->az
+				, nc->bt);
+		}
+
+		if (data[1] == WM_REPORT_CORE_ACCEL_IR10_EXT6)
+		{
+			wm_ir_basic *ir = (wm_ir_basic*)&data[7];
+
+			SIR = StringFromFormat(
+				"%4u %4u %4u %4u"
+				, ir->x1 | ir->x1hi << 8
+				, ir->y1 | ir->y1hi << 8
+				, ir->x2 | ir->x2hi << 8
+				, ir->y2 | ir->y1hi << 8);
+
+			/*
+			wm_motionplus *mp = (wm_motionplus*)&data[17];
+			wm_nc_mp  *nc_mp = (wm_nc_mp *)&data[17];
+
+			if (mp->is_mp_data)
+			{
+				SExt = StringFromFormat(""
+					//"%02x %02x %02x %02x %02x %02x"
+					//"| %04x %04x %04x
+					" %5.2f %5.2f %5.2f"
+					" %s%s%s"
+					//, mp->roll1, mp->roll2
+					//, mp->pitch1, mp->pitch2
+					//, mp->yaw1, mp->yaw2
+					//, mp->pitch2<<8 | mp->pitch1
+					//, mp->roll2<<8 | mp->roll1
+					//, mp->yaw2<<8 | mp->yaw1
+					//, mp->pitch2<<8 | mp->pitch1
+					//, mp->roll2<<8 | mp->roll1
+					//, mp->yaw2<<8 | mp->yaw1
+					, float((mp->pitch2<<8 | mp->pitch1) - 0x1f7f) / float(0x1fff)
+					, float((mp->roll2<<8 | mp->roll1) - 0x1f7f) / float(0x1fff)
+					, float((mp->yaw2<<8 | mp->yaw1) - 0x1f7f) / float(0x1fff)
+					, mp->pitch_slow?"*":" ", mp->roll_slow?"*":" ", mp->yaw_slow?"*":" ");
+			}
+			else
+			{
+				SExt = StringFromFormat(
+					"%02x %02x | %02x %02x | %02x %02x %02x | %02x %02x %02x",
+					nc_mp->bz, nc_mp->bc,
+					nc_mp->jx, nc_mp->jy,
+					nc_mp->ax+nc_mp->axL, nc_mp->ay+nc_mp->ayL, (nc_mp->az<<1)+nc_mp->azL);
+			}
+
+			SExtID = StringFromFormat(
+				"[%s|%d|%d]"
+				, mp->is_mp_data ? "+" : "e"
+				, mp->is_mp_data ? mp->extension_connected : nc_mp->extension_connected
+				, wm->m_extension->active_extension);
+			*/
+
+			//DEBUG_LOG_S(CONSOLE, "M+ %d Extension %d %d %s", mp->is_mp_data, mp->is_mp_data ?
+			//		mp->extension_connected : ((wm_nc_mp*)&data[17])->extension_connected, wm->m_extension->active_extension,
+			//		ArrayToString(((u8*)&wm->m_reg_motion_plus.ext_identifier), sizeof(wm->m_reg_motion_plus.ext_identifier), 0).c_str());
+		}
+
+		// select log data
+		WARN_LOG_S(CONSOLE, "Data"
+			"[%s]"
+			" | id %s"
+			" | %s"
+			" | c %s"
+			" | a %s"
+			" | ir %s"
+			" | ext %s"
+			//" | %s"
+			//" | %s"
+			//" | %s"
+			, (emu ? "E" : "R")
+			, SExtID.c_str()
+			, ArrayToString(data, 2, 0).c_str()
+			, SCore.c_str()
+			, SAcc.c_str()
+			, SIR.c_str()
+			, SExt.c_str()
+			//, ArrayToString(&data[4], 3, 0).c_str()
+			//, (accel->x - 0x7f) / float(0xff), (accel->y - 0x7f) / float(0xff), (accel->z - 0x7f) / float(0xff)
+			//, ArrayToString(&data[17], 6, 0).c_str(),
+			);
+	}
+#endif
+}
+
 void Wiimote::ReportMode(const wm_report_mode* const dr)
 {
 	//INFO_LOG(WIIMOTE, "Set data report mode");
@@ -64,7 +711,7 @@ void Wiimote::ReportMode(const wm_report_mode* const dr)
    an Input Report back to the Wii. Input and Output is from the Wii's
    perspective, Output means data to the Wiimote (from the Wii), Input means
    data from the Wiimote.
-   
+
    The call browser:
 
    1. Wiimote_InterruptChannel > InterruptChannel > HidOutputReport
@@ -231,7 +878,7 @@ void Wiimote::RequestStatus(const wm_request_status* const rs)
 	*(wm_status_report*)(data + 2) = m_status;
 
 	// hybrid wiimote stuff
-	if (WIIMOTE_SRC_HYBRID == g_wiimote_sources[m_index] && (m_extension->switch_extension <= 0))
+	if (WIIMOTE_SRC_REAL & g_wiimote_sources[m_index] && (m_extension->switch_extension <= 0))
 	{
 		using namespace WiimoteReal;
 
@@ -253,7 +900,7 @@ void Wiimote::RequestStatus(const wm_request_status* const rs)
 /* Write data to Wiimote and Extensions registers. */
 void Wiimote::WriteData(const wm_write_data* const wd)
 {
-	u32 address = swap24(wd->address);
+	u32 address = Common::swap24(wd->address);
 
 	// ignore the 0x010000 bit
 	address &= ~0x010000;
@@ -290,7 +937,7 @@ void Wiimote::WriteData(const wm_write_data* const wd)
 			}
 		}
 		break;
-		
+
 	case WM_SPACE_REGS1 :
 	case WM_SPACE_REGS2 :
 		{
@@ -354,7 +1001,7 @@ void Wiimote::WriteData(const wm_write_data* const wd)
 
 			if (&m_reg_ext == region_ptr)
 			{
-				// Run the key generation on all writes in the key area, it doesn't matter 
+				// Run the key generation on all writes in the key area, it doesn't matter
 				// that we send it parts of a key, only the last full key will have an effect
 				if (address >= 0xa40040 && address <= 0xa4004c)
 					wiimote_gen_key(&m_ext_key, m_reg_ext.encryption_key);
@@ -381,9 +1028,9 @@ void Wiimote::WriteData(const wm_write_data* const wd)
 }
 
 /* Read data from Wiimote and Extensions registers. */
-void Wiimote::ReadData(const wm_read_data* const rd) 
+void Wiimote::ReadData(const wm_read_data* const rd)
 {
-	u32 address = swap24(rd->address);
+	u32 address = Common::swap24(rd->address);
 	u16 size = Common::swap16(rd->size);
 
 	// ignore the 0x010000 bit
@@ -391,10 +1038,10 @@ void Wiimote::ReadData(const wm_read_data* const rd)
 
 	// hybrid wiimote stuff
 	// relay the read data request to real-wiimote
-	if (WIIMOTE_SRC_HYBRID == g_wiimote_sources[m_index] && ((0xA4 != (address >> 16)) || (m_extension->switch_extension <= 0)))
+	if (WIIMOTE_SRC_REAL & g_wiimote_sources[m_index] && ((0xA4 != (address >> 16)) || (m_extension->switch_extension <= 0)))
 	{
 		WiimoteReal::InterruptChannel(m_index, m_reporting_channel, ((u8*)rd) - 2, sizeof(wm_read_data) + 2); // hacky
-		
+
 		// don't want emu-wiimote to send reply
 		return;
 	}
@@ -408,9 +1055,9 @@ void Wiimote::ReadData(const wm_read_data* const rd)
 		{
 			//PanicAlert("ReadData: reading from EEPROM: address: 0x%x size: 0x%x", address, size);
 			// Read from EEPROM
-			if (address + size >= WIIMOTE_EEPROM_FREE_SIZE) 
+			if (address + size >= WIIMOTE_EEPROM_FREE_SIZE)
 			{
-				if (address + size > WIIMOTE_EEPROM_SIZE) 
+				if (address + size > WIIMOTE_EEPROM_SIZE)
 				{
 					PanicAlert("ReadData: address + size out of bounds");
 					delete [] block;
@@ -503,7 +1150,7 @@ void Wiimote::ReadData(const wm_read_data* const rd)
 	}
 
 	// want the requested address, not the above modified one
-	rr.address = swap24(rd->address);
+	rr.address = Common::swap24(rd->address);
 	rr.size = size;
 	//rr.channel = _channelID;
 	rr.position = 0;
@@ -643,6 +1290,21 @@ void Wiimote::DoState(PointerWrap& p)
 		}
 	}
 	p.DoMarker("Wiimote");
+
+	if (p.GetMode() == PointerWrap::MODE_READ)
+		RealState();
+}
+
+// load real Wiimote state
+void Wiimote::RealState()
+{
+	using namespace WiimoteReal;
+
+	if (g_wiimotes[m_index])
+	{
+		g_wiimotes[m_index]->SetChannel(m_reporting_channel);
+		g_wiimotes[m_index]->EnableDataReporting(m_reporting_mode);
+	}
 }
 
 }
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
index bf8a8e2893..eb13c1a6fd 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -781,7 +781,10 @@ void Wiimote::Update()
 
 	// send data report
 	if (rptf_size)
+	{
+		WiimoteEmu::Spy(this, data, rptf_size);
 		Core::Callback_WiimoteInterruptChannel(m_index, m_reporting_channel, data, rptf_size);
+	}
 }
 
 void Wiimote::ControlChannel(const u16 _channelID, const void* _pData, u32 _Size) 
@@ -853,7 +856,7 @@ void Wiimote::InterruptChannel(const u16 _channelID, const void* _pData, u32 _Si
 			{
 				const wm_report* const sr = (wm_report*)hidp->data;
 
-				if (WIIMOTE_SRC_HYBRID == g_wiimote_sources[m_index])
+				if (WIIMOTE_SRC_REAL & g_wiimote_sources[m_index])
 				{
 					switch (sr->wm)
 					{
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h
index 828594a4f7..24b9357542 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.h
@@ -24,6 +24,11 @@
 #define WIIMOTE_REG_EXT_SIZE		0x100
 #define WIIMOTE_REG_IR_SIZE			0x34
 
+namespace WiimoteReal
+{
+class Wiimote;
+}
+
 namespace WiimoteEmu
 {
 
@@ -66,6 +71,8 @@ inline double trim(double a)
 
 class Wiimote : public ControllerEmu
 {
+friend class WiimoteReal::Wiimote;
+friend void Spy(Wiimote* wm_, const void* data_, int size_);
 public:
 
 	enum
@@ -92,6 +99,7 @@ public:
 	void ControlChannel(const u16 _channelID, const void* _pData, u32 _Size);
 
 	void DoState(PointerWrap& p);
+	void RealState();
 
 	void LoadDefaults(const ControllerInterface& ciface);
 
@@ -235,6 +243,8 @@ private:
 	}	m_reg_speaker;
 };
 
+void Spy(Wiimote* wm_, const void* data_, int size_);
+
 }
 
 #endif
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
index 711ef135bb..bfeddb7c8f 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
@@ -597,6 +597,8 @@ int _IORead(HANDLE &dev_handle, OVERLAPPED &hid_overlap_read, u8* buf, int index
 		}
 	}
 
+	WiimoteEmu::Spy(NULL, buf, bytes + 1);
+
 	return bytes + 1;
 }
 
@@ -611,6 +613,8 @@ int Wiimote::IORead(u8* buf)
 
 int _IOWrite(HANDLE &dev_handle, OVERLAPPED &hid_overlap_write, enum win_bt_stack_t &stack, const u8* buf, int len)
 {
+	WiimoteEmu::Spy(NULL, buf, len);
+
 	switch (stack)
 	{
 		case MSBT_STACK_UNKNOWN:
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
index 40c6ee0554..f073f6371f 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
@@ -110,6 +110,22 @@ void Wiimote::DisableDataReporting()
 	QueueReport(WM_REPORT_MODE, &rpt, sizeof(rpt));
 }
 
+void Wiimote::EnableDataReporting(u8 mode)
+{
+	m_last_input_report.clear();
+
+	wm_report_mode rpt = {};
+	rpt.mode = mode;
+	rpt.all_the_time = 1;
+	rpt.continuous = 1;
+	QueueReport(WM_REPORT_MODE, &rpt, sizeof(rpt));
+}
+
+void Wiimote::SetChannel(u16 channel)
+{
+	m_channel = channel;
+}
+
 void Wiimote::ClearReadQueue()
 {
 	Report rpt;
@@ -314,6 +330,44 @@ void Wiimote::EmuStop()
 	NOTICE_LOG(WIIMOTE, "Stopping Wiimote data reporting.");
 }
 
+void Wiimote::EmuResume()
+{
+	WiimoteEmu::Wiimote *const wm = (WiimoteEmu::Wiimote*)::Wiimote::GetPlugin()->controllers[index];
+
+	m_last_input_report.clear();
+
+	wm_report_mode rpt = {};
+	rpt.mode = wm->m_reporting_mode;
+	rpt.all_the_time = 1;
+	rpt.continuous = 1;
+	QueueReport(WM_REPORT_MODE, &rpt, sizeof(rpt));
+
+	NOTICE_LOG(WIIMOTE, "Resuming Wiimote data reporting.");
+}
+
+void Wiimote::EmuPause()
+{
+	m_last_input_report.clear();
+
+	wm_report_mode rpt = {};
+	rpt.mode = WM_REPORT_CORE;
+	rpt.all_the_time = 0;
+	rpt.continuous = 0;
+	QueueReport(WM_REPORT_MODE, &rpt, sizeof(rpt));
+
+	NOTICE_LOG(WIIMOTE, "Pausing Wiimote data reporting.");
+}
+
+unsigned int CalculateConnectedWiimotes()
+{
+	unsigned int connected_wiimotes = 0;
+	for (unsigned int i = 0; i < MAX_WIIMOTES; ++i)
+		if (g_wiimotes[i])
+			++connected_wiimotes;
+
+	return connected_wiimotes;
+}
+
 unsigned int CalculateWantedWiimotes()
 {
 	// Figure out how many real Wiimotes are required
@@ -470,12 +524,26 @@ void Initialize()
 		g_wiimote_scanner.StartScanning();
 	else
 		g_wiimote_scanner.StopScanning();
-	
+
 	std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
 
 	g_wiimote_scanner.WantWiimotes(0 != CalculateWantedWiimotes());
 	g_wiimote_scanner.WantBB(0 != CalculateWantedBB());
-	
+
+	// wait for connection because it should exist before state load
+	int timeout = 100;
+	std::vector<Wiimote*> found_wiimotes;
+	Wiimote* found_board = NULL;
+	g_wiimote_scanner.FindWiimotes(found_wiimotes, found_board);
+	if (SConfig::GetInstance().m_WiimoteContinuousScanning)
+	{
+		while(CalculateWantedWiimotes() && CalculateConnectedWiimotes() < found_wiimotes.size() && timeout)
+		{
+			Common::SleepCurrentThread(100);
+			timeout--;
+		}
+	}
+
 	if (g_real_wiimotes_initialized)
 		return;
 
@@ -485,7 +553,14 @@ void Initialize()
 }
 
 void Shutdown(void)
-{	
+{
+	for (unsigned int i = 0; i < MAX_BBMOTES; ++i)
+		if (g_wiimotes[i] && g_wiimotes[i]->IsConnected())
+			g_wiimotes[i]->EmuStop();
+
+	// WiimoteReal is shutdown on app exit
+	return;
+
 	g_wiimote_scanner.StopScanning();
 
 	std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);
@@ -501,6 +576,20 @@ void Shutdown(void)
 		HandleWiimoteDisconnect(i);
 }
 
+void Resume()
+{
+	for (unsigned int i = 0; i < MAX_BBMOTES; ++i)
+		if (g_wiimotes[i] && g_wiimotes[i]->IsConnected())
+			g_wiimotes[i]->EmuResume();
+}
+
+void Pause()
+{
+	for (unsigned int i = 0; i < MAX_BBMOTES; ++i)
+		if (g_wiimotes[i] && g_wiimotes[i]->IsConnected())
+			g_wiimotes[i]->EmuPause();
+}
+
 void ChangeWiimoteSource(unsigned int index, int source)
 {
 	{
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h
index d195f92120..2ab4e435e2 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h
@@ -47,6 +47,8 @@ public:
 	// "handshake" / stop packets
 	void EmuStart();
 	void EmuStop();
+	void EmuResume();
+	void EmuPause();
 
 	// connecting and disconnecting from physical devices
 	// (using address inserted by FindWiimotes)
@@ -59,6 +61,8 @@ public:
 	bool Prepare(int index);
 
 	void DisableDataReporting();
+	void EnableDataReporting(u8 mode);
+	void SetChannel(u16 channel);
 	
 	void QueueReport(u8 rpt_id, const void* data, unsigned int size);
 
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
index daa28b340d..bf50913fcc 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
@@ -138,27 +138,6 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::DoState(PointerWrap &p)
 
 	for (unsigned int i = 0; i < MAX_BBMOTES; i++)
 		m_WiiMotes[i].DoState(p);
-
-	// Reset the connection of real and hybrid wiimotes
-	if (p.GetMode() == PointerWrap::MODE_READ && SConfig::GetInstance().m_WiimoteReconnectOnLoad)
-	{
-		for (unsigned int i = 0; i < MAX_BBMOTES; i++)
-		{
-			if (WIIMOTE_SRC_EMU == g_wiimote_sources[i] || WIIMOTE_SRC_NONE == g_wiimote_sources[i])
-				continue;
-			// TODO: Selectively clear real wiimote messages if possible. Or create a real wiimote channel and reporting mode pre-setup to vacate the need for m_WiimoteReconnectOnLoad.
-			m_EventQueue.clear();
-			if (!m_WiiMotes[i].IsInactive())
-			{
-				m_WiiMotes[i].Activate(false);
-				m_WiiMotes[i].Activate(true);
-			}
-			else
-			{
-				m_WiiMotes[i].Activate(false);
-			}
-		}
-	}
 }
 
 bool CWII_IPC_HLE_Device_usb_oh1_57e_305::RemoteDisconnect(u16 _connectionHandle)
diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp
index be29f11015..06b839b960 100644
--- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp
@@ -106,7 +106,6 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin
 	wxSlider* const WiiSensBarSens = new wxSlider(this, wxID_ANY, 0, 0, 4, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL);
 	wxSlider* const WiimoteSpkVolume = new wxSlider(this, wxID_ANY, 0, 0, 127);
 	wxCheckBox* const WiimoteMotor = new wxCheckBox(this, wxID_ANY, _("Wiimote Motor"));
-	wxCheckBox* const WiimoteReconnectOnLoad = new wxCheckBox(this, wxID_ANY, _("Reconnect Wiimote on State Loading"));
 
 	wxStaticText* const WiiSensBarPosText = new wxStaticText(this, wxID_ANY, _("Sensor Bar Position:"));
 	wxStaticText* const WiiSensBarSensText = new wxStaticText(this, wxID_ANY, _("IR Sensitivity:"));
@@ -143,13 +142,11 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin
 	WiiSensBarSens->SetValue(SConfig::GetInstance().m_SYSCONF->GetData<u32>("BT.SENS"));
 	WiimoteSpkVolume->SetValue(SConfig::GetInstance().m_SYSCONF->GetData<u8>("BT.SPKV"));
 	WiimoteMotor->SetValue(SConfig::GetInstance().m_SYSCONF->GetData<bool>("BT.MOT"));
-	WiimoteReconnectOnLoad->SetValue(SConfig::GetInstance().m_WiimoteReconnectOnLoad);
 
 	WiiSensBarPos->Bind(wxEVT_COMMAND_CHOICE_SELECTED, &WiimoteConfigDiag::OnSensorBarPos, this);
 	WiiSensBarSens->Bind(wxEVT_COMMAND_SLIDER_UPDATED, &WiimoteConfigDiag::OnSensorBarSensitivity, this);
 	WiimoteSpkVolume->Bind(wxEVT_COMMAND_SLIDER_UPDATED, &WiimoteConfigDiag::OnSpeakerVolume, this);
 	WiimoteMotor->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &WiimoteConfigDiag::OnMotor, this);
-	WiimoteReconnectOnLoad->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &WiimoteConfigDiag::OnReconnectOnLoad, this);
 
 
 	// "General Settings" layout
@@ -175,7 +172,6 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputPlugin& plugin
 
 	wxGridSizer* const general_wiimote_sizer = new wxGridSizer(1, 5, 5);
 	general_wiimote_sizer->Add(WiimoteMotor);
-	general_wiimote_sizer->Add(WiimoteReconnectOnLoad);
 
 	general_sizer->Add(choice_sizer);
 	general_sizer->Add(general_wiimote_sizer);
diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h
index dac963d9f3..c6368fc33b 100644
--- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h
+++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.h
@@ -52,11 +52,6 @@ public:
 		SConfig::GetInstance().m_SYSCONF->SetData("BT.MOT", event.GetInt());
 		event.Skip();
 	}
-	void OnReconnectOnLoad(wxCommandEvent& event)
-	{
-		SConfig::GetInstance().m_WiimoteReconnectOnLoad = event.IsChecked();
-		event.Skip();
-	}
 	void OnContinuousScanning(wxCommandEvent& event)
 	{
 		SConfig::GetInstance().m_WiimoteContinuousScanning = event.IsChecked();

From 9e779c22b3657dfa7f140208ecde3e38e894f364 Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Thu, 30 May 2013 04:59:28 +0200
Subject: [PATCH 218/352] Removing Wii input use of an unsaved state value

because that allow the complete state to be loaded
---
 .../Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp  | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
index bf50913fcc..9bef545257 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
@@ -487,18 +487,16 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update()
 
 	// The Real Wiimote sends report every ~5ms (200 Hz).
 	const u64 interval = SystemTimers::GetTicksPerSecond() / 200;
-	const u64 each_wiimote_interval = interval / m_WiiMotes.size();
 	const u64 now = CoreTiming::GetTicks();
 
-	if (now - m_last_ticks > each_wiimote_interval)
+	if (now - m_last_ticks > interval)
 	{
-		static int wiimote_to_update = 0;
-		if (m_WiiMotes[wiimote_to_update].IsConnected())
-		{
-			NetPlay_WiimoteUpdate(wiimote_to_update);
-			Wiimote::Update(wiimote_to_update);
-		}
-		wiimote_to_update = (wiimote_to_update + 1) % m_WiiMotes.size();
+		for (unsigned int i = 0; i < m_WiiMotes.size(); i++)
+			if (m_WiiMotes[i].IsConnected())
+			{
+				NetPlay_WiimoteUpdate(i);
+				Wiimote::Update(i);
+			}
 		m_last_ticks = now;
 	}
 

From e250550de3e7fbfdaf119404e5deedb6564ee164 Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Sat, 1 Jun 2013 06:01:31 +0200
Subject: [PATCH 219/352] Removing muted Wiimote audio

because that reduce writes
---
 Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 4 +++-
 Source/Core/DolphinWX/Src/Main.cpp                  | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
index f073f6371f..587d718abe 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
@@ -168,6 +168,7 @@ void Wiimote::InterruptChannel(const u16 channel, const void* const _data, const
 	
 	auto const data = static_cast<const u8*>(_data);
 	Report rpt(data, data + size);
+	WiimoteEmu::Wiimote *const wm = (WiimoteEmu::Wiimote*)::Wiimote::GetPlugin()->controllers[index];
 
 	// Convert output DATA packets to SET_REPORT packets.
 	// Nintendo Wiimotes work without this translation, but 3rd
@@ -189,7 +190,8 @@ void Wiimote::InterruptChannel(const u16 channel, const void* const _data, const
 		}
 	}
 	else if (rpt[1] == WM_WRITE_SPEAKER_DATA
-		&& !SConfig::GetInstance().m_WiimoteEnableSpeaker)
+		&& (!SConfig::GetInstance().m_WiimoteEnableSpeaker
+		|| (!wm->m_status.speaker || wm->m_speaker_mute)))
 	{
 		// Translate speaker data reports into rumble reports.
 		rpt[1] = WM_RUMBLE;
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index 8c31d99005..1cb52b828f 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -658,6 +658,8 @@ void Host_SetWiiMoteConnectionState(int _State)
 	// Update field 1 or 2
 	event.SetInt(1);
 
+	NOTICE_LOG(WIIMOTE, event.GetString().c_str());
+
 	main_frame->GetEventHandler()->AddPendingEvent(event);
 }
 

From b892d838ffa20ea6c12391a28d458831976140bc Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Tue, 25 Jun 2013 10:52:25 -0400
Subject: [PATCH 220/352] Allow dragging the analog sticks with the tas input.

---
 Source/Core/DolphinWX/Src/TASInputDlg.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
index 0eb2336966..da12f26ff7 100644
--- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp
+++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
@@ -42,6 +42,7 @@ TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title,
 
 	static_bitmap_main = new wxStaticBitmap(this, ID_MAIN_STICK, TASInputDlg::CreateStickBitmap(128,128), wxDefaultPosition, wxDefaultSize);
 	static_bitmap_main->Bind(wxEVT_LEFT_UP, &TASInputDlg::OnMouseUpL, this);
+	static_bitmap_main->Bind(wxEVT_MOTION, &TASInputDlg::OnMouseUpL, this);
 	static_bitmap_main->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnMouseUpR, this);
 	wx_mainX_s = new wxSlider(this, ID_MAIN_X_SLIDER, 128, 0, 255, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL);
 	wx_mainX_s->SetMinSize(wxSize(120,-1));
@@ -68,6 +69,7 @@ TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title,
 	
 	static_bitmap_c = new wxStaticBitmap(this, ID_C_STICK, TASInputDlg::CreateStickBitmap(128,128), wxDefaultPosition, wxDefaultSize);
 	static_bitmap_c->Bind(wxEVT_LEFT_UP, &TASInputDlg::OnMouseUpL, this);
+	static_bitmap_c->Bind(wxEVT_MOTION, &TASInputDlg::OnMouseUpL, this);
 	static_bitmap_c->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnMouseUpR, this);
 	wx_cX_s = new wxSlider(this, ID_C_X_SLIDER, 128, 0, 255, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL);
 	wx_cX_s->SetMinSize(wxSize(120,-1));
@@ -754,6 +756,9 @@ void TASInputDlg::OnMouseUpR(wxMouseEvent& event)
 
 void TASInputDlg::OnMouseUpL(wxMouseEvent& event)
 {
+	if (!event.LeftIsDown())
+		return;
+
 	wxSlider *sliderX,*sliderY;
 	wxStaticBitmap *sbitmap;
 	wxTextCtrl *textX, *textY;

From 5904ffb21d2322d411e55fdb4ae853ff224f0de7 Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Tue, 25 Jun 2013 11:04:28 -0400
Subject: [PATCH 221/352] Fix last commit, and set the position on mouse down
 instead of mouse up.

---
 Source/Core/DolphinWX/Src/TASInputDlg.cpp | 12 ++++++------
 Source/Core/DolphinWX/Src/TASInputDlg.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
index da12f26ff7..5bc24f3262 100644
--- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp
+++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
@@ -41,8 +41,8 @@ TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title,
 	wxBoxSizer* const main_stick_box = new wxBoxSizer(wxVERTICAL);
 
 	static_bitmap_main = new wxStaticBitmap(this, ID_MAIN_STICK, TASInputDlg::CreateStickBitmap(128,128), wxDefaultPosition, wxDefaultSize);
-	static_bitmap_main->Bind(wxEVT_LEFT_UP, &TASInputDlg::OnMouseUpL, this);
-	static_bitmap_main->Bind(wxEVT_MOTION, &TASInputDlg::OnMouseUpL, this);
+	static_bitmap_main->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::OnMouseDownL, this);
+	static_bitmap_main->Bind(wxEVT_MOTION, &TASInputDlg::OnMouseDownL, this);
 	static_bitmap_main->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnMouseUpR, this);
 	wx_mainX_s = new wxSlider(this, ID_MAIN_X_SLIDER, 128, 0, 255, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL);
 	wx_mainX_s->SetMinSize(wxSize(120,-1));
@@ -68,8 +68,8 @@ TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title,
 	wxBoxSizer* const c_stick_box = new wxBoxSizer(wxVERTICAL);
 	
 	static_bitmap_c = new wxStaticBitmap(this, ID_C_STICK, TASInputDlg::CreateStickBitmap(128,128), wxDefaultPosition, wxDefaultSize);
-	static_bitmap_c->Bind(wxEVT_LEFT_UP, &TASInputDlg::OnMouseUpL, this);
-	static_bitmap_c->Bind(wxEVT_MOTION, &TASInputDlg::OnMouseUpL, this);
+	static_bitmap_c->Bind(wxEVT_LEFT_DOWN, &TASInputDlg::OnMouseDownL, this);
+	static_bitmap_c->Bind(wxEVT_MOTION, &TASInputDlg::OnMouseDownL, this);
 	static_bitmap_c->Bind(wxEVT_RIGHT_UP, &TASInputDlg::OnMouseUpR, this);
 	wx_cX_s = new wxSlider(this, ID_C_X_SLIDER, 128, 0, 255, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL);
 	wx_cX_s->SetMinSize(wxSize(120,-1));
@@ -754,9 +754,9 @@ void TASInputDlg::OnMouseUpR(wxMouseEvent& event)
 
 }
 
-void TASInputDlg::OnMouseUpL(wxMouseEvent& event)
+void TASInputDlg::OnMouseDownL(wxMouseEvent& event)
 {
-	if (!event.LeftIsDown())
+	if (event.GetEventType() == wxEVT_MOTION && !event.LeftIsDown())
 		return;
 
 	wxSlider *sliderX,*sliderY;
diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.h b/Source/Core/DolphinWX/Src/TASInputDlg.h
index fa780081f0..28b3391463 100644
--- a/Source/Core/DolphinWX/Src/TASInputDlg.h
+++ b/Source/Core/DolphinWX/Src/TASInputDlg.h
@@ -24,7 +24,7 @@ class TASInputDlg : public wxDialog
 		void OnCloseWindow(wxCloseEvent& event);
 		void UpdateFromSliders(wxCommandEvent& event);
 		void UpdateFromText(wxCommandEvent& event);
-		void OnMouseUpL(wxMouseEvent& event);
+		void OnMouseDownL(wxMouseEvent& event);
 		void OnMouseUpR(wxMouseEvent& event);
 		void ResetValues();
 		void GetValues(SPADStatus *PadStatus, int controllerID);

From 21ca344a215f1742350753edc2369b89feaec39a Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Tue, 25 Jun 2013 18:14:41 +0200
Subject: [PATCH 222/352] provide GL_ARB_ES2_compatibility workaround

ES2 is in ogl core since 4.1, but not all drivers support it
---
 Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index 7ed532019b..93f4e2a37c 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -255,6 +255,16 @@ void ErrorCallback( GLenum source, GLenum type, GLuint id, GLenum severity, GLsi
 #endif
 }
 
+// Two small Fallbacks to avoid GL_ARB_ES2_compatibility
+void GLAPIENTRY DepthRangef(GLfloat neardepth, GLfloat fardepth)
+{
+	glDepthRange(neardepth, fardepth);
+}
+void GLAPIENTRY ClearDepthf(GLfloat depthval)
+{
+	glClearDepth(depthval);
+}
+
 void InitDriverInfo()
 {
 	// Get Vendor
@@ -404,6 +414,16 @@ Renderer::Renderer()
 	}
 	if (!GLEW_ARB_texture_non_power_of_two)
 		WARN_LOG(VIDEO, "ARB_texture_non_power_of_two not supported.");
+	
+	// OpenGL 3 doesn't provide GLES like float functions for depth.
+	// They are in core in OpenGL 4.1, so almost every driver should support them.
+	// But for the oldest ones, we provide fallbacks to the old double functions.
+	if (!GLEW_ARB_ES2_compatibility)
+	{
+		glDepthRangef = DepthRangef;
+		glClearDepthf = ClearDepthf;
+		
+	}
 
 	if (!bSuccess)
 		return;	// TODO: fail

From 55950365e337755e89d9d39b88a1720c16b297f0 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Tue, 25 Jun 2013 14:32:25 -0400
Subject: [PATCH 223/352] InputConfigDiag: Fix complex bindings with with
 left-click Detect

This fixes the binding of XBox 360 controllers and similar devices
with complex control names.
---
 Source/Core/DolphinWX/Src/InputConfigDiag.cpp | 48 +++++++++++++------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
index e036d5ec71..2c6f08fde0 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
@@ -327,12 +327,33 @@ void ControlDialog::ClearControl(wxCommandEvent&)
 
 inline bool IsAlphabetic(wxString &str)
 {
-    for (wxString::const_iterator it = str.begin(); it != str.end(); ++it)
+	for (wxString::const_iterator it = str.begin(); it != str.end(); ++it)
 		if (!isalpha(*it))
 			return false;
 	return true;
 }
 
+inline void GetExpressionForControl(wxString &expr,
+				    wxString &control_name,
+				    DeviceQualifier *control_device = NULL,
+				    DeviceQualifier *default_device = NULL)
+{
+	expr = "";
+
+	// non-default device
+	if (control_device && default_device && !(*control_device == *default_device))
+	{
+		expr += ":";
+		expr += control_device->ToString();
+	}
+
+	// append the control name
+	expr += control_name;
+
+	if (!IsAlphabetic(expr))
+		expr = wxString::Format("`%s`", expr);
+}
+
 bool ControlDialog::GetExpressionForSelectedControl(wxString &expr)
 {
 	const int num = control_lbox->GetSelection();
@@ -340,17 +361,11 @@ bool ControlDialog::GetExpressionForSelectedControl(wxString &expr)
 	if (num < 0)
 		return false;
 
-	expr = "";
-
-	// non-default device
-	if (!(m_devq == m_parent->controller->default_device))
-		expr += m_devq.ToString();
-
-	// append the control name
-	expr += control_lbox->GetString(num);
-
-	if (!IsAlphabetic(expr))
-		expr = wxString::Format("`%s`", expr);
+	wxString control_name = control_lbox->GetString(num);
+	GetExpressionForControl(expr,
+				control_name,
+				&m_devq,
+				&m_parent->controller->default_device);
 
 	return true;
 }
@@ -482,12 +497,15 @@ void GamepadPage::DetectControl(wxCommandEvent& event)
 		// if we got input, update expression and reference
 		if (ctrl)
 		{
-			btn->control_reference->expression = ctrl->GetName();
+			wxString control_name = ctrl->GetName();
+			wxString expr;
+			GetExpressionForControl(expr, control_name);
+			btn->control_reference->expression = expr;
 			g_controller_interface.UpdateReference(btn->control_reference, controller->default_device);
 		}
-
-		btn->SetLabel(StrToWxStr(btn->control_reference->expression));
 	}
+
+	UpdateGUI();
 }
 
 wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent)

From fc0f347ceaa6d03d2374bce3bc92dafff1f6d117 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 25 Jun 2013 14:36:03 -0500
Subject: [PATCH 224/352] [Android] Open the navigation drawer by clicking on
 the button. Woops, didn't realize that gmail did this as well.

---
 .../dolphinemu/GameListActivity.java           | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
index 41b0ecfd9c..cedf728574 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
@@ -11,6 +11,7 @@ import android.preference.PreferenceManager;
 import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.widget.DrawerLayout;
 import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
@@ -74,6 +75,13 @@ public class GameListActivity extends Activity
 				R.string.drawer_open,  /* "open drawer" description for accessibility */
 				R.string.drawer_close  /* "close drawer" description for accessibility */
 		) {
+			public void onDrawerClosed(View view) {
+				invalidateOptionsMenu(); // creates call to onPrepareOptionsMenu()
+			}
+
+			public void onDrawerOpened(View drawerView) {
+				invalidateOptionsMenu(); // creates call to onPrepareOptionsMenu()
+			}
 		};
 		mDrawerLayout.setDrawerListener(mDrawerToggle);
 
@@ -215,6 +223,16 @@ public class GameListActivity extends Activity
 	public boolean onPrepareOptionsMenu(Menu menu) {
 		return super.onPrepareOptionsMenu(menu);
 	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		// The action bar home/up action should open or close the drawer.
+		// ActionBarDrawerToggle will take care of this.
+		if (mDrawerToggle.onOptionsItemSelected(item)) {
+			return true;
+		}
+		return super.onOptionsItemSelected(item);
+	}
 	public void onBackPressed()
 	{
 

From 06d721984d253c505f9ebfbe384380b8b4beaf23 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Wed, 26 Jun 2013 04:58:34 -0500
Subject: [PATCH 225/352] [Android] Make the navigation drawer not so
 blindingly dark.

---
 Source/Android/res/layout/gamelist_activity.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Android/res/layout/gamelist_activity.xml b/Source/Android/res/layout/gamelist_activity.xml
index 08a2c4eb5b..2c22d36afa 100644
--- a/Source/Android/res/layout/gamelist_activity.xml
+++ b/Source/Android/res/layout/gamelist_activity.xml
@@ -16,5 +16,5 @@
             android:choiceMode="singleChoice"
             android:divider="@android:color/transparent"
             android:dividerHeight="0dp"
-            android:background="#111"/>
+            android:background="#333"/>
 </android.support.v4.widget.DrawerLayout>

From 63a747edc07e98031b7c2184756dd1f5d6f7ca79 Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Wed, 26 Jun 2013 06:23:29 -0400
Subject: [PATCH 226/352] Add shortcut to (dis)connect the balance board.

Fixes issue 6383.
---
 Source/Core/Core/Src/ConfigManager.cpp   |  2 ++
 Source/Core/Core/Src/CoreParameter.h     |  1 +
 Source/Core/DolphinWX/Src/Frame.cpp      |  5 ++++-
 Source/Core/DolphinWX/Src/FrameTools.cpp | 10 ++++++++--
 Source/Core/DolphinWX/Src/Globals.h      |  1 +
 Source/Core/DolphinWX/Src/HotkeyDlg.cpp  |  1 +
 6 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp
index 8917e20cc6..f3d3107aeb 100644
--- a/Source/Core/Core/Src/ConfigManager.cpp
+++ b/Source/Core/Core/Src/ConfigManager.cpp
@@ -41,6 +41,7 @@ static const struct {
 	{ "Wiimote2Connect",	50 /* '2' */,		2 /* wxMOD_CMD */ },
 	{ "Wiimote3Connect",	51 /* '3' */,		2 /* wxMOD_CMD */ },
 	{ "Wiimote4Connect",	52 /* '4' */,		2 /* wxMOD_CMD */ },
+	{ "BalanceBoardConnect",53 /* '4' */,		2 /* wxMOD_CMD */ },
 #else
 	{ "Open",		79 /* 'O' */,		2 /* wxMOD_CONTROL */},
 	{ "ChangeDisc",		0,			0 /* wxMOD_NONE */ },
@@ -64,6 +65,7 @@ static const struct {
 	{ "Wiimote2Connect",	345 /* WXK_F6 */,	1 /* wxMOD_ALT */ },
 	{ "Wiimote3Connect",	346 /* WXK_F7 */,	1 /* wxMOD_ALT */ },
 	{ "Wiimote4Connect",	347 /* WXK_F8 */,	1 /* wxMOD_ALT */ },
+	{ "BalanceBoardConnect",348 /* WXK_F9 */,	1 /* wxMOD_ALT */ },
 #endif
 
 	{ "LoadStateSlot1",	340 /* WXK_F1 */,	0 /* wxMOD_NONE */ },
diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h
index 6f2219e9f8..c69d79eb9d 100644
--- a/Source/Core/Core/Src/CoreParameter.h
+++ b/Source/Core/Core/Src/CoreParameter.h
@@ -32,6 +32,7 @@ enum Hotkey
 	HK_WIIMOTE2_CONNECT,
 	HK_WIIMOTE3_CONNECT,
 	HK_WIIMOTE4_CONNECT,
+	HK_BALANCEBOARD_CONNECT,
 
 	HK_LOAD_STATE_SLOT_1,
 	HK_LOAD_STATE_SLOT_2,
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index 1e0e0c756c..dd2b0f1cd4 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -215,7 +215,7 @@ EVT_MENU_RANGE(IDM_LOADLAST1, IDM_LOADLAST8, CFrame::OnLoadLastState)
 EVT_MENU_RANGE(IDM_SAVESLOT1, IDM_SAVESLOT8, CFrame::OnSaveState)
 EVT_MENU_RANGE(IDM_FRAMESKIP0, IDM_FRAMESKIP9, CFrame::OnFrameSkip)
 EVT_MENU_RANGE(IDM_DRIVE1, IDM_DRIVE24, CFrame::OnBootDrive)
-EVT_MENU_RANGE(IDM_CONNECT_WIIMOTE1, IDM_CONNECT_WIIMOTE4, CFrame::OnConnectWiimote)
+EVT_MENU_RANGE(IDM_CONNECT_WIIMOTE1, IDM_CONNECT_BALANCEBOARD, CFrame::OnConnectWiimote)
 EVT_MENU_RANGE(IDM_LISTWAD, IDM_LISTDRIVES, CFrame::GameListChanged)
 
 // Other
@@ -739,6 +739,7 @@ int GetCmdForHotkey(unsigned int key)
 	case HK_WIIMOTE2_CONNECT: return IDM_CONNECT_WIIMOTE2;
 	case HK_WIIMOTE3_CONNECT: return IDM_CONNECT_WIIMOTE3;
 	case HK_WIIMOTE4_CONNECT: return IDM_CONNECT_WIIMOTE4;
+	case HK_BALANCEBOARD_CONNECT: return IDM_CONNECT_BALANCEBOARD;
 
 	case HK_LOAD_STATE_SLOT_1: return IDM_LOADSLOT1;
 	case HK_LOAD_STATE_SLOT_2: return IDM_LOADSLOT2;
@@ -823,6 +824,8 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
 			WiimoteId = 2;
 		else if (IsHotkey(event, HK_WIIMOTE4_CONNECT))
 			WiimoteId = 3;
+		else if (IsHotkey(event, HK_BALANCEBOARD_CONNECT))
+			WiimoteId = 4;
 		else
 		{
 			unsigned int i = NUM_HOTKEYS;
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index 8607fdb110..6a23e15d16 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -205,6 +205,7 @@ void CFrame::CreateMenu()
 	toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE2, GetMenuLabel(HK_WIIMOTE2_CONNECT));
 	toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE3, GetMenuLabel(HK_WIIMOTE3_CONNECT));
 	toolsMenu->AppendCheckItem(IDM_CONNECT_WIIMOTE4, GetMenuLabel(HK_WIIMOTE4_CONNECT));
+	toolsMenu->AppendCheckItem(IDM_CONNECT_BALANCEBOARD, GetMenuLabel(HK_BALANCEBOARD_CONNECT));
 
 	m_MenuBar->Append(toolsMenu, _("&Tools"));
 
@@ -370,7 +371,9 @@ wxString CFrame::GetMenuLabel(int Id)
 			Label = wxString::Format(_("Connect Wiimote %i"),
 					Id - HK_WIIMOTE1_CONNECT + 1);
 			break;
-
+		case HK_BALANCEBOARD_CONNECT:
+			Label = _("Connect Balance Board");
+			break;
 		case HK_LOAD_STATE_SLOT_1:
 		case HK_LOAD_STATE_SLOT_2:
 		case HK_LOAD_STATE_SLOT_3:
@@ -1570,13 +1573,14 @@ void CFrame::UpdateGUI()
 	if (DiscIO::CNANDContentManager::Access().GetNANDLoader(TITLEID_SYSMENU).IsValid())
 		GetMenuBar()->FindItem(IDM_LOAD_WII_MENU)->Enable(!Initialized);
 
-	// Tools
+	// Tools
 	GetMenuBar()->FindItem(IDM_CHEATS)->Enable(SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats);
 
 	GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE1)->Enable(RunningWii);
 	GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE2)->Enable(RunningWii);
 	GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE3)->Enable(RunningWii);
 	GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE4)->Enable(RunningWii);
+	GetMenuBar()->FindItem(IDM_CONNECT_BALANCEBOARD)->Enable(RunningWii);
 	GetMenuBar()->FindItem(IDM_CONFIG_WIIMOTE_PLUGIN)->Enable(!RunningGamecube);
 	if (RunningWii)
 	{
@@ -1588,6 +1592,8 @@ void CFrame::UpdateGUI()
 				AccessWiiMote(0x0102)->IsConnected());
 		GetMenuBar()->FindItem(IDM_CONNECT_WIIMOTE4)->Check(GetUsbPointer()->
 				AccessWiiMote(0x0103)->IsConnected());
+		GetMenuBar()->FindItem(IDM_CONNECT_BALANCEBOARD)->Check(GetUsbPointer()->
+				AccessWiiMote(0x0104)->IsConnected());
 	}
 
 	if (Running)
diff --git a/Source/Core/DolphinWX/Src/Globals.h b/Source/Core/DolphinWX/Src/Globals.h
index 144eafe40f..ded510028d 100644
--- a/Source/Core/DolphinWX/Src/Globals.h
+++ b/Source/Core/DolphinWX/Src/Globals.h
@@ -97,6 +97,7 @@ enum
 	IDM_CONNECT_WIIMOTE2,
 	IDM_CONNECT_WIIMOTE3,
 	IDM_CONNECT_WIIMOTE4,
+	IDM_CONNECT_BALANCEBOARD,
 
 	IDM_LISTWAD,
 	IDM_LISTWII,
diff --git a/Source/Core/DolphinWX/Src/HotkeyDlg.cpp b/Source/Core/DolphinWX/Src/HotkeyDlg.cpp
index 5ee94deb59..487b310bf7 100644
--- a/Source/Core/DolphinWX/Src/HotkeyDlg.cpp
+++ b/Source/Core/DolphinWX/Src/HotkeyDlg.cpp
@@ -185,6 +185,7 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls(void)
 		_("Connect Wiimote 2"),
 		_("Connect Wiimote 3"),
 		_("Connect Wiimote 4"),
+		_("Connect Balance Board"),
 
 		_("Load State Slot 1"),
 		_("Load State Slot 2"),

From 0037acbbaaf31d3754796edffe4214d82d544024 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Wed, 26 Jun 2013 05:32:44 -0500
Subject: [PATCH 227/352] [Android] Actually copy Dolphin.ini correctly...

---
 Source/Android/.idea/workspace.xml            | 252 +++++++-----------
 Source/Android/AndroidManifest.xml            |   4 +-
 .../dolphinemu/DolphinEmulator.java           |   4 +-
 3 files changed, 104 insertions(+), 156 deletions(-)

diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index ae0ee19324..01d723657a 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -54,7 +54,6 @@
     <disable_hints />
   </component>
   <component name="DebuggerManager">
-    <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
     <breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
       <breakpoint>
         <option name="NOTIFY_CAUGHT" value="true" />
@@ -91,6 +90,7 @@
         <option name="LOG_MESSAGE" value="" />
       </breakpoint>
     </breakpoint_any>
+    <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
     <breakpoint_rules />
     <ui_properties />
   </component>
@@ -100,67 +100,21 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/build.xml">
+      <file leaf-file-name="DolphinEmulator.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="26" column="0" selection-start="1180" selection-end="1180" vertical-scroll-proportion="0.0" vertical-offset="765" max-vertical-offset="1470">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="GameListActivity.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="191" column="26" selection-start="6574" selection-end="6574" vertical-scroll-proportion="0.0" vertical-offset="2160" max-vertical-offset="4125">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="project.properties" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/project.properties">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="13" column="17" selection-start="562" selection-end="562" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="300">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PrefsActivity.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="8" column="0" selection-start="215" selection-end="332" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="630">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="AboutActivity.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/AboutActivity.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="12" column="3" selection-start="265" selection-end="265" vertical-scroll-proportion="0.0" vertical-offset="162" max-vertical-offset="555">
+            <state line="116" column="85" selection-start="3532" selection-end="3532" vertical-scroll-proportion="0.0" vertical-offset="1320" max-vertical-offset="3210">
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#590#604#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="GameListItem.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
+      <file leaf-file-name="AndroidManifest.xml" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="22" column="36" selection-start="580" selection-end="580" vertical-scroll-proportion="0.3816794" vertical-offset="90" max-vertical-offset="1050">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="FolderBrowser.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="41" column="61" selection-start="1431" selection-end="1454" vertical-scroll-proportion="0.0" vertical-offset="405" max-vertical-offset="1290">
+            <state line="3" column="26" selection-start="174" selection-end="174" vertical-scroll-proportion="0.07867133" vertical-offset="0" max-vertical-offset="825">
               <folding />
             </state>
           </provider>
@@ -189,7 +143,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListAdapter.java" />
         <option value="$PROJECT_DIR$/res/layout/sidemenu.xml" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java" />
@@ -202,9 +155,10 @@
         <option value="$PROJECT_DIR$/project.properties" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeLibrary.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/AboutActivity.java" />
-        <option value="$PROJECT_DIR$/AndroidManifest.xml" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
+        <option value="$PROJECT_DIR$/AndroidManifest.xml" />
       </list>
     </option>
   </component>
@@ -258,45 +212,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dolphinemu" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <PATH>
@@ -343,6 +258,45 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
+      <pane id="ProjectPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dolphinemu" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -356,9 +310,9 @@
     <property name="options.splitter.main.proportions" value="0.3" />
     <property name="GoToFile.includeJavaFiles" value="false" />
     <property name="options.searchVisible" value="true" />
+    <property name="options.splitter.details.proportions" value="0.2" />
     <property name="last_opened_file_path" value="$USER_HOME$/NavigationDrawer/libs/android-support-v4.jar" />
     <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="options.splitter.details.proportions" value="0.2" />
     <property name="MemberChooser.showClasses" value="true" />
     <property name="FullScreen" value="false" />
     <property name="ExportedModule" value="Android" />
@@ -428,6 +382,20 @@
       <patterns />
       <method />
     </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+      <method />
+    </configuration>
     <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
       <module name="" />
       <option name="TESTING_TYPE" value="0" />
@@ -446,20 +414,6 @@
       <option name="CLEAR_LOGCAT" value="false" />
       <method />
     </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
     <configuration default="false" name="Dolphin Emulator" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="Android" />
       <option name="ACTIVITY_CLASS" value="" />
@@ -564,15 +518,13 @@
     <frame x="24" y="0" width="1342" height="744" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21406491" sideWeight="0.70302016" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29697987" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29598662" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2179289" sideWeight="0.29026845" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -582,9 +534,11 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29865772" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -601,9 +555,9 @@
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29865772" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2179289" sideWeight="0.29026845" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
@@ -694,20 +648,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="17" column="13" selection-start="433" selection-end="433" vertical-scroll-proportion="0.026929982" vertical-offset="45" max-vertical-offset="2850">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="26" column="0" selection-start="1180" selection-end="1180" vertical-scroll-proportion="0.0" vertical-offset="765" max-vertical-offset="1470">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListAdapter.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="12" column="13" selection-start="300" selection-end="300" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="825">
@@ -743,18 +683,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="38" column="41" selection-start="1810" selection-end="1810" vertical-scroll-proportion="0.6315789" vertical-offset="210" max-vertical-offset="825">
-          <folding>
-            <element signature="e#659#677#0" expanded="true" />
-            <element signature="e#767#785#0" expanded="true" />
-            <element signature="e#1338#1356#0" expanded="true" />
-            <element signature="e#1603#1621#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="8" column="0" selection-start="215" selection-end="332" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="630">
@@ -769,13 +697,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="191" column="26" selection-start="6574" selection-end="6574" vertical-scroll-proportion="0.0" vertical-offset="2160" max-vertical-offset="4125">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="41" column="61" selection-start="1431" selection-end="1454" vertical-scroll-proportion="0.0" vertical-offset="45" max-vertical-offset="1290">
@@ -786,16 +707,43 @@
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/AboutActivity.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="12" column="3" selection-start="265" selection-end="265" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="555">
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#590#604#0" expanded="true" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="22" column="36" selection-start="580" selection-end="580" vertical-scroll-proportion="0.3816794" vertical-offset="90" max-vertical-offset="1050">
+        <state line="22" column="36" selection-start="580" selection-end="580" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1050">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="191" column="26" selection-start="6216" selection-end="6216" vertical-scroll-proportion="2.9667833" vertical-offset="838" max-vertical-offset="3390">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="26" column="0" selection-start="1180" selection-end="1180" vertical-scroll-proportion="-0.6708408" vertical-offset="765" max-vertical-offset="1470">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="116" column="85" selection-start="3532" selection-end="3532" vertical-scroll-proportion="0.0" vertical-offset="1320" max-vertical-offset="3210">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="3" column="26" selection-start="174" selection-end="174" vertical-scroll-proportion="0.07867133" vertical-offset="0" max-vertical-offset="825">
           <folding />
         </state>
       </provider>
diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index 5574b269dd..0edfe1f4de 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.dolphinemu.dolphinemu"
-    android:versionCode="6"
-    android:versionName="0.6" >
+    android:versionCode="7"
+    android:versionName="0.7" >
 
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14"/>
     
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index 2cc19d3955..a7f70c08af 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -112,9 +112,9 @@ public class DolphinEmulator<MainActivity> extends Activity
 				CopyAsset("GCPadNew.ini", 
 						Environment.getExternalStorageDirectory()+File.separator+
 						"dolphin-emu" + File.separator + "Config" + File.separator + "GCPadNew.ini");
-				CopyAsset("GCPadNew.ini",
+				CopyAsset("Dolphin.ini",
 						Environment.getExternalStorageDirectory()+File.separator+
-						"dolphin-emu" + File.separator + "Config" + File.separator  +"Dolphin.ini");
+						"dolphin-emu" + File.separator + "Config" + File.separator + "Dolphin.ini");
 
 				SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 				SharedPreferences.Editor editor = prefs.edit();

From 99d32e756f0e89a2b49facd1e0162fc9c7c68188 Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Wed, 26 Jun 2013 13:14:46 +0200
Subject: [PATCH 228/352] only provide ES2_compatibility workaround for non
 gles devices

---
 Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index 93f4e2a37c..98e85e31e5 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -255,6 +255,7 @@ void ErrorCallback( GLenum source, GLenum type, GLuint id, GLenum severity, GLsi
 #endif
 }
 
+#ifndef USE_GLES3
 // Two small Fallbacks to avoid GL_ARB_ES2_compatibility
 void GLAPIENTRY DepthRangef(GLfloat neardepth, GLfloat fardepth)
 {
@@ -264,6 +265,7 @@ void GLAPIENTRY ClearDepthf(GLfloat depthval)
 {
 	glClearDepth(depthval);
 }
+#endif
 
 void InitDriverInfo()
 {

From 9edfb5c710b0711bcd24c3cc1d7d136f74112d77 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Wed, 26 Jun 2013 08:18:53 -0500
Subject: [PATCH 229/352] [Android] Disable OpenGL ES 3 EGL bit. This is due to
 drivers complaining(Which they should do) when they don't support GLES3.
 Qualcomm drivers don't care about it being ES2 or ES3 bit anyway. Intel
 drivers are untested in this code path, but GLES3 is untested entirely in
 desktop anyway.

---
 Source/Core/DolphinWX/Src/GLInterface/EGL.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp
index 6c12c1156c..b5560d1ed7 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp
@@ -53,7 +53,12 @@ bool cInterfaceEGL::Create(void *&window_handle)
 		EGL_DEPTH_SIZE, 24,
 #ifdef USE_GLES
 #ifdef USE_GLES3
-		EGL_RENDERABLE_TYPE, (1 << 6) /* EGL_OPENGL_ES3_BIT */,
+		EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+		
+		// OpenGL ES 3 bit is disabled for now, until we have a way to select it from runtime
+		// Qualcomm drivers don't even care if it is ES2 or ES3 bit set.
+		// Intel drivers /might/ not care, but that code path is untested
+		// EGL_RENDERABLE_TYPE, (1 << 6) /* EGL_OPENGL_ES3_BIT */,
 #else
 		EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
 #endif

From 03fdebac09f76decaa0a51f3491fa606f45df3cb Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Wed, 26 Jun 2013 16:54:48 -0400
Subject: [PATCH 230/352] ExpressionParser: Don't crash when we can't find a
 device

---
 .../InputCommon/Src/ControllerInterface/ExpressionParser.cpp   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
index a259f303c8..51f152d434 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
@@ -351,6 +351,9 @@ Device *ControlFinder::FindDevice(ControlQualifier qualifier)
 Device::Control *ControlFinder::FindControl(ControlQualifier qualifier)
 {
 	Device *device = FindDevice(qualifier);
+	if (!device)
+		return NULL;
+
 	if (is_input)
 		return device->FindInput(qualifier.control_name);
 	else

From f53eefb491d8325ec7fccc8c006dc3be38765fe5 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Wed, 26 Jun 2013 20:19:23 -0400
Subject: [PATCH 231/352] ExpressionParser: Add support for simple barewords
 control names

If an expression can't be parsed normally, we then look to see if it's a
simple device name. This keeps backwards compatibility with simple input
ocnfigurations, where people just used the Detect button.
---
 .../ControllerInterface/ExpressionParser.cpp  | 79 +++++++++++++------
 .../ControllerInterface/ExpressionParser.h    | 10 +--
 2 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
index 51f152d434..0e9ebda1c1 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
@@ -209,6 +209,7 @@ public:
 	virtual ~ExpressionNode() {}
 	virtual ControlState GetValue() { return 0; }
 	virtual void SetValue(ControlState state) {}
+	virtual int CountNumControls() { return 0; }
 	virtual bool IsComplicated() { return false; }
 	virtual operator std::string() { return ""; }
 };
@@ -231,6 +232,11 @@ public:
 		control->ToOutput()->SetState(value);
 	}
 
+	virtual int CountNumControls()
+	{
+		return 1;
+	}
+
 	virtual bool IsComplicated()
 	{
 		return false;
@@ -282,6 +288,11 @@ public:
 		rhs->SetValue(value);
 	}
 
+	virtual int CountNumControls()
+	{
+		return lhs->CountNumControls() + rhs->CountNumControls();
+	}
+
 	virtual bool IsComplicated()
 	{
 		return true;
@@ -329,6 +340,11 @@ public:
 		}
 	}
 
+	virtual int CountNumControls()
+	{
+		return inner->CountNumControls();
+	}
+
 	virtual bool IsComplicated()
 	{
 		return true;
@@ -371,18 +387,12 @@ public:
 
 	ExpressionParseStatus Parse(Expression **expr_out)
 	{
-		Expression *expr;
-		ExpressionNode *expr_node;
-		ExpressionParseStatus status = Toplevel(&expr_node);
+		ExpressionNode *node;
+		ExpressionParseStatus status = Toplevel(&node);
 		if (status != EXPRESSION_PARSE_SUCCESS)
 			return status;
 
-		expr = new Expression();
-		expr->expr = expr_node;
-		expr->num_controls = CountNumControls();
-		expr->is_complicated = expr_node->IsComplicated();
-		*expr_out = expr;
-
+		*expr_out = new Expression(node);
 		return EXPRESSION_PARSE_SUCCESS;
 	}
 
@@ -513,33 +523,31 @@ private:
 	{
 		return Binary(expr_out);
 	}
-
-	int CountNumControls()
-	{
-		int count = 0;
-		for (std::vector<Token>::iterator it = tokens.begin(); it != tokens.end(); ++it)
-			if (it->type == TOK_CONTROL)
-				count++;
-		return count;
-	}
 };
 
 ControlState Expression::GetValue()
 {
-	return expr->GetValue();
+	return node->GetValue();
 }
 
 void Expression::SetValue(ControlState value)
 {
-	expr->SetValue(value);
+	node->SetValue(value);
+}
+
+Expression::Expression(ExpressionNode *node_)
+{
+	node = node_;
+	num_controls = node->CountNumControls();
+	is_complicated = node->IsComplicated();
 }
 
 Expression::~Expression()
 {
-	delete expr;
+	delete node;
 }
 
-ExpressionParseStatus ParseExpression(std::string str, ControlFinder &finder, Expression **expr_out)
+ExpressionParseStatus ParseExpressionInner(std::string str, ControlFinder &finder, Expression **expr_out)
 {
 	ExpressionParseStatus status;
 	Expression *expr;
@@ -563,5 +571,32 @@ ExpressionParseStatus ParseExpression(std::string str, ControlFinder &finder, Ex
 	return EXPRESSION_PARSE_SUCCESS;
 }
 
+ExpressionParseStatus ParseExpression(std::string str, ControlFinder &finder, Expression **expr_out)
+{
+	ExpressionParseStatus status;
+
+	status = ParseExpressionInner(str, finder, expr_out);
+	if (status == EXPRESSION_PARSE_SUCCESS)
+		return status;
+
+	if (status != EXPRESSION_PARSE_SYNTAX_ERROR)
+		return status;
+
+	// Add compatibility with old simple expressions, which are simple
+	// barewords control names.
+
+	ControlQualifier qualifier;
+	qualifier.control_name = str;
+	qualifier.has_device = false;
+
+	Device::Control *control = finder.FindControl(qualifier);
+	if (control) {
+		*expr_out = new Expression(new ControlExpression(qualifier, control));
+		return EXPRESSION_PARSE_SUCCESS;
+	}
+
+	return EXPRESSION_PARSE_SYNTAX_ERROR;
+}
+
 }
 }
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h
index 342f513f5c..d85c17a474 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h
@@ -41,22 +41,18 @@ private:
 	bool is_input;
 };
 
-class Parser;
 class ExpressionNode;
 class Expression
 {
-	friend class Parser;
-
 public:
-	Expression() : expr(NULL) {}
+	Expression() : node(NULL) {}
+	Expression(ExpressionNode *node);
 	~Expression();
 	ControlState GetValue();
 	void SetValue (ControlState state);
 	int num_controls;
 	bool is_complicated;
-
-private:
-	ExpressionNode *expr;
+	ExpressionNode *node;
 };
 
 enum ExpressionParseStatus

From c11ae9ea4b52f25493c1a74490a5a544b07e30f0 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Wed, 26 Jun 2013 20:25:37 -0400
Subject: [PATCH 232/352] Revert "Core: Update default bound controls for new
 ExpressionParser"

This reverts commit 54e1b58199e9f11e9d8015777ebfcd53c86d485d.

We now support barewords control names, so use those instead.

Conflicts:
	Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
---
 Source/Core/Core/Src/HW/GCPadEmu.cpp          | 12 ++++-----
 .../Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp     | 26 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Source/Core/Core/Src/HW/GCPadEmu.cpp b/Source/Core/Core/Src/HW/GCPadEmu.cpp
index a183d27714..af4130b1bc 100644
--- a/Source/Core/Core/Src/HW/GCPadEmu.cpp
+++ b/Source/Core/Core/Src/HW/GCPadEmu.cpp
@@ -181,14 +181,14 @@ void GCPad::LoadDefaults(const ControllerInterface& ciface)
 	set_control(m_main_stick, 4, "LSHIFT");		// Modifier
 
 #elif __APPLE__
-	set_control(m_c_stick, 4, "`Left Control`");	// Modifier
+	set_control(m_c_stick, 4, "Left Control");	// Modifier
 
 	// Main Stick
-	set_control(m_main_stick, 0, "`Up Arrow");		// Up
-	set_control(m_main_stick, 1, "`Down Arrow`");		// Down
-	set_control(m_main_stick, 2, "`Left Arrow`");		// Left
-	set_control(m_main_stick, 3, "`Right Arrow`");	// Right
-	set_control(m_main_stick, 4, "`Left Shift`");		// Modifier
+	set_control(m_main_stick, 0, "Up Arrow");		// Up
+	set_control(m_main_stick, 1, "Down Arrow");		// Down
+	set_control(m_main_stick, 2, "Left Arrow");		// Left
+	set_control(m_main_stick, 3, "Right Arrow");	// Right
+	set_control(m_main_stick, 4, "Left Shift");		// Modifier
 #else
 	// not sure if these are right
 
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
index eb13c1a6fd..f530bc8dea 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -897,11 +897,11 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
 
 	// Buttons
 #if defined HAVE_X11 && HAVE_X11
-	set_control(m_buttons, 0, "`Click 1`");		// A
-	set_control(m_buttons, 1, "`Click 3`");		// B
+	set_control(m_buttons, 0, "Click 1");		// A
+	set_control(m_buttons, 1, "Click 3");		// B
 #else
-	set_control(m_buttons, 0, "`Click 0`");		// A
-	set_control(m_buttons, 1, "`Click 1`");		// B
+	set_control(m_buttons, 0, "Click 0");		// A
+	set_control(m_buttons, 1, "Click 1");		// B
 #endif
 	set_control(m_buttons, 2, "1");		// 1
 	set_control(m_buttons, 3, "2");		// 2
@@ -916,13 +916,13 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
 
 	// Shake
 	for (size_t i = 0; i != 3; ++i)
-		set_control(m_shake, i, "`Click 2`");
+		set_control(m_shake, i, "Click 2");
 
 	// IR
-	set_control(m_ir, 0, "`Cursor Y-`");
-	set_control(m_ir, 1, "`Cursor Y+`");
-	set_control(m_ir, 2, "`Cursor X-`");
-	set_control(m_ir, 3, "`Cursor X+`");
+	set_control(m_ir, 0, "Cursor Y-");
+	set_control(m_ir, 1, "Cursor Y+");
+	set_control(m_ir, 2, "Cursor X-");
+	set_control(m_ir, 3, "Cursor X+");
 
 	// DPad
 #ifdef _WIN32
@@ -931,10 +931,10 @@ void Wiimote::LoadDefaults(const ControllerInterface& ciface)
 	set_control(m_dpad, 2, "LEFT");		// Left
 	set_control(m_dpad, 3, "RIGHT");	// Right
 #elif __APPLE__
-	set_control(m_dpad, 0, "`Up Arrow`");		// Up
-	set_control(m_dpad, 1, "`Down Arrow`");	// Down
-	set_control(m_dpad, 2, "`Left Arrow`");	// Left
-	set_control(m_dpad, 3, "`Right Arrow`");	// Right
+	set_control(m_dpad, 0, "Up Arrow");		// Up
+	set_control(m_dpad, 1, "Down Arrow");	// Down
+	set_control(m_dpad, 2, "Left Arrow");	// Left
+	set_control(m_dpad, 3, "Right Arrow");	// Right
 #else
 	set_control(m_dpad, 0, "Up");		// Up
 	set_control(m_dpad, 1, "Down");		// Down

From cdb5b8b7370d3ae4ff590d08e285d9a296da0bf6 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Wed, 26 Jun 2013 23:06:17 -0400
Subject: [PATCH 233/352] DInputJoystick: Always exclude XInput

Yeah, yeah, it's possible that some guy would try to build DInput
without XInput, but they're crazy, and I doubt it would have worked
since the header file mess was so fragile anyway. Always exclude
DInput devices when we don't have XInput.
---
 .../Src/ControllerInterface/DInput/DInputJoystick.cpp      | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
index 24502e7a8a..033ee7b8a1 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
@@ -37,7 +37,6 @@ static const struct
 
 #define DATA_BUFFER_SIZE	32
 
-#ifdef NO_DUPLICATE_DINPUT_XINPUT
 //-----------------------------------------------------------------------------
 // Modified some MSDN code to get all the XInput device GUID.Data1 values in a vector,
 // faster than checking all the devices for each DirectInput device, like MSDN says to do
@@ -141,7 +140,6 @@ LCleanup:
 	if( bCleanupCOM )
 		CoUninitialize();
 }
-#endif
 
 void InitJoystick(IDirectInput8* const idi8, std::vector<Core::Device*>& devices, HWND hwnd)
 {
@@ -152,21 +150,18 @@ void InitJoystick(IDirectInput8* const idi8, std::vector<Core::Device*>& devices
 	// multiple joysticks with the same name shall get unique ids starting at 0
 	std::map< std::basic_string<TCHAR>, int>	name_counts;
 
-#ifdef NO_DUPLICATE_DINPUT_XINPUT
 	std::vector<DWORD> xinput_guids;
 	GetXInputGUIDS( xinput_guids );
-#endif
 
 	std::list<DIDEVICEINSTANCE>::iterator
 		i = joysticks.begin(),
 		e = joysticks.end();
 	for ( ; i!=e; ++i )
 	{
-#ifdef NO_DUPLICATE_DINPUT_XINPUT
 		// skip XInput Devices
 		if ( std::find( xinput_guids.begin(), xinput_guids.end(), i->guidProduct.Data1 ) != xinput_guids.end() )
 			continue;
-#endif
+
 		LPDIRECTINPUTDEVICE8 js_device;
 		if (SUCCEEDED(idi8->CreateDevice(i->guidInstance, &js_device, NULL)))
 		{

From a92f6f68d6ba43cebc878c21d566abf5f1701a05 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Wed, 26 Jun 2013 23:26:21 -0400
Subject: [PATCH 234/352] DInputJoystick: Fix compile

Whoops. MSVC++ messed up somehow and didn't tell me it didn't work
locally.
---
 .../Src/ControllerInterface/DInput/DInputJoystick.cpp          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
index 033ee7b8a1..fa33595ee8 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/DInput/DInputJoystick.cpp
@@ -6,6 +6,9 @@
 #include <sstream>
 #include <algorithm>
 
+#include <wbemidl.h>
+#include <oleauto.h>
+
 namespace ciface
 {
 namespace DInput

From 72d49e05a75103924cd2d990388bd6306f71cfa9 Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Thu, 27 Jun 2013 10:34:53 +0200
Subject: [PATCH 235/352] fix opengl debug build on win32

---
 Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index 98e85e31e5..fcd18f8c0d 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -217,7 +217,7 @@ void ApplySSAASettings() {
 #endif
 }
 
-void ErrorCallback( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const char* message, void* userParam)
+void GLAPIENTRY ErrorCallback( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const char* message, void* userParam)
 {
 	// GLES3 doesn't natively support this
 	// XXX: Include GLES2 extensions header so we can use this

From 72257d5f699d7d234c035547c02c5d9781bb2e11 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Thu, 27 Jun 2013 04:47:39 -0500
Subject: [PATCH 236/352] [Android] Support clicking on games in the folder
 browser to add the folder currently in. Mostly for derps that keep trying to
 run the game from the folder browser.

---
 Source/Android/.idea/workspace.xml            | 254 ++++++++++--------
 Source/Android/AndroidManifest.xml            |   4 +-
 Source/Android/assets/GCPadNew.ini            |  40 +--
 .../dolphinemu/DolphinEmulator.java           |  48 +++-
 .../dolphinemu/dolphinemu/FolderBrowser.java  |  19 +-
 5 files changed, 210 insertions(+), 155 deletions(-)

diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index 01d723657a..1a8e010c8e 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -103,18 +103,34 @@
       <file leaf-file-name="DolphinEmulator.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="116" column="85" selection-start="3532" selection-end="3532" vertical-scroll-proportion="0.0" vertical-offset="1320" max-vertical-offset="3210">
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state line="177" column="80" selection-start="5496" selection-end="5496" vertical-scroll-proportion="0.0" vertical-offset="2304" max-vertical-offset="3315">
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="AndroidManifest.xml" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="AndroidManifest.xml" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="3" column="26" selection-start="174" selection-end="174" vertical-scroll-proportion="0.07867133" vertical-offset="0" max-vertical-offset="825">
+            <state line="3" column="26" selection-start="174" selection-end="174" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="825">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="GCPadNew.ini" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/assets/GCPadNew.ini">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="3" column="13" selection-start="76" selection-end="76" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="525">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="FolderBrowser.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="89" column="5" selection-start="2811" selection-end="2811" vertical-scroll-proportion="0.47769028" vertical-offset="958" max-vertical-offset="1365">
               <folding />
             </state>
           </provider>
@@ -143,22 +159,22 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/res/layout/sidemenu.xml" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuAdapter.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigAdapter.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java" />
         <option value="$PROJECT_DIR$/bin/AndroidManifest.xml" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java" />
         <option value="$PROJECT_DIR$/res/layout/folderbrowser.xml" />
         <option value="$PROJECT_DIR$/project.properties" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeLibrary.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/AboutActivity.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java" />
+        <option value="$PROJECT_DIR$/assets/GCPadNew.ini" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeLibrary.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
         <option value="$PROJECT_DIR$/AndroidManifest.xml" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java" />
       </list>
     </option>
   </component>
@@ -212,6 +228,44 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dolphinemu" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="Scope">
         <subPane subId="Project Files">
           <PATH>
@@ -256,51 +310,27 @@
               <option name="myItemType" value="" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="assets">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
       <pane id="PackagesPane" />
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dolphinemu" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="ExportedApkPath" value="$USER_HOME$/Desktop/DolphinEmu-Pre0.6-Android2.3.apk" />
+    <property name="ExportedApkPath" value="$USER_HOME$/Desktop/DolphinEmu-0.9.apk" />
     <property name="options.lastSelected" value="project.propCompiler" />
     <property name="AndroidRunProguardForReleaseBuild" value="false" />
     <property name="MemberChooser.copyJavadoc" value="false" />
@@ -310,9 +340,9 @@
     <property name="options.splitter.main.proportions" value="0.3" />
     <property name="GoToFile.includeJavaFiles" value="false" />
     <property name="options.searchVisible" value="true" />
+    <property name="project.structure.last.edited" value="Artifacts" />
     <property name="options.splitter.details.proportions" value="0.2" />
     <property name="last_opened_file_path" value="$USER_HOME$/NavigationDrawer/libs/android-support-v4.jar" />
-    <property name="project.structure.last.edited" value="Artifacts" />
     <property name="MemberChooser.showClasses" value="true" />
     <property name="FullScreen" value="false" />
     <property name="ExportedModule" value="Android" />
@@ -382,20 +412,6 @@
       <patterns />
       <method />
     </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
     <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
       <module name="" />
       <option name="TESTING_TYPE" value="0" />
@@ -414,6 +430,20 @@
       <option name="CLEAR_LOGCAT" value="false" />
       <method />
     </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+      <method />
+    </configuration>
     <configuration default="false" name="Dolphin Emulator" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="Android" />
       <option name="ACTIVITY_CLASS" value="" />
@@ -519,12 +549,13 @@
     <editor active="true" />
     <layout>
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21406491" sideWeight="0.70302016" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21406491" sideWeight="0.70469797" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29598662" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.295302" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2179289" sideWeight="0.29026845" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -538,7 +569,6 @@
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -555,9 +585,9 @@
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29865772" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2179289" sideWeight="0.29026845" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
@@ -631,23 +661,6 @@
     <breakpoint-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/res/layout/folderbrowser.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="25" column="38" selection-start="1051" selection-end="1051" vertical-scroll-proportion="1.0190217" vertical-offset="0" max-vertical-offset="525">
-          <folding />
-        </state>
-      </provider>
-      <provider editor-type-id="android-designer">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigAdapter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="16" column="13" selection-start="385" selection-end="385" vertical-scroll-proportion="-0.7557252" vertical-offset="432" max-vertical-offset="825">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListAdapter.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="12" column="13" selection-start="300" selection-end="300" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="825">
@@ -655,20 +668,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeLibrary.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="16" column="58" selection-start="731" selection-end="731" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="630">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="57" column="0" selection-start="2469" selection-end="2571" vertical-scroll-proportion="0.0" vertical-offset="540" max-vertical-offset="2610">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigItem.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="7" column="13" selection-start="167" selection-end="167" vertical-scroll-proportion="0.18421052" vertical-offset="0" max-vertical-offset="930">
@@ -697,13 +696,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="41" column="61" selection-start="1431" selection-end="1454" vertical-scroll-proportion="0.0" vertical-offset="45" max-vertical-offset="1290">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/AboutActivity.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="12" column="3" selection-start="265" selection-end="265" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="555">
@@ -732,18 +724,54 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/assets/GCPadNew.ini">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="3" column="13" selection-start="76" selection-end="76" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="525">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="59" column="5" selection-start="1460" selection-end="1460" vertical-scroll-proportion="0.8684211" vertical-offset="360" max-vertical-offset="975">
+          <folding>
+            <element signature="e#493#661#0" expanded="true" />
+            <element signature="e#654#655#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeLibrary.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="23" column="46" selection-start="1055" selection-end="1055" vertical-scroll-proportion="0.4467005" vertical-offset="154" max-vertical-offset="630">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="142" column="53" selection-start="4886" selection-end="4886" vertical-scroll-proportion="0.428934" vertical-offset="1766" max-vertical-offset="2580">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="116" column="85" selection-start="3532" selection-end="3532" vertical-scroll-proportion="0.0" vertical-offset="1320" max-vertical-offset="3210">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state line="177" column="80" selection-start="5496" selection-end="5496" vertical-scroll-proportion="0.0" vertical-offset="2304" max-vertical-offset="3315">
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="3" column="26" selection-start="174" selection-end="174" vertical-scroll-proportion="0.07867133" vertical-offset="0" max-vertical-offset="825">
+        <state line="3" column="26" selection-start="174" selection-end="174" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="825">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="89" column="5" selection-start="2811" selection-end="2811" vertical-scroll-proportion="0.47769028" vertical-offset="958" max-vertical-offset="1365">
           <folding />
         </state>
       </provider>
diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index 0edfe1f4de..125bb474eb 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.dolphinemu.dolphinemu"
-    android:versionCode="7"
-    android:versionName="0.7" >
+    android:versionCode="9"
+    android:versionName="0.9" >
 
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14"/>
     
diff --git a/Source/Android/assets/GCPadNew.ini b/Source/Android/assets/GCPadNew.ini
index 3c22ed5a2e..42144db1ce 100644
--- a/Source/Android/assets/GCPadNew.ini
+++ b/Source/Android/assets/GCPadNew.ini
@@ -1,29 +1,29 @@
 [GCPad1]
 Device = Android/0/Touchscreen
-Buttons/A = Button 0
-Buttons/B = Button 1
-Buttons/X = Button 3
-Buttons/Y = Button 4
-Buttons/Z = Button 5
-Buttons/Start = Button 2
-Main Stick/Up = Axis 10
-Main Stick/Down = Axis 11
-Main Stick/Left = Axis 12
-Main Stick/Right = Axis 13
+Buttons/A = `Button 0`
+Buttons/B = `Button 1`
+Buttons/X = `Button 3`
+Buttons/Y = `Button 4`
+Buttons/Z = `Button 5`
+Buttons/Start = `Button 2`
+Main Stick/Up = `Axis 10`
+Main Stick/Down = `Axis 11`
+Main Stick/Left = `Axis 12`
+Main Stick/Right = `Axis 13`
 Main Stick/Modifier = Shift_L
 Main Stick/Modifier/Range = 50.000000
-C-Stick/Up = Axis 14
-C-Stick/Down = Axis 15
-C-Stick/Left = Axis 16
-C-Stick/Right = Axis 17
+C-Stick/Up = `Axis 14`
+C-Stick/Down = `Axis 15`
+C-Stick/Left = `Axis 16`
+C-Stick/Right = `Axis 17`
 C-Stick/Modifier = Control_L
 C-Stick/Modifier/Range = 50.000000
-Triggers/L = Axis 18
-Triggers/R = Axis 19
-D-Pad/Up = Button 6
-D-Pad/Down = Button 7
-D-Pad/Left = Button 8
-D-Pad/Right = Button 9
+Triggers/L = `Axis 18`
+Triggers/R = `Axis 19`
+D-Pad/Up = `Button 6`
+D-Pad/Down = `Button 7`
+D-Pad/Left = `Button 8`
+D-Pad/Right = `Button 9`
 [GCPad2]
 [GCPad3]
 [GCPad4]
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index a7f70c08af..1afeff417e 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -173,24 +173,46 @@ public class DolphinEmulator<MainActivity> extends Activity
 	@Override
 	public boolean dispatchKeyEvent(KeyEvent event) {
 		int action = 0;
-		switch (event.getAction()) {
-			case KeyEvent.ACTION_DOWN:
-				action = 0;
-				break;
-			case KeyEvent.ACTION_UP:
-				action = 1;
-				break;
-			default:
-				break;
+
+		// Special catch for the back key
+		// Currently disabled because stopping and starting emulation is broken.
+		/*
+		if (    event.getSource() == InputDevice.SOURCE_KEYBOARD
+				&& event.getKeyCode() == KeyEvent.KEYCODE_BACK
+				&& event.getAction() == KeyEvent.ACTION_UP
+				)
+		{
+			if (Running)
+				NativeLibrary.StopEmulation();
+			Running = false;
+			Intent ListIntent = new Intent(this, GameListActivity.class);
+			startActivityForResult(ListIntent, 1);
+			return true;
 		}
-		InputDevice input = event.getDevice();
-		NativeLibrary.onGamePadEvent(input.getDescriptor(), event.getKeyCode(), action);
-		return true;
+		*/
+
+		if (Running)
+		{
+			switch (event.getAction()) {
+				case KeyEvent.ACTION_DOWN:
+					action = 0;
+					break;
+				case KeyEvent.ACTION_UP:
+					action = 1;
+					break;
+				default:
+					return false;
+			}
+			InputDevice input = event.getDevice();
+			NativeLibrary.onGamePadEvent(input.getDescriptor(), event.getKeyCode(), action);
+			return true;
+		}
+		return false;
 	}
 
 	@Override
 	public boolean dispatchGenericMotionEvent(MotionEvent event) {
-		if (((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) == 0)) {
+		if (((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) == 0) || !Running) {
 			return super.dispatchGenericMotionEvent(event);
 		}
 
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
index 0ceb776a77..d0e16e67a5 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
@@ -60,10 +60,12 @@ public class FolderBrowser extends ListActivity {
 	protected void onListItemClick(ListView l, View v, int position, long id) {
 		super.onListItemClick(l, v, position, id);
 		GameListItem o = adapter.getItem(position);
-		if(o.getData().equalsIgnoreCase("folder")||o.getData().equalsIgnoreCase("parent directory")){
+		if(o.getData().equalsIgnoreCase("folder") || o.getData().equalsIgnoreCase("parent directory")){
 			currentDir = new File(o.getPath());
 			Fill(currentDir);
 		}
+		else
+			FolderSelected();
 	}
 	
 	@Override
@@ -83,11 +85,14 @@ public class FolderBrowser extends ListActivity {
     }
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        Intent intent = new Intent();
-        intent.putExtra("Select", currentDir.getPath());
-        setResult(Activity.RESULT_OK, intent);
-
-        this.finish();
-        return true;
+		FolderSelected();
+		return true;
     }
+	private void FolderSelected()
+	{
+		Intent intent = new Intent();
+		intent.putExtra("Select", currentDir.getPath());
+		setResult(Activity.RESULT_OK, intent);
+		this.finish();
+	}
 }

From 11fdd5a4ec25984c5c484cf1dd29fdec004028b3 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Thu, 27 Jun 2013 10:51:19 -0400
Subject: [PATCH 237/352] ExpressionParser: Search for control names first

Otherwise, valid control names like "Cursor X+" would be incorrectly
tokenized as "`Cursor` `X` +", causing the parser to first abort trying to
find a control named `Cursor` rather than aborting with invalid syntax on
the bad binop.

We could also do this by resolving devices lazily, but since simple
control name bindings are going to be 90% of usecases, just look for these
first.
---
 .../Src/ControllerInterface/ExpressionParser.cpp      | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
index 0e9ebda1c1..c68df48e25 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
@@ -573,15 +573,6 @@ ExpressionParseStatus ParseExpressionInner(std::string str, ControlFinder &finde
 
 ExpressionParseStatus ParseExpression(std::string str, ControlFinder &finder, Expression **expr_out)
 {
-	ExpressionParseStatus status;
-
-	status = ParseExpressionInner(str, finder, expr_out);
-	if (status == EXPRESSION_PARSE_SUCCESS)
-		return status;
-
-	if (status != EXPRESSION_PARSE_SYNTAX_ERROR)
-		return status;
-
 	// Add compatibility with old simple expressions, which are simple
 	// barewords control names.
 
@@ -595,7 +586,7 @@ ExpressionParseStatus ParseExpression(std::string str, ControlFinder &finder, Ex
 		return EXPRESSION_PARSE_SUCCESS;
 	}
 
-	return EXPRESSION_PARSE_SYNTAX_ERROR;
+	return ParseExpressionInner(str, finder, expr_out);
 }
 
 }

From 166a9c56371bd8d0f5f9673a541e5f9a05d91bcb Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Fri, 28 Jun 2013 17:43:53 +0200
Subject: [PATCH 238/352] Finishing touches.

---
 Source/Core/VideoCommon/CMakeLists.txt        |  1 -
 .../VideoCommon/Src/LightingShaderGen.cpp     |  7 ------
 Source/Core/VideoCommon/Src/PixelShaderGen.h  |  8 +++----
 Source/Core/VideoCommon/Src/ShaderGenCommon.h |  3 +--
 .../Core/VideoCommon/Src/VertexShaderGen.cpp  |  4 ++--
 Source/Core/VideoCommon/Src/VertexShaderGen.h | 22 +++++++++++--------
 Source/Core/VideoCommon/VideoCommon.vcxproj   |  1 -
 .../VideoCommon/VideoCommon.vcxproj.filters   |  5 +----
 8 files changed, 21 insertions(+), 30 deletions(-)
 delete mode 100644 Source/Core/VideoCommon/Src/LightingShaderGen.cpp

diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt
index 1bbc69a150..a4dad8293b 100644
--- a/Source/Core/VideoCommon/CMakeLists.txt
+++ b/Source/Core/VideoCommon/CMakeLists.txt
@@ -11,7 +11,6 @@ set(SRCS	Src/BPFunctions.cpp
 			Src/HiresTextures.cpp
 			Src/ImageWrite.cpp
 			Src/IndexGenerator.cpp
-			Src/LightingShaderGen.cpp
 			Src/MainBase.cpp
 			Src/OnScreenDisplay.cpp
 			Src/OpcodeDecoding.cpp
diff --git a/Source/Core/VideoCommon/Src/LightingShaderGen.cpp b/Source/Core/VideoCommon/Src/LightingShaderGen.cpp
deleted file mode 100644
index 58da3612f5..0000000000
--- a/Source/Core/VideoCommon/Src/LightingShaderGen.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "LightingShaderGen.h"
-#include "NativeVertexFormat.h"
-#include "XFMemory.h"
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 210dd9dd32..150a69902e 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -55,14 +55,13 @@ const s_svar PSVar_Loc[] = { {I_COLORS, C_COLORS, 4 },
 						{I_PMATERIALS, C_PMATERIALS, 4 },
 						};
 
-// TODO: Should compact packing be enabled?
-//#pragma pack(4)
+#pragma pack(1)
 struct pixel_shader_uid_data
 {
 	// TODO: Optimize field order for easy access!
 
 	u32 num_values; // TODO: Shouldn't be a u32
-	u32 NumValues() const { return num_values; } // TODO: Can be optimized :)
+	u32 NumValues() const { return num_values; }
 
 	u32 components;
 	u32 dstAlphaMode : 2;
@@ -117,6 +116,7 @@ struct pixel_shader_uid_data
 	u32 xfregs_numTexGen_numTexGens : 4;
 
 	struct {
+		// TODO: Can save a lot space by removing the padding bits
 		u32 cc : 24;
 		u32 ac : 24;
 
@@ -147,7 +147,7 @@ struct pixel_shader_uid_data
 	// TODO: I think we're fine without an enablePixelLighting field, should probably double check, though..
 	LightingUidData lighting;
 };
-//#pragma pack()
+#pragma pack()
 
 typedef ShaderUid<pixel_shader_uid_data> PixelShaderUid;
 typedef ShaderCode PixelShaderCode; // TODO: Obsolete
diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index 53f2405f8a..c8f8ff8345 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -199,10 +199,9 @@ static void DeclareUniform(T& object, API_TYPE api_type, bool using_ubos, const
 	object.Write(";\n");
 }
 
-#pragma pack(4)
+#pragma pack(1)
 /**
  * Common uid data used for shader generators that use lighting calculations.
- * Expected to be stored as a member called "lighting".
  */
 struct LightingUidData
 {
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index a7e3a3d923..81d45cd6ad 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -401,7 +401,7 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 		{
 			const PostMtxInfo& postInfo = xfregs.postMtxInfo[i];
 
-			uid_data.postMtxInfo[i] = xfregs.postMtxInfo[i].index;
+			uid_data.postMtxInfo[i].index = xfregs.postMtxInfo[i].index;
 			int postidx = postInfo.index;
 			out.Write("float4 P0 = " I_POSTTRANSFORMMATRICES"[%d];\n"
 				"float4 P1 = " I_POSTTRANSFORMMATRICES"[%d];\n"
@@ -419,7 +419,7 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 			}
 			else
 			{
-				uid_data.postMtxInfo[i] |= xfregs.postMtxInfo[i].normalize << 6;
+				uid_data.postMtxInfo[i].normalize = xfregs.postMtxInfo[i].normalize;
 				if (postInfo.normalize)
 					out.Write("o.tex%d.xyz = normalize(o.tex%d.xyz);\n", i, i);
 
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h
index 3b233a22fe..797fe7d108 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h
@@ -71,22 +71,26 @@ struct vertex_shader_uid_data
 	u32 NumValues() const { return num_values; }
 
 	u32 components;
-	u32 num_values : 16; // TODO: Shouldn't be a u32
+	u32 num_values : 16; // TODO: u8 might be enough, actually
 	u32 numColorChans : 2;
 	u32 numTexGens : 4;
 
 	u32 dualTexTrans_enabled : 1;
 
-	u32 texMtxInfo_n_projection : 16; // XF_TEXPROJ_X
+	u32 texMtxInfo_n_projection : 16; // Stored separately to guarantee that the texMtxInfo struct is 8 bits wide
 	struct {
-		u32 inputform : 2; // XF_TEXINPUT_X
-		u32 texgentype : 3; // XF_TEXGEN_X
-		u32 sourcerow : 5; // XF_SRCGEOM_X
-		u32 embosssourceshift : 3; // what generated texcoord to use
-		u32 embosslightshift : 3; // light index that is used
-	} texMtxInfo[8]; // TODO: Wasting space
+		u32 inputform : 2;
+		u32 texgentype : 3;
+		u32 sourcerow : 5;
+		u32 embosssourceshift : 3;
+		u32 embosslightshift : 3;
+	} texMtxInfo[8];
 
-	u8 postMtxInfo[8]; // index + normalize + 1 padding bit, TODO: Can be made a struct again..
+	struct {
+		u32 index : 6;
+		u32 normalize : 1;
+		u32 pad : 1;
+	} postMtxInfo[8];
 
 	LightingUidData lighting;
 };
diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj
index 617e4ec567..1e7a56f578 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcxproj
+++ b/Source/Core/VideoCommon/VideoCommon.vcxproj
@@ -190,7 +190,6 @@
     <ClCompile Include="Src\HiresTextures.cpp" />
     <ClCompile Include="Src\ImageWrite.cpp" />
     <ClCompile Include="Src\IndexGenerator.cpp" />
-    <ClCompile Include="Src\LightingShaderGen.cpp" />
     <ClCompile Include="Src\MainBase.cpp" />
     <ClCompile Include="Src\memcpy_amd.cpp" />
     <ClCompile Include="Src\OnScreenDisplay.cpp" />
diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters
index e988d34e12..785e55877f 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters
+++ b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters
@@ -113,9 +113,6 @@
     <ClCompile Include="Src\VertexManagerBase.cpp">
       <Filter>Base</Filter>
     </ClCompile>
-    <ClCompile Include="Src\LightingShaderGen.cpp">
-      <Filter>Shader Generators</Filter>
-    </ClCompile>
     <ClCompile Include="Src\FPSCounter.cpp">
       <Filter>Util</Filter>
     </ClCompile>
@@ -294,4 +291,4 @@
       <UniqueIdentifier>{e2a527a2-ccc8-4ab8-a93e-dd2628c0f3b6}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

From 1083d78721e896f55d816aab686c49735d235fd8 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sat, 29 Jun 2013 02:55:29 -0400
Subject: [PATCH 239/352] InputConfigDiag: Put the colon after the device name

Oops. The dialog accidentally generated the wrong syntax for
this one.
---
 Source/Core/DolphinWX/Src/InputConfigDiag.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
index 2c6f08fde0..7be5f0c55e 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
@@ -343,8 +343,8 @@ inline void GetExpressionForControl(wxString &expr,
 	// non-default device
 	if (control_device && default_device && !(*control_device == *default_device))
 	{
-		expr += ":";
 		expr += control_device->ToString();
+		expr += ":";
 	}
 
 	// append the control name

From f524312fd17e62cbc761bb01953c67763fc9242b Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Sat, 29 Jun 2013 22:54:19 +0200
Subject: [PATCH 240/352] VertexShaderGen: Fix a potential bug where vertex
 shader uids don't change when pixel lighting is toggled.

---
 Source/Core/VideoCommon/Src/VertexShaderGen.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 81d45cd6ad..4296f42930 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -279,8 +279,8 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 			out.Write("o.colors_0 = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
 	}
 
-	// TODO: This probably isn't necessary if pixel lighting is enabled.
-	GenerateLightingShader<T>(out, uid_data.lighting, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_");
+	if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
+		GenerateLightingShader<T>(out, uid_data.lighting, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_");
 
 	if (xfregs.numChan.numColorChans < 2)
 	{

From 99301bd158a90d93dc7fb74e50118b1517a40ed3 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Sat, 29 Jun 2013 23:00:57 +0200
Subject: [PATCH 241/352] PixelShaderGen: Store early_ztest as part of shader
 uid.

---
 Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 1 +
 Source/Core/VideoCommon/Src/PixelShaderGen.h   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index dd284ced7d..ad8cc4d7c5 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -585,6 +585,7 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 	uid_data.ztex_op = bpmem.ztex2.op;
 	uid_data.per_pixel_depth = per_pixel_depth;
 	uid_data.fast_depth_calc = g_ActiveConfig.bFastDepthCalc;
+	uid_data.early_ztest = bpmem.zcontrol.early_ztest;
 	uid_data.fog_fsel = bpmem.fog.c_proj_fsel.fsel;
 
 	// Note: z-textures are not written to depth buffer if early depth test is used
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 150a69902e..21004323f9 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -112,6 +112,7 @@ struct pixel_shader_uid_data
 
 	u32 fast_depth_calc : 1;
 	u32 per_pixel_depth : 1;
+	u32 early_ztest : 1;
 
 	u32 xfregs_numTexGen_numTexGens : 4;
 

From eb153cfdedf4ec3563576aca5deb9ef33338ac7d Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Sat, 29 Jun 2013 23:14:08 +0200
Subject: [PATCH 242/352] PixelShaderGen: Fix a small early-ztest related bug.

---
 Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index ad8cc4d7c5..1c10459160 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -592,6 +592,8 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 	if (per_pixel_depth && bpmem.zcontrol.early_ztest)
 		out.Write("depth = zCoord;\n");
 
+	// Note: depth texture output is only written to depth buffer if late depth test is used
+	// theoretical final depth value is used for fog calculation, though, so we have to emulate ztextures anyway
 	if (bpmem.ztex2.op != ZTEXTURE_DISABLE && !skip_ztexture)
 	{
 		// use the texture input of the last texture stage (textemp), hopefully this has been read and is in correct format...
@@ -603,13 +605,9 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 		out.Write("zCoord = zCoord * (16777215.0f/16777216.0f);\n");
 		out.Write("zCoord = frac(zCoord);\n");
 		out.Write("zCoord = zCoord * (16777216.0f/16777215.0f);\n");
-
-		// Note: depth texture output is only written to depth buffer if late depth test is used
-		// final depth value is used for fog calculation, though
-		if (per_pixel_depth)
-			out.Write("depth = zCoord;\n");
 	}
-	else if (per_pixel_depth && !bpmem.zcontrol.early_ztest)
+
+	if (per_pixel_depth && !bpmem.zcontrol.early_ztest)
 		out.Write("depth = zCoord;\n");
 
 	if (dstAlphaMode == DSTALPHA_ALPHA_PASS)

From d5983b587e3e9739622b8e1658114a81ccfc3e69 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sat, 29 Jun 2013 18:27:11 -0400
Subject: [PATCH 243/352] InputConfigDialog: Don't show "..." for complicated
 expressions

Just show the actual expression. We need to do a bit of mangling
here as wx has no way to turn off mnemonics parsing, so do that
as well.
---
 Source/Core/DolphinWX/Src/InputConfigDiag.cpp   |  7 +++----
 .../ControllerInterface/ControllerInterface.h   |  7 -------
 .../ControllerInterface/ExpressionParser.cpp    | 17 -----------------
 .../Src/ControllerInterface/ExpressionParser.h  |  1 -
 4 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
index 7be5f0c55e..033eca8da0 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
@@ -240,10 +240,9 @@ void GamepadPage::UpdateGUI()
 			, e = (*g)->control_buttons.end();
 		for (; i!=e; ++i) {
 			ControllerInterface::ControlReference *r = (*i)->control_reference;
-			if (r->IsComplicated())
-				(*i)->SetLabel("...");
-			else
-				(*i)->SetLabel(StrToWxStr((*i)->control_reference->expression));
+			wxString expr = StrToWxStr((*i)->control_reference->expression);
+			expr.Replace("&", "&&");
+			(*i)->SetLabel(expr);
 		}
 
 		// cboxes
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
index e130c951aa..57903a08a7 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
@@ -73,13 +73,6 @@ public:
 				return 0;
 		}
 
-		bool IsComplicated() {
-			if (parsed_expression)
-				return parsed_expression->is_complicated;
-			else
-				return false;
-		}
-
 	protected:
 		ControlReference(const bool _is_input) : range(1), is_input(_is_input), parsed_expression(NULL) {}
 		ciface::ExpressionParser::Expression *parsed_expression;
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
index c68df48e25..5b6495b781 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
@@ -210,7 +210,6 @@ public:
 	virtual ControlState GetValue() { return 0; }
 	virtual void SetValue(ControlState state) {}
 	virtual int CountNumControls() { return 0; }
-	virtual bool IsComplicated() { return false; }
 	virtual operator std::string() { return ""; }
 };
 
@@ -237,11 +236,6 @@ public:
 		return 1;
 	}
 
-	virtual bool IsComplicated()
-	{
-		return false;
-	}
-
 	virtual operator std::string()
 	{
 		return "`" + (std::string)qualifier + "`";
@@ -293,11 +287,6 @@ public:
 		return lhs->CountNumControls() + rhs->CountNumControls();
 	}
 
-	virtual bool IsComplicated()
-	{
-		return true;
-	}
-
 	virtual operator std::string()
 	{
 		return OpName(op) + "(" + (std::string)(*lhs) + ", " + (std::string)(*rhs) + ")";
@@ -345,11 +334,6 @@ public:
 		return inner->CountNumControls();
 	}
 
-	virtual bool IsComplicated()
-	{
-		return true;
-	}
-
 	virtual operator std::string()
 	{
 		return OpName(op) + "(" + (std::string)(*inner) + ")";
@@ -539,7 +523,6 @@ Expression::Expression(ExpressionNode *node_)
 {
 	node = node_;
 	num_controls = node->CountNumControls();
-	is_complicated = node->IsComplicated();
 }
 
 Expression::~Expression()
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h
index d85c17a474..70cc51373b 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.h
@@ -51,7 +51,6 @@ public:
 	ControlState GetValue();
 	void SetValue (ControlState state);
 	int num_controls;
-	bool is_complicated;
 	ExpressionNode *node;
 };
 

From b8b5427ba4cead27a52de2780f6e03bfcc34fd22 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@googlemail.com>
Date: Sun, 30 Jun 2013 11:36:45 +0000
Subject: [PATCH 244/352] VertexShaderGen: Fix a dumb regression from revision
 f524312fd17e.

---
 Source/Core/VideoCommon/Src/VertexShaderGen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 4296f42930..758012f972 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -279,7 +279,7 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 			out.Write("o.colors_0 = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
 	}
 
-	if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
+	if (!(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting))
 		GenerateLightingShader<T>(out, uid_data.lighting, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_");
 
 	if (xfregs.numChan.numColorChans < 2)

From c34c82e7ae3209c083c18573f0494057828290ed Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Sun, 30 Jun 2013 14:27:04 +0200
Subject: [PATCH 245/352] VertexShaderGen: Fix a potential bug where vertex
 shader uids don't change when pixel lighting is toggled.

Same as revision f524312fd17e but done properly (why is our shader gen code this dumb?).
---
 Source/Core/VideoCommon/Src/VertexShaderGen.cpp | 4 ++--
 Source/Core/VideoCommon/Src/VertexShaderGen.h   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 758012f972..63b752b838 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -114,6 +114,7 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 
 	uid_data.numTexGens = xfregs.numTexGen.numTexGens;
 	uid_data.components = components;
+	uid_data.pixel_lighting = (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting);
 
 	if(api_type == API_OPENGL)
 	{
@@ -279,8 +280,7 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 			out.Write("o.colors_0 = float4(1.0f, 1.0f, 1.0f, 1.0f);\n");
 	}
 
-	if (!(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting))
-		GenerateLightingShader<T>(out, uid_data.lighting, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_");
+	GenerateLightingShader<T>(out, uid_data.lighting, components, I_MATERIALS, I_LIGHTS, "color", "o.colors_");
 
 	if (xfregs.numChan.numColorChans < 2)
 	{
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h
index 797fe7d108..a28f4758fa 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h
@@ -76,6 +76,7 @@ struct vertex_shader_uid_data
 	u32 numTexGens : 4;
 
 	u32 dualTexTrans_enabled : 1;
+	u32 pixel_lighting : 1;
 
 	u32 texMtxInfo_n_projection : 16; // Stored separately to guarantee that the texMtxInfo struct is 8 bits wide
 	struct {

From e4846de692472db11094b2fbecf163716c32449a Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Sun, 30 Jun 2013 19:01:30 -0400
Subject: [PATCH 246/352] Add hotkeys for save/load state to/from file.

---
 Source/Core/Core/Src/ConfigManager.cpp   |  2 ++
 Source/Core/Core/Src/CoreParameter.h     |  2 ++
 Source/Core/DolphinWX/Src/Frame.cpp      |  2 ++
 Source/Core/DolphinWX/Src/FrameTools.cpp | 10 ++++++++--
 Source/Core/DolphinWX/Src/HotkeyDlg.cpp  |  4 +++-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp
index f3d3107aeb..ffca141b46 100644
--- a/Source/Core/Core/Src/ConfigManager.cpp
+++ b/Source/Core/Core/Src/ConfigManager.cpp
@@ -98,6 +98,8 @@ static const struct {
 	{ "SaveFirstState",	0,	0 /* wxMOD_NONE */ },
 	{ "UndoLoadState",	351 /* WXK_F12 */,	0 /* wxMOD_NONE */ },
 	{ "UndoSaveState",	351 /* WXK_F12 */,	4 /* wxMOD_SHIFT */ },
+	{ "SaveStateFile",	0,	0 /* wxMOD_NONE */ },
+	{ "LoadStateFile",	0,	0 /* wxMOD_NONE */ },
 };
 
 SConfig::SConfig()
diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h
index c69d79eb9d..679fb0d425 100644
--- a/Source/Core/Core/Src/CoreParameter.h
+++ b/Source/Core/Core/Src/CoreParameter.h
@@ -64,6 +64,8 @@ enum Hotkey
 	HK_SAVE_FIRST_STATE,
 	HK_UNDO_LOAD_STATE,
 	HK_UNDO_SAVE_STATE,
+	HK_SAVE_STATE_FILE,
+	HK_LOAD_STATE_FILE,
 
 	NUM_HOTKEYS,
 };
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index dd2b0f1cd4..14a1276eef 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -771,6 +771,8 @@ int GetCmdForHotkey(unsigned int key)
 	case HK_SAVE_FIRST_STATE: return IDM_SAVEFIRSTSTATE;
 	case HK_UNDO_LOAD_STATE: return IDM_UNDOLOADSTATE;
 	case HK_UNDO_SAVE_STATE: return IDM_UNDOSAVESTATE;
+	case HK_LOAD_STATE_FILE: return IDM_LOADSTATEFILE;
+	case HK_SAVE_STATE_FILE: return IDM_SAVESTATEFILE;
 	}
 
 	return -1;
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index 6a23e15d16..3b59352585 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -149,12 +149,12 @@ void CFrame::CreateMenu()
 	emulationMenu->Append(IDM_LOADSTATE, _("&Load State"), loadMenu);
 	emulationMenu->Append(IDM_SAVESTATE, _("Sa&ve State"), saveMenu);
 
-	saveMenu->Append(IDM_SAVESTATEFILE, _("Save State..."));
+	saveMenu->Append(IDM_SAVESTATEFILE, GetMenuLabel(HK_SAVE_STATE_FILE));
 	saveMenu->Append(IDM_SAVEFIRSTSTATE, GetMenuLabel(HK_SAVE_FIRST_STATE));
 	loadMenu->Append(IDM_UNDOSAVESTATE, GetMenuLabel(HK_UNDO_SAVE_STATE));
 	saveMenu->AppendSeparator();
 
-	loadMenu->Append(IDM_LOADSTATEFILE, _("Load State..."));
+	loadMenu->Append(IDM_LOADSTATEFILE,  GetMenuLabel(HK_LOAD_STATE_FILE));
 	
 	loadMenu->Append(IDM_UNDOLOADSTATE, GetMenuLabel(HK_UNDO_LOAD_STATE));
 	loadMenu->AppendSeparator();
@@ -397,6 +397,9 @@ wxString CFrame::GetMenuLabel(int Id)
 			Label = wxString::Format(_("Slot %i"), 
 					Id - HK_SAVE_STATE_SLOT_1 + 1);
 			break;
+		case HK_SAVE_STATE_FILE:
+			Label = _("Save State...");
+			break;
 
 		case HK_LOAD_LAST_STATE_1:
 		case HK_LOAD_LAST_STATE_2:
@@ -409,6 +412,9 @@ wxString CFrame::GetMenuLabel(int Id)
 			Label = wxString::Format(_("Last %i"),
 				Id - HK_LOAD_LAST_STATE_1 + 1);
 			break;
+		case HK_LOAD_STATE_FILE:
+			Label = _("Load State...");
+			break;
 
 		case HK_SAVE_FIRST_STATE: Label = wxString("Save Oldest State"); break;
 		case HK_UNDO_LOAD_STATE: Label = wxString("Undo Load State"); break;
diff --git a/Source/Core/DolphinWX/Src/HotkeyDlg.cpp b/Source/Core/DolphinWX/Src/HotkeyDlg.cpp
index 487b310bf7..fad602f19e 100644
--- a/Source/Core/DolphinWX/Src/HotkeyDlg.cpp
+++ b/Source/Core/DolphinWX/Src/HotkeyDlg.cpp
@@ -216,7 +216,9 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls(void)
 
 		_("Save Oldest State"),
 		_("Undo Load State"),
-		_("Undo Save State")
+		_("Undo Save State"),
+		_("Save State"),
+		_("Load State"),
 	};
 
 	const int page_breaks[3] = {HK_OPEN, HK_LOAD_STATE_SLOT_1, NUM_HOTKEYS};

From de369dcc607a62320994ee77d61c071e0393ce1b Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Mon, 1 Jul 2013 17:44:42 -0400
Subject: [PATCH 247/352] Misc cleanup and fixes for some of the bad code i've
 written.

Fixes a buffer overflow in the sscanf, move the movie.raw to the GC folder, and stops calling GetSettings() twice.
---
 Source/Core/Core/Src/BootManager.cpp          |  4 +--
 .../Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp |  2 +-
 Source/Core/Core/Src/Movie.cpp                | 32 ++++++-------------
 3 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp
index 9e79de0d23..33f656ca4d 100644
--- a/Source/Core/Core/Src/BootManager.cpp
+++ b/Source/Core/Core/Src/BootManager.cpp
@@ -129,8 +129,8 @@ bool BootCore(const std::string& _rFilename)
 		StartUp.bSyncGPU = Movie::IsSyncGPU();
 		if (Movie::IsUsingMemcard() && Movie::IsStartingFromClearSave() && !StartUp.bWii)
 		{
-			if (File::Exists("Movie.raw"))
-				File::Delete("Movie.raw");
+			if (File::Exists(File::GetUserPath(D_GCUSER_IDX) + "Movie.raw"))
+				File::Delete(File::GetUserPath(D_GCUSER_IDX) + "Movie.raw");
 		}
 	}
 
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp
index 51b3a3a2d6..692db55ecc 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp
+++ b/Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp
@@ -48,7 +48,7 @@ CEXIMemoryCard::CEXIMemoryCard(const int index)
 {
 	m_strFilename = (card_index == 0) ? SConfig::GetInstance().m_strMemoryCardA : SConfig::GetInstance().m_strMemoryCardB;
 	if (Movie::IsPlayingInput() && Movie::IsConfigSaved() && Movie::IsUsingMemcard() && Movie::IsStartingFromClearSave())
-		m_strFilename = "Movie.raw";
+		m_strFilename = File::GetUserPath(D_GCUSER_IDX) + "Movie.raw";
 
 	// we're potentially leaking events here, since there's no UnregisterEvent until emu shutdown, but I guess it's inconsequential
 	et_this_card = CoreTiming::RegisterEvent((card_index == 0) ? "memcardFlushA" : "memcardFlushB", FlushCallback);
diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp
index 89a4b4fda6..e05afd1c42 100644
--- a/Source/Core/Core/Src/Movie.cpp
+++ b/Source/Core/Core/Src/Movie.cpp
@@ -432,9 +432,9 @@ bool BeginRecordingInput(int controllers)
 				Movie::g_bClearSave = true;
 		}
 		std::thread md5thread(GetMD5);
+		GetSettings();
 	}
 	g_playMode = MODE_RECORDING;
-	GetSettings();
 	author = SConfig::GetInstance().m_strMovieAuthor;
 	EnsureTmpInputSize(1);
 
@@ -687,23 +687,9 @@ void ReadHeader()
 		GetSettings();
 	}
 
-	videoBackend.resize(ARRAYSIZE(tmpHeader.videoBackend));
-	for (unsigned int i = 0; i < ARRAYSIZE(tmpHeader.videoBackend);i++)
-	{
-		videoBackend[i] = tmpHeader.videoBackend[i];
-	}
-
-	g_discChange.resize(ARRAYSIZE(tmpHeader.discChange));
-	for (unsigned int i = 0; i < ARRAYSIZE(tmpHeader.discChange);i++)
-	{
-		g_discChange[i] = tmpHeader.discChange[i];
-	}
-
-	author.resize(ARRAYSIZE(tmpHeader.author));
-	for (unsigned int i = 0; i < ARRAYSIZE(tmpHeader.author);i++)
-	{
-		author[i] = tmpHeader.author[i];
-	}
+	videoBackend = (char*) tmpHeader.videoBackend;
+	g_discChange = (char*) tmpHeader.discChange;
+	author = (char*) tmpHeader.author;
 	memcpy(MD5, tmpHeader.md5, 16);
 }
 
@@ -1075,7 +1061,7 @@ void EndPlayInput(bool cont)
 		g_currentByte = 0;
 		g_playMode = MODE_NONE;
 		Core::DisplayMessage("Movie End.", 2000);
-		g_bRecordingFromSaveState = 0;
+		g_bRecordingFromSaveState = false;
 		// we don't clear these things because otherwise we can't resume playback if we load a movie state later
 		//g_totalFrames = g_totalBytes = 0;
 		//delete tmpInput;
@@ -1183,10 +1169,11 @@ void GetSettings()
 	if (!Core::g_CoreStartupParameter.bWii)
 		g_bClearSave = !File::Exists(SConfig::GetInstance().m_strMemoryCardA);
 	bMemcard = SConfig::GetInstance().m_EXIDevice[0] == EXIDEVICE_MEMORYCARD;
-
+	u8 tmp[21];
 	for (int i = 0; i < 20; ++i)
 	{
-		sscanf(SCM_REV_STR + 2 * i, "%02hhx", &revision[i]);
+		sscanf(SCM_REV_STR + 2 * i, "%02hhx", &tmp[i]);
+		revision[i] = tmp[i];
 	}
 }
 
@@ -1216,8 +1203,7 @@ void CheckMD5()
 void GetMD5()
 {
 	Core::DisplayMessage("Calculating checksum of game file...", 2000);
-	for (int i = 0; i < 16; i++)
-		MD5[i] = 0;
+	memset(MD5, 0, sizeof(MD5));
 	char game[255];
 	memcpy(game, SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.c_str(),SConfig::GetInstance().m_LocalCoreStartupParameter.m_strFilename.size());
 	md5_file(game, MD5);

From 1f92ccc228bcb97893598ca1788fb2f459a078c0 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@gmail.com>
Date: Tue, 2 Jul 2013 14:32:52 +0200
Subject: [PATCH 248/352] ShaderGen: Use u8 as uid storage base type. Fixes an
 off-by-one error introduced in revision bdc28106eed0 that caused some
 lighting issues.

---
 Source/Core/VideoCommon/Src/PixelShaderGen.cpp  | 2 +-
 Source/Core/VideoCommon/Src/ShaderGenCommon.h   | 4 ++--
 Source/Core/VideoCommon/Src/VertexShaderGen.cpp | 2 --
 Source/Core/VideoCommon/Src/VertexShaderGen.h   | 4 +---
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 1c10459160..cf0dc8e959 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -537,7 +537,7 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 
 #define MY_STRUCT_OFFSET(str,elem) ((u32)((u64)&(str).elem-(u64)&(str)))
 	bool enable_pl = g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting;
-	uid_data.num_values = (enable_pl) ? sizeof(uid_data)/sizeof(32) : MY_STRUCT_OFFSET(uid_data,stagehash[numStages])/sizeof(u32);
+	uid_data.num_values = (enable_pl) ? sizeof(uid_data) : MY_STRUCT_OFFSET(uid_data,stagehash[numStages]);
 
 
 	if (numStages)
diff --git a/Source/Core/VideoCommon/Src/ShaderGenCommon.h b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
index c8f8ff8345..ec4fe27416 100644
--- a/Source/Core/VideoCommon/Src/ShaderGenCommon.h
+++ b/Source/Core/VideoCommon/Src/ShaderGenCommon.h
@@ -120,7 +120,7 @@ private:
 	union
 	{
 		uid_data data;
-		u32 values[sizeof(uid_data) / sizeof(u32)];
+		u8 values[sizeof(uid_data)];
 	};
 };
 
@@ -212,7 +212,7 @@ struct LightingUidData
 	u32 attnfunc : 8; // 4x2 bits
 	u32 light_mask : 32; // 4x8 bits
 
-	u32 NumValues() const { return sizeof(LightingUidData) / sizeof(u32); }
+	u32 NumValues() const { return sizeof(LightingUidData); }
 };
 #pragma pack()
 
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 63b752b838..a682b4ea21 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -74,8 +74,6 @@ static void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
 	vertex_shader_uid_data& uid_data = (&out.template GetUidData<vertex_shader_uid_data>() != NULL)
 											? out.template GetUidData<vertex_shader_uid_data>() : dummy_data;
 
-	uid_data.num_values = sizeof(uid_data)/sizeof(u32);
-
 	out.SetBuffer(text);
 #ifndef ANDROID
 	locale_t locale;
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h
index a28f4758fa..eef0646e6f 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h
@@ -67,11 +67,9 @@ const s_svar VSVar_Loc[] = {  {I_POSNORMALMATRIX, C_POSNORMALMATRIX, 6 },
 
 struct vertex_shader_uid_data
 {
-
-	u32 NumValues() const { return num_values; }
+	u32 NumValues() const { return sizeof(vertex_shader_uid_data); }
 
 	u32 components;
-	u32 num_values : 16; // TODO: u8 might be enough, actually
 	u32 numColorChans : 2;
 	u32 numTexGens : 4;
 

From 03a47d3c6b81175331f9645cdb4bd72ab02eb14c Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 2 Jul 2013 21:42:44 -0400
Subject: [PATCH 249/352] Fix a case where a boolean check (vector.empty()) was
 used when a clear (vector.clear()) was intended in ExpressionParser.cpp.

---
 .../InputCommon/Src/ControllerInterface/ExpressionParser.cpp    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
index 5b6495b781..0677a04abb 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
@@ -190,7 +190,7 @@ public:
 
 			if (tok.type == TOK_INVALID)
 			{
-				tokens.empty();
+				tokens.clear();
 				return EXPRESSION_PARSE_SYNTAX_ERROR;
 			}
 

From 3de5b1bed9a41f632cdc32d053db25bc3f594653 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 2 Jul 2013 21:58:09 -0400
Subject: [PATCH 250/352] Fix vendor retrieval for Tegra in VideoOGL.

---
 Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index fcd18f8c0d..07a59c5983 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -289,7 +289,7 @@ void InitDriverInfo()
 		vendor = DriverDetails::VENDOR_QUALCOMM;
 	else if (svendor == "Imagination Technologies")
 		vendor = DriverDetails::VENDOR_IMGTEC;
-	else if (svendor == "NVIDIA Corporation" && srenderer != "NVIDIA Tegra")
+	else if (svendor == "NVIDIA Corporation" && srenderer == "NVIDIA Tegra")
 		vendor = DriverDetails::VENDOR_TEGRA;
 	else if (svendor == "Vivante Corporation")
 		vendor = DriverDetails::VENDOR_VIVANTE;

From 998c4042c2f94fc7446279953e2079a6fed283a3 Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Wed, 3 Jul 2013 23:01:52 +1200
Subject: [PATCH 251/352] Add ability to dump Balance Board data to local udp
 port. This probably won't work on Mac...

---
 Source/Core/Core/Src/ConfigManager.cpp              |  1 +
 Source/Core/Core/Src/CoreParameter.cpp              |  3 ++-
 Source/Core/Core/Src/CoreParameter.h                |  1 +
 Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 13 +++++++++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp
index ffca141b46..6c0decaebc 100644
--- a/Source/Core/Core/Src/ConfigManager.cpp
+++ b/Source/Core/Core/Src/ConfigManager.cpp
@@ -409,6 +409,7 @@ void SConfig::LoadSettings()
 		ini.Get("Core", "RunCompareClient",	&m_LocalCoreStartupParameter.bRunCompareClient,	false);
 		ini.Get("Core", "MMU",				&m_LocalCoreStartupParameter.bMMU,				false);
 		ini.Get("Core", "TLBHack",			&m_LocalCoreStartupParameter.iTLBHack,			0);
+		ini.Get("Core", "BBDumpPort",		&m_LocalCoreStartupParameter.iBBDumpPort,		-1);
 		ini.Get("Core", "VBeam",			&m_LocalCoreStartupParameter.bVBeamSpeedHack,			false);
 		ini.Get("Core", "SyncGPU",			&m_LocalCoreStartupParameter.bSyncGPU,			false);
 		ini.Get("Core", "FastDiscSpeed",	&m_LocalCoreStartupParameter.bFastDiscSpeed,	false);
diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp
index e05816cb64..93b622b8de 100644
--- a/Source/Core/Core/Src/CoreParameter.cpp
+++ b/Source/Core/Core/Src/CoreParameter.cpp
@@ -36,7 +36,7 @@ SCoreStartupParameter::SCoreStartupParameter()
   bMergeBlocks(false), bEnableMemcardSaving(true),
   bDPL2Decoder(false), iLatency(14),
   bRunCompareServer(false), bRunCompareClient(false),
-  bMMU(false), bDCBZOFF(false), iTLBHack(0), bVBeamSpeedHack(false),
+  bMMU(false), bDCBZOFF(false), iTLBHack(0), iBBDumpPort(0), bVBeamSpeedHack(false),
   bSyncGPU(false), bFastDiscSpeed(false),
   SelectedLanguage(0), bWii(false),
   bConfirmStop(false), bHideCursor(false),
@@ -65,6 +65,7 @@ void SCoreStartupParameter::LoadDefaults()
 	bMMU = false;
 	bDCBZOFF = false;
 	iTLBHack = 0;
+	iBBDumpPort = -1;
 	bVBeamSpeedHack = false;
 	bSyncGPU = false;
 	bFastDiscSpeed = false;
diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h
index 679fb0d425..322fd105f3 100644
--- a/Source/Core/Core/Src/CoreParameter.h
+++ b/Source/Core/Core/Src/CoreParameter.h
@@ -122,6 +122,7 @@ struct SCoreStartupParameter
 	bool bMMU;
 	bool bDCBZOFF;
 	int iTLBHack;
+	int iBBDumpPort;
 	bool bVBeamSpeedHack;
 	bool bSyncGPU;
 	bool bFastDiscSpeed;
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
index 587d718abe..f518cebf7f 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
@@ -12,6 +12,8 @@
 #include "Timer.h"
 #include "Host.h"
 #include "ConfigManager.h"
+#include "SFML/Network.hpp"
+ 
 
 #include "WiimoteReal.h"
 
@@ -210,6 +212,12 @@ bool Wiimote::Read()
 
 	if (result > 0 && m_channel > 0)
 	{
+		if (Core::g_CoreStartupParameter.iBBDumpPort > 0 && index == WIIMOTE_BALANCE_BOARD)
+		{
+			static sf::SocketUDP Socket;
+			Socket.Send((char*)rpt.data(), rpt.size(), sf::IPAddress::LocalHost, Core::g_CoreStartupParameter.iBBDumpPort);
+		}
+
 		// Add it to queue
 		rpt.resize(result);
 		m_read_reports.Push(std::move(rpt));
@@ -234,6 +242,11 @@ bool Wiimote::Write()
 		
 		if (!is_speaker_data || m_last_audio_report.GetTimeDifference() > 5)
 		{
+			if (Core::g_CoreStartupParameter.iBBDumpPort > 0 && index == WIIMOTE_BALANCE_BOARD)
+			{
+				static sf::SocketUDP Socket;
+				Socket.Send((char*)rpt.data(), rpt.size(), sf::IPAddress::LocalHost, Core::g_CoreStartupParameter.iBBDumpPort);
+			}
 			IOWrite(rpt.data(), rpt.size());
 			
 			if (is_speaker_data)

From 691900aa90fd236a278373dd07619d0ad0a8cdb1 Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Wed, 3 Jul 2013 23:05:19 +1200
Subject: [PATCH 252/352] Disable encryption when checking Wiimote extension
 for scan. This is for when we are checking if it is a Balance Board.

---
 Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
index bfeddb7c8f..5d4d26108f 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
@@ -336,11 +336,26 @@ void WiimoteScanner::CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool
 		u8 buf[MAX_PAYLOAD] = {0};
 
 		u8 const req_status_report[] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_REQUEST_STATUS, 0};
+		// The new way to initialize the extension is by writing 0x55 to 0x(4)A400F0, then writing 0x00 to 0x(4)A400FB
+		// 52 16 04 A4 00 F0 01 55
+		// 52 16 04 A4 00 FB 01 00
+		u8 const disable_enc_pt1_report[MAX_PAYLOAD] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_WRITE_DATA, 0x04, 0xa4, 0x00, 0xf0, 0x01, 0x55};
+		u8 const disable_enc_pt2_report[MAX_PAYLOAD] = {WM_SET_REPORT | WM_BT_OUTPUT, WM_WRITE_DATA, 0x04, 0xa4, 0x00, 0xfb, 0x01, 0x00};
 
+		rc = CheckDeviceType_Write(dev_handle, 
+									disable_enc_pt1_report, 
+									sizeof(disable_enc_pt1_report), 
+									1);
+		rc = CheckDeviceType_Write(dev_handle, 
+									disable_enc_pt2_report, 
+									sizeof(disable_enc_pt2_report), 
+									1);
+		
 		rc = CheckDeviceType_Write(dev_handle, 
 									req_status_report, 
 									sizeof(req_status_report), 
 									1);
+
 		while (rc > 0 && --max_cycles > 0)
 		{
 			if ((rc = CheckDeviceType_Read(dev_handle, buf, 1)) <= 0)
@@ -397,9 +412,7 @@ void WiimoteScanner::CheckDeviceType(std::basic_string<TCHAR> &devicepath, bool
 						// DEBUG_LOG(WIIMOTE, 
 						//		  "CheckDeviceType: GOT EXT TYPE %llX", 
 						//		  ext_type);
-						is_bb = (ext_type == 0x020420A40000ULL) ||
-									((ext_type & 0xf00000000000ULL) && 
-										ext_type != 0xffffffffffffULL);
+						is_bb = (ext_type == 0x020420A40000ULL);
 					}
 					else
 					{

From a610cdac8b69c278fba87c4a75a783188db2932f Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Fri, 5 Jul 2013 06:29:01 -0500
Subject: [PATCH 253/352] [Android] Fix Android 4.0 gamepad input.

---
 Source/Android/.idea/workspace.xml            | 258 +++++++++---------
 .../dolphinemu/DolphinEmulator.java           |   4 +-
 .../dolphinemu/InputConfigActivity.java       |  20 +-
 3 files changed, 146 insertions(+), 136 deletions(-)

diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index 1a8e010c8e..140ae23672 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -54,6 +54,7 @@
     <disable_hints />
   </component>
   <component name="DebuggerManager">
+    <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
     <breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
       <breakpoint>
         <option name="NOTIFY_CAUGHT" value="true" />
@@ -90,7 +91,6 @@
         <option name="LOG_MESSAGE" value="" />
       </breakpoint>
     </breakpoint_any>
-    <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
     <breakpoint_rules />
     <ui_properties />
   </component>
@@ -103,7 +103,16 @@
       <file leaf-file-name="DolphinEmulator.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="177" column="80" selection-start="5496" selection-end="5496" vertical-scroll-proportion="0.0" vertical-offset="2304" max-vertical-offset="3315">
+            <state line="224" column="45" selection-start="6730" selection-end="6769" vertical-scroll-proportion="0.0" vertical-offset="2668" max-vertical-offset="3315">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="InputConfigActivity.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="24" column="39" selection-start="651" selection-end="651" vertical-scroll-proportion="0.15189873" vertical-offset="90" max-vertical-offset="2775">
               <folding />
             </state>
           </provider>
@@ -112,25 +121,16 @@
       <file leaf-file-name="AndroidManifest.xml" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="3" column="26" selection-start="174" selection-end="174" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="825">
+            <state line="3" column="26" selection-start="174" selection-end="174" vertical-scroll-proportion="0.0" vertical-offset="30" max-vertical-offset="825">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="GCPadNew.ini" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/assets/GCPadNew.ini">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="3" column="13" selection-start="76" selection-end="76" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="525">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="FolderBrowser.java" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="FolderBrowser.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="89" column="5" selection-start="2811" selection-end="2811" vertical-scroll-proportion="0.47769028" vertical-offset="958" max-vertical-offset="1365">
+            <state line="82" column="39" selection-start="2671" selection-end="2671" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1365">
               <folding />
             </state>
           </provider>
@@ -171,10 +171,10 @@
         <option value="$PROJECT_DIR$/assets/GCPadNew.ini" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeLibrary.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
         <option value="$PROJECT_DIR$/AndroidManifest.xml" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java" />
       </list>
     </option>
   </component>
@@ -182,8 +182,8 @@
     <treeState />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="24" />
-    <option name="width" value="1342" />
+    <option name="x" value="27" />
+    <option name="width" value="1339" />
     <option name="height" value="744" />
   </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
@@ -330,49 +330,38 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
+    <property name="GoToFile.includeJavaFiles" value="false" />
+    <property name="project.structure.last.edited" value="Artifacts" />
+    <property name="project.structure.proportion" value="0.0" />
+    <property name="options.splitter.main.proportions" value="0.3" />
+    <property name="MemberChooser.sorted" value="false" />
+    <property name="recentsLimit" value="5" />
     <property name="ExportedApkPath" value="$USER_HOME$/Desktop/DolphinEmu-0.9.apk" />
     <property name="options.lastSelected" value="project.propCompiler" />
-    <property name="AndroidRunProguardForReleaseBuild" value="false" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="978fa698" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="dynamic.classpath" value="false" />
-    <property name="options.splitter.main.proportions" value="0.3" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="options.searchVisible" value="true" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="options.splitter.details.proportions" value="0.2" />
-    <property name="last_opened_file_path" value="$USER_HOME$/NavigationDrawer/libs/android-support-v4.jar" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="FullScreen" value="false" />
     <property name="ExportedModule" value="Android" />
-    <property name="project.structure.proportion" value="0.0" />
-    <property name="recentsLimit" value="5" />
-    <property name="restartRequiresConfirmation" value="true" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
-    <property name="GoToClass.includeLibraries" value="false" />
+    <property name="last_opened_file_path" value="$USER_HOME$/NavigationDrawer/libs/android-support-v4.jar" />
     <property name="project.structure.side.proportion" value="0.2" />
-    <property name="MemberChooser.sorted" value="false" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="978fa698" />
+    <property name="MemberChooser.copyJavadoc" value="false" />
+    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+    <property name="AndroidRunProguardForReleaseBuild" value="false" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
+    <property name="restartRequiresConfirmation" value="true" />
+    <property name="FullScreen" value="false" />
+    <property name="MemberChooser.showClasses" value="true" />
+    <property name="GoToClass.includeLibraries" value="false" />
+    <property name="dynamic.classpath" value="false" />
+    <property name="options.searchVisible" value="true" />
+    <property name="options.splitter.details.proportions" value="0.2" />
   </component>
   <component name="RunManager" selected="Android Application.Dolphin Emulator">
-    <configuration default="true" type="Applet" factoryName="Applet">
+    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
       <module name="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
-      <module name="" />
-      <option name="ACTIVITY_CLASS" value="" />
-      <option name="MODE" value="default_activity" />
-      <option name="DEPLOY" value="true" />
+      <option name="TESTING_TYPE" value="0" />
+      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
+      <option name="METHOD_NAME" value="" />
+      <option name="CLASS_NAME" value="" />
+      <option name="PACKAGE_NAME" value="" />
       <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
       <option name="PREFERRED_AVD" value="" />
       <option name="USE_COMMAND_LINE" value="true" />
@@ -392,6 +381,33 @@
       <option name="PORT" value="5005" />
       <method />
     </configuration>
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <module name="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <method />
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+      <method />
+    </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
       <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -412,13 +428,11 @@
       <patterns />
       <method />
     </configuration>
-    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
+    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="" />
-      <option name="TESTING_TYPE" value="0" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="PACKAGE_NAME" value="" />
+      <option name="ACTIVITY_CLASS" value="" />
+      <option name="MODE" value="default_activity" />
+      <option name="DEPLOY" value="true" />
       <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
       <option name="PREFERRED_AVD" value="" />
       <option name="USE_COMMAND_LINE" value="true" />
@@ -430,20 +444,6 @@
       <option name="CLEAR_LOGCAT" value="false" />
       <method />
     </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
     <configuration default="false" name="Dolphin Emulator" type="AndroidRunConfigurationType" factoryName="Android Application">
       <module name="Android" />
       <option name="ACTIVITY_CLASS" value="" />
@@ -545,59 +545,59 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="24" y="0" width="1342" height="744" extended-state="0" />
+    <frame x="27" y="0" width="1339" height="744" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21406491" sideWeight="0.70469797" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.295302" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2179289" sideWeight="0.29026845" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6912752" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29865772" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2179289" sideWeight="0.29026845" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.21378776" sideWeight="0.70637584" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29362416" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2179289" sideWeight="0.7013423" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29865772" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2179289" sideWeight="0.29026845" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6912752" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29865772" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2179289" sideWeight="0.29026845" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29865772" sideWeight="0.5" order="11" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21378776" sideWeight="0.70637584" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29362416" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
   <component name="VcsContentAnnotationSettings">
@@ -691,9 +691,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/project.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="13" column="17" selection-start="562" selection-end="562" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="300">
-          <folding />
-        </state>
+        <state line="13" column="17" selection-start="562" selection-end="562" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="300" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/AboutActivity.java">
@@ -726,9 +724,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/assets/GCPadNew.ini">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="3" column="13" selection-start="76" selection-end="76" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="525">
-          <folding />
-        </state>
+        <state line="3" column="13" selection-start="76" selection-end="76" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="525" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java">
@@ -748,20 +744,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="142" column="53" selection-start="4886" selection-end="4886" vertical-scroll-proportion="0.428934" vertical-offset="1766" max-vertical-offset="2580">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="177" column="80" selection-start="5496" selection-end="5496" vertical-scroll-proportion="0.0" vertical-offset="2304" max-vertical-offset="3315">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state line="3" column="26" selection-start="174" selection-end="174" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="825">
@@ -771,7 +753,21 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="89" column="5" selection-start="2811" selection-end="2811" vertical-scroll-proportion="0.47769028" vertical-offset="958" max-vertical-offset="1365">
+        <state line="82" column="39" selection-start="2671" selection-end="2671" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1365">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="224" column="45" selection-start="6730" selection-end="6769" vertical-scroll-proportion="0.0" vertical-offset="2668" max-vertical-offset="3315">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="24" column="39" selection-start="651" selection-end="651" vertical-scroll-proportion="0.15189873" vertical-offset="90" max-vertical-offset="2775">
           <folding />
         </state>
       </provider>
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index 1afeff417e..a34e803a45 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -204,7 +204,7 @@ public class DolphinEmulator<MainActivity> extends Activity
 					return false;
 			}
 			InputDevice input = event.getDevice();
-			NativeLibrary.onGamePadEvent(input.getDescriptor(), event.getKeyCode(), action);
+			NativeLibrary.onGamePadEvent(InputConfigActivity.getInputDesc(input), event.getKeyCode(), action);
 			return true;
 		}
 		return false;
@@ -222,7 +222,7 @@ public class DolphinEmulator<MainActivity> extends Activity
 		{
 			InputDevice.MotionRange range;
 			range = motions.get(a);
-			NativeLibrary.onGamePadMoveEvent(input.getDescriptor(), range.getAxis(), event.getAxisValue(range.getAxis()));
+			NativeLibrary.onGamePadMoveEvent(InputConfigActivity.getInputDesc(input), range.getAxis(), event.getAxisValue(range.getAxis()));
 		}
 
 		return true;
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java
index 6646865f03..607af71766 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java
@@ -3,6 +3,7 @@ package org.dolphinemu.dolphinemu;
 import android.app.Activity;
 import android.app.ListActivity;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.InputDevice;
@@ -26,6 +27,19 @@ public class InputConfigActivity extends ListActivity {
 	boolean Configuring = false;
 	boolean firstEvent = true;
 
+	static public String getInputDesc(InputDevice input)
+	{
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
+			return input.getDescriptor();
+		else
+		{
+			List<InputDevice.MotionRange> motions = input.getMotionRanges();
+			String fakeid = "";
+			for (InputDevice.MotionRange range : motions)
+				fakeid += range.getAxis();
+			return fakeid;
+		}
+	}
 	@Override
 	public void onCreate(Bundle savedInstanceState)
 	{
@@ -124,12 +138,12 @@ public class InputConfigActivity extends ListActivity {
 					range = motions.get(a);
 					if (m_values.get(a) > (event.getAxisValue(range.getAxis()) + 0.5f))
 					{
-						AssignBind("Device '" + input.getDescriptor() + "'-Axis " + range.getAxis() + "-");
+						AssignBind("Device '" + InputConfigActivity.getInputDesc(input) + "'-Axis " + range.getAxis() + "-");
 						Configuring = false;
 					}
 					else if (m_values.get(a) < (event.getAxisValue(range.getAxis()) - 0.5f))
 					{
-						AssignBind("Device '" + input.getDescriptor() + "'-Axis " + range.getAxis() + "+");
+						AssignBind("Device '" + InputConfigActivity.getInputDesc(input) + "'-Axis " + range.getAxis() + "+");
 						Configuring = false;
 					}
 				}
@@ -148,7 +162,7 @@ public class InputConfigActivity extends ListActivity {
 				if (Configuring)
 				{
 					InputDevice input = event.getDevice();
-					AssignBind("Device '" + input.getDescriptor() + "'-Button " + event.getKeyCode());
+					AssignBind("Device '" + InputConfigActivity.getInputDesc(input) + "'-Button " + event.getKeyCode());
 					Configuring = false;
 					return true;
 				}

From c19858ca87141a13924d0c84031ecaa7d4478aa5 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Fri, 5 Jul 2013 18:49:59 -0500
Subject: [PATCH 254/352] [Android] Instead of wiping shared preferences, set
 the default values so the settings are actually selected when going in to the
 settings menu.

---
 .../src/org/dolphinemu/dolphinemu/DolphinEmulator.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index a34e803a45..7150af7e11 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -118,7 +118,9 @@ public class DolphinEmulator<MainActivity> extends Activity
 
 				SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 				SharedPreferences.Editor editor = prefs.edit();
-				editor.clear();
+				editor.putString("cpupref", NativeLibrary.GetConfig("Dolphin.ini", "Core", "CPUCore", "3"));
+				editor.putBoolean("dualcorepref", NativeLibrary.GetConfig("Dolphin.ini", "Core", "CPUThread", "False").equals("True") ? true : false);
+				editor.putString("gpupref", NativeLibrary.GetConfig("Dolphin.ini", "Core", "GFXBackend ", "Software Renderer"));
 				editor.commit();
 			}
 		}

From cdfd7905a05693b6b37b3dd2c747c220c8b8b8bf Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Fri, 5 Jul 2013 19:18:33 -0500
Subject: [PATCH 255/352] [Android] Copy over DSP roms and font assets on build
 and first runs.

---
 .../dolphinemu/DolphinEmulator.java           | 28 +++++++++++++++----
 Source/Core/DolphinWX/CMakeLists.txt          |  3 ++
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index 7150af7e11..af2f2df326 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -83,18 +83,22 @@ public class DolphinEmulator<MainActivity> extends Activity
 			startActivityForResult(ListIntent, 1);
 			
 			// Make the assets directory
-			String strDir = Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu";
-			File directory = new File(strDir);
+			String BaseDir = Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu";
+			File directory = new File(BaseDir);
 			directory.mkdirs();
 			
-			strDir += File.separator+"Config";
-			directory = new File(strDir);
+			String ConfigDir = BaseDir + File.separator + "Config";
+			directory = new File(ConfigDir);
 			directory.mkdirs();
-			
+
+			String GCDir = BaseDir + File.separator + "GC";
+			directory = new File(GCDir);
+			directory.mkdirs();
+
 			// Copy assets if needed
 			java.io.File file = new java.io.File(
 					Environment.getExternalStorageDirectory()+File.separator+
-							"dolphin-emu" + File.separator + "Config" + File.separator + "Dolphin.ini");
+							"dolphin-emu" + File.separator + "GC" + File.separator + "dsp_coef.bin");
 			if(!file.exists())
 			{
 				CopyAsset("ButtonA.png", 
@@ -115,6 +119,18 @@ public class DolphinEmulator<MainActivity> extends Activity
 				CopyAsset("Dolphin.ini",
 						Environment.getExternalStorageDirectory()+File.separator+
 						"dolphin-emu" + File.separator + "Config" + File.separator + "Dolphin.ini");
+				CopyAsset("dsp_coef.bin",
+						Environment.getExternalStorageDirectory()+File.separator+
+						"dolphin-emu" + File.separator + "GC" + File.separator + "dsp_coef.bin");
+				CopyAsset("dsp_rom.bin",
+						Environment.getExternalStorageDirectory()+File.separator+
+						"dolphin-emu" + File.separator + "GC" + File.separator + "dsp_rom.bin");
+				CopyAsset("font_ansi.bin",
+						Environment.getExternalStorageDirectory()+File.separator+
+						"dolphin-emu" + File.separator + "GC" + File.separator + "font_ansi.bin");
+				CopyAsset("font_sjis.bin",
+						Environment.getExternalStorageDirectory()+File.separator+
+						"dolphin-emu" + File.separator + "GC" + File.separator + "font_sjis.bin");
 
 				SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 				SharedPreferences.Editor editor = prefs.edit();
diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
index 6207ac70d3..9e40bbd90b 100644
--- a/Source/Core/DolphinWX/CMakeLists.txt
+++ b/Source/Core/DolphinWX/CMakeLists.txt
@@ -179,6 +179,9 @@ if(ANDROID)
 	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
 		COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/libs/armeabi-v7a/lib${DOLPHIN_EXE}.so ${CMAKE_SOURCE_DIR}/Source/Android/libs/armeabi-v7a/
 	)
+	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
+		COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/GC/* ${CMAKE_SOURCE_DIR}/Source/Android/assets/
+	)
 else()
 	add_executable(${DOLPHIN_EXE} ${SRCS})
 	target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS})

From 7d6b36bf73c32b830a1b9022122a75d89f7686e0 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Fri, 5 Jul 2013 19:56:15 -0500
Subject: [PATCH 256/352] Fix most ARM warnings

---
 Source/Core/AudioCommon/Src/OpenSLESStream.cpp |  3 ++-
 Source/Core/Common/Src/ArmEmitter.cpp          |  2 +-
 Source/Core/Core/Src/GeckoCode.cpp             |  2 +-
 Source/Core/Core/Src/HW/Memmap.cpp             | 10 +++++-----
 Source/Core/VideoCommon/Src/DriverDetails.cpp  |  4 ++--
 Source/Core/VideoCommon/Src/DriverDetails.h    |  2 +-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Source/Core/AudioCommon/Src/OpenSLESStream.cpp b/Source/Core/AudioCommon/Src/OpenSLESStream.cpp
index 0035b4adeb..26391d5d72 100644
--- a/Source/Core/AudioCommon/Src/OpenSLESStream.cpp
+++ b/Source/Core/AudioCommon/Src/OpenSLESStream.cpp
@@ -41,7 +41,8 @@ static void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void *context) {
 	// Comment from sample code:
 	// the most likely other result is SL_RESULT_BUFFER_INSUFFICIENT,
 	// which for this code example would indicate a programming error
-	assert(SL_RESULT_SUCCESS == result);
+	_assert_msg_(AUDIO, SL_RESULT_SUCCESS == result, "Couldn't enqueue audio stream.");
+
 
 	curBuffer ^= 1;	// Switch buffer
 	// Render to the fresh buffer
diff --git a/Source/Core/Common/Src/ArmEmitter.cpp b/Source/Core/Common/Src/ArmEmitter.cpp
index a8d0fcc92a..eff366312c 100644
--- a/Source/Core/Common/Src/ArmEmitter.cpp
+++ b/Source/Core/Common/Src/ArmEmitter.cpp
@@ -86,7 +86,7 @@ bool TryMakeOperand2_AllowNegation(s32 imm, Operand2 &op2, bool *negated)
 Operand2 AssumeMakeOperand2(u32 imm) {
 	Operand2 op2;
 	bool result = TryMakeOperand2(imm, op2);
-	_dbg_assert_msg_(JIT, result, "Could not make assumed Operand2.");
+	_assert_msg_(DYNA_REC, result, "Could not make assumed Operand2.");
 	return op2;
 }
 
diff --git a/Source/Core/Core/Src/GeckoCode.cpp b/Source/Core/Core/Src/GeckoCode.cpp
index c7127ef018..252e758746 100644
--- a/Source/Core/Core/Src/GeckoCode.cpp
+++ b/Source/Core/Core/Src/GeckoCode.cpp
@@ -83,7 +83,7 @@ bool GeckoCode::Compare(GeckoCode compare) const
 	if (codes.size() != compare.codes.size())
 		return false;
 
-	int exist = 0;
+	unsigned int exist = 0;
 	std::vector<GeckoCode::Code>::const_iterator
 		codes_iter = codes.begin(),
 		codes_end = codes.end();
diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp
index 170b67de5b..96f2945391 100644
--- a/Source/Core/Core/Src/HW/Memmap.cpp
+++ b/Source/Core/Core/Src/HW/Memmap.cpp
@@ -113,18 +113,18 @@ void HW_Default_Write(const T _Data, const u32 _Address){	ERROR_LOG(MASTER_LOG,
 template <class T>
 void HW_Default_Read(T _Data, const u32 _Address){	ERROR_LOG(MASTER_LOG, "Illegal HW Read%lu %08x", (unsigned long)sizeof(T)*8, _Address); _dbg_assert_(MEMMAP, 0);}
 
-#define PAGE_SHIFT 10
-#define PAGE_SIZE (1 << PAGE_SHIFT)
-#define PAGE_MASK (PAGE_SHIFT - 1)
+#define HW_PAGE_SHIFT 10
+#define HW_PAGE_SIZE (1 << HW_PAGE_SHIFT)
+#define HW_PAGE_MASK (HW_PAGE_SHIFT - 1)
 
 template <class T, u8 *P> void HW_Read_Memory(T &_Data, const u32 _Address)
 {
-	_Data = *(T *)&P[_Address & PAGE_MASK];
+	_Data = *(T *)&P[_Address & HW_PAGE_MASK];
 }
 
 template <class T, u8 *P> void HW_Write_Memory(T _Data, const u32 _Address)
 {
-	*(T *)&P[_Address & PAGE_MASK] = _Data;
+	*(T *)&P[_Address & HW_PAGE_MASK] = _Data;
 }
 
 // Create shortcuts to the hardware devices' read and write functions.
diff --git a/Source/Core/VideoCommon/Src/DriverDetails.cpp b/Source/Core/VideoCommon/Src/DriverDetails.cpp
index 41f22be55c..0a6510eb90 100644
--- a/Source/Core/VideoCommon/Src/DriverDetails.cpp
+++ b/Source/Core/VideoCommon/Src/DriverDetails.cpp
@@ -40,7 +40,7 @@ namespace DriverDetails
 		switch(m_vendor)
 		{
 			case VENDOR_QUALCOMM:
-				for (int a = 0; a < (sizeof(m_qualcommbugs) / sizeof(BugInfo)); ++a)
+				for (unsigned int a = 0; a < (sizeof(m_qualcommbugs) / sizeof(BugInfo)); ++a)
 					m_bugs[std::make_pair(m_vendor, m_qualcommbugs[a].m_bug)] = m_qualcommbugs[a];
 			break;
 			default:
@@ -61,7 +61,7 @@ namespace DriverDetails
 					it->second.m_hasbug = true;
 	}
 
-	const bool HasBug(Bug bug)
+	bool HasBug(Bug bug)
 	{
 		auto it = m_bugs.find(std::make_pair(m_vendor, bug));
 		if (it == m_bugs.end())
diff --git a/Source/Core/VideoCommon/Src/DriverDetails.h b/Source/Core/VideoCommon/Src/DriverDetails.h
index bf831e29b9..f2f3480f70 100644
--- a/Source/Core/VideoCommon/Src/DriverDetails.h
+++ b/Source/Core/VideoCommon/Src/DriverDetails.h
@@ -68,5 +68,5 @@ namespace DriverDetails
 	void Init(Vendor vendor, const u32 devfamily, const double version);
 	
 	// Once Vendor and driver version is set, this will return if it has the applicable bug passed to it.
-	const bool HasBug(Bug bug);
+	bool HasBug(Bug bug);
 }

From d58415085109736e43082f06006cf817a0953b91 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Fri, 5 Jul 2013 20:56:17 -0500
Subject: [PATCH 257/352] Remove a warning from ARM includes already defining
 PAGE_SIZE and a warning in the FPR cache.

---
 Source/Core/Core/Src/HW/MemmapFunctions.cpp   | 24 +++++++++----------
 .../Core/Src/PowerPC/JitArm32/JitFPRCache.h   |  1 -
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Source/Core/Core/Src/HW/MemmapFunctions.cpp b/Source/Core/Core/Src/HW/MemmapFunctions.cpp
index 0e899079c5..e7422490c9 100644
--- a/Source/Core/Core/Src/HW/MemmapFunctions.cpp
+++ b/Source/Core/Core/Src/HW/MemmapFunctions.cpp
@@ -653,10 +653,10 @@ void SDRUpdated()
 #define TLB_WAYS 2
 #define NUM_TLBS 2
 
-#define PAGE_SIZE 4096
-#define PAGE_INDEX_SHIFT 12
-#define PAGE_INDEX_MASK 0x3f
-#define PAGE_TAG_SHIFT 18
+#define HW_PAGE_SIZE 4096
+#define HW_PAGE_INDEX_SHIFT 12
+#define HW_PAGE_INDEX_MASK 0x3f
+#define HW_PAGE_TAG_SHIFT 18
 
 #define TLB_FLAG_MOST_RECENT 0x01
 #define TLB_FLAG_INVALID 0x02
@@ -676,7 +676,7 @@ static tlb_entry tlb[NUM_TLBS][TLB_SIZE/TLB_WAYS][TLB_WAYS];
 u32 LookupTLBPageAddress(const XCheckTLBFlag _Flag, const u32 vpa, u32 *paddr)
 {
 #ifdef FAST_TLB_CACHE
-	tlb_entry *tlbe = tlb[_Flag == FLAG_OPCODE][(vpa>>PAGE_INDEX_SHIFT)&PAGE_INDEX_MASK];
+	tlb_entry *tlbe = tlb[_Flag == FLAG_OPCODE][(vpa>>HW_PAGE_INDEX_SHIFT)&HW_PAGE_INDEX_MASK];
 	if(tlbe[0].tag == (vpa & ~0xfff) && !(tlbe[0].flags & TLB_FLAG_INVALID))
 	{
 		tlbe[0].flags |= TLB_FLAG_MOST_RECENT;
@@ -725,19 +725,19 @@ u32 LookupTLBPageAddress(const XCheckTLBFlag _Flag, const u32 vpa, u32 *paddr)
 void UpdateTLBEntry(const XCheckTLBFlag _Flag, UPTE2 PTE2, const u32 vpa)
 {
 #ifdef FAST_TLB_CACHE
-	tlb_entry *tlbe = tlb[_Flag == FLAG_OPCODE][(vpa>>PAGE_INDEX_SHIFT)&PAGE_INDEX_MASK];
+	tlb_entry *tlbe = tlb[_Flag == FLAG_OPCODE][(vpa>>HW_PAGE_INDEX_SHIFT)&HW_PAGE_INDEX_MASK];
 	if((tlbe[0].flags & TLB_FLAG_MOST_RECENT) == 0)
 	{
 		tlbe[0].flags = TLB_FLAG_MOST_RECENT;
 		tlbe[1].flags &= ~TLB_FLAG_MOST_RECENT;
-		tlbe[0].paddr = PTE2.RPN << PAGE_INDEX_SHIFT;
+		tlbe[0].paddr = PTE2.RPN << HW_PAGE_INDEX_SHIFT;
 		tlbe[0].tag = vpa & ~0xfff;
 	}
 	else
 	{
 		tlbe[1].flags = TLB_FLAG_MOST_RECENT;
 		tlbe[0].flags &= ~TLB_FLAG_MOST_RECENT;
-		tlbe[1].paddr = PTE2.RPN << PAGE_INDEX_SHIFT;
+		tlbe[1].paddr = PTE2.RPN << HW_PAGE_INDEX_SHIFT;
 		tlbe[1].tag = vpa & ~0xfff;
 	}
 #else
@@ -746,7 +746,7 @@ void UpdateTLBEntry(const XCheckTLBFlag _Flag, UPTE2 PTE2, const u32 vpa)
 		// ITLB cache
 		PowerPC::ppcState.itlb_last++;
 		PowerPC::ppcState.itlb_last &= 127;
-		PowerPC::ppcState.itlb_pa[PowerPC::ppcState.itlb_last] = PTE2.RPN << PAGE_INDEX_SHIFT;
+		PowerPC::ppcState.itlb_pa[PowerPC::ppcState.itlb_last] = PTE2.RPN << HW_PAGE_INDEX_SHIFT;
 		PowerPC::ppcState.itlb_va[PowerPC::ppcState.itlb_last] = vpa & ~0xfff;	
 	}
 	else
@@ -754,7 +754,7 @@ void UpdateTLBEntry(const XCheckTLBFlag _Flag, UPTE2 PTE2, const u32 vpa)
 		// DTLB cache
 		PowerPC::ppcState.dtlb_last++;
 		PowerPC::ppcState.dtlb_last &= 127;
-		PowerPC::ppcState.dtlb_pa[PowerPC::ppcState.dtlb_last] = PTE2.RPN << PAGE_INDEX_SHIFT;
+		PowerPC::ppcState.dtlb_pa[PowerPC::ppcState.dtlb_last] = PTE2.RPN << HW_PAGE_INDEX_SHIFT;
 		PowerPC::ppcState.dtlb_va[PowerPC::ppcState.dtlb_last] = vpa & ~0xfff;	
 	}
 #endif
@@ -763,7 +763,7 @@ void UpdateTLBEntry(const XCheckTLBFlag _Flag, UPTE2 PTE2, const u32 vpa)
 void InvalidateTLBEntry(u32 vpa)
 {
 #ifdef FAST_TLB_CACHE
-	tlb_entry *tlbe = tlb[0][(vpa>>PAGE_INDEX_SHIFT)&PAGE_INDEX_MASK];
+	tlb_entry *tlbe = tlb[0][(vpa>>HW_PAGE_INDEX_SHIFT)&HW_PAGE_INDEX_MASK];
 	if(tlbe[0].tag == (vpa & ~0xfff))
 	{
 		tlbe[0].flags |= TLB_FLAG_INVALID;
@@ -772,7 +772,7 @@ void InvalidateTLBEntry(u32 vpa)
 	{
 		tlbe[1].flags |= TLB_FLAG_INVALID;
 	}
-	tlb_entry *tlbe_i = tlb[1][(vpa>>PAGE_INDEX_SHIFT)&PAGE_INDEX_MASK];
+	tlb_entry *tlbe_i = tlb[1][(vpa>>HW_PAGE_INDEX_SHIFT)&HW_PAGE_INDEX_MASK];
 	if(tlbe_i[0].tag == (vpa & ~0xfff))
 	{
 		tlbe_i[0].flags |= TLB_FLAG_INVALID;
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.h b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.h
index 6b4f056409..b8c17f470f 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.h
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.h
@@ -29,7 +29,6 @@ using namespace ArmGen;
 class ArmFPRCache
 {
 private:
-	PPCCachedReg regs[32];
 	JRCPPC ArmCRegs[ARMFPUREGS];
 	JRCReg ArmRegs[ARMFPUREGS]; 
 	

From 7493f19cdafa631bcdddbdbdb3d9e95515a96e2a Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 5 Jul 2013 22:12:52 -0400
Subject: [PATCH 258/352] Squash warnings from wx

See: http://trac.wxwidgets.org/ticket/15137
---
 Externals/wxWidgets3/include/wx/checkeddelete.h |  4 ++--
 Externals/wxWidgets3/include/wx/defs.h          | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Externals/wxWidgets3/include/wx/checkeddelete.h b/Externals/wxWidgets3/include/wx/checkeddelete.h
index f7d00e36dd..3dad109fad 100644
--- a/Externals/wxWidgets3/include/wx/checkeddelete.h
+++ b/Externals/wxWidgets3/include/wx/checkeddelete.h
@@ -38,14 +38,14 @@
 #define wxCHECKED_DELETE(ptr)                                                 \
     wxPRE_NO_WARNING_SCOPE(scope_var1)                                        \
     {                                                                         \
-        typedef char complete[sizeof(*ptr)];                                  \
+        typedef char complete[sizeof(*ptr)] WX_ATTRIBUTE_UNUSED;              \
         delete ptr;                                                           \
     } wxPOST_NO_WARNING_SCOPE(scope_var1)
 
 #define wxCHECKED_DELETE_ARRAY(ptr)                                           \
     wxPRE_NO_WARNING_SCOPE(scope_var2)                                        \
     {                                                                         \
-        typedef char complete[sizeof(*ptr)];                                  \
+        typedef char complete[sizeof(*ptr)] WX_ATTRIBUTE_UNUSED;              \
         delete [] ptr;                                                        \
     } wxPOST_NO_WARNING_SCOPE(scope_var2)
 
diff --git a/Externals/wxWidgets3/include/wx/defs.h b/Externals/wxWidgets3/include/wx/defs.h
index bb6afaa107..0c2a8e024c 100644
--- a/Externals/wxWidgets3/include/wx/defs.h
+++ b/Externals/wxWidgets3/include/wx/defs.h
@@ -577,6 +577,14 @@ typedef short int WXTYPE;
 #include <stddef.h>
 #endif
 
+
+#if defined(__GNUC__)
+    #define WX_ATTRIBUTE_UNUSED __attribute__ ((unused))
+#else
+    #define WX_ATTRIBUTE_UNUSED
+#endif
+
+
 #ifdef __cplusplus
 
 // everybody gets the assert and other debug macros
@@ -586,7 +594,7 @@ typedef short int WXTYPE;
     template <typename T>
     inline void wxDELETE(T*& ptr)
     {
-        typedef char TypeIsCompleteCheck[sizeof(T)];
+        typedef char TypeIsCompleteCheck[sizeof(T)] WX_ATTRIBUTE_UNUSED;
 
         if ( ptr != NULL )
         {
@@ -599,7 +607,7 @@ typedef short int WXTYPE;
     template <typename T>
     inline void wxDELETEA(T*& ptr)
     {
-        typedef char TypeIsCompleteCheck[sizeof(T)];
+        typedef char TypeIsCompleteCheck[sizeof(T)] WX_ATTRIBUTE_UNUSED;
 
         if ( ptr != NULL )
         {

From b2e7248b58408d1750c8cae0f2b3581218f68e5a Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 5 Jul 2013 22:39:18 -0400
Subject: [PATCH 259/352] LogWindow: Fix a bad initializer

Since these defaults aren't used, don't bother specifying them.
---
 Source/Core/DolphinWX/Src/LogWindow.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/DolphinWX/Src/LogWindow.h b/Source/Core/DolphinWX/Src/LogWindow.h
index 93e965dbc5..451c90cba8 100644
--- a/Source/Core/DolphinWX/Src/LogWindow.h
+++ b/Source/Core/DolphinWX/Src/LogWindow.h
@@ -64,7 +64,7 @@ private:
 
 	DECLARE_EVENT_TABLE()
 
-	wxTextCtrl * CreateTextCtrl(wxPanel* parent, wxWindowID id = wxID_ANY, long Style = NULL);
+	wxTextCtrl * CreateTextCtrl(wxPanel* parent, wxWindowID id, long Style);
 	void CreateGUIControls();
 	void PopulateBottom();
 	void UnPopulateBottom();

From 7b408743092280afb79aac8a4f6d1f43b96f6bc3 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sat, 6 Jul 2013 12:53:38 +0200
Subject: [PATCH 260/352] Implement AX command 0x11 (SET_OPPOSITE_LR)

---
 .../Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp     | 18 +++++++++++++++++-
 .../Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h  |  3 ++-
 .../Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h |  2 ++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp
index e28d5a32ae..411624a714 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp
@@ -239,7 +239,11 @@ void CUCode_AX::HandleCommandList()
 				MixAUXBLR(HILO_TO_32(addr), HILO_TO_32(addr2));
 				break;
 
-			case CMD_UNK_11: curr_idx += 2; break;
+			case CMD_SET_OPPOSITE_LR:
+				addr_hi = m_cmdlist[curr_idx++];
+				addr_lo = m_cmdlist[curr_idx++];
+				SetOppositeLR(HILO_TO_32(addr));
+				break;
 
 			case CMD_UNK_12:
 			{
@@ -589,6 +593,18 @@ void CUCode_AX::MixAUXBLR(u32 ul_addr, u32 dl_addr)
 	}
 }
 
+void CUCode_AX::SetOppositeLR(u32 src_addr)
+{
+	int* ptr = (int*)HLEMemory_Get_Pointer(src_addr);
+	for (u32 i = 0; i < 5 * 32; ++i)
+	{
+		int inp = Common::swap32(*ptr++);
+		m_samples_left[i] = -inp;
+		m_samples_right[i] = inp;
+		m_samples_surround[i] = 0;
+	}
+}
+
 void CUCode_AX::SendAUXAndMix(u32 main_auxa_up, u32 auxb_s_up, u32 main_l_dl,
                               u32 main_r_dl, u32 auxb_l_dl, u32 auxb_r_dl)
 {
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h
index ae2ada78fd..5af2daed12 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h
@@ -147,6 +147,7 @@ protected:
 	void SetMainLR(u32 src_addr);
 	void OutputSamples(u32 out_addr, u32 surround_addr);
 	void MixAUXBLR(u32 ul_addr, u32 dl_addr);
+	void SetOppositeLR(u32 src_addr);
 	void SendAUXAndMix(u32 main_auxa_up, u32 auxb_s_up, u32 main_l_dl,
 	                   u32 main_r_dl, u32 auxb_l_dl, u32 auxb_r_dl);
 
@@ -173,7 +174,7 @@ private:
 		CMD_OUTPUT = 0x0E,
 		CMD_END = 0x0F,
 		CMD_MIX_AUXB_LR = 0x10,
-		CMD_UNK_11 = 0x11,
+		CMD_SET_OPPOSITE_LR = 0x11,
 		CMD_UNK_12 = 0x12,
 		CMD_SEND_AUX_AND_MIX = 0x13,
 	};
diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h
index 56d736c399..a353f0d02b 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h
@@ -458,7 +458,9 @@ void ProcessVoice(PB_TYPE& pb, const AXBuffers& buffers, u16 count, AXMixControl
 
 	// Optionally, execute a low pass filter
 	if (pb.lpf.enabled)
+	{
 		pb.lpf.yn1 = LowPassFilter(samples, count, pb.lpf.yn1, pb.lpf.a0, pb.lpf.b0);
+	}
 
 	// Mix LRS, AUXA and AUXB depending on mixer_control
 	// TODO: Handle DPL2 on AUXB.

From 9b128e9347ce5f7a46c313f5f76b3a32dfbe9001 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sat, 6 Jul 2013 14:33:35 +0200
Subject: [PATCH 261/352] Disable LPF filtering in new-ax-hle

The current implementation is broken and this is a non critical feature.

Fixes new-ax-hle regression in Super Monkey Ball.
---
 Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h
index a353f0d02b..ed65a89fe5 100644
--- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h
+++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX_Voice.h
@@ -457,7 +457,9 @@ void ProcessVoice(PB_TYPE& pb, const AXBuffers& buffers, u16 count, AXMixControl
 	}
 
 	// Optionally, execute a low pass filter
-	if (pb.lpf.enabled)
+	// TODO: LPF code is currently broken, causing Super Monkey Ball sound
+	// corruption. Disabled until someone figures out what is wrong with it.
+	if (0 && pb.lpf.enabled)
 	{
 		pb.lpf.yn1 = LowPassFilter(samples, count, pb.lpf.yn1, pb.lpf.a0, pb.lpf.b0);
 	}

From 22c80e1dc252b3e31f5f876bbae753b62f150c8a Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sun, 7 Jul 2013 02:40:59 +0200
Subject: [PATCH 262/352] Fix ICC profiles in some of our PNGs (ic_drawer,
 Dolphin icon).

Also keep a PNG version of bin2c'd resources in order to make these kind of
changes easier in the future.

Fixes recent versions of libpng complaining loudly about our images.
---
 Source/Android/res/drawable/ic_drawer.png     | Bin 2842 -> 178 bytes
 Source/Core/DolphinWX/resources/Dolphin.c     | 716 +++++-------------
 Source/Core/DolphinWX/resources/Dolphin.png   | Bin 0 -> 2438 bytes
 .../Core/DolphinWX/resources/dolphin_logo.png | Bin 0 -> 34383 bytes
 .../resources/toolbar_add_breakpoint.png      | Bin 0 -> 3647 bytes
 .../resources/toolbar_add_memorycheck.png     | Bin 0 -> 2842 bytes
 .../resources/toolbar_debugger_delete.png     | Bin 0 -> 2904 bytes
 7 files changed, 204 insertions(+), 512 deletions(-)
 create mode 100644 Source/Core/DolphinWX/resources/Dolphin.png
 create mode 100644 Source/Core/DolphinWX/resources/dolphin_logo.png
 create mode 100644 Source/Core/DolphinWX/resources/toolbar_add_breakpoint.png
 create mode 100644 Source/Core/DolphinWX/resources/toolbar_add_memorycheck.png
 create mode 100644 Source/Core/DolphinWX/resources/toolbar_debugger_delete.png

diff --git a/Source/Android/res/drawable/ic_drawer.png b/Source/Android/res/drawable/ic_drawer.png
index ff7b1def9ac3f86488a855f502b965ac75b633fb..f62119bb3b7cf3dbbcffda2e1614e5868b345c35 100644
GIT binary patch
delta 79
zcmbOwwuy0q3O`$tx4R3&e-K=-clqRrisCX1>?NMQuIzW&*%_qd3zluW#=yW}@9E+g
g;&D8A@(C^r5i3zqL-qEIML=-|Pgg&ebxsLQ01V$4!~g&Q

delta 2782
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

diff --git a/Source/Core/DolphinWX/resources/Dolphin.c b/Source/Core/DolphinWX/resources/Dolphin.c
index 435f5a0670..e3392da769 100644
--- a/Source/Core/DolphinWX/resources/Dolphin.c
+++ b/Source/Core/DolphinWX/resources/Dolphin.c
@@ -1,514 +1,206 @@
 static const unsigned char dolphin_ico32x32[] = {
-0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 
-0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x20, 
-0x00, 0x00, 0x00, 0x20, 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 
-0x7A, 0x7A, 0xF4, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 
-0x73, 0x00, 0x00, 0x0B, 0x13, 0x00, 0x00, 0x0B, 0x13, 0x01, 
-0x00, 0x9A, 0x9C, 0x18, 0x00, 0x00, 0x0A, 0x4F, 0x69, 0x43, 
-0x43, 0x50, 0x50, 0x68, 0x6F, 0x74, 0x6F, 0x73, 0x68, 0x6F, 
-0x70, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70, 0x72, 0x6F, 0x66, 
-0x69, 0x6C, 0x65, 0x00, 0x00, 0x78, 0xDA, 0x9D, 0x53, 0x67, 
-0x54, 0x53, 0xE9, 0x16, 0x3D, 0xF7, 0xDE, 0xF4, 0x42, 0x4B, 
-0x88, 0x80, 0x94, 0x4B, 0x6F, 0x52, 0x15, 0x08, 0x20, 0x52, 
-0x42, 0x8B, 0x80, 0x14, 0x91, 0x26, 0x2A, 0x21, 0x09, 0x10, 
-0x4A, 0x88, 0x21, 0xA1, 0xD9, 0x15, 0x51, 0xC1, 0x11, 0x45, 
-0x45, 0x04, 0x1B, 0xC8, 0xA0, 0x88, 0x03, 0x8E, 0x8E, 0x80, 
-0x8C, 0x15, 0x51, 0x2C, 0x0C, 0x8A, 0x0A, 0xD8, 0x07, 0xE4, 
-0x21, 0xA2, 0x8E, 0x83, 0xA3, 0x88, 0x8A, 0xCA, 0xFB, 0xE1, 
-0x7B, 0xA3, 0x6B, 0xD6, 0xBC, 0xF7, 0xE6, 0xCD, 0xFE, 0xB5, 
-0xD7, 0x3E, 0xE7, 0xAC, 0xF3, 0x9D, 0xB3, 0xCF, 0x07, 0xC0, 
-0x08, 0x0C, 0x96, 0x48, 0x33, 0x51, 0x35, 0x80, 0x0C, 0xA9, 
-0x42, 0x1E, 0x11, 0xE0, 0x83, 0xC7, 0xC4, 0xC6, 0xE1, 0xE4, 
-0x2E, 0x40, 0x81, 0x0A, 0x24, 0x70, 0x00, 0x10, 0x08, 0xB3, 
-0x64, 0x21, 0x73, 0xFD, 0x23, 0x01, 0x00, 0xF8, 0x7E, 0x3C, 
-0x3C, 0x2B, 0x22, 0xC0, 0x07, 0xBE, 0x00, 0x01, 0x78, 0xD3, 
-0x0B, 0x08, 0x00, 0xC0, 0x4D, 0x9B, 0xC0, 0x30, 0x1C, 0x87, 
-0xFF, 0x0F, 0xEA, 0x42, 0x99, 0x5C, 0x01, 0x80, 0x84, 0x01, 
-0xC0, 0x74, 0x91, 0x38, 0x4B, 0x08, 0x80, 0x14, 0x00, 0x40, 
-0x7A, 0x8E, 0x42, 0xA6, 0x00, 0x40, 0x46, 0x01, 0x80, 0x9D, 
-0x98, 0x26, 0x53, 0x00, 0xA0, 0x04, 0x00, 0x60, 0xCB, 0x63, 
-0x62, 0xE3, 0x00, 0x50, 0x2D, 0x00, 0x60, 0x27, 0x7F, 0xE6, 
-0xD3, 0x00, 0x80, 0x9D, 0xF8, 0x99, 0x7B, 0x01, 0x00, 0x5B, 
-0x94, 0x21, 0x15, 0x01, 0xA0, 0x91, 0x00, 0x20, 0x13, 0x65, 
-0x88, 0x44, 0x00, 0x68, 0x3B, 0x00, 0xAC, 0xCF, 0x56, 0x8A, 
-0x45, 0x00, 0x58, 0x30, 0x00, 0x14, 0x66, 0x4B, 0xC4, 0x39, 
-0x00, 0xD8, 0x2D, 0x00, 0x30, 0x49, 0x57, 0x66, 0x48, 0x00, 
-0xB0, 0xB7, 0x00, 0xC0, 0xCE, 0x10, 0x0B, 0xB2, 0x00, 0x08, 
-0x0C, 0x00, 0x30, 0x51, 0x88, 0x85, 0x29, 0x00, 0x04, 0x7B, 
-0x00, 0x60, 0xC8, 0x23, 0x23, 0x78, 0x00, 0x84, 0x99, 0x00, 
-0x14, 0x46, 0xF2, 0x57, 0x3C, 0xF1, 0x2B, 0xAE, 0x10, 0xE7, 
-0x2A, 0x00, 0x00, 0x78, 0x99, 0xB2, 0x3C, 0xB9, 0x24, 0x39, 
-0x45, 0x81, 0x5B, 0x08, 0x2D, 0x71, 0x07, 0x57, 0x57, 0x2E, 
-0x1E, 0x28, 0xCE, 0x49, 0x17, 0x2B, 0x14, 0x36, 0x61, 0x02, 
-0x61, 0x9A, 0x40, 0x2E, 0xC2, 0x79, 0x99, 0x19, 0x32, 0x81, 
-0x34, 0x0F, 0xE0, 0xF3, 0xCC, 0x00, 0x00, 0xA0, 0x91, 0x15, 
-0x11, 0xE0, 0x83, 0xF3, 0xFD, 0x78, 0xCE, 0x0E, 0xAE, 0xCE, 
-0xCE, 0x36, 0x8E, 0xB6, 0x0E, 0x5F, 0x2D, 0xEA, 0xBF, 0x06, 
-0xFF, 0x22, 0x62, 0x62, 0xE3, 0xFE, 0xE5, 0xCF, 0xAB, 0x70, 
-0x40, 0x00, 0x00, 0xE1, 0x74, 0x7E, 0xD1, 0xFE, 0x2C, 0x2F, 
-0xB3, 0x1A, 0x80, 0x3B, 0x06, 0x80, 0x6D, 0xFE, 0xA2, 0x25, 
-0xEE, 0x04, 0x68, 0x5E, 0x0B, 0xA0, 0x75, 0xF7, 0x8B, 0x66, 
-0xB2, 0x0F, 0x40, 0xB5, 0x00, 0xA0, 0xE9, 0xDA, 0x57, 0xF3, 
-0x70, 0xF8, 0x7E, 0x3C, 0x3C, 0x45, 0xA1, 0x90, 0xB9, 0xD9, 
-0xD9, 0xE5, 0xE4, 0xE4, 0xD8, 0x4A, 0xC4, 0x42, 0x5B, 0x61, 
-0xCA, 0x57, 0x7D, 0xFE, 0x67, 0xC2, 0x5F, 0xC0, 0x57, 0xFD, 
-0x6C, 0xF9, 0x7E, 0x3C, 0xFC, 0xF7, 0xF5, 0xE0, 0xBE, 0xE2, 
-0x24, 0x81, 0x32, 0x5D, 0x81, 0x47, 0x04, 0xF8, 0xE0, 0xC2, 
-0xCC, 0xF4, 0x4C, 0xA5, 0x1C, 0xCF, 0x92, 0x09, 0x84, 0x62, 
-0xDC, 0xE6, 0x8F, 0x47, 0xFC, 0xB7, 0x0B, 0xFF, 0xFC, 0x1D, 
-0xD3, 0x22, 0xC4, 0x49, 0x62, 0xB9, 0x58, 0x2A, 0x14, 0xE3, 
-0x51, 0x12, 0x71, 0x8E, 0x44, 0x9A, 0x8C, 0xF3, 0x32, 0xA5, 
-0x22, 0x89, 0x42, 0x92, 0x29, 0xC5, 0x25, 0xD2, 0xFF, 0x64, 
-0xE2, 0xDF, 0x2C, 0xFB, 0x03, 0x3E, 0xDF, 0x35, 0x00, 0xB0, 
-0x6A, 0x3E, 0x01, 0x7B, 0x91, 0x2D, 0xA8, 0x5D, 0x63, 0x03, 
-0xF6, 0x4B, 0x27, 0x10, 0x58, 0x74, 0xC0, 0xE2, 0xF7, 0x00, 
-0x00, 0xF2, 0xBB, 0x6F, 0xC1, 0xD4, 0x28, 0x08, 0x03, 0x80, 
-0x68, 0x83, 0xE1, 0xCF, 0x77, 0xFF, 0xEF, 0x3F, 0xFD, 0x47, 
-0xA0, 0x25, 0x00, 0x80, 0x66, 0x49, 0x92, 0x71, 0x00, 0x00, 
-0x5E, 0x44, 0x24, 0x2E, 0x54, 0xCA, 0xB3, 0x3F, 0xC7, 0x08, 
-0x00, 0x00, 0x44, 0xA0, 0x81, 0x2A, 0xB0, 0x41, 0x1B, 0xF4, 
-0xC1, 0x18, 0x2C, 0xC0, 0x06, 0x1C, 0xC1, 0x05, 0xDC, 0xC1, 
-0x0B, 0xFC, 0x60, 0x36, 0x84, 0x42, 0x24, 0xC4, 0xC2, 0x42, 
-0x10, 0x42, 0x0A, 0x64, 0x80, 0x1C, 0x72, 0x60, 0x29, 0xAC, 
-0x82, 0x42, 0x28, 0x86, 0xCD, 0xB0, 0x1D, 0x2A, 0x60, 0x2F, 
-0xD4, 0x40, 0x1D, 0x34, 0xC0, 0x51, 0x68, 0x86, 0x93, 0x70, 
-0x0E, 0x2E, 0xC2, 0x55, 0xB8, 0x0E, 0x3D, 0x70, 0x0F, 0xFA, 
-0x61, 0x08, 0x9E, 0xC1, 0x28, 0xBC, 0x81, 0x09, 0x04, 0x41, 
-0xC8, 0x08, 0x13, 0x61, 0x21, 0xDA, 0x88, 0x01, 0x62, 0x8A, 
-0x58, 0x23, 0x8E, 0x08, 0x17, 0x99, 0x85, 0xF8, 0x21, 0xC1, 
-0x48, 0x04, 0x12, 0x8B, 0x24, 0x20, 0xC9, 0x88, 0x14, 0x51, 
-0x22, 0x4B, 0x91, 0x35, 0x48, 0x31, 0x52, 0x8A, 0x54, 0x20, 
-0x55, 0x48, 0x1D, 0xF2, 0x3D, 0x72, 0x02, 0x39, 0x87, 0x5C, 
-0x46, 0xBA, 0x91, 0x3B, 0xC8, 0x00, 0x32, 0x82, 0xFC, 0x86, 
-0xBC, 0x47, 0x31, 0x94, 0x81, 0xB2, 0x51, 0x3D, 0xD4, 0x0C, 
-0xB5, 0x43, 0xB9, 0xA8, 0x37, 0x1A, 0x84, 0x46, 0xA2, 0x0B, 
-0xD0, 0x64, 0x74, 0x31, 0x9A, 0x8F, 0x16, 0xA0, 0x9B, 0xD0, 
-0x72, 0xB4, 0x1A, 0x3D, 0x8C, 0x36, 0xA1, 0xE7, 0xD0, 0xAB, 
-0x68, 0x0F, 0xDA, 0x8F, 0x3E, 0x43, 0xC7, 0x30, 0xC0, 0xE8, 
-0x18, 0x07, 0x33, 0xC4, 0x6C, 0x30, 0x2E, 0xC6, 0xC3, 0x42, 
-0xB1, 0x38, 0x2C, 0x09, 0x93, 0x63, 0xCB, 0xB1, 0x22, 0xAC, 
-0x0C, 0xAB, 0xC6, 0x1A, 0xB0, 0x56, 0xAC, 0x03, 0xBB, 0x89, 
-0xF5, 0x63, 0xCF, 0xB1, 0x77, 0x04, 0x12, 0x81, 0x45, 0xC0, 
-0x09, 0x36, 0x04, 0x77, 0x42, 0x20, 0x61, 0x1E, 0x41, 0x48, 
-0x58, 0x4C, 0x58, 0x4E, 0xD8, 0x48, 0xA8, 0x20, 0x1C, 0x24, 
-0x34, 0x11, 0xDA, 0x09, 0x37, 0x09, 0x03, 0x84, 0x51, 0xC2, 
-0x27, 0x22, 0x93, 0xA8, 0x4B, 0xB4, 0x26, 0xBA, 0x11, 0xF9, 
-0xC4, 0x18, 0x62, 0x32, 0x31, 0x87, 0x58, 0x48, 0x2C, 0x23, 
-0xD6, 0x12, 0x8F, 0x13, 0x2F, 0x10, 0x7B, 0x88, 0x43, 0xC4, 
-0x37, 0x24, 0x12, 0x89, 0x43, 0x32, 0x27, 0xB9, 0x90, 0x02, 
-0x49, 0xB1, 0xA4, 0x54, 0xD2, 0x12, 0xD2, 0x46, 0xD2, 0x6E, 
-0x52, 0x23, 0xE9, 0x2C, 0xA9, 0x9B, 0x34, 0x48, 0x1A, 0x23, 
-0x93, 0xC9, 0xDA, 0x64, 0x6B, 0xB2, 0x07, 0x39, 0x94, 0x2C, 
-0x20, 0x2B, 0xC8, 0x85, 0xE4, 0x9D, 0xE4, 0xC3, 0xE4, 0x33, 
-0xE4, 0x1B, 0xE4, 0x21, 0xF2, 0x5B, 0x0A, 0x9D, 0x62, 0x40, 
-0x71, 0xA4, 0xF8, 0x53, 0xE2, 0x28, 0x52, 0xCA, 0x6A, 0x4A, 
-0x19, 0xE5, 0x10, 0xE5, 0x34, 0xE5, 0x06, 0x65, 0x98, 0x32, 
-0x41, 0x55, 0xA3, 0x9A, 0x52, 0xDD, 0xA8, 0xA1, 0x54, 0x11, 
-0x35, 0x8F, 0x5A, 0x42, 0xAD, 0xA1, 0xB6, 0x52, 0xAF, 0x51, 
-0x87, 0xA8, 0x13, 0x34, 0x75, 0x9A, 0x39, 0xCD, 0x83, 0x16, 
-0x49, 0x4B, 0xA5, 0xAD, 0xA2, 0x95, 0xD3, 0x1A, 0x68, 0x17, 
-0x68, 0xF7, 0x69, 0xAF, 0xE8, 0x74, 0xBA, 0x11, 0xDD, 0x95, 
-0x1E, 0x4E, 0x97, 0xD0, 0x57, 0xD2, 0xCB, 0xE9, 0x47, 0xE8, 
-0x97, 0xE8, 0x03, 0xF4, 0x77, 0x0C, 0x0D, 0x86, 0x15, 0x83, 
-0xC7, 0x88, 0x67, 0x28, 0x19, 0x9B, 0x18, 0x07, 0x18, 0x67, 
-0x19, 0x77, 0x18, 0xAF, 0x98, 0x4C, 0xA6, 0x19, 0xD3, 0x8B, 
-0x19, 0xC7, 0x54, 0x30, 0x37, 0x31, 0xEB, 0x98, 0xE7, 0x99, 
-0x0F, 0x99, 0x6F, 0x55, 0x58, 0x2A, 0xB6, 0x2A, 0x7C, 0x15, 
-0x91, 0xCA, 0x0A, 0x95, 0x4A, 0x95, 0x26, 0x95, 0x1B, 0x2A, 
-0x2F, 0x54, 0xA9, 0xAA, 0xA6, 0xAA, 0xDE, 0xAA, 0x0B, 0x55, 
-0xF3, 0x55, 0xCB, 0x54, 0x8F, 0xA9, 0x5E, 0x53, 0x7D, 0xAE, 
-0x46, 0x55, 0x33, 0x53, 0xE3, 0xA9, 0x09, 0xD4, 0x96, 0xAB, 
-0x55, 0xAA, 0x9D, 0x50, 0xEB, 0x53, 0x1B, 0x53, 0x67, 0xA9, 
-0x3B, 0xA8, 0x87, 0xAA, 0x67, 0xA8, 0x6F, 0x54, 0x3F, 0xA4, 
-0x7E, 0x59, 0xFD, 0x89, 0x06, 0x59, 0xC3, 0x4C, 0xC3, 0x4F, 
-0x43, 0xA4, 0x51, 0xA0, 0xB1, 0x5F, 0xE3, 0xBC, 0xC6, 0x20, 
-0x0B, 0x63, 0x19, 0xB3, 0x78, 0x2C, 0x21, 0x6B, 0x0D, 0xAB, 
-0x86, 0x75, 0x81, 0x35, 0xC4, 0x26, 0xB1, 0xCD, 0xD9, 0x7C, 
-0x76, 0x2A, 0xBB, 0x98, 0xFD, 0x1D, 0xBB, 0x8B, 0x3D, 0xAA, 
-0xA9, 0xA1, 0x39, 0x43, 0x33, 0x4A, 0x33, 0x57, 0xB3, 0x52, 
-0xF3, 0x94, 0x66, 0x3F, 0x07, 0xE3, 0x98, 0x71, 0xF8, 0x9C, 
-0x74, 0x4E, 0x09, 0xE7, 0x28, 0xA7, 0x97, 0xF3, 0x7E, 0x8A, 
-0xDE, 0x14, 0xEF, 0x29, 0xE2, 0x29, 0x1B, 0xA6, 0x34, 0x4C, 
-0xB9, 0x31, 0x65, 0x5C, 0x6B, 0xAA, 0x96, 0x97, 0x96, 0x58, 
-0xAB, 0x48, 0xAB, 0x51, 0xAB, 0x47, 0xEB, 0xBD, 0x36, 0xAE, 
-0xED, 0xA7, 0x9D, 0xA6, 0xBD, 0x45, 0xBB, 0x59, 0xFB, 0x81, 
-0x0E, 0x41, 0xC7, 0x4A, 0x27, 0x5C, 0x27, 0x47, 0x67, 0x8F, 
-0xCE, 0x05, 0x9D, 0xE7, 0x53, 0xD9, 0x53, 0xDD, 0xA7, 0x0A, 
-0xA7, 0x16, 0x4D, 0x3D, 0x3A, 0xF5, 0xAE, 0x2E, 0xAA, 0x6B, 
-0xA5, 0x1B, 0xA1, 0xBB, 0x44, 0x77, 0xBF, 0x6E, 0xA7, 0xEE, 
-0x98, 0x9E, 0xBE, 0x5E, 0x80, 0x9E, 0x4C, 0x6F, 0xA7, 0xDE, 
-0x79, 0xBD, 0xE7, 0xFA, 0x1C, 0x7D, 0x2F, 0xFD, 0x54, 0xFD, 
-0x6D, 0xFA, 0xA7, 0xF5, 0x47, 0x0C, 0x58, 0x06, 0xB3, 0x0C, 
-0x24, 0x06, 0xDB, 0x0C, 0xCE, 0x18, 0x3C, 0xC5, 0x35, 0x71, 
-0x6F, 0x3C, 0x1D, 0x2F, 0xC7, 0xDB, 0xF1, 0x51, 0x43, 0x5D, 
-0xC3, 0x40, 0x43, 0xA5, 0x61, 0x95, 0x61, 0x97, 0xE1, 0x84, 
-0x91, 0xB9, 0xD1, 0x3C, 0xA3, 0xD5, 0x46, 0x8D, 0x46, 0x0F, 
-0x8C, 0x69, 0xC6, 0x5C, 0xE3, 0x24, 0xE3, 0x6D, 0xC6, 0x6D, 
-0xC6, 0xA3, 0x26, 0x06, 0x26, 0x21, 0x26, 0x4B, 0x4D, 0xEA, 
-0x4D, 0xEE, 0x9A, 0x52, 0x4D, 0xB9, 0xA6, 0x29, 0xA6, 0x3B, 
-0x4C, 0x3B, 0x4C, 0xC7, 0xCD, 0xCC, 0xCD, 0xA2, 0xCD, 0xD6, 
-0x99, 0x35, 0x9B, 0x3D, 0x31, 0xD7, 0x32, 0xE7, 0x9B, 0xE7, 
-0x9B, 0xD7, 0x9B, 0xDF, 0xB7, 0x60, 0x5A, 0x78, 0x5A, 0x2C, 
-0xB6, 0xA8, 0xB6, 0xB8, 0x65, 0x49, 0xB2, 0xE4, 0x5A, 0xA6, 
-0x59, 0xEE, 0xB6, 0xBC, 0x6E, 0x85, 0x5A, 0x39, 0x59, 0xA5, 
-0x58, 0x55, 0x5A, 0x5D, 0xB3, 0x46, 0xAD, 0x9D, 0xAD, 0x25, 
-0xD6, 0xBB, 0xAD, 0xBB, 0xA7, 0x11, 0xA7, 0xB9, 0x4E, 0x93, 
-0x4E, 0xAB, 0x9E, 0xD6, 0x67, 0xC3, 0xB0, 0xF1, 0xB6, 0xC9, 
-0xB6, 0xA9, 0xB7, 0x19, 0xB0, 0xE5, 0xD8, 0x06, 0xDB, 0xAE, 
-0xB6, 0x6D, 0xB6, 0x7D, 0x61, 0x67, 0x62, 0x17, 0x67, 0xB7, 
-0xC5, 0xAE, 0xC3, 0xEE, 0x93, 0xBD, 0x93, 0x7D, 0xBA, 0x7D, 
-0x8D, 0xFD, 0x3D, 0x07, 0x0D, 0x87, 0xD9, 0x0E, 0xAB, 0x1D, 
-0x5A, 0x1D, 0x7E, 0x73, 0xB4, 0x72, 0x14, 0x3A, 0x56, 0x3A, 
-0xDE, 0x9A, 0xCE, 0x9C, 0xEE, 0x3F, 0x7D, 0xC5, 0xF4, 0x96, 
-0xE9, 0x2F, 0x67, 0x58, 0xCF, 0x10, 0xCF, 0xD8, 0x33, 0xE3, 
-0xB6, 0x13, 0xCB, 0x29, 0xC4, 0x69, 0x9D, 0x53, 0x9B, 0xD3, 
-0x47, 0x67, 0x17, 0x67, 0xB9, 0x73, 0x83, 0xF3, 0x88, 0x8B, 
-0x89, 0x4B, 0x82, 0xCB, 0x2E, 0x97, 0x3E, 0x2E, 0x9B, 0x1B, 
-0xC6, 0xDD, 0xC8, 0xBD, 0xE4, 0x4A, 0x74, 0xF5, 0x71, 0x5D, 
-0xE1, 0x7A, 0xD2, 0xF5, 0x9D, 0x9B, 0xB3, 0x9B, 0xC2, 0xED, 
-0xA8, 0xDB, 0xAF, 0xEE, 0x36, 0xEE, 0x69, 0xEE, 0x87, 0xDC, 
-0x9F, 0xCC, 0x34, 0x9F, 0x29, 0x9E, 0x59, 0x33, 0x73, 0xD0, 
-0xC3, 0xC8, 0x43, 0xE0, 0x51, 0xE5, 0xD1, 0x3F, 0x0B, 0x9F, 
-0x95, 0x30, 0x6B, 0xDF, 0xAC, 0x7E, 0x4F, 0x43, 0x4F, 0x81, 
-0x67, 0xB5, 0xE7, 0x23, 0x2F, 0x63, 0x2F, 0x91, 0x57, 0xAD, 
-0xD7, 0xB0, 0xB7, 0xA5, 0x77, 0xAA, 0xF7, 0x61, 0xEF, 0x17, 
-0x3E, 0xF6, 0x3E, 0x72, 0x9F, 0xE3, 0x3E, 0xE3, 0x3C, 0x37, 
-0xDE, 0x32, 0xDE, 0x59, 0x5F, 0xCC, 0x37, 0xC0, 0xB7, 0xC8, 
-0xB7, 0xCB, 0x4F, 0xC3, 0x6F, 0x9E, 0x5F, 0x85, 0xDF, 0x43, 
-0x7F, 0x23, 0xFF, 0x64, 0xFF, 0x7A, 0xFF, 0xD1, 0x00, 0xA7, 
-0x80, 0x25, 0x01, 0x67, 0x03, 0x89, 0x81, 0x41, 0x81, 0x5B, 
-0x02, 0xFB, 0xF8, 0x7A, 0x7C, 0x21, 0xBF, 0x8E, 0x3F, 0x3A, 
-0xDB, 0x65, 0xF6, 0xB2, 0xD9, 0xED, 0x41, 0x8C, 0xA0, 0xB9, 
-0x41, 0x15, 0x41, 0x8F, 0x82, 0xAD, 0x82, 0xE5, 0xC1, 0xAD, 
-0x21, 0x68, 0xC8, 0xEC, 0x90, 0xAD, 0x21, 0xF7, 0xE7, 0x98, 
-0xCE, 0x91, 0xCE, 0x69, 0x0E, 0x85, 0x50, 0x7E, 0xE8, 0xD6, 
-0xD0, 0x07, 0x61, 0xE6, 0x61, 0x8B, 0xC3, 0x7E, 0x0C, 0x27, 
-0x85, 0x87, 0x85, 0x57, 0x86, 0x3F, 0x8E, 0x70, 0x88, 0x58, 
-0x1A, 0xD1, 0x31, 0x97, 0x35, 0x77, 0xD1, 0xDC, 0x43, 0x73, 
-0xDF, 0x44, 0xFA, 0x44, 0x96, 0x44, 0xDE, 0x9B, 0x67, 0x31, 
-0x4F, 0x39, 0xAF, 0x2D, 0x4A, 0x35, 0x2A, 0x3E, 0xAA, 0x2E, 
-0x6A, 0x3C, 0xDA, 0x37, 0xBA, 0x34, 0xBA, 0x3F, 0xC6, 0x2E, 
-0x66, 0x59, 0xCC, 0xD5, 0x58, 0x9D, 0x58, 0x49, 0x6C, 0x4B, 
-0x1C, 0x39, 0x2E, 0x2A, 0xAE, 0x36, 0x6E, 0x6C, 0xBE, 0xDF, 
-0xFC, 0xED, 0xF3, 0x87, 0xE2, 0x9D, 0xE2, 0x0B, 0xE3, 0x7B, 
-0x17, 0x98, 0x2F, 0xC8, 0x5D, 0x70, 0x79, 0xA1, 0xCE, 0xC2, 
-0xF4, 0x85, 0xA7, 0x16, 0xA9, 0x2E, 0x12, 0x2C, 0x3A, 0x96, 
-0x40, 0x4C, 0x88, 0x4E, 0x38, 0x94, 0xF0, 0x41, 0x10, 0x2A, 
-0xA8, 0x16, 0x8C, 0x25, 0xF2, 0x13, 0x77, 0x25, 0x8E, 0x0A, 
-0x79, 0xC2, 0x1D, 0xC2, 0x67, 0x22, 0x2F, 0xD1, 0x36, 0xD1, 
-0x88, 0xD8, 0x43, 0x5C, 0x2A, 0x1E, 0x4E, 0xF2, 0x48, 0x2A, 
-0x4D, 0x7A, 0x92, 0xEC, 0x91, 0xBC, 0x35, 0x79, 0x24, 0xC5, 
-0x33, 0xA5, 0x2C, 0xE5, 0xB9, 0x84, 0x27, 0xA9, 0x90, 0xBC, 
-0x4C, 0x0D, 0x4C, 0xDD, 0x9B, 0x3A, 0x9E, 0x16, 0x9A, 0x76, 
-0x20, 0x6D, 0x32, 0x3D, 0x3A, 0xBD, 0x31, 0x83, 0x92, 0x91, 
-0x90, 0x71, 0x42, 0xAA, 0x21, 0x4D, 0x93, 0xB6, 0x67, 0xEA, 
-0x67, 0xE6, 0x66, 0x76, 0xCB, 0xAC, 0x65, 0x85, 0xB2, 0xFE, 
-0xC5, 0x6E, 0x8B, 0xB7, 0x2F, 0x1E, 0x95, 0x07, 0xC9, 0x6B, 
-0xB3, 0x90, 0xAC, 0x05, 0x59, 0x2D, 0x0A, 0xB6, 0x42, 0xA6, 
-0xE8, 0x54, 0x5A, 0x28, 0xD7, 0x2A, 0x07, 0xB2, 0x67, 0x65, 
-0x57, 0x66, 0xBF, 0xCD, 0x89, 0xCA, 0x39, 0x96, 0xAB, 0x9E, 
-0x2B, 0xCD, 0xED, 0xCC, 0xB3, 0xCA, 0xDB, 0x90, 0x37, 0x9C, 
-0xEF, 0x9F, 0xFF, 0xED, 0x12, 0xC2, 0x12, 0xE1, 0x92, 0xB6, 
-0xA5, 0x86, 0x4B, 0x57, 0x2D, 0x1D, 0x58, 0xE6, 0xBD, 0xAC, 
-0x6A, 0x39, 0xB2, 0x3C, 0x71, 0x79, 0xDB, 0x0A, 0xE3, 0x15, 
-0x05, 0x2B, 0x86, 0x56, 0x06, 0xAC, 0x3C, 0xB8, 0x8A, 0xB6, 
-0x2A, 0x6D, 0xD5, 0x4F, 0xAB, 0xED, 0x57, 0x97, 0xAE, 0x7E, 
-0xBD, 0x26, 0x7A, 0x4D, 0x6B, 0x81, 0x5E, 0xC1, 0xCA, 0x82, 
-0xC1, 0xB5, 0x01, 0x6B, 0xEB, 0x0B, 0x55, 0x0A, 0xE5, 0x85, 
-0x7D, 0xEB, 0xDC, 0xD7, 0xED, 0x5D, 0x4F, 0x58, 0x2F, 0x59, 
-0xDF, 0xB5, 0x61, 0xFA, 0x86, 0x9D, 0x1B, 0x3E, 0x15, 0x89, 
-0x8A, 0xAE, 0x14, 0xDB, 0x17, 0x97, 0x15, 0x7F, 0xD8, 0x28, 
-0xDC, 0x78, 0xE5, 0x1B, 0x87, 0x6F, 0xCA, 0xBF, 0x99, 0xDC, 
-0x94, 0xB4, 0xA9, 0xAB, 0xC4, 0xB9, 0x64, 0xCF, 0x66, 0xD2, 
-0x66, 0xE9, 0xE6, 0xDE, 0x2D, 0x9E, 0x5B, 0x0E, 0x96, 0xAA, 
-0x97, 0xE6, 0x97, 0x0E, 0x6E, 0x0D, 0xD9, 0xDA, 0xB4, 0x0D, 
-0xDF, 0x56, 0xB4, 0xED, 0xF5, 0xF6, 0x45, 0xDB, 0x2F, 0x97, 
-0xCD, 0x28, 0xDB, 0xBB, 0x83, 0xB6, 0x43, 0xB9, 0xA3, 0xBF, 
-0x3C, 0xB8, 0xBC, 0x65, 0xA7, 0xC9, 0xCE, 0xCD, 0x3B, 0x3F, 
-0x54, 0xA4, 0x54, 0xF4, 0x54, 0xFA, 0x54, 0x36, 0xEE, 0xD2, 
-0xDD, 0xB5, 0x61, 0xD7, 0xF8, 0x6E, 0xD1, 0xEE, 0x1B, 0x7B, 
-0xBC, 0xF6, 0x34, 0xEC, 0xD5, 0xDB, 0x5B, 0xBC, 0xF7, 0xFD, 
-0x3E, 0xC9, 0xBE, 0xDB, 0x55, 0x01, 0x55, 0x4D, 0xD5, 0x66, 
-0xD5, 0x65, 0xFB, 0x49, 0xFB, 0xB3, 0xF7, 0x3F, 0xAE, 0x89, 
-0xAA, 0xE9, 0xF8, 0x96, 0xFB, 0x6D, 0x5D, 0xAD, 0x4E, 0x6D, 
-0x71, 0xED, 0xC7, 0x03, 0xD2, 0x03, 0xFD, 0x07, 0x23, 0x0E, 
-0xB6, 0xD7, 0xB9, 0xD4, 0xD5, 0x1D, 0xD2, 0x3D, 0x54, 0x52, 
-0x8F, 0xD6, 0x2B, 0xEB, 0x47, 0x0E, 0xC7, 0x1F, 0xBE, 0xFE, 
-0x9D, 0xEF, 0x77, 0x2D, 0x0D, 0x36, 0x0D, 0x55, 0x8D, 0x9C, 
-0xC6, 0xE2, 0x23, 0x70, 0x44, 0x79, 0xE4, 0xE9, 0xF7, 0x09, 
-0xDF, 0xF7, 0x1E, 0x0D, 0x3A, 0xDA, 0x76, 0x8C, 0x7B, 0xAC, 
-0xE1, 0x07, 0xD3, 0x1F, 0x76, 0x1D, 0x67, 0x1D, 0x2F, 0x6A, 
-0x42, 0x9A, 0xF2, 0x9A, 0x46, 0x9B, 0x53, 0x9A, 0xFB, 0x5B, 
-0x62, 0x5B, 0xBA, 0x4F, 0xCC, 0x3E, 0xD1, 0xD6, 0xEA, 0xDE, 
-0x7A, 0xFC, 0x47, 0xDB, 0x1F, 0x0F, 0x9C, 0x34, 0x3C, 0x59, 
-0x79, 0x4A, 0xF3, 0x54, 0xC9, 0x69, 0xDA, 0xE9, 0x82, 0xD3, 
-0x93, 0x67, 0xF2, 0xCF, 0x8C, 0x9D, 0x95, 0x9D, 0x7D, 0x7E, 
-0x2E, 0xF9, 0xDC, 0x60, 0xDB, 0xA2, 0xB6, 0x7B, 0xE7, 0x63, 
-0xCE, 0xDF, 0x6A, 0x0F, 0x6F, 0xEF, 0xBA, 0x10, 0x74, 0xE1, 
-0xD2, 0x45, 0xFF, 0x8B, 0xE7, 0x3B, 0xBC, 0x3B, 0xCE, 0x5C, 
-0xF2, 0xB8, 0x74, 0xF2, 0xB2, 0xDB, 0xE5, 0x13, 0x57, 0xB8, 
-0x57, 0x9A, 0xAF, 0x3A, 0x5F, 0x6D, 0xEA, 0x74, 0xEA, 0x3C, 
-0xFE, 0x93, 0xD3, 0x4F, 0xC7, 0xBB, 0x9C, 0xBB, 0x9A, 0xAE, 
-0xB9, 0x5C, 0x6B, 0xB9, 0xEE, 0x7A, 0xBD, 0xB5, 0x7B, 0x66, 
-0xF7, 0xE9, 0x1B, 0x9E, 0x37, 0xCE, 0xDD, 0xF4, 0xBD, 0x79, 
-0xF1, 0x16, 0xFF, 0xD6, 0xD5, 0x9E, 0x39, 0x3D, 0xDD, 0xBD, 
-0xF3, 0x7A, 0x6F, 0xF7, 0xC5, 0xF7, 0xF5, 0xDF, 0x16, 0xDD, 
-0x7E, 0x72, 0x27, 0xFD, 0xCE, 0xCB, 0xBB, 0xD9, 0x77, 0x27, 
-0xEE, 0xAD, 0xBC, 0x4F, 0xBC, 0x5F, 0xF4, 0x40, 0xED, 0x41, 
-0xD9, 0x43, 0xDD, 0x87, 0xD5, 0x3F, 0x5B, 0xFE, 0xDC, 0xD8, 
-0xEF, 0xDC, 0x7F, 0x6A, 0xC0, 0x77, 0xA0, 0xF3, 0xD1, 0xDC, 
-0x47, 0xF7, 0x06, 0x85, 0x83, 0xCF, 0xFE, 0x91, 0xF5, 0x8F, 
-0x0F, 0x43, 0x05, 0x8F, 0x99, 0x8F, 0xCB, 0x86, 0x0D, 0x86, 
-0xEB, 0x9E, 0x38, 0x3E, 0x39, 0x39, 0xE2, 0x3F, 0x72, 0xFD, 
-0xE9, 0xFC, 0xA7, 0x43, 0xCF, 0x64, 0xCF, 0x26, 0x9E, 0x17, 
-0xFE, 0xA2, 0xFE, 0xCB, 0xAE, 0x17, 0x16, 0x2F, 0x7E, 0xF8, 
-0xD5, 0xEB, 0xD7, 0xCE, 0xD1, 0x98, 0xD1, 0xA1, 0x97, 0xF2, 
-0x97, 0x93, 0xBF, 0x6D, 0x7C, 0xA5, 0xFD, 0xEA, 0xC0, 0xEB, 
-0x19, 0xAF, 0xDB, 0xC6, 0xC2, 0xC6, 0x1E, 0xBE, 0xC9, 0x78, 
-0x33, 0x31, 0x5E, 0xF4, 0x56, 0xFB, 0xED, 0xC1, 0x77, 0xDC, 
-0x77, 0x1D, 0xEF, 0xA3, 0xDF, 0x0F, 0x4F, 0xE4, 0x7C, 0x20, 
-0x7F, 0x28, 0xFF, 0x68, 0xF9, 0xB1, 0xF5, 0x53, 0xD0, 0xA7, 
-0xFB, 0x93, 0x19, 0x93, 0x93, 0xFF, 0x04, 0x03, 0x98, 0xF3, 
-0xFC, 0x63, 0x33, 0x2D, 0xDB, 0x00, 0x00, 0x00, 0x20, 0x63, 
-0x48, 0x52, 0x4D, 0x00, 0x00, 0x7A, 0x25, 0x00, 0x00, 0x80, 
-0x83, 0x00, 0x00, 0xF9, 0xFF, 0x00, 0x00, 0x80, 0xE9, 0x00, 
-0x00, 0x75, 0x30, 0x00, 0x00, 0xEA, 0x60, 0x00, 0x00, 0x3A, 
-0x98, 0x00, 0x00, 0x17, 0x6F, 0x92, 0x5F, 0xC5, 0x46, 0x00, 
-0x00, 0x09, 0x20, 0x49, 0x44, 0x41, 0x54, 0x78, 0xDA, 0x9C, 
-0x97, 0x7F, 0x90, 0x5E, 0x65, 0x75, 0xC7, 0x3F, 0xE7, 0x3C, 
-0x3F, 0xEE, 0x8F, 0xF7, 0x7D, 0xF7, 0x67, 0xC8, 0x86, 0xD0, 
-0x95, 0x60, 0x48, 0x03, 0x6A, 0x90, 0x08, 0xE3, 0x80, 0x44, 
-0x99, 0xA0, 0x16, 0xE5, 0x87, 0x05, 0x6B, 0x07, 0x61, 0xFC, 
-0xC3, 0x01, 0x9D, 0x01, 0x95, 0x4E, 0xF9, 0xA3, 0xA5, 0x33, 
-0xB6, 0x76, 0x3A, 0xC2, 0x50, 0x99, 0x71, 0x44, 0x51, 0x92, 
-0x51, 0x0B, 0x28, 0x30, 0xAD, 0x75, 0x2A, 0x19, 0x61, 0x6C, 
-0x1D, 0x48, 0x75, 0x87, 0x76, 0xA8, 0xA8, 0x24, 0x1A, 0x24, 
-0x1A, 0xC2, 0xC6, 0x00, 0xD9, 0x24, 0xCB, 0x66, 0xB3, 0xBB, 
-0xEF, 0xEE, 0xFB, 0xEB, 0xDE, 0xFB, 0x3C, 0xFD, 0xE3, 0x5D, 
-0x62, 0x77, 0x5A, 0x65, 0xEB, 0x77, 0xE6, 0xCE, 0xDC, 0xE7, 
-0xDC, 0x7B, 0x9F, 0xF3, 0x3D, 0xCF, 0x73, 0xEE, 0xF7, 0x9C, 
-0x47, 0x1E, 0x7D, 0xF4, 0x51, 0x76, 0xEE, 0xD8, 0x71, 0xF1, 
-0xA5, 0xEF, 0xBD, 0xE2, 0xF1, 0x10, 0x24, 0xB1, 0xCE, 0x11, 
-0x45, 0x00, 0x20, 0xC6, 0xFE, 0xC5, 0xF2, 0xB8, 0x6F, 0x3C, 
-0x75, 0x27, 0xA2, 0x88, 0x48, 0xFF, 0x71, 0x84, 0x18, 0x03, 
-0x11, 0xF9, 0xCD, 0xEB, 0x21, 0xAE, 0xF8, 0x46, 0x80, 0xB2, 
-0x2C, 0x50, 0xA1, 0x3B, 0xF1, 0xE4, 0xF7, 0xAE, 0xBA, 0xF9, 
-0x96, 0x5B, 0x9E, 0xB6, 0xCE, 0xE8, 0xA5, 0x7B, 0x0E, 0xBE, 
-0xBA, 0xAB, 0xB1, 0x61, 0x7A, 0xE8, 0xFA, 0x0F, 0xBC, 0x9B, 
-0xA2, 0x0C, 0x20, 0x86, 0x28, 0x20, 0x21, 0x10, 0x89, 0xC8, 
-0xF2, 0x8C, 0x71, 0x99, 0x94, 0x8A, 0xE0, 0xD3, 0x94, 0xB9, 
-0xB9, 0x79, 0x9A, 0x0B, 0xF3, 0x20, 0x4A, 0x92, 0x24, 0x8C, 
-0x8E, 0x8E, 0x22, 0x22, 0xF4, 0x8A, 0xA2, 0xEF, 0x30, 0x86, 
-0x95, 0xA4, 0x63, 0xC4, 0x59, 0xE5, 0x1F, 0x77, 0x3D, 0x51, 
-0xDB, 0x73, 0x60, 0xFA, 0x7B, 0xCE, 0xE8, 0x35, 0x76, 0xFF, 
-0xE4, 0xD4, 0x63, 0xED, 0x90, 0x34, 0x6E, 0xBD, 0xE9, 0x3A, 
-0xD2, 0xC4, 0xD3, 0x2B, 0x2A, 0x40, 0x41, 0x5E, 0x63, 0xFD, 
-0x5A, 0x78, 0x10, 0x55, 0x50, 0xA0, 0x96, 0xD7, 0xF8, 0xF1, 
-0x33, 0xFF, 0xC5, 0xA1, 0x83, 0xFB, 0xD1, 0x58, 0x22, 0xAA, 
-0xF4, 0x8A, 0x92, 0xE3, 0x03, 0x43, 0x5C, 0xF2, 0xAE, 0xF7, 
-0x30, 0x3C, 0x3C, 0xC2, 0xD2, 0xD2, 0x22, 0x88, 0xF4, 0xE3, 
-0x0E, 0x11, 0x11, 0x88, 0x12, 0xF1, 0x2A, 0xDC, 0xFA, 0xF1, 
-0xEB, 0xF9, 0xFE, 0xBF, 0x3F, 0x35, 0xB4, 0x7F, 0x72, 0xEA, 
-0x31, 0xFB, 0xCA, 0xF1, 0x59, 0xBB, 0xE5, 0xBC, 0xB7, 0x30, 
-0x7D, 0x62, 0x9E, 0xA5, 0x6E, 0x44, 0x8C, 0x25, 0xA2, 0x20, 
-0x10, 0x43, 0x58, 0x5E, 0x6A, 0x21, 0x56, 0x15, 0x36, 0xF1, 
-0x64, 0x69, 0xCE, 0x93, 0x8F, 0xFC, 0x03, 0x23, 0x59, 0xC5, 
-0xC7, 0x6E, 0xBA, 0x91, 0xB3, 0xCE, 0x7A, 0x23, 0x00, 0x0B, 
-0x0B, 0xF3, 0xEC, 0xDE, 0xBD, 0x9B, 0x1D, 0x5F, 0xFE, 0x02, 
-0xEF, 0x78, 0xEF, 0x07, 0x19, 0xDF, 0xB0, 0x91, 0xE6, 0xC2, 
-0x02, 0xC6, 0x18, 0x42, 0x08, 0x40, 0x44, 0x55, 0x08, 0x45, 
-0x41, 0x3D, 0x81, 0x2D, 0xE7, 0xBD, 0x85, 0x57, 0x8E, 0x9F, 
-0xB4, 0xD6, 0xF8, 0x7A, 0xE8, 0x52, 0xE7, 0xC8, 0x4C, 0x9B, 
-0x66, 0x61, 0x50, 0x13, 0x29, 0x81, 0x10, 0x22, 0xCE, 0x19, 
-0xAC, 0x4F, 0x89, 0x40, 0xD1, 0x29, 0xA9, 0x0F, 0x26, 0x3C, 
-0xFD, 0xF8, 0xB7, 0xD9, 0xB6, 0x69, 0x88, 0x3F, 0xFB, 0xF3, 
-0xDB, 0xF8, 0x9F, 0x18, 0x18, 0x18, 0xE4, 0xDA, 0x6B, 0x3F, 
-0xC8, 0x39, 0x9B, 0x37, 0xF3, 0xE9, 0x3B, 0x3E, 0xCF, 0xE6, 
-0x6D, 0x7F, 0x42, 0xBD, 0x31, 0x48, 0x51, 0xB6, 0x91, 0xE5, 
-0x20, 0x8C, 0x2A, 0x45, 0xBB, 0xC5, 0x50, 0x0A, 0xBD, 0xD8, 
-0xC0, 0x24, 0xF5, 0x60, 0xD5, 0xD5, 0x98, 0xEF, 0x35, 0x78, 
-0x69, 0xA6, 0xCB, 0x52, 0x70, 0x88, 0x03, 0x49, 0x6A, 0xA8, 
-0xB5, 0x34, 0x5F, 0x9D, 0x65, 0xEA, 0x3F, 0xBF, 0x81, 0xA9, 
-0xAF, 0xE1, 0xDC, 0xCB, 0xAE, 0xE7, 0x27, 0x13, 0x4F, 0xB1, 
-0x31, 0xEB, 0xF0, 0x89, 0x4F, 0x7C, 0x92, 0xDF, 0x86, 0x73, 
-0xDF, 0xF4, 0x66, 0xFE, 0xF2, 0x53, 0x37, 0x72, 0xDB, 0xE7, 
-0x1E, 0x64, 0xEB, 0xD5, 0x1F, 0xA7, 0x6A, 0x17, 0xFD, 0x44, 
-0x05, 0x62, 0xD9, 0xA3, 0xE8, 0x74, 0x68, 0x26, 0x96, 0x66, 
-0x39, 0x82, 0xBA, 0x1A, 0x56, 0xAD, 0x67, 0xB1, 0xDB, 0xE0, 
-0xF0, 0x74, 0x97, 0xB6, 0x06, 0x74, 0x20, 0x67, 0xEE, 0xD0, 
-0x3E, 0xDA, 0xD3, 0x2F, 0x33, 0x77, 0xE4, 0x30, 0x0F, 0xDD, 
-0xF9, 0x31, 0x9E, 0x7A, 0xFA, 0xC7, 0x3C, 0xF2, 0x83, 0x1F, 
-0x90, 0x4F, 0xFF, 0x94, 0xFB, 0x1F, 0xF8, 0x1C, 0xD6, 0x7B, 
-0x7E, 0x17, 0x2E, 0x7A, 0xC7, 0x36, 0xAE, 0x7A, 0xFB, 0x04, 
-0x8F, 0xEF, 0x7D, 0x96, 0x33, 0xCE, 0x7E, 0x1B, 0x9D, 0xA5, 
-0x45, 0xAC, 0x31, 0x14, 0xDD, 0x82, 0xD0, 0x81, 0xA6, 0x96, 
-0xB4, 0xCA, 0x51, 0xAC, 0x49, 0x50, 0x35, 0x86, 0xA5, 0x22, 
-0x67, 0x6A, 0x36, 0x30, 0x5B, 0x64, 0xBC, 0x74, 0xE4, 0x28, 
-0xE7, 0x96, 0x87, 0xB8, 0xF3, 0x86, 0x0B, 0xD9, 0x54, 0x5F, 
-0x60, 0xBE, 0xB9, 0xC4, 0xAD, 0x9F, 0xBC, 0x99, 0x43, 0x4F, 
-0xDC, 0xCF, 0x15, 0xEF, 0xBC, 0x80, 0xD1, 0xB5, 0xEB, 0x59, 
-0x0D, 0xDE, 0x79, 0xD1, 0xDB, 0x99, 0x69, 0x2D, 0x31, 0xDD, 
-0x35, 0xCC, 0xB4, 0x61, 0xBA, 0x15, 0x99, 0x5E, 0x8C, 0x4C, 
-0x37, 0x23, 0x47, 0x4F, 0x0A, 0xAD, 0x22, 0x45, 0xAD, 0x60, 
-0xAD, 0x85, 0x6E, 0x35, 0xC8, 0xD1, 0x79, 0x25, 0xC9, 0x32, 
-0x16, 0x7B, 0x2D, 0xB0, 0x05, 0x97, 0x5F, 0xF9, 0x01, 0x2E, 
-0xDE, 0xF6, 0x2E, 0x0E, 0xBF, 0xF4, 0x32, 0x59, 0x96, 0x73, 
-0xD9, 0x85, 0x1B, 0x09, 0xDD, 0x05, 0x56, 0x8B, 0xD9, 0x93, 
-0x73, 0x1C, 0x79, 0x65, 0x8A, 0xB8, 0x41, 0x31, 0x65, 0x42, 
-0x59, 0x16, 0x48, 0x95, 0xA2, 0xD1, 0xD3, 0x6C, 0x16, 0x2C, 
-0xF5, 0x12, 0x44, 0x4A, 0x14, 0x2A, 0x8A, 0x90, 0x33, 0xD7, 
-0xAB, 0x71, 0xB2, 0x15, 0x89, 0x6B, 0x37, 0xF1, 0xCF, 0x87, 
-0xC7, 0xD8, 0x71, 0xDF, 0x4E, 0x06, 0x06, 0x87, 0xD8, 0xB2, 
-0x65, 0x0B, 0x00, 0xF7, 0xDE, 0xFB, 0x25, 0xCE, 0x3F, 0xFF, 
-0x3C, 0xAA, 0xAA, 0x5A, 0x15, 0x81, 0x8B, 0x2E, 0xB9, 0x84, 
-0xF7, 0x8F, 0xB5, 0x99, 0x3A, 0x72, 0x8C, 0xD9, 0xE0, 0x98, 
-0xAF, 0x2C, 0x4D, 0x12, 0xE6, 0x0A, 0xC7, 0xCC, 0x52, 0xA4, 
-0x53, 0x08, 0x22, 0x01, 0x2B, 0x52, 0x12, 0xC5, 0x82, 0x1D, 
-0x82, 0x24, 0xA5, 0x52, 0x21, 0x0C, 0xAD, 0x67, 0x61, 0x71, 
-0x6A, 0xC5, 0x84, 0xE3, 0xE3, 0xE3, 0x8C, 0x8F, 0x8F, 0x13, 
-0x63, 0x5C, 0x15, 0x81, 0x75, 0xA7, 0xAF, 0xE7, 0xAA, 0x4B, 
-0xDE, 0xC6, 0xEE, 0x89, 0x79, 0xF2, 0xB3, 0x37, 0x53, 0x2D, 
-0x75, 0x28, 0x3B, 0x25, 0x65, 0xAB, 0x45, 0x37, 0x96, 0x40, 
-0x1B, 0xA1, 0x85, 0x8A, 0x46, 0xCC, 0x60, 0x8A, 0xAB, 0x37, 
-0x88, 0x46, 0x30, 0x3E, 0xA1, 0x1E, 0x8F, 0xF2, 0xEE, 0x4B, 
-0xB7, 0xFE, 0x9F, 0x13, 0xBF, 0x96, 0xD1, 0xAB, 0xC1, 0x73, 
-0x07, 0x0F, 0x12, 0xD7, 0xAF, 0xC3, 0xF9, 0x84, 0xA4, 0x5E, 
-0xC3, 0xE5, 0x19, 0xB6, 0x56, 0x23, 0xA9, 0x0F, 0x83, 0xF7, 
-0x7D, 0x6D, 0x80, 0x88, 0x6D, 0x24, 0xB8, 0xA1, 0x01, 0x92, 
-0x7A, 0x4E, 0x96, 0x67, 0xB4, 0xCE, 0xB8, 0x90, 0xAF, 0x3E, 
-0xF0, 0x5D, 0x28, 0xBB, 0xFC, 0x3E, 0x58, 0x9A, 0x9B, 0xE1, 
-0xA1, 0x9D, 0x5F, 0xE6, 0x5F, 0x8F, 0x66, 0xAC, 0xD9, 0x7C, 
-0x0E, 0x46, 0x05, 0x75, 0x16, 0x9F, 0xA7, 0x7D, 0x1F, 0xA7, 
-0xAD, 0x41, 0x73, 0x0F, 0x02, 0x4A, 0x04, 0x5C, 0x44, 0x6C, 
-0x85, 0xCF, 0x13, 0x94, 0x8A, 0xC6, 0x99, 0x6F, 0x64, 0x57, 
-0xF1, 0x87, 0xFC, 0xC5, 0xA7, 0xEF, 0xE0, 0x97, 0x3F, 0xDF, 
-0xCB, 0xD4, 0xE1, 0xC9, 0xFF, 0x17, 0x81, 0xBB, 0xBF, 0xB8, 
-0x83, 0x1B, 0x27, 0x0A, 0xAA, 0xF7, 0xDC, 0x4C, 0x6E, 0x1D, 
-0x6A, 0x04, 0xE7, 0x15, 0xE7, 0x2D, 0x62, 0x05, 0x4C, 0x40, 
-0xFD, 0x72, 0x5D, 0x01, 0xB0, 0xA9, 0x80, 0x54, 0xA0, 0x81, 
-0x24, 0x73, 0x0C, 0x58, 0x65, 0xE4, 0xB2, 0x0F, 0xF3, 0x2D, 
-0x7B, 0x31, 0xEF, 0xBF, 0xFB, 0xBB, 0x5C, 0x76, 0xF3, 0x5D, 
-0x7C, 0x6D, 0xE7, 0x4E, 0x62, 0xB1, 0x8A, 0x15, 0x89, 0x81, 
-0x12, 0xC7, 0xA0, 0x7A, 0xAC, 0x17, 0x7C, 0x62, 0x70, 0x5E, 
-0x11, 0x13, 0xA9, 0x42, 0x97, 0x10, 0x7A, 0x54, 0x55, 0x0B, 
-0xC9, 0x40, 0x54, 0xFA, 0x2B, 0xA0, 0x99, 0x62, 0x32, 0x03, 
-0x5A, 0xA1, 0x4E, 0x70, 0x4E, 0x91, 0x66, 0x93, 0xE1, 0x73, 
-0x2E, 0x60, 0xE4, 0x8F, 0x6F, 0x43, 0xAF, 0xFB, 0x2C, 0xB7, 
-0x3F, 0xD3, 0xE5, 0xF6, 0xBF, 0xB9, 0x83, 0xAA, 0xF7, 0x3A, 
-0x24, 0x44, 0xB9, 0xF3, 0x6F, 0xFF, 0x8A, 0xAF, 0x5D, 0x39, 
-0x48, 0xEF, 0x5F, 0xFE, 0x9E, 0x66, 0xB9, 0x80, 0x49, 0x95, 
-0x48, 0x45, 0x94, 0x80, 0xDA, 0x88, 0xF1, 0x8A, 0xFA, 0x7E, 
-0xAD, 0xD1, 0x18, 0x22, 0xB1, 0x2A, 0xF0, 0xB9, 0xC7, 0x18, 
-0x41, 0x63, 0x85, 0xF3, 0x4A, 0xAD, 0x96, 0x52, 0x76, 0xDA, 
-0x74, 0x4E, 0xCE, 0xE0, 0xA4, 0x62, 0xFD, 0xFB, 0x3E, 0xC2, 
-0xFD, 0x33, 0x6B, 0x78, 0xF8, 0xE1, 0x47, 0x56, 0xB5, 0x0D, 
-0xD7, 0xDE, 0xF0, 0x11, 0xBE, 0x72, 0xC3, 0x45, 0x94, 0x4F, 
-0xDC, 0x4F, 0x17, 0xC1, 0x5A, 0xC1, 0x3B, 0xC1, 0x18, 0xC1, 
-0x98, 0x88, 0x9A, 0x7E, 0x9F, 0xA1, 0x04, 0x50, 0x2A, 0x44, 
-0xC0, 0x1A, 0x88, 0xA1, 0xC4, 0x02, 0xCE, 0x09, 0xA9, 0x33, 
-0x24, 0x4E, 0xA1, 0xD7, 0xC5, 0x17, 0x1D, 0x06, 0x36, 0x5C, 
-0xC8, 0x89, 0x66, 0x7B, 0xD5, 0xB9, 0xF0, 0x47, 0x1F, 0xBA, 
-0x8E, 0xAB, 0xD7, 0x09, 0x9D, 0xE3, 0x87, 0x70, 0xDE, 0x62, 
-0x8D, 0x62, 0x9D, 0xA0, 0xCE, 0x60, 0xAC, 0x20, 0x44, 0x2C, 
-0x11, 0x62, 0x59, 0x62, 0x24, 0x90, 0xD5, 0x52, 0x92, 0xDC, 
-0x82, 0x04, 0x08, 0x90, 0x26, 0x0E, 0x6B, 0x94, 0x4E, 0xA7, 
-0x87, 0x58, 0x43, 0xBE, 0xF0, 0x0A, 0x1B, 0xCE, 0x1C, 0x5A, 
-0x35, 0x81, 0xD0, 0x5E, 0xE0, 0xE5, 0xF9, 0x2E, 0xF9, 0xE6, 
-0x61, 0x52, 0x03, 0xD9, 0x40, 0x8D, 0xD0, 0xAD, 0x20, 0x33, 
-0xF8, 0x01, 0x07, 0x11, 0x34, 0xC6, 0x88, 0x18, 0x30, 0x89, 
-0xC3, 0x3A, 0x8F, 0xA1, 0x5F, 0x36, 0xBD, 0x35, 0x28, 0x91, 
-0x50, 0x95, 0xA4, 0xA9, 0x47, 0x55, 0x81, 0x80, 0xAE, 0x52, 
-0x06, 0x4E, 0x1C, 0x3B, 0xCA, 0x2D, 0x7F, 0x7D, 0x37, 0xFB, 
-0x37, 0x6C, 0x63, 0xF4, 0xB4, 0x35, 0x84, 0xAA, 0x42, 0x55, 
-0x49, 0xB3, 0x0C, 0x11, 0xA1, 0xEC, 0xF4, 0x15, 0x55, 0x79, 
-0xAD, 0xEF, 0x51, 0x45, 0x55, 0x40, 0x85, 0x10, 0x2A, 0xDA, 
-0x9D, 0x0E, 0x65, 0x55, 0x50, 0x55, 0x25, 0x45, 0xAF, 0x87, 
-0x12, 0x88, 0x6B, 0x36, 0x30, 0x39, 0x3B, 0xBF, 0x2A, 0x02, 
-0x3F, 0xFA, 0xC9, 0x4F, 0xD9, 0xD5, 0x5E, 0xC7, 0xDA, 0xF3, 
-0xB7, 0x53, 0x34, 0x17, 0x31, 0xC6, 0x40, 0x8C, 0x74, 0xDB, 
-0x6D, 0x8C, 0x77, 0x18, 0xA7, 0x10, 0xC1, 0x02, 0xA8, 0x11, 
-0x42, 0x08, 0x14, 0x45, 0x05, 0xAA, 0x58, 0xA3, 0x38, 0xE7, 
-0x88, 0x21, 0xE0, 0xBC, 0x25, 0x84, 0x08, 0xD1, 0x21, 0xA3, 
-0x23, 0x1C, 0x7C, 0x71, 0xB6, 0xDF, 0xA8, 0xBE, 0x8E, 0x22, 
-0xCE, 0x2E, 0x75, 0x19, 0x1D, 0x1D, 0xC3, 0x55, 0x01, 0xBC, 
-0x27, 0x8A, 0xD2, 0xED, 0x74, 0x89, 0x21, 0xA2, 0xCE, 0xA1, 
-0xDE, 0x12, 0xE3, 0xB2, 0x10, 0x89, 0x80, 0x11, 0x08, 0x45, 
-0x8F, 0x58, 0x15, 0xA8, 0x51, 0x8C, 0x0A, 0x84, 0x0A, 0xEF, 
-0x2D, 0x02, 0xA8, 0x04, 0x12, 0x55, 0x8E, 0xB5, 0xA0, 0xAA, 
-0x8A, 0xD7, 0xD1, 0x82, 0x8A, 0x3D, 0xFB, 0x7E, 0x41, 0x3A, 
-0x3C, 0x86, 0xB3, 0x10, 0x42, 0x85, 0x55, 0x21, 0x96, 0x15, 
-0xD6, 0x0A, 0xC6, 0x82, 0x51, 0xB3, 0xBC, 0x05, 0x22, 0xA8, 
-0x82, 0x33, 0x81, 0x3C, 0x4B, 0xA8, 0xE7, 0x19, 0x59, 0xEA, 
-0xF0, 0x56, 0xB0, 0x02, 0x86, 0x48, 0x96, 0x58, 0x9C, 0x01, 
-0x35, 0x81, 0xB5, 0xB9, 0x62, 0xEC, 0xCA, 0x86, 0x64, 0xEF, 
-0xDE, 0xBD, 0x34, 0x9B, 0xCD, 0x53, 0xE3, 0x93, 0xD3, 0xC7, 
-0x99, 0x78, 0xE1, 0x55, 0x46, 0x36, 0xBE, 0x19, 0xAD, 0x7A, 
-0xE4, 0x89, 0xC5, 0x68, 0x20, 0xF1, 0x86, 0x34, 0x71, 0xA4, 
-0xDE, 0x22, 0x31, 0x10, 0x01, 0x15, 0x15, 0xAC, 0xB7, 0x78, 
-0x13, 0x49, 0x13, 0x83, 0xB5, 0x91, 0xCC, 0x28, 0x79, 0xEA, 
-0x70, 0x3E, 0x12, 0xCB, 0x2E, 0x96, 0x0A, 0xE3, 0x02, 0xA1, 
-0xDD, 0x61, 0x7C, 0x28, 0xF9, 0x5F, 0x01, 0xDF, 0x73, 0xCF, 
-0x3D, 0x1C, 0x38, 0x70, 0xE0, 0xD4, 0xF8, 0x97, 0xBF, 0x7A, 
-0x9E, 0x13, 0xB6, 0x41, 0x7D, 0xA8, 0x86, 0x21, 0xE0, 0x14, 
-0x24, 0x14, 0x64, 0x5E, 0x69, 0x34, 0x32, 0xBC, 0x06, 0x84, 
-0xAA, 0xFF, 0x17, 0x84, 0x10, 0x70, 0x12, 0xA9, 0xD7, 0x12, 
-0xBC, 0x89, 0xE4, 0x4E, 0x70, 0x2E, 0xE2, 0x4C, 0x24, 0xB3, 
-0x86, 0xCC, 0x19, 0x52, 0x2F, 0x8C, 0x0C, 0x35, 0xE8, 0xED, 
-0xFB, 0x0F, 0xB6, 0x6C, 0x38, 0x63, 0x85, 0xF3, 0xC5, 0xC5, 
-0x45, 0xA6, 0xA7, 0xA7, 0x19, 0x1B, 0x1B, 0x3B, 0x65, 0x7B, 
-0xD3, 0x96, 0xAD, 0x5C, 0xF3, 0x06, 0xE1, 0xD7, 0x0F, 0xDD, 
-0x81, 0x4A, 0x9B, 0xD4, 0x43, 0xE6, 0x0D, 0x59, 0x6A, 0x30, 
-0x94, 0xB8, 0xD8, 0x45, 0xCB, 0x62, 0x39, 0x07, 0x44, 0x30, 
-0x22, 0xE4, 0x4E, 0x48, 0xAD, 0xA0, 0xA1, 0xC0, 0x11, 0xC8, 
-0x9D, 0x52, 0x4B, 0x2D, 0xB9, 0x37, 0x9C, 0x36, 0xD2, 0x60, 
-0xE6, 0x99, 0xDD, 0x9C, 0xB3, 0xF4, 0x0B, 0xB6, 0x5F, 0x7E, 
-0xF9, 0x0A, 0x02, 0x93, 0x93, 0x93, 0xD4, 0x6A, 0x35, 0x46, 
-0x46, 0x46, 0x4E, 0xD9, 0x06, 0x87, 0x47, 0xF9, 0xC2, 0x9D, 
-0x7F, 0xC7, 0x7D, 0xD7, 0x5F, 0xCC, 0xFC, 0x13, 0x0F, 0x33, 
-0x76, 0xDA, 0x30, 0x43, 0xF5, 0xAC, 0x1F, 0x8C, 0x8D, 0x64, 
-0x36, 0x60, 0x35, 0xF6, 0xAB, 0x61, 0x8C, 0x11, 0x9F, 0x38, 
-0x52, 0x2F, 0x68, 0xD9, 0x25, 0xB1, 0x7D, 0x05, 0x34, 0xB1, 
-0xAF, 0x52, 0x89, 0x33, 0xF4, 0x4E, 0xCC, 0x30, 0xFA, 0xE2, 
-0x04, 0xDF, 0xF8, 0xD2, 0x5D, 0x34, 0x06, 0x87, 0x57, 0x10, 
-0xE8, 0xF6, 0x7A, 0x1C, 0x3F, 0x76, 0x94, 0x3C, 0x4B, 0x57, 
-0xEE, 0x8B, 0x5A, 0xC6, 0xCF, 0xDA, 0x8C, 0x54, 0x3D, 0x5C, 
-0x04, 0x2F, 0xB1, 0x2F, 0x46, 0xCE, 0x30, 0x50, 0xCF, 0xF0, 
-0x56, 0x99, 0x6B, 0x15, 0xD8, 0xAA, 0x0A, 0x0A, 0x50, 0x4F, 
-0x2D, 0xA5, 0x4D, 0x70, 0x56, 0x29, 0x5B, 0x2D, 0xD4, 0x28, 
-0x99, 0x75, 0x78, 0xEF, 0x28, 0xDA, 0x15, 0x59, 0x9A, 0x90, 
-0xE5, 0xB5, 0x15, 0x67, 0xC4, 0x76, 0x73, 0x9E, 0xE7, 0xF7, 
-0xEC, 0x61, 0x52, 0xD6, 0xF0, 0xF5, 0x47, 0xBE, 0x8D, 0x35, 
-0xCA, 0x70, 0xE6, 0xA8, 0x25, 0x96, 0x5E, 0x10, 0xBE, 0xF9, 
-0xD8, 0x93, 0xAC, 0xDD, 0x7E, 0x13, 0xF4, 0x3A, 0xD8, 0x18, 
-0x31, 0x46, 0x91, 0xE5, 0x46, 0x34, 0x02, 0xB9, 0x15, 0xB5, 
-0xEB, 0x06, 0x6C, 0x79, 0xF4, 0xE0, 0x34, 0xCE, 0xA4, 0x64, 
-0x26, 0xA2, 0xD6, 0x50, 0xC6, 0x88, 0xB1, 0x16, 0x63, 0x2D, 
-0xAA, 0x86, 0xC6, 0xFA, 0x37, 0xF0, 0xDC, 0xC0, 0x46, 0xEE, 
-0xFA, 0xCC, 0x67, 0x38, 0x6F, 0xEB, 0x05, 0xBC, 0x30, 0x75, 
-0x84, 0x67, 0xF7, 0xFF, 0x9A, 0xCA, 0x0D, 0xD0, 0x49, 0x47, 
-0xB9, 0xF2, 0xF6, 0x7B, 0xF9, 0xB7, 0x03, 0xCF, 0x01, 0x60, 
-0xAA, 0x0E, 0x21, 0x2C, 0x81, 0x1A, 0x06, 0xB7, 0x7F, 0x94, 
-0xB5, 0x67, 0x6F, 0xA6, 0xDB, 0xEE, 0x91, 0x79, 0x47, 0x08, 
-0xE0, 0x10, 0xAA, 0x90, 0x70, 0x6C, 0xEA, 0x38, 0xEB, 0xCF, 
-0xF4, 0xA5, 0xDD, 0xF4, 0x07, 0xC3, 0x57, 0xD7, 0xFF, 0xE9, 
-0xC9, 0x5D, 0x13, 0xDF, 0x77, 0x43, 0x5B, 0xCF, 0x5E, 0x8F, 
-0x7A, 0x07, 0xA1, 0x22, 0x86, 0x88, 0x18, 0x03, 0x46, 0x51, 
-0x51, 0x06, 0xCF, 0x78, 0x2B, 0xDF, 0xF9, 0x59, 0xE4, 0xC1, 
-0x6F, 0xBD, 0x40, 0x6D, 0x74, 0x98, 0x35, 0x63, 0xDB, 0x71, 
-0x59, 0x4E, 0x6D, 0x68, 0x84, 0xF6, 0xB1, 0x39, 0xF2, 0xC1, 
-0x71, 0xD4, 0x1A, 0xC4, 0x9A, 0xBE, 0xEC, 0x1A, 0x21, 0x04, 
-0x78, 0x79, 0xDF, 0xF3, 0x08, 0x91, 0x10, 0x2A, 0x62, 0x59, 
-0x11, 0x8B, 0x92, 0x3D, 0x93, 0x53, 0x34, 0x26, 0x7F, 0x38, 
-0xB7, 0xE9, 0x4F, 0xAF, 0xB8, 0xC6, 0x06, 0x31, 0x13, 0xEB, 
-0x8A, 0x5F, 0x5D, 0x71, 0xEC, 0xB9, 0xD3, 0x1F, 0xFF, 0xCE, 
-0xB3, 0x3F, 0x4F, 0x92, 0x91, 0x7A, 0x9F, 0x40, 0xAB, 0x0B, 
-0xA2, 0xFD, 0xC3, 0xA5, 0x11, 0x88, 0x60, 0x4C, 0x0A, 0x92, 
-0x73, 0xFC, 0x70, 0x93, 0x17, 0x0F, 0xEE, 0xEB, 0x1F, 0xC5, 
-0xAD, 0x05, 0x15, 0x62, 0xAF, 0x40, 0x8D, 0x40, 0x9E, 0x40, 
-0xD9, 0x43, 0x7A, 0x65, 0xBF, 0xBC, 0x9E, 0x2A, 0x1E, 0x91, 
-0x58, 0x55, 0x74, 0x5B, 0x1D, 0x86, 0x0D, 0xDD, 0xD3, 0xAB, 
-0x17, 0xAF, 0x0A, 0x62, 0x9F, 0xFE, 0xEF, 0x01, 0x00, 0x46, 
-0xBB, 0xB1, 0xB5, 0x3F, 0x50, 0x9D, 0x5B, 0x00, 0x00, 0x00, 
-0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82
+0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 
+0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 
+0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a, 0xf4, 0x00, 0x00, 0x00, 
+0x06, 0x62, 0x4b, 0x47, 0x44, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0xa0, 
+0xbd, 0xa7, 0x93, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 
+0x00, 0x0b, 0x13, 0x00, 0x00, 0x0b, 0x13, 0x01, 0x00, 0x9a, 0x9c, 0x18, 
+0x00, 0x00, 0x00, 0x07, 0x74, 0x49, 0x4d, 0x45, 0x07, 0xdd, 0x07, 0x07, 
+0x00, 0x25, 0x16, 0x51, 0xa4, 0x24, 0x4e, 0x00, 0x00, 0x09, 0x13, 0x49, 
+0x44, 0x41, 0x54, 0x58, 0xc3, 0x9d, 0x97, 0x6b, 0x8c, 0x5d, 0x55, 0x15, 
+0xc7, 0x7f, 0x6b, 0xed, 0xbd, 0xcf, 0xeb, 0xde, 0x99, 0xb9, 0x33, 0x53, 
+0x3a, 0xa5, 0x64, 0xa4, 0x50, 0xb0, 0xa0, 0x96, 0x50, 0x20, 0x84, 0x47, 
+0x95, 0x80, 0x0f, 0x10, 0x50, 0x41, 0x4d, 0x10, 0xe2, 0x07, 0xc3, 0x23, 
+0xe1, 0x21, 0x46, 0x3e, 0x28, 0x26, 0x2a, 0xc6, 0x08, 0x41, 0x89, 0x46, 
+0x14, 0xb5, 0x8d, 0x0f, 0x7c, 0x00, 0x31, 0x6a, 0x94, 0x2a, 0x8d, 0x8f, 
+0x40, 0x35, 0x0d, 0x1a, 0x14, 0x95, 0x56, 0x41, 0x2a, 0xb5, 0x4c, 0x29, 
+0xd0, 0x69, 0x67, 0x98, 0x4e, 0x67, 0xe6, 0xce, 0xdc, 0xc7, 0x79, 0xec, 
+0xed, 0x87, 0x3b, 0x54, 0x27, 0x3e, 0x18, 0xfd, 0x27, 0x27, 0x39, 0x7b, 
+0x9d, 0x73, 0xf6, 0xfe, 0xaf, 0xb5, 0xd7, 0xf9, 0xaf, 0xb5, 0xe5, 0xc1, 
+0x07, 0x1f, 0x64, 0xf3, 0xa6, 0x4d, 0x67, 0x9f, 0xf7, 0xe6, 0x8b, 0xb7, 
+0x7a, 0x2f, 0xb1, 0x75, 0x8e, 0x20, 0x02, 0x00, 0x21, 0xf4, 0x2e, 0x16, 
+0xc7, 0x3d, 0xe3, 0x91, 0x3b, 0x11, 0x45, 0x44, 0x7a, 0x8f, 0x03, 0x84, 
+0xe0, 0x09, 0xc8, 0x3f, 0x5e, 0xf7, 0x61, 0xc9, 0x37, 0x02, 0x94, 0x65, 
+0x81, 0x0a, 0xdd, 0xed, 0x8f, 0xfc, 0xf4, 0xd2, 0xeb, 0x6f, 0xb8, 0xe1, 
+0x31, 0xeb, 0x8c, 0x9e, 0xb7, 0x63, 0xcf, 0x4b, 0x5b, 0xfa, 0xd6, 0x4c, 
+0x36, 0xae, 0x7c, 0xfb, 0x1b, 0x29, 0x4a, 0x0f, 0x62, 0x08, 0x02, 0xe2, 
+0x3d, 0x81, 0x80, 0x2c, 0xce, 0x18, 0x16, 0x49, 0xa9, 0x08, 0x51, 0x92, 
+0x30, 0x33, 0x33, 0x4b, 0x73, 0x6e, 0x16, 0x44, 0x89, 0xe3, 0x98, 0xe1, 
+0xe1, 0x61, 0x44, 0x84, 0xbc, 0x28, 0x7a, 0x0b, 0x06, 0xbf, 0x94, 0x74, 
+0x08, 0x38, 0xab, 0x7c, 0x77, 0xcb, 0xc3, 0xb5, 0x1d, 0xbb, 0x27, 0x7f, 
+0xea, 0x8c, 0x5e, 0x66, 0x77, 0x8d, 0x8d, 0x3f, 0xd4, 0xf6, 0x71, 0xdf, 
+0xcd, 0xd7, 0x5c, 0x41, 0x12, 0x47, 0xe4, 0x45, 0x05, 0x28, 0xc8, 0xcb, 
+0xac, 0x5f, 0x76, 0x0f, 0x82, 0x0a, 0x0a, 0xd4, 0xb2, 0x1a, 0xbf, 0x7f, 
+0xfc, 0xb7, 0xec, 0xdd, 0xb3, 0x0b, 0x0d, 0x25, 0xa2, 0x4a, 0x5e, 0x94, 
+0x4c, 0xf4, 0x37, 0x38, 0xf7, 0x0d, 0x6f, 0x62, 0x70, 0x70, 0x88, 0x85, 
+0x85, 0x79, 0x10, 0xe9, 0xf9, 0xed, 0x03, 0x22, 0x10, 0x24, 0x10, 0xa9, 
+0x70, 0xf3, 0x75, 0x57, 0xf2, 0x8b, 0x5f, 0x3e, 0xda, 0xd8, 0x35, 0x36, 
+0xfe, 0x90, 0x7d, 0x71, 0x62, 0xda, 0xae, 0x3f, 0xe5, 0x75, 0x4c, 0x1e, 
+0x9a, 0x65, 0xa1, 0x1b, 0x10, 0x63, 0x09, 0x28, 0x08, 0x04, 0xef, 0x17, 
+0x43, 0x2d, 0x84, 0xaa, 0xc2, 0xc6, 0x11, 0x69, 0x92, 0xf1, 0xc8, 0x03, 
+0xdf, 0x60, 0x28, 0xad, 0xb8, 0xf6, 0x9a, 0xab, 0x39, 0xee, 0xb8, 0xe3, 
+0x01, 0x98, 0x9b, 0x9b, 0x65, 0xdb, 0xb6, 0x6d, 0x6c, 0xfa, 0xd2, 0xe7, 
+0x39, 0xe7, 0xcd, 0xef, 0x64, 0x74, 0xcd, 0x5a, 0x9a, 0x73, 0x73, 0x18, 
+0x63, 0xf0, 0xde, 0x03, 0x01, 0x55, 0xc1, 0x17, 0x05, 0xf5, 0x18, 0xd6, 
+0x9f, 0xf2, 0x3a, 0x5e, 0x9c, 0x38, 0x6c, 0xad, 0x89, 0xea, 0xbe, 0x4b, 
+0x9d, 0xfd, 0x53, 0x6d, 0x9a, 0x85, 0x41, 0x4d, 0xa0, 0x04, 0xbc, 0x0f, 
+0x38, 0x67, 0xb0, 0x51, 0x42, 0x00, 0x8a, 0x4e, 0x49, 0x7d, 0x20, 0xe6, 
+0xb1, 0xad, 0x3f, 0x60, 0xe3, 0x89, 0x0d, 0x3e, 0xf0, 0xc1, 0x5b, 0xf8, 
+0x67, 0xf4, 0xf7, 0x0f, 0x70, 0xf9, 0xe5, 0xef, 0xe4, 0xa4, 0x75, 0xeb, 
+0xf8, 0xe8, 0xed, 0x9f, 0x63, 0xdd, 0xc6, 0x77, 0x51, 0xef, 0x1b, 0xa0, 
+0x28, 0xdb, 0xc8, 0xa2, 0x13, 0x46, 0x95, 0xa2, 0xdd, 0xa2, 0x91, 0x40, 
+0x1e, 0xfa, 0x30, 0x71, 0xdd, 0x5b, 0x75, 0x35, 0x66, 0xf3, 0x3e, 0x9e, 
+0x9f, 0xea, 0xb2, 0xe0, 0x1d, 0xe2, 0x40, 0xe2, 0x1a, 0x6a, 0x2d, 0xcd, 
+0x97, 0xa6, 0x19, 0xff, 0xcd, 0xb7, 0x31, 0xf5, 0x15, 0x9c, 0x7c, 0xc1, 
+0x95, 0xfc, 0x61, 0xfb, 0xa3, 0xac, 0x4d, 0x3b, 0xdc, 0x78, 0xe3, 0x4d, 
+0xfc, 0x27, 0x9c, 0xfc, 0x9a, 0xd7, 0xf2, 0xe1, 0xf7, 0x5f, 0xcd, 0x2d, 
+0x9f, 0xf9, 0x16, 0x1b, 0xde, 0x76, 0x1d, 0x55, 0xbb, 0xe8, 0x25, 0x2a, 
+0x10, 0xca, 0x9c, 0xa2, 0xd3, 0xa1, 0x19, 0x5b, 0x9a, 0xe5, 0x10, 0xea, 
+0x6a, 0x58, 0xb5, 0x11, 0xf3, 0xdd, 0x3e, 0xf6, 0x4d, 0x76, 0x69, 0xab, 
+0x47, 0xfb, 0x33, 0x66, 0xf6, 0x3e, 0x49, 0x7b, 0xf2, 0x05, 0x66, 0xf6, 
+0xef, 0xe3, 0xbe, 0x3b, 0xae, 0xe5, 0xd1, 0xc7, 0x7e, 0xcf, 0x03, 0xbf, 
+0xfa, 0x15, 0xd9, 0xe4, 0x1f, 0xb9, 0xf7, 0x9b, 0x9f, 0xc1, 0x46, 0x11, 
+0xff, 0x0d, 0x67, 0x9d, 0xb3, 0x91, 0x4b, 0xcf, 0xdc, 0xce, 0xd6, 0x9d, 
+0x4f, 0x70, 0xcc, 0x09, 0xa7, 0xd1, 0x59, 0x98, 0xc7, 0x1a, 0x43, 0xd1, 
+0x2d, 0xf0, 0x1d, 0x68, 0x6a, 0x49, 0xab, 0x1c, 0xc6, 0x9a, 0x18, 0x55, 
+0x63, 0x58, 0x28, 0x32, 0xc6, 0xa7, 0x3d, 0xd3, 0x45, 0xca, 0xf3, 0xfb, 
+0x0f, 0x70, 0x72, 0xb9, 0x97, 0x3b, 0xae, 0x3a, 0x83, 0x13, 0xeb, 0x73, 
+0xcc, 0x36, 0x17, 0xb8, 0xf9, 0xa6, 0xeb, 0xd9, 0xfb, 0xf0, 0xbd, 0x5c, 
+0xfc, 0xfa, 0xd3, 0x19, 0x5e, 0xb9, 0x9a, 0xe5, 0xe0, 0xf5, 0x67, 0x9d, 
+0xc9, 0x54, 0x6b, 0x81, 0xc9, 0xae, 0x61, 0xaa, 0x0d, 0x93, 0xad, 0xc0, 
+0xe4, 0x7c, 0x60, 0xb2, 0x19, 0x38, 0x70, 0x58, 0x68, 0x15, 0x09, 0x6a, 
+0x05, 0x6b, 0x2d, 0x74, 0xab, 0x01, 0x0e, 0xcc, 0x2a, 0x71, 0x9a, 0x32, 
+0x9f, 0xb7, 0xc0, 0x16, 0x5c, 0x78, 0xc9, 0xdb, 0x39, 0x7b, 0xe3, 0x1b, 
+0xd8, 0xf7, 0xfc, 0x0b, 0xa4, 0x69, 0xc6, 0x05, 0x67, 0xac, 0xc5, 0x77, 
+0xe7, 0x58, 0x2e, 0xa6, 0x0f, 0xcf, 0xb0, 0xff, 0xc5, 0x71, 0xc2, 0x1a, 
+0xc5, 0x94, 0x31, 0x65, 0x59, 0x20, 0x55, 0x82, 0x86, 0x88, 0x66, 0xb3, 
+0x60, 0x21, 0x8f, 0x11, 0x29, 0x51, 0xa8, 0x28, 0x7c, 0xc6, 0x4c, 0x5e, 
+0xe3, 0x70, 0x2b, 0x10, 0x56, 0x9e, 0xc8, 0xf7, 0xf7, 0x8d, 0xb0, 0xe9, 
+0x2b, 0x9b, 0xe9, 0x1f, 0x68, 0xb0, 0x7e, 0xfd, 0x7a, 0x00, 0xee, 0xb9, 
+0xe7, 0x8b, 0x9c, 0x7a, 0xea, 0x29, 0x54, 0x55, 0xb5, 0x2c, 0x02, 0x67, 
+0x9d, 0x7b, 0x2e, 0x6f, 0x1d, 0x69, 0x33, 0xbe, 0xff, 0x20, 0xd3, 0xde, 
+0x31, 0x5b, 0x59, 0x9a, 0xc4, 0xcc, 0x14, 0x8e, 0xa9, 0x85, 0x40, 0xa7, 
+0x10, 0x44, 0x3c, 0x56, 0xa4, 0x24, 0x88, 0x05, 0xdb, 0x80, 0x38, 0xa1, 
+0x52, 0xc1, 0x37, 0x56, 0x33, 0x37, 0x3f, 0xbe, 0x64, 0xc2, 0xd1, 0xd1, 
+0x51, 0x46, 0x47, 0x47, 0x09, 0x21, 0x2c, 0x8b, 0xc0, 0xaa, 0xa3, 0x57, 
+0x73, 0xe9, 0xb9, 0xa7, 0xb1, 0x6d, 0xfb, 0x2c, 0xd9, 0x09, 0xeb, 0xa8, 
+0x16, 0x3a, 0x94, 0x9d, 0x92, 0xa2, 0xd5, 0xa2, 0x1b, 0x4a, 0xa0, 0x8d, 
+0xd0, 0xc2, 0x8a, 0x06, 0xcc, 0x40, 0x82, 0xab, 0xf7, 0x11, 0x4c, 0x89, 
+0x8d, 0x62, 0xea, 0xe1, 0x00, 0x6f, 0x3c, 0x6f, 0xc3, 0xbf, 0x9d, 0xf8, 
+0xe5, 0x8c, 0x5e, 0x0e, 0x9e, 0xda, 0xb3, 0x87, 0xb0, 0xfa, 0x22, 0x5c, 
+0x14, 0x63, 0xc5, 0x20, 0x9a, 0x13, 0x72, 0x21, 0xd4, 0x63, 0x5a, 0x51, 
+0xab, 0xa7, 0x0d, 0x10, 0xb0, 0x7d, 0x31, 0xae, 0xd1, 0x4f, 0x5c, 0xcf, 
+0x48, 0xb3, 0x94, 0xd6, 0x31, 0x67, 0xf0, 0xd5, 0x6f, 0xfe, 0x04, 0xca, 
+0x2e, 0xff, 0x0f, 0x16, 0x66, 0xa6, 0xb8, 0x6f, 0xf3, 0x97, 0xf8, 0xd9, 
+0x81, 0x94, 0x15, 0xeb, 0x4e, 0xc2, 0xa8, 0xa0, 0xce, 0x12, 0x65, 0x09, 
+0x71, 0x3d, 0x23, 0x3b, 0x6a, 0x05, 0x9a, 0x45, 0x20, 0xa0, 0x04, 0xc0, 
+0x05, 0xc4, 0x56, 0x44, 0x59, 0x8c, 0x52, 0xd1, 0x77, 0xec, 0xf1, 0x6c, 
+0x29, 0x5e, 0xcd, 0x87, 0x3e, 0x7a, 0x3b, 0x7f, 0xfd, 0xf3, 0x4e, 0xc6, 
+0xf7, 0x8d, 0xfd, 0x4f, 0x04, 0xee, 0xfa, 0xc2, 0x26, 0xae, 0xde, 0x5e, 
+0x50, 0xbd, 0xe9, 0x7a, 0x32, 0xeb, 0x50, 0x23, 0xb8, 0x48, 0x71, 0x91, 
+0x45, 0xac, 0x80, 0xf1, 0x68, 0xb4, 0x58, 0x57, 0x00, 0x6c, 0x22, 0x20, 
+0x15, 0xa8, 0x27, 0x4e, 0x1d, 0xfd, 0x56, 0x19, 0xba, 0xe0, 0x3d, 0x7c, 
+0xcf, 0x9e, 0xcd, 0x5b, 0xef, 0xfa, 0x09, 0x17, 0x5c, 0x7f, 0x27, 0x5f, 
+0xdb, 0xbc, 0x99, 0x50, 0x2c, 0x23, 0x22, 0xc1, 0x53, 0xe2, 0x18, 0xd0, 
+0x08, 0x1b, 0x09, 0x51, 0x6c, 0x70, 0x91, 0x22, 0x26, 0x50, 0xf9, 0x2e, 
+0xde, 0xe7, 0x54, 0x55, 0x0b, 0x49, 0x41, 0x54, 0x7a, 0x11, 0xd0, 0x54, 
+0x31, 0xa9, 0x01, 0xad, 0x50, 0x27, 0x38, 0xa7, 0x48, 0xb3, 0xc9, 0xe0, 
+0x49, 0xa7, 0x33, 0xf4, 0x8e, 0x5b, 0xd0, 0x2b, 0x3e, 0xc5, 0x87, 0x1f, 
+0xef, 0x72, 0xeb, 0xc7, 0x6f, 0xa7, 0xca, 0x5f, 0x81, 0x84, 0x28, 0x77, 
+0x7c, 0xe2, 0x23, 0x7c, 0xed, 0x92, 0x01, 0xf2, 0x1f, 0x7e, 0x9a, 0x66, 
+0x39, 0x87, 0x49, 0x94, 0x40, 0x45, 0x10, 0x8f, 0xda, 0x80, 0x89, 0x14, 
+0x8d, 0x7a, 0xb5, 0x46, 0x83, 0x0f, 0x84, 0xaa, 0x20, 0xca, 0x22, 0x8c, 
+0x11, 0x34, 0x54, 0xb8, 0x48, 0xa9, 0xd5, 0x12, 0xca, 0x4e, 0x9b, 0xce, 
+0xe1, 0x29, 0x9c, 0x54, 0x1c, 0x73, 0xd1, 0x7b, 0xb9, 0x77, 0x6a, 0x05, 
+0xf7, 0xdf, 0xff, 0xc0, 0xb2, 0xb6, 0xe1, 0xf2, 0xab, 0xde, 0xcb, 0x97, 
+0xaf, 0x3a, 0x8b, 0xf2, 0xe1, 0x7b, 0xe9, 0x22, 0x58, 0x2b, 0x44, 0x4e, 
+0x30, 0x46, 0x30, 0x26, 0xa0, 0xa6, 0xd7, 0x67, 0x28, 0x1e, 0x94, 0x0a, 
+0x11, 0xb0, 0x06, 0x82, 0x2f, 0xb1, 0x80, 0x73, 0x42, 0xe2, 0x0c, 0xb1, 
+0x53, 0xc8, 0xbb, 0x44, 0x45, 0x87, 0xfe, 0x35, 0x67, 0x70, 0xa8, 0xd9, 
+0x5e, 0x76, 0x2e, 0xbc, 0xe5, 0xdd, 0x57, 0xf0, 0xb6, 0x55, 0x42, 0x67, 
+0x62, 0x2f, 0x2e, 0xb2, 0x58, 0xa3, 0x58, 0x27, 0xa8, 0x33, 0x18, 0x2b, 
+0x08, 0x01, 0x4b, 0x80, 0x50, 0x96, 0x18, 0xf1, 0xa4, 0xb5, 0x84, 0x38, 
+0xb3, 0x20, 0x1e, 0x3c, 0x24, 0xb1, 0xc3, 0x1a, 0xa5, 0xd3, 0xc9, 0x11, 
+0x6b, 0xc8, 0xe6, 0x5e, 0x64, 0xcd, 0xb1, 0x8d, 0x65, 0x13, 0xf0, 0xed, 
+0x39, 0x5e, 0x98, 0xed, 0x92, 0xad, 0x1b, 0x24, 0x31, 0x90, 0xf6, 0xd7, 
+0xf0, 0xdd, 0x0a, 0x52, 0x83, 0xeb, 0x77, 0x10, 0x40, 0x43, 0x08, 0x88, 
+0x01, 0x13, 0x3b, 0xac, 0x8b, 0x30, 0xf4, 0xca, 0x66, 0x64, 0x0d, 0x4a, 
+0xc0, 0x57, 0x25, 0x49, 0x12, 0xa1, 0xaa, 0x80, 0x47, 0x97, 0x29, 0x03, 
+0x87, 0x0e, 0x1e, 0xe0, 0x86, 0x8f, 0xdd, 0xc5, 0xae, 0x35, 0x1b, 0x19, 
+0x3e, 0x6a, 0x05, 0xbe, 0xaa, 0x50, 0x55, 0x92, 0x34, 0x45, 0x44, 0xa8, 
+0x3a, 0x3d, 0x45, 0x55, 0x5e, 0xee, 0x7b, 0x54, 0x51, 0x15, 0x50, 0xc1, 
+0xfb, 0x8a, 0x76, 0xa7, 0x43, 0x59, 0x15, 0x54, 0x55, 0x49, 0x91, 0xe7, 
+0x28, 0x9e, 0xb0, 0x62, 0x0d, 0x63, 0xd3, 0xb3, 0xcb, 0x22, 0xf0, 0xbb, 
+0x3f, 0xfc, 0x91, 0x2d, 0xed, 0x55, 0xac, 0x3c, 0xf5, 0x7c, 0x8a, 0xe6, 
+0x3c, 0xc6, 0x18, 0x08, 0x81, 0x6e, 0xbb, 0x8d, 0x89, 0x1c, 0xea, 0x14, 
+0x02, 0x58, 0x00, 0x31, 0x82, 0xf7, 0x9e, 0xa2, 0xa8, 0x40, 0x15, 0x6b, 
+0x14, 0xe7, 0x1c, 0xc1, 0x7b, 0x5c, 0x64, 0xf1, 0x3e, 0x40, 0x70, 0xc8, 
+0xf0, 0x10, 0x7b, 0x9e, 0x9d, 0xee, 0x35, 0xaa, 0xaf, 0xa0, 0x88, 0xd3, 
+0x0b, 0x5d, 0x86, 0x87, 0x47, 0x70, 0x95, 0x87, 0x28, 0x22, 0x88, 0xd2, 
+0xed, 0x74, 0x09, 0x3e, 0xa0, 0xce, 0x61, 0x22, 0x4b, 0x08, 0x8b, 0x42, 
+0x24, 0x02, 0x46, 0xc0, 0x17, 0x39, 0xa1, 0x2a, 0x50, 0xa3, 0x18, 0x15, 
+0xf0, 0x15, 0x51, 0x64, 0x11, 0x40, 0xc5, 0x13, 0xab, 0x72, 0xb0, 0x05, 
+0x55, 0x55, 0xbc, 0x82, 0x16, 0x54, 0xec, 0x78, 0xf2, 0x2f, 0x24, 0x83, 
+0x23, 0x38, 0x0b, 0xde, 0x57, 0x58, 0x15, 0x42, 0x59, 0x61, 0xad, 0x60, 
+0x2c, 0x18, 0x35, 0x8b, 0x5b, 0x20, 0x82, 0x51, 0x70, 0xc6, 0x93, 0xa5, 
+0x31, 0xf5, 0x2c, 0x25, 0x4d, 0x1c, 0x91, 0x15, 0xac, 0x80, 0x21, 0x90, 
+0xc6, 0x16, 0x67, 0x40, 0x8d, 0x67, 0x65, 0xa6, 0x18, 0xbb, 0xb4, 0x21, 
+0xd9, 0xb9, 0x73, 0x27, 0xcd, 0x66, 0xf3, 0xc8, 0xf8, 0xf0, 0xe4, 0x04, 
+0xdb, 0xff, 0xf6, 0x12, 0x43, 0x6b, 0x5f, 0x8b, 0x56, 0x39, 0x59, 0x6c, 
+0x31, 0xea, 0x89, 0x23, 0x43, 0x12, 0x3b, 0x92, 0xc8, 0x22, 0xc1, 0x13, 
+0x00, 0x15, 0x15, 0x6c, 0x64, 0x89, 0x4c, 0x20, 0x89, 0x0d, 0xd6, 0x06, 
+0x52, 0xa3, 0x64, 0x89, 0xc3, 0x45, 0x81, 0x50, 0x76, 0xb1, 0x54, 0x18, 
+0xe7, 0xf1, 0xed, 0x0e, 0xa3, 0x8d, 0xf8, 0x5f, 0x1c, 0xbe, 0xfb, 0xee, 
+0xbb, 0xd9, 0xbd, 0x7b, 0xf7, 0x91, 0xf1, 0x5f, 0x9f, 0x79, 0x9a, 0x43, 
+0xb6, 0x8f, 0x7a, 0xa3, 0x86, 0xc1, 0xe3, 0x14, 0xc4, 0x17, 0xa4, 0x91, 
+0xd2, 0xd7, 0x97, 0x12, 0xa9, 0x47, 0xa8, 0x7a, 0x7f, 0x81, 0xf7, 0x1e, 
+0x27, 0x81, 0x7a, 0x2d, 0x26, 0x32, 0x81, 0xcc, 0x09, 0xce, 0x05, 0x9c, 
+0x09, 0xa4, 0xd6, 0x90, 0x3a, 0x43, 0x12, 0x09, 0x43, 0x8d, 0x3e, 0xf2, 
+0x27, 0x7f, 0xcd, 0xfa, 0x35, 0xc7, 0x2c, 0x59, 0x7c, 0x7e, 0x7e, 0x9e, 
+0xc9, 0xc9, 0x49, 0x46, 0x46, 0x46, 0x8e, 0xd8, 0x5e, 0xb3, 0x7e, 0x03, 
+0x97, 0xbd, 0x4a, 0x78, 0xee, 0xbe, 0xdb, 0x51, 0x69, 0x93, 0x44, 0x90, 
+0x46, 0x86, 0x34, 0x31, 0x18, 0x4a, 0x5c, 0xe8, 0xa2, 0x65, 0xb1, 0x98, 
+0x03, 0x22, 0x18, 0x11, 0x32, 0x27, 0x24, 0x56, 0x50, 0x5f, 0xe0, 0xf0, 
+0x64, 0x4e, 0xa9, 0x25, 0x96, 0x2c, 0x32, 0x1c, 0x35, 0xd4, 0xc7, 0xd4, 
+0xe3, 0xdb, 0x38, 0x69, 0xe1, 0x2f, 0x9c, 0x7f, 0xe1, 0x85, 0x4b, 0x08, 
+0x8c, 0x8d, 0x8d, 0x51, 0xab, 0xd5, 0x18, 0x1a, 0x1a, 0x3a, 0x62, 0x1b, 
+0x18, 0x1c, 0xe6, 0xf3, 0x77, 0x7c, 0x92, 0xaf, 0x5c, 0x79, 0x36, 0xb3, 
+0x0f, 0xdf, 0xcf, 0xc8, 0x51, 0x83, 0x34, 0xea, 0x69, 0xcf, 0x19, 0x1b, 
+0x48, 0xad, 0xc7, 0x6a, 0xe8, 0x55, 0xc3, 0x10, 0x02, 0x51, 0xec, 0x48, 
+0x22, 0x41, 0xcb, 0x2e, 0xb1, 0xed, 0x29, 0xa0, 0x09, 0x3d, 0x95, 0x8a, 
+0x9d, 0x21, 0x3f, 0x34, 0xc5, 0xf0, 0xb3, 0xdb, 0xf9, 0xf6, 0x17, 0xef, 
+0xa4, 0x6f, 0x60, 0x70, 0x09, 0x81, 0x6e, 0x9e, 0x33, 0x71, 0xf0, 0x00, 
+0x59, 0x9a, 0x2c, 0xdd, 0x17, 0xb5, 0x8c, 0x1e, 0xb7, 0x0e, 0xa9, 0x72, 
+0x5c, 0x80, 0x48, 0x42, 0x4f, 0x8c, 0x9c, 0xa1, 0xbf, 0x9e, 0x12, 0x59, 
+0x65, 0xa6, 0x55, 0x60, 0xab, 0xca, 0x2b, 0x40, 0x3d, 0xb1, 0x94, 0x36, 
+0xc6, 0x59, 0xa5, 0x6c, 0xb5, 0x50, 0xa3, 0xa4, 0xd6, 0x11, 0x45, 0x8e, 
+0xa2, 0x5d, 0x91, 0x26, 0x31, 0x69, 0x56, 0x5b, 0x72, 0x46, 0x6c, 0x37, 
+0x67, 0x79, 0x7a, 0xc7, 0x0e, 0xc6, 0x64, 0x05, 0x5f, 0x7f, 0xe0, 0x07, 
+0x58, 0xa3, 0x0c, 0xa6, 0x8e, 0x5a, 0x6c, 0xc9, 0xbd, 0xf0, 0x9d, 0x87, 
+0x1e, 0x61, 0xe5, 0xf9, 0xd7, 0x40, 0xde, 0xc1, 0x86, 0x80, 0x31, 0x8a, 
+0x2c, 0x36, 0xa2, 0x01, 0xc8, 0xac, 0xa8, 0x5d, 0xd5, 0x6f, 0xcb, 0x03, 
+0x7b, 0x26, 0x71, 0x26, 0x21, 0x35, 0x01, 0xb5, 0x86, 0x32, 0x04, 0x8c, 
+0xb5, 0x18, 0x6b, 0x51, 0x35, 0xf4, 0xad, 0x7e, 0x15, 0x4f, 0xf5, 0xaf, 
+0xe5, 0xce, 0xdb, 0x6e, 0xe3, 0x94, 0x0d, 0xa7, 0xf3, 0xb7, 0xf1, 0xfd, 
+0x3c, 0xb1, 0xeb, 0x39, 0x2a, 0xd7, 0x4f, 0x27, 0x19, 0xe6, 0x92, 0x5b, 
+0xef, 0xe1, 0xe7, 0xbb, 0x9f, 0x02, 0xc0, 0x54, 0x1d, 0xbc, 0x5f, 0x00, 
+0x35, 0x0c, 0x9c, 0xff, 0x3e, 0x56, 0x9e, 0xb0, 0x8e, 0x6e, 0x3b, 0x27, 
+0x8d, 0x1c, 0xde, 0x83, 0x43, 0xa8, 0x7c, 0xcc, 0xc1, 0xf1, 0x09, 0x56, 
+0x1f, 0x1b, 0x95, 0xb2, 0xf5, 0xc7, 0x3f, 0x3c, 0xef, 0xda, 0xcf, 0x3e, 
+0xb2, 0xa5, 0x71, 0xe6, 0x85, 0x8d, 0x0d, 0x27, 0xac, 0x46, 0x23, 0x07, 
+0xbe, 0x22, 0xf8, 0x80, 0x18, 0x03, 0x46, 0x51, 0x51, 0xaa, 0x3c, 0xe7, 
+0x99, 0x3f, 0xed, 0x64, 0x6e, 0xe2, 0x25, 0x6a, 0xc3, 0x83, 0xac, 0x18, 
+0x59, 0x8d, 0x4b, 0x33, 0x6a, 0x8d, 0x21, 0x52, 0x67, 0x41, 0x04, 0xb5, 
+0x06, 0xb1, 0xa6, 0x27, 0xbb, 0x46, 0x10, 0x81, 0xa2, 0xdb, 0x45, 0x08, 
+0x78, 0x5f, 0x11, 0xca, 0x8a, 0x50, 0x94, 0xec, 0x18, 0x1b, 0x67, 0xe6, 
+0xb7, 0x3f, 0x9f, 0xf9, 0xfa, 0xad, 0x17, 0x5f, 0x66, 0xbd, 0x98, 0xed, 
+0xab, 0x8a, 0x67, 0x2e, 0x3e, 0xf8, 0xd4, 0xd1, 0x5b, 0x7f, 0xf4, 0xc4, 
+0x9f, 0xe3, 0x78, 0xa8, 0xde, 0x23, 0xd0, 0xea, 0x82, 0x68, 0xef, 0x70, 
+0x69, 0x04, 0x02, 0x18, 0x93, 0x80, 0x64, 0x4c, 0xec, 0x6b, 0xf2, 0xec, 
+0x9e, 0x27, 0x7b, 0x47, 0x71, 0x6b, 0x41, 0x85, 0x90, 0x17, 0xa8, 0x11, 
+0xc8, 0x62, 0x28, 0x73, 0x24, 0x2f, 0x7b, 0xe5, 0xf5, 0x48, 0xf1, 0x08, 
+0x84, 0xaa, 0xa2, 0xdb, 0xea, 0x30, 0x68, 0xe8, 0x1e, 0x5d, 0x3d, 0x7b, 
+0xa9, 0x17, 0xfb, 0xd8, 0xdf, 0x01, 0x8b, 0xfb, 0xb9, 0x42, 0x10, 0x02, 
+0xa4, 0xb6, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 
+0x60, 0x82, 
 };
-
diff --git a/Source/Core/DolphinWX/resources/Dolphin.png b/Source/Core/DolphinWX/resources/Dolphin.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3bfebe4878d8faf9f5b9f087690bbd535f24824
GIT binary patch
literal 2438
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
Ef|N{tS^xk5

literal 0
HcmV?d00001

diff --git a/Source/Core/DolphinWX/resources/dolphin_logo.png b/Source/Core/DolphinWX/resources/dolphin_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..73da44dfb092f1480e38d69e70c011d00e69b579
GIT binary patch
literal 34383
zcmV+8Kpek`P)<h;3K|Lk000e1NJLTq009R800DLg0ssI2?6=C400001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBWN%}GQ-RCr$Pod=i{Rkp`_Vox3zCXmxG<jj!ckaLbAL6U+<6ct4z
ziNL^+g9JrT5iwxEtZQ6zTGOWYHo4DDy6&#7tL`rE*Brcar>eTUI!x$L-@w<?Q+4as
zt@FPppA!=o7nh!%{_VHl#>B)ptd8^N&s%;U{W7`&p}PW>)DEdToz8#!;~$R9%*=iJ
z_T78$y{Ama-4~9#E*y8>dFROs$B7Ha9d3@}$B(PO@Y(BedpRGs**=by!*TTJQAXu|
zpN=C(j`(!G+$HFT?UlQYcgV@*@g|`khV@ECI@Os8Qz%xb7cv%l7TPwDJSYGQAi|N7
zlER-siGKX|!ttLA$G`vm@9)3=9%k~*H{bm8pa1;&>#x81>MQWX@pselx4->OeaC0Z
z<4YUIUu_&;*f>77as0(}{Q1v+*1zLdJI9|)#~=UrNA(?_EssC^;SYxI&EHsFXuh5K
z8#~iBKfZjUR!;w{FQ>lzeDCgUs5i+8?%t}R2u`r14tKPqzBiL1-$0_!DhEUh>Hh0q
z|ALIa`|dmF8LEc1h0b-#2MZv=0u_P>0Ruw_9vGK<FbR1uSsi!u<nCp7c#-aihVO++
z_}}vQ%-ivQ?vLO9{`dTm{|(2dpMJ_W{O{rToyX(1rsFri`3>Lkf8d9CaQVjblsrF<
z{MEb^vObne=xyOY<9%_CyBDY4tWTJCM_Q1g`ja9{!KxrlKmr*<%)rBd4FwEqROpZ}
z<AM7@**u1<h%A<QDdiir%I5cB`TpF!Y@sK2B=u`I$FF|%EBOl_%*X$lj{k9U{PLH-
zl)v!7eEh=A@pIGhv!DG;zT<=W_~{Ra<zEe7ng_R>h0K;eS<YNNm*Kf(VffO#M3yV5
z*4gkL1pIvIZWpk8-9i{T!i9MF(jBTT$xp#pwp0KELIfTP8^Sjf(-2@-ph7`{vxPr^
zFvbE5&ph+YiWMt*^yrbBn;RP&8@g&%bmoz>0uX9;b~Z%2eEIUnAAcOEfDnio27=Us
zWCf86(-3LO0u=^G04adQ5cl18U!OjGB4;V1Pa3W((7ShU)N6PSVh)52c`INjj!}kJ
z7$5<QfaAb@=FXkV8VwvcFkDwE`dpE=0<&k&Mm|I&gKxkz*!_iL2rw{Dm1^6dLey){
z;5;CKyx6Z_zpSjRNL#h&^M?Hjz%)Mi-~$vM_I(rtIELuoKmgNia&ofE1_eGqiI`u}
zCEzTaT~t&wY0{)J3sf-3G2w_~<tL6!-#9k^+p*=p<@xg;#};lOKYZrLx7)>R`ESgY
z|HN+j5C6+g>{fpM9UH)yzRtnp`SMWe(PWYrpHU_s)Z6*CdSP;F2o-XLXd&IQN6(%;
zF<PM3qliQB*li(xAYep=XxPY3h+OmL&2#xOemD|x@*T4ut=N?katQ<#E;=haXPpYG
z0+krhUWy8)tq@YN%U%_hrF`Zv`_XvFSUWDg^im9QsNfL1lA|u70)D|Kc!w|w7z*mO
zesNNhUXGi-sEl`G*iFl4v3z7f!Cr?lxQ!wq*vng%W^VezncqvNZJgq;3lt341;h^o
z@PE4`C_#nND8NnMzI_`sXdoB6xJ2bZg69#6@ke|r-^HzDAcf`bP*D$c(-%6&=-$0M
zZW-8xQoD%_xrhqzA&dee?$b{{T}A+_Xu-*Hb)ph>MG;LT03MRoj<aXaVvj<*fcSv`
zVN@4U0Y1d^g!r^_<;v1a&{0BZnWEr{g2&zpXv+7ZMT>C2D=RHBRVgaa!NCgR6S{dR
zDp1}-2^IEMB>F_r6@ajRI68OkjQc`#ZcI(3sDNvTo=uEXPEJlKDzIurS1`H);kN=1
z_74XkA(&_pq9A^BZbITO@(S>QBLjs4K2j#e33G4wtw{8VqALJl|8PL?L}rR53dT?d
z72?k(KBSDQ9bLZY3WVhf;DgqVPd@ns)dJ#&F+@=j)k7k91vFHA{PD-us1TPnI!BaO
zM1{tPSOJaDKl<n+qW&O$#3d4aOZAE<Dk6du!crXa@1g9Yg0!Y6uZY4UB32-Ziimj4
z{%x5NdsP$_A%}{jZQteX_(%TE&s*;NtX;`(Ms7S^bnUTrSL|*)b8FknclW>M=$PVj
z{59mBs|rn6L&b+5ekjpU)_O%$f~u6)mc9M!RwbW~+;pbj!p$8=&T7=Ab7sxP&dfY#
zdX_W2hBK{3Vp4iyQkwqbOs$sQutU#z8`|#vEN90*D`ncDeN(Tzf<jb;dk`QMMMVX_
zY4-b}tB=<2P~?b9ii?R$btY9$P0h{Bs98O;Wq#v6-MaSdT-d)?&zaMvUN+;>Ioi*N
zL4&e0(h?kw*yN06LuQTL`E--rUsmwsL;H4KQGst88&nh(75195cYNJu*Z=idydyEM
zfVY#AnbEzlaL&w`#ap&K`p6^Hs)3<PMHyA~M=$*%wP9X;_0{D|m$q%*JT(Dy#HBRq
zShQka!JfZW*i(e|jiRWiI`6OX&d*10f1=%`Hzs7(;=MGel{bCLl>5(|fzYKGnba?m
za&l7k%d&Kz6b0iPvdL~ecyP>!VYRbdxsz%6od>Tu*))m`uT}(`dPS61ls9;gmwGSS
z=B!qeH`2IHtrbg`Jo&^EQlv=Ac&S2nQYccYL`v~e^TD5_lp|Mh`4f*nK6lov%p@1z
z$muqI$mWL%_C#eW_s)B-s8D(ZrE;SFit@ll<C4D&xbg0cCLLMcIyI_o-naqz2RuN{
zkTt|D1?`CEmwJ!-K|+}2!8xk(uM|6Fw1*#lcv$~_+$AA3tJkd6QGv?s+q930sJ2}m
zkbp(>x?;04J)0LXdED5SUV4djhCjd@1P=lRA$=)jXE?~JHym;TC+mfP;T}?-<&N8K
zYu>OvjTf95xqYtKTo6^n%>q>v73D$ecE*H74BGTSYQwg?f_iy5yLRqGjaG&01P_Kv
zz)}ZZYGr#p%thl>5maup?#4BBvujZNv~a}CsHS0jUnW$rRiUkw#z93TC_5zX>p3Xa
z{g&>DOUsUTIL3|`@y6?~BcMtqB%8X_ax@eGRxmI$PH^|DI$vtY!#BVfNMmrRhWh^d
z?~fZb3RNQ^J$ulaJE8(r=}WXiMHw$%6cxTwyw~%Qn!3-pmX)uaU1P`g?O0Nk$m9+W
zHj!X?n(8+qVwGS+67ebLy>Z>TELU}}ggy&4HQoDnual366QZc7;MbhL>x)jqE@9cb
z6?S^)!3SZ@m{1{5ScF+*GISO38ygB3dKVrLi0Z-?c<#|h+qY=Wl&ZDpHPmIEig>q%
zO;qsaqBf`i@#C^Jt-B|^j*I@LPMY}oYp+R~yi`?Db>ZDL+VL9_>OyzeK%n}``|sl*
zXJX0K>kPUf;-#r5DgvZ+o0p?V^j)?$A+<V+#Htm`RkcQegsSgr*?1~&JQy0d>D{WN
z6$#UTYwap2sh;eNjZNq^<JyQ;!R?@ey(G#jY*N4FX($q1r(exd=T^_$vu8IE8Q7W-
zT|{b<%D#rSI>AMPyUvD6pc3;Gy8g4zJl(NXOQzbP|LDk7Gi=(RqNwm275O{A=s4V^
zNVIF!>g<CLN^b-MBr1SKm|-RYl>kFm!Kw9vG!+-)NT^<W@Y++6=mocr3SMW_x9ux7
z(5>6`9l^Sd9XV1I2`T<AWv<~870DvpS*WBFgOr_DDtO6`9T`c^_>}5{*WD9w(v%xi
z(5Crf-nLj~;T2I-_ymayPPzw^a~tC+TfA_gDnX~WmQp>}f@N#+PwvutS-~`vG<Edw
z;mpK%!b1kHJKc0|BpIf>qJkPYqE|#wVILJPNNji@B`+UHtX{Q>ux~;wL~1hY*8Y)l
zaIZ3V$CcKHw;w&4nGl<po;_sU=?JpeYN(*^5j&drwo7?M6czTtAZIpmLE^sTynM_}
ztFO6+EC|u9VY%Xws9@dNCVmXSP@cXMx8I(T7>ECR$W8Y|3NWI)!dIgAd_IsExc-bY
zr%_^T%<5~e#oVO0gfcf(if(NO8@fY7`l(BJ$cf{(S4&QcOU=5#F(M!YJ&KATq5{E5
zAmIcO*IXlzkkBRrB<#>=Wt}5TLpmV}FmS!!e(YFAYDz-&y2G|T9>f)^qC?q41;#|)
zanuIo`7I7we<nGnA@O#?B~;&o5Q2n2(a=j;IL6NH+novVDYcq4+ZXQPQa1I9C@Q?}
zYWO9RavGvbTz~Dg(w8>mxP;jSE*wL23?Apk)vHO&DC|Er%pH7DRCpzKJ0}p((Z2s!
zEKWD9zK%)*X4kdo5|t$s`FCGklmZyYf!GWdE?D3SZ5%x-oPiNVg&m^zd=BbFmq}N#
zlJjTJmWo;u^QSCMp$G|Glv3T+d8ps~`qz`jkLO`~%~%z-CMi3pK-mfd3982SuUeJ-
zjtWbir!KEkIJkD<kWLe>9D2j;&~$*n=(A*xi%Pn6efOPr#d|F=e-hwSWi3v27>FS%
zL=+5)*Y~^73$E`Kw}fY<sYpPD%Ym?RZ=Ke>$hi0zN41pXTG=)Dsh*aK%oCqlz0a~e
zeq#gKDLx~&R!+`+XU-68F999msuRD25SAShteWQ-G;c{)dhOL$+cs|o@eEvZM}T`u
zRlGdxQ31JkpLIiwBc^Un*04c?u3fe2@S#JGKla#T=gyrtew<j0I(c~%=PSDUkRPvy
z!Q1s4l@K4las7JLJ&g@jAQ94B!k~Fe9HGQYN$;yi9)374JKLGpBn&+mCRDKB8GYNK
zEJ2;`v$(_&m(a0on}^Px#dVLtlqW>a;lPcLvFNUoCu>x%7VAtWlFuh#z=FC>UCshd
znK%)3LX1w5VhZ(y0hh4M$`F&3l+w9$>Qo+o%q<W2v~D4AvQ1R*$|0bT^H*RkP049c
zvsyZ3!YDy0>7eX$;9M$*p)c_z9yctiU8gQV9J2q;s01FLoY6eL(VK6+DSHW48U=~a
z)v!I3M-cBGoKReQY$(;!(+Y~F<n9cw)}i)M5rSU4^TV#*%LA^t?mG5zJwuw8iWney
zHsItJzx-vp7A<1qlSUUmY7-UUC%s;4utXhR_6yJ@>V&RgS4}-3kXb1?N({BIi>@8o
z$0nwB*dM6H!sfD9&}m_fivRYSd_{VU<44aur<%ip2QipRX+6;$aW8Dzus$i#+3WI6
zcGlgctIS-@(p@osKDnmioiL~qfe>Gny;f=75^&C*vVQH2NzSB!s}9>)w~#r<3KeVt
zWnyNbn-G<tTK5>-rERNs-+9O2Lr`_~B$oho@$^$qr6(sf>^U~0_+MUMUePtjC>7JL
zbxTY!5@U><t*aANmaGGxm;gi6ZkBG}?%jzAiFtjdH{16Quj>{vC)no|m8e&+HxIwz
zwm$RMw;VV%uj7#Pmi=<u4{S4H?tm40M{han!Km7xb=SUKIuRl-UBuxGs&0VF%w&&e
zr-zy3W~QgsY~oet=5|SSnmc11w;eksrdYFgB5>lXvLomYZ}ybiZ@aCaK?9fXV*WbE
zmh&M)_nym=S8-G{-2SJc8%`3D#ysO3j=EVH4RWg2&#vAmw??%j=Y`29WH#;Ef9<Kp
zB^HWuRza7xO&U@pPuvJ1<cNVt4zZ{p2_OX(_3ZA<$Z5ChQ_ruq`|LH`b?#-Cp}q^)
z4Bm+<OVGiZn88X*?exreM`p7g;lnPfI4b&FeK0;PD>*)H!JNzPxZ{pTAAJ;81FwOf
z`|rPh+by?D96geFwdCrxi>^CnZU&dvX-KV%<hR~>OO;(x+OU*i6-fZVK;Ji9cWr!Z
z{16m$_Zvy09e<9iR;Nj$hA%w-Jd6S+qw}BevpacC^%m^{>3V3t-p;IglMlQce!Su*
zKlur&qqV=HQuGQ)Fu7hUY=6aDxBl#BKf{hBO?|}Gz-M-Aq7QDlc~g3POuRF#@6x?x
zD{P-{KW-tgf92(u&Eczp3b8Ya_5G<QpXB7G{U&6)?<F^4^I6UrJz|7ZN{$4(lRIE2
zryknH`Zd?HEQ7B<UTw#>;Q$OfyaJM{6jY2@e~*wLq)*Q)F|A62A8F^qtN;mrB8#$i
zc9tVPdBC;Dv{=sb{jVx!gj09jDM|&xl88?N36)#JpBV7tk3MQtGbgofD;jWFzS{I{
z-*la^IyoU>!%a7#hcFo_)uDWL!4grb{y4gJfn56J<Bzk>EygZsx;HFzZaX%p%0flY
zS=Xm0C2ilfjS59lMv0lQJxe1WK1d@U_H6!o`qZhMYMGA2^r0KhG(YgQkoDLNr+C0k
zH?7qxYbdX?$j8W3yjO+-UDGFy$H_f<^L>`6fOpkw)uU#1jc1;IT3D(mDgv{rPs+ia
zq3*k&AZOjol+2bz9ryn!TzQ4jGAqg`;z|Ykwp$d9&#hLC62&5}s2UmKYLKGyAOt=j
zeB<ODcT~$rk4wuLwf(7<hg{y)8MnWaRHJ^sZe7^d&9N9dDi{R8tfY7w&p2RdiKRKE
z_4Z%IC8l<6-wu>=GRq=vy9iMy%%GCWoV*TJWAxwwG3hlY?SC=MP@(jSs)CB_CY@^M
zWYhjfS$k9=d+Gh7JaMoNXq3&H$iEc4O4$v@?0X5yZguOo+3g3X#yEcYi(eSB9aM}o
z@(;u<eSnC21r?pAUt@`iVb|Z5n3#0=yty<o1*HH<M6!rQg={Ml0J7nxwJhE6b*G}J
zaNlpwYnw_NCuA2C*3Qm;`K6a|m55tF5}=h`RkC4Jvl5Z4@GD`%O|Mlj?$B!xcf(1m
z;~X)^j~$g-eR?RXE(35O5*nfrK^*n_O-(KS&ir<JU3NoqLgMz~VxkOz5U3EPB9c+T
zv$Lu$$Hg%`n~q*f_ofzqAM(J^grX|PD_RYlmYtb-=H7c1D)iVpVc${;Qt=I54;t{c
zEn9f5v^vdrJ#BA(!I@Hh%&;Nmy5CA=6gMrv!&hB5D?OumpZdGMGQZl^1E-`W#6A4b
zLr8QI_@qaS2UltjiP2;M#pgraFxI@~oUQeDT~z8q7#md?6}@I%pOKurduNHD0>U*@
zwgDRw-~=`{uV2TbCD$tGu<i9~E&J5Ys{W@x{?WiF6e>gpKyUfrCqL=bqG?i{)~)yd
z)$~%&=Qi)079ac8n{Oh~p{T%KqNos`52!eOkIP_~*XPn!dwqyIuA<1P%BUE*!L`tn
zFJv#s-mD}jmCz%Ut+1h32OC()wrz+~Nwr(#cAJoqmVVFOcdM(^PAnIS41h$0SEOIp
z!i1ds!UKOcqoP))!D$KcPe1vjj#BOz(y4ZVFeMce#e4br&wkdsOQFM=*<p{hUAu|`
zz*3U0%BUdXD85Ghg2s(-!=c?uPLHyLin^>H3LYX^aU9&YFF7$GA*V6$STJXfIaySh
zp(K+A<Lt;m{T*1bcK^uy7CVezl#-Be$L+V{tdML9;S~{%3fWWOv{%fX1369D{Y)qU
zAmmWN;&z+qa+)r>;tI+C6op%P;&duk@K7E);RDBy9ZN}0W{~dPx|zvW?RL;N3JG%B
zym@muIj8HmE(eUJ_W_HGlM|eTncz<ph>GeT$*52cpHDvixM!!1vDNCe+w;c=LIwM1
z1^X*lTtb_YYBhDnId<>dDJ}xtoos3RG4qfI&YWr6qQ#U66U@?rAp(@`|DAW<89RI!
zPugJGhLI)D>Je{aHlA`OCa+k!M9i{mkP+zB*4I$>9obNh9y#K2Z;x4+Qxf`lc~x10
zk}YSz^(SJJGBQ$<u>Fa9Tf7#kf`%Q*nC`vAPI(RKk)9?9Yz2)PIbxhts86fYy!V_n
zf{o_;zlu*x>({e~sQxmC2sg{J0<6O?fBy5fEt*jjVqEbfA<rnFI<KgpA3Y*trTDgG
zeaQvwf6ZZlk(HKm@9ERXQ4+optXxoG7a|F$W<P|P6!q#cZrG4|*;#lnQgRzjJA_;C
zzZp%t*Uim&=dHI48jc-ghSNC)AL#lUUD5Remh1?VU~>DYs1ylGfI%iu|EmwjJ5#Ak
z@aV%2tIB-A5@2*WN({RaNWzWKXI3s<$|_ZB)sLCfpSC_JHg?<Q%~AgyizZ&wM;?AC
zJ=T#{w?&JC{|pC4VV_qZ(^n!YSnDRc{@Q=Vf%tf5!&-TGpp`vJWS9WAVcGd4gchXf
z&hiUER)3jy*=&H(bm5`)#jo*UaQ~vOzxpaFKCuGty#02gT6u}d8Lk+68}SOEagK>s
zusN2AgAxg<(ox|8#_lhRmhNW4%^Eg%@r4(pDMYXWE)+0Svt0?Yl4>B&|L8}JYUZZ5
z8QA&o|J3Y%nX9kYHP>)LBwL@@M6kv6>e|KOh$&cju;rn!$gB`xhY%{5E@kTaE#A(Y
z+qZ1-&fD(<-8QOYLjp;}Sx($|&(4LhxlKAB{&nHrkK=1LZ<gQiqYpofa8yW@w3_{9
zwcGM?llgmx-E>d0{T7ijp}`+?MyH{I^k#xVt1hpQ#U-hz-@?sIyGLOm5#1{0B0wR^
zvQC}|R05A#)2DOO+-~DrUH?!@<IcGmsjs~BQV?$%T0_b9L8lJZ#96&gQdXU~IA?r9
zN>cS&UB}KTn-N*QA*AI3xzOSjvIH19`YzbO%ts6wh)F6~LX-g*$~Gl36=LMfX;Uen
zkPx4QRqE<x%OaLhuuy^uIO*f(&JFI@XWX!18`iE_wQOmhE`=%aan8)#@q3>w7kaH2
z)x`=GP+Dm{sH&q^=&RiI(C5`!_Dys+2)`*0RHzp(*iZ+FO;;{h@c5&T0+rC(-Ge?`
z-J-4P%@JUK^M(znagNkl1x<FFBP>INZ`kJ*gy>bgZ`*ReL5S*qRf#KzqjMp?xe5ro
zQ2z3u(^g0is9UrJ7~<MmwQ{BF?M%5URDoe%uc$hx=)dxSE4ZMb$s4b|rlM#gS)Qpx
zXc>S(WB^Vcva)(~?&L^F8MWzjNS00uIaJ`$bJlE{SH0T9XV0q4=|~RIt3*i1tqrkc
z0*pr=dI<Y<%TWtLGAt_OP|<V2&CGe><(I3>=}4|8Q0b6R3YcD@RJw#w;g=Zx_WR74
zDpg*)u!9PqkH4lWNKiCVp}9_j+O_CMfnvw%M|k8#RX~Me7kV=!VgjyS=8BXVw<QF7
zzF48cXoIRcs2IJ&RgG)x$dQDfNV<hWMHQish@FN(!65QLa#s6Xesk!VXuYBW8*SA=
z#lWQ{l<vE6%^EVNrRqn7XTwz~5Gr6u9z0<(HPe$D^qUrXWi~?#72PJxuaS{K)sJY7
zXqCc)nhd~DmEPZb_gxCYCpYfWY~SBQj9u7A1?IL&_gA#;KCpI94(W2lrAR&S3UF3b
zP5P^vvl4b8mEPg!gZlJzWYp<&Ak_MUg%&CrHf`OwZf(M!2-k~dPFGoAs7miMrc8ps
zChUDKq<F=D^xa=Y2bR&cm0nR5ctu{_M(tWQCx#K57*-C1*I*?cRZR*D#aXFrBslrJ
z*)yTAo;N)hQm7~sNiL|667;2UP*n;QsTtY*d-tNt2KgRQR8&pO=%|=G%Y};OSBF~h
zS(5~1jS3`|s=zA}lQIVN>&r|ODx!KtRl|m$0y7lG*?F^Pxp>985at!{z4smxdzD5-
zN@jM4RxP8bsA@<s1mP=G%$eazN}0Gjgrds-W5~txf(qo8O1DAf)oaqYZXI2Mit>so
zg%I6kLEX_oy?Z#S)hj$0LN+K*s5o-uNHP`o_=jGBzpRQ#Q28Bt*U8PHMzYejqo}BY
zs1VESOE11yJ0qn*(Iw48t`)bo{p-A<ilU-j|8X_5s=xT+i_w~vRSFDhGI}-ZQ+M43
zbrmh!Rc(hwGmt85l`3PIRj8msp9Lzaf&|rV-2Ci}jQj7qPkHg85g%0t9^%**MuDom
zeDNYsF~0cWDhvQ~^sbK*R8>GlzxiwFXt8(KE^Go42NjK(tqQ16wNa#Q8h)e?Klq?w
zZjI!+tvej}BGgb}%`5O%R8d|ra^t<!+@CXhHZik?juz2eyvl-y4hbnR$8L4&!Gkc0
zcGIrO-TAL5D#|yZq*ckM^bYRYsUyZ&y`x1Wm+`ACFz6A1Qg%^VfgwA6`n%tCZQmv#
zBX7d4r$Y@A#wuxEwC$=OLDks)Rij>G(wqqhQL3YbwD;A!dsRB2M92h$OQ>p#!X=2>
zEZ(*imfmyPQtD2G6e@n$({0+IAi=7D3YK`pEoU9E&is1yNXHX)A*D417}5}4mE^Ge
z5FsR6u8*mtCLIz|;{#hrjnpJ(MotJq;)1GOwxXsd8&uUn1#Q84Us(*8TQ+S<8D{Bd
z0Wjbg2(@4X8;HQeeCU;(<h_<F>4e|l3JiLaPO0K9T;kPNUTIRl9+hVYUUw`6xdf<i
zYlE_|%z_Fc2P@sTEelNpq&`=;dIz^@+2V!gpBG^8Rxo|=dU#0!4>_bHrX12NPhrN~
zJTm;~I9N}lxUP-|DZ(qQa7fsE;DHC4HfZ3=N?ov#QrRJk3fumQDuoIcFm`?6N(gqu
z6t-_iCM3av7|z(M2&Cl=!8+jPye+|r97tIlyhQ~YgTxgq0t&xzba_edZq6bLi@>S6
zdE>^cjC5*1^`5^m#Out4EGk@u`*;1d*ZlR4nAlEj+dTQ?lXx(|28BO>2m2PU3I+m5
z<e(aephW=&gqXW`haW)){zSUrRhoOS#Rwi)VZ25^e&v<P<HyBNhB>GHz}2^fCYL}4
z`9Y~Dt5>}H?z{AxCZ?;ZOHhh6!!dfzTL;UoUo&s=gbC}`uHCeL{qfsw!)^<6V*>*x
z94O_WMF7KF1T#wFGOOu<lTnzBU@n`<7Q?2)VzRb$lr6X*H5HDSQLyK4At*H&d<hp+
z3zH4X0u?-eRg<99>eDr^*TO9cHR`fgCB?^60R-oFyB005gb)@F%K0CS2m=~Wp`;b=
zKMoiRm;wE;5n&opY047J=6W`QhYvpZVB@-*3fr`%NPCPkv-cIZglb9I(jw=ISA;$)
z1Rh{x)YgZ3Eh=s??S>kiM#jY@Bsd&-8R_kt7qls8eBmd*Z9#sA=1uc!=cUEQ(0`ks
zlo&^sPMt7hNmEv{Z8ywzeP16(AR#q7=qr2EjW@1bvUuvav7OtrtdZhOh>49)NG=>P
zGh{_3%OI$*;1xQ{&M5u{c(g6~?TG7-^_{k)bJ2*_UHcZa?_RfQhs?T7Q*s-o<TOmJ
zU69eReP*K$)tVI2H5gX8Vcj}u$|};7GVDgUg-UtoB--!Dt+&R<#yVmWo#{Er*$tX>
z9Xe#mR$5PmzR2W7f^w@@RAmXu{aZP&|H--S`>Y+`)ZO_HHnvuKKd1O<;r>6hyzV|w
zL0NeoP}ej>3y)-($`IPbmT}V>SMT74Q`e5z@l=NcpXcrj{Z{kF1~KBSF#0Pzp#ni1
z0lkX&D}uE@4c+o6Pc(V#Se_1z97P;8LmYx4P)PxiNMjm?09aTkO+tnY?9W<tJw#Sr
zne8T6@1j!2(KHH^Z`%ths*V>gSSyHvnBKf6+C@omF^V`A1xsv1TIiutCq#C_2)l8e
z%h1<r`ifw!d=(o<;}TI+@NSB(Jr?IoO^$O+oiO3CbLRvb*ru?wh_hU2;leR|Raisr
ze8nilH39S7v~C@iiKN=inukY!RO`-qKgdqLq9XhxC{RJ^|Dx-UC)aF3jAu$*O!J2I
zr;Z=Dd*@EfxFS%oQ!1ZEBmhIVJK>Hf>eY*tNzSS>b@x+MY=aMa&VnyqJo1lFM#ECC
zD0O<2{AJMcolW~rz)t1B=Mm#rw`L6v4IW&8Asj>L7$L_2>`z!P(lK`y)tqAb&b+$i
zq43kKbx@UM6n1>uk$?(;NA`|?w%PUBfYrAr*J^?oeeKGXQX5MFLs!1-(^+VpsZeq9
z`0<par0N}p^|&o88q53Cl2|h<S!>&ogNh$m$9aO=+VvVjTenp!R#5T>V2DFQa>T=%
zV<=P%9XuG?sNQzq$Sn_F;1%I#dJ=YFViZwc;Z9b@Jk_@65LdVP<;x}MPs-YcJusAB
zar?1jT|0I}&yGt-Nvq$w&-4{xs%`s=3T!grtyfrLgV4h^JqDv=tXjSt9RuY%5;%r#
zgTfZSbH|Rc!-nM7%yWgrR<GTA{)Vs!0raR;xZxE<mzLJ};8SFxLb5oLYc+*qtX{PW
zQA(^*W{weN7F&bA0=Fi{sFLm58`P|cOqJTG!+_Pt3F8kJlayw9Qo4s7y#iDaNlW}`
znEAHtyw`yn?oX~+fOT^14cF@&BaCx1^c*8BZ{o;<PtwU@*7WIFX{oUZ$$bct4If~b
zjJ#1)c*X{4;)6Fmn3R_fFbEp`^wTn;RJhg_F$aAB4EQAb<B1a|nl;IXY<gU>B3yuB
zVi!?Vc;y(x;ktm4(*RM5AUT7M5w5_%psaiJgkt~<3=c2A_+pQ4-CUVQ!!K>JE3`@j
zTKfJxp@JriKmF-Xjaf&cS46A?rSdlhZG0dpyFrq}vChRYT;|$H@O+yS@dOwjfAYz+
zi4$D~CA#$w7mlF;#tyGQ`;Kr_xDuQ2f3H82SglTSeB1?5$_R{b^<(H9gWwm@F#yJI
ze*0UD5J?FMtvmM#H(*$y0u&rReE4GjiYTwp149O`JLAl%n;7G`_JUQ)?D-Bedz3il
zb&esWZr~Ww)nv`}*C#q0?fZ@lqYTwD-6Gxkwnc(Mx{5#>ltJroDc>9JOR3eArC7T7
z%HRCPRT`bW(@@njw4yw`&el-*M%94g*)iHKTrl6IV~m^;n!s>*@nSCgl$QC>2;GZb
z5k-YU2(Q0=zfmmRl0^%plLkip@a`F42@JLafbr{J{c6g@39Lr9NmquHC?!g^>;ISw
zKczch6ct`=P?jeUE7hU@SXOW2`gKw(L`r&!cHwpR4bc;H2OkeBRRaOWPe1u&$iM+E
zbM2)oaeex?q?LMASu>Og6~F%VucLZ}t=N5X`IEBhW+W!uar`)xApz%-xEG>CZ)e&D
z&o{sjj`8l>Z+9sybOB?=wUj)qR1&xK`t%u=VHEBoK1#K1K1FR%?%wghwRbt<lk)4=
zNBR`)LV{|;Qs-8fu>=N&hZkRXp?SW`!Pj^B9-KU(0*njdlUrV)wCyObu)Eo`+x>qv
z2hMdSCQw3;Dj{r~5z^DuoZHRgBS}8^zyq~&vSVTs2i|llbWowRZHxXDQB>FkL#f)m
z>+?pliW3|$OBXMuP$xQf<aDnzc)oddfPqPB-=00G@o{N&TZEM6UG~*S^@>2Yw9Mjf
z8cbc67#nxZ%9YZ+GICI1@MA~|3vpsBTf7*$>M~|dr~<>j4JtBYX1!vj?%1o7<Krp(
zEZr+b;SO)TLRZRpQfYT2CMk&rp%%o*VZ&US_sr`;(j*l{g;%=wa6)?VziN+MmXeUL
zX~PCVMMUumJ%Ugbk3x<@F@59p*IPGlMke2YYmNl6!j*Haoj9mybfCL;(`d(^YYo0U
z)#=>6ZJUmYNT`uxX_As2s<<@)#+lQntEVO>Qj~UgsHG@H<DdfBjaqO2RbqNhPG-jG
zd+v!$USSTDQk_)Myf@r*69m@vl29u;808g#prUBO`oy@n6-$;NNk^t$Vc;0jbsNna
zj)76`qYpnUY~R-5%nY&W<x#yN092gsFlbV8T+CBXK1nG~P!VZ1D1$Ft*SrCSXx;?X
zlEygT@^t~Mv(FauK<^dh6@IT^`nGRsHtm=mAB&?0R6qd{jtZrGOO0AWV9>k?Ds9oE
zNv#G=b4x;}0HIA(L}29`uV`ts<4-BMjq2xSljcwK7^eD&^5S{u7>2DDV2B5U&0@^(
z;W3W5_WP*vU*WsHe|L<c!tYnrs`!7Cs@Lw=y5)x-en|d___igDJ97LLW^Cw{YVlxT
zkD@lIGa+&8rhEKe>WaS5jSZ?yJ*cp+zU<$kkG$o<#I)?eMSVZ{<P&%)uOFEqLgJu2
zMAzz(AfjCyJ8~pFDS6<c&Hk-(C0u2PS42@^elaK&eODchPfEXJ(gb=K5atj?g>H|M
z9+P6F{qf5$*GNzAFnneu(0BPsP*GHvUnl;%7MHAb#KbLIyok2Nl*5Urm|4%67{V^Z
z+l^F-b*@(RYIy}6qNoTFy~@A6WXpe1Dr&SFgw2tP_Bbo>SV=lwB;;3kO-@p%5KGi&
z|M!12t7oRwX%RlCIC}JGlvkKv=cp|Y#ieEU>Du{?H{PJFJpm2`K_M`JiiisL@L-7&
z`z*ZTy?5Wu$w;qVI5Z4V5q{kw19?e9*W8XuwrKv`k3aqxv#hxAKt-grmUL%>6635$
zP|rR4OjcT2hcOERS?~(I)~mLyctsQy`imK~>Htf3&5Gp&*h@<!Df1CUg>IQ;n}CJh
zdGcgNa`J%rH&rNQ`zsr}CTSlPVc9Lx-}iLB|MER7-SyXA!?IBPMqGGNRG3q`S((8_
zMX`>!3B?cjyV@15quN9TFFwjEw3m9m@8az&-G-aivMiWoap6TsjSoAX3ehN}{0DJR
z^iu0_$?|6V{t-n*h2uLAj_LEY=X+ef8C2Y|X``5Bqo^>Hijr`T{d@Lgrllli)eEui
zVNqV;*9LaJaP~TuuB3RIm}PO{u{DN$l{9yZ!YnwkARE@MO-_uDOUf9!;Xc0>x$-tv
z4HfUb_Z~vBu~NTi+ffOs?0Y@m_L9{s-QL~1h?X^@BBJ7;%#eU{UbS#x0`2STG#`G;
z!%g@8Jq%HS!W2b?0ToThF9#L39y|ytKKtx5acoB*uP{Rb@6FT+<IyDw2aE|Z!O5yG
zo?BiKMTKdrJ70g;6`<m_qemeE9Tj0;QBx0gGC+c@;l%Odjcet(s(XxI5UP-{X_<|p
z!i<Vq1LyGWPo6jtnW!)~&U@|0uTCC2h6cnWviHAoYqR}dg_zXjrY5=Y3UNu5Mv|jf
zL{VYED@H652`U0nVSvPkAAGR>#vAM9<+30-UB`_qej=2Nu$JaWleTS*3QY2tAa$Q#
z2=4?w+hNVdkn_!_Ue9W5-F&kF72#c}-(1n-wqwUG)O~U|bMl8=ceMF|ufu^bqNwoe
zEuL>bcMD6m`kGais0d>llrRbjb0VOlux(q`Vc@boEf0oHTDI41(FzrWx)~*?D6cSp
zr^A#LEFDFcVWAOagEAzbwrbuiE;Xmy;lKH{xm2D<!ZR?Uyu!cN*|KPSqr4io9y(<3
z;)T5pN*IOY*`aW@Xp*0p)v)l^C@KU=UfEDspU`RaoN5V<ht8gjSX2<xK?r@*h7FQx
zHE(k;)ckZ&UQr$Z?lEl{iFo&(J{@UsP~=pp3gnb=$gfv7rGC5oy<wqbyZ7R`wL!5d
zMr}|(0PK9xytU%5h_sklK?O1M#0bCr)>{p0)vD3DPu|XdmB-doX=7@HPO&duv7iDk
z#l<f4;;%s4j-o=3Bp-O?R`FM;{0cpiJX~#1O4XLy<FCB@a=pB~{9a>|wtZh|6kHyH
zx*b#y>=i|Y;jIt9kfA#Nve}<}{Bh*u;;AwPQqtzRXP>Q;lifaqO4`_jP!tvZZE}rE
z{*qp=C1IiacJG!jW69eN?;0P<Q-P{YM$!HE-A9*#p3_6E5WiP!xUtNZk)Wcy!V)?C
zZ#a>dTCG9N++Y6U7gFOR>?_|WR7kV0T|0NCB_<46vCF@mrRrW~;uXY<8}*7PDlFe$
z+mhd9H13!j<M`l%4<e)<lyX*p3L<2eUU?<-Gj40>BxHN#5^{n~RFH&e(zeSs?zVZq
zFgh)N=jYYi^iOj2uXsY$4vYi|3KyQBV(iF~&`-y`f2g{<zJK&)9~Gq6l(o!8Iw~@X
zziB*hMpAtI@!M~M!$v}#S;Z?{6#+l{tVh=_j^wP?`@V>x;s<DKiF8yz3OyHWbS5~7
zqs9ys36=Umh4lEsEK8Tv=8YO;x9r<scPOV)c#9+#e}%PPVI@IT)zB{gn5JJ>QCBnG
znL2df0O{%y_Pve-6(r*Fqz~MGe@<F*`-w|ai@%HV3dJj;sQ7QIl1~#eYBs7<n|Sg_
z=m4gp0s|DJFlg1maD#+T+O|orh@#@Z+1tOW*19OCTIRV&AB}__s)7o_JupMBT)Grg
zOxW>wB%<Qjv13TgNKk&E;y*E4TtAMBKVb-@8ePU_rKeF!H4=KLs;(6O`#=9v)U&%I
zCA<B;KSxoaS)sfO;(+1bu@`>$Z~++MhKd^7zfP{xvQ|#^TW`LpqarMe_3PmtgwQ8D
z9L<N$&fOVCDR@>fv)0-+yaJmeUMk;t#ed?qe4n`W`}nN_i7-S(s~x{haHjR?)<wF|
zhqtz^%(A%fZ@lhWHpsD?L#-&F&3)O*Ux78HG~&ZARJgbVkZ^AME@|6$@mmR~3`0o3
z`UWlEotWTUwS2jt0%=>yl80Z+tSbG40g8w1)~-!_^?Dr+d>(%M-<@weKvcLO0e=7z
zDciqIF8(%tE0()3L<J2a3&$-;ii@KOSlD-=*DDx2`|LAprme>;%nh@&3Xc+0AgFLj
zN*B1qw`tqIP2cga<n7<aZV_G)Zor^nWWA34lVTmuKmUAqTV_>S1^zp{+SjdG=@OrA
zzSptke5CUVUc8N5ybFwC%Xg{8-)5Bji~ke1eisv_s&?z*|4qrMpBm@*$xnU~#$D)@
z>?9Qoe*2r>G_PMLrB>692mczLkSOb~;N_BpERB0C^a?wuzz7RxKyb>~;rdD4{#|^S
zGKz-V|JY^9GPa4C(=VY3SQy7aiR>h93W5Ufz2_dDy6vQ8dAq_ZE7eU!O@)dwk>pC-
zwt)&D@o$(zstXk^Mv<`f`*39xBW`{mAw8!><Ay(a?l~!FK)wM)6J{~9y6lAMiD&HI
zsY7CNwei~@30p=HR9*ojTpC46@xM?f5TDSt<1Wfh;igd_PY+n;ig%!P;D;Z6D8>3K
zKI@46`^&%n^^4Cx=jX3qe1U``h5dqP0aHE->70G?j^oMk@p-+bgnT7g+m&yWzrsHW
z3LiFhCzR}erDJ+Rc5*R_FjTTH?2+et&tDHJcJ0`1=qy~3{kHG9`|d$~`V@67?ANt$
z)UaXCJ@brIxfLH`P_UtV6q2ajqf6)br1ar8hh3VH0VJ9N9iUzTqxd&=*!1oHLV`-%
z_WcEycKC4#anGOce5uQgMU4-=vv5WB+lF4JOqjqNoV8lS<>d3>(18PB5(XmJ2nsOt
z>Q9Fc9!yDcW_O(s=8VF=1cij)S+78RO4#yUO7XX-+Q?4)8orQlp`z9JB@p5r$B$dq
zg9^$%?YUbiRTPqA9hq$gu+B}cIK*Ujmy{sqAV-OA6O^bERs9K#qNrz2M_lso;wQsd
zqcCNt3a_BXjfDgSDo7!4Z<%#5ibPPc{acqad&|Es$WGxF^`xH2x%K-7L+7&^Cr+He
z(Tl3Bx<!_E7kc3U@4xq6{hGP)dCevqev?@hTy>nuloS`E5MwC<8$khv^4u{jjDmtD
zHM))ue@0=&D~zbP?Y7&<(DjIli$03vZFsW33wPPc1@#)+|0%tW2$fZp`XQb2?u#do
zVE;aI@4ehTf7Z4hceu)vHM(q9JT-Xs>_H(GV8Af~$EQ*%e*LRo_37Tt5tlNe<k>LZ
z>`EWaq*u5_g?kCgg$l$c@Q}ET@TYK&8<&Nvx8uv&gXXbxci(lF6oW#*fE=O4^6ToN
zAi*tmZ7=5Ty>Gm)_FflHZaDoG=LNk2JD37S;Ov4sO6J{xefzjwUeWB(?(1b=c(IQP
z_Y#!LAd9ySqtgXQgstGD9<6D~pM+POK6OemdLc(tZ9zqOC>074km=W7eYI%rY)4G;
z^us^Ch|;O+Qyh*XhYtfzGOBT#z%Bwug(wxj`1#M<Hf<7{kvDqJ3z6`04bg$tdWAO$
z>SA~-s6e#{Z*@Y^M5~hD=k%DI=x{vp@Wb#{va+yRDnbl8Ds)HyJc_b4uU|VQzf0@G
z7Zav)`_IctO~UJpdL!&YAR34er92h8FJz()ShOWfx_jB#wFBc7E=a_<7zKipWEVvQ
zuV}a9SI)frTGcXe5lEvW2oXsm5GwR+abnw+UMj!;^wUcwPv)%+TC!bGddZR39SP}e
z+qU`n&wdtMRB%TI9MGd{LRS5jhr%(t$Q?ogM+JdTKj0xEAVH{X$KjW<Zu95N!K*Dw
z1wu=Jd$VU$NFO@b(UQfka(#WKEp2t{w?LxSp6^?Yn3IwazkTagOou^4h2W4%p{*O&
zPs=ZiqN0pt)}sU^ydu0^6Gk<u?`1bYm!pObCDubs6XjZWStJ>$!h}NKATK8=yMFg$
z7rUr*Ir>$6az@8CtpO*399)aZ=z4|U;+&v@SdtL~isG~CjoJT7xGNRfo*n?Na6uw0
z6DK^p{;cAE<P~%%Xw>l8XP?DWf%qgP1ItyZP>g~b<z%F$)@s`7(8YMwsfS)pbf!$3
zI6<KTZCh-_fy5~)DDqreZ{7rv)E;t0xO*ysg9=rnAR+`Ofl7;FSCUD;UcG33g;7q~
zWXn~lP~92f1G(v`b((dmzLUlOZ}pPzM{Ix6=}et7a|SaBqWGjx!E;g0qbHR!dFq9?
z6zmDFu8?K)iYO}V7$U6B>9MFd*5SBp=1ggEB-STolMPCcg+am4Bat3IcP_)3&~@aD
zix55Vb?4Qm<KvwphYrCy3@ViP6rhr$qXK#CjW^zC-OSZ$zW4kM?RI_Ixa7}d=Z2R+
zRaOhIDM6ui;jSth@ex_-1VqrF_>U>|T4kiC-G19`5<QNdE!L;<3zb!oNPqkCOZM!T
z*u+UCj|oL~KJ-O)haohr+`era>Wxe$aPdiCsjOaL9&7K9U-@zCrUei{&Hk6QnYX?F
z4JU_hKHFmJFB)w7L)zAVhB!h@erJu)X~Tf1Z0*~2gNpEX*s1s3p!g4kQ(V>Zh71@$
z^tg2WVs93gcDdSQB@d4H+~mZ>tisVP4ql|f(d+JvOGxV9t0!5bpaR+zJv%7#Q9)2(
z9$f`S^x}&z3NT{hQxel^BxdBM)NE3((_ofm@C|p=-zN3?Ls6VI?eBI_!6p>psNj`%
zpR+zDHUYAD?z!iPlchkGL<CByoAQvI*szr=jSYL!`0>1~(R*JKpyuuRu37&{MC?8F
z#1l+L$#SCM1ny!t*uKC&y8ytrZq?QEXU`rvXkh=I-D_uM;>t{jiH&!rRcqC+&o#&D
zZ~H6+fnh?j6)ITa(!6afvk{I8-gNiNZ;44ru300CuslgKs(>gDL4_EgFuC^aK?Td4
zu7|%ARCGA-MM~}F?V9Ejk{}ReM;AsBtT1x9yM#hXBRrm3YO7*wAW7}bH{X2t?Ac8l
zHWapPn;7GWb*6TiwFa3gqy#D}=4Pc=*hED{h)?yme%AepEslibjO3&P`}a$}B2uPM
zVfmS!M7UR|xR~CMoYnF0KZNEcA9x`?qvo*w{XnUNvI{DLsNo2^P<CM$BfvmZ1B3{W
zU;~rGM<0Fk-h1!8`s%AU-mr!)!;n+g*=vwCD+CyUOKUPhFnLAzqoUr{&$`Xu<cN1x
z&q&|4Wy?G7yz|qa{#1fwB}=>f!U1(uNXM<gMMWguwLEyyf7f*H-%}g3Z<v?;?mO=&
zR0JKR24L{Wh*B^vm<GlMtZ+n9gAE*-EY7J@ryAC)i{8=m%908JMzBy}qGbCL6x%~t
z8&sI1!Uc(W8xaetSIgYFV+U`YT^S+}aiwB<&Z`UuZihELIXSuB9#wDVe2+_($2c4-
zmn{|ERZg*3Ixs|(f+?{na7T6rR)cK<D-ALgvfQnQ4pqy{j7!Ssy=-5Fu#55`!YC>%
zUmk)}*V$`h<DAvg()R4${qDQ(^45_V*p&@F3co`tJOn<eKS_pzRO}l!YE<32byJF6
z{yX`>r<Po!URFvHyEU`ooS;~r%oEdr!7Y%}zy`Mi8{8Lcuq^0W$d=eKH*ebHjEzaj
zZA8GBzrYBb2?T}~n>Hw(JaTvikmxjJS!`@vUiHlV`}YG01SjDV67^KB)>xe=6)OJx
zm%sGs(Y-~79y*;B?D;Y!r$Jt38Wk1FyDOgphM*LtAw|>R8|XaTT?8spoY6EUjvW&l
z8$WRA4u4S*7)|@@qAi`RO<oZ>r~ndehfHT#nl);4*U6It2{u9rc~YM2^0UU8Q2_})
z_w2Lva%=Rt<SL!cde2+OJQvKJgA4;)mG)mw>`PAu<ndAK72n|2qHG|`!BNkhJD22e
zH0snpd&fmB$QO7hpIYT5b=pA%j4~2XQTLYLcVE2IncI*x>E5ODBab|SE`i`Anb{&Z
z8Ms6_(Vszr0u@UaFJ@NbH{Pv@PhTeIHmsSM{=y3{z{V>86=D+;rXjW|!3NXAoq|9G
z(-2^wfED%V>a1S3%`V&*K5hI4NcePZ@J^1RLcO*wb2r90)9@cppE~vN#~*+D?YDWm
z?0lkLo4G`JLqez!%KPwx4_f9oOsvydIV&i=(`VsU-rY5;u7;IW7%G%y%)mE<X&_Ju
zFj%xnqesT4))>9@VP8-okf;KI*ilr-Ypc8E_X+9Q8EL7THg0_R<(Gj3^08F4sbF2g
zAVIMu|LECg(+NNtvarjMzbidEwSF7k-I>#;Rh*(|+ktzv?U(@+JQUNAiscd;f`Tz)
z%H+7DYF)3s-FH+}p5Ua|nh6zRWik4;k)U|gFt*J0TedqcHh$RPK?o#oz4ewrLSn*H
zrGkplCCsRR^jZ1FGqw~Sx!CW$=LL=8iUkX>`AF?&vCLL5Ds-7j<wc3Sz4-F^j`-v*
zD-QdDir|SrzKLz#{S_9dkmn3<RJ0pDGc_@BdvWn=ue~Ou1|%e`qg=C3J#Wn7uQ+=6
zFc@fh#i6#hy5hGfKNFwTuvw$}4?pyf*o%?zP<CaW70D|M90MIg*ag%wW6H$1l&o<(
z&V@ND!rL-it6jhJB<DS+PGNKsnMAmR1ZGz}m(YFNJGO2C70s6%Z+_6_!W*{vEWgg4
zF$45slNDot${nwGRH(=liI@VMkV-+FnrZdh5Udr>s9@I&Z(dQmZQt~yqzCT5A5v4f
z6TDzOccKE+YXj>LUa@}78eq_3<=qYTxk}v>EV`9nmoHsPoCN^JYD`44lxYhjE7iU_
zVd>`6JHNd4>Z>^2TMoP=Z>Ou|Lg@Y2(JLfaGQ3gIX~LDs2?_XRRqliY+o`DRiid>S
zgIBLy&TDFO-F?}+T=g?Yl(?ETPM<Ov<p*~%&I(Xb@!d0Y^RXU8h<dYT^>y*F38St*
z8hUszRbQ5@BWt}P>`^gv-94lUkdTd`QwpC6qbR=$nO^s1@eH6UtXRCr<w9BiXyP_k
zC`5CYUQwSmOOKs9R~2}LArk{7r)h)wDS3^VXBePDy7u^u3U~gO%8qHV$H5zJ|5H-U
zCVAO4&OP#oD6i#OA=4`)6r+G&EnRd4s2Fg|<BG`oEq2wJC0!c}vaVNDyaZ(ks)fPs
z*tRVpKEC(t)u9TBvNg%AQE~h2x7(1Q%r<6~^`}DEt9qVyughIZ?SwI7*ccQl$|=dt
z5*6YaQ-@@1qb*!HkD9jeBX&Ha=!`J(toDPMEk-ldDxmzL13h3^F$xK%W$8M!Y{_gx
zm{F7iDs;|J1p->^F$$r!wmW{EklVCX(}H*2ejD?@1b37-Dhx<4$5X&7u3f$i0F2#H
z$}5=dz#H#$#3jv`HWlNnR2%V-b!5Ja`o<2|a(9l-D8wea=n5BG>v`$bA<QVsqQY9Q
zfLBP)u9dd!HEKmap{m;=n(zEWTt@A}wr!v@h^+ijVPFU<tOy-OEIE4Y9qNq~${)Mw
zv`%X6_WUuqR?{|38e;I#D^uwisyf?|yNFt>KKq9aeOSrVlU|a?jvPsjk4-P=9`XhK
zH5-&$3CcDqXc%cG{m{@WTtOctU#4W_^y=D0oD~4&KpMYF+YX}j$v~z8104wxh$?Z~
z?7or|x?`&=<Y~e!_v@(0DfwsP?!!|Zj>jK+3?WL-g;F*874-u%>{Or~TY@TgV1|bs
zzF~lb%IXH3jY!0cOB%85Vqu;TW*7ERfn~-N@nM#cs=D&v;Z>z<`?g`*?(JH(AQ2hf
zs4TMq3Q^__TSc1+26PyJ1b7r+VCz-6pjQz+;fR^C=jpPOKi_xOD&EM<>C+`ZPzo7J
zlAxp?DYkR-h7J9D_ikU%xK)0`#S0fwDTfodyL6Wn>$46LGc!@&2)B_(P?6+6{p1tc
zt1_8^SMLvp!kcbTLGO9eAszfv+O{`T2$u+9R51T;Q<hXucG3fqoz*gKTu9vPYtxPQ
zW~EuDB!~$bLfF{9ckfeAJ_!sI5?~9oP~qoikohN{eEiWzufO)%(yJEdq&idUwK7v%
z<C4F07%-k%h69U=_V3%rg{oE>V@l^pfn3inl*EilY2GiXeh1$8-6v0~4tjEq86k>~
z85o+9?j(R50DtoF$2|%Q8Mfc$8$(`pGWjcX391Y#M1nG*LJ#`Y!4Sg07{2x-Z}-ZD
z3sn^l)gDDQRDH{|{A?g5T}fal3g^%vyKZhyhSQmrkdRv~vsIJ))&))YX;sjqdE-Wn
zYS-eYq5RaU#hEm`bLKXhw9{HF0T}HEO=8Yzi3u$Wn#{Un+WtMe-+28sUKvb74lD<q
z+qQ9L<j@6X%#J5xQ>wQvXbkE&hXa-<6$ddNz5Ui(Z@>BGJ8!)uKkvT%w)%1X`p!Gl
zp1Skoi91i+K|A^rcO1WiB8o>2cW&3t1&Mj<Lfh`73;$NUf@Sm-6$W)8WONCGK-GBX
z=Qzmf<z!RQ6@f(BwWxhp$s0;IF@KOvR}R^yMM+@GnKWh;Bp&OCNo&-x-lQ8FOj}>Q
z&A|B7oY=(FSZBI3H7loXlY(x;TK5^<ao~h*!>05cc}brMb4FgX7dxy6!H+qQ-26bZ
zp|hPe>L<h}COebT660&6B(`qSsDF=cmrk14tbSeY+i&*u4ASz@w}V#hjf;s*k8@OW
z#+Chv&u}Js{z;?MvolHmNlA3Z$2r3a5^gNB7N~$Vn|OuF4hdoAV5YWSSKPu*F=y5+
ziKGA+(o+jjfejUeK;rHW5r;$~l6-%5VhlvPcI?PWPa!m@dW)W8c0Jqu=-;~@{Rd&;
z?Qi|M<-vdE@BgOGo^P{CT)j5^)=*Kt+wc4Hgq=?eS+=v|=s7i;bxy6BpPW_KnVwC>
zgT8ZaP<1$49Qb<7b^H5|ozZvH)IKAp^d3IB`_KuU2aG8kGNsel1#L#mX*PIf!+z6h
z_L!K{bzIFJ6B_iL#y4$7%<VX4LC=}j^<P{(Xz7k&%S(o@*fnzH?oq4uz{kQtm+*sE
zSfRq;xeHbPU?9Z&onK@&=|Z8%4eQqtKa05<(~ShB0uPZlED!#~Az}$gKsET$bI<MH
zx3@nv{~T2PYc%wR+rfa}bZ`H{wC&$F-22bA2mjvr;OA5JKkr7cIZr~L>8Gk&&+RWl
zKxf*Npgf`?Oz@!Aal)Qwoi$uiN5@vpyS8uJvr~srg9l9>H)i6PQS&aFy?n`%rB_{b
z!*$nfx%uX6uD*KNk|isaE?sivmD49roHS<iq_Lwpt*CpqZtYs<R?A>{V-iwo_Pumu
z$urIO`;pooCDY1S0sE*x8!Ky>4J*OPu(dSV^~HdBH@5FRJilY#^m?rv32BhG!$DPi
z4~Lw<Pkc(v{D$rOb{T*9h&8uO-uqm$eV!D9fOa)socGZi*<ArUmRUpsc!e8Ogd3wU
zFI-yjcMbM@-Ddxng$MsK<-kj0cRoF6>*MWLo@jJgNr&rB58CqBxLwaoIq)LlN{54A
zBCgck{Y^@-E95)+6RIm<LWMX<jW#Iv5>)ivM^_;1R=_JNjvqgc5^2RN!fq|1yL)s6
z+<5VfydsK<P!$8BB<}YL*yI(&kec+0D6fdFK$xz8h6>VvRUvw#UI8j#B4z9^oBek=
zMR(um3RLM8@QMnNpad1Mv4o=iaBK>*-m+o3?fET5MC^qS_74XHZ_O)oROIC3l%itg
zCsi8m5&Kf34<6tOK-fPVHEPswiwcRmgjaOy)~ys36OKet5nX{WTmcCChof`n&VmX;
zeu#*pbLz$X3V4N}f<G)-vZNFh1%twHMFQMrqL+uk3KR@VOCyxQbu3u0Kw9Qnpn`Bw
zfI<K%Egi}z+_N8z0wcNtVYLE~w07Ki=bglcO7t}0p{2ayjyvv<z69hO0Gb{>dX!$3
z-PCbYXciI;gDoxk2ti)~h&j9Ilqpk$!V#aOYp%-vEk(tN6DOntIqq#hgFsb=UE~)<
zfe}`lWzb12R0aeR`9)V=d8H!n-Me>_!B2HYRh^z}?TdN^s347o06~ni6u;o4Y15{a
z0R|i+DoTaQyN}M(as?pZ?4~*-#*G{I$}6wXD_PouNN1lis37$Wg&Wm^KT~7{0Cnx!
zwG1%$1?3y%9jjK<j}fK3s=osGpdnPq6{3Z79S$Wp@wro{PR~5^%<HeeE*;jTQ78~V
zP`bz~PM$m|O$iX9&^b^oNI|9{P#0I(2scNJ=InEOQuGhe6{r#`pe#-@oA&M7pFMjP
z3a5rI?Lp8Qq@)lKC`AQoxawge@#LIJ>L$(O;4)R>v7(cRu0W7hV8n<K7+Rlw_E~9p
zrFw-D-hm#0HgS<xfC^O~4#dDN;3>E^Xdd_Ci!W~5wyk-4S9z@H5nX|hUV+A~I<8x{
z?$JjdefsIA(J0vW+5J(ZRTnrUrZT9ITB2wd(jil{3*@Lb-+YtnpMK`KjobJ3pEx@;
zzgt{d4M$Xb3Tf(yoXOL#BrQ9oQRi->E?v91`2L3;dE$vDo_p>&NE(BzXcSW9ManS(
z0XT$<SEQt*+;!JoQZk<EMwn<-#WZwtI0leHDS7Fom!5q3x%(b{^4^Ee-SglhcingP
z&NC0*dG7=KoIHKMPd_K_xzCTEJ5HVP`g8p5dkyFCjn|*s?>g=E=e9fVF`UCUUVo0A
zJY_hCZ-VvX_3oB)_WGopU|2EpH<n9kUU{$Yixccqf_)kjvUJhsnFsH_|DjX&KYaF)
zb5B0`BzQpfL2wdCNGBI~fXGf#p|lhgci(-tbY~NGp*(sp7dQr<Kde{iB@BnA@%;18
zGdeuzsi&wG={mrlPY3Pa{Wu=;>o{lofU){?Ae;JeJRFR}{(XIVB6YIuH7j$XU+?EJ
zJCxuPb#bzgCG^RGp$T$Dv1VI`fKdwGfB$_TAx))4cGBC0!XYm53PFWbN|kE6Vx>hf
z=Soacv}R)<h67}8yzvI3!-GHwcj5qlJ{?Taj{`LNas0^k!P@zBpsx9G@R9;Q?BCa?
zCsHTdUb8YM`tf$S#119+L|vRLWC?w8{P@Q|hFnnu*w!InWFOpda0!8g*quang7`rJ
zs6cvhNl>6dx=|@PO8R#I46ekKi$5F*3~b;VN7;aN;Lt#_0wf*|=Hd4Nrh{^@95xTo
z?$d!(8I*%}X6NwlUOqjMI@#um8BPnz`(hCLG~=24pid5v0J#DNL>}+}i@*+x-~?eS
zbwck40v3#@FaQIN0e?a85^Ml3Mg(UJ4MMmFD!kVNAgOcs9K?g?49Wo;^y6TmgL1IT
z*g5>Wmmkk%c}Y;#S$b>uedtu=mFhSF`s6@2hFsaxAzd^AawU*}h~bci2TGk#ts0D|
z5O$#hLv#$72G{^txH1?KcrY{wk%K!0e!z<ug#YExKdUbT`M`?Ep$1Xk1o#2*vT7ay
zK9}Kg*3H8j2J&jm*UH-uoT!98VGEEeh9*cC0%nT`57?6+Y%?T)fCVZHz>vOAswIzf
zAps$b3rOVPHo-bTupDYYpT1Ei2l9c1Q<w8u4m;ndldH%FJ9GAMP9SS&d9APSG;pF)
zBr4^DrLlo3unl2L{dwUMs$+>YDs*6|hCO<#9_iDg4tIr$%jtWmf2<cs4)7awdEg(U
zDl;!Y4rv^r4*gd-Gw^Q=b7nv&z|P@rhBAWstKK5R<~plKlR?yE46EUx#C5PJN2gLL
zATPz_+2sWi(yPSK#K$cvq^XaRrrdRQlMXr+d`Pnh)#FFCkEq;lc=zZASObZo*|cfX
znl)=4c;Erm6GP2eCaM4G_h;4ONUa9JY^ztVzV5o~uD|~J8*aFPIjmi~7FX_u4I6I0
z`R2`=H*eXpW$V_h+qZAuv17;1ojcJ%WriXSU{~e*_3PIkI&|p1`|iWK#0iKokgxe(
z=5HW+6i&<r_uqg2u3fv9FJHcY|9+;y1o)K%9xT$>g;*uz8KKJxqZ~wB3{yC*SqkRE
zYm&Z!mVGq6pu&I+y+5b9bCkPp^gcj3K}g6tIuH^hpUt!`+|9D9kcWONLHv_6ZBazS
zi)3*z^Fc9t_UwWFX3m^BV8DQuEn8NrR?X5`JY>ia)zaItS&ZHq#z1HKeYrK(4(<-w
z@j*4#P#D7=*rrVzKOELqUwyS~%o8V0^l*86e0*kRW?o)i{rdGAH*TDtpWmcO6aH^R
z+osyJt5>g{m`K+H-wp<B(4YZPdPPM=<HwJ`?6S+qbt4*e`0(K~X3SWzVg)cheE2XJ
z152ps$fbtOMS7a4mVe@d#?%V}q5ipZ=MEY)sA<!tmUAOf0@lIh=6;B_P@%VnGc<$q
z`m5M^u~wZveVVOn(xgd+g@v_h)ryNV*8OJP8#Zh>aNxj|D_61*GGkrl^LnqKpMX(;
zeT5fBd53!S>Y3+khYF@opAOB5;ZL8TY%yxfKoP`%h+`CEc}Yphwbxz?l@P>6rWk~n
zl$503D<dO=Ab$uNW4vrM7BT;JCU@Z+_{QSJi*27?nJ2Oib?epzNYDvnP12kK28)SL
zx=x)s_UE^1)hcmQ7=Yn3D(p0+710Ym0MMB_^kjdc>P(!A?8I<e#p!I`Iw+?xf8>Yk
z>})?~ZoY)5OgIKFK+O#sD|_M4p+h@#=)j9iNJ#MeMt%GCMO5?qaxP>yb-8jw^B6gD
zr1%{0XZ!jDykDpkot{_2_N3lU@KM1O_wL=xtMYY<?#>5S7@h-c`>P&Uq<=(Aq6~;t
zU{Nf4rNZ10419V7XF_a#o%G&qb0-%ySU$N$wX{-+f>lOJMDG+{0TIW<&;+Agj&@C|
z-!P+%<<HeqTV6S?nf%NimalHF^FXG}X|smr5A9mJON$x>b<^{zC#58LZs>7wq|~JN
zI@!q`3bF=wu03Z&6E5cu8L0`^Ueap8=mM5yQ0H2mo7ZSkH@!xNGd4D8D?mvaI4#`6
z!-D2ib9QQ$HNH>%B@>(LrxBll49~04_pIQcLISAZ=Cfwavj4tWuX?#D^>b7CKRtz(
zLv9bmR%9yd3CbsLhat$UxQgTwcqPJXZf>sm9&FfW&YVGD6Cp=r(=x>zv};)0_D!k}
z>sDv(h$d@iw>`A7+e4d+-ab0w{~nz9%`?;WpX^Mhx(+26UlRHNgQJono%;cZwB&eM
zt7NAq8eKo9ona=HzaGE7r<y}nR+joasz+USm;dSE$)BB_^gs8E`{|uy^q)`fpUC&-
ztJokI7DRa%@Mm|8ef`$qPi`N0>ZaZYS9ZPWvUbn!8S>!G{SL3{zG;5@6_Z=e9NHLs
zf~7{a(m<WNb%Tx#Pr<djmvlb6x!=3TMt*T_ikbtrQ-h?Zr=x_xx6xQ2fFSb<_}A#s
zqdmN7o~Lj7yk(PG@U+kE9{j(j$A9(YG{a(j`PkH-+&=2AwY?XOYgRWW#V{HQ6D$%E
zhh**W4Ilw6jvYJJrZRx8i57vhhD~PS!iD<XFCX3XN4p2}{{Hs(R67L6IiEjzv3`V%
zbL!M7bOzi>Y)D6s9<^L3w$G;ZGWxX3o7k@bE3j@(y8|n_KCr3Zi~ELf>%Tr$=GMQu
zcl?PPdJgDR(>&Du8~fUs<cRL2@;BB3HO`jHJKDM2>p84ILcA+gll{)?$?AkR4iEQy
zGDPyrd&a$baM;7Q6xFIxD)qH$)k-}A#P;=5m$(~e&(hK~A?y<mJ@gPkE4cZvvjq(m
z;sr-3w0zTDTW0fiU*12|i~-LN&-tg<_i5dznm#N~4&lP=WK%b@3z-bNGWxo{bJ*ON
zTeN6F%nZ7ae*Wm5bv-PxyQkoh)gYLsP@oCyfm6dM^tHNlaN{2z9LDbZ_a}^dgiT61
zv!Snn&HnVRF<!5Qv&F}i3NWduscN>&-0S6bPJn7<OrUP(d^rb>VgF>d49hp$t4*$l
zL8cFCq^?3IK}^7uj3CXc2^uP(Lc%`{lS90Q{r%$9IQvg%c_!qz`qI|=;5XiQBfx;!
z>AI0JA7i|mH*cP23?P2+o>;h%J?eIBS}HlnRqfif)1@pP<c|+c_TwpbT~)dvVZo$k
z1c7}Lr>Rd5Ncb_h;SzXn+z&E32>IvJZnsHwA%dR{TJ;&3*4O>Z-Tcw4WLTJz&1ZxG
z-gaFNn<vX@mkcZ=arG2v4ju;KovJet3J|?8`(pA&;S3Hc*qhn5uejn0b(@wAGm+%{
z*jzn4#<T$q)%cjV30yNsflLDivUKTEcX()AJ8j|Ergz@h3u)LuG%xKNYQ~0)1F88<
zwc~o1n%yuw;5>p&6B38XRZWuDV~2w6P|4!)&1BeaEwk;M-@jw2=+&`f$I`viy;5Ok
zSp6K7ei@d1&E~Z`t}OiM#Aur*%W1!VU?Ro<!+S?%ayQ8D?w_Eaj7b{T6TAZ9HaNUO
z>9RFzmM-zV>-+fhRCZ2A2@wfZ4&0^0sDW%{`=<worT&V(%Z~M?4N(=oVMf%Av)bC3
zp7|Wq4_&IkzKk6m2?{*-@84hD$UeDvoyKd2hRLwl0KA_3n==!11DI}VLp}9+xt$Yq
z;<KseFzkfB_5Ii;khBf&4(-(4B$<pl8M?)VPx2P81_1=!I0(E#l9Le2)NSCuC_{Eu
z&DV1<sHwY5ojR3Gm-t6CV;CPUHZwsttDk{dZ+|j>d1Olcyi(bk0b4Z4w69wm9!HmV
z3De)WaU&i~sg|No70Z>c>)`Hu)Djta=T(JX$K)I}4Jy>@Q$nrxdbynwPOj;thGjdq
za|!AY;*gy)&F4(&*FfEl{m6r;f{j?6i8mQ1AZ}B<Ntg$NV}nAn$6SNsR^4XCkjDN!
zmDj6|UfW&W1)ZBj6Yv13>1;|)Xjm%^2I_|h2a0t1c&cQe*IBtcfjv(Rg%_6cC^#qx
zC_*Vx-y>?8FNf3aUDoBTBR-=AWk5!La)<Y6_h?<(oCL}!oobWnem}C|LfjoPEcOzc
zW1@)i3T&QiI1SdM?BE#jJPd*%R6Q^IDLkC53U8Q1<phCOU}Qv^C-gww=8-M^{d+2}
zSAB4Nl)4Ld#0N*@nNGxfPD+f!RBxX@7;cK`Q<=lj3cOCq-3h<FZ-OrG;lM%UBN>_v
zN$(1RVcswT!b9yJOpQ0s@8Ht}(3fO2xVz^Ie}4B^eckl-J-*)5-Hmt<Wmvyzf+xjS
z9|12AqOwm<t)Gn2D9?rU-`ybW9lFPZ*a9RS#3y!GlnMl&AfN)*0Wnx=i2>_BOfCq&
zAJT9kBkQ8D*$|9P$yY_qJhvfTT+VEKu7J?*nQxfeUabkvM;HYLC`qW-$??NGjA|t|
zcy&UX#&)+@ndj}RT?OQM1zxAUc|iwt7v0*%@?s$Ndbynw-Z?f>-2xY<olD-oeH7Zc
zoijb0Gxmao12>Mlb9Db55iY3O#PDLbB!Jgo)%4%D4ZL)j9+!TAPv!Y?oLmOxAiwfD
z*>{6tPsAI_fH+hAeh}n)LLSsS`}OO$Z{I!%$-d^AYt;9|M3`@Zr(B(YpzPBe#N_2!
zc#r|PwYrNQap=LN?bA#+`IgHs0uS!3JC!|*bHmIw*V{H#xf|!#XU11gPxP=k>i#>-
z<&+}FFN_n3cx{6R%uiHc{~_|k=`5wxr*{tWb@_Zc-|X$??Xn7wZ5!azI37+$gaBiK
z@EqB*)j`}V`W&JBSj33}RNu2<o2MaBLmWhQc(9_FFJzAwmmD5(&r6{TqJ}NTjzVH{
zo%?mTD7zCEWAhR`NPZi^^;=-)@L<K#{da`_AlXvT1nU#~yM!|bBteNy_SRc(RV&K|
z>4$=AbIIhinpsA(G=VWbi8^Qw7+dj95J_QqYZN}BEqt1lelqU^$w#dTdN%nz#Ci~a
zrd#Sb!EEY5ACL=)8hT>8Z#chVOjEg*I3mxJ=kX0-kY8<jIqa+qPEX}E-?yxbol7t)
zV*vESCTnMK{T!ka)#J~eJ^RR!BkWc%3UmQOgs4BfLMo~0!u`^TZdDv#r|#~2L)a$9
z4LGL#!HI0+-OHlz4lFN3f+Fb1{+Na{abM~*H-G+ocr<~D<OAv13*B4gm~V098kYqO
zZzHm=PZQvL6@2P7SfhFUQqzb&)gUs8yVv$sBiq!TS59e(Tgj)V_Tywi81+Xc-w>@B
z|D7RPR@jBlr~p+!0(XIak5>-Z4W40}By<NE8c`U&3494@_8L`zKS948kl-QhFAaPQ
zZmvdfr`QE(gwZXYh^=IVvKygiWBAi!*YMz)XHJwg#uFaX{zGvl+)r^QJn@DILc>rj
z0uD`ybtM>wC|7=by`$IZ5!of{j6mr1WKMuZ5D09ae(a2Cd5-Qx!puO%ES7x?P?CIW
zh^g}j71(4^A{CLb!`Wnim`%~Z%uJl!!t>MWW(@)*@Xq?QI=Y(0-N_%YygZOClWX<o
z!qrG{2aAh2oFaefPv|W~`<U<kv5%1sGQwrUo2Zf7<_BuS@o7mdPsZk<{04}lb_OIE
znVr!l{n#1M-8s7dj%F?g4<3Y#<3y4)$$(HH8U@-3$;#?|TsPfrpo@WY)CluNda+;K
zv+kl-pGEhTfY?EEtCi{`(52Zb%2E<W8py_}yN5_+rkVi}<G3jZe<F`mJt?OJ@@n;K
zw_Z^izr^@<Vm*R&Yj@*3yUW!~NDiAu3oHZ(4&^;D#@Aoagb5Qcmt%m!ENdBQ>Km_+
zJY%vn^nH<y+~!jm0$|l3B%OF30ka(^qsBesyQND{uVD~(4tUSvhv(@rD}6!m_fzZO
z-h1z*d@8$<p1rVtxh)0M>v|quRT}gvxAxmH?DbyuPe2Hi$>5T+a}~UW90?>kJ0}Nn
zj=_J2l^iPw`9@@1;?g$9U;Bm%iG8B-f+B)ewq5!>mC|>08nWZ)7+6?~ODrXFuZyL}
zUl3pE&im_kh658Q(n3&4Qm48Mnj9Ih)Jw%#p&k~|-zRm*-J@aK(HBrYTQWeeixb2X
zkb<xZ%49aqvn4(~UOd2#k0tO)lFX!5jL0->vc%xL`s%AVD^Lf_xjMd~LSmov>`j~b
zkUSVxAe9E7rbu?LR|gzXdKjR{{_#)xRQ5Q${V(jbHZdVS`E6N7GS+F7ZfRnAl431-
zm_6Cd0lr|?3LVT033gon7AL^@=$Gr1_sL0H+dp~{#<w8O!QD_qm#IZ-)~p%AEh+m%
z(-A<f`|rHh4zx^+#`;7!wEkA?OZkS(DO?;Lob&qQv7?|E5CP`j@?i;O!q{p&MBVvn
z57lQPaUycSC@2cXqT?RIzCp!bN++qm21o&@={i%=-@?=Z4gFi3AYLU>E{9F)6Pq0-
za!XzA&yP$Fu2^;H;L_wIDnt<!hzSHr#*`{$Z&c!%KbBd7w=p=X_fgo)mi0}Ro(w5m
z(PU<!U7<bO597m2MKZVF?+-sQ0k9re0cJ|StxtMr4a-6Z3~}SgtSH$q3UY$gS|ujL
z{=q8c-{y0n9c5*>EklNyVRM}FJB{dld03l*F1sYW!g4-jL2O&tDTq_m{dWr%EWoLX
zYn8l6TzFD&%uiHEN;F<TJ@(kAspHe}LrOv1_dD#~=CYE=W*?%4G4V4fx~HrYkT`JQ
z0Cg!bNTA7Ge);9<uYLy_QKG_JwLp)x;TAUiWi}VYkJIpk$dlqyv}rdd#nPQX%RcBi
z_u8i!8vJ(z97v`S6%5R=9=`Dku|CoALucH<in8?ZkYrkUO{Vi{jSMH_4<6IY&$w|C
zW%Qy(W5$d@qqygud+<@9#<3Mq^G_|8O>t459#P-yrsldyR9@`av$SrFWvpQ!YvRYX
ztEOGd=CP?e5jBXQ<xUrpt=-bG<Hy`|(VfV7RBbYis0l`KG|aM=^<wO5+du+sowB~_
zHB;@!k16_kNw9JzE$<5>!p}|R0bggOWJ0wXRG}k?fLvK(0ZF@K9|9iguar>m$r-{%
zK<KVshNDz!Ei5E{g#2~&O~u&zJuDF-0RCy25Al(9788*ee~aarDp$m&B<A&Yy8o_i
z+qTqj!D3Ej3B1~91m+rfK16(=sxyinxqx2pbwUB2K*6j)0+YPnT@=LkZnNue(FcUe
z$;eftNtI<-GeHEfQ&yaM3&fwPzuJrp#}tM`L(Bu_g9K};^itGEw`=)5f3J&U{{-cn
zCEAxVP<Aey(!ZfQ^NF$-Q5nt7P+rebF}$qRuwldS-x2;qrjenFrfy!c%PTO*k|dyB
z6*gACjY3`@L!D5rL1Vm2{M^(6^v|XV`Kr|*QGo*Yh))Qtux2zlihAe;7LWtoJvGKw
zf<~!L#>+EXuH_b_A5sQ^A|@EPa2D}u)vY}TdJtw0OYhk_2NN8@V^Vq$FeA9ze+ypE
z#4#%Kv6-4e*c(P6cf%sks;BcQCfag9ga3{V1&T+hz$UBf*?vZRz$o<6GB(9WuM6to
zgh#jbr@~qwBY3zLl>j`j`hF`F*x%I4Bd&%Z0!)5Xkug_iBfsA4I7bDf*egCP_E$^J
zAYW4Q5fuWFiF8WDSNwyNrO?Z6yOTrY+4U+A`dxy^=dq%yaAupy?quQfaxLEuNtZeY
zUgK|>6*ai-MIrx=NE{4M1RRi7;h_ShEnb1_MWq?yK-J0yXnOZb>lm}K^aUjo#e6TS
zPN<k_|Ken^_Ie;?!=EhoMf4@lBT%S8nijwxc$aiwA)y6BJHM(6Q9L{(YU4JgAhhLO
z{3w{<?v<&6YdE%Ta$TYs+*u>_NGfLTQ{;r@40Zn<1T0ypcq%CBVX0C0V1wd%y$m|0
zcdxPEUg_TR36#|4jh06uIFQh@H2w2bkP~Yk6_&ZnNHvxtAS|H~!g&@gT13TYx@Qo3
zi(8N#j-Yg$gL+^A(z%Caqz<3uEr_u6!$j`xMk<QOT%W=65}2ficnIYRR5Q0zAk@Pm
z=>9vTQ0(SVGKwFbihxidHd$T6^IPh$2^C@}Fh{~GY@TobG#qx6oY85;KX~inlbP}|
zQxkf(%f$^s1Up`NbA%Ps(66GM4Nh^${gO*AfjJPnM*ABqT5N2{OK@{yZz*d+_7XNO
z{X);C2ugXYll3-8p0Q+qF*y@oirfMX&1L~r5+OZQokGJltf$R{K6lgB{dZJbMb&0!
z!DvpYn}ARuHdz|XsOeH=#HY3M>0~nOqyS8?Oc3hsfX$HRO7SS4<|ZeTtYdg{4Qi(1
zq$4Gtf=>G0Mq(O)Ugle%TdNVUprbZW$cH3v3P#bl3gv;E7!m-Gmx!m5;1N=nu=Zl<
zQWtvmbHNgI!!FfE)P**Ur*>9G^@1Sm#m@PhLk$#nXEJAVR}Y)!J9m6Ze^V^1Bn+!w
zBJTP<c<&YoBrvV0(TTCMX??S~O!{eztagha@(K(QL~)ueJoXC%>yt#M#LI!<W&5H|
zeD)B>LB64761HC178ZdT4H)1IAc0_8LeOCjfPtV+_yc(0EmEC@4j%eD_FR37Em@tc
z_v`~Imc1tYcv%Dls2~&%MmBw9+`b;XnX0Cf{+Pte`7t-SggzK*C`^JZuVr0+Gd4V-
zLUN2qR-!?h8om4i(J<6V#JC&~G5Vt4E21tWRLRVj<rZFZ00X%@lZO|XBZ3L}*55iE
z4T%#Ww-IA5?+h?Von}mjXoS)!os9__V6R@KWh(J$cvfxoBpVbJbw~SkH@rT(Drf=+
zwi$;{yq1SrII7~{1(B?@k$~SJ6y(FH2ggn*^)oR*QJ#iX_0Sl|3n~zwaE$Bi;p`XF
z^}4M33CQ>Qi<E~6P^LuEC1S!ut1av&K26f6laF23gF@)$OLR>gx%8%+Zjx+CqBy|=
z0aQr6*bOoI2_ED?rqZ#5t;WM-h?UTvTJL%1N8pLO8!2z2{bbBruXelOdc{GWR4;0H
zpS?ac=6UM=JE@<E_$2i+^?qNz@e0W?VyseLoR;W!O=1skk?oUe$NF2B&$tx)i+jT_
zMv(-)vgJko6Bnm1x7Qp%pI~4(8D*Ew66O)~C&l(kaY5`$5@W0QgCvMaks>}ILFsM~
zuLVDel~9YR*H^|25J<|Q{w%7}A@H+Vvzep|4`5b`yD*C8%}cx2`BxksF0K25q<*GU
zD7LI%VAr?JTLDs&Cr?&O45<Y|D3;f<dwFPzM;#EG4o<iYLOe;Z1}l@AJZ+1~9VHb@
zePc5@#*arvakMP*fTKVMKd*{lHEe|h*rH5Rg$4c~J!8ek#K9||HiEi}kSednN?J^*
z^YudfUdyQ2e^O=f9B#W58ZX*|)K|QylbSPbN?lweo6`Qo)R_kV9cmi_DxL~7G;>y}
zAsx??1SOewX=xYJ4w-Zi3-vL38l36fPh?T3N<zaSopf-I%pX;NW5Ez$hc|;rG9<cd
zrnPd{nMKCI3Baz5oySnK+3x^yuP=#s5X*2Crm7x|2tTYM$B!SUtvzv5;K5MAj@=7X
z(5ypW4a>TN`h38Qnd{0o?8jbbZs!D5t&lP4^kwG~&hc!zBw9jEn=;h|Agf>P7dF>t
zqUZ6d`k9hbVeTMjP%}KCf{SUms3u3!v)61=n+t^COGz?w6&z-d_v)&vu3}%ee6@I>
z2<G93va@!2^8#riCg?niod=~BznB`96eyds_2V>jB+3vPa;e!V(ZAIMh7TW33ua;K
zXc6!Pvjv@R2=G*wAQKX8N|1$zDPe6>=j-*A$>a0mK`bv(-M!$4HXVYLyujwcW?^nN
z%PkBgk>HKw2C1ijPHcM3_1UV*RE$HxU;KAiGTh}<=w<r7#LV)ZuDtR}H94>KX}m5v
zW*OQ65}achBi*G-7swYk7Nue!Us|KP+w<&vkK{ltQRWYSz%ND$A$FeCt5>UQ@$Yz@
zuzx3@3n|26^MS$2OQqYGK67F>u!=~Ek~B>=sC|;@Wk?BT1h9dzu4Hkcr6@(bpym3I
zX5ioB7_Ne>RlR%rX=kdu3$Grbi_}7$^Rq;1&TM4R0K1r;S>=a%NvCi%CjAnqSV!Iq
zi~<0dcOP4*P?>jnDM;?YohV_82uLn9IWb=M309D_9*VLM3CC99E+!NWn8v=)E&)H(
zjDdWSwu_64>4dG<&GrfgV(Iep^XWr3XU-f(BaRg?NCXi)kpLLn0&0+;dkLW)Oc8hk
z^lJEWJ2Y&zN#sCvcXH~9vBfn((F4-EE$gp{WgL5yyB4*KMx+oKKdAM>#)*ozTqV>q
zuP@6cW^h)@EeHy<>H1(((0eq><tRva=&&!bXo~spee2e(vCF~O^_D&Evi6uWb1**|
zdY!%w1PWmIreUY>WV6x97AhplgCTSSlzF+Ka-1v_{~=tN4S?=){P3B82zaZZGOXp>
zqKkI-?%ffY*u|k>GD5IX;xuFjg^s}ns{=NmbzMtVLnS06U}GsLC_p)zGGz*3DGY@Q
zOT+{b*8q&o80QyOYGijjVi<f%>C)9DtQ$XUy6kz7GQn5;P}B$vV^l?<<Oj~iL*eh^
zx%dG~L}l|Mf*evMF`jyur&s983G4zyH}ROHC}Da+!#3Ank+;BK+2r()4a-{~QnF#`
zL9)7@P3WGy9e!}b%cJQ(JTFhJ|DXcNf~X(d(kxW9w2SHE+)<5*#3<`y{=tCj&i)|}
zf@KV8Ry`Cg(s@lN$9f$t(pjlxOs+EO2d@B(ad(5nfuO~gJZYz9S$as0*ZP@&#5Yv%
zO7v)co3Gr?X=uRU0bT?ifHFHeK|bIChc1ab#5f=YQnZIJw{PDLHm<+^dSoF&S>T2o
zeBfFHEe>KOV7MTGJqBoTK5!!91(BViOqi%~+~5~uOV-=a*qLNGof8`y3uuWxKxe>w
zj<-&)G$BehkU+0P)rO^v8a2v~_Tl9;`SKnXdcc7Ld)GT_269uv`&Io+OG(uSRPdhQ
z6?Er@I@#DPo0R%7SENQv(RBY_wrm-s3>~vEATrUXof19ZfsAL&^JqoL(`@j>KEV4}
zBSJ?x6Jmny0f`)ZzU7u%WNU$X00St3zX2!Aod_rF#P7fVKEHDEv}x1u^6DMe{g}T`
zmr$%<PbF2?qWocfVhg}c!M=k*R<}L@31R_>iPAfUneVGRUVNHW<(`Z*NJgjbSk&i3
zmk(YvZyYlZ0&q~KiumBUex_Yis8|nt<D~N;%-~xk>xdFy=)}k~Y+Xcp+L<&kz=I1p
zQkoWb0s1r&4jVrrKKucZiTq~pfRI4vI6N%4(m^AU4#?Bk(b(qM?D6|TL&!qxui!^k
zjf07i6bjMvS71PwEp}h9gk>5P1y2j&yPZi^$~mJ)j|Q=<Fis^<Ar1<xQii^!9_EIv
zrca+fl(mhEv#4oZDG%l0rceUWjZhIABLDOFEn2id23D6KC9-)z61+YRWNCtk19=K|
zK;&w+ONa!*_~kEu=`JhPmINhCoFO1k-W)W?9?Y)H28MkANe1HPK#XDDK!pu}2Od0l
zF#lt4#Mlf)BIh9FfK)k|wEzzi8Olxxe}JYDtRZ5IFfb*MpnSUGR_9kHKq)KGf(V3S
zfP4i=ctUnlSOM3<UX*~uI24=F3zG%1ruMIe_31$|_Aew4o9F{7P4K)Nygv`uqP-Bq
zuj&SHCXy9KHddH*HfZG7g)Pg!TaJ$gs8<ppWC*E)Z5v*P?}!}@dPPeyTRu<=+3ZL{
z<h`T*@#>idtHHtCpnDF80aXF&ga8nC5fG4(IG_Z6g(NruDSgI_84w22FH}J;G!hDX
z9Q8<%uJJW74YuRny?aArj0tsdKIFG>;X-+QR7!rOwK+H9cFc$Wp;ahNmBB^^vDDw}
z@(NMX5u$iuP$Z0ArigF?lrjCH$g<P(3`j5B7{DOR=m+2MJ%8mK&J^(mK?q(Z5)OC}
z35OIA<RuABLAex%t}rWcBeIpkKwupR+4z7F#0ic7Bpm#Tw!qW!SH9H41U!%z`XXLG
z6jK7B$;BgK5?3J6A4D+_Dk49mE?{RP6r5x(tS$tup-__aY&oo+rDz`#awfS%z@BHv
zk*B*C)HqC)KqCq~OAeOaTN*+{%#g*0BK1o+6FWHWWM+;R41<sQE0F}mBV#f~e<i09
zce|n18#Ko*j)bO%=(&3?_G1x-nF%{RELxEP;;tMb<suqE1JEcY5EMNAhnCnJ`5pln
zIuTPLask^M2b&;!A3HKM!{rPjVl%gpF(EK2Nbo0h@GD;mL1M!cVGKzGc?VKqh27<9
z+vOFYLRq4aeHj#{!N$x!jY)?)!Q;RQ@()zbz46g9dmfelIrxU}5qK~@KKS5+JR7f{
zD$wli)FhVO9lSvh-~k;7&S04ZBJdEt0X$$GoR8HRoQSN2P|o*^p!<FFSBUEXvLMl(
z=paZxz#<G-*#Qht(Ub0VRT%4sZo<OOLza)S)!=8qN~3qaWG`fG;gisonl^ce7?cP~
zHP2RBTFQZb!gd3NvEVu~$=@)WS(!OTOw05}Jz>q<!rUv)$sB|n*(mV|AX5kda6l3q
zOpgOffLhoJ;REc3kSQ`V^nf{pEs{S$ClD3iAV{-IazJ(LbdVfZK~4<F_yQ`16#@fA
zj0_R-KL@|^C5Mu(+0Aj1B0FKyu#6rM2H*oK#1g_b#yf)$2_S)v+1e3Q*yEY52s3~i
zoKOb|$zBdV^9|qgkg^2Wlz3XUc~k|2CAM~etHMHIN@lyHGAb*+0XCQn51<Z-C*@Zj
zm~=Mv{tzB;<x(gK82D6($)?So)6BV)a(6p@3$Tr<sj|!R+Tg}I@p;JN*CYQrckT?K
zusyK{>zCV1i<5^X?nXCpT3W!>;7D;~I}uOCMx(xjO)&vzk-ZPf76MQQyP<4|Pzz5A
zp|cBMQ-M--sTew85g-ycKlH|C2YG-E=nYC^1n`6Dh4BH25ExPx!*W1`9DD$BP#p(g
z;4@#saJZL*j=S4=eM5zrE+IkEE!eFgYi5u1!lW@4QSOE9A7;WN_@B=_9^e56JUo&Q
zj|Z+qbC4($5tBT`xZC-Y48nkVOAR*K^2>`7N+O-W+`SSiv6;JzZ%2_7dM7Ur1w(y9
zfpHH=)*H`Z(Pww$aztu%IT_*hvCWw}^U2IKMlKVgLN$0$>Pj>Gq0t0^x4Mf41(MBM
zOo(iMLICQ35;(*%E}}BLT{bf40eWStWv>)Ek&dRwIdVX3?4FP{qp=Y)IJn{izw*XK
zkcP$}LOJ*qYUEGySN;UU0bShA9Al;vm=C-{zfAZB6V-(o2pz_R6vV>_*HZ`IaPU{o
zVIfrZj0%vpL-bzH5jMj5VvzQmEPSFNIaw!7eUr9XlteFMPTUt#wLXZ4Bm{0v2WNFM
z?2#RsT~?2d@u}J(x`$5RDA{Uo1V494?I+ii=09O$MRpS33zQ9sD;hw!;4}YoK>hl*
zD1;>0RFDV4u*eRoo}cpA@N)U92vlsu{LjIFP#0rzKx69QSEx}4QvL+bf#MNHJa55%
zqC)2zLW`meb3Y!>-N9c4^vd$+mC$`UftfHk%X;ahm#Wu^Q`Qec_vsSLiuv|)m-UoG
zws}lFYVt@Xo<lJ8JOuO^1ZehYbvdRa54CX2&!}gR6L+M$!!bg*TN54CNO6cy7|q$p
zAzx`TXFh}ybQwXnsVE{b?C84i%$Qh^^pP1;5txvoIyg-}+a$a|Q6W?-j|BJN5QJDB
za)L4|`9$${PG)ePoLxcREG;X|_(b%cPj=VK-7?3>awt7V4Bw*8DBP6~Q{zzWL7k5d
zfcA+ONPPp|>^~`TVBMTjs~QGb-RR`5g9P!;x)~QEhr~D{MYGdO>mc)?D8cYr6>TUw
zF`wX$#$-&(L%`r}OfzW(2NiZmwgS!(^Ax+3zF7t(+uH+eVbC<2Wqj&nMO_><f*v$5
zsIzyPChu8Yi}Mc4rfz2NsgZ@DU=$t(H8NF8+^vAlUN9vi{)vadU5~j6AcMef5pJkp
zbJCq(J~f)Lzpbh>Q8e{XHbq7_H|&pQSt1P!vYnEC#GmSz#67BhCBoc(;~2)#W6p`f
z&;>aUSp%xWH}}PbCxtW6v(c5^`N#sN+VUPDtWY6tKHQm#GTimjwokI2&&2IzW)x(E
z`ZT_tL8?Y`*Z9XgGRcYRDm|0ar^Yeow)WQ_1VK(ux};`|<r5kFeT3`dH^4}Wl?esc
zoa0vB)Eunw!wnVKDD>tjylkHc)Yp?O3EJ0$9&_nIVlM1AG0{Wx^;%Cp)$h<Xej=#|
zqfj8h`Ry)u_o@k{MFt3bBx*r5BgN(+p$WmF)QTJ@tWd$`gr{7+PBu{w<%WC(fcbpG
zPAT`LVw$h{lX{_B8N{dJ+m>a_fr@>9rJm`}-O(t>QBliCkcj14;TNYss5*^!6Jmex
zufZrJ?_9LoilpXX-7Bn6fl@)NfqGB&Q<E{juvwBzMA0|)Kcb-sub@N-xojSkb);>x
z_=NAmSG*aLNIkpl%!8{0QGGIW=(9f!!b#M%^b^yqSbR_EQOlw9R$4?%<CVuKOyCB3
zwuin!!6Mvp9VdKH!M4QyL=dHV!M9xA!6s#3y*1Of`i6iJatTQyBZ6@5h$g^B^3lxX
zNSK`;nV*K-G|z53^AlMH!=BmD*XFYm52B|E6R)91RT7NoZX7+)k3d?Y^oY>L*-Qve
z=<3-5wlG13`0rrcdVv1hM@QJC3^)UgNy%o`gGoK$#ND4L5NPv``e~{OFT;9u+nL8V
zr@xcrX}^k(o+M3GW+JZjr*nrcQt)*xpFnO>ZU}rLwgP`q=xP*Ug$g_s>`!`O9ug0H
zmG6b%$b2VsoV5C#R}~TzM5s1B8E|iTt*k?eu!jyC9wwugkN4`fGoS+2WQM5C)>{lk
z5Qkoqj>->uW=N0LZp+u|?NLziC2xT^JffRCSG_M+$tPHYhY7Dh&nCD)5A>jejvw2$
zhfAP%YDKblx?>d7{q}G<{gB-KRaJ%Z+(?ZEDCQ9ed^FF;KC}=r)#ZeE=-t!V1;{XQ
zH)q}WMu{zQ1_}Qr8k(pig4{w>$yT5W6I7sQvqkC20QQU6`2-%lhKin)OK}s=C3g?5
zbc-3ur}OHzvuqhmn3Dk&RO7YT6bc&y(^i)g;-L>k8ya^jV+e8~_f6`1V||jmg<$R3
zl{HS7pn^A{ch$gHX<xAR2^AloC^h8k>Cv9MK~pu*gRxae)3e(Sp^iT7=BZK}*MN%4
zN84?PiWa0_tE*%H)k8@_z2rRsCWuecLmBajpj1TJ%A)3A-8URi0l$W8>rKf>Q}&70
z?Vn7)60^jD+1|5bgl*n~d_@&0uWmac2rWbX%svy6S8YBHmAlll=zI^Z<)J^I-ejK3
zaZ}*DBLRr)1!A@()jn9%Sy|(R2`Uhu^jfs#*OW}p-c%&zweu=HTF-8FTfvfQxt^=f
zlSj_I#`dmfCU?3k=_ti2VAC{=kI$Wg<hd{=`HcF7Qm+X;n`{T(f}xUCWs!A&_YHYe
zNCZ23mF`}!@7A@st;%VHZJV3(5*_F{EceaBuEGNNkKNsiGMFAFjP#Gmm=P@7N|6(%
z(<qe=Z9WlZYfDs60oL;fdKqIP_6>E^L)V|J11aQDAt{0L=g(K~81Irz%JB6xM0PVJ
zd2KQx<@i06O}J-W9}hFxb=AdI+?MuMTz>kLP(N%wl<LExE=O>pwV&t9L9gz+B$Jld
zb*xVw>Zk{}ZCA?WA&&~lsnD%Y)H%0F89to`8R_XYLQJUjmbK>9$Wo4<pl%QT3J-rG
z6kJsRv1}lQ@TSPxrvlQ9tT%r`y|&ZpNq6}XR7=Sjsl!Klw7cq*l|t45-ZZpPf%t??
zmMSTVGVn<StE-ic87x|Q84Gng3V?ft7IkqrxqhD8tR2sn>$L?eWgA2$H5tnaHy*~v
z69;1PQNkkZ6nwx9qVpw^QN>L`wGQeJgomCT^1f}!;w2D`y0_|WxeM?#69<VwQb^p+
zj~*PVD==QOqOtmOJ~322@g+H#q)<Jo!qWIlU2ZiW52}kFcQ;%@f;fRB>RwbsqqZN6
zf~qr=*r2>X=w?%x8A}NB3W<GUm!hV(dRy3JY*K(8DC*7{<N15S1U=sia}WWr4C0@v
zqt^vw5X)#>RY-v%PBxu)HrGc#4Y!><h&m{eN#GMz3t$wuDJa+x>akB@qHT*tLBU4#
zs*ne4#y%OeMl}MFc7!ug&yNm$s-FX;{z!o^^xr@z_uBXwtG|rw!B6atMrmAPz~n0j
zhMG@Sk%ib~{UCQcm(Yj@f4M%Hu3fugkfi`7*%Xv}!c8F+qeDH=BOD?=Bp+2zFZOB<
zQbeFyrt`9KW>Ni)Z>aO<p?x|VKh{hdJ4rB~od#%xoeME}?dfQsPOy!*Z$O1P37gZD
zMTnxec1YaUbMSu~BGpOhrdgTzvuPIuqrioVKRaw75!#XDIE<*2s7MFHqW#j5*#42A
zDDOpFlTU<#+D*X=j8X0?!Kl#ySXRcxo;^U$r@P>VG(Z9Y#ymoqpscu<;PyVJ3awel
zqzp4{3Nbz5xx@5CK|YBa$37mQ*{4cf9;$kUSf41xuBeBq+V&~WrUTeKAbwx&h$qYI
zz4S~b4*?YBaR8p)TU8#=GMtv$ggSU0*%F*2byyJlg+Y<vM%2fb&TIsYs~$8kitzB<
zg}h!N)+a&?bUoYG8UkL)+I#}rr_{N5-+frPx=P<@(N^u>PLJ+ZL{C7Tc?3fxPhzEP
zs#P8)^X#rcmX&y@9zy>IAVG3AjW#K|MZH&%ovPF}AC$?2B(D%Xn|5J}XmAJwtNFJF
zidi|uRTke)=pjB6y~uzaZ-CsFBnr!BlY~N<C$?#RdxM~5KPlHR8mmX5m0qt+jZC3V
zitnRKAUM%e0tW^C6@UbpkM4Q}1%)&#agdNi1sVmOR6QIJ`mnzl`*$X-lO+g>xF)Y7
z;9pl%1(ka}U!8yh+d$~@t7Xd3oFBA#{Ss;!+6N)`#mhlVie5`oAB}`;dRZYjQ6>UN
zP}qjnDul-pF%BfcPj(7nFCI{)QG<GU7)g9pn(dRRI#Z%$vC`VPR?qY&VAjqhoI}2z
zWe;-79axS)-A+pg5t>f11<2h}eS$3@0a8B`P{Cs@N8n2mCkS&wx0aTLls}_o1le{}
zz(>PYov12tM=!ryhaRs$slYmp$y~io44^j2&hOJy8pBKbESv_0VF{ttt(o=<@BlgW
zQ0eI|`>!095m4N;c3IDwnZA+Y@U)<*tKR1Yb<_3mCre0B{D!OvGVG`Yh?q*{eHs8@
z?xUbG^*f}da=3DdkmMB-Hx3`yUnf<Y{3dss7fNY8>VVie-%!RFCS&I+L*9a31rUkf
zJOa6L`XW&B$K1Zr9UpM_J$=Jy_6dKG{(8j2QsRlau{5I~tb?3vGAK~5!^w?p$#6o9
zS4flxJDGZ~GzzjqbAg<rYOvBm#m+d`h;_2F(?A1JN6(DYE0Yt-VVNwdn`JXHGDt<7
zJ9lpD)~$U-0_WGMQ>RCd9<yi9rU5C%&Jda44~R_Qfj(L^6T(&JwQE-S$uku{awwq!
zNT6r)p7a-wCD9J0`h5=cN|8+NNCP-KgP`H)edV~2o~!TyoW%G#2y5kkI;1?dZ2&3Y
zDsstC#aVAS?@j>I-SgCVWrN2|MCWoSyQrv$V!Ix?Zj+*om_%3roquUYOiN!H`@$cn
zbS7QT&zw0!bpl-1gotASm;NlC`xRC^?UvsiLk1NhJ273XgbEcDEV86jvZzrg+1hau
z?^)V;-JEuWWFwuc(5CsL3g{zz(`D_5rpD-rS;<}EwMzNdePonTA`Fph8Ft!$(w?aJ
zC@9Nmf42rdB;ry1Qg5r5pP#Sy2q&e1NF*YBNf|%9symUhOdA_9ak%P6wCX|uP@SD2
zZhi$Ja1R2CDF-OM&k5<HO)wc+cpjwJ^_n$n)~#EI7lLlQ@CWcf^DaDev=O6V2mQMU
z`}5FiwEXC@az_p&R3JOi0Zpel{Kr^SJ~}a)M9mFz+e7pe!q6M_+9y!XBrcGkKw_3i
zijZ9#w}X_W>C`NXFeL1)zzLg@Ps93pGG$(Eb_!P`v*nZOKwy#_2tT-=(F$lXje3AY
z1nGkl{^y`awe+8cEfBat(Hi=&(C(QC4)`#oI=}-W6Q%Y&cX_T{!Y$XkhYTvreT)cv
zLbfp{Qu|7Umgkd8Kp^*wA&up)?B$j=)1cf-9|Wm}U0m-o<n<OP6>RqG@dS0_U&D9`
zaYN#`+vsd9t=-`RV1Rx%95|=>Qkq_)IS}{CRUm=pj?&v!nwsJ#l>n!33j4E(rBFfz
z)(>P{-8kcwVk+wdWcvR7`%`xel4TCmZ^h?GXkD8&ZRr0?g9r*&CMI5t9aNK~K0Z<n
z@(;92XsVsbGd@}}=Ogw&+0womWq_W}0uR&!{0uazqu_%a0ERE6<2604F)ncl_9Y6O
z5yA2G*Ix@Bg4OQXCLva-(?SLnyeG`$aCW_!v<JGuOj)Bw4Xi7O=}=gQ4jsC5>C(M>
zcZ@9@xI2)=`5p-#gOBH4>y~$c9MN$Jm}4}wTbf_>>(`IZ3`@umVT%hFE=2LgF-!|>
zKFGmm^$lt+MT-&onGD&U@CUdA(hghuU3cBZ|APh%qSG8%Z)^lPIXOHF(4wq{wCCb+
z&=zR<1&Y}F>A@}ysu6pL#lU0)p-Xpn{BC%oX+A9nzw#x2VvB(}a3(!`Q69uG7iQ6~
z{(;TF9+5Cz0fz*5`xL@IKKVCdIbFrp#cShTvcnnbW@Ax-ve}6#cuJEV_D+Zon+!yT
zABuwwn1iqd4s=jC<X67O{K7dnt<Xe!_wEf&^eTEfBtQb2J#<W`P*GU9Rz_CCVhG~E
zp0j@adeLG@MIeGm4nE5_NcK=O=OFHr>dE<{E+0B{2*rTCoc|H}IT?kR!MTwf>RI?w
z6lIA`V%Jywq}lJKsXOEjNDzuRfQlT_@|-^rwSllCco6%Nv@k8FHyFCZR&`Wh6+tjS
z8iuf_wLE_Oc%48Y6etYxV#kH%6cwUbLU6SAEGa2Lyq1H{e533(oQxU@ok4|A9>ETT
z03qtID+5A2B(#bH3E&5!=N6)~LbWn71Cp^Rf;$I2r=f2YSrlI+c=DU&;4_8O<r@@Y
z2pZCdEpR>uC*z=`0V(nidq1?!2#m(~+(-`fEZmVx7=$!YPKF8SJ==u@Rij>aA3~Q>
zD{|&l7Zs|PHli~DYETcMP+&v$U1$X=#|{ILK`4+NK?-P-*xfnv?AfyfKO<6~J9iEV
zTMj<+4c}vaf&MrdqC9r&7$ZR61j9l1AVi!1fQ@~fdqJQOF%k<Wvz;@zjEwA#yiRIA
z2l^|u^h9vSq=VHTB+J3Ca_|`)7Xv7#aWZ7h!8a6Eg1!l?;4wLkzcNpD0cHsG%d_w+
zS_F?k6b4>rg1Qlq5QIX#mr6wvx=;72x~Pzx3Zw!=Vbn^f0TO{a<sdKtSsc=VMxjf#
zTUt>;j!+DV#k3kx@-&)>93pT-e2j+s7BXc_u7&162%9uJvEn3v0W%JG18m$EiWDOz
zgEO*->F_ZQgmsbE$!11YK}uoHmIpEn-Z7||ld(8+AOa!VhzW?lG6Dla@dO|-Ll_8}
zF`rSU`I4J*BT*!9v7sVIg&&`2-Tui{8WrNjg9xAos2QS1{+0t8W#5Ie=@uz45V}!1
zCDa4`L3SL-*7AXG_#Ukk;^Sn-gzOlBJ)WJLy&r_IHw!}m32f@zh5JIIoD8&tE*S~{
zK;j%sj{_J$+{pLr-yD#v`9PZIaUf`g89wuk1RC*y?->wm$P5K<d=|**5DKTNGxmwK
z!p^L^s1PYxEK!gPlns4A%5un7%{T10(7IA6ITKPtp@hh|kVD9nLw@CZ{t5-NH**!&
zG6KX0#luP1l>rzB7=S16rQAjF0ik2YQACg0%AqWqp5L4}?BRjxQ2qg_6w0t_hD=hP
z1+d9YMMaKGmqLX>f*Vz7R0uG{od;#eRw{clG|eG9v|vCdRv}ZNRQ-@I`6~nJ2w@yC
z-6)nK+(2%mZXsYW3=544nc9?R%zCg=lm#$qh5|hOS$w)tMUqjN-K(mj!m!*1k_zI>
z@L;_O;$5Ocg~SSk7%D<yO{0?x^%aPsBGlhtbpF9#fha11zoyX<LwyCJs0j5p7@dFc
zS0IXt;IC<P#86*>i>S!V%p|UXZYg+qqepZFB6$Ts0aySL4$=dNUQSL<CU`b_L{}h^
fR{#`%1rYK73i}CcUau|}00000NkvXXu0mjf0$(-G

literal 0
HcmV?d00001

diff --git a/Source/Core/DolphinWX/resources/toolbar_add_breakpoint.png b/Source/Core/DolphinWX/resources/toolbar_add_breakpoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..c633370aacb7a184e8bc9645f92a7a10032eee52
GIT binary patch
literal 3647
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
R%6R|)002ovPDHLkV1n<U<s|?B

literal 0
HcmV?d00001

diff --git a/Source/Core/DolphinWX/resources/toolbar_add_memorycheck.png b/Source/Core/DolphinWX/resources/toolbar_add_memorycheck.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcd46e7ea2d6e7460662b273d326739278628377
GIT binary patch
literal 2842
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

literal 0
HcmV?d00001

diff --git a/Source/Core/DolphinWX/resources/toolbar_debugger_delete.png b/Source/Core/DolphinWX/resources/toolbar_debugger_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..97af25dac468de9804290b4fda5bd3d781f0b741
GIT binary patch
literal 2904
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

literal 0
HcmV?d00001


From 379a15ba3bfce5a3247239b70f9df8d0ba8eb870 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Mon, 8 Jul 2013 02:56:40 -0500
Subject: [PATCH 263/352] Make confirm on stop default enabled.

---
 Source/Core/Core/Src/ConfigManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp
index 6c0decaebc..15dcbcf6f3 100644
--- a/Source/Core/Core/Src/ConfigManager.cpp
+++ b/Source/Core/Core/Src/ConfigManager.cpp
@@ -309,7 +309,7 @@ void SConfig::LoadSettings()
 
 	{
 		// Interface
-		ini.Get("Interface", "ConfirmStop",			&m_LocalCoreStartupParameter.bConfirmStop,		false);
+		ini.Get("Interface", "ConfirmStop",			&m_LocalCoreStartupParameter.bConfirmStop,		true);
 		ini.Get("Interface", "UsePanicHandlers",	&m_LocalCoreStartupParameter.bUsePanicHandlers,	true);
 		ini.Get("Interface", "OnScreenDisplayMessages",	&m_LocalCoreStartupParameter.bOnScreenDisplayMessages,	true);
 		ini.Get("Interface", "HideCursor",			&m_LocalCoreStartupParameter.bHideCursor,		false);

From 16cd26d17788fe7c0f5807de6a51aaa5a0ab9189 Mon Sep 17 00:00:00 2001
From: John Chadwick <johnwchadwick@gmail.com>
Date: Mon, 8 Jul 2013 20:13:02 -0400
Subject: [PATCH 264/352] Add UPnP support.

Feedback is in logs as suggested by skid_au. The checkbox is still there, but
mostly for people who would like to opt out (unfortunately, I can not be sure
how this feature may behave for some routers - there's a hell of a lot of bad
UPnP implementations.)

The Visual Studio stuff is a little messy, so I apologize if anything is a bit
off. I tested most configurations and it worked.

I also tested CMake on Debian Wheezy, Ubuntu Saucy, and Mac OS X Mountain Lion.
All seemed to be OK.
---
 CMakeLists.txt                                |    8 +
 Externals/miniupnpc/CMakeLists.txt            |   37 +
 Externals/miniupnpc/Changelog.txt             |  556 ++++++++
 Externals/miniupnpc/LICENSE                   |   27 +
 Externals/miniupnpc/README                    |   66 +
 Externals/miniupnpc/VERSION                   |    1 +
 Externals/miniupnpc/apiversions.txt           |  117 ++
 Externals/miniupnpc/miniupnpc.vcxproj         |  164 +++
 Externals/miniupnpc/miniupnpc.vcxproj.filters |  108 ++
 Externals/miniupnpc/src/bsdqueue.h            |  531 ++++++++
 Externals/miniupnpc/src/codelength.h          |   31 +
 Externals/miniupnpc/src/connecthostport.c     |  250 ++++
 Externals/miniupnpc/src/connecthostport.h     |   18 +
 Externals/miniupnpc/src/declspec.h            |    5 +
 Externals/miniupnpc/src/igd_desc_parse.c      |  125 ++
 Externals/miniupnpc/src/igd_desc_parse.h      |   48 +
 Externals/miniupnpc/src/minisoap.c            |  121 ++
 Externals/miniupnpc/src/minisoap.h            |   15 +
 Externals/miniupnpc/src/minissdpc.c           |  133 ++
 Externals/miniupnpc/src/minissdpc.h           |   15 +
 Externals/miniupnpc/src/miniupnpc.c           |  987 ++++++++++++++
 Externals/miniupnpc/src/miniupnpc.def         |   42 +
 Externals/miniupnpc/src/miniupnpc.h           |  130 ++
 Externals/miniupnpc/src/miniupnpcmodule.c     |  544 ++++++++
 Externals/miniupnpc/src/miniupnpcstrings.h    |   27 +
 Externals/miniupnpc/src/miniupnpctypes.h      |   19 +
 Externals/miniupnpc/src/miniwget.c            |  574 ++++++++
 Externals/miniupnpc/src/miniwget.h            |   30 +
 Externals/miniupnpc/src/minixml.c             |  216 +++
 Externals/miniupnpc/src/minixml.h             |   37 +
 Externals/miniupnpc/src/portlistingparse.c    |  159 +++
 Externals/miniupnpc/src/portlistingparse.h    |   71 +
 Externals/miniupnpc/src/receivedata.c         |  104 ++
 Externals/miniupnpc/src/receivedata.h         |   19 +
 Externals/miniupnpc/src/upnpc.c               |  715 ++++++++++
 Externals/miniupnpc/src/upnpcommands.c        | 1097 +++++++++++++++
 Externals/miniupnpc/src/upnpcommands.h        |  271 ++++
 Externals/miniupnpc/src/upnperrors.c          |  104 ++
 Externals/miniupnpc/src/upnperrors.h          |   26 +
 Externals/miniupnpc/src/upnpreplyparse.c      |  152 +++
 Externals/miniupnpc/src/upnpreplyparse.h      |   64 +
 Source/Core/Core/Core.vcxproj                 | 1202 ++++++++---------
 Source/Core/Core/Src/NetPlay.h                |   20 +
 Source/Core/Core/Src/NetPlayServer.cpp        |  167 ++-
 Source/Core/DolphinWX/CMakeLists.txt          |    4 +
 Source/Core/DolphinWX/Dolphin.vcxproj         |  747 +++++-----
 Source/Core/DolphinWX/Dolphin.vcxproj.filters |  612 ++++-----
 Source/Core/DolphinWX/Src/NetWindow.cpp       |    8 +
 Source/Core/DolphinWX/Src/NetWindow.h         |    3 +
 Source/Dolphin_2010.sln                       |   14 +
 Source/VSProps/Base.props                     |   54 +-
 Source/VSProps/Dolphin.Win32.props            |   30 +-
 Source/VSProps/Dolphin.x64.props              |   32 +-
 53 files changed, 9321 insertions(+), 1336 deletions(-)
 create mode 100644 Externals/miniupnpc/CMakeLists.txt
 create mode 100644 Externals/miniupnpc/Changelog.txt
 create mode 100644 Externals/miniupnpc/LICENSE
 create mode 100644 Externals/miniupnpc/README
 create mode 100644 Externals/miniupnpc/VERSION
 create mode 100644 Externals/miniupnpc/apiversions.txt
 create mode 100644 Externals/miniupnpc/miniupnpc.vcxproj
 create mode 100644 Externals/miniupnpc/miniupnpc.vcxproj.filters
 create mode 100644 Externals/miniupnpc/src/bsdqueue.h
 create mode 100644 Externals/miniupnpc/src/codelength.h
 create mode 100644 Externals/miniupnpc/src/connecthostport.c
 create mode 100644 Externals/miniupnpc/src/connecthostport.h
 create mode 100644 Externals/miniupnpc/src/declspec.h
 create mode 100644 Externals/miniupnpc/src/igd_desc_parse.c
 create mode 100644 Externals/miniupnpc/src/igd_desc_parse.h
 create mode 100644 Externals/miniupnpc/src/minisoap.c
 create mode 100644 Externals/miniupnpc/src/minisoap.h
 create mode 100644 Externals/miniupnpc/src/minissdpc.c
 create mode 100644 Externals/miniupnpc/src/minissdpc.h
 create mode 100644 Externals/miniupnpc/src/miniupnpc.c
 create mode 100644 Externals/miniupnpc/src/miniupnpc.def
 create mode 100644 Externals/miniupnpc/src/miniupnpc.h
 create mode 100644 Externals/miniupnpc/src/miniupnpcmodule.c
 create mode 100644 Externals/miniupnpc/src/miniupnpcstrings.h
 create mode 100644 Externals/miniupnpc/src/miniupnpctypes.h
 create mode 100644 Externals/miniupnpc/src/miniwget.c
 create mode 100644 Externals/miniupnpc/src/miniwget.h
 create mode 100644 Externals/miniupnpc/src/minixml.c
 create mode 100644 Externals/miniupnpc/src/minixml.h
 create mode 100644 Externals/miniupnpc/src/portlistingparse.c
 create mode 100644 Externals/miniupnpc/src/portlistingparse.h
 create mode 100644 Externals/miniupnpc/src/receivedata.c
 create mode 100644 Externals/miniupnpc/src/receivedata.h
 create mode 100644 Externals/miniupnpc/src/upnpc.c
 create mode 100644 Externals/miniupnpc/src/upnpcommands.c
 create mode 100644 Externals/miniupnpc/src/upnpcommands.h
 create mode 100644 Externals/miniupnpc/src/upnperrors.c
 create mode 100644 Externals/miniupnpc/src/upnperrors.h
 create mode 100644 Externals/miniupnpc/src/upnpreplyparse.c
 create mode 100644 Externals/miniupnpc/src/upnpreplyparse.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ecc8e6ea61..6ea7cfeca7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,7 @@ option(USE_X11 "Enables X11 Support" ON)
 option(USE_WAYLAND "Enables Wayland Support" OFF)
 option(USE_GLES "Enables GLES2 And EGL, disables OGL" OFF)
 option(USE_GLES3 "Enables GLES3 and EGL" OFF)
+option(USE_UPNP "Enables UPnP port mapping support" ON)
 option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF)
 
 option(FASTLOG "Enable all logs" OFF)
@@ -549,6 +550,13 @@ else()
        include_directories(Externals/SFML/include)
 endif()
 
+if(USE_UPNP)
+	message("Using static MiniUPnP client from Externals")
+	add_subdirectory(Externals/miniupnpc)
+	include_directories(Externals/miniupnpc/src)
+	add_definitions(-DUSE_UPNP)
+endif()
+
 if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
 	check_lib(SOIL SOIL SOIL/SOIL.h QUIET)
 endif()
diff --git a/Externals/miniupnpc/CMakeLists.txt b/Externals/miniupnpc/CMakeLists.txt
new file mode 100644
index 0000000000..404ef65b94
--- /dev/null
+++ b/Externals/miniupnpc/CMakeLists.txt
@@ -0,0 +1,37 @@
+cmake_minimum_required(VERSION 2.6)
+
+project(miniupnpc C)
+set(MINIUPNPC_VERSION 1.7)
+set(MINIUPNPC_API_VERSION 9)
+
+if(UNIX)
+	add_definitions(-DMINIUPNPC_SET_SOCKET_TIMEOUT)
+	add_definitions(-D_BSD_SOURCE -D_POSIX_C_SOURCE=1)
+elseif(WIN32)
+	add_definitions(-D_WIN32_WINNT=0x0501)
+	find_library(WINSOCK2_LIBRARY NAMES ws2_32 WS2_32 Ws2_32)
+	find_library(IPHLPAPI_LIBRARY NAMES iphlpapi)
+	set(LDLIBS ${WINSOCK2_LIBRARY} ${IPHLPAPI_LIBRARY} ${LDLIBS})
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+	add_definitions(-DMACOSX -D_DARWIN_C_SOURCE)
+endif()
+
+include_directories(include)
+
+set(SRCS	src/igd_desc_parse.c
+			src/miniupnpc.c
+			src/minixml.c
+			src/minisoap.c
+			src/miniwget.c
+			src/upnpc.c
+			src/upnpcommands.c
+			src/upnpreplyparse.c
+			src/upnperrors.c
+			src/connecthostport.c
+			src/portlistingparse.c
+			src/receivedata.c)
+
+add_library(miniupnpc STATIC ${SRCS})
+
diff --git a/Externals/miniupnpc/Changelog.txt b/Externals/miniupnpc/Changelog.txt
new file mode 100644
index 0000000000..e3ced295d8
--- /dev/null
+++ b/Externals/miniupnpc/Changelog.txt
@@ -0,0 +1,556 @@
+$Id: Changelog.txt,v 1.185 2013/05/03 09:05:38 nanard Exp $
+miniUPnP client Changelog.
+
+2013/05/03:
+  Fix Solaris build thanks to Maciej Małecki
+
+2013/04/27:
+  Fix testminiwget.sh for BSD
+
+2013/03/23:
+  Fixed Makefile for *BSD
+
+2013/03/11:
+  Update Makefile to use JNAerator version 0.11
+
+2013/02/11:
+  Fix testminiwget.sh for use with dash
+  Use $(DESTDIR) in Makefile
+
+VERSION 1.8 : released 2013/02/06
+
+2012/10/16:
+  fix testminiwget with no IPv6 support
+
+2012/09/27:
+  Rename all include guards to not clash with C99
+  (7.1.3 Reserved identifiers).
+
+2012/08/30:
+  Added -e option to upnpc program (set description for port mappings)
+
+2012/08/29:
+  Python 3 support (thanks to Christopher Foo)
+
+2012/08/11:
+  Fix a memory link in UPNP_GetValidIGD()
+  Try to handle scope id in link local IPv6 URL under MS Windows
+
+2012/07/20:
+  Disable HAS_IP_MREQN on DragonFly BSD
+
+2012/06/28:
+  GetUPNPUrls() now inserts scope into link-local IPv6 addresses
+
+2012/06/23:
+  More error return checks in upnpc.c
+  #define MINIUPNPC_GET_SRC_ADDR enables receivedata() to get scope_id
+  parseURL() now parses IPv6 addresses scope
+  new parameter for miniwget() : IPv6 address scope
+  increment API_VERSION to 9
+
+2012/06/20:
+  fixed CMakeLists.txt
+
+2012/05/29
+  Improvements in testminiwget.sh
+
+VERSION 1.7 : released 2012/05/24
+
+2012/05/01:
+  Cleanup settings of CFLAGS in Makefile
+  Fix signed/unsigned integer comparaisons
+
+2012/04/20:
+  Allow to specify protocol with TCP or UDP for -A option
+
+2012/04/09:
+  Only try to fetch XML description once in UPNP_GetValidIGD()
+  Added -ansi flag to compilation, and fixed C++ comments to ANSI C comments.
+
+2012/04/05:
+  minor improvements to minihttptestserver.c
+
+2012/03/15:
+  upnperrors.c returns valid error string for unrecognized error codes
+
+2012/03/08:
+  make minihttptestserver listen on loopback interface instead of 0.0.0.0
+
+2012/01/25:
+  Maven installation thanks to Alexey Kuznetsov
+
+2012/01/21:
+  Replace WIN32 macro by _WIN32
+
+2012/01/19:
+  Fixes in java wrappers thanks to Alexey Kuznetsov :
+    https://github.com/axet/miniupnp/tree/fix-javatest/miniupnpc
+  Make and install .deb packages (python) thanks to Alexey Kuznetsov :
+    https://github.com/axet/miniupnp/tree/feature-debbuild/miniupnpc
+
+2012/01/07:
+  The multicast interface can now be specified by name with IPv4.
+
+2012/01/02:
+  Install man page
+
+2011/11/25:
+  added header to Port Mappings list in upnpc.c
+
+2011/10/09:
+  Makefile : make clean now removes jnaerator generated files.
+  MINIUPNPC_VERSION in miniupnpc.h (updated by make)
+
+2011/09/12:
+  added rootdescURL to UPNPUrls structure.
+
+VERSION 1.6 : released 2011/07/25
+
+2011/07/25:
+  Update doc for version 1.6 release
+
+2011/06/18:
+  Fix for windows in miniwget.c
+
+2011/06/04:
+  display remote host in port mapping listing
+
+2011/06/03:
+  Fix in make install : there were missing headers
+
+2011/05/26:
+  Fix the socket leak in miniwget thanks to Richard Marsh.
+  Permit to add leaseduration in -a command. Display lease duration.
+
+2011/05/15:
+  Try both LinkLocal and SiteLocal multicast address for SSDP in IPv6
+
+2011/05/09:
+  add a test in testminiwget.sh.
+  more error checking in miniwget.c
+
+2011/05/06:
+  Adding some tool to test and validate miniwget.c
+  simplified and debugged miniwget.c
+
+2011/04/11:
+  moving ReceiveData() to a receivedata.c file.
+  parsing presentation url
+  adding IGD v2 WANIPv6FirewallControl commands
+
+2011/04/10:
+  update of miniupnpcmodule.c
+  comments in miniwget.c, update in testminiwget
+  Adding errors codes from IGD v2
+  new functions in upnpc.c for IGD v2
+
+2011/04/09:
+  Support for litteral ip v6 address in miniwget
+
+2011/04/08:
+  Adding support for urn:schemas-upnp-org:service:WANIPv6FirewallControl:1
+  Updating APIVERSION
+  Supporting IPV6 in upnpDiscover()
+  Adding a -6 option to upnpc command line tool
+
+2011/03/18:
+  miniwget/parseURL() : return an error when url param is null.
+  fixing GetListOfPortMappings()
+
+2011/03/14:
+  upnpDiscover() now reporting an error code.
+  improvements in comments.
+
+2011/03/11:
+  adding miniupnpcstrings.h.cmake and CMakeLists.txt files.
+
+2011/02/15:
+  Implementation of GetListOfPortMappings()
+
+2011/02/07:
+  updates to minixml to support character data starting with spaces
+  minixml now support CDATA
+  upnpreplyparse treats <NewPortListing> specificaly
+  change in simpleUPnPcommand to return the buffer (simplification)
+
+2011/02/06:
+  Added leaseDuration argument to AddPortMapping()
+  Starting to implement GetListOfPortMappings()
+
+2011/01/11:
+  updating wingenminiupnpcstrings.c
+
+2011/01/04:
+  improving updateminiupnpcstrings.sh
+
+VERSION 1.5 : released 2011/01/01
+
+2010/12/21:
+  use NO_GETADDRINFO macro to disable the use of getaddrinfo/freeaddrinfo
+
+2010/12/11:
+  Improvements on getHTTPResponse() code.
+
+2010/12/09:
+  new code for miniwget that handle Chunked transfer encoding
+  using getHTTPResponse() in SOAP call code
+  Adding MANIFEST.in for 'python setup.py bdist_rpm'
+
+2010/11/25:
+  changes to minissdpc.c to compile under Win32.
+  see http://miniupnp.tuxfamily.org/forum/viewtopic.php?t=729
+
+2010/09/17:
+  Various improvement to Makefile from Michał Górny
+
+2010/08/05:
+  Adding the script "external-ip.sh" from Reuben Hawkins
+
+2010/06/09:
+  update to python module to match modification made on 2010/04/05
+  update to Java test code to match modification made on 2010/04/05
+  all UPNP_* function now return an error if the SOAP request failed
+  at HTTP level.
+
+2010/04/17:
+  Using GetBestRoute() under win32 in order to find the
+  right interface to use.
+
+2010/04/12:
+  Retrying with HTTP/1.1 if HTTP/1.0 failed. see
+  http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=1703
+
+2010/04/07:
+  avoid returning duplicates in upnpDiscover()
+
+2010/04/05:
+  Create a connecthostport.h/.c with connecthostport() function
+  and use it in miniwget and miniupnpc.
+  Use getnameinfo() instead of inet_ntop or inet_ntoa
+  Work to make miniupnpc IPV6 compatible...
+  Add java test code.
+  Big changes in order to support device having both WANIPConnection
+  and WANPPPConnection.
+
+2010/04/04:
+  Use getaddrinfo() instead of gethostbyname() in miniwget.
+
+2010/01/06:
+  #define _DARWIN_C_SOURCE for Mac OS X
+
+2009/12/19:
+  Improve MinGW32 build
+
+2009/12/11:
+  adding a MSVC9 project to build the static library and executable
+
+2009/12/10:
+  Fixing some compilation stuff for Windows/MinGW
+
+2009/12/07:
+  adaptations in Makefile and updateminiupnpcstring.sh for AmigaOS
+  some fixes for Windows when using virtual ethernet adapters (it is the
+  case with VMWare installed).
+
+2009/12/04:
+  some fixes for AmigaOS compilation
+  Changed HTTP version to HTTP/1.0 for Soap too (to prevent chunked
+  transfer encoding)
+
+2009/12/03:
+  updating printIDG and testigddescparse.c for debug.
+  modifications to compile under AmigaOS
+  adding a testminiwget program
+  Changed miniwget to advertise itself as HTTP/1.0 to prevent chunked
+  transfer encoding
+
+2009/11/26:
+  fixing updateminiupnpcstrings.sh to take into account
+  which command that does not return an error code.
+
+VERSION 1.4 : released 2009/10/30
+
+2009/10/16:
+  using Py_BEGIN_ALLOW_THREADS and Py_END_ALLOW_THREADS in python module.
+
+2009/10/10:
+  Some fixes for compilation under Solaris
+  compilation fixes : http://miniupnp.tuxfamily.org/forum/viewtopic.php?p=1464
+
+2009/09/21:
+  fixing the code to ignore EINTR during connect() calls.
+
+2009/08/07:
+  Set socket timeout for connect()
+  Some cleanup in miniwget.c
+
+2009/08/04:
+  remove multiple redirections with -d in upnpc.c
+  Print textual error code in upnpc.c
+  Ignore EINTR during the connect() and poll() calls.
+
+2009/07/29:
+  fix in updateminiupnpcstrings.sh if OS name contains "/"
+  Sending a correct value for MX: field in SSDP request
+
+2009/07/20:
+  Change the Makefile to compile under Mac OS X
+  Fixed a stackoverflow in getDevicesFromMiniSSDPD()
+
+2009/07/09:
+  Compile under Haiku
+  generate miniupnpcstrings.h.in from miniupnpcstrings.h
+
+2009/06/04:
+  patching to compile under CygWin and cross compile for minGW
+
+VERSION 1.3 :
+
+2009/04/17:
+  updating python module
+  Use strtoull() when using C99
+
+2009/02/28:
+  Fixed miniwget.c for compiling under sun
+
+2008/12/18:
+  cleanup in Makefile (thanks to Paul de Weerd)
+  minissdpc.c : win32 compatibility
+  miniupnpc.c : changed xmlns prefix from 'm' to 'u'
+  Removed NDEBUG (using DEBUG)
+
+2008/10/14:
+  Added the ExternalHost argument to DeletePortMapping()
+
+2008/10/11:
+  Added the ExternalHost argument to AddPortMapping()
+  Put a correct User-Agent: header in HTTP requests.
+
+VERSION 1.2 :
+
+2008/10/07:
+  Update docs
+
+2008/09/25:
+  Integrated sameport patch from Dario Meloni : Added a "sameport"
+  argument to upnpDiscover().
+
+2008/07/18:
+  small modif to make Clang happy :)
+
+2008/07/17:
+  #define SOAPPREFIX "s" in miniupnpc.c in order to remove SOAP-ENV...
+
+2008/07/14:
+  include declspec.h in installation (to /usr/include/miniupnpc)
+
+VERSION 1.1 :
+
+2008/07/04:
+  standard options for install/ln instead of gnu-specific stuff.
+
+2008/07/03:
+  now builds a .dll and .lib with win32. (mingw32)
+
+2008/04/28:
+  make install now install the binary of the upnpc tool
+
+2008/04/27:
+  added testupnpigd.py
+  added error strings for miniupnpc "internal" errors
+  improved python module error/exception reporting.
+
+2008/04/23:
+  Completely rewrite igd_desc_parse.c in order to be compatible with
+  Linksys WAG200G
+  Added testigddescparse
+  updated python module
+
+VERSION 1.0 :
+
+2008/02/21:
+  put some #ifdef DEBUG around DisplayNameValueList()
+
+2008/02/18:
+  Improved error reporting in upnpcommands.c
+  UPNP_GetStatusInfo() returns LastConnectionError
+
+2008/02/16:
+  better error handling in minisoap.c
+  improving display of "valid IGD found" in upnpc.c
+
+2008/02/03:
+  Fixing UPNP_GetValidIGD()
+  improved make install :)
+
+2007/12/22:
+  Adding upnperrors.c/h to provide a strupnperror() function
+  used to translate UPnP error codes to string.
+
+2007/12/19:
+  Fixing getDevicesFromMiniSSDPD()
+  improved error reporting of UPnP functions
+
+2007/12/18:
+  It is now possible to specify a different location for MiniSSDPd socket.
+  working with MiniSSDPd is now more efficient.
+  python module improved.
+
+2007/12/16:
+  improving error reporting
+
+2007/12/13:
+  Try to improve compatibility by using HTTP/1.0 instead of 1.1 and
+  XML a bit different for SOAP.
+
+2007/11/25:
+  fixed select() call for linux
+
+2007/11/15:
+  Added -fPIC to CFLAG for better shared library code.
+
+2007/11/02:
+  Fixed a potential socket leak in miniwget2()
+
+2007/10/16:
+  added a parameter to upnpDiscover() in order to allow the use of another
+  interface than the default multicast interface.
+
+2007/10/12:
+  Fixed the creation of symbolic link in Makefile
+
+2007/10/08:
+  Added man page
+
+2007/10/02:
+  fixed memory bug in GetUPNPUrls()
+
+2007/10/01:
+  fixes in the Makefile
+  Added UPNP_GetIGDFromUrl() and adapted the sample program accordingly.
+  Added SONAME in the shared library to please debian :)
+  fixed MS Windows compilation (minissdpd is not available under MS Windows).
+
+2007/09/25:
+  small change to Makefile to be able to install in a different location
+  (default is /usr)
+
+2007/09/24:
+  now compiling both shared and static library
+
+2007/09/19:
+  Cosmetic changes on upnpc.c
+
+2007/09/02:
+  adapting to new miniSSDPd (release version ?)
+
+2007/08/31:
+  Usage of miniSSDPd to skip discovery process.
+
+2007/08/27:
+  fixed python module to allow compilation with Python older than Python 2.4
+
+2007/06/12:
+  Added a python module.
+
+2007/05/19:
+  Fixed compilation under MinGW
+
+2007/05/15:
+  fixed a memory leak in AddPortMapping()
+  Added testupnpreplyparse executable to check the parsing of
+  upnp soap messages
+  minixml now ignore namespace prefixes.
+
+2007/04/26:
+  upnpc now displays external ip address with -s or -l
+
+2007/04/11:
+  changed MINIUPNPC_URL_MAXSIZE to 128 to accomodate the "BT Voyager 210"
+
+2007/03/19:
+  cleanup in miniwget.c
+
+2007/03/01:
+  Small typo fix...
+
+2007/01/30:
+  Now parsing the HTTP header from SOAP responses in order to
+  get content-length value.
+
+2007/01/29:
+  Fixed the Soap Query to speedup the HTTP request.
+  added some Win32 DLL stuff...
+
+2007/01/27:
+  Fixed some WIN32 compatibility issues
+
+2006/12/14:
+  Added UPNPIGD_IsConnected() function in miniupnp.c/.h
+  Added UPNP_GetValidIGD() in miniupnp.c/.h
+  cleaned upnpc.c main(). now using UPNP_GetValidIGD()
+
+2006/12/07:
+  Version 1.0-RC1 released
+
+2006/12/03:
+  Minor changes to compile under SunOS/Solaris
+
+2006/11/30:
+  made a minixml parser validator program
+  updated minixml to handle attributes correctly
+
+2006/11/22:
+  Added a -r option to the upnpc sample thanks to Alexander Hubmann.
+
+2006/11/19:
+  Cleanup code to make it more ANSI C compliant
+
+2006/11/10:
+  detect and display local lan address.
+
+2006/11/04:
+  Packets and Bytes Sent/Received are now unsigned int.
+
+2006/11/01:
+  Bug fix thanks to Giuseppe D'Angelo
+
+2006/10/31:
+  C++ compatibility for .h files.
+  Added a way to get ip Address on the LAN used to reach the IGD.
+
+2006/10/25:
+  Added M-SEARCH to the services in the discovery process.
+
+2006/10/22:
+  updated the Makefile to use makedepend, added a "make install"
+  update Makefile
+
+2006/10/20:
+  fixing the description url parsing thanks to patch sent by
+  Wayne Dawe.
+  Fixed/translated some comments.
+  Implemented a better discover process, first looking
+  for IGD then for root devices (as some devices only reply to
+  M-SEARCH for root devices).
+
+2006/09/02:
+  added freeUPNPDevlist() function.
+
+2006/08/04:
+  More command line arguments checking
+
+2006/08/01:
+  Added the .bat file to compile under Win32 with minGW32
+
+2006/07/31:
+  Fixed the rootdesc parser (igd_desc_parse.c)
+
+2006/07/20:
+  parseMSEARCHReply() is now returning the ST: line as well
+  starting changes to detect several UPnP devices on the network
+
+2006/07/19:
+  using GetCommonLinkProperties to get down/upload bitrate
+
diff --git a/Externals/miniupnpc/LICENSE b/Externals/miniupnpc/LICENSE
new file mode 100644
index 0000000000..ac89a7516a
--- /dev/null
+++ b/Externals/miniupnpc/LICENSE
@@ -0,0 +1,27 @@
+MiniUPnPc
+Copyright (c) 2005-2011, Thomas BERNARD
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * The name of the author may not be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/Externals/miniupnpc/README b/Externals/miniupnpc/README
new file mode 100644
index 0000000000..b23478de97
--- /dev/null
+++ b/Externals/miniupnpc/README
@@ -0,0 +1,66 @@
+Project: miniupnp
+Project web page: http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+github: https://github.com/miniupnp/miniupnp
+freecode: http://freecode.com/projects/miniupnp
+Author: Thomas Bernard
+Copyright (c) 2005-2012 Thomas Bernard
+This software is subject to the conditions detailed in the
+LICENSE file provided within this distribution.
+
+
+For the comfort of Win32 users, bsdqueue.h is included in the distribution.
+Its licence is included in the header of the file.
+bsdqueue.h is a copy of the sys/queue.h of an OpenBSD system.
+
+
+* miniUPnP Client - miniUPnPc *
+
+To compile, simply run 'gmake' (could be 'make' on your system).
+Under win32, to compile with MinGW, type "mingw32make.bat".
+MS Visual C solution and project files are supplied in the msvc/ subdirectory.
+
+The compilation is known to work under linux, FreeBSD,
+OpenBSD, MacOS X, AmigaOS and cygwin.
+The official AmigaOS4.1 SDK was used for AmigaOS4 and GeekGadgets for AmigaOS3.
+upx (http://upx.sourceforge.net) is used to compress the win32 .exe files.
+
+To install the library and headers on the system use :
+> su
+> make install
+> exit
+
+alternatively, to install into a specific location, use :
+> INSTALLPREFIX=/usr/local make install
+
+upnpc.c is a sample client using the libminiupnpc.
+To use the libminiupnpc in your application, link it with
+libminiupnpc.a (or .so) and use the following functions found in miniupnpc.h,
+upnpcommands.h and miniwget.h :
+- upnpDiscover()
+- miniwget()
+- parserootdesc()
+- GetUPNPUrls()
+- UPNP_* (calling UPNP methods)
+
+Note : use #include <miniupnpc/miniupnpc.h> etc... for the includes
+and -lminiupnpc for the link
+
+Discovery process is speeded up when MiniSSDPd is running on the machine.
+
+
+* Python module *
+
+you can build a python module with 'make pythonmodule'
+and install it with 'make installpythonmodule'.
+setup.py (and setupmingw32.py) are included in the distribution.
+
+
+Feel free to contact me if you have any problem :
+e-mail : miniupnp@free.fr
+
+If you are using libminiupnpc in your application, please
+send me an email !
+
+For any question, you can use the web forum :
+http://miniupnp.tuxfamily.org/forum/
+
diff --git a/Externals/miniupnpc/VERSION b/Externals/miniupnpc/VERSION
new file mode 100644
index 0000000000..6259340971
--- /dev/null
+++ b/Externals/miniupnpc/VERSION
@@ -0,0 +1 @@
+1.8
diff --git a/Externals/miniupnpc/apiversions.txt b/Externals/miniupnpc/apiversions.txt
new file mode 100644
index 0000000000..bec2941be3
--- /dev/null
+++ b/Externals/miniupnpc/apiversions.txt
@@ -0,0 +1,117 @@
+$Id: apiversions.txt,v 1.2 2013/03/29 14:45:09 nanard Exp $
+
+Differences in API between miniUPnPc versions
+
+
+====================== miniUPnPc version 1.8 ======================
+API version 9
+
+miniupnpc.h:
+  updated macros :
+    #define MINIUPNPC_VERSION      "1.8"
+    #define MINIUPNPC_API_VERSION  9
+  added "unsigned int scope_id;" to struct UPNPDev
+  added scope_id argument to GetUPNPUrls()
+
+
+
+====================== miniUPnPc version 1.7 ======================
+API version 8
+
+miniupnpc.h :
+  add new macros :
+    #define MINIUPNPC_VERSION      "1.7"
+    #define MINIUPNPC_API_VERSION  8
+  add rootdescURL to struct UPNPUrls
+
+
+
+====================== miniUPnPc version 1.6 ======================
+API version 8
+
+Adding support for IPv6.
+igd_desc_parse.h :
+  struct IGDdatas_service :
+    add char presentationurl[MINIUPNPC_URL_MAXSIZE];
+  struct IGDdatas :
+    add struct IGDdatas_service IPv6FC;
+miniupnpc.h :
+  new macros :
+    #define UPNPDISCOVER_SUCCESS (0)
+    #define UPNPDISCOVER_UNKNOWN_ERROR (-1)
+    #define UPNPDISCOVER_SOCKET_ERROR (-101)
+    #define UPNPDISCOVER_MEMORY_ERROR (-102)
+  simpleUPnPcommand() prototype changed (but is normaly not used by API users)
+  add arguments ipv6 and error to upnpDiscover() :
+     struct UPNPDev *
+     upnpDiscover(int delay, const char * multicastif,
+                  const char * minissdpdsock, int sameport,
+                  int ipv6,
+                  int * error);
+  add controlURL_6FC member to struct UPNPUrls :
+    struct UPNPUrls {
+       char * controlURL;
+       char * ipcondescURL;
+       char * controlURL_CIF;
+       char * controlURL_6FC;
+    };
+
+upnpcommands.h :
+  add leaseDuration argument to UPNP_AddPortMapping()
+  add desc, enabled and leaseDuration arguments to UPNP_GetSpecificPortMappingEntry()
+  add UPNP_GetListOfPortMappings() function (IGDv2)
+  add IGDv2 IPv6 related functions :
+    UPNP_GetFirewallStatus()
+    UPNP_GetOutboundPinholeTimeout()
+    UPNP_AddPinhole()
+    UPNP_UpdatePinhole()
+    UPNP_DeletePinhole()
+    UPNP_CheckPinholeWorking()
+    UPNP_GetPinholePackets()
+
+
+
+====================== miniUPnPc version 1.5 ======================
+API version 5
+
+new function :
+int UPNPIGD_IsConnected(struct UPNPUrls *, struct IGDdatas *);
+new macro in upnpcommands.h :
+#define UPNPCOMMAND_HTTP_ERROR
+
+====================== miniUPnPc version 1.4 ======================
+Same API as version 1.3
+
+====================== miniUPnPc version 1.3 ======================
+API version 4
+
+Use UNSIGNED_INTEGER type for
+UPNP_GetTotalBytesSent(), UPNP_GetTotalBytesReceived(),
+UPNP_GetTotalPacketsSent(), UPNP_GetTotalPacketsReceived()
+Add remoteHost argument to UPNP_AddPortMapping() and UPNP_DeletePortMapping()
+
+====================== miniUPnPc version 1.2 ======================
+API version 3
+
+added sameport argument to upnpDiscover()
+struct UPNPDev *
+upnpDiscover(int delay, const char * multicastif,
+             const char * minissdpdsock, int sameport);
+
+====================== miniUPnPc Version 1.1 ======================
+Same API as 1.0
+
+
+====================== miniUPnPc Version 1.0 ======================
+API version 2
+
+
+struct UPNPDev {
+      struct UPNPDev * pNext;
+      char * descURL;
+      char * st;
+      char buffer[2];
+};
+struct UPNPDev * upnpDiscover(int delay, const char * multicastif,
+                              const char * minissdpdsock);
+
diff --git a/Externals/miniupnpc/miniupnpc.vcxproj b/Externals/miniupnpc/miniupnpc.vcxproj
new file mode 100644
index 0000000000..db92cd61f9
--- /dev/null
+++ b/Externals/miniupnpc/miniupnpc.vcxproj
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A680190D-0764-485B-9CF3-A82C5EDD5715}</ProjectGuid>
+    <RootNamespace>miniupnpc</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\Source\VSProps\Base.props" />
+    <Import Project="..\..\Source\VSProps\CodeGen_Debug.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\Source\VSProps\Base.props" />
+    <Import Project="..\..\Source\VSProps\CodeGen_Debug.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\Source\VSProps\Base.props" />
+    <Import Project="..\..\Source\VSProps\CodeGen_Release.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\Source\VSProps\Base.props" />
+    <Import Project="..\..\Source\VSProps\CodeGen_Release.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_WIN32_WINNT=0x0501;STATICLIB;DEBUG</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_WIN32_WINNT=0x0501;STATICLIB;DEBUG</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>_WIN32_WINNT=0x0501;STATICLIB</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>_WIN32_WINNT=0x0501;STATICLIB</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="src\bsdqueue.h" />
+    <ClInclude Include="src\codelength.h" />
+    <ClInclude Include="src\connecthostport.h" />
+    <ClInclude Include="src\declspec.h" />
+    <ClInclude Include="src\igd_desc_parse.h" />
+    <ClInclude Include="src\minisoap.h" />
+    <ClInclude Include="src\minissdpc.h" />
+    <ClInclude Include="src\miniupnpc.h" />
+    <ClInclude Include="src\miniupnpcstrings.h" />
+    <ClInclude Include="src\miniupnpctypes.h" />
+    <ClInclude Include="src\miniwget.h" />
+    <ClInclude Include="src\minixml.h" />
+    <ClInclude Include="src\portlistingparse.h" />
+    <ClInclude Include="src\receivedata.h" />
+    <ClInclude Include="src\upnpcommands.h" />
+    <ClInclude Include="src\upnperrors.h" />
+    <ClInclude Include="src\upnpreplyparse.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\connecthostport.c" />
+    <ClCompile Include="src\igd_desc_parse.c" />
+    <ClCompile Include="src\minisoap.c" />
+    <ClCompile Include="src\miniupnpc.c" />
+    <ClCompile Include="src\miniwget.c" />
+    <ClCompile Include="src\minixml.c" />
+    <ClCompile Include="src\portlistingparse.c" />
+    <ClCompile Include="src\receivedata.c" />
+    <ClCompile Include="src\upnpc.c" />
+    <ClCompile Include="src\upnpcommands.c" />
+    <ClCompile Include="src\upnperrors.c" />
+    <ClCompile Include="src\upnpreplyparse.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/miniupnpc/miniupnpc.vcxproj.filters b/Externals/miniupnpc/miniupnpc.vcxproj.filters
new file mode 100644
index 0000000000..1b4bfa312a
--- /dev/null
+++ b/Externals/miniupnpc/miniupnpc.vcxproj.filters
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\bsdqueue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\codelength.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\connecthostport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\declspec.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\igd_desc_parse.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\minisoap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\minissdpc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\miniupnpc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\miniupnpcstrings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\miniupnpctypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\miniwget.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\minixml.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\portlistingparse.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\receivedata.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\upnpcommands.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\upnperrors.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\upnpreplyparse.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\igd_desc_parse.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\minisoap.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\miniupnpc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\miniwget.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\minixml.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\portlistingparse.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\receivedata.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\upnpc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\upnpcommands.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\upnperrors.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\upnpreplyparse.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\connecthostport.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Externals/miniupnpc/src/bsdqueue.h b/Externals/miniupnpc/src/bsdqueue.h
new file mode 100644
index 0000000000..c6afe1f7c4
--- /dev/null
+++ b/Externals/miniupnpc/src/bsdqueue.h
@@ -0,0 +1,531 @@
+/*	$OpenBSD: queue.h,v 1.31 2005/11/25 08:06:25 otto Exp $	*/
+/*	$NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $	*/
+
+/*
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)queue.h	8.5 (Berkeley) 8/20/94
+ */
+
+#ifndef	_SYS_QUEUE_H_
+#define	_SYS_QUEUE_H_
+
+/*
+ * This file defines five types of data structures: singly-linked lists,
+ * lists, simple queues, tail queues, and circular queues.
+ *
+ *
+ * A singly-linked list is headed by a single forward pointer. The elements
+ * are singly linked for minimum space and pointer manipulation overhead at
+ * the expense of O(n) removal for arbitrary elements. New elements can be
+ * added to the list after an existing element or at the head of the list.
+ * Elements being removed from the head of the list should use the explicit
+ * macro for this purpose for optimum efficiency. A singly-linked list may
+ * only be traversed in the forward direction.  Singly-linked lists are ideal
+ * for applications with large datasets and few or no removals or for
+ * implementing a LIFO queue.
+ *
+ * A list is headed by a single forward pointer (or an array of forward
+ * pointers for a hash table header). The elements are doubly linked
+ * so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before
+ * or after an existing element or at the head of the list. A list
+ * may only be traversed in the forward direction.
+ *
+ * A simple queue is headed by a pair of pointers, one the head of the
+ * list and the other to the tail of the list. The elements are singly
+ * linked to save space, so elements can only be removed from the
+ * head of the list. New elements can be added to the list before or after
+ * an existing element, at the head of the list, or at the end of the
+ * list. A simple queue may only be traversed in the forward direction.
+ *
+ * A tail queue is headed by a pair of pointers, one to the head of the
+ * list and the other to the tail of the list. The elements are doubly
+ * linked so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before or
+ * after an existing element, at the head of the list, or at the end of
+ * the list. A tail queue may be traversed in either direction.
+ *
+ * A circle queue is headed by a pair of pointers, one to the head of the
+ * list and the other to the tail of the list. The elements are doubly
+ * linked so that an arbitrary element can be removed without a need to
+ * traverse the list. New elements can be added to the list before or after
+ * an existing element, at the head of the list, or at the end of the list.
+ * A circle queue may be traversed in either direction, but has a more
+ * complex end of list detection.
+ *
+ * For details on the use of these macros, see the queue(3) manual page.
+ */
+
+#ifdef QUEUE_MACRO_DEBUG
+#define _Q_INVALIDATE(a) (a) = ((void *)-1)
+#else
+#define _Q_INVALIDATE(a)
+#endif
+
+/*
+ * Singly-linked List definitions.
+ */
+#define SLIST_HEAD(name, type)						\
+struct name {								\
+	struct type *slh_first;	/* first element */			\
+}
+
+#define	SLIST_HEAD_INITIALIZER(head)					\
+	{ NULL }
+
+#ifdef SLIST_ENTRY
+#undef SLIST_ENTRY
+#endif
+
+#define SLIST_ENTRY(type)						\
+struct {								\
+	struct type *sle_next;	/* next element */			\
+}
+
+/*
+ * Singly-linked List access methods.
+ */
+#define	SLIST_FIRST(head)	((head)->slh_first)
+#define	SLIST_END(head)		NULL
+#define	SLIST_EMPTY(head)	(SLIST_FIRST(head) == SLIST_END(head))
+#define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
+
+#define	SLIST_FOREACH(var, head, field)					\
+	for((var) = SLIST_FIRST(head);					\
+	    (var) != SLIST_END(head);					\
+	    (var) = SLIST_NEXT(var, field))
+
+#define	SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
+	for ((varp) = &SLIST_FIRST((head));				\
+	    ((var) = *(varp)) != SLIST_END(head);			\
+	    (varp) = &SLIST_NEXT((var), field))
+
+/*
+ * Singly-linked List functions.
+ */
+#define	SLIST_INIT(head) {						\
+	SLIST_FIRST(head) = SLIST_END(head);				\
+}
+
+#define	SLIST_INSERT_AFTER(slistelm, elm, field) do {			\
+	(elm)->field.sle_next = (slistelm)->field.sle_next;		\
+	(slistelm)->field.sle_next = (elm);				\
+} while (0)
+
+#define	SLIST_INSERT_HEAD(head, elm, field) do {			\
+	(elm)->field.sle_next = (head)->slh_first;			\
+	(head)->slh_first = (elm);					\
+} while (0)
+
+#define	SLIST_REMOVE_NEXT(head, elm, field) do {			\
+	(elm)->field.sle_next = (elm)->field.sle_next->field.sle_next;	\
+} while (0)
+
+#define	SLIST_REMOVE_HEAD(head, field) do {				\
+	(head)->slh_first = (head)->slh_first->field.sle_next;		\
+} while (0)
+
+#define SLIST_REMOVE(head, elm, type, field) do {			\
+	if ((head)->slh_first == (elm)) {				\
+		SLIST_REMOVE_HEAD((head), field);			\
+	} else {							\
+		struct type *curelm = (head)->slh_first;		\
+									\
+		while (curelm->field.sle_next != (elm))			\
+			curelm = curelm->field.sle_next;		\
+		curelm->field.sle_next =				\
+		    curelm->field.sle_next->field.sle_next;		\
+		_Q_INVALIDATE((elm)->field.sle_next);			\
+	}								\
+} while (0)
+
+/*
+ * List definitions.
+ */
+#define LIST_HEAD(name, type)						\
+struct name {								\
+	struct type *lh_first;	/* first element */			\
+}
+
+#define LIST_HEAD_INITIALIZER(head)					\
+	{ NULL }
+
+#define LIST_ENTRY(type)						\
+struct {								\
+	struct type *le_next;	/* next element */			\
+	struct type **le_prev;	/* address of previous next element */	\
+}
+
+/*
+ * List access methods
+ */
+#define	LIST_FIRST(head)		((head)->lh_first)
+#define	LIST_END(head)			NULL
+#define	LIST_EMPTY(head)		(LIST_FIRST(head) == LIST_END(head))
+#define	LIST_NEXT(elm, field)		((elm)->field.le_next)
+
+#define LIST_FOREACH(var, head, field)					\
+	for((var) = LIST_FIRST(head);					\
+	    (var)!= LIST_END(head);					\
+	    (var) = LIST_NEXT(var, field))
+
+/*
+ * List functions.
+ */
+#define	LIST_INIT(head) do {						\
+	LIST_FIRST(head) = LIST_END(head);				\
+} while (0)
+
+#define LIST_INSERT_AFTER(listelm, elm, field) do {			\
+	if (((elm)->field.le_next = (listelm)->field.le_next) != NULL)	\
+		(listelm)->field.le_next->field.le_prev =		\
+		    &(elm)->field.le_next;				\
+	(listelm)->field.le_next = (elm);				\
+	(elm)->field.le_prev = &(listelm)->field.le_next;		\
+} while (0)
+
+#define	LIST_INSERT_BEFORE(listelm, elm, field) do {			\
+	(elm)->field.le_prev = (listelm)->field.le_prev;		\
+	(elm)->field.le_next = (listelm);				\
+	*(listelm)->field.le_prev = (elm);				\
+	(listelm)->field.le_prev = &(elm)->field.le_next;		\
+} while (0)
+
+#define LIST_INSERT_HEAD(head, elm, field) do {				\
+	if (((elm)->field.le_next = (head)->lh_first) != NULL)		\
+		(head)->lh_first->field.le_prev = &(elm)->field.le_next;\
+	(head)->lh_first = (elm);					\
+	(elm)->field.le_prev = &(head)->lh_first;			\
+} while (0)
+
+#define LIST_REMOVE(elm, field) do {					\
+	if ((elm)->field.le_next != NULL)				\
+		(elm)->field.le_next->field.le_prev =			\
+		    (elm)->field.le_prev;				\
+	*(elm)->field.le_prev = (elm)->field.le_next;			\
+	_Q_INVALIDATE((elm)->field.le_prev);				\
+	_Q_INVALIDATE((elm)->field.le_next);				\
+} while (0)
+
+#define LIST_REPLACE(elm, elm2, field) do {				\
+	if (((elm2)->field.le_next = (elm)->field.le_next) != NULL)	\
+		(elm2)->field.le_next->field.le_prev =			\
+		    &(elm2)->field.le_next;				\
+	(elm2)->field.le_prev = (elm)->field.le_prev;			\
+	*(elm2)->field.le_prev = (elm2);				\
+	_Q_INVALIDATE((elm)->field.le_prev);				\
+	_Q_INVALIDATE((elm)->field.le_next);				\
+} while (0)
+
+/*
+ * Simple queue definitions.
+ */
+#define SIMPLEQ_HEAD(name, type)					\
+struct name {								\
+	struct type *sqh_first;	/* first element */			\
+	struct type **sqh_last;	/* addr of last next element */		\
+}
+
+#define SIMPLEQ_HEAD_INITIALIZER(head)					\
+	{ NULL, &(head).sqh_first }
+
+#define SIMPLEQ_ENTRY(type)						\
+struct {								\
+	struct type *sqe_next;	/* next element */			\
+}
+
+/*
+ * Simple queue access methods.
+ */
+#define	SIMPLEQ_FIRST(head)	    ((head)->sqh_first)
+#define	SIMPLEQ_END(head)	    NULL
+#define	SIMPLEQ_EMPTY(head)	    (SIMPLEQ_FIRST(head) == SIMPLEQ_END(head))
+#define	SIMPLEQ_NEXT(elm, field)    ((elm)->field.sqe_next)
+
+#define SIMPLEQ_FOREACH(var, head, field)				\
+	for((var) = SIMPLEQ_FIRST(head);				\
+	    (var) != SIMPLEQ_END(head);					\
+	    (var) = SIMPLEQ_NEXT(var, field))
+
+/*
+ * Simple queue functions.
+ */
+#define	SIMPLEQ_INIT(head) do {						\
+	(head)->sqh_first = NULL;					\
+	(head)->sqh_last = &(head)->sqh_first;				\
+} while (0)
+
+#define SIMPLEQ_INSERT_HEAD(head, elm, field) do {			\
+	if (((elm)->field.sqe_next = (head)->sqh_first) == NULL)	\
+		(head)->sqh_last = &(elm)->field.sqe_next;		\
+	(head)->sqh_first = (elm);					\
+} while (0)
+
+#define SIMPLEQ_INSERT_TAIL(head, elm, field) do {			\
+	(elm)->field.sqe_next = NULL;					\
+	*(head)->sqh_last = (elm);					\
+	(head)->sqh_last = &(elm)->field.sqe_next;			\
+} while (0)
+
+#define SIMPLEQ_INSERT_AFTER(head, listelm, elm, field) do {		\
+	if (((elm)->field.sqe_next = (listelm)->field.sqe_next) == NULL)\
+		(head)->sqh_last = &(elm)->field.sqe_next;		\
+	(listelm)->field.sqe_next = (elm);				\
+} while (0)
+
+#define SIMPLEQ_REMOVE_HEAD(head, field) do {			\
+	if (((head)->sqh_first = (head)->sqh_first->field.sqe_next) == NULL) \
+		(head)->sqh_last = &(head)->sqh_first;			\
+} while (0)
+
+/*
+ * Tail queue definitions.
+ */
+#define TAILQ_HEAD(name, type)						\
+struct name {								\
+	struct type *tqh_first;	/* first element */			\
+	struct type **tqh_last;	/* addr of last next element */		\
+}
+
+#define TAILQ_HEAD_INITIALIZER(head)					\
+	{ NULL, &(head).tqh_first }
+
+#define TAILQ_ENTRY(type)						\
+struct {								\
+	struct type *tqe_next;	/* next element */			\
+	struct type **tqe_prev;	/* address of previous next element */	\
+}
+
+/*
+ * tail queue access methods
+ */
+#define	TAILQ_FIRST(head)		((head)->tqh_first)
+#define	TAILQ_END(head)			NULL
+#define	TAILQ_NEXT(elm, field)		((elm)->field.tqe_next)
+#define TAILQ_LAST(head, headname)					\
+	(*(((struct headname *)((head)->tqh_last))->tqh_last))
+/* XXX */
+#define TAILQ_PREV(elm, headname, field)				\
+	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
+#define	TAILQ_EMPTY(head)						\
+	(TAILQ_FIRST(head) == TAILQ_END(head))
+
+#define TAILQ_FOREACH(var, head, field)					\
+	for((var) = TAILQ_FIRST(head);					\
+	    (var) != TAILQ_END(head);					\
+	    (var) = TAILQ_NEXT(var, field))
+
+#define TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
+	for((var) = TAILQ_LAST(head, headname);				\
+	    (var) != TAILQ_END(head);					\
+	    (var) = TAILQ_PREV(var, headname, field))
+
+/*
+ * Tail queue functions.
+ */
+#define	TAILQ_INIT(head) do {						\
+	(head)->tqh_first = NULL;					\
+	(head)->tqh_last = &(head)->tqh_first;				\
+} while (0)
+
+#define TAILQ_INSERT_HEAD(head, elm, field) do {			\
+	if (((elm)->field.tqe_next = (head)->tqh_first) != NULL)	\
+		(head)->tqh_first->field.tqe_prev =			\
+		    &(elm)->field.tqe_next;				\
+	else								\
+		(head)->tqh_last = &(elm)->field.tqe_next;		\
+	(head)->tqh_first = (elm);					\
+	(elm)->field.tqe_prev = &(head)->tqh_first;			\
+} while (0)
+
+#define TAILQ_INSERT_TAIL(head, elm, field) do {			\
+	(elm)->field.tqe_next = NULL;					\
+	(elm)->field.tqe_prev = (head)->tqh_last;			\
+	*(head)->tqh_last = (elm);					\
+	(head)->tqh_last = &(elm)->field.tqe_next;			\
+} while (0)
+
+#define TAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
+	if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != NULL)\
+		(elm)->field.tqe_next->field.tqe_prev =			\
+		    &(elm)->field.tqe_next;				\
+	else								\
+		(head)->tqh_last = &(elm)->field.tqe_next;		\
+	(listelm)->field.tqe_next = (elm);				\
+	(elm)->field.tqe_prev = &(listelm)->field.tqe_next;		\
+} while (0)
+
+#define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
+	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
+	(elm)->field.tqe_next = (listelm);				\
+	*(listelm)->field.tqe_prev = (elm);				\
+	(listelm)->field.tqe_prev = &(elm)->field.tqe_next;		\
+} while (0)
+
+#define TAILQ_REMOVE(head, elm, field) do {				\
+	if (((elm)->field.tqe_next) != NULL)				\
+		(elm)->field.tqe_next->field.tqe_prev =			\
+		    (elm)->field.tqe_prev;				\
+	else								\
+		(head)->tqh_last = (elm)->field.tqe_prev;		\
+	*(elm)->field.tqe_prev = (elm)->field.tqe_next;			\
+	_Q_INVALIDATE((elm)->field.tqe_prev);				\
+	_Q_INVALIDATE((elm)->field.tqe_next);				\
+} while (0)
+
+#define TAILQ_REPLACE(head, elm, elm2, field) do {			\
+	if (((elm2)->field.tqe_next = (elm)->field.tqe_next) != NULL)	\
+		(elm2)->field.tqe_next->field.tqe_prev =		\
+		    &(elm2)->field.tqe_next;				\
+	else								\
+		(head)->tqh_last = &(elm2)->field.tqe_next;		\
+	(elm2)->field.tqe_prev = (elm)->field.tqe_prev;			\
+	*(elm2)->field.tqe_prev = (elm2);				\
+	_Q_INVALIDATE((elm)->field.tqe_prev);				\
+	_Q_INVALIDATE((elm)->field.tqe_next);				\
+} while (0)
+
+/*
+ * Circular queue definitions.
+ */
+#define CIRCLEQ_HEAD(name, type)					\
+struct name {								\
+	struct type *cqh_first;		/* first element */		\
+	struct type *cqh_last;		/* last element */		\
+}
+
+#define CIRCLEQ_HEAD_INITIALIZER(head)					\
+	{ CIRCLEQ_END(&head), CIRCLEQ_END(&head) }
+
+#define CIRCLEQ_ENTRY(type)						\
+struct {								\
+	struct type *cqe_next;		/* next element */		\
+	struct type *cqe_prev;		/* previous element */		\
+}
+
+/*
+ * Circular queue access methods
+ */
+#define	CIRCLEQ_FIRST(head)		((head)->cqh_first)
+#define	CIRCLEQ_LAST(head)		((head)->cqh_last)
+#define	CIRCLEQ_END(head)		((void *)(head))
+#define	CIRCLEQ_NEXT(elm, field)	((elm)->field.cqe_next)
+#define	CIRCLEQ_PREV(elm, field)	((elm)->field.cqe_prev)
+#define	CIRCLEQ_EMPTY(head)						\
+	(CIRCLEQ_FIRST(head) == CIRCLEQ_END(head))
+
+#define CIRCLEQ_FOREACH(var, head, field)				\
+	for((var) = CIRCLEQ_FIRST(head);				\
+	    (var) != CIRCLEQ_END(head);					\
+	    (var) = CIRCLEQ_NEXT(var, field))
+
+#define CIRCLEQ_FOREACH_REVERSE(var, head, field)			\
+	for((var) = CIRCLEQ_LAST(head);					\
+	    (var) != CIRCLEQ_END(head);					\
+	    (var) = CIRCLEQ_PREV(var, field))
+
+/*
+ * Circular queue functions.
+ */
+#define	CIRCLEQ_INIT(head) do {						\
+	(head)->cqh_first = CIRCLEQ_END(head);				\
+	(head)->cqh_last = CIRCLEQ_END(head);				\
+} while (0)
+
+#define CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do {		\
+	(elm)->field.cqe_next = (listelm)->field.cqe_next;		\
+	(elm)->field.cqe_prev = (listelm);				\
+	if ((listelm)->field.cqe_next == CIRCLEQ_END(head))		\
+		(head)->cqh_last = (elm);				\
+	else								\
+		(listelm)->field.cqe_next->field.cqe_prev = (elm);	\
+	(listelm)->field.cqe_next = (elm);				\
+} while (0)
+
+#define CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do {		\
+	(elm)->field.cqe_next = (listelm);				\
+	(elm)->field.cqe_prev = (listelm)->field.cqe_prev;		\
+	if ((listelm)->field.cqe_prev == CIRCLEQ_END(head))		\
+		(head)->cqh_first = (elm);				\
+	else								\
+		(listelm)->field.cqe_prev->field.cqe_next = (elm);	\
+	(listelm)->field.cqe_prev = (elm);				\
+} while (0)
+
+#define CIRCLEQ_INSERT_HEAD(head, elm, field) do {			\
+	(elm)->field.cqe_next = (head)->cqh_first;			\
+	(elm)->field.cqe_prev = CIRCLEQ_END(head);			\
+	if ((head)->cqh_last == CIRCLEQ_END(head))			\
+		(head)->cqh_last = (elm);				\
+	else								\
+		(head)->cqh_first->field.cqe_prev = (elm);		\
+	(head)->cqh_first = (elm);					\
+} while (0)
+
+#define CIRCLEQ_INSERT_TAIL(head, elm, field) do {			\
+	(elm)->field.cqe_next = CIRCLEQ_END(head);			\
+	(elm)->field.cqe_prev = (head)->cqh_last;			\
+	if ((head)->cqh_first == CIRCLEQ_END(head))			\
+		(head)->cqh_first = (elm);				\
+	else								\
+		(head)->cqh_last->field.cqe_next = (elm);		\
+	(head)->cqh_last = (elm);					\
+} while (0)
+
+#define	CIRCLEQ_REMOVE(head, elm, field) do {				\
+	if ((elm)->field.cqe_next == CIRCLEQ_END(head))			\
+		(head)->cqh_last = (elm)->field.cqe_prev;		\
+	else								\
+		(elm)->field.cqe_next->field.cqe_prev =			\
+		    (elm)->field.cqe_prev;				\
+	if ((elm)->field.cqe_prev == CIRCLEQ_END(head))			\
+		(head)->cqh_first = (elm)->field.cqe_next;		\
+	else								\
+		(elm)->field.cqe_prev->field.cqe_next =			\
+		    (elm)->field.cqe_next;				\
+	_Q_INVALIDATE((elm)->field.cqe_prev);				\
+	_Q_INVALIDATE((elm)->field.cqe_next);				\
+} while (0)
+
+#define CIRCLEQ_REPLACE(head, elm, elm2, field) do {			\
+	if (((elm2)->field.cqe_next = (elm)->field.cqe_next) ==		\
+	    CIRCLEQ_END(head))						\
+		(head).cqh_last = (elm2);				\
+	else								\
+		(elm2)->field.cqe_next->field.cqe_prev = (elm2);	\
+	if (((elm2)->field.cqe_prev = (elm)->field.cqe_prev) ==		\
+	    CIRCLEQ_END(head))						\
+		(head).cqh_first = (elm2);				\
+	else								\
+		(elm2)->field.cqe_prev->field.cqe_next = (elm2);	\
+	_Q_INVALIDATE((elm)->field.cqe_prev);				\
+	_Q_INVALIDATE((elm)->field.cqe_next);				\
+} while (0)
+
+#endif	/* !_SYS_QUEUE_H_ */
diff --git a/Externals/miniupnpc/src/codelength.h b/Externals/miniupnpc/src/codelength.h
new file mode 100644
index 0000000000..d342bd1419
--- /dev/null
+++ b/Externals/miniupnpc/src/codelength.h
@@ -0,0 +1,31 @@
+/* $Id: codelength.h,v 1.4 2012/09/27 15:40:29 nanard Exp $ */
+/* Project : miniupnp
+ * Author : Thomas BERNARD
+ * copyright (c) 2005-2011 Thomas Bernard
+ * This software is subjet to the conditions detailed in the
+ * provided LICENCE file. */
+#ifndef CODELENGTH_H_INCLUDED
+#define CODELENGTH_H_INCLUDED
+
+/* Encode length by using 7bit per Byte :
+ * Most significant bit of each byte specifies that the
+ * following byte is part of the code */
+#define DECODELENGTH(n, p) n = 0; \
+                           do { n = (n << 7) | (*p & 0x7f); } \
+                           while((*(p++)&0x80) && (n<(1<<25)));
+
+#define DECODELENGTH_CHECKLIMIT(n, p, p_limit) \
+	n = 0; \
+	do { \
+		if((p) >= (p_limit)) break; \
+		n = (n << 7) | (*(p) & 0x7f); \
+	} while((*((p)++)&0x80) && (n<(1<<25)));
+
+#define CODELENGTH(n, p) if(n>=268435456) *(p++) = (n >> 28) | 0x80; \
+                         if(n>=2097152) *(p++) = (n >> 21) | 0x80; \
+                         if(n>=16384) *(p++) = (n >> 14) | 0x80; \
+                         if(n>=128) *(p++) = (n >> 7) | 0x80; \
+                         *(p++) = n & 0x7f;
+
+#endif
+
diff --git a/Externals/miniupnpc/src/connecthostport.c b/Externals/miniupnpc/src/connecthostport.c
new file mode 100644
index 0000000000..dcf37f4190
--- /dev/null
+++ b/Externals/miniupnpc/src/connecthostport.c
@@ -0,0 +1,250 @@
+/* $Id: connecthostport.c,v 1.10 2013/05/03 09:05:38 nanard Exp $ */
+/* Project : miniupnp
+ * Author : Thomas Bernard
+ * Copyright (c) 2010-2012 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution. */
+
+/* use getaddrinfo() or gethostbyname()
+ * uncomment the following line in order to use gethostbyname() */
+#ifdef NO_GETADDRINFO
+#define USE_GETHOSTBYNAME
+#endif
+
+#include <string.h>
+#include <stdio.h>
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <io.h>
+#define MAXHOSTNAMELEN 64
+#define snprintf _snprintf
+#define herror
+#define socklen_t int
+#else /* #ifdef _WIN32 */
+#include <unistd.h>
+#include <sys/param.h>
+#include <sys/select.h>
+#include <errno.h>
+#define closesocket close
+#include <netdb.h>
+#include <netinet/in.h>
+/* defining MINIUPNPC_IGNORE_EINTR enable the ignore of interruptions
+ * during the connect() call */
+#define MINIUPNPC_IGNORE_EINTR
+#ifndef USE_GETHOSTBYNAME
+#include <sys/types.h>
+#include <sys/socket.h>
+#endif /* #ifndef USE_GETHOSTBYNAME */
+#endif /* #else _WIN32 */
+
+/* definition of PRINT_SOCKET_ERROR */
+#ifdef _WIN32
+#define PRINT_SOCKET_ERROR(x)    printf("Socket error: %s, %d\n", x, WSAGetLastError());
+#else
+#define PRINT_SOCKET_ERROR(x) perror(x)
+#endif
+
+#if defined(__amigaos__) || defined(__amigaos4__)
+#define herror(A) printf("%s\n", A)
+#endif
+
+#include "connecthostport.h"
+
+/* connecthostport()
+ * return a socket connected (TCP) to the host and port
+ * or -1 in case of error */
+int connecthostport(const char * host, unsigned short port,
+                    unsigned int scope_id)
+{
+	int s, n;
+#ifdef USE_GETHOSTBYNAME
+	struct sockaddr_in dest;
+	struct hostent *hp;
+#else /* #ifdef USE_GETHOSTBYNAME */
+	char tmp_host[MAXHOSTNAMELEN+1];
+	char port_str[8];
+	struct addrinfo *ai, *p;
+	struct addrinfo hints;
+#endif /* #ifdef USE_GETHOSTBYNAME */
+#ifdef MINIUPNPC_SET_SOCKET_TIMEOUT
+	struct timeval timeout;
+#endif /* #ifdef MINIUPNPC_SET_SOCKET_TIMEOUT */
+
+#ifdef USE_GETHOSTBYNAME
+	hp = gethostbyname(host);
+	if(hp == NULL)
+	{
+		herror(host);
+		return -1;
+	}
+	memcpy(&dest.sin_addr, hp->h_addr, sizeof(dest.sin_addr));
+	memset(dest.sin_zero, 0, sizeof(dest.sin_zero));
+	s = socket(PF_INET, SOCK_STREAM, 0);
+	if(s < 0)
+	{
+		PRINT_SOCKET_ERROR("socket");
+		return -1;
+	}
+#ifdef MINIUPNPC_SET_SOCKET_TIMEOUT
+	/* setting a 3 seconds timeout for the connect() call */
+	timeout.tv_sec = 3;
+	timeout.tv_usec = 0;
+	if(setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(struct timeval)) < 0)
+	{
+		PRINT_SOCKET_ERROR("setsockopt");
+	}
+	timeout.tv_sec = 3;
+	timeout.tv_usec = 0;
+	if(setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(struct timeval)) < 0)
+	{
+		PRINT_SOCKET_ERROR("setsockopt");
+	}
+#endif /* #ifdef MINIUPNPC_SET_SOCKET_TIMEOUT */
+	dest.sin_family = AF_INET;
+	dest.sin_port = htons(port);
+	n = connect(s, (struct sockaddr *)&dest, sizeof(struct sockaddr_in));
+#ifdef MINIUPNPC_IGNORE_EINTR
+	while(n < 0 && errno == EINTR)
+	{
+		socklen_t len;
+		fd_set wset;
+		int err;
+		FD_ZERO(&wset);
+		FD_SET(s, &wset);
+		if((n = select(s + 1, NULL, &wset, NULL, NULL)) == -1 && errno == EINTR)
+			continue;
+		/*len = 0;*/
+		/*n = getpeername(s, NULL, &len);*/
+		len = sizeof(err);
+		if(getsockopt(s, SOL_SOCKET, SO_ERROR, &err, &len) < 0) {
+			PRINT_SOCKET_ERROR("getsockopt");
+			closesocket(s);
+			return -1;
+		}
+		if(err != 0) {
+			errno = err;
+			n = -1;
+		}
+	}
+#endif /* #ifdef MINIUPNPC_IGNORE_EINTR */
+	if(n<0)
+	{
+		PRINT_SOCKET_ERROR("connect");
+		closesocket(s);
+		return -1;
+	}
+#else /* #ifdef USE_GETHOSTBYNAME */
+	/* use getaddrinfo() instead of gethostbyname() */
+	memset(&hints, 0, sizeof(hints));
+	/* hints.ai_flags = AI_ADDRCONFIG; */
+#ifdef AI_NUMERICSERV
+	hints.ai_flags = AI_NUMERICSERV;
+#endif
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_family = AF_UNSPEC; /* AF_INET, AF_INET6 or AF_UNSPEC */
+	/* hints.ai_protocol = IPPROTO_TCP; */
+	snprintf(port_str, sizeof(port_str), "%hu", port);
+	if(host[0] == '[')
+	{
+		/* literal ip v6 address */
+		int i, j;
+		for(i = 0, j = 1; host[j] && (host[j] != ']') && i < MAXHOSTNAMELEN; i++, j++)
+		{
+			tmp_host[i] = host[j];
+			if(0 == memcmp(host+j, "%25", 3))	/* %25 is just url encoding for '%' */
+				j+=2;							/* skip "25" */
+		}
+		tmp_host[i] = '\0';
+	}
+	else
+	{
+		strncpy(tmp_host, host, MAXHOSTNAMELEN);
+	}
+	tmp_host[MAXHOSTNAMELEN] = '\0';
+	n = getaddrinfo(tmp_host, port_str, &hints, &ai);
+	if(n != 0)
+	{
+#ifdef _WIN32
+		fprintf(stderr, "getaddrinfo() error : %d\n", n);
+#else
+		fprintf(stderr, "getaddrinfo() error : %s\n", gai_strerror(n));
+#endif
+		return -1;
+	}
+	s = -1;
+	for(p = ai; p; p = p->ai_next)
+	{
+		s = socket(p->ai_family, p->ai_socktype, p->ai_protocol);
+		if(s < 0)
+			continue;
+		if(p->ai_addr->sa_family == AF_INET6 && scope_id > 0) {
+			struct sockaddr_in6 * addr6 = (struct sockaddr_in6 *)p->ai_addr;
+			addr6->sin6_scope_id = scope_id;
+		}
+#ifdef MINIUPNPC_SET_SOCKET_TIMEOUT
+		/* setting a 3 seconds timeout for the connect() call */
+		timeout.tv_sec = 3;
+		timeout.tv_usec = 0;
+		if(setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(struct timeval)) < 0)
+		{
+			PRINT_SOCKET_ERROR("setsockopt");
+		}
+		timeout.tv_sec = 3;
+		timeout.tv_usec = 0;
+		if(setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(struct timeval)) < 0)
+		{
+			PRINT_SOCKET_ERROR("setsockopt");
+		}
+#endif /* #ifdef MINIUPNPC_SET_SOCKET_TIMEOUT */
+		n = connect(s, p->ai_addr, p->ai_addrlen);
+#ifdef MINIUPNPC_IGNORE_EINTR
+		while(n < 0 && errno == EINTR)
+		{
+			socklen_t len;
+			fd_set wset;
+			int err;
+			FD_ZERO(&wset);
+			FD_SET(s, &wset);
+			if((n = select(s + 1, NULL, &wset, NULL, NULL)) == -1 && errno == EINTR)
+				continue;
+			/*len = 0;*/
+			/*n = getpeername(s, NULL, &len);*/
+			len = sizeof(err);
+			if(getsockopt(s, SOL_SOCKET, SO_ERROR, &err, &len) < 0) {
+				PRINT_SOCKET_ERROR("getsockopt");
+				closesocket(s);
+				freeaddrinfo(ai);
+				return -1;
+			}
+			if(err != 0) {
+				errno = err;
+				n = -1;
+			}
+		}
+#endif /* #ifdef MINIUPNPC_IGNORE_EINTR */
+		if(n < 0)
+		{
+			closesocket(s);
+			continue;
+		}
+		else
+		{
+			break;
+		}
+	}
+	freeaddrinfo(ai);
+	if(s < 0)
+	{
+		PRINT_SOCKET_ERROR("socket");
+		return -1;
+	}
+	if(n < 0)
+	{
+		PRINT_SOCKET_ERROR("connect");
+		return -1;
+	}
+#endif /* #ifdef USE_GETHOSTBYNAME */
+	return s;
+}
+
diff --git a/Externals/miniupnpc/src/connecthostport.h b/Externals/miniupnpc/src/connecthostport.h
new file mode 100644
index 0000000000..56941d6fae
--- /dev/null
+++ b/Externals/miniupnpc/src/connecthostport.h
@@ -0,0 +1,18 @@
+/* $Id: connecthostport.h,v 1.3 2012/09/27 15:42:10 nanard Exp $ */
+/* Project: miniupnp
+ * http://miniupnp.free.fr/
+ * Author: Thomas Bernard
+ * Copyright (c) 2010-2012 Thomas Bernard
+ * This software is subjects to the conditions detailed
+ * in the LICENCE file provided within this distribution */
+#ifndef CONNECTHOSTPORT_H_INCLUDED
+#define CONNECTHOSTPORT_H_INCLUDED
+
+/* connecthostport()
+ * return a socket connected (TCP) to the host and port
+ * or -1 in case of error */
+int connecthostport(const char * host, unsigned short port,
+                    unsigned int scope_id);
+
+#endif
+
diff --git a/Externals/miniupnpc/src/declspec.h b/Externals/miniupnpc/src/declspec.h
new file mode 100644
index 0000000000..b9bc07ef72
--- /dev/null
+++ b/Externals/miniupnpc/src/declspec.h
@@ -0,0 +1,5 @@
+#ifndef DECLSPEC_H_INCLUDED
+#define DECLSPEC_H_INCLUDED
+#define LIBSPEC
+#endif
+
diff --git a/Externals/miniupnpc/src/igd_desc_parse.c b/Externals/miniupnpc/src/igd_desc_parse.c
new file mode 100644
index 0000000000..6c3e65677d
--- /dev/null
+++ b/Externals/miniupnpc/src/igd_desc_parse.c
@@ -0,0 +1,125 @@
+/* $Id: igd_desc_parse.c,v 1.14 2011/04/11 09:19:24 nanard Exp $ */
+/* Project : miniupnp
+ * http://miniupnp.free.fr/
+ * Author : Thomas Bernard
+ * Copyright (c) 2005-2010 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution. */
+
+#include "igd_desc_parse.h"
+#include <stdio.h>
+#include <string.h>
+
+/* Start element handler :
+ * update nesting level counter and copy element name */
+void IGDstartelt(void * d, const char * name, int l)
+{
+	struct IGDdatas * datas = (struct IGDdatas *)d;
+	memcpy( datas->cureltname, name, l);
+	datas->cureltname[l] = '\0';
+	datas->level++;
+	if( (l==7) && !memcmp(name, "service", l) ) {
+		datas->tmp.controlurl[0] = '\0';
+		datas->tmp.eventsuburl[0] = '\0';
+		datas->tmp.scpdurl[0] = '\0';
+		datas->tmp.servicetype[0] = '\0';
+	}
+}
+
+/* End element handler :
+ * update nesting level counter and update parser state if
+ * service element is parsed */
+void IGDendelt(void * d, const char * name, int l)
+{
+	struct IGDdatas * datas = (struct IGDdatas *)d;
+	datas->level--;
+	/*printf("endelt %2d %.*s\n", datas->level, l, name);*/
+	if( (l==7) && !memcmp(name, "service", l) )
+	{
+		/*
+		if( datas->state < 1
+			&& !strcmp(datas->servicetype,
+				//	"urn:schemas-upnp-org:service:WANIPConnection:1") )
+				"urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1"))
+			datas->state ++;
+		*/
+		if(0==strcmp(datas->tmp.servicetype,
+				"urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1")) {
+			memcpy(&datas->CIF, &datas->tmp, sizeof(struct IGDdatas_service));
+		} else if(0==strcmp(datas->tmp.servicetype,
+				"urn:schemas-upnp-org:service:WANIPv6FirewallControl:1")) {
+			memcpy(&datas->IPv6FC, &datas->tmp, sizeof(struct IGDdatas_service));
+		} else if(0==strcmp(datas->tmp.servicetype,
+				"urn:schemas-upnp-org:service:WANIPConnection:1")
+				 || 0==strcmp(datas->tmp.servicetype,
+				"urn:schemas-upnp-org:service:WANPPPConnection:1") ) {
+			if(datas->first.servicetype[0] == '\0') {
+				memcpy(&datas->first, &datas->tmp, sizeof(struct IGDdatas_service));
+			} else {
+				memcpy(&datas->second, &datas->tmp, sizeof(struct IGDdatas_service));
+			}
+		}
+	}
+}
+
+/* Data handler :
+ * copy data depending on the current element name and state */
+void IGDdata(void * d, const char * data, int l)
+{
+	struct IGDdatas * datas = (struct IGDdatas *)d;
+	char * dstmember = 0;
+	/*printf("%2d %s : %.*s\n",
+           datas->level, datas->cureltname, l, data);	*/
+	if( !strcmp(datas->cureltname, "URLBase") )
+		dstmember = datas->urlbase;
+	else if( !strcmp(datas->cureltname, "presentationURL") )
+		dstmember = datas->presentationurl;
+	else if( !strcmp(datas->cureltname, "serviceType") )
+		dstmember = datas->tmp.servicetype;
+	else if( !strcmp(datas->cureltname, "controlURL") )
+		dstmember = datas->tmp.controlurl;
+	else if( !strcmp(datas->cureltname, "eventSubURL") )
+		dstmember = datas->tmp.eventsuburl;
+	else if( !strcmp(datas->cureltname, "SCPDURL") )
+		dstmember = datas->tmp.scpdurl;
+/*	else if( !strcmp(datas->cureltname, "deviceType") )
+		dstmember = datas->devicetype_tmp;*/
+	if(dstmember)
+	{
+		if(l>=MINIUPNPC_URL_MAXSIZE)
+			l = MINIUPNPC_URL_MAXSIZE-1;
+		memcpy(dstmember, data, l);
+		dstmember[l] = '\0';
+	}
+}
+
+void printIGD(struct IGDdatas * d)
+{
+	printf("urlbase = '%s'\n", d->urlbase);
+	printf("WAN Device (Common interface config) :\n");
+	/*printf(" deviceType = '%s'\n", d->CIF.devicetype);*/
+	printf(" serviceType = '%s'\n", d->CIF.servicetype);
+	printf(" controlURL = '%s'\n", d->CIF.controlurl);
+	printf(" eventSubURL = '%s'\n", d->CIF.eventsuburl);
+	printf(" SCPDURL = '%s'\n", d->CIF.scpdurl);
+	printf("primary WAN Connection Device (IP or PPP Connection):\n");
+	/*printf(" deviceType = '%s'\n", d->first.devicetype);*/
+	printf(" servicetype = '%s'\n", d->first.servicetype);
+	printf(" controlURL = '%s'\n", d->first.controlurl);
+	printf(" eventSubURL = '%s'\n", d->first.eventsuburl);
+	printf(" SCPDURL = '%s'\n", d->first.scpdurl);
+	printf("secondary WAN Connection Device (IP or PPP Connection):\n");
+	/*printf(" deviceType = '%s'\n", d->second.devicetype);*/
+	printf(" servicetype = '%s'\n", d->second.servicetype);
+	printf(" controlURL = '%s'\n", d->second.controlurl);
+	printf(" eventSubURL = '%s'\n", d->second.eventsuburl);
+	printf(" SCPDURL = '%s'\n", d->second.scpdurl);
+	printf("WAN IPv6 Firewall Control :\n");
+	/*printf(" deviceType = '%s'\n", d->IPv6FC.devicetype);*/
+	printf(" servicetype = '%s'\n", d->IPv6FC.servicetype);
+	printf(" controlURL = '%s'\n", d->IPv6FC.controlurl);
+	printf(" eventSubURL = '%s'\n", d->IPv6FC.eventsuburl);
+	printf(" SCPDURL = '%s'\n", d->IPv6FC.scpdurl);
+}
+
+
diff --git a/Externals/miniupnpc/src/igd_desc_parse.h b/Externals/miniupnpc/src/igd_desc_parse.h
new file mode 100644
index 0000000000..0a49b019d0
--- /dev/null
+++ b/Externals/miniupnpc/src/igd_desc_parse.h
@@ -0,0 +1,48 @@
+/* $Id: igd_desc_parse.h,v 1.11 2012/10/16 16:49:02 nanard Exp $ */
+/* Project : miniupnp
+ * http://miniupnp.free.fr/
+ * Author : Thomas Bernard
+ * Copyright (c) 2005-2010 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution.
+ * */
+#ifndef IGD_DESC_PARSE_H_INCLUDED
+#define IGD_DESC_PARSE_H_INCLUDED
+
+/* Structure to store the result of the parsing of UPnP
+ * descriptions of Internet Gateway Devices */
+#define MINIUPNPC_URL_MAXSIZE (128)
+struct IGDdatas_service {
+	char controlurl[MINIUPNPC_URL_MAXSIZE];
+	char eventsuburl[MINIUPNPC_URL_MAXSIZE];
+	char scpdurl[MINIUPNPC_URL_MAXSIZE];
+	char servicetype[MINIUPNPC_URL_MAXSIZE];
+	/*char devicetype[MINIUPNPC_URL_MAXSIZE];*/
+};
+
+struct IGDdatas {
+	char cureltname[MINIUPNPC_URL_MAXSIZE];
+	char urlbase[MINIUPNPC_URL_MAXSIZE];
+	char presentationurl[MINIUPNPC_URL_MAXSIZE];
+	int level;
+	/*int state;*/
+	/* "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1" */
+	struct IGDdatas_service CIF;
+	/* "urn:schemas-upnp-org:service:WANIPConnection:1"
+	 * "urn:schemas-upnp-org:service:WANPPPConnection:1" */
+	struct IGDdatas_service first;
+	/* if both WANIPConnection and WANPPPConnection are present */
+	struct IGDdatas_service second;
+	/* "urn:schemas-upnp-org:service:WANIPv6FirewallControl:1" */
+	struct IGDdatas_service IPv6FC;
+	/* tmp */
+	struct IGDdatas_service tmp;
+};
+
+void IGDstartelt(void *, const char *, int);
+void IGDendelt(void *, const char *, int);
+void IGDdata(void *, const char *, int);
+void printIGD(struct IGDdatas *);
+
+#endif
+
diff --git a/Externals/miniupnpc/src/minisoap.c b/Externals/miniupnpc/src/minisoap.c
new file mode 100644
index 0000000000..e45a481acb
--- /dev/null
+++ b/Externals/miniupnpc/src/minisoap.c
@@ -0,0 +1,121 @@
+/* $Id: minisoap.c,v 1.22 2012/01/21 13:30:31 nanard Exp $ */
+/* Project : miniupnp
+ * Author : Thomas Bernard
+ * Copyright (c) 2005-2012 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution.
+ *
+ * Minimal SOAP implementation for UPnP protocol.
+ */
+#include <stdio.h>
+#include <string.h>
+#ifdef _WIN32
+#include <io.h>
+#include <winsock2.h>
+#define snprintf _snprintf
+#else
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#endif
+#include "minisoap.h"
+#include "miniupnpcstrings.h"
+
+/* only for malloc */
+#include <stdlib.h>
+
+#ifdef _WIN32
+#define PRINT_SOCKET_ERROR(x)    printf("Socket error: %s, %d\n", x, WSAGetLastError());
+#else
+#define PRINT_SOCKET_ERROR(x) perror(x)
+#endif
+
+/* httpWrite sends the headers and the body to the socket
+ * and returns the number of bytes sent */
+static int
+httpWrite(int fd, const char * body, int bodysize,
+          const char * headers, int headerssize)
+{
+	int n = 0;
+	/*n = write(fd, headers, headerssize);*/
+	/*if(bodysize>0)
+		n += write(fd, body, bodysize);*/
+	/* Note : my old linksys router only took into account
+	 * soap request that are sent into only one packet */
+	char * p;
+	/* TODO: AVOID MALLOC */
+	p = malloc(headerssize+bodysize);
+	if(!p)
+	  return 0;
+	memcpy(p, headers, headerssize);
+	memcpy(p+headerssize, body, bodysize);
+	/*n = write(fd, p, headerssize+bodysize);*/
+	n = send(fd, p, headerssize+bodysize, 0);
+	if(n<0) {
+	  PRINT_SOCKET_ERROR("send");
+	}
+	/* disable send on the socket */
+	/* draytek routers dont seems to like that... */
+#if 0
+#ifdef _WIN32
+	if(shutdown(fd, SD_SEND)<0) {
+#else
+	if(shutdown(fd, SHUT_WR)<0)	{ /*SD_SEND*/
+#endif
+		PRINT_SOCKET_ERROR("shutdown");
+	}
+#endif
+	free(p);
+	return n;
+}
+
+/* self explanatory  */
+int soapPostSubmit(int fd,
+                   const char * url,
+				   const char * host,
+				   unsigned short port,
+				   const char * action,
+				   const char * body,
+				   const char * httpversion)
+{
+	int bodysize;
+	char headerbuf[512];
+	int headerssize;
+	char portstr[8];
+	bodysize = (int)strlen(body);
+	/* We are not using keep-alive HTTP connections.
+	 * HTTP/1.1 needs the header Connection: close to do that.
+	 * This is the default with HTTP/1.0
+	 * Using HTTP/1.1 means we need to support chunked transfer-encoding :
+	 * When using HTTP/1.1, the router "BiPAC 7404VNOX" always use chunked
+	 * transfer encoding. */
+    /* Connection: Close is normally there only in HTTP/1.1 but who knows */
+	portstr[0] = '\0';
+	if(port != 80)
+		snprintf(portstr, sizeof(portstr), ":%hu", port);
+	headerssize = snprintf(headerbuf, sizeof(headerbuf),
+                       "POST %s HTTP/%s\r\n"
+	                   "Host: %s%s\r\n"
+					   "User-Agent: " OS_STRING ", UPnP/1.0, MiniUPnPc/" MINIUPNPC_VERSION_STRING "\r\n"
+	                   "Content-Length: %d\r\n"
+					   "Content-Type: text/xml\r\n"
+					   "SOAPAction: \"%s\"\r\n"
+					   "Connection: Close\r\n"
+					   "Cache-Control: no-cache\r\n"	/* ??? */
+					   "Pragma: no-cache\r\n"
+					   "\r\n",
+					   url, httpversion, host, portstr, bodysize, action);
+#ifdef DEBUG
+	/*printf("SOAP request : headersize=%d bodysize=%d\n",
+	       headerssize, bodysize);
+	*/
+	printf("SOAP request : POST %s HTTP/%s - Host: %s%s\n",
+	        url, httpversion, host, portstr);
+	printf("SOAPAction: \"%s\" - Content-Length: %d\n", action, bodysize);
+	printf("Headers :\n%s", headerbuf);
+	printf("Body :\n%s\n", body);
+#endif
+	return httpWrite(fd, body, bodysize, headerbuf, headerssize);
+}
+
+
diff --git a/Externals/miniupnpc/src/minisoap.h b/Externals/miniupnpc/src/minisoap.h
new file mode 100644
index 0000000000..14c859d1eb
--- /dev/null
+++ b/Externals/miniupnpc/src/minisoap.h
@@ -0,0 +1,15 @@
+/* $Id: minisoap.h,v 1.5 2012/09/27 15:42:10 nanard Exp $ */
+/* Project : miniupnp
+ * Author : Thomas Bernard
+ * Copyright (c) 2005 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution. */
+#ifndef MINISOAP_H_INCLUDED
+#define MINISOAP_H_INCLUDED
+
+/*int httpWrite(int, const char *, int, const char *);*/
+int soapPostSubmit(int, const char *, const char *, unsigned short,
+		   const char *, const char *, const char *);
+
+#endif
+
diff --git a/Externals/miniupnpc/src/minissdpc.c b/Externals/miniupnpc/src/minissdpc.c
new file mode 100644
index 0000000000..c4913fb89a
--- /dev/null
+++ b/Externals/miniupnpc/src/minissdpc.c
@@ -0,0 +1,133 @@
+/* $Id: minissdpc.c,v 1.16 2012/03/05 19:42:46 nanard Exp $ */
+/* Project : miniupnp
+ * Web : http://miniupnp.free.fr/
+ * Author : Thomas BERNARD
+ * copyright (c) 2005-2012 Thomas Bernard
+ * This software is subjet to the conditions detailed in the
+ * provided LICENCE file. */
+/*#include <syslog.h>*/
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#if defined(_WIN32) || defined(__amigaos__) || defined(__amigaos4__)
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <io.h>
+#include <winsock.h>
+#include <stdint.h>
+#endif
+#if defined(__amigaos__) || defined(__amigaos4__)
+#include <sys/socket.h>
+#endif
+#if defined(__amigaos__)
+#define uint16_t unsigned short
+#endif
+/* Hack */
+#define UNIX_PATH_LEN   108
+struct sockaddr_un {
+  uint16_t sun_family;
+  char     sun_path[UNIX_PATH_LEN];
+};
+#else
+#include <sys/socket.h>
+#include <sys/un.h>
+#endif
+
+#include "minissdpc.h"
+#include "miniupnpc.h"
+
+#include "codelength.h"
+
+struct UPNPDev *
+getDevicesFromMiniSSDPD(const char * devtype, const char * socketpath)
+{
+	struct UPNPDev * tmp;
+	struct UPNPDev * devlist = NULL;
+	unsigned char buffer[2048];
+	ssize_t n;
+	unsigned char * p;
+	unsigned char * url;
+	unsigned int i;
+	unsigned int urlsize, stsize, usnsize, l;
+	int s;
+	struct sockaddr_un addr;
+
+	s = socket(AF_UNIX, SOCK_STREAM, 0);
+	if(s < 0)
+	{
+		/*syslog(LOG_ERR, "socket(unix): %m");*/
+		perror("socket(unix)");
+		return NULL;
+	}
+	addr.sun_family = AF_UNIX;
+	strncpy(addr.sun_path, socketpath, sizeof(addr.sun_path));
+	/* TODO : check if we need to handle the EINTR */
+	if(connect(s, (struct sockaddr *)&addr, sizeof(struct sockaddr_un)) < 0)
+	{
+		/*syslog(LOG_WARNING, "connect(\"%s\"): %m", socketpath);*/
+		close(s);
+		return NULL;
+	}
+	stsize = strlen(devtype);
+	buffer[0] = 1; /* request type 1 : request devices/services by type */
+	p = buffer + 1;
+	l = stsize;	CODELENGTH(l, p);
+	if(p + stsize > buffer + sizeof(buffer))
+	{
+		/* devtype is too long ! */
+		close(s);
+		return NULL;
+	}
+	memcpy(p, devtype, stsize);
+	p += stsize;
+	if(write(s, buffer, p - buffer) < 0)
+	{
+		/*syslog(LOG_ERR, "write(): %m");*/
+		perror("minissdpc.c: write()");
+		close(s);
+		return NULL;
+	}
+	n = read(s, buffer, sizeof(buffer));
+	if(n<=0)
+	{
+		perror("minissdpc.c: read()");
+		close(s);
+		return NULL;
+	}
+	p = buffer + 1;
+	for(i = 0; i < buffer[0]; i++)
+	{
+		if(p+2>=buffer+sizeof(buffer))
+			break;
+		DECODELENGTH(urlsize, p);
+		if(p+urlsize+2>=buffer+sizeof(buffer))
+			break;
+		url = p;
+		p += urlsize;
+		DECODELENGTH(stsize, p);
+		if(p+stsize+2>=buffer+sizeof(buffer))
+			break;
+		tmp = (struct UPNPDev *)malloc(sizeof(struct UPNPDev)+urlsize+stsize);
+		tmp->pNext = devlist;
+		tmp->descURL = tmp->buffer;
+		tmp->st = tmp->buffer + 1 + urlsize;
+		memcpy(tmp->buffer, url, urlsize);
+		tmp->buffer[urlsize] = '\0';
+		memcpy(tmp->buffer + urlsize + 1, p, stsize);
+		p += stsize;
+		tmp->buffer[urlsize+1+stsize] = '\0';
+		devlist = tmp;
+		/* added for compatibility with recent versions of MiniSSDPd
+		 * >= 2007/12/19 */
+		DECODELENGTH(usnsize, p);
+		p += usnsize;
+		if(p>buffer + sizeof(buffer))
+			break;
+	}
+	close(s);
+	return devlist;
+}
+
diff --git a/Externals/miniupnpc/src/minissdpc.h b/Externals/miniupnpc/src/minissdpc.h
new file mode 100644
index 0000000000..915b0026fb
--- /dev/null
+++ b/Externals/miniupnpc/src/minissdpc.h
@@ -0,0 +1,15 @@
+/* $Id: minissdpc.h,v 1.2 2012/09/27 15:42:10 nanard Exp $ */
+/* Project: miniupnp
+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * Author: Thomas Bernard
+ * Copyright (c) 2005-2007 Thomas Bernard
+ * This software is subjects to the conditions detailed
+ * in the LICENCE file provided within this distribution */
+#ifndef MINISSDPC_H_INCLUDED
+#define MINISSDPC_H_INCLUDED
+
+struct UPNPDev *
+getDevicesFromMiniSSDPD(const char * devtype, const char * socketpath);
+
+#endif
+
diff --git a/Externals/miniupnpc/src/miniupnpc.c b/Externals/miniupnpc/src/miniupnpc.c
new file mode 100644
index 0000000000..f6b0cc23ff
--- /dev/null
+++ b/Externals/miniupnpc/src/miniupnpc.c
@@ -0,0 +1,987 @@
+/* $Id: miniupnpc.c,v 1.111 2012/10/09 17:53:14 nanard Exp $ */
+/* Project : miniupnp
+ * Web : http://miniupnp.free.fr/
+ * Author : Thomas BERNARD
+ * copyright (c) 2005-2012 Thomas Bernard
+ * This software is subjet to the conditions detailed in the
+ * provided LICENSE file. */
+#define __EXTENSIONS__ 1
+#if !defined(MACOSX) && !defined(__sun)
+#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+#ifndef __cplusplus
+#define _XOPEN_SOURCE 600
+#endif
+#endif
+#ifndef __BSD_VISIBLE
+#define __BSD_VISIBLE 1
+#endif
+#endif
+
+#if !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(MACOSX) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__sun)
+#define HAS_IP_MREQN
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#ifdef _WIN32
+/* Win32 Specific includes and defines */
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <io.h>
+#include <iphlpapi.h>
+#define snprintf _snprintf
+#define strdup _strdup
+#ifndef strncasecmp
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#define strncasecmp _memicmp
+#else /* defined(_MSC_VER) && (_MSC_VER >= 1400) */
+#define strncasecmp memicmp
+#endif /* defined(_MSC_VER) && (_MSC_VER >= 1400) */
+#endif /* #ifndef strncasecmp */
+#define MAXHOSTNAMELEN 64
+#else /* #ifdef _WIN32 */
+/* Standard POSIX includes */
+#include <unistd.h>
+#if defined(__amigaos__) && !defined(__amigaos4__)
+/* Amiga OS 3 specific stuff */
+#define socklen_t int
+#else
+#include <sys/select.h>
+#endif
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/param.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <net/if.h>
+#if !defined(__amigaos__) && !defined(__amigaos4__)
+#include <poll.h>
+#endif
+#include <strings.h>
+#include <errno.h>
+#define closesocket close
+#endif /* #else _WIN32 */
+#ifdef MINIUPNPC_SET_SOCKET_TIMEOUT
+#include <sys/time.h>
+#endif
+#if defined(__amigaos__) || defined(__amigaos4__)
+/* Amiga OS specific stuff */
+#define TIMEVAL struct timeval
+#endif
+
+#include "miniupnpc.h"
+#include "minissdpc.h"
+#include "miniwget.h"
+#include "minisoap.h"
+#include "minixml.h"
+#include "upnpcommands.h"
+#include "connecthostport.h"
+#include "receivedata.h"
+
+#ifdef _WIN32
+#define PRINT_SOCKET_ERROR(x)    printf("Socket error: %s, %d\n", x, WSAGetLastError());
+#else
+#define PRINT_SOCKET_ERROR(x) perror(x)
+#endif
+
+#define SOAPPREFIX "s"
+#define SERVICEPREFIX "u"
+#define SERVICEPREFIX2 'u'
+
+/* root description parsing */
+LIBSPEC void parserootdesc(const char * buffer, int bufsize, struct IGDdatas * data)
+{
+	struct xmlparser parser;
+	/* xmlparser object */
+	parser.xmlstart = buffer;
+	parser.xmlsize = bufsize;
+	parser.data = data;
+	parser.starteltfunc = IGDstartelt;
+	parser.endeltfunc = IGDendelt;
+	parser.datafunc = IGDdata;
+	parser.attfunc = 0;
+	parsexml(&parser);
+#ifdef DEBUG
+	printIGD(data);
+#endif
+}
+
+/* simpleUPnPcommand2 :
+ * not so simple !
+ * return values :
+ *   pointer - OK
+ *   NULL - error */
+char * simpleUPnPcommand2(int s, const char * url, const char * service,
+		       const char * action, struct UPNParg * args,
+		       int * bufsize, const char * httpversion)
+{
+	char hostname[MAXHOSTNAMELEN+1];
+	unsigned short port = 0;
+	char * path;
+	char soapact[128];
+	char soapbody[2048];
+	char * buf;
+    int n;
+
+	*bufsize = 0;
+	snprintf(soapact, sizeof(soapact), "%s#%s", service, action);
+	if(args==NULL)
+	{
+		/*soapbodylen = */snprintf(soapbody, sizeof(soapbody),
+						"<?xml version=\"1.0\"?>\r\n"
+	    	              "<" SOAPPREFIX ":Envelope "
+						  "xmlns:" SOAPPREFIX "=\"http://schemas.xmlsoap.org/soap/envelope/\" "
+						  SOAPPREFIX ":encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">"
+						  "<" SOAPPREFIX ":Body>"
+						  "<" SERVICEPREFIX ":%s xmlns:" SERVICEPREFIX "=\"%s\">"
+						  "</" SERVICEPREFIX ":%s>"
+						  "</" SOAPPREFIX ":Body></" SOAPPREFIX ":Envelope>"
+					 	  "\r\n", action, service, action);
+	}
+	else
+	{
+		char * p;
+		const char * pe, * pv;
+		int soapbodylen;
+		soapbodylen = snprintf(soapbody, sizeof(soapbody),
+						"<?xml version=\"1.0\"?>\r\n"
+	    	            "<" SOAPPREFIX ":Envelope "
+						"xmlns:" SOAPPREFIX "=\"http://schemas.xmlsoap.org/soap/envelope/\" "
+						SOAPPREFIX ":encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">"
+						"<" SOAPPREFIX ":Body>"
+						"<" SERVICEPREFIX ":%s xmlns:" SERVICEPREFIX "=\"%s\">",
+						action, service);
+		p = soapbody + soapbodylen;
+		while(args->elt)
+		{
+			/* check that we are never overflowing the string... */
+			if(soapbody + sizeof(soapbody) <= p + 100)
+			{
+				/* we keep a margin of at least 100 bytes */
+				return NULL;
+			}
+			*(p++) = '<';
+			pe = args->elt;
+			while(*pe)
+				*(p++) = *(pe++);
+			*(p++) = '>';
+			if((pv = args->val))
+			{
+				while(*pv)
+					*(p++) = *(pv++);
+			}
+			*(p++) = '<';
+			*(p++) = '/';
+			pe = args->elt;
+			while(*pe)
+				*(p++) = *(pe++);
+			*(p++) = '>';
+			args++;
+		}
+		*(p++) = '<';
+		*(p++) = '/';
+		*(p++) = SERVICEPREFIX2;
+		*(p++) = ':';
+		pe = action;
+		while(*pe)
+			*(p++) = *(pe++);
+		strncpy(p, "></" SOAPPREFIX ":Body></" SOAPPREFIX ":Envelope>\r\n",
+		        soapbody + sizeof(soapbody) - p);
+	}
+	if(!parseURL(url, hostname, &port, &path, NULL)) return NULL;
+	if(s < 0) {
+		s = connecthostport(hostname, port, 0);
+		if(s < 0) {
+			/* failed to connect */
+			return NULL;
+		}
+	}
+
+	n = soapPostSubmit(s, path, hostname, port, soapact, soapbody, httpversion);
+	if(n<=0) {
+#ifdef DEBUG
+		printf("Error sending SOAP request\n");
+#endif
+		closesocket(s);
+		return NULL;
+	}
+
+	buf = getHTTPResponse(s, bufsize);
+#ifdef DEBUG
+	if(*bufsize > 0 && buf)
+	{
+		printf("SOAP Response :\n%.*s\n", *bufsize, buf);
+	}
+#endif
+	closesocket(s);
+	return buf;
+}
+
+/* simpleUPnPcommand :
+ * not so simple !
+ * return values :
+ *   pointer - OK
+ *   NULL    - error */
+char * simpleUPnPcommand(int s, const char * url, const char * service,
+		       const char * action, struct UPNParg * args,
+		       int * bufsize)
+{
+	char * buf;
+
+#if 1
+	buf = simpleUPnPcommand2(s, url, service, action, args, bufsize, "1.1");
+#else
+	buf = simpleUPnPcommand2(s, url, service, action, args, bufsize, "1.0");
+	if (!buf || *bufsize == 0)
+	{
+#if DEBUG
+	    printf("Error or no result from SOAP request; retrying with HTTP/1.1\n");
+#endif
+		buf = simpleUPnPcommand2(s, url, service, action, args, bufsize, "1.1");
+	}
+#endif
+	return buf;
+}
+
+/* parseMSEARCHReply()
+ * the last 4 arguments are filled during the parsing :
+ *    - location/locationsize : "location:" field of the SSDP reply packet
+ *    - st/stsize : "st:" field of the SSDP reply packet.
+ * The strings are NOT null terminated */
+static void
+parseMSEARCHReply(const char * reply, int size,
+                  const char * * location, int * locationsize,
+			      const char * * st, int * stsize)
+{
+	int a, b, i;
+	i = 0;
+	a = i;	/* start of the line */
+	b = 0;	/* end of the "header" (position of the colon) */
+	while(i<size)
+	{
+		switch(reply[i])
+		{
+		case ':':
+				if(b==0)
+				{
+					b = i; /* end of the "header" */
+					/*for(j=a; j<b; j++)
+					{
+						putchar(reply[j]);
+					}
+					*/
+				}
+				break;
+		case '\x0a':
+		case '\x0d':
+				if(b!=0)
+				{
+					/*for(j=b+1; j<i; j++)
+					{
+						putchar(reply[j]);
+					}
+					putchar('\n');*/
+					/* skip the colon and white spaces */
+					do { b++; } while(reply[b]==' ');
+					if(0==strncasecmp(reply+a, "location", 8))
+					{
+						*location = reply+b;
+						*locationsize = i-b;
+					}
+					else if(0==strncasecmp(reply+a, "st", 2))
+					{
+						*st = reply+b;
+						*stsize = i-b;
+					}
+					b = 0;
+				}
+				a = i+1;
+				break;
+		default:
+				break;
+		}
+		i++;
+	}
+}
+
+/* port upnp discover : SSDP protocol */
+#define PORT 1900
+#define XSTR(s) STR(s)
+#define STR(s) #s
+#define UPNP_MCAST_ADDR "239.255.255.250"
+/* for IPv6 */
+#define UPNP_MCAST_LL_ADDR "FF02::C" /* link-local */
+#define UPNP_MCAST_SL_ADDR "FF05::C" /* site-local */
+
+/* upnpDiscover() :
+ * return a chained list of all devices found or NULL if
+ * no devices was found.
+ * It is up to the caller to free the chained list
+ * delay is in millisecond (poll) */
+LIBSPEC struct UPNPDev *
+upnpDiscover(int delay, const char * multicastif,
+             const char * minissdpdsock, int sameport,
+             int ipv6,
+             int * error)
+{
+	struct UPNPDev * tmp;
+	struct UPNPDev * devlist = 0;
+	unsigned int scope_id = 0;
+	int opt = 1;
+	static const char MSearchMsgFmt[] =
+	"M-SEARCH * HTTP/1.1\r\n"
+	"HOST: %s:" XSTR(PORT) "\r\n"
+	"ST: %s\r\n"
+	"MAN: \"ssdp:discover\"\r\n"
+	"MX: %u\r\n"
+	"\r\n";
+	static const char * const deviceList[] = {
+#if 0
+		"urn:schemas-upnp-org:device:InternetGatewayDevice:2",
+		"urn:schemas-upnp-org:service:WANIPConnection:2",
+#endif
+		"urn:schemas-upnp-org:device:InternetGatewayDevice:1",
+		"urn:schemas-upnp-org:service:WANIPConnection:1",
+		"urn:schemas-upnp-org:service:WANPPPConnection:1",
+		"upnp:rootdevice",
+		0
+	};
+	int deviceIndex = 0;
+	char bufr[1536];	/* reception and emission buffer */
+	int sudp;
+	int n;
+	struct sockaddr_storage sockudp_r;
+	unsigned int mx;
+#ifdef NO_GETADDRINFO
+	struct sockaddr_storage sockudp_w;
+#else
+	int rv;
+	struct addrinfo hints, *servinfo, *p;
+#endif
+#ifdef _WIN32
+	MIB_IPFORWARDROW ip_forward;
+#endif
+	int linklocal = 1;
+
+	if(error)
+		*error = UPNPDISCOVER_UNKNOWN_ERROR;
+	/* fallback to direct discovery */
+#ifdef _WIN32
+	sudp = socket(ipv6 ? PF_INET6 : PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+#else
+	sudp = socket(ipv6 ? PF_INET6 : PF_INET, SOCK_DGRAM, 0);
+#endif
+	if(sudp < 0)
+	{
+		if(error)
+			*error = UPNPDISCOVER_SOCKET_ERROR;
+		PRINT_SOCKET_ERROR("socket");
+		return NULL;
+	}
+	/* reception */
+	memset(&sockudp_r, 0, sizeof(struct sockaddr_storage));
+	if(ipv6) {
+		struct sockaddr_in6 * p = (struct sockaddr_in6 *)&sockudp_r;
+		p->sin6_family = AF_INET6;
+		if(sameport)
+			p->sin6_port = htons(PORT);
+		p->sin6_addr = in6addr_any; /* in6addr_any is not available with MinGW32 3.4.2 */
+	} else {
+		struct sockaddr_in * p = (struct sockaddr_in *)&sockudp_r;
+		p->sin_family = AF_INET;
+		if(sameport)
+			p->sin_port = htons(PORT);
+		p->sin_addr.s_addr = INADDR_ANY;
+	}
+#ifdef _WIN32
+/* This code could help us to use the right Network interface for
+ * SSDP multicast traffic */
+/* Get IP associated with the index given in the ip_forward struct
+ * in order to give this ip to setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF) */
+	if(!ipv6
+	   && (GetBestRoute(inet_addr("223.255.255.255"), 0, &ip_forward) == NO_ERROR)) {
+		DWORD dwRetVal = 0;
+		PMIB_IPADDRTABLE pIPAddrTable;
+		DWORD dwSize = 0;
+#ifdef DEBUG
+		IN_ADDR IPAddr;
+#endif
+		int i;
+#ifdef DEBUG
+		printf("ifIndex=%lu nextHop=%lx \n", ip_forward.dwForwardIfIndex, ip_forward.dwForwardNextHop);
+#endif
+		pIPAddrTable = (MIB_IPADDRTABLE *) malloc(sizeof (MIB_IPADDRTABLE));
+		if (GetIpAddrTable(pIPAddrTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) {
+			free(pIPAddrTable);
+			pIPAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
+		}
+		if(pIPAddrTable) {
+			dwRetVal = GetIpAddrTable( pIPAddrTable, &dwSize, 0 );
+#ifdef DEBUG
+			printf("\tNum Entries: %ld\n", pIPAddrTable->dwNumEntries);
+#endif
+			for (i=0; i < (int) pIPAddrTable->dwNumEntries; i++) {
+#ifdef DEBUG
+				printf("\n\tInterface Index[%d]:\t%ld\n", i, pIPAddrTable->table[i].dwIndex);
+				IPAddr.S_un.S_addr = (u_long) pIPAddrTable->table[i].dwAddr;
+				printf("\tIP Address[%d]:     \t%s\n", i, inet_ntoa(IPAddr) );
+				IPAddr.S_un.S_addr = (u_long) pIPAddrTable->table[i].dwMask;
+				printf("\tSubnet Mask[%d]:    \t%s\n", i, inet_ntoa(IPAddr) );
+				IPAddr.S_un.S_addr = (u_long) pIPAddrTable->table[i].dwBCastAddr;
+				printf("\tBroadCast[%d]:      \t%s (%ld)\n", i, inet_ntoa(IPAddr), pIPAddrTable->table[i].dwBCastAddr);
+				printf("\tReassembly size[%d]:\t%ld\n", i, pIPAddrTable->table[i].dwReasmSize);
+				printf("\tType and State[%d]:", i);
+				printf("\n");
+#endif
+				if (pIPAddrTable->table[i].dwIndex == ip_forward.dwForwardIfIndex) {
+					/* Set the address of this interface to be used */
+					struct in_addr mc_if;
+					memset(&mc_if, 0, sizeof(mc_if));
+					mc_if.s_addr = pIPAddrTable->table[i].dwAddr;
+					if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&mc_if, sizeof(mc_if)) < 0) {
+						PRINT_SOCKET_ERROR("setsockopt");
+					}
+					((struct sockaddr_in *)&sockudp_r)->sin_addr.s_addr = pIPAddrTable->table[i].dwAddr;
+#ifndef DEBUG
+					break;
+#endif
+				}
+			}
+			free(pIPAddrTable);
+			pIPAddrTable = NULL;
+		}
+	}
+#endif
+
+#ifdef _WIN32
+	if (setsockopt(sudp, SOL_SOCKET, SO_REUSEADDR, (const char *)&opt, sizeof (opt)) < 0)
+#else
+	if (setsockopt(sudp, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof (opt)) < 0)
+#endif
+	{
+		if(error)
+			*error = UPNPDISCOVER_SOCKET_ERROR;
+		PRINT_SOCKET_ERROR("setsockopt");
+		return NULL;
+	}
+
+	if(multicastif)
+	{
+		if(ipv6) {
+#if !defined(_WIN32)
+			/* according to MSDN, if_nametoindex() is supported since
+			 * MS Windows Vista and MS Windows Server 2008.
+			 * http://msdn.microsoft.com/en-us/library/bb408409%28v=vs.85%29.aspx */
+			unsigned int ifindex = if_nametoindex(multicastif); /* eth0, etc. */
+			if(setsockopt(sudp, IPPROTO_IPV6, IPV6_MULTICAST_IF, &ifindex, sizeof(&ifindex)) < 0)
+			{
+				PRINT_SOCKET_ERROR("setsockopt");
+			}
+#else
+#ifdef DEBUG
+			printf("Setting of multicast interface not supported in IPv6 under Windows.\n");
+#endif
+#endif
+		} else {
+			struct in_addr mc_if;
+			mc_if.s_addr = inet_addr(multicastif); /* ex: 192.168.x.x */
+			if(mc_if.s_addr != INADDR_NONE)
+			{
+				((struct sockaddr_in *)&sockudp_r)->sin_addr.s_addr = mc_if.s_addr;
+				if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&mc_if, sizeof(mc_if)) < 0)
+				{
+					PRINT_SOCKET_ERROR("setsockopt");
+				}
+			} else {
+#ifdef HAS_IP_MREQN
+				/* was not an ip address, try with an interface name */
+				struct ip_mreqn reqn;	/* only defined with -D_BSD_SOURCE or -D_GNU_SOURCE */
+				memset(&reqn, 0, sizeof(struct ip_mreqn));
+				reqn.imr_ifindex = if_nametoindex(multicastif);
+				if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&reqn, sizeof(reqn)) < 0)
+				{
+					PRINT_SOCKET_ERROR("setsockopt");
+				}
+#else
+#ifdef DEBUG
+				printf("Setting of multicast interface not supported with interface name.\n");
+#endif
+#endif
+			}
+		}
+	}
+
+	/* Avant d'envoyer le paquet on bind pour recevoir la reponse */
+    if (bind(sudp, (const struct sockaddr *)&sockudp_r,
+	         ipv6 ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in)) != 0)
+	{
+		if(error)
+			*error = UPNPDISCOVER_SOCKET_ERROR;
+        PRINT_SOCKET_ERROR("bind");
+		closesocket(sudp);
+		return NULL;
+    }
+
+	if(error)
+		*error = UPNPDISCOVER_SUCCESS;
+	/* Calculating maximum response time in seconds */
+	mx = ((unsigned int)delay) / 1000u;
+	/* receiving SSDP response packet */
+	for(n = 0; deviceList[deviceIndex]; deviceIndex++)
+	{
+	if(n == 0)
+	{
+		/* sending the SSDP M-SEARCH packet */
+		n = snprintf(bufr, sizeof(bufr),
+		             MSearchMsgFmt,
+		             ipv6 ?
+		             (linklocal ? "[" UPNP_MCAST_LL_ADDR "]" :  "[" UPNP_MCAST_SL_ADDR "]")
+		             : UPNP_MCAST_ADDR,
+		             deviceList[deviceIndex], mx);
+#ifdef DEBUG
+		printf("Sending %s", bufr);
+#endif
+#ifdef NO_GETADDRINFO
+		/* the following code is not using getaddrinfo */
+		/* emission */
+		memset(&sockudp_w, 0, sizeof(struct sockaddr_storage));
+		if(ipv6) {
+			struct sockaddr_in6 * p = (struct sockaddr_in6 *)&sockudp_w;
+			p->sin6_family = AF_INET6;
+			p->sin6_port = htons(PORT);
+			inet_pton(AF_INET6,
+			          linklocal ? UPNP_MCAST_LL_ADDR : UPNP_MCAST_SL_ADDR,
+			          &(p->sin6_addr));
+		} else {
+			struct sockaddr_in * p = (struct sockaddr_in *)&sockudp_w;
+			p->sin_family = AF_INET;
+			p->sin_port = htons(PORT);
+			p->sin_addr.s_addr = inet_addr(UPNP_MCAST_ADDR);
+		}
+		n = sendto(sudp, bufr, n, 0,
+		           &sockudp_w,
+		           ipv6 ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in));
+		if (n < 0) {
+			if(error)
+				*error = UPNPDISCOVER_SOCKET_ERROR;
+			PRINT_SOCKET_ERROR("sendto");
+			break;
+		}
+#else /* #ifdef NO_GETADDRINFO */
+		memset(&hints, 0, sizeof(hints));
+		hints.ai_family = AF_UNSPEC; /* AF_INET6 or AF_INET */
+		hints.ai_socktype = SOCK_DGRAM;
+		/*hints.ai_flags = */
+		if ((rv = getaddrinfo(ipv6
+		                      ? (linklocal ? UPNP_MCAST_LL_ADDR : UPNP_MCAST_SL_ADDR)
+		                      : UPNP_MCAST_ADDR,
+		                      XSTR(PORT), &hints, &servinfo)) != 0) {
+			if(error)
+				*error = UPNPDISCOVER_SOCKET_ERROR;
+#ifdef _WIN32
+		    fprintf(stderr, "getaddrinfo() failed: %d\n", rv);
+#else
+		    fprintf(stderr, "getaddrinfo: %s\n", gai_strerror(rv));
+#endif
+			break;
+		}
+		for(p = servinfo; p; p = p->ai_next) {
+			n = sendto(sudp, bufr, n, 0, p->ai_addr, p->ai_addrlen);
+			if (n < 0) {
+#ifdef DEBUG
+				char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
+				if (getnameinfo(p->ai_addr, p->ai_addrlen, hbuf, sizeof(hbuf), sbuf,
+						sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV) == 0) {
+					fprintf(stderr, "host:%s port:%s\n", hbuf, sbuf);
+				}
+#endif
+				PRINT_SOCKET_ERROR("sendto");
+				continue;
+			}
+		}
+		freeaddrinfo(servinfo);
+		if(n < 0) {
+			if(error)
+				*error = UPNPDISCOVER_SOCKET_ERROR;
+			break;
+		}
+#endif /* #ifdef NO_GETADDRINFO */
+	}
+	/* Waiting for SSDP REPLY packet to M-SEARCH */
+	n = receivedata(sudp, bufr, sizeof(bufr), delay, &scope_id);
+	if (n < 0) {
+		/* error */
+		if(error)
+			*error = UPNPDISCOVER_SOCKET_ERROR;
+		break;
+	} else if (n == 0) {
+		/* no data or Time Out */
+		if (devlist) {
+			/* no more device type to look for... */
+			if(error)
+				*error = UPNPDISCOVER_SUCCESS;
+			break;
+		}
+		if(ipv6) {
+			if(linklocal) {
+				linklocal = 0;
+				--deviceIndex;
+			} else {
+				linklocal = 1;
+			}
+		}
+	} else {
+		const char * descURL=NULL;
+		int urlsize=0;
+		const char * st=NULL;
+		int stsize=0;
+        /*printf("%d byte(s) :\n%s\n", n, bufr);*/ /* affichage du message */
+		parseMSEARCHReply(bufr, n, &descURL, &urlsize, &st, &stsize);
+		if(st&&descURL)
+		{
+#ifdef DEBUG
+			printf("M-SEARCH Reply:\nST: %.*s\nLocation: %.*s\n",
+			       stsize, st, urlsize, descURL);
+#endif
+			for(tmp=devlist; tmp; tmp = tmp->pNext) {
+				if(memcmp(tmp->descURL, descURL, urlsize) == 0 &&
+				   tmp->descURL[urlsize] == '\0' &&
+				   memcmp(tmp->st, st, stsize) == 0 &&
+				   tmp->st[stsize] == '\0')
+					break;
+			}
+			/* at the exit of the loop above, tmp is null if
+			 * no duplicate device was found */
+			if(tmp)
+				continue;
+			tmp = (struct UPNPDev *)malloc(sizeof(struct UPNPDev)+urlsize+stsize);
+			if(!tmp) {
+				/* memory allocation error */
+				if(error)
+					*error = UPNPDISCOVER_MEMORY_ERROR;
+				break;
+			}
+			tmp->pNext = devlist;
+			tmp->descURL = tmp->buffer;
+			tmp->st = tmp->buffer + 1 + urlsize;
+			memcpy(tmp->buffer, descURL, urlsize);
+			tmp->buffer[urlsize] = '\0';
+			memcpy(tmp->buffer + urlsize + 1, st, stsize);
+			tmp->buffer[urlsize+1+stsize] = '\0';
+			tmp->scope_id = scope_id;
+			devlist = tmp;
+		}
+	}
+	}
+	closesocket(sudp);
+	return devlist;
+}
+
+/* freeUPNPDevlist() should be used to
+ * free the chained list returned by upnpDiscover() */
+LIBSPEC void freeUPNPDevlist(struct UPNPDev * devlist)
+{
+	struct UPNPDev * next;
+	while(devlist)
+	{
+		next = devlist->pNext;
+		free(devlist);
+		devlist = next;
+	}
+}
+
+static void
+url_cpy_or_cat(char * dst, const char * src, int n)
+{
+	if(  (src[0] == 'h')
+	   &&(src[1] == 't')
+	   &&(src[2] == 't')
+	   &&(src[3] == 'p')
+	   &&(src[4] == ':')
+	   &&(src[5] == '/')
+	   &&(src[6] == '/'))
+	{
+		strncpy(dst, src, n);
+	}
+	else
+	{
+		int l = strlen(dst);
+		if(src[0] != '/')
+			dst[l++] = '/';
+		if(l<=n)
+			strncpy(dst + l, src, n - l);
+	}
+}
+
+/* Prepare the Urls for usage...
+ */
+LIBSPEC void
+GetUPNPUrls(struct UPNPUrls * urls, struct IGDdatas * data,
+            const char * descURL, unsigned int scope_id)
+{
+	char * p;
+	int n1, n2, n3, n4;
+#ifdef IF_NAMESIZE
+	char ifname[IF_NAMESIZE];
+#else
+	char scope_str[8];
+#endif
+
+	n1 = strlen(data->urlbase);
+	if(n1==0)
+		n1 = strlen(descURL);
+	if(scope_id != 0) {
+#ifdef IF_NAMESIZE
+		if(if_indextoname(scope_id, ifname)) {
+			n1 += 3 + strlen(ifname);	/* 3 == strlen(%25) */
+		}
+#else
+	/* under windows, scope is numerical */
+	snprintf(scope_str, sizeof(scope_str), "%u", scope_id);
+#endif
+	}
+	n1 += 2;	/* 1 byte more for Null terminator, 1 byte for '/' if needed */
+	n2 = n1; n3 = n1; n4 = n1;
+	n1 += strlen(data->first.scpdurl);
+	n2 += strlen(data->first.controlurl);
+	n3 += strlen(data->CIF.controlurl);
+	n4 += strlen(data->IPv6FC.controlurl);
+
+	/* allocate memory to store URLs */
+	urls->ipcondescURL = (char *)malloc(n1);
+	urls->controlURL = (char *)malloc(n2);
+	urls->controlURL_CIF = (char *)malloc(n3);
+	urls->controlURL_6FC = (char *)malloc(n4);
+
+	/* strdup descURL */
+	urls->rootdescURL = strdup(descURL);
+
+	/* get description of WANIPConnection */
+	if(data->urlbase[0] != '\0')
+		strncpy(urls->ipcondescURL, data->urlbase, n1);
+	else
+		strncpy(urls->ipcondescURL, descURL, n1);
+	p = strchr(urls->ipcondescURL+7, '/');
+	if(p) p[0] = '\0';
+	if(scope_id != 0) {
+		if(0 == memcmp(urls->ipcondescURL, "http://[fe80:", 13)) {
+			/* this is a linklocal IPv6 address */
+			p = strchr(urls->ipcondescURL, ']');
+			if(p) {
+				/* insert %25<scope> into URL */
+#ifdef IF_NAMESIZE
+				memmove(p + 3 + strlen(ifname), p, strlen(p) + 1);
+				memcpy(p, "%25", 3);
+				memcpy(p + 3, ifname, strlen(ifname));
+#else
+				memmove(p + 3 + strlen(scope_str), p, strlen(p) + 1);
+				memcpy(p, "%25", 3);
+				memcpy(p + 3, scope_str, strlen(scope_str));
+#endif
+			}
+		}
+	}
+	strncpy(urls->controlURL, urls->ipcondescURL, n2);
+	strncpy(urls->controlURL_CIF, urls->ipcondescURL, n3);
+	strncpy(urls->controlURL_6FC, urls->ipcondescURL, n4);
+
+	url_cpy_or_cat(urls->ipcondescURL, data->first.scpdurl, n1);
+
+	url_cpy_or_cat(urls->controlURL, data->first.controlurl, n2);
+
+	url_cpy_or_cat(urls->controlURL_CIF, data->CIF.controlurl, n3);
+
+	url_cpy_or_cat(urls->controlURL_6FC, data->IPv6FC.controlurl, n4);
+
+#ifdef DEBUG
+	printf("urls->ipcondescURL='%s' %u n1=%d\n", urls->ipcondescURL,
+	       (unsigned)strlen(urls->ipcondescURL), n1);
+	printf("urls->controlURL='%s' %u n2=%d\n", urls->controlURL,
+	       (unsigned)strlen(urls->controlURL), n2);
+	printf("urls->controlURL_CIF='%s' %u n3=%d\n", urls->controlURL_CIF,
+	       (unsigned)strlen(urls->controlURL_CIF), n3);
+	printf("urls->controlURL_6FC='%s' %u n4=%d\n", urls->controlURL_6FC,
+	       (unsigned)strlen(urls->controlURL_6FC), n4);
+#endif
+}
+
+LIBSPEC void
+FreeUPNPUrls(struct UPNPUrls * urls)
+{
+	if(!urls)
+		return;
+	free(urls->controlURL);
+	urls->controlURL = 0;
+	free(urls->ipcondescURL);
+	urls->ipcondescURL = 0;
+	free(urls->controlURL_CIF);
+	urls->controlURL_CIF = 0;
+	free(urls->controlURL_6FC);
+	urls->controlURL_6FC = 0;
+	free(urls->rootdescURL);
+	urls->rootdescURL = 0;
+}
+
+int
+UPNPIGD_IsConnected(struct UPNPUrls * urls, struct IGDdatas * data)
+{
+	char status[64];
+	unsigned int uptime;
+	status[0] = '\0';
+	UPNP_GetStatusInfo(urls->controlURL, data->first.servicetype,
+	                   status, &uptime, NULL);
+	if(0 == strcmp("Connected", status))
+	{
+		return 1;
+	}
+	else
+		return 0;
+}
+
+
+/* UPNP_GetValidIGD() :
+ * return values :
+ *    -1 = Internal error
+ *     0 = NO IGD found
+ *     1 = A valid connected IGD has been found
+ *     2 = A valid IGD has been found but it reported as
+ *         not connected
+ *     3 = an UPnP device has been found but was not recognized as an IGD
+ *
+ * In any non zero return case, the urls and data structures
+ * passed as parameters are set. Donc forget to call FreeUPNPUrls(urls) to
+ * free allocated memory.
+ */
+LIBSPEC int
+UPNP_GetValidIGD(struct UPNPDev * devlist,
+                 struct UPNPUrls * urls,
+				 struct IGDdatas * data,
+				 char * lanaddr, int lanaddrlen)
+{
+	struct xml_desc {
+		char * xml;
+		int size;
+	} * desc = NULL;
+	struct UPNPDev * dev;
+	int ndev = 0;
+	int i;
+	int state = -1; /* state 1 : IGD connected. State 2 : IGD. State 3 : anything */
+	if(!devlist)
+	{
+#ifdef DEBUG
+		printf("Empty devlist\n");
+#endif
+		return 0;
+	}
+	for(dev = devlist; dev; dev = dev->pNext)
+		ndev++;
+	if(ndev > 0)
+	{
+		desc = calloc(ndev, sizeof(struct xml_desc));
+		if(!desc)
+			return -1; /* memory allocation error */
+	}
+	for(state = 1; state <= 3; state++)
+	{
+		for(dev = devlist, i = 0; dev; dev = dev->pNext, i++)
+		{
+			/* we should choose an internet gateway device.
+		 	* with st == urn:schemas-upnp-org:device:InternetGatewayDevice:1 */
+			if(state == 1)
+			{
+				desc[i].xml = miniwget_getaddr(dev->descURL, &(desc[i].size),
+				   	                           lanaddr, lanaddrlen,
+				                               dev->scope_id);
+#ifdef DEBUG
+				if(!desc[i].xml)
+				{
+					printf("error getting XML description %s\n", dev->descURL);
+				}
+#endif
+			}
+			if(desc[i].xml)
+			{
+				memset(data, 0, sizeof(struct IGDdatas));
+				memset(urls, 0, sizeof(struct UPNPUrls));
+				parserootdesc(desc[i].xml, desc[i].size, data);
+				if(0==strcmp(data->CIF.servicetype,
+				   "urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1")
+				   || state >= 3 )
+				{
+				  GetUPNPUrls(urls, data, dev->descURL, dev->scope_id);
+
+#ifdef DEBUG
+				  printf("UPNPIGD_IsConnected(%s) = %d\n",
+				     urls->controlURL,
+			         UPNPIGD_IsConnected(urls, data));
+#endif
+				  if((state >= 2) || UPNPIGD_IsConnected(urls, data))
+					goto free_and_return;
+				  FreeUPNPUrls(urls);
+				  if(data->second.servicetype[0] != '\0') {
+#ifdef DEBUG
+				    printf("We tried %s, now we try %s !\n",
+				           data->first.servicetype, data->second.servicetype);
+#endif
+				    /* swaping WANPPPConnection and WANIPConnection ! */
+				    memcpy(&data->tmp, &data->first, sizeof(struct IGDdatas_service));
+				    memcpy(&data->first, &data->second, sizeof(struct IGDdatas_service));
+				    memcpy(&data->second, &data->tmp, sizeof(struct IGDdatas_service));
+				    GetUPNPUrls(urls, data, dev->descURL, dev->scope_id);
+#ifdef DEBUG
+				    printf("UPNPIGD_IsConnected(%s) = %d\n",
+				       urls->controlURL,
+			           UPNPIGD_IsConnected(urls, data));
+#endif
+				    if((state >= 2) || UPNPIGD_IsConnected(urls, data))
+					  goto free_and_return;
+				    FreeUPNPUrls(urls);
+				  }
+				}
+				memset(data, 0, sizeof(struct IGDdatas));
+			}
+		}
+	}
+	state = 0;
+free_and_return:
+	if(desc) {
+		for(i = 0; i < ndev; i++) {
+			if(desc[i].xml) {
+				free(desc[i].xml);
+			}
+		}
+		free(desc);
+	}
+	return state;
+}
+
+/* UPNP_GetIGDFromUrl()
+ * Used when skipping the discovery process.
+ * return value :
+ *   0 - Not ok
+ *   1 - OK */
+int
+UPNP_GetIGDFromUrl(const char * rootdescurl,
+                   struct UPNPUrls * urls,
+                   struct IGDdatas * data,
+                   char * lanaddr, int lanaddrlen)
+{
+	char * descXML;
+	int descXMLsize = 0;
+	descXML = miniwget_getaddr(rootdescurl, &descXMLsize,
+	   	                       lanaddr, lanaddrlen, 0);
+	if(descXML) {
+		memset(data, 0, sizeof(struct IGDdatas));
+		memset(urls, 0, sizeof(struct UPNPUrls));
+		parserootdesc(descXML, descXMLsize, data);
+		free(descXML);
+		descXML = NULL;
+		GetUPNPUrls(urls, data, rootdescurl, 0);
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
diff --git a/Externals/miniupnpc/src/miniupnpc.def b/Externals/miniupnpc/src/miniupnpc.def
new file mode 100644
index 0000000000..10b9f58002
--- /dev/null
+++ b/Externals/miniupnpc/src/miniupnpc.def
@@ -0,0 +1,42 @@
+LIBRARY
+; miniupnpc library
+
+EXPORTS
+; miniupnpc
+   upnpDiscover
+   freeUPNPDevlist
+   parserootdesc
+   UPNP_GetValidIGD
+   UPNP_GetIGDFromUrl
+   GetUPNPUrls
+   FreeUPNPUrls
+; miniwget
+   miniwget
+   miniwget_getaddr
+; upnpcommands
+   UPNP_GetTotalBytesSent
+   UPNP_GetTotalBytesReceived
+   UPNP_GetTotalPacketsSent
+   UPNP_GetTotalPacketsReceived
+   UPNP_GetStatusInfo
+   UPNP_GetConnectionTypeInfo
+   UPNP_GetExternalIPAddress
+   UPNP_GetLinkLayerMaxBitRates
+   UPNP_AddPortMapping
+   UPNP_DeletePortMapping
+   UPNP_GetPortMappingNumberOfEntries
+   UPNP_GetSpecificPortMappingEntry
+   UPNP_GetGenericPortMappingEntry
+   UPNP_GetListOfPortMappings
+   UPNP_AddPinhole
+   UPNP_CheckPinholeWorking
+   UPNP_UpdatePinhole
+   UPNP_GetPinholePackets
+   UPNP_DeletePinhole
+   UPNP_GetFirewallStatus
+   UPNP_GetOutboundPinholeTimeout
+; upnperrors
+   strupnperror
+; portlistingparse
+   ParsePortListing
+   FreePortListing
diff --git a/Externals/miniupnpc/src/miniupnpc.h b/Externals/miniupnpc/src/miniupnpc.h
new file mode 100644
index 0000000000..ba0deb03f2
--- /dev/null
+++ b/Externals/miniupnpc/src/miniupnpc.h
@@ -0,0 +1,130 @@
+/* $Id: miniupnpc.h,v 1.32 2013/02/06 14:44:42 nanard Exp $ */
+/* Project: miniupnp
+ * http://miniupnp.free.fr/
+ * Author: Thomas Bernard
+ * Copyright (c) 2005-2012 Thomas Bernard
+ * This software is subjects to the conditions detailed
+ * in the LICENCE file provided within this distribution */
+#ifndef MINIUPNPC_H_INCLUDED
+#define MINIUPNPC_H_INCLUDED
+
+#include "declspec.h"
+#include "igd_desc_parse.h"
+
+/* error codes : */
+#define UPNPDISCOVER_SUCCESS (0)
+#define UPNPDISCOVER_UNKNOWN_ERROR (-1)
+#define UPNPDISCOVER_SOCKET_ERROR (-101)
+#define UPNPDISCOVER_MEMORY_ERROR (-102)
+
+/* versions : */
+#define MINIUPNPC_VERSION	"1.8.20130503"
+#define MINIUPNPC_API_VERSION	9
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Structures definitions : */
+struct UPNParg { const char * elt; const char * val; };
+
+char *
+simpleUPnPcommand(int, const char *, const char *,
+                  const char *, struct UPNParg *,
+                  int *);
+
+struct UPNPDev {
+	struct UPNPDev * pNext;
+	char * descURL;
+	char * st;
+	unsigned int scope_id;
+	char buffer[2];
+};
+
+/* upnpDiscover()
+ * discover UPnP devices on the network.
+ * The discovered devices are returned as a chained list.
+ * It is up to the caller to free the list with freeUPNPDevlist().
+ * delay (in millisecond) is the maximum time for waiting any device
+ * response.
+ * If available, device list will be obtained from MiniSSDPd.
+ * Default path for minissdpd socket will be used if minissdpdsock argument
+ * is NULL.
+ * If multicastif is not NULL, it will be used instead of the default
+ * multicast interface for sending SSDP discover packets.
+ * If sameport is not null, SSDP packets will be sent from the source port
+ * 1900 (same as destination port) otherwise system assign a source port. */
+LIBSPEC struct UPNPDev *
+upnpDiscover(int delay, const char * multicastif,
+             const char * minissdpdsock, int sameport,
+             int ipv6,
+             int * error);
+/* freeUPNPDevlist()
+ * free list returned by upnpDiscover() */
+LIBSPEC void freeUPNPDevlist(struct UPNPDev * devlist);
+
+/* parserootdesc() :
+ * parse root XML description of a UPnP device and fill the IGDdatas
+ * structure. */
+LIBSPEC void parserootdesc(const char *, int, struct IGDdatas *);
+
+/* structure used to get fast access to urls
+ * controlURL: controlURL of the WANIPConnection
+ * ipcondescURL: url of the description of the WANIPConnection
+ * controlURL_CIF: controlURL of the WANCommonInterfaceConfig
+ * controlURL_6FC: controlURL of the WANIPv6FirewallControl
+ */
+struct UPNPUrls {
+	char * controlURL;
+	char * ipcondescURL;
+	char * controlURL_CIF;
+	char * controlURL_6FC;
+	char * rootdescURL;
+};
+
+/* UPNP_GetValidIGD() :
+ * return values :
+ *     0 = NO IGD found
+ *     1 = A valid connected IGD has been found
+ *     2 = A valid IGD has been found but it reported as
+ *         not connected
+ *     3 = an UPnP device has been found but was not recognized as an IGD
+ *
+ * In any non zero return case, the urls and data structures
+ * passed as parameters are set. Donc forget to call FreeUPNPUrls(urls) to
+ * free allocated memory.
+ */
+LIBSPEC int
+UPNP_GetValidIGD(struct UPNPDev * devlist,
+                 struct UPNPUrls * urls,
+				 struct IGDdatas * data,
+				 char * lanaddr, int lanaddrlen);
+
+/* UPNP_GetIGDFromUrl()
+ * Used when skipping the discovery process.
+ * return value :
+ *   0 - Not ok
+ *   1 - OK */
+LIBSPEC int
+UPNP_GetIGDFromUrl(const char * rootdescurl,
+                   struct UPNPUrls * urls,
+                   struct IGDdatas * data,
+                   char * lanaddr, int lanaddrlen);
+
+LIBSPEC void
+GetUPNPUrls(struct UPNPUrls *, struct IGDdatas *,
+            const char *, unsigned int);
+
+LIBSPEC void
+FreeUPNPUrls(struct UPNPUrls *);
+
+/* return 0 or 1 */
+LIBSPEC int UPNPIGD_IsConnected(struct UPNPUrls *, struct IGDdatas *);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/Externals/miniupnpc/src/miniupnpcmodule.c b/Externals/miniupnpc/src/miniupnpcmodule.c
new file mode 100644
index 0000000000..f3d27d6e59
--- /dev/null
+++ b/Externals/miniupnpc/src/miniupnpcmodule.c
@@ -0,0 +1,544 @@
+/* $Id: miniupnpcmodule.c,v 1.21 2012/08/29 07:51:30 nanard Exp $*/
+/* Project : miniupnp
+ * Author : Thomas BERNARD
+ * website : http://miniupnp.tuxfamily.org/
+ * copyright (c) 2007-2012 Thomas Bernard
+ * This software is subjet to the conditions detailed in the
+ * provided LICENCE file. */
+#include <Python.h>
+#define STATICLIB
+#include "structmember.h"
+#include "miniupnpc.h"
+#include "upnpcommands.h"
+#include "upnperrors.h"
+
+/* for compatibility with Python < 2.4 */
+#ifndef Py_RETURN_NONE
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
+#endif
+
+#ifndef Py_RETURN_TRUE
+#define Py_RETURN_TRUE return Py_INCREF(Py_True), Py_True
+#endif
+
+#ifndef Py_RETURN_FALSE
+#define Py_RETURN_FALSE return Py_INCREF(Py_False), Py_False
+#endif
+
+/* for compatibility with Python < 3.0 */
+#ifndef PyVarObject_HEAD_INIT
+#define PyVarObject_HEAD_INIT(type, size) \
+    PyObject_HEAD_INIT(type) size,
+#endif
+
+#ifndef Py_TYPE
+#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
+#endif
+
+typedef struct {
+    PyObject_HEAD
+    /* Type-specific fields go here. */
+	struct UPNPDev * devlist;
+	struct UPNPUrls urls;
+	struct IGDdatas data;
+	unsigned int discoverdelay;	/* value passed to upnpDiscover() */
+	char lanaddr[40];	/* our ip address on the LAN */
+	char * multicastif;
+	char * minissdpdsocket;
+} UPnPObject;
+
+static PyMemberDef UPnP_members[] = {
+	{"lanaddr", T_STRING_INPLACE, offsetof(UPnPObject, lanaddr),
+	 READONLY, "ip address on the LAN"
+	},
+	{"discoverdelay", T_UINT, offsetof(UPnPObject, discoverdelay),
+	 0/*READWRITE*/, "value in ms used to wait for SSDP responses"
+	},
+	/* T_STRING is allways readonly :( */
+	{"multicastif", T_STRING, offsetof(UPnPObject, multicastif),
+	 0, "IP of the network interface to be used for multicast operations"
+	},
+	{"minissdpdsocket", T_STRING, offsetof(UPnPObject, multicastif),
+	 0, "path of the MiniSSDPd unix socket"
+	},
+	{NULL}
+};
+
+static void
+UPnPObject_dealloc(UPnPObject *self)
+{
+	freeUPNPDevlist(self->devlist);
+	FreeUPNPUrls(&self->urls);
+	Py_TYPE(self)->tp_free((PyObject*)self);
+}
+
+static PyObject *
+UPnP_discover(UPnPObject *self)
+{
+	struct UPNPDev * dev;
+	int i;
+	PyObject *res = NULL;
+	if(self->devlist)
+	{
+		freeUPNPDevlist(self->devlist);
+		self->devlist = 0;
+	}
+	Py_BEGIN_ALLOW_THREADS
+	self->devlist = upnpDiscover((int)self->discoverdelay/*timeout in ms*/,
+	                             0/* multicast if*/,
+	                             0/*minissdpd socket*/,
+								 0/*sameport flag*/,
+	                             0/*ip v6*/,
+	                             0/*error */);
+	Py_END_ALLOW_THREADS
+	/* Py_RETURN_NONE ??? */
+	for(dev = self->devlist, i = 0; dev; dev = dev->pNext)
+		i++;
+	res = Py_BuildValue("i", i);
+	return res;
+}
+
+static PyObject *
+UPnP_selectigd(UPnPObject *self)
+{
+	int r;
+Py_BEGIN_ALLOW_THREADS
+	r = UPNP_GetValidIGD(self->devlist, &self->urls, &self->data,
+	                     self->lanaddr, sizeof(self->lanaddr));
+Py_END_ALLOW_THREADS
+	if(r)
+	{
+		return Py_BuildValue("s", self->urls.controlURL);
+	}
+	else
+	{
+		/* TODO: have our own exception type ! */
+		PyErr_SetString(PyExc_Exception, "No UPnP device discovered");
+		return NULL;
+	}
+}
+
+static PyObject *
+UPnP_totalbytesent(UPnPObject *self)
+{
+	UNSIGNED_INTEGER i;
+Py_BEGIN_ALLOW_THREADS
+	i = UPNP_GetTotalBytesSent(self->urls.controlURL_CIF,
+	                           self->data.CIF.servicetype);
+Py_END_ALLOW_THREADS
+	return Py_BuildValue("I", i);
+}
+
+static PyObject *
+UPnP_totalbytereceived(UPnPObject *self)
+{
+	UNSIGNED_INTEGER i;
+Py_BEGIN_ALLOW_THREADS
+	i = UPNP_GetTotalBytesReceived(self->urls.controlURL_CIF,
+		                           self->data.CIF.servicetype);
+Py_END_ALLOW_THREADS
+	return Py_BuildValue("I", i);
+}
+
+static PyObject *
+UPnP_totalpacketsent(UPnPObject *self)
+{
+	UNSIGNED_INTEGER i;
+Py_BEGIN_ALLOW_THREADS
+	i = UPNP_GetTotalPacketsSent(self->urls.controlURL_CIF,
+		                         self->data.CIF.servicetype);
+Py_END_ALLOW_THREADS
+	return Py_BuildValue("I", i);
+}
+
+static PyObject *
+UPnP_totalpacketreceived(UPnPObject *self)
+{
+	UNSIGNED_INTEGER i;
+Py_BEGIN_ALLOW_THREADS
+	i = UPNP_GetTotalPacketsReceived(self->urls.controlURL_CIF,
+		                          self->data.CIF.servicetype);
+Py_END_ALLOW_THREADS
+	return Py_BuildValue("I", i);
+}
+
+static PyObject *
+UPnP_statusinfo(UPnPObject *self)
+{
+	char status[64];
+	char lastconnerror[64];
+	unsigned int uptime = 0;
+	int r;
+	status[0] = '\0';
+	lastconnerror[0] = '\0';
+Py_BEGIN_ALLOW_THREADS
+	r = UPNP_GetStatusInfo(self->urls.controlURL, self->data.first.servicetype,
+	                   status, &uptime, lastconnerror);
+Py_END_ALLOW_THREADS
+	if(r==UPNPCOMMAND_SUCCESS) {
+		return Py_BuildValue("(s,I,s)", status, uptime, lastconnerror);
+	} else {
+		/* TODO: have our own exception type ! */
+		PyErr_SetString(PyExc_Exception, strupnperror(r));
+		return NULL;
+	}
+}
+
+static PyObject *
+UPnP_connectiontype(UPnPObject *self)
+{
+	char connectionType[64];
+	int r;
+	connectionType[0] = '\0';
+Py_BEGIN_ALLOW_THREADS
+	r = UPNP_GetConnectionTypeInfo(self->urls.controlURL,
+	                               self->data.first.servicetype,
+	                               connectionType);
+Py_END_ALLOW_THREADS
+	if(r==UPNPCOMMAND_SUCCESS) {
+		return Py_BuildValue("s", connectionType);
+	} else {
+		/* TODO: have our own exception type ! */
+		PyErr_SetString(PyExc_Exception, strupnperror(r));
+		return NULL;
+	}
+}
+
+static PyObject *
+UPnP_externalipaddress(UPnPObject *self)
+{
+	char externalIPAddress[40];
+	int r;
+	externalIPAddress[0] = '\0';
+Py_BEGIN_ALLOW_THREADS
+	r = UPNP_GetExternalIPAddress(self->urls.controlURL,
+	                              self->data.first.servicetype,
+	                              externalIPAddress);
+Py_END_ALLOW_THREADS
+	if(r==UPNPCOMMAND_SUCCESS) {
+		return Py_BuildValue("s", externalIPAddress);
+	} else {
+		/* TODO: have our own exception type ! */
+		PyErr_SetString(PyExc_Exception, strupnperror(r));
+		return NULL;
+	}
+}
+
+/* AddPortMapping(externalPort, protocol, internalHost, internalPort, desc,
+ *                remoteHost)
+ * protocol is 'UDP' or 'TCP' */
+static PyObject *
+UPnP_addportmapping(UPnPObject *self, PyObject *args)
+{
+	char extPort[6];
+	unsigned short ePort;
+	char inPort[6];
+	unsigned short iPort;
+	const char * proto;
+	const char * host;
+	const char * desc;
+	const char * remoteHost;
+	const char * leaseDuration = "0";
+	int r;
+	if (!PyArg_ParseTuple(args, "HssHss", &ePort, &proto,
+	                                     &host, &iPort, &desc, &remoteHost))
+        return NULL;
+Py_BEGIN_ALLOW_THREADS
+	sprintf(extPort, "%hu", ePort);
+	sprintf(inPort, "%hu", iPort);
+	r = UPNP_AddPortMapping(self->urls.controlURL, self->data.first.servicetype,
+	                        extPort, inPort, host, desc, proto,
+	                        remoteHost, leaseDuration);
+Py_END_ALLOW_THREADS
+	if(r==UPNPCOMMAND_SUCCESS)
+	{
+		Py_RETURN_TRUE;
+	}
+	else
+	{
+		// TODO: RAISE an Exception. See upnpcommands.h for errors codes.
+		// upnperrors.c
+		//Py_RETURN_FALSE;
+		/* TODO: have our own exception type ! */
+		PyErr_SetString(PyExc_Exception, strupnperror(r));
+		return NULL;
+	}
+}
+
+/* DeletePortMapping(extPort, proto, removeHost='')
+ * proto = 'UDP', 'TCP' */
+static PyObject *
+UPnP_deleteportmapping(UPnPObject *self, PyObject *args)
+{
+	char extPort[6];
+	unsigned short ePort;
+	const char * proto;
+	const char * remoteHost = "";
+	int r;
+	if(!PyArg_ParseTuple(args, "Hs|z", &ePort, &proto, &remoteHost))
+		return NULL;
+Py_BEGIN_ALLOW_THREADS
+	sprintf(extPort, "%hu", ePort);
+	r = UPNP_DeletePortMapping(self->urls.controlURL, self->data.first.servicetype,
+	                           extPort, proto, remoteHost);
+Py_END_ALLOW_THREADS
+	if(r==UPNPCOMMAND_SUCCESS) {
+		Py_RETURN_TRUE;
+	} else {
+		/* TODO: have our own exception type ! */
+		PyErr_SetString(PyExc_Exception, strupnperror(r));
+		return NULL;
+	}
+}
+
+static PyObject *
+UPnP_getportmappingnumberofentries(UPnPObject *self)
+{
+	unsigned int n = 0;
+	int r;
+Py_BEGIN_ALLOW_THREADS
+	r = UPNP_GetPortMappingNumberOfEntries(self->urls.controlURL,
+	                                   self->data.first.servicetype,
+									   &n);
+Py_END_ALLOW_THREADS
+	if(r==UPNPCOMMAND_SUCCESS) {
+		return Py_BuildValue("I", n);
+	} else {
+		/* TODO: have our own exception type ! */
+		PyErr_SetString(PyExc_Exception, strupnperror(r));
+		return NULL;
+	}
+}
+
+/* GetSpecificPortMapping(ePort, proto)
+ * proto = 'UDP' or 'TCP' */
+static PyObject *
+UPnP_getspecificportmapping(UPnPObject *self, PyObject *args)
+{
+	char extPort[6];
+	unsigned short ePort;
+	const char * proto;
+	char intClient[40];
+	char intPort[6];
+	unsigned short iPort;
+	char desc[80];
+	char enabled[4];
+	char leaseDuration[16];
+	if(!PyArg_ParseTuple(args, "Hs", &ePort, &proto))
+		return NULL;
+	extPort[0] = '\0'; intClient[0] = '\0'; intPort[0] = '\0';
+	desc[0] = '\0'; enabled[0] = '\0'; leaseDuration[0] = '\0';
+Py_BEGIN_ALLOW_THREADS
+	sprintf(extPort, "%hu", ePort);
+	UPNP_GetSpecificPortMappingEntry(self->urls.controlURL,
+	                                 self->data.first.servicetype,
+									 extPort, proto,
+									 intClient, intPort,
+	                                 desc, enabled, leaseDuration);
+Py_END_ALLOW_THREADS
+	if(intClient[0])
+	{
+		iPort = (unsigned short)atoi(intPort);
+		return Py_BuildValue("(s,H,s,O,i)",
+		                     intClient, iPort, desc,
+		                     PyBool_FromLong(atoi(enabled)),
+		                     atoi(leaseDuration));
+	}
+	else
+	{
+		Py_RETURN_NONE;
+	}
+}
+
+/* GetGenericPortMapping(index) */
+static PyObject *
+UPnP_getgenericportmapping(UPnPObject *self, PyObject *args)
+{
+	int i, r;
+	char index[8];
+	char intClient[40];
+	char intPort[6];
+	unsigned short iPort;
+	char extPort[6];
+	unsigned short ePort;
+	char protocol[4];
+	char desc[80];
+	char enabled[6];
+	char rHost[64];
+	char duration[16];	/* lease duration */
+	unsigned int dur;
+	if(!PyArg_ParseTuple(args, "i", &i))
+		return NULL;
+Py_BEGIN_ALLOW_THREADS
+	snprintf(index, sizeof(index), "%d", i);
+	rHost[0] = '\0'; enabled[0] = '\0';
+	duration[0] = '\0'; desc[0] = '\0';
+	extPort[0] = '\0'; intPort[0] = '\0'; intClient[0] = '\0';
+	r = UPNP_GetGenericPortMappingEntry(self->urls.controlURL,
+	                                    self->data.first.servicetype,
+										index,
+										extPort, intClient, intPort,
+										protocol, desc, enabled, rHost,
+										duration);
+Py_END_ALLOW_THREADS
+	if(r==UPNPCOMMAND_SUCCESS)
+	{
+		ePort = (unsigned short)atoi(extPort);
+		iPort = (unsigned short)atoi(intPort);
+		dur = (unsigned int)strtoul(duration, 0, 0);
+		return Py_BuildValue("(H,s,(s,H),s,s,s,I)",
+		                     ePort, protocol, intClient, iPort,
+		                     desc, enabled, rHost, dur);
+	}
+	else
+	{
+		Py_RETURN_NONE;
+	}
+}
+
+/* miniupnpc.UPnP object Method Table */
+static PyMethodDef UPnP_methods[] = {
+    {"discover", (PyCFunction)UPnP_discover, METH_NOARGS,
+     "discover UPnP IGD devices on the network"
+    },
+	{"selectigd", (PyCFunction)UPnP_selectigd, METH_NOARGS,
+	 "select a valid UPnP IGD among discovered devices"
+	},
+	{"totalbytesent", (PyCFunction)UPnP_totalbytesent, METH_NOARGS,
+	 "return the total number of bytes sent by UPnP IGD"
+	},
+	{"totalbytereceived", (PyCFunction)UPnP_totalbytereceived, METH_NOARGS,
+	 "return the total number of bytes received by UPnP IGD"
+	},
+	{"totalpacketsent", (PyCFunction)UPnP_totalpacketsent, METH_NOARGS,
+	 "return the total number of packets sent by UPnP IGD"
+	},
+	{"totalpacketreceived", (PyCFunction)UPnP_totalpacketreceived, METH_NOARGS,
+	 "return the total number of packets received by UPnP IGD"
+	},
+	{"statusinfo", (PyCFunction)UPnP_statusinfo, METH_NOARGS,
+	 "return status and uptime"
+	},
+	{"connectiontype", (PyCFunction)UPnP_connectiontype, METH_NOARGS,
+	 "return IGD WAN connection type"
+	},
+	{"externalipaddress", (PyCFunction)UPnP_externalipaddress, METH_NOARGS,
+	 "return external IP address"
+	},
+	{"addportmapping", (PyCFunction)UPnP_addportmapping, METH_VARARGS,
+	 "add a port mapping"
+	},
+	{"deleteportmapping", (PyCFunction)UPnP_deleteportmapping, METH_VARARGS,
+	 "delete a port mapping"
+	},
+	{"getportmappingnumberofentries", (PyCFunction)UPnP_getportmappingnumberofentries, METH_NOARGS,
+	 "-- non standard --"
+	},
+	{"getspecificportmapping", (PyCFunction)UPnP_getspecificportmapping, METH_VARARGS,
+	 "get details about a specific port mapping entry"
+	},
+	{"getgenericportmapping", (PyCFunction)UPnP_getgenericportmapping, METH_VARARGS,
+	 "get all details about the port mapping at index"
+	},
+    {NULL}  /* Sentinel */
+};
+
+static PyTypeObject UPnPType = {
+    PyVarObject_HEAD_INIT(NULL,
+    0)                         /*ob_size*/
+    "miniupnpc.UPnP",          /*tp_name*/
+    sizeof(UPnPObject),        /*tp_basicsize*/
+    0,                         /*tp_itemsize*/
+    (destructor)UPnPObject_dealloc,/*tp_dealloc*/
+    0,                         /*tp_print*/
+    0,                         /*tp_getattr*/
+    0,                         /*tp_setattr*/
+    0,                         /*tp_compare*/
+    0,                         /*tp_repr*/
+    0,                         /*tp_as_number*/
+    0,                         /*tp_as_sequence*/
+    0,                         /*tp_as_mapping*/
+    0,                         /*tp_hash */
+    0,                         /*tp_call*/
+    0,                         /*tp_str*/
+    0,                         /*tp_getattro*/
+    0,                         /*tp_setattro*/
+    0,                         /*tp_as_buffer*/
+    Py_TPFLAGS_DEFAULT,        /*tp_flags*/
+    "UPnP objects",            /* tp_doc */
+    0,		                   /* tp_traverse */
+    0,		                   /* tp_clear */
+    0,		                   /* tp_richcompare */
+    0,		                   /* tp_weaklistoffset */
+    0,		                   /* tp_iter */
+    0,		                   /* tp_iternext */
+    UPnP_methods,              /* tp_methods */
+    UPnP_members,              /* tp_members */
+    0,                         /* tp_getset */
+    0,                         /* tp_base */
+    0,                         /* tp_dict */
+    0,                         /* tp_descr_get */
+    0,                         /* tp_descr_set */
+    0,                         /* tp_dictoffset */
+    0,/*(initproc)UPnP_init,*/      /* tp_init */
+    0,                         /* tp_alloc */
+#ifndef _WIN32
+    PyType_GenericNew,/*UPnP_new,*/      /* tp_new */
+#else
+    0,
+#endif
+};
+
+/* module methods */
+static PyMethodDef miniupnpc_methods[] = {
+    {NULL}  /* Sentinel */
+};
+
+#if PY_MAJOR_VERSION >= 3
+static struct PyModuleDef moduledef = {
+    PyModuleDef_HEAD_INIT,
+    "miniupnpc",     /* m_name */
+    "miniupnpc module.",  /* m_doc */
+    -1,                  /* m_size */
+    miniupnpc_methods,    /* m_methods */
+    NULL,                /* m_reload */
+    NULL,                /* m_traverse */
+    NULL,                /* m_clear */
+    NULL,                /* m_free */
+};
+#endif
+
+#ifndef PyMODINIT_FUNC	/* declarations for DLL import/export */
+#define PyMODINIT_FUNC void
+#endif
+
+PyMODINIT_FUNC
+#if PY_MAJOR_VERSION >= 3
+PyInit_miniupnpc(void)
+#else
+initminiupnpc(void)
+#endif
+{
+    PyObject* m;
+
+#ifdef _WIN32
+    UPnPType.tp_new = PyType_GenericNew;
+#endif
+    if (PyType_Ready(&UPnPType) < 0)
+        return;
+
+#if PY_MAJOR_VERSION >= 3
+    m = PyModule_Create(&moduledef);
+#else
+    m = Py_InitModule3("miniupnpc", miniupnpc_methods,
+                       "miniupnpc module.");
+#endif
+
+    Py_INCREF(&UPnPType);
+    PyModule_AddObject(m, "UPnP", (PyObject *)&UPnPType);
+    
+#if PY_MAJOR_VERSION >= 3
+    return m;
+#endif
+}
+
diff --git a/Externals/miniupnpc/src/miniupnpcstrings.h b/Externals/miniupnpc/src/miniupnpcstrings.h
new file mode 100644
index 0000000000..426ecc2d33
--- /dev/null
+++ b/Externals/miniupnpc/src/miniupnpcstrings.h
@@ -0,0 +1,27 @@
+/* $Id: miniupnpcstrings.h.in,v 1.5 2012/10/16 16:48:26 nanard Exp $ */
+/* Project: miniupnp
+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * Author: Thomas Bernard
+ * Copyright (c) 2005-2011 Thomas Bernard
+ * This software is subjects to the conditions detailed
+ * in the LICENCE file provided within this distribution */
+#ifndef MINIUPNPCSTRINGS_H_INCLUDED
+#define MINIUPNPCSTRINGS_H_INCLUDED
+
+#if   defined(_WIN32)
+#define OS_STRING "Windows"
+#elif defined(__linux__)
+#define OS_STRING "Linux"
+#elif defined(__OSX__)
+#define OS_STRING "Mac OS X"
+#elif defined(__APPLE__)
+#define OS_STRING "Mac OS X"
+#elif defined(__DARWIN__)
+#define OS_STRING "Darwin"
+#else
+#define OS_STRING "Generic"
+#endif
+#define MINIUPNPC_VERSION_STRING "1.7"
+
+#endif
+
diff --git a/Externals/miniupnpc/src/miniupnpctypes.h b/Externals/miniupnpc/src/miniupnpctypes.h
new file mode 100644
index 0000000000..591c32fb60
--- /dev/null
+++ b/Externals/miniupnpc/src/miniupnpctypes.h
@@ -0,0 +1,19 @@
+/* $Id: miniupnpctypes.h,v 1.2 2012/09/27 15:42:10 nanard Exp $ */
+/* Miniupnp project : http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org
+ * Author : Thomas Bernard
+ * Copyright (c) 2011 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided within this distribution */
+#ifndef MINIUPNPCTYPES_H_INCLUDED
+#define MINIUPNPCTYPES_H_INCLUDED
+
+#if (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
+#define UNSIGNED_INTEGER unsigned long long
+#define STRTOUI	strtoull
+#else
+#define UNSIGNED_INTEGER unsigned int
+#define STRTOUI	strtoul
+#endif
+
+#endif
+
diff --git a/Externals/miniupnpc/src/miniwget.c b/Externals/miniupnpc/src/miniwget.c
new file mode 100644
index 0000000000..31f3af070e
--- /dev/null
+++ b/Externals/miniupnpc/src/miniwget.c
@@ -0,0 +1,574 @@
+/* $Id: miniwget.c,v 1.58 2012/08/11 05:52:49 nanard Exp $ */
+/* Project : miniupnp
+ * Website : http://miniupnp.free.fr/
+ * Author : Thomas Bernard
+ * Copyright (c) 2005-2012 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution. */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <io.h>
+#define MAXHOSTNAMELEN 64
+#define MIN(x,y) (((x)<(y))?(x):(y))
+#define snprintf _snprintf
+#define socklen_t int
+#ifndef strncasecmp
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#define strncasecmp _memicmp
+#else /* defined(_MSC_VER) && (_MSC_VER >= 1400) */
+#define strncasecmp memicmp
+#endif /* defined(_MSC_VER) && (_MSC_VER >= 1400) */
+#endif /* #ifndef strncasecmp */
+#else /* #ifdef _WIN32 */
+#include <unistd.h>
+#include <sys/param.h>
+#if defined(__amigaos__) && !defined(__amigaos4__)
+#define socklen_t int
+#else /* #if defined(__amigaos__) && !defined(__amigaos4__) */
+#include <sys/select.h>
+#endif /* #else defined(__amigaos__) && !defined(__amigaos4__) */
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <netdb.h>
+#define closesocket close
+/* defining MINIUPNPC_IGNORE_EINTR enable the ignore of interruptions
+ * during the connect() call */
+#define MINIUPNPC_IGNORE_EINTR
+#endif /* #else _WIN32 */
+#if defined(__sun) || defined(sun)
+#define MIN(x,y) (((x)<(y))?(x):(y))
+#endif
+
+#include "miniupnpcstrings.h"
+#include "miniwget.h"
+#include "connecthostport.h"
+#include "receivedata.h"
+
+/*
+ * Read a HTTP response from a socket.
+ * Process Content-Length and Transfer-encoding headers.
+ * return a pointer to the content buffer, which length is saved
+ * to the length parameter.
+ */
+void *
+getHTTPResponse(int s, int * size)
+{
+	char buf[2048];
+	int n;
+	int endofheaders = 0;
+	int chunked = 0;
+	int content_length = -1;
+	unsigned int chunksize = 0;
+	unsigned int bytestocopy = 0;
+	/* buffers : */
+	char * header_buf;
+	unsigned int header_buf_len = 2048;
+	unsigned int header_buf_used = 0;
+	char * content_buf;
+	unsigned int content_buf_len = 2048;
+	unsigned int content_buf_used = 0;
+	char chunksize_buf[32];
+	unsigned int chunksize_buf_index;
+
+	header_buf = malloc(header_buf_len);
+	content_buf = malloc(content_buf_len);
+	chunksize_buf[0] = '\0';
+	chunksize_buf_index = 0;
+
+	while((n = receivedata(s, buf, 2048, 5000, NULL)) > 0)
+	{
+		if(endofheaders == 0)
+		{
+			int i;
+			int linestart=0;
+			int colon=0;
+			int valuestart=0;
+			if(header_buf_used + n > header_buf_len) {
+				header_buf = realloc(header_buf, header_buf_used + n);
+				header_buf_len = header_buf_used + n;
+			}
+			memcpy(header_buf + header_buf_used, buf, n);
+			header_buf_used += n;
+			/* search for CR LF CR LF (end of headers)
+			 * recognize also LF LF */
+			i = 0;
+			while(i < ((int)header_buf_used-1) && (endofheaders == 0)) {
+				if(header_buf[i] == '\r') {
+					i++;
+					if(header_buf[i] == '\n') {
+						i++;
+						if(i < (int)header_buf_used && header_buf[i] == '\r') {
+							i++;
+							if(i < (int)header_buf_used && header_buf[i] == '\n') {
+								endofheaders = i+1;
+							}
+						}
+					}
+				} else if(header_buf[i] == '\n') {
+					i++;
+					if(header_buf[i] == '\n') {
+						endofheaders = i+1;
+					}
+				}
+				i++;
+			}
+			if(endofheaders == 0)
+				continue;
+			/* parse header lines */
+			for(i = 0; i < endofheaders - 1; i++) {
+				if(colon <= linestart && header_buf[i]==':')
+				{
+					colon = i;
+					while(i < (endofheaders-1)
+					      && (header_buf[i+1] == ' ' || header_buf[i+1] == '\t'))
+						i++;
+					valuestart = i + 1;
+				}
+				/* detecting end of line */
+				else if(header_buf[i]=='\r' || header_buf[i]=='\n')
+				{
+					if(colon > linestart && valuestart > colon)
+					{
+#ifdef DEBUG
+						printf("header='%.*s', value='%.*s'\n",
+						       colon-linestart, header_buf+linestart,
+						       i-valuestart, header_buf+valuestart);
+#endif
+						if(0==strncasecmp(header_buf+linestart, "content-length", colon-linestart))
+						{
+							content_length = atoi(header_buf+valuestart);
+#ifdef DEBUG
+							printf("Content-Length: %d\n", content_length);
+#endif
+						}
+						else if(0==strncasecmp(header_buf+linestart, "transfer-encoding", colon-linestart)
+						   && 0==strncasecmp(header_buf+valuestart, "chunked", 7))
+						{
+#ifdef DEBUG
+							printf("chunked transfer-encoding!\n");
+#endif
+							chunked = 1;
+						}
+					}
+					while(header_buf[i]=='\r' || header_buf[i] == '\n')
+						i++;
+					linestart = i;
+					colon = linestart;
+					valuestart = 0;
+				}
+			}
+			/* copy the remaining of the received data back to buf */
+			n = header_buf_used - endofheaders;
+			memcpy(buf, header_buf + endofheaders, n);
+			/* if(headers) */
+		}
+		if(endofheaders)
+		{
+			/* content */
+			if(chunked)
+			{
+				int i = 0;
+				while(i < n)
+				{
+					if(chunksize == 0)
+					{
+						/* reading chunk size */
+						if(chunksize_buf_index == 0) {
+							/* skipping any leading CR LF */
+							if(i<n && buf[i] == '\r') i++;
+							if(i<n && buf[i] == '\n') i++;
+						}
+						while(i<n && isxdigit(buf[i])
+						     && chunksize_buf_index < (sizeof(chunksize_buf)-1))
+						{
+							chunksize_buf[chunksize_buf_index++] = buf[i];
+							chunksize_buf[chunksize_buf_index] = '\0';
+							i++;
+						}
+						while(i<n && buf[i] != '\r' && buf[i] != '\n')
+							i++; /* discarding chunk-extension */
+						if(i<n && buf[i] == '\r') i++;
+						if(i<n && buf[i] == '\n') {
+							unsigned int j;
+							for(j = 0; j < chunksize_buf_index; j++) {
+							if(chunksize_buf[j] >= '0'
+							   && chunksize_buf[j] <= '9')
+								chunksize = (chunksize << 4) + (chunksize_buf[j] - '0');
+							else
+								chunksize = (chunksize << 4) + ((chunksize_buf[j] | 32) - 'a' + 10);
+							}
+							chunksize_buf[0] = '\0';
+							chunksize_buf_index = 0;
+							i++;
+						} else {
+							/* not finished to get chunksize */
+							continue;
+						}
+#ifdef DEBUG
+						printf("chunksize = %u (%x)\n", chunksize, chunksize);
+#endif
+						if(chunksize == 0)
+						{
+#ifdef DEBUG
+							printf("end of HTTP content - %d %d\n", i, n);
+							/*printf("'%.*s'\n", n-i, buf+i);*/
+#endif
+							goto end_of_stream;
+						}
+					}
+					bytestocopy = ((int)chunksize < (n - i))?chunksize:(unsigned int)(n - i);
+					if((content_buf_used + bytestocopy) > content_buf_len)
+					{
+						if(content_length >= (int)(content_buf_used + bytestocopy)) {
+							content_buf_len = content_length;
+						} else {
+							content_buf_len = content_buf_used + bytestocopy;
+						}
+						content_buf = (char *)realloc((void *)content_buf,
+						                              content_buf_len);
+					}
+					memcpy(content_buf + content_buf_used, buf + i, bytestocopy);
+					content_buf_used += bytestocopy;
+					i += bytestocopy;
+					chunksize -= bytestocopy;
+				}
+			}
+			else
+			{
+				/* not chunked */
+				if(content_length > 0
+				   && (int)(content_buf_used + n) > content_length) {
+					/* skipping additional bytes */
+					n = content_length - content_buf_used;
+				}
+				if(content_buf_used + n > content_buf_len)
+				{
+					if(content_length >= (int)(content_buf_used + n)) {
+						content_buf_len = content_length;
+					} else {
+						content_buf_len = content_buf_used + n;
+					}
+					content_buf = (char *)realloc((void *)content_buf,
+					                              content_buf_len);
+				}
+				memcpy(content_buf + content_buf_used, buf, n);
+				content_buf_used += n;
+			}
+		}
+		/* use the Content-Length header value if available */
+		if(content_length > 0 && (int)content_buf_used >= content_length)
+		{
+#ifdef DEBUG
+			printf("End of HTTP content\n");
+#endif
+			break;
+		}
+	}
+end_of_stream:
+	free(header_buf); header_buf = NULL;
+	*size = content_buf_used;
+	if(content_buf_used == 0)
+	{
+		free(content_buf);
+		content_buf = NULL;
+	}
+	return content_buf;
+}
+
+/* miniwget3() :
+ * do all the work.
+ * Return NULL if something failed. */
+static void *
+miniwget3(const char * host,
+          unsigned short port, const char * path,
+          int * size, char * addr_str, int addr_str_len,
+          const char * httpversion, unsigned int scope_id)
+{
+	char buf[2048];
+    int s;
+	int n;
+	int len;
+	int sent;
+	void * content;
+
+	*size = 0;
+	s = connecthostport(host, port, scope_id);
+	if(s < 0)
+		return NULL;
+
+	/* get address for caller ! */
+	if(addr_str)
+	{
+		struct sockaddr_storage saddr;
+		socklen_t saddrlen;
+
+		saddrlen = sizeof(saddr);
+		if(getsockname(s, (struct sockaddr *)&saddr, &saddrlen) < 0)
+		{
+			perror("getsockname");
+		}
+		else
+		{
+#if defined(__amigaos__) && !defined(__amigaos4__)
+	/* using INT WINAPI WSAAddressToStringA(LPSOCKADDR, DWORD, LPWSAPROTOCOL_INFOA, LPSTR, LPDWORD);
+     * But his function make a string with the port :  nn.nn.nn.nn:port */
+/*		if(WSAAddressToStringA((SOCKADDR *)&saddr, sizeof(saddr),
+                            NULL, addr_str, (DWORD *)&addr_str_len))
+		{
+		    printf("WSAAddressToStringA() failed : %d\n", WSAGetLastError());
+		}*/
+			/* the following code is only compatible with ip v4 addresses */
+			strncpy(addr_str, inet_ntoa(((struct sockaddr_in *)&saddr)->sin_addr), addr_str_len);
+#else
+#if 0
+			if(saddr.sa_family == AF_INET6) {
+				inet_ntop(AF_INET6,
+				          &(((struct sockaddr_in6 *)&saddr)->sin6_addr),
+				          addr_str, addr_str_len);
+			} else {
+				inet_ntop(AF_INET,
+				          &(((struct sockaddr_in *)&saddr)->sin_addr),
+				          addr_str, addr_str_len);
+			}
+#endif
+			/* getnameinfo return ip v6 address with the scope identifier
+			 * such as : 2a01:e35:8b2b:7330::%4281128194 */
+			n = getnameinfo((const struct sockaddr *)&saddr, saddrlen,
+			                addr_str, addr_str_len,
+			                NULL, 0,
+			                NI_NUMERICHOST | NI_NUMERICSERV);
+			if(n != 0) {
+#ifdef _WIN32
+				fprintf(stderr, "getnameinfo() failed : %d\n", n);
+#else
+				fprintf(stderr, "getnameinfo() failed : %s\n", gai_strerror(n));
+#endif
+			}
+#endif
+		}
+#ifdef DEBUG
+		printf("address miniwget : %s\n", addr_str);
+#endif
+	}
+
+	len = snprintf(buf, sizeof(buf),
+                 "GET %s HTTP/%s\r\n"
+			     "Host: %s:%d\r\n"
+				 "Connection: Close\r\n"
+				 "User-Agent: " OS_STRING ", UPnP/1.0, MiniUPnPc/" MINIUPNPC_VERSION_STRING "\r\n"
+
+				 "\r\n",
+			   path, httpversion, host, port);
+	sent = 0;
+	/* sending the HTTP request */
+	while(sent < len)
+	{
+		n = send(s, buf+sent, len-sent, 0);
+		if(n < 0)
+		{
+			perror("send");
+			closesocket(s);
+			return NULL;
+		}
+		else
+		{
+			sent += n;
+		}
+	}
+	content = getHTTPResponse(s, size);
+	closesocket(s);
+	return content;
+}
+
+/* miniwget2() :
+ * Call miniwget3(); retry with HTTP/1.1 if 1.0 fails. */
+static void *
+miniwget2(const char * host,
+		  unsigned short port, const char * path,
+		  int * size, char * addr_str, int addr_str_len,
+          unsigned int scope_id)
+{
+	char * respbuffer;
+
+#if 1
+	respbuffer = miniwget3(host, port, path, size,
+	                       addr_str, addr_str_len, "1.1", scope_id);
+#else
+	respbuffer = miniwget3(host, port, path, size,
+	                       addr_str, addr_str_len, "1.0", scope_id);
+	if (*size == 0)
+	{
+#ifdef DEBUG
+		printf("Retrying with HTTP/1.1\n");
+#endif
+		free(respbuffer);
+		respbuffer = miniwget3(host, port, path, size,
+		                       addr_str, addr_str_len, "1.1", scope_id);
+	}
+#endif
+	return respbuffer;
+}
+
+
+
+
+/* parseURL()
+ * arguments :
+ *   url :		source string not modified
+ *   hostname :	hostname destination string (size of MAXHOSTNAMELEN+1)
+ *   port :		port (destination)
+ *   path :		pointer to the path part of the URL
+ *
+ * Return values :
+ *    0 - Failure
+ *    1 - Success         */
+int
+parseURL(const char * url,
+         char * hostname, unsigned short * port,
+         char * * path, unsigned int * scope_id)
+{
+	char * p1, *p2, *p3;
+	if(!url)
+		return 0;
+	p1 = strstr(url, "://");
+	if(!p1)
+		return 0;
+	p1 += 3;
+	if(  (url[0]!='h') || (url[1]!='t')
+	   ||(url[2]!='t') || (url[3]!='p'))
+		return 0;
+	memset(hostname, 0, MAXHOSTNAMELEN + 1);
+	if(*p1 == '[')
+	{
+		/* IP v6 : http://[2a00:1450:8002::6a]/path/abc */
+		char * scope;
+		scope = strchr(p1, '%');
+		p2 = strchr(p1, ']');
+		if(p2 && scope && scope < p2 && scope_id) {
+			/* parse scope */
+#ifdef IF_NAMESIZE
+			char tmp[IF_NAMESIZE];
+			int l;
+			scope++;
+			/* "%25" is just '%' in URL encoding */
+			if(scope[0] == '2' && scope[1] == '5')
+				scope += 2;	/* skip "25" */
+			l = p2 - scope;
+			if(l >= IF_NAMESIZE)
+				l = IF_NAMESIZE - 1;
+			memcpy(tmp, scope, l);
+			tmp[l] = '\0';
+			*scope_id = if_nametoindex(tmp);
+			if(*scope_id == 0) {
+				*scope_id = (unsigned int)strtoul(tmp, NULL, 10);
+			}
+#else
+			/* under windows, scope is numerical */
+			char tmp[8];
+			int l;
+			scope++;
+			/* "%25" is just '%' in URL encoding */
+			if(scope[0] == '2' && scope[1] == '5')
+				scope += 2;	/* skip "25" */
+			l = p2 - scope;
+			if(l >= sizeof(tmp))
+				l = sizeof(tmp) - 1;
+			memcpy(tmp, scope, l);
+			tmp[l] = '\0';
+			*scope_id = (unsigned int)strtoul(tmp, NULL, 10);
+#endif
+		}
+		p3 = strchr(p1, '/');
+		if(p2 && p3)
+		{
+			p2++;
+			strncpy(hostname, p1, MIN(MAXHOSTNAMELEN, (int)(p2-p1)));
+			if(*p2 == ':')
+			{
+				*port = 0;
+				p2++;
+				while( (*p2 >= '0') && (*p2 <= '9'))
+				{
+					*port *= 10;
+					*port += (unsigned short)(*p2 - '0');
+					p2++;
+				}
+			}
+			else
+			{
+				*port = 80;
+			}
+			*path = p3;
+			return 1;
+		}
+	}
+	p2 = strchr(p1, ':');
+	p3 = strchr(p1, '/');
+	if(!p3)
+		return 0;
+	if(!p2 || (p2>p3))
+	{
+		strncpy(hostname, p1, MIN(MAXHOSTNAMELEN, (int)(p3-p1)));
+		*port = 80;
+	}
+	else
+	{
+		strncpy(hostname, p1, MIN(MAXHOSTNAMELEN, (int)(p2-p1)));
+		*port = 0;
+		p2++;
+		while( (*p2 >= '0') && (*p2 <= '9'))
+		{
+			*port *= 10;
+			*port += (unsigned short)(*p2 - '0');
+			p2++;
+		}
+	}
+	*path = p3;
+	return 1;
+}
+
+void *
+miniwget(const char * url, int * size, unsigned int scope_id)
+{
+	unsigned short port;
+	char * path;
+	/* protocol://host:port/chemin */
+	char hostname[MAXHOSTNAMELEN+1];
+	*size = 0;
+	if(!parseURL(url, hostname, &port, &path, &scope_id))
+		return NULL;
+#ifdef DEBUG
+	printf("parsed url : hostname='%s' port=%hu path='%s' scope_id=%u\n",
+	       hostname, port, path, scope_id);
+#endif
+	return miniwget2(hostname, port, path, size, 0, 0, scope_id);
+}
+
+void *
+miniwget_getaddr(const char * url, int * size,
+                 char * addr, int addrlen, unsigned int scope_id)
+{
+	unsigned short port;
+	char * path;
+	/* protocol://host:port/path */
+	char hostname[MAXHOSTNAMELEN+1];
+	*size = 0;
+	if(addr)
+		addr[0] = '\0';
+	if(!parseURL(url, hostname, &port, &path, &scope_id))
+		return NULL;
+#ifdef DEBUG
+	printf("parsed url : hostname='%s' port=%hu path='%s' scope_id=%u\n",
+	       hostname, port, path, scope_id);
+#endif
+	return miniwget2(hostname, port, path, size, addr, addrlen, scope_id);
+}
+
diff --git a/Externals/miniupnpc/src/miniwget.h b/Externals/miniupnpc/src/miniwget.h
new file mode 100644
index 0000000000..31bcea322a
--- /dev/null
+++ b/Externals/miniupnpc/src/miniwget.h
@@ -0,0 +1,30 @@
+/* $Id: miniwget.h,v 1.8 2012/09/27 15:42:10 nanard Exp $ */
+/* Project : miniupnp
+ * Author : Thomas Bernard
+ * Copyright (c) 2005-2012 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution.
+ * */
+#ifndef MINIWGET_H_INCLUDED
+#define MINIWGET_H_INCLUDED
+
+#include "declspec.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+LIBSPEC void * getHTTPResponse(int s, int * size);
+
+LIBSPEC void * miniwget(const char *, int *, unsigned int);
+
+LIBSPEC void * miniwget_getaddr(const char *, int *, char *, int, unsigned int);
+
+int parseURL(const char *, char *, unsigned short *, char * *, unsigned int *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/Externals/miniupnpc/src/minixml.c b/Externals/miniupnpc/src/minixml.c
new file mode 100644
index 0000000000..eb4d7d9857
--- /dev/null
+++ b/Externals/miniupnpc/src/minixml.c
@@ -0,0 +1,216 @@
+/* $Id: minixml.c,v 1.10 2012/03/05 19:42:47 nanard Exp $ */
+/* minixml.c : the minimum size a xml parser can be ! */
+/* Project : miniupnp
+ * webpage: http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * Author : Thomas Bernard
+
+Copyright (c) 2005-2011, Thomas BERNARD
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * The name of the author may not be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+*/
+#include <string.h>
+#include "minixml.h"
+
+/* parseatt : used to parse the argument list
+ * return 0 (false) in case of success and -1 (true) if the end
+ * of the xmlbuffer is reached. */
+static int parseatt(struct xmlparser * p)
+{
+	const char * attname;
+	int attnamelen;
+	const char * attvalue;
+	int attvaluelen;
+	while(p->xml < p->xmlend)
+	{
+		if(*p->xml=='/' || *p->xml=='>')
+			return 0;
+		if( !IS_WHITE_SPACE(*p->xml) )
+		{
+			char sep;
+			attname = p->xml;
+			attnamelen = 0;
+			while(*p->xml!='=' && !IS_WHITE_SPACE(*p->xml) )
+			{
+				attnamelen++; p->xml++;
+				if(p->xml >= p->xmlend)
+					return -1;
+			}
+			while(*(p->xml++) != '=')
+			{
+				if(p->xml >= p->xmlend)
+					return -1;
+			}
+			while(IS_WHITE_SPACE(*p->xml))
+			{
+				p->xml++;
+				if(p->xml >= p->xmlend)
+					return -1;
+			}
+			sep = *p->xml;
+			if(sep=='\'' || sep=='\"')
+			{
+				p->xml++;
+				if(p->xml >= p->xmlend)
+					return -1;
+				attvalue = p->xml;
+				attvaluelen = 0;
+				while(*p->xml != sep)
+				{
+					attvaluelen++; p->xml++;
+					if(p->xml >= p->xmlend)
+						return -1;
+				}
+			}
+			else
+			{
+				attvalue = p->xml;
+				attvaluelen = 0;
+				while(   !IS_WHITE_SPACE(*p->xml)
+					  && *p->xml != '>' && *p->xml != '/')
+				{
+					attvaluelen++; p->xml++;
+					if(p->xml >= p->xmlend)
+						return -1;
+				}
+			}
+			/*printf("%.*s='%.*s'\n",
+			       attnamelen, attname, attvaluelen, attvalue);*/
+			if(p->attfunc)
+				p->attfunc(p->data, attname, attnamelen, attvalue, attvaluelen);
+		}
+		p->xml++;
+	}
+	return -1;
+}
+
+/* parseelt parse the xml stream and
+ * call the callback functions when needed... */
+static void parseelt(struct xmlparser * p)
+{
+	int i;
+	const char * elementname;
+	while(p->xml < (p->xmlend - 1))
+	{
+		if((p->xml)[0]=='<' && (p->xml)[1]!='?')
+		{
+			i = 0; elementname = ++p->xml;
+			while( !IS_WHITE_SPACE(*p->xml)
+				  && (*p->xml!='>') && (*p->xml!='/')
+				 )
+			{
+				i++; p->xml++;
+				if (p->xml >= p->xmlend)
+					return;
+				/* to ignore namespace : */
+				if(*p->xml==':')
+				{
+					i = 0;
+					elementname = ++p->xml;
+				}
+			}
+			if(i>0)
+			{
+				if(p->starteltfunc)
+					p->starteltfunc(p->data, elementname, i);
+				if(parseatt(p))
+					return;
+				if(*p->xml!='/')
+				{
+					const char * data;
+					i = 0; data = ++p->xml;
+					if (p->xml >= p->xmlend)
+						return;
+					while( IS_WHITE_SPACE(*p->xml) )
+					{
+						i++; p->xml++;
+						if (p->xml >= p->xmlend)
+							return;
+					}
+					if(memcmp(p->xml, "<![CDATA[", 9) == 0)
+					{
+						/* CDATA handling */
+						p->xml += 9;
+						data = p->xml;
+						i = 0;
+						while(memcmp(p->xml, "]]>", 3) != 0)
+						{
+							i++; p->xml++;
+							if ((p->xml + 3) >= p->xmlend)
+								return;
+						}
+						if(i>0 && p->datafunc)
+							p->datafunc(p->data, data, i);
+						while(*p->xml!='<')
+						{
+							p->xml++;
+							if (p->xml >= p->xmlend)
+								return;
+						}
+					}
+					else
+					{
+						while(*p->xml!='<')
+						{
+							i++; p->xml++;
+							if ((p->xml + 1) >= p->xmlend)
+								return;
+						}
+						if(i>0 && p->datafunc && *(p->xml + 1) == '/')
+							p->datafunc(p->data, data, i);
+					}
+				}
+			}
+			else if(*p->xml == '/')
+			{
+				i = 0; elementname = ++p->xml;
+				if (p->xml >= p->xmlend)
+					return;
+				while((*p->xml != '>'))
+				{
+					i++; p->xml++;
+					if (p->xml >= p->xmlend)
+						return;
+				}
+				if(p->endeltfunc)
+					p->endeltfunc(p->data, elementname, i);
+				p->xml++;
+			}
+		}
+		else
+		{
+			p->xml++;
+		}
+	}
+}
+
+/* the parser must be initialized before calling this function */
+void parsexml(struct xmlparser * parser)
+{
+	parser->xml = parser->xmlstart;
+	parser->xmlend = parser->xmlstart + parser->xmlsize;
+	parseelt(parser);
+}
+
+
diff --git a/Externals/miniupnpc/src/minixml.h b/Externals/miniupnpc/src/minixml.h
new file mode 100644
index 0000000000..9f43aa48cb
--- /dev/null
+++ b/Externals/miniupnpc/src/minixml.h
@@ -0,0 +1,37 @@
+/* $Id: minixml.h,v 1.7 2012/09/27 15:42:10 nanard Exp $ */
+/* minimal xml parser
+ *
+ * Project : miniupnp
+ * Website : http://miniupnp.free.fr/
+ * Author : Thomas Bernard
+ * Copyright (c) 2005 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution.
+ * */
+#ifndef MINIXML_H_INCLUDED
+#define MINIXML_H_INCLUDED
+#define IS_WHITE_SPACE(c) ((c==' ') || (c=='\t') || (c=='\r') || (c=='\n'))
+
+/* if a callback function pointer is set to NULL,
+ * the function is not called */
+struct xmlparser {
+	const char *xmlstart;
+	const char *xmlend;
+	const char *xml;	/* pointer to current character */
+	int xmlsize;
+	void * data;
+	void (*starteltfunc) (void *, const char *, int);
+	void (*endeltfunc) (void *, const char *, int);
+	void (*datafunc) (void *, const char *, int);
+	void (*attfunc) (void *, const char *, int, const char *, int);
+};
+
+/* parsexml()
+ * the xmlparser structure must be initialized before the call
+ * the following structure members have to be initialized :
+ * xmlstart, xmlsize, data, *func
+ * xml is for internal usage, xmlend is computed automatically */
+void parsexml(struct xmlparser *);
+
+#endif
+
diff --git a/Externals/miniupnpc/src/portlistingparse.c b/Externals/miniupnpc/src/portlistingparse.c
new file mode 100644
index 0000000000..19e3054ebb
--- /dev/null
+++ b/Externals/miniupnpc/src/portlistingparse.c
@@ -0,0 +1,159 @@
+/* $Id: portlistingparse.c,v 1.6 2012/05/29 10:26:51 nanard Exp $ */
+/* MiniUPnP project
+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * (c) 2011 Thomas Bernard
+ * This software is subject to the conditions detailed
+ * in the LICENCE file provided within the distribution */
+#include <string.h>
+#include <stdlib.h>
+#include "portlistingparse.h"
+#include "minixml.h"
+
+/* list of the elements */
+static const struct {
+	const portMappingElt code;
+	const char * const str;
+} elements[] = {
+	{ PortMappingEntry, "PortMappingEntry"},
+	{ NewRemoteHost, "NewRemoteHost"},
+	{ NewExternalPort, "NewExternalPort"},
+	{ NewProtocol, "NewProtocol"},
+	{ NewInternalPort, "NewInternalPort"},
+	{ NewInternalClient, "NewInternalClient"},
+	{ NewEnabled, "NewEnabled"},
+	{ NewDescription, "NewDescription"},
+	{ NewLeaseTime, "NewLeaseTime"},
+	{ PortMappingEltNone, NULL}
+};
+
+/* Helper function */
+static UNSIGNED_INTEGER
+atoui(const char * p, int l)
+{
+	UNSIGNED_INTEGER r = 0;
+	while(l > 0 && *p)
+	{
+		if(*p >= '0' && *p <= '9')
+			r = r*10 + (*p - '0');
+		else
+			break;
+		p++;
+		l--;
+	}
+	return r;
+}
+
+/* Start element handler */
+static void
+startelt(void * d, const char * name, int l)
+{
+	int i;
+	struct PortMappingParserData * pdata = (struct PortMappingParserData *)d;
+	pdata->curelt = PortMappingEltNone;
+	for(i = 0; elements[i].str; i++)
+	{
+		if(memcmp(name, elements[i].str, l) == 0)
+		{
+			pdata->curelt = elements[i].code;
+			break;
+		}
+	}
+	if(pdata->curelt == PortMappingEntry)
+	{
+		struct PortMapping * pm;
+		pm = calloc(1, sizeof(struct PortMapping));
+		LIST_INSERT_HEAD( &(pdata->head), pm, entries);
+	}
+}
+
+/* End element handler */
+static void
+endelt(void * d, const char * name, int l)
+{
+	struct PortMappingParserData * pdata = (struct PortMappingParserData *)d;
+	(void)name;
+	(void)l;
+	pdata->curelt = PortMappingEltNone;
+}
+
+/* Data handler */
+static void
+data(void * d, const char * data, int l)
+{
+	struct PortMapping * pm;
+	struct PortMappingParserData * pdata = (struct PortMappingParserData *)d;
+	pm = pdata->head.lh_first;
+	if(!pm)
+		return;
+	if(l > 63)
+		l = 63;
+	switch(pdata->curelt)
+	{
+	case NewRemoteHost:
+		memcpy(pm->remoteHost, data, l);
+		pm->remoteHost[l] = '\0';
+		break;
+	case NewExternalPort:
+		pm->externalPort = (unsigned short)atoui(data, l);
+		break;
+	case NewProtocol:
+		if(l > 3)
+			l = 3;
+		memcpy(pm->protocol, data, l);
+		pm->protocol[l] = '\0';
+		break;
+	case NewInternalPort:
+		pm->internalPort = (unsigned short)atoui(data, l);
+		break;
+	case NewInternalClient:
+		memcpy(pm->internalClient, data, l);
+		pm->internalClient[l] = '\0';
+		break;
+	case NewEnabled:
+		pm->enabled = (unsigned char)atoui(data, l);
+		break;
+	case NewDescription:
+		memcpy(pm->description, data, l);
+		pm->description[l] = '\0';
+		break;
+	case NewLeaseTime:
+		pm->leaseTime = atoui(data, l);
+		break;
+	default:
+		break;
+	}
+}
+
+
+/* Parse the PortMappingList XML document for IGD version 2
+ */
+void
+ParsePortListing(const char * buffer, int bufsize,
+                 struct PortMappingParserData * pdata)
+{
+	struct xmlparser parser;
+
+	memset(pdata, 0, sizeof(struct PortMappingParserData));
+	LIST_INIT(&(pdata->head));
+	/* init xmlparser */
+	parser.xmlstart = buffer;
+	parser.xmlsize = bufsize;
+	parser.data = pdata;
+	parser.starteltfunc = startelt;
+	parser.endeltfunc = endelt;
+	parser.datafunc = data;
+	parser.attfunc = 0;
+	parsexml(&parser);
+}
+
+void
+FreePortListing(struct PortMappingParserData * pdata)
+{
+	struct PortMapping * pm;
+	while((pm = pdata->head.lh_first) != NULL)
+	{
+		LIST_REMOVE(pm, entries);
+		free(pm);
+	}
+}
+
diff --git a/Externals/miniupnpc/src/portlistingparse.h b/Externals/miniupnpc/src/portlistingparse.h
new file mode 100644
index 0000000000..bafa2a47c3
--- /dev/null
+++ b/Externals/miniupnpc/src/portlistingparse.h
@@ -0,0 +1,71 @@
+/* $Id: portlistingparse.h,v 1.7 2012/09/27 15:42:10 nanard Exp $ */
+/* MiniUPnP project
+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * (c) 2011-2012 Thomas Bernard
+ * This software is subject to the conditions detailed
+ * in the LICENCE file provided within the distribution */
+#ifndef PORTLISTINGPARSE_H_INCLUDED
+#define PORTLISTINGPARSE_H_INCLUDED
+
+#include "declspec.h"
+/* for the definition of UNSIGNED_INTEGER */
+#include "miniupnpctypes.h"
+
+#if defined(NO_SYS_QUEUE_H) || defined(_WIN32) || defined(__HAIKU__)
+#include "bsdqueue.h"
+#else
+#include <sys/queue.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* sample of PortMappingEntry :
+  <p:PortMappingEntry>
+    <p:NewRemoteHost>202.233.2.1</p:NewRemoteHost>
+    <p:NewExternalPort>2345</p:NewExternalPort>
+    <p:NewProtocol>TCP</p:NewProtocol>
+    <p:NewInternalPort>2345</p:NewInternalPort>
+    <p:NewInternalClient>192.168.1.137</p:NewInternalClient>
+    <p:NewEnabled>1</p:NewEnabled>
+    <p:NewDescription>dooom</p:NewDescription>
+    <p:NewLeaseTime>345</p:NewLeaseTime>
+  </p:PortMappingEntry>
+ */
+typedef enum { PortMappingEltNone,
+       PortMappingEntry, NewRemoteHost,
+       NewExternalPort, NewProtocol,
+       NewInternalPort, NewInternalClient,
+       NewEnabled, NewDescription,
+       NewLeaseTime } portMappingElt;
+
+struct PortMapping {
+	LIST_ENTRY(PortMapping) entries;
+	UNSIGNED_INTEGER leaseTime;
+	unsigned short externalPort;
+	unsigned short internalPort;
+	char remoteHost[64];
+	char internalClient[64];
+	char description[64];
+	char protocol[4];
+	unsigned char enabled;
+};
+
+struct PortMappingParserData {
+	LIST_HEAD(portmappinglisthead, PortMapping) head;
+	portMappingElt curelt;
+};
+
+LIBSPEC void
+ParsePortListing(const char * buffer, int bufsize,
+                 struct PortMappingParserData * pdata);
+
+LIBSPEC void
+FreePortListing(struct PortMappingParserData * pdata);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Externals/miniupnpc/src/receivedata.c b/Externals/miniupnpc/src/receivedata.c
new file mode 100644
index 0000000000..f9b9901fc0
--- /dev/null
+++ b/Externals/miniupnpc/src/receivedata.c
@@ -0,0 +1,104 @@
+/* $Id: receivedata.c,v 1.4 2012/06/23 22:34:47 nanard Exp $ */
+/* Project : miniupnp
+ * Website : http://miniupnp.free.fr/
+ * Author : Thomas Bernard
+ * Copyright (c) 2011-2012 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution. */
+
+#include <stdio.h>
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
+#include <unistd.h>
+#if defined(__amigaos__) && !defined(__amigaos4__)
+#define socklen_t int
+#else /* #if defined(__amigaos__) && !defined(__amigaos4__) */
+#include <sys/select.h>
+#endif /* #else defined(__amigaos__) && !defined(__amigaos4__) */
+#include <sys/socket.h>
+#include <netinet/in.h>
+#if !defined(__amigaos__) && !defined(__amigaos4__)
+#include <poll.h>
+#endif
+#include <errno.h>
+#define MINIUPNPC_IGNORE_EINTR
+#endif
+
+#ifdef _WIN32
+#define PRINT_SOCKET_ERROR(x)    printf("Socket error: %s, %d\n", x, WSAGetLastError());
+#else
+#define PRINT_SOCKET_ERROR(x) perror(x)
+#endif
+
+#include "receivedata.h"
+
+int
+receivedata(int socket,
+            char * data, int length,
+            int timeout, unsigned int * scope_id)
+{
+#if MINIUPNPC_GET_SRC_ADDR
+	struct sockaddr_storage src_addr;
+	socklen_t src_addr_len = sizeof(src_addr);
+#endif
+    int n;
+#if !defined(_WIN32) && !defined(__amigaos__) && !defined(__amigaos4__)
+	/* using poll */
+    struct pollfd fds[1]; /* for the poll */
+#ifdef MINIUPNPC_IGNORE_EINTR
+    do {
+#endif
+        fds[0].fd = socket;
+        fds[0].events = POLLIN;
+        n = poll(fds, 1, timeout);
+#ifdef MINIUPNPC_IGNORE_EINTR
+    } while(n < 0 && errno == EINTR);
+#endif
+    if(n < 0) {
+        PRINT_SOCKET_ERROR("poll");
+        return -1;
+    } else if(n == 0) {
+		/* timeout */
+        return 0;
+    }
+#else /* !defined(_WIN32) && !defined(__amigaos__) && !defined(__amigaos4__) */
+	/* using select under _WIN32 and amigaos */
+    fd_set socketSet;
+    TIMEVAL timeval;
+    FD_ZERO(&socketSet);
+    FD_SET(socket, &socketSet);
+    timeval.tv_sec = timeout / 1000;
+    timeval.tv_usec = (timeout % 1000) * 1000;
+    n = select(FD_SETSIZE, &socketSet, NULL, NULL, &timeval);
+    if(n < 0) {
+        PRINT_SOCKET_ERROR("select");
+        return -1;
+    } else if(n == 0) {
+        return 0;
+    }
+#endif
+#if MINIUPNPC_GET_SRC_ADDR
+	n = recvfrom(socket, data, length, 0,
+	             (struct sockaddr *)&src_addr, &src_addr_len);
+#else
+	n = recv(socket, data, length, 0);
+#endif
+	if(n<0) {
+		PRINT_SOCKET_ERROR("recv");
+	}
+#if MINIUPNPC_GET_SRC_ADDR
+	if (src_addr.ss_family == AF_INET6) {
+		const struct sockaddr_in6 * src_addr6 = (struct sockaddr_in6 *)&src_addr;
+#ifdef DEBUG
+		printf("scope_id=%u\n", src_addr6->sin6_scope_id);
+#endif
+		if(scope_id)
+			*scope_id = src_addr6->sin6_scope_id;
+	}
+#endif
+	return n;
+}
+
+
diff --git a/Externals/miniupnpc/src/receivedata.h b/Externals/miniupnpc/src/receivedata.h
new file mode 100644
index 0000000000..0520a11d38
--- /dev/null
+++ b/Externals/miniupnpc/src/receivedata.h
@@ -0,0 +1,19 @@
+/* $Id: receivedata.h,v 1.4 2012/09/27 15:42:10 nanard Exp $ */
+/* Project: miniupnp
+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * Author: Thomas Bernard
+ * Copyright (c) 2011-2012 Thomas Bernard
+ * This software is subjects to the conditions detailed
+ * in the LICENCE file provided within this distribution */
+#ifndef RECEIVEDATA_H_INCLUDED
+#define RECEIVEDATA_H_INCLUDED
+
+/* Reads data from the specified socket.
+ * Returns the number of bytes read if successful, zero if no bytes were
+ * read or if we timed out. Returns negative if there was an error. */
+int receivedata(int socket,
+                char * data, int length,
+                int timeout, unsigned int * scope_id);
+
+#endif
+
diff --git a/Externals/miniupnpc/src/upnpc.c b/Externals/miniupnpc/src/upnpc.c
new file mode 100644
index 0000000000..54cddf9a07
--- /dev/null
+++ b/Externals/miniupnpc/src/upnpc.c
@@ -0,0 +1,715 @@
+/* $Id: upnpc.c,v 1.99 2013/02/06 12:56:41 nanard Exp $ */
+/* Project : miniupnp
+ * Author : Thomas Bernard
+ * Copyright (c) 2005-2013 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution. */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#ifdef _WIN32
+#include <winsock2.h>
+#define snprintf _snprintf
+#else
+/* for IPPROTO_TCP / IPPROTO_UDP */
+#include <netinet/in.h>
+#endif
+#include "miniwget.h"
+#include "miniupnpc.h"
+#include "upnpcommands.h"
+#include "upnperrors.h"
+
+/* protofix() checks if protocol is "UDP" or "TCP"
+ * returns NULL if not */
+const char * protofix(const char * proto)
+{
+	static const char proto_tcp[4] = { 'T', 'C', 'P', 0};
+	static const char proto_udp[4] = { 'U', 'D', 'P', 0};
+	int i, b;
+	for(i=0, b=1; i<4; i++)
+		b = b && (   (proto[i] == proto_tcp[i])
+		          || (proto[i] == (proto_tcp[i] | 32)) );
+	if(b)
+		return proto_tcp;
+	for(i=0, b=1; i<4; i++)
+		b = b && (   (proto[i] == proto_udp[i])
+		          || (proto[i] == (proto_udp[i] | 32)) );
+	if(b)
+		return proto_udp;
+	return 0;
+}
+
+static void DisplayInfos(struct UPNPUrls * urls,
+                         struct IGDdatas * data)
+{
+	char externalIPAddress[40];
+	char connectionType[64];
+	char status[64];
+	char lastconnerr[64];
+	unsigned int uptime;
+	unsigned int brUp, brDown;
+	time_t timenow, timestarted;
+	int r;
+	if(UPNP_GetConnectionTypeInfo(urls->controlURL,
+	                              data->first.servicetype,
+	                              connectionType) != UPNPCOMMAND_SUCCESS)
+		printf("GetConnectionTypeInfo failed.\n");
+	else
+		printf("Connection Type : %s\n", connectionType);
+	if(UPNP_GetStatusInfo(urls->controlURL, data->first.servicetype,
+	                      status, &uptime, lastconnerr) != UPNPCOMMAND_SUCCESS)
+		printf("GetStatusInfo failed.\n");
+	else
+		printf("Status : %s, uptime=%us, LastConnectionError : %s\n",
+		       status, uptime, lastconnerr);
+	timenow = time(NULL);
+	timestarted = timenow - uptime;
+	printf("  Time started : %s", ctime(&timestarted));
+	if(UPNP_GetLinkLayerMaxBitRates(urls->controlURL_CIF, data->CIF.servicetype,
+	                                &brDown, &brUp) != UPNPCOMMAND_SUCCESS) {
+		printf("GetLinkLayerMaxBitRates failed.\n");
+	} else {
+		printf("MaxBitRateDown : %u bps", brDown);
+		if(brDown >= 1000000) {
+			printf(" (%u.%u Mbps)", brDown / 1000000, (brDown / 100000) % 10);
+		} else if(brDown >= 1000) {
+			printf(" (%u Kbps)", brDown / 1000);
+		}
+		printf("   MaxBitRateUp %u bps", brUp);
+		if(brUp >= 1000000) {
+			printf(" (%u.%u Mbps)", brUp / 1000000, (brUp / 100000) % 10);
+		} else if(brUp >= 1000) {
+			printf(" (%u Kbps)", brUp / 1000);
+		}
+		printf("\n");
+	}
+	r = UPNP_GetExternalIPAddress(urls->controlURL,
+	                          data->first.servicetype,
+							  externalIPAddress);
+	if(r != UPNPCOMMAND_SUCCESS) {
+		printf("GetExternalIPAddress failed. (errorcode=%d)\n", r);
+	} else {
+		printf("ExternalIPAddress = %s\n", externalIPAddress);
+	}
+}
+
+static void GetConnectionStatus(struct UPNPUrls * urls,
+                               struct IGDdatas * data)
+{
+	unsigned int bytessent, bytesreceived, packetsreceived, packetssent;
+	DisplayInfos(urls, data);
+	bytessent = UPNP_GetTotalBytesSent(urls->controlURL_CIF, data->CIF.servicetype);
+	bytesreceived = UPNP_GetTotalBytesReceived(urls->controlURL_CIF, data->CIF.servicetype);
+	packetssent = UPNP_GetTotalPacketsSent(urls->controlURL_CIF, data->CIF.servicetype);
+	packetsreceived = UPNP_GetTotalPacketsReceived(urls->controlURL_CIF, data->CIF.servicetype);
+	printf("Bytes:   Sent: %8u\tRecv: %8u\n", bytessent, bytesreceived);
+	printf("Packets: Sent: %8u\tRecv: %8u\n", packetssent, packetsreceived);
+}
+
+static void ListRedirections(struct UPNPUrls * urls,
+                             struct IGDdatas * data)
+{
+	int r;
+	int i = 0;
+	char index[6];
+	char intClient[40];
+	char intPort[6];
+	char extPort[6];
+	char protocol[4];
+	char desc[80];
+	char enabled[6];
+	char rHost[64];
+	char duration[16];
+	/*unsigned int num=0;
+	UPNP_GetPortMappingNumberOfEntries(urls->controlURL, data->servicetype, &num);
+	printf("PortMappingNumberOfEntries : %u\n", num);*/
+	printf(" i protocol exPort->inAddr:inPort description remoteHost leaseTime\n");
+	do {
+		snprintf(index, 6, "%d", i);
+		rHost[0] = '\0'; enabled[0] = '\0';
+		duration[0] = '\0'; desc[0] = '\0';
+		extPort[0] = '\0'; intPort[0] = '\0'; intClient[0] = '\0';
+		r = UPNP_GetGenericPortMappingEntry(urls->controlURL,
+		                               data->first.servicetype,
+		                               index,
+		                               extPort, intClient, intPort,
+									   protocol, desc, enabled,
+									   rHost, duration);
+		if(r==0)
+		/*
+			printf("%02d - %s %s->%s:%s\tenabled=%s leaseDuration=%s\n"
+			       "     desc='%s' rHost='%s'\n",
+			       i, protocol, extPort, intClient, intPort,
+				   enabled, duration,
+				   desc, rHost);
+				   */
+			printf("%2d %s %5s->%s:%-5s '%s' '%s' %s\n",
+			       i, protocol, extPort, intClient, intPort,
+			       desc, rHost, duration);
+		else
+			printf("GetGenericPortMappingEntry() returned %d (%s)\n",
+			       r, strupnperror(r));
+		i++;
+	} while(r==0);
+}
+
+static void NewListRedirections(struct UPNPUrls * urls,
+                                struct IGDdatas * data)
+{
+	int r;
+	int i = 0;
+	struct PortMappingParserData pdata;
+	struct PortMapping * pm;
+
+	memset(&pdata, 0, sizeof(struct PortMappingParserData));
+	r = UPNP_GetListOfPortMappings(urls->controlURL,
+                                   data->first.servicetype,
+	                               "0",
+	                               "65535",
+	                               "TCP",
+	                               "1000",
+	                               &pdata);
+	if(r == UPNPCOMMAND_SUCCESS)
+	{
+		printf(" i protocol exPort->inAddr:inPort description remoteHost leaseTime\n");
+		for(pm = pdata.head.lh_first; pm != NULL; pm = pm->entries.le_next)
+		{
+			printf("%2d %s %5hu->%s:%-5hu '%s' '%s' %u\n",
+			       i, pm->protocol, pm->externalPort, pm->internalClient,
+			       pm->internalPort,
+			       pm->description, pm->remoteHost,
+			       (unsigned)pm->leaseTime);
+			i++;
+		}
+		FreePortListing(&pdata);
+	}
+	else
+	{
+		printf("GetListOfPortMappings() returned %d (%s)\n",
+		       r, strupnperror(r));
+	}
+	r = UPNP_GetListOfPortMappings(urls->controlURL,
+                                   data->first.servicetype,
+	                               "0",
+	                               "65535",
+	                               "UDP",
+	                               "1000",
+	                               &pdata);
+	if(r == UPNPCOMMAND_SUCCESS)
+	{
+		for(pm = pdata.head.lh_first; pm != NULL; pm = pm->entries.le_next)
+		{
+			printf("%2d %s %5hu->%s:%-5hu '%s' '%s' %u\n",
+			       i, pm->protocol, pm->externalPort, pm->internalClient,
+			       pm->internalPort,
+			       pm->description, pm->remoteHost,
+			       (unsigned)pm->leaseTime);
+			i++;
+		}
+		FreePortListing(&pdata);
+	}
+	else
+	{
+		printf("GetListOfPortMappings() returned %d (%s)\n",
+		       r, strupnperror(r));
+	}
+}
+
+/* Test function
+ * 1 - get connection type
+ * 2 - get extenal ip address
+ * 3 - Add port mapping
+ * 4 - get this port mapping from the IGD */
+static void SetRedirectAndTest(struct UPNPUrls * urls,
+                               struct IGDdatas * data,
+							   const char * iaddr,
+							   const char * iport,
+							   const char * eport,
+                               const char * proto,
+                               const char * leaseDuration,
+                               const char * description)
+{
+	char externalIPAddress[40];
+	char intClient[40];
+	char intPort[6];
+	char duration[16];
+	int r;
+
+	if(!iaddr || !iport || !eport || !proto)
+	{
+		fprintf(stderr, "Wrong arguments\n");
+		return;
+	}
+	proto = protofix(proto);
+	if(!proto)
+	{
+		fprintf(stderr, "invalid protocol\n");
+		return;
+	}
+
+	UPNP_GetExternalIPAddress(urls->controlURL,
+	                          data->first.servicetype,
+							  externalIPAddress);
+	if(externalIPAddress[0])
+		printf("ExternalIPAddress = %s\n", externalIPAddress);
+	else
+		printf("GetExternalIPAddress failed.\n");
+
+	r = UPNP_AddPortMapping(urls->controlURL, data->first.servicetype,
+	                        eport, iport, iaddr, description,
+	                        proto, 0, leaseDuration);
+	if(r!=UPNPCOMMAND_SUCCESS)
+		printf("AddPortMapping(%s, %s, %s) failed with code %d (%s)\n",
+		       eport, iport, iaddr, r, strupnperror(r));
+
+	r = UPNP_GetSpecificPortMappingEntry(urls->controlURL,
+	                                 data->first.servicetype,
+    	                             eport, proto,
+									 intClient, intPort, NULL/*desc*/,
+	                                 NULL/*enabled*/, duration);
+	if(r!=UPNPCOMMAND_SUCCESS)
+		printf("GetSpecificPortMappingEntry() failed with code %d (%s)\n",
+		       r, strupnperror(r));
+
+	if(intClient[0]) {
+		printf("InternalIP:Port = %s:%s\n", intClient, intPort);
+		printf("external %s:%s %s is redirected to internal %s:%s (duration=%s)\n",
+		       externalIPAddress, eport, proto, intClient, intPort, duration);
+	}
+}
+
+static void
+RemoveRedirect(struct UPNPUrls * urls,
+               struct IGDdatas * data,
+			   const char * eport,
+			   const char * proto)
+{
+	int r;
+	if(!proto || !eport)
+	{
+		fprintf(stderr, "invalid arguments\n");
+		return;
+	}
+	proto = protofix(proto);
+	if(!proto)
+	{
+		fprintf(stderr, "protocol invalid\n");
+		return;
+	}
+	r = UPNP_DeletePortMapping(urls->controlURL, data->first.servicetype, eport, proto, 0);
+	printf("UPNP_DeletePortMapping() returned : %d\n", r);
+}
+
+/* IGD:2, functions for service WANIPv6FirewallControl:1 */
+static void GetFirewallStatus(struct UPNPUrls * urls, struct IGDdatas * data)
+{
+	unsigned int bytessent, bytesreceived, packetsreceived, packetssent;
+	int firewallEnabled = 0, inboundPinholeAllowed = 0;
+
+	UPNP_GetFirewallStatus(urls->controlURL_6FC, data->IPv6FC.servicetype, &firewallEnabled, &inboundPinholeAllowed);
+	printf("FirewallEnabled: %d & Inbound Pinhole Allowed: %d\n", firewallEnabled, inboundPinholeAllowed);
+	printf("GetFirewallStatus:\n   Firewall Enabled: %s\n   Inbound Pinhole Allowed: %s\n", (firewallEnabled)? "Yes":"No", (inboundPinholeAllowed)? "Yes":"No");
+
+	bytessent = UPNP_GetTotalBytesSent(urls->controlURL_CIF, data->CIF.servicetype);
+	bytesreceived = UPNP_GetTotalBytesReceived(urls->controlURL_CIF, data->CIF.servicetype);
+	packetssent = UPNP_GetTotalPacketsSent(urls->controlURL_CIF, data->CIF.servicetype);
+	packetsreceived = UPNP_GetTotalPacketsReceived(urls->controlURL_CIF, data->CIF.servicetype);
+	printf("Bytes:   Sent: %8u\tRecv: %8u\n", bytessent, bytesreceived);
+	printf("Packets: Sent: %8u\tRecv: %8u\n", packetssent, packetsreceived);
+}
+
+/* Test function
+ * 1 - Add pinhole
+ * 2 - Check if pinhole is working from the IGD side */
+static void SetPinholeAndTest(struct UPNPUrls * urls, struct IGDdatas * data,
+					const char * remoteaddr, const char * eport,
+					const char * intaddr, const char * iport,
+					const char * proto, const char * lease_time)
+{
+	char uniqueID[8];
+	/*int isWorking = 0;*/
+	int r;
+	char proto_tmp[8];
+
+	if(!intaddr || !remoteaddr || !iport || !eport || !proto || !lease_time)
+	{
+		fprintf(stderr, "Wrong arguments\n");
+		return;
+	}
+	if(atoi(proto) == 0)
+	{
+		const char * protocol;
+		protocol = protofix(proto);
+		if(protocol && (strcmp("TCP", protocol) == 0))
+		{
+			snprintf(proto_tmp, sizeof(proto_tmp), "%d", IPPROTO_TCP);
+			proto = proto_tmp;
+		}
+		else if(protocol && (strcmp("UDP", protocol) == 0))
+		{
+			snprintf(proto_tmp, sizeof(proto_tmp), "%d", IPPROTO_UDP);
+			proto = proto_tmp;
+		}
+		else
+		{
+			fprintf(stderr, "invalid protocol\n");
+			return;
+		}
+	}
+	r = UPNP_AddPinhole(urls->controlURL_6FC, data->IPv6FC.servicetype, remoteaddr, eport, intaddr, iport, proto, lease_time, uniqueID);
+	if(r!=UPNPCOMMAND_SUCCESS)
+		printf("AddPinhole([%s]:%s -> [%s]:%s) failed with code %d (%s)\n",
+		       remoteaddr, eport, intaddr, iport, r, strupnperror(r));
+	else
+	{
+		printf("AddPinhole: ([%s]:%s -> [%s]:%s) / Pinhole ID = %s\n",
+		       remoteaddr, eport, intaddr, iport, uniqueID);
+		/*r = UPNP_CheckPinholeWorking(urls->controlURL_6FC, data->servicetype_6FC, uniqueID, &isWorking);
+		if(r!=UPNPCOMMAND_SUCCESS)
+			printf("CheckPinholeWorking() failed with code %d (%s)\n", r, strupnperror(r));
+		printf("CheckPinholeWorking: Pinhole ID = %s / IsWorking = %s\n", uniqueID, (isWorking)? "Yes":"No");*/
+	}
+}
+
+/* Test function
+ * 1 - Check if pinhole is working from the IGD side
+ * 2 - Update pinhole */
+static void GetPinholeAndUpdate(struct UPNPUrls * urls, struct IGDdatas * data,
+					const char * uniqueID, const char * lease_time)
+{
+	int isWorking = 0;
+	int r;
+
+	if(!uniqueID || !lease_time)
+	{
+		fprintf(stderr, "Wrong arguments\n");
+		return;
+	}
+	r = UPNP_CheckPinholeWorking(urls->controlURL_6FC, data->IPv6FC.servicetype, uniqueID, &isWorking);
+	printf("CheckPinholeWorking: Pinhole ID = %s / IsWorking = %s\n", uniqueID, (isWorking)? "Yes":"No");
+	if(r!=UPNPCOMMAND_SUCCESS)
+		printf("CheckPinholeWorking() failed with code %d (%s)\n", r, strupnperror(r));
+	if(isWorking || r==709)
+	{
+		r = UPNP_UpdatePinhole(urls->controlURL_6FC, data->IPv6FC.servicetype, uniqueID, lease_time);
+		printf("UpdatePinhole: Pinhole ID = %s with Lease Time: %s\n", uniqueID, lease_time);
+		if(r!=UPNPCOMMAND_SUCCESS)
+			printf("UpdatePinhole: ID (%s) failed with code %d (%s)\n", uniqueID, r, strupnperror(r));
+	}
+}
+
+/* Test function
+ * Get pinhole timeout
+ */
+static void GetPinholeOutboundTimeout(struct UPNPUrls * urls, struct IGDdatas * data,
+					const char * remoteaddr, const char * eport,
+					const char * intaddr, const char * iport,
+					const char * proto)
+{
+	int timeout = 0;
+	int r;
+
+	if(!intaddr || !remoteaddr || !iport || !eport || !proto)
+	{
+		fprintf(stderr, "Wrong arguments\n");
+		return;
+	}
+
+	r = UPNP_GetOutboundPinholeTimeout(urls->controlURL_6FC, data->IPv6FC.servicetype, remoteaddr, eport, intaddr, iport, proto, &timeout);
+	if(r!=UPNPCOMMAND_SUCCESS)
+		printf("GetOutboundPinholeTimeout([%s]:%s -> [%s]:%s) failed with code %d (%s)\n",
+		       intaddr, iport, remoteaddr, eport, r, strupnperror(r));
+	else
+		printf("GetOutboundPinholeTimeout: ([%s]:%s -> [%s]:%s) / Timeout = %d\n", intaddr, iport, remoteaddr, eport, timeout);
+}
+
+static void
+GetPinholePackets(struct UPNPUrls * urls,
+               struct IGDdatas * data, const char * uniqueID)
+{
+	int r, pinholePackets = 0;
+	if(!uniqueID)
+	{
+		fprintf(stderr, "invalid arguments\n");
+		return;
+	}
+	r = UPNP_GetPinholePackets(urls->controlURL_6FC, data->IPv6FC.servicetype, uniqueID, &pinholePackets);
+	if(r!=UPNPCOMMAND_SUCCESS)
+		printf("GetPinholePackets() failed with code %d (%s)\n", r, strupnperror(r));
+	else
+		printf("GetPinholePackets: Pinhole ID = %s / PinholePackets = %d\n", uniqueID, pinholePackets);
+}
+
+static void
+CheckPinhole(struct UPNPUrls * urls,
+               struct IGDdatas * data, const char * uniqueID)
+{
+	int r, isWorking = 0;
+	if(!uniqueID)
+	{
+		fprintf(stderr, "invalid arguments\n");
+		return;
+	}
+	r = UPNP_CheckPinholeWorking(urls->controlURL_6FC, data->IPv6FC.servicetype, uniqueID, &isWorking);
+	if(r!=UPNPCOMMAND_SUCCESS)
+		printf("CheckPinholeWorking() failed with code %d (%s)\n", r, strupnperror(r));
+	else
+		printf("CheckPinholeWorking: Pinhole ID = %s / IsWorking = %s\n", uniqueID, (isWorking)? "Yes":"No");
+}
+
+static void
+RemovePinhole(struct UPNPUrls * urls,
+               struct IGDdatas * data, const char * uniqueID)
+{
+	int r;
+	if(!uniqueID)
+	{
+		fprintf(stderr, "invalid arguments\n");
+		return;
+	}
+	r = UPNP_DeletePinhole(urls->controlURL_6FC, data->IPv6FC.servicetype, uniqueID);
+	printf("UPNP_DeletePinhole() returned : %d\n", r);
+}
+
+
+/* sample upnp client program */
+int main(int argc, char ** argv)
+{
+	char command = 0;
+	char ** commandargv = 0;
+	int commandargc = 0;
+	struct UPNPDev * devlist = 0;
+	char lanaddr[64];	/* my ip address on the LAN */
+	int i;
+	const char * rootdescurl = 0;
+	const char * multicastif = 0;
+	const char * minissdpdpath = 0;
+	int retcode = 0;
+	int error = 0;
+	int ipv6 = 0;
+	const char * description = 0;
+
+#ifdef _WIN32
+	WSADATA wsaData;
+	int nResult = WSAStartup(MAKEWORD(2,2), &wsaData);
+	if(nResult != NO_ERROR)
+	{
+		fprintf(stderr, "WSAStartup() failed.\n");
+		return -1;
+	}
+#endif
+    printf("upnpc : miniupnpc library test client. (c) 2005-2013 Thomas Bernard\n");
+    printf("Go to http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/\n"
+	       "for more information.\n");
+	/* command line processing */
+	for(i=1; i<argc; i++)
+	{
+		if(argv[i][0] == '-')
+		{
+			if(argv[i][1] == 'u')
+				rootdescurl = argv[++i];
+			else if(argv[i][1] == 'm')
+				multicastif = argv[++i];
+			else if(argv[i][1] == 'p')
+				minissdpdpath = argv[++i];
+			else if(argv[i][1] == '6')
+				ipv6 = 1;
+			else if(argv[i][1] == 'e')
+				description = argv[++i];
+			else
+			{
+				command = argv[i][1];
+				i++;
+				commandargv = argv + i;
+				commandargc = argc - i;
+				break;
+			}
+		}
+		else
+		{
+			fprintf(stderr, "option '%s' invalid\n", argv[i]);
+		}
+	}
+
+	if(!command || (command == 'a' && commandargc<4)
+	   || (command == 'd' && argc<2)
+	   || (command == 'r' && argc<2)
+	   || (command == 'A' && commandargc<6)
+	   || (command == 'U' && commandargc<2)
+	   || (command == 'D' && commandargc<1))
+	{
+		fprintf(stderr, "Usage :\t%s [options] -a ip port external_port protocol [duration]\n\t\tAdd port redirection\n", argv[0]);
+		fprintf(stderr, "       \t%s [options] -d external_port protocol [port2 protocol2] [...]\n\t\tDelete port redirection\n", argv[0]);
+		fprintf(stderr, "       \t%s [options] -s\n\t\tGet Connection status\n", argv[0]);
+		fprintf(stderr, "       \t%s [options] -l\n\t\tList redirections\n", argv[0]);
+		fprintf(stderr, "       \t%s [options] -L\n\t\tList redirections (using GetListOfPortMappings, IGD v2)\n", argv[0]);
+		fprintf(stderr, "       \t%s [options] -r port1 protocol1 [port2 protocol2] [...]\n\t\tAdd all redirections to the current host\n", argv[0]);
+		fprintf(stderr, "       \t%s [options] -A remote_ip remote_port internal_ip internal_port protocol lease_time\n\t\tAdd Pinhole (for IGD:2 only)\n", argv[0]);
+		fprintf(stderr, "       \t%s [options] -U uniqueID new_lease_time\n\t\tUpdate Pinhole (for IGD:2 only)\n", argv[0]);
+		fprintf(stderr, "       \t%s [options] -C uniqueID\n\t\tCheck if Pinhole is Working (for IGD:2 only)\n", argv[0]);
+		fprintf(stderr, "       \t%s [options] -K uniqueID\n\t\tGet Number of packets going through the rule (for IGD:2 only)\n", argv[0]);
+		fprintf(stderr, "       \t%s [options] -D uniqueID\n\t\tDelete Pinhole (for IGD:2 only)\n", argv[0]);
+		fprintf(stderr, "       \t%s [options] -S\n\t\tGet Firewall status (for IGD:2 only)\n", argv[0]);
+		fprintf(stderr, "       \t%s [options] -G remote_ip remote_port internal_ip internal_port protocol\n\t\tGet Outbound Pinhole Timeout (for IGD:2 only)\n", argv[0]);
+		fprintf(stderr, "       \t%s [options] -P\n\t\tGet Presentation url\n", argv[0]);
+		fprintf(stderr, "\nprotocol is UDP or TCP\n");
+		fprintf(stderr, "Options:\n");
+		fprintf(stderr, "  -e description : set description for port mapping.\n");
+		fprintf(stderr, "  -6 : use ip v6 instead of ip v4.\n");
+		fprintf(stderr, "  -u url : bypass discovery process by providing the XML root description url.\n");
+		fprintf(stderr, "  -m address/interface : provide ip address (ip v4) or interface name (ip v4 or v6) to use for sending SSDP multicast packets.\n");
+		fprintf(stderr, "  -p path : use this path for MiniSSDPd socket.\n");
+		return 1;
+	}
+
+	if( rootdescurl
+	  || (devlist = upnpDiscover(2000, multicastif, minissdpdpath,
+	                             0/*sameport*/, ipv6, &error)))
+	{
+		struct UPNPDev * device;
+		struct UPNPUrls urls;
+		struct IGDdatas data;
+		if(devlist)
+		{
+			printf("List of UPNP devices found on the network :\n");
+			for(device = devlist; device; device = device->pNext)
+			{
+				printf(" desc: %s\n st: %s\n\n",
+					   device->descURL, device->st);
+			}
+		}
+		else
+		{
+			printf("upnpDiscover() error code=%d\n", error);
+		}
+		i = 1;
+		if( (rootdescurl && UPNP_GetIGDFromUrl(rootdescurl, &urls, &data, lanaddr, sizeof(lanaddr)))
+		  || (i = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr))))
+		{
+			switch(i) {
+			case 1:
+				printf("Found valid IGD : %s\n", urls.controlURL);
+				break;
+			case 2:
+				printf("Found a (not connected?) IGD : %s\n", urls.controlURL);
+				printf("Trying to continue anyway\n");
+				break;
+			case 3:
+				printf("UPnP device found. Is it an IGD ? : %s\n", urls.controlURL);
+				printf("Trying to continue anyway\n");
+				break;
+			default:
+				printf("Found device (igd ?) : %s\n", urls.controlURL);
+				printf("Trying to continue anyway\n");
+			}
+			printf("Local LAN ip address : %s\n", lanaddr);
+			#if 0
+			printf("getting \"%s\"\n", urls.ipcondescURL);
+			descXML = miniwget(urls.ipcondescURL, &descXMLsize);
+			if(descXML)
+			{
+				/*fwrite(descXML, 1, descXMLsize, stdout);*/
+				free(descXML); descXML = NULL;
+			}
+			#endif
+
+			switch(command)
+			{
+			case 'l':
+				DisplayInfos(&urls, &data);
+				ListRedirections(&urls, &data);
+				break;
+			case 'L':
+				NewListRedirections(&urls, &data);
+				break;
+			case 'a':
+				SetRedirectAndTest(&urls, &data,
+				                   commandargv[0], commandargv[1],
+				                   commandargv[2], commandargv[3],
+				                   (commandargc > 4)?commandargv[4]:"0",
+				                   description);
+				break;
+			case 'd':
+				for(i=0; i<commandargc; i+=2)
+				{
+					RemoveRedirect(&urls, &data, commandargv[i], commandargv[i+1]);
+				}
+				break;
+			case 's':
+				GetConnectionStatus(&urls, &data);
+				break;
+			case 'r':
+				for(i=0; i<commandargc; i+=2)
+				{
+					/*printf("port %s protocol %s\n", argv[i], argv[i+1]);*/
+					SetRedirectAndTest(&urls, &data,
+					                   lanaddr, commandargv[i],
+									   commandargv[i], commandargv[i+1], "0",
+					                   description);
+				}
+				break;
+			case 'A':
+				SetPinholeAndTest(&urls, &data,
+				                  commandargv[0], commandargv[1],
+				                  commandargv[2], commandargv[3],
+				                  commandargv[4], commandargv[5]);
+				break;
+			case 'U':
+				GetPinholeAndUpdate(&urls, &data,
+				                   commandargv[0], commandargv[1]);
+				break;
+			case 'C':
+				for(i=0; i<commandargc; i++)
+				{
+					CheckPinhole(&urls, &data, commandargv[i]);
+				}
+				break;
+			case 'K':
+				for(i=0; i<commandargc; i++)
+				{
+					GetPinholePackets(&urls, &data, commandargv[i]);
+				}
+				break;
+			case 'D':
+				for(i=0; i<commandargc; i++)
+				{
+					RemovePinhole(&urls, &data, commandargv[i]);
+				}
+				break;
+			case 'S':
+				GetFirewallStatus(&urls, &data);
+				break;
+			case 'G':
+				GetPinholeOutboundTimeout(&urls, &data,
+							commandargv[0], commandargv[1],
+							commandargv[2], commandargv[3],
+							commandargv[4]);
+				break;
+			case 'P':
+				printf("Presentation URL found:\n");
+				printf("            %s\n", data.presentationurl);
+				break;
+			default:
+				fprintf(stderr, "Unknown switch -%c\n", command);
+				retcode = 1;
+			}
+
+			FreeUPNPUrls(&urls);
+		}
+		else
+		{
+			fprintf(stderr, "No valid UPNP Internet Gateway Device found.\n");
+			retcode = 1;
+		}
+		freeUPNPDevlist(devlist); devlist = 0;
+	}
+	else
+	{
+		fprintf(stderr, "No IGD UPnP Device found on the network !\n");
+		retcode = 1;
+	}
+	return retcode;
+}
+
diff --git a/Externals/miniupnpc/src/upnpcommands.c b/Externals/miniupnpc/src/upnpcommands.c
new file mode 100644
index 0000000000..662c10bc6d
--- /dev/null
+++ b/Externals/miniupnpc/src/upnpcommands.c
@@ -0,0 +1,1097 @@
+/* $Id: upnpcommands.c,v 1.40 2012/06/23 22:36:35 nanard Exp $ */
+/* Project : miniupnp
+ * Author : Thomas Bernard
+ * Copyright (c) 2005-2012 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided in this distribution.
+ * */
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "upnpcommands.h"
+#include "miniupnpc.h"
+#include "portlistingparse.h"
+
+static UNSIGNED_INTEGER
+my_atoui(const char * s)
+{
+	return s ? ((UNSIGNED_INTEGER)STRTOUI(s, NULL, 0)) : 0;
+}
+
+/*
+ * */
+LIBSPEC UNSIGNED_INTEGER
+UPNP_GetTotalBytesSent(const char * controlURL,
+					const char * servicetype)
+{
+	struct NameValueParserData pdata;
+	char * buffer;
+	int bufsize;
+	unsigned int r = 0;
+	char * p;
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                                "GetTotalBytesSent", 0, &bufsize))) {
+		return UPNPCOMMAND_HTTP_ERROR;
+	}
+	ParseNameValue(buffer, bufsize, &pdata);
+	/*DisplayNameValueList(buffer, bufsize);*/
+	free(buffer); buffer = NULL;
+	p = GetValueFromNameValueList(&pdata, "NewTotalBytesSent");
+	r = my_atoui(p);
+	ClearNameValueList(&pdata);
+	return r;
+}
+
+/*
+ * */
+LIBSPEC UNSIGNED_INTEGER
+UPNP_GetTotalBytesReceived(const char * controlURL,
+						const char * servicetype)
+{
+	struct NameValueParserData pdata;
+	char * buffer;
+	int bufsize;
+	unsigned int r = 0;
+	char * p;
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                                "GetTotalBytesReceived", 0, &bufsize))) {
+		return UPNPCOMMAND_HTTP_ERROR;
+	}
+	ParseNameValue(buffer, bufsize, &pdata);
+	/*DisplayNameValueList(buffer, bufsize);*/
+	free(buffer); buffer = NULL;
+	p = GetValueFromNameValueList(&pdata, "NewTotalBytesReceived");
+	r = my_atoui(p);
+	ClearNameValueList(&pdata);
+	return r;
+}
+
+/*
+ * */
+LIBSPEC UNSIGNED_INTEGER
+UPNP_GetTotalPacketsSent(const char * controlURL,
+						const char * servicetype)
+{
+	struct NameValueParserData pdata;
+	char * buffer;
+	int bufsize;
+	unsigned int r = 0;
+	char * p;
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                                "GetTotalPacketsSent", 0, &bufsize))) {
+		return UPNPCOMMAND_HTTP_ERROR;
+	}
+	ParseNameValue(buffer, bufsize, &pdata);
+	/*DisplayNameValueList(buffer, bufsize);*/
+	free(buffer); buffer = NULL;
+	p = GetValueFromNameValueList(&pdata, "NewTotalPacketsSent");
+	r = my_atoui(p);
+	ClearNameValueList(&pdata);
+	return r;
+}
+
+/*
+ * */
+LIBSPEC UNSIGNED_INTEGER
+UPNP_GetTotalPacketsReceived(const char * controlURL,
+						const char * servicetype)
+{
+	struct NameValueParserData pdata;
+	char * buffer;
+	int bufsize;
+	unsigned int r = 0;
+	char * p;
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                                "GetTotalPacketsReceived", 0, &bufsize))) {
+		return UPNPCOMMAND_HTTP_ERROR;
+	}
+	ParseNameValue(buffer, bufsize, &pdata);
+	/*DisplayNameValueList(buffer, bufsize);*/
+	free(buffer); buffer = NULL;
+	p = GetValueFromNameValueList(&pdata, "NewTotalPacketsReceived");
+	r = my_atoui(p);
+	ClearNameValueList(&pdata);
+	return r;
+}
+
+/* UPNP_GetStatusInfo() call the corresponding UPNP method
+ * returns the current status and uptime */
+LIBSPEC int
+UPNP_GetStatusInfo(const char * controlURL,
+				const char * servicetype,
+				char * status,
+				unsigned int * uptime,
+				char * lastconnerror)
+{
+	struct NameValueParserData pdata;
+	char * buffer;
+	int bufsize;
+	char * p;
+	char * up;
+	char * err;
+	int ret = UPNPCOMMAND_UNKNOWN_ERROR;
+
+	if(!status && !uptime)
+		return UPNPCOMMAND_INVALID_ARGS;
+
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                                "GetStatusInfo", 0, &bufsize))) {
+		return UPNPCOMMAND_HTTP_ERROR;
+	}
+	ParseNameValue(buffer, bufsize, &pdata);
+	/*DisplayNameValueList(buffer, bufsize);*/
+	free(buffer); buffer = NULL;
+	up = GetValueFromNameValueList(&pdata, "NewUptime");
+	p = GetValueFromNameValueList(&pdata, "NewConnectionStatus");
+	err = GetValueFromNameValueList(&pdata, "NewLastConnectionError");
+	if(p && up)
+	  ret = UPNPCOMMAND_SUCCESS;
+
+	if(status) {
+		if(p){
+			strncpy(status, p, 64 );
+			status[63] = '\0';
+		}else
+			status[0]= '\0';
+	}
+
+	if(uptime) {
+		if(up)
+			sscanf(up,"%u",uptime);
+		else
+			uptime = 0;
+	}
+
+	if(lastconnerror) {
+		if(err) {
+			strncpy(lastconnerror, err, 64 );
+			lastconnerror[63] = '\0';
+		} else
+			lastconnerror[0] = '\0';
+	}
+
+	p = GetValueFromNameValueList(&pdata, "errorCode");
+	if(p) {
+		ret = UPNPCOMMAND_UNKNOWN_ERROR;
+		sscanf(p, "%d", &ret);
+	}
+	ClearNameValueList(&pdata);
+	return ret;
+}
+
+/* UPNP_GetConnectionTypeInfo() call the corresponding UPNP method
+ * returns the connection type */
+LIBSPEC int
+UPNP_GetConnectionTypeInfo(const char * controlURL,
+                           const char * servicetype,
+                           char * connectionType)
+{
+	struct NameValueParserData pdata;
+	char * buffer;
+	int bufsize;
+	char * p;
+	int ret = UPNPCOMMAND_UNKNOWN_ERROR;
+
+	if(!connectionType)
+		return UPNPCOMMAND_INVALID_ARGS;
+
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                                "GetConnectionTypeInfo", 0, &bufsize))) {
+		return UPNPCOMMAND_HTTP_ERROR;
+	}
+	ParseNameValue(buffer, bufsize, &pdata);
+	free(buffer); buffer = NULL;
+	p = GetValueFromNameValueList(&pdata, "NewConnectionType");
+	/*p = GetValueFromNameValueList(&pdata, "NewPossibleConnectionTypes");*/
+	/* PossibleConnectionTypes will have several values.... */
+	if(p) {
+		strncpy(connectionType, p, 64 );
+		connectionType[63] = '\0';
+		ret = UPNPCOMMAND_SUCCESS;
+	} else
+		connectionType[0] = '\0';
+	p = GetValueFromNameValueList(&pdata, "errorCode");
+	if(p) {
+		ret = UPNPCOMMAND_UNKNOWN_ERROR;
+		sscanf(p, "%d", &ret);
+	}
+	ClearNameValueList(&pdata);
+	return ret;
+}
+
+/* UPNP_GetLinkLayerMaxBitRate() call the corresponding UPNP method.
+ * Returns 2 values: Downloadlink bandwidth and Uplink bandwidth.
+ * One of the values can be null
+ * Note : GetLinkLayerMaxBitRates belongs to WANPPPConnection:1 only
+ * We can use the GetCommonLinkProperties from WANCommonInterfaceConfig:1 */
+LIBSPEC int
+UPNP_GetLinkLayerMaxBitRates(const char * controlURL,
+                             const char * servicetype,
+                             unsigned int * bitrateDown,
+                             unsigned int * bitrateUp)
+{
+	struct NameValueParserData pdata;
+	char * buffer;
+	int bufsize;
+	int ret = UPNPCOMMAND_UNKNOWN_ERROR;
+	char * down;
+	char * up;
+	char * p;
+
+	if(!bitrateDown && !bitrateUp)
+		return UPNPCOMMAND_INVALID_ARGS;
+
+	/* shouldn't we use GetCommonLinkProperties ? */
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                                "GetCommonLinkProperties", 0, &bufsize))) {
+	                              /*"GetLinkLayerMaxBitRates", 0, &bufsize);*/
+		return UPNPCOMMAND_HTTP_ERROR;
+	}
+	/*DisplayNameValueList(buffer, bufsize);*/
+	ParseNameValue(buffer, bufsize, &pdata);
+	free(buffer); buffer = NULL;
+	/*down = GetValueFromNameValueList(&pdata, "NewDownstreamMaxBitRate");*/
+	/*up = GetValueFromNameValueList(&pdata, "NewUpstreamMaxBitRate");*/
+	down = GetValueFromNameValueList(&pdata, "NewLayer1DownstreamMaxBitRate");
+	up = GetValueFromNameValueList(&pdata, "NewLayer1UpstreamMaxBitRate");
+	/*GetValueFromNameValueList(&pdata, "NewWANAccessType");*/
+	/*GetValueFromNameValueList(&pdata, "NewPhysicalLinkStatus");*/
+	if(down && up)
+		ret = UPNPCOMMAND_SUCCESS;
+
+	if(bitrateDown) {
+		if(down)
+			sscanf(down,"%u",bitrateDown);
+		else
+			*bitrateDown = 0;
+	}
+
+	if(bitrateUp) {
+		if(up)
+			sscanf(up,"%u",bitrateUp);
+		else
+			*bitrateUp = 0;
+	}
+	p = GetValueFromNameValueList(&pdata, "errorCode");
+	if(p) {
+		ret = UPNPCOMMAND_UNKNOWN_ERROR;
+		sscanf(p, "%d", &ret);
+	}
+	ClearNameValueList(&pdata);
+	return ret;
+}
+
+
+/* UPNP_GetExternalIPAddress() call the corresponding UPNP method.
+ * if the third arg is not null the value is copied to it.
+ * at least 16 bytes must be available
+ *
+ * Return values :
+ * 0 : SUCCESS
+ * NON ZERO : ERROR Either an UPnP error code or an unknown error.
+ *
+ * 402 Invalid Args - See UPnP Device Architecture section on Control.
+ * 501 Action Failed - See UPnP Device Architecture section on Control.
+ */
+LIBSPEC int
+UPNP_GetExternalIPAddress(const char * controlURL,
+                          const char * servicetype,
+                          char * extIpAdd)
+{
+	struct NameValueParserData pdata;
+	char * buffer;
+	int bufsize;
+	char * p;
+	int ret = UPNPCOMMAND_UNKNOWN_ERROR;
+
+	if(!extIpAdd || !controlURL || !servicetype)
+		return UPNPCOMMAND_INVALID_ARGS;
+
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                                "GetExternalIPAddress", 0, &bufsize))) {
+		return UPNPCOMMAND_HTTP_ERROR;
+	}
+	/*DisplayNameValueList(buffer, bufsize);*/
+	ParseNameValue(buffer, bufsize, &pdata);
+	free(buffer); buffer = NULL;
+	/*printf("external ip = %s\n", GetValueFromNameValueList(&pdata, "NewExternalIPAddress") );*/
+	p = GetValueFromNameValueList(&pdata, "NewExternalIPAddress");
+	if(p) {
+		strncpy(extIpAdd, p, 16 );
+		extIpAdd[15] = '\0';
+		ret = UPNPCOMMAND_SUCCESS;
+	} else
+		extIpAdd[0] = '\0';
+
+	p = GetValueFromNameValueList(&pdata, "errorCode");
+	if(p) {
+		ret = UPNPCOMMAND_UNKNOWN_ERROR;
+		sscanf(p, "%d", &ret);
+	}
+
+	ClearNameValueList(&pdata);
+	return ret;
+}
+
+LIBSPEC int
+UPNP_AddPortMapping(const char * controlURL, const char * servicetype,
+                    const char * extPort,
+					const char * inPort,
+					const char * inClient,
+					const char * desc,
+					const char * proto,
+                    const char * remoteHost,
+                    const char * leaseDuration)
+{
+	struct UPNParg * AddPortMappingArgs;
+	char * buffer;
+	int bufsize;
+	struct NameValueParserData pdata;
+	const char * resVal;
+	int ret;
+
+	if(!inPort || !inClient || !proto || !extPort)
+		return UPNPCOMMAND_INVALID_ARGS;
+
+	AddPortMappingArgs = calloc(9, sizeof(struct UPNParg));
+	AddPortMappingArgs[0].elt = "NewRemoteHost";
+	AddPortMappingArgs[0].val = remoteHost;
+	AddPortMappingArgs[1].elt = "NewExternalPort";
+	AddPortMappingArgs[1].val = extPort;
+	AddPortMappingArgs[2].elt = "NewProtocol";
+	AddPortMappingArgs[2].val = proto;
+	AddPortMappingArgs[3].elt = "NewInternalPort";
+	AddPortMappingArgs[3].val = inPort;
+	AddPortMappingArgs[4].elt = "NewInternalClient";
+	AddPortMappingArgs[4].val = inClient;
+	AddPortMappingArgs[5].elt = "NewEnabled";
+	AddPortMappingArgs[5].val = "1";
+	AddPortMappingArgs[6].elt = "NewPortMappingDescription";
+	AddPortMappingArgs[6].val = desc?desc:"libminiupnpc";
+	AddPortMappingArgs[7].elt = "NewLeaseDuration";
+	AddPortMappingArgs[7].val = leaseDuration?leaseDuration:"0";
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                                "AddPortMapping", AddPortMappingArgs,
+	                                &bufsize))) {
+		free(AddPortMappingArgs);
+		return UPNPCOMMAND_HTTP_ERROR;
+	}
+	/*DisplayNameValueList(buffer, bufsize);*/
+	/*buffer[bufsize] = '\0';*/
+	/*puts(buffer);*/
+	ParseNameValue(buffer, bufsize, &pdata);
+	free(buffer); buffer = NULL;
+	resVal = GetValueFromNameValueList(&pdata, "errorCode");
+	if(resVal) {
+		/*printf("AddPortMapping errorCode = '%s'\n", resVal); */
+		ret = UPNPCOMMAND_UNKNOWN_ERROR;
+		sscanf(resVal, "%d", &ret);
+	} else {
+		ret = UPNPCOMMAND_SUCCESS;
+	}
+	ClearNameValueList(&pdata);
+	free(AddPortMappingArgs);
+	return ret;
+}
+
+LIBSPEC int
+UPNP_DeletePortMapping(const char * controlURL, const char * servicetype,
+                       const char * extPort, const char * proto,
+                       const char * remoteHost)
+{
+	/*struct NameValueParserData pdata;*/
+	struct UPNParg * DeletePortMappingArgs;
+	char * buffer;
+	int bufsize;
+	struct NameValueParserData pdata;
+	const char * resVal;
+	int ret;
+
+	if(!extPort || !proto)
+		return UPNPCOMMAND_INVALID_ARGS;
+
+	DeletePortMappingArgs = calloc(4, sizeof(struct UPNParg));
+	DeletePortMappingArgs[0].elt = "NewRemoteHost";
+	DeletePortMappingArgs[0].val = remoteHost;
+	DeletePortMappingArgs[1].elt = "NewExternalPort";
+	DeletePortMappingArgs[1].val = extPort;
+	DeletePortMappingArgs[2].elt = "NewProtocol";
+	DeletePortMappingArgs[2].val = proto;
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                               "DeletePortMapping",
+	                               DeletePortMappingArgs, &bufsize))) {
+		free(DeletePortMappingArgs);
+		return UPNPCOMMAND_HTTP_ERROR;
+	}
+	/*DisplayNameValueList(buffer, bufsize);*/
+	ParseNameValue(buffer, bufsize, &pdata);
+	free(buffer); buffer = NULL;
+	resVal = GetValueFromNameValueList(&pdata, "errorCode");
+	if(resVal) {
+		ret = UPNPCOMMAND_UNKNOWN_ERROR;
+		sscanf(resVal, "%d", &ret);
+	} else {
+		ret = UPNPCOMMAND_SUCCESS;
+	}
+	ClearNameValueList(&pdata);
+	free(DeletePortMappingArgs);
+	return ret;
+}
+
+LIBSPEC int
+UPNP_GetGenericPortMappingEntry(const char * controlURL,
+                                const char * servicetype,
+							 const char * index,
+							 char * extPort,
+							 char * intClient,
+							 char * intPort,
+							 char * protocol,
+							 char * desc,
+							 char * enabled,
+							 char * rHost,
+							 char * duration)
+{
+	struct NameValueParserData pdata;
+	struct UPNParg * GetPortMappingArgs;
+	char * buffer;
+	int bufsize;
+	char * p;
+	int r = UPNPCOMMAND_UNKNOWN_ERROR;
+	if(!index)
+		return UPNPCOMMAND_INVALID_ARGS;
+	intClient[0] = '\0';
+	intPort[0] = '\0';
+	GetPortMappingArgs = calloc(2, sizeof(struct UPNParg));
+	GetPortMappingArgs[0].elt = "NewPortMappingIndex";
+	GetPortMappingArgs[0].val = index;
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                               "GetGenericPortMappingEntry",
+	                               GetPortMappingArgs, &bufsize))) {
+		free(GetPortMappingArgs);
+		return UPNPCOMMAND_HTTP_ERROR;
+	}
+	ParseNameValue(buffer, bufsize, &pdata);
+	free(buffer); buffer = NULL;
+
+	p = GetValueFromNameValueList(&pdata, "NewRemoteHost");
+	if(p && rHost)
+	{
+		strncpy(rHost, p, 64);
+		rHost[63] = '\0';
+	}
+	p = GetValueFromNameValueList(&pdata, "NewExternalPort");
+	if(p && extPort)
+	{
+		strncpy(extPort, p, 6);
+		extPort[5] = '\0';
+		r = UPNPCOMMAND_SUCCESS;
+	}
+	p = GetValueFromNameValueList(&pdata, "NewProtocol");
+	if(p && protocol)
+	{
+		strncpy(protocol, p, 4);
+		protocol[3] = '\0';
+	}
+	p = GetValueFromNameValueList(&pdata, "NewInternalClient");
+	if(p && intClient)
+	{
+		strncpy(intClient, p, 16);
+		intClient[15] = '\0';
+		r = 0;
+	}
+	p = GetValueFromNameValueList(&pdata, "NewInternalPort");
+	if(p && intPort)
+	{
+		strncpy(intPort, p, 6);
+		intPort[5] = '\0';
+	}
+	p = GetValueFromNameValueList(&pdata, "NewEnabled");
+	if(p && enabled)
+	{
+		strncpy(enabled, p, 4);
+		enabled[3] = '\0';
+	}
+	p = GetValueFromNameValueList(&pdata, "NewPortMappingDescription");
+	if(p && desc)
+	{
+		strncpy(desc, p, 80);
+		desc[79] = '\0';
+	}
+	p = GetValueFromNameValueList(&pdata, "NewLeaseDuration");
+	if(p && duration)
+	{
+		strncpy(duration, p, 16);
+		duration[15] = '\0';
+	}
+	p = GetValueFromNameValueList(&pdata, "errorCode");
+	if(p) {
+		r = UPNPCOMMAND_UNKNOWN_ERROR;
+		sscanf(p, "%d", &r);
+	}
+	ClearNameValueList(&pdata);
+	free(GetPortMappingArgs);
+	return r;
+}
+
+LIBSPEC int
+UPNP_GetPortMappingNumberOfEntries(const char * controlURL,
+                                   const char * servicetype,
+                                   unsigned int * numEntries)
+{
+ 	struct NameValueParserData pdata;
+ 	char * buffer;
+ 	int bufsize;
+ 	char* p;
+	int ret = UPNPCOMMAND_UNKNOWN_ERROR;
+ 	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                                "GetPortMappingNumberOfEntries", 0,
+	                                &bufsize))) {
+		return UPNPCOMMAND_HTTP_ERROR;
+	}
+#ifdef DEBUG
+	DisplayNameValueList(buffer, bufsize);
+#endif
+ 	ParseNameValue(buffer, bufsize, &pdata);
+	free(buffer); buffer = NULL;
+
+ 	p = GetValueFromNameValueList(&pdata, "NewPortMappingNumberOfEntries");
+ 	if(numEntries && p) {
+		*numEntries = 0;
+ 		sscanf(p, "%u", numEntries);
+		ret = UPNPCOMMAND_SUCCESS;
+ 	}
+
+	p = GetValueFromNameValueList(&pdata, "errorCode");
+	if(p) {
+		ret = UPNPCOMMAND_UNKNOWN_ERROR;
+		sscanf(p, "%d", &ret);
+	}
+
+ 	ClearNameValueList(&pdata);
+	return ret;
+}
+
+/* UPNP_GetSpecificPortMappingEntry retrieves an existing port mapping
+ * the result is returned in the intClient and intPort strings
+ * please provide 16 and 6 bytes of data */
+LIBSPEC int
+UPNP_GetSpecificPortMappingEntry(const char * controlURL,
+                                 const char * servicetype,
+                                 const char * extPort,
+							     const char * proto,
+                                 char * intClient,
+                                 char * intPort,
+                                 char * desc,
+                                 char * enabled,
+                                 char * leaseDuration)
+{
+	struct NameValueParserData pdata;
+	struct UPNParg * GetPortMappingArgs;
+	char * buffer;
+	int bufsize;
+	char * p;
+	int ret = UPNPCOMMAND_UNKNOWN_ERROR;
+
+	if(!intPort || !intClient || !extPort || !proto)
+		return UPNPCOMMAND_INVALID_ARGS;
+
+	GetPortMappingArgs = calloc(4, sizeof(struct UPNParg));
+	GetPortMappingArgs[0].elt = "NewRemoteHost";
+	/* TODO : add remote host ? */
+	GetPortMappingArgs[1].elt = "NewExternalPort";
+	GetPortMappingArgs[1].val = extPort;
+	GetPortMappingArgs[2].elt = "NewProtocol";
+	GetPortMappingArgs[2].val = proto;
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                                "GetSpecificPortMappingEntry",
+	                                GetPortMappingArgs, &bufsize))) {
+		free(GetPortMappingArgs);
+		return UPNPCOMMAND_HTTP_ERROR;
+	}
+	/*DisplayNameValueList(buffer, bufsize);*/
+	ParseNameValue(buffer, bufsize, &pdata);
+	free(buffer); buffer = NULL;
+
+	p = GetValueFromNameValueList(&pdata, "NewInternalClient");
+	if(p) {
+		strncpy(intClient, p, 16);
+		intClient[15] = '\0';
+		ret = UPNPCOMMAND_SUCCESS;
+	} else
+		intClient[0] = '\0';
+
+	p = GetValueFromNameValueList(&pdata, "NewInternalPort");
+	if(p) {
+		strncpy(intPort, p, 6);
+		intPort[5] = '\0';
+	} else
+		intPort[0] = '\0';
+
+	p = GetValueFromNameValueList(&pdata, "NewEnabled");
+	if(p && enabled) {
+		strncpy(enabled, p, 4);
+		enabled[3] = '\0';
+	}
+
+	p = GetValueFromNameValueList(&pdata, "NewPortMappingDescription");
+	if(p && desc) {
+		strncpy(desc, p, 80);
+		desc[79] = '\0';
+	}
+
+	p = GetValueFromNameValueList(&pdata, "NewLeaseDuration");
+	if(p && leaseDuration)
+	{
+		strncpy(leaseDuration, p, 16);
+		leaseDuration[15] = '\0';
+	}
+
+	p = GetValueFromNameValueList(&pdata, "errorCode");
+	if(p) {
+		ret = UPNPCOMMAND_UNKNOWN_ERROR;
+		sscanf(p, "%d", &ret);
+	}
+
+	ClearNameValueList(&pdata);
+	free(GetPortMappingArgs);
+	return ret;
+}
+
+/* UPNP_GetListOfPortMappings()
+ *
+ * Possible UPNP Error codes :
+ * 606 Action not Authorized
+ * 730 PortMappingNotFound - no port mapping is found in the specified range.
+ * 733 InconsistantParameters - NewStartPort and NewEndPort values are not
+ *                              consistent.
+ */
+LIBSPEC int
+UPNP_GetListOfPortMappings(const char * controlURL,
+                           const char * servicetype,
+                           const char * startPort,
+                           const char * endPort,
+                           const char * protocol,
+                           const char * numberOfPorts,
+                           struct PortMappingParserData * data)
+{
+	struct NameValueParserData pdata;
+	struct UPNParg * GetListOfPortMappingsArgs;
+	const char * p;
+	char * buffer;
+	int bufsize;
+	int ret = UPNPCOMMAND_UNKNOWN_ERROR;
+
+	if(!startPort || !endPort || !protocol)
+		return UPNPCOMMAND_INVALID_ARGS;
+
+	GetListOfPortMappingsArgs = calloc(6, sizeof(struct UPNParg));
+	GetListOfPortMappingsArgs[0].elt = "NewStartPort";
+	GetListOfPortMappingsArgs[0].val = startPort;
+	GetListOfPortMappingsArgs[1].elt = "NewEndPort";
+	GetListOfPortMappingsArgs[1].val = endPort;
+	GetListOfPortMappingsArgs[2].elt = "NewProtocol";
+	GetListOfPortMappingsArgs[2].val = protocol;
+	GetListOfPortMappingsArgs[3].elt = "NewManage";
+	GetListOfPortMappingsArgs[3].val = "1";
+	GetListOfPortMappingsArgs[4].elt = "NewNumberOfPorts";
+	GetListOfPortMappingsArgs[4].val = numberOfPorts?numberOfPorts:"1000";
+
+	if(!(buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                                "GetListOfPortMappings",
+	                                GetListOfPortMappingsArgs, &bufsize))) {
+		free(GetListOfPortMappingsArgs);
+		return UPNPCOMMAND_HTTP_ERROR;
+	}
+	free(GetListOfPortMappingsArgs);
+
+	/*DisplayNameValueList(buffer, bufsize);*/
+	ParseNameValue(buffer, bufsize, &pdata);
+	free(buffer); buffer = NULL;
+
+	/*p = GetValueFromNameValueList(&pdata, "NewPortListing");*/
+	/*if(p) {
+		printf("NewPortListing : %s\n", p);
+	}*/
+	/*printf("NewPortListing(%d chars) : %s\n",
+	       pdata.portListingLength, pdata.portListing);*/
+	if(pdata.portListing)
+	{
+		/*struct PortMapping * pm;
+		int i = 0;*/
+		ParsePortListing(pdata.portListing, pdata.portListingLength,
+		                 data);
+		ret = UPNPCOMMAND_SUCCESS;
+		/*
+		for(pm = data->head.lh_first; pm != NULL; pm = pm->entries.le_next)
+		{
+			printf("%2d %s %5hu->%s:%-5hu '%s' '%s'\n",
+			       i, pm->protocol, pm->externalPort, pm->internalClient,
+			       pm->internalPort,
+			       pm->description, pm->remoteHost);
+			i++;
+		}
+		*/
+		/*FreePortListing(&data);*/
+	}
+
+	p = GetValueFromNameValueList(&pdata, "errorCode");
+	if(p) {
+		ret = UPNPCOMMAND_UNKNOWN_ERROR;
+		sscanf(p, "%d", &ret);
+	}
+	ClearNameValueList(&pdata);
+
+	/*printf("%.*s", bufsize, buffer);*/
+
+	return ret;
+}
+
+/* IGD:2, functions for service WANIPv6FirewallControl:1 */
+LIBSPEC int
+UPNP_GetFirewallStatus(const char * controlURL,
+				const char * servicetype,
+				int * firewallEnabled,
+				int * inboundPinholeAllowed)
+{
+	struct NameValueParserData pdata;
+	char * buffer;
+	int bufsize;
+	char * fe, *ipa, *p;
+	int ret = UPNPCOMMAND_UNKNOWN_ERROR;
+
+	if(!firewallEnabled && !inboundPinholeAllowed)
+		return UPNPCOMMAND_INVALID_ARGS;
+
+	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                           "GetFirewallStatus", 0, &bufsize);
+	if(!buffer) {
+		return UPNPCOMMAND_HTTP_ERROR;
+	}
+	ParseNameValue(buffer, bufsize, &pdata);
+	free(buffer); buffer = NULL;
+	fe = GetValueFromNameValueList(&pdata, "FirewallEnabled");
+	ipa = GetValueFromNameValueList(&pdata, "InboundPinholeAllowed");
+	if(ipa && fe)
+		ret = UPNPCOMMAND_SUCCESS;
+	if(fe)
+		*firewallEnabled = my_atoui(fe);
+	/*else
+		*firewallEnabled = 0;*/
+	if(ipa)
+		*inboundPinholeAllowed = my_atoui(ipa);
+	/*else
+		*inboundPinholeAllowed = 0;*/
+	p = GetValueFromNameValueList(&pdata, "errorCode");
+	if(p)
+	{
+		ret = UPNPCOMMAND_UNKNOWN_ERROR;
+		sscanf(p, "%d", &ret);
+	}
+	ClearNameValueList(&pdata);
+	return ret;
+}
+
+LIBSPEC int
+UPNP_GetOutboundPinholeTimeout(const char * controlURL, const char * servicetype,
+                    const char * remoteHost,
+                    const char * remotePort,
+                    const char * intClient,
+                    const char * intPort,
+                    const char * proto,
+                    int * opTimeout)
+{
+	struct UPNParg * GetOutboundPinholeTimeoutArgs;
+	char * buffer;
+	int bufsize;
+	struct NameValueParserData pdata;
+	const char * resVal;
+	char * p;
+	int ret;
+
+	if(!intPort || !intClient || !proto || !remotePort || !remoteHost)
+		return UPNPCOMMAND_INVALID_ARGS;
+
+	GetOutboundPinholeTimeoutArgs = calloc(6, sizeof(struct UPNParg));
+	GetOutboundPinholeTimeoutArgs[0].elt = "RemoteHost";
+	GetOutboundPinholeTimeoutArgs[0].val = remoteHost;
+	GetOutboundPinholeTimeoutArgs[1].elt = "RemotePort";
+	GetOutboundPinholeTimeoutArgs[1].val = remotePort;
+	GetOutboundPinholeTimeoutArgs[2].elt = "Protocol";
+	GetOutboundPinholeTimeoutArgs[2].val = proto;
+	GetOutboundPinholeTimeoutArgs[3].elt = "InternalPort";
+	GetOutboundPinholeTimeoutArgs[3].val = intPort;
+	GetOutboundPinholeTimeoutArgs[4].elt = "InternalClient";
+	GetOutboundPinholeTimeoutArgs[4].val = intClient;
+	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                           "GetOutboundPinholeTimeout", GetOutboundPinholeTimeoutArgs, &bufsize);
+	if(!buffer)
+		return UPNPCOMMAND_HTTP_ERROR;
+	ParseNameValue(buffer, bufsize, &pdata);
+	free(buffer); buffer = NULL;
+	resVal = GetValueFromNameValueList(&pdata, "errorCode");
+	if(resVal)
+	{
+		ret = UPNPCOMMAND_UNKNOWN_ERROR;
+		sscanf(resVal, "%d", &ret);
+	}
+	else
+	{
+		ret = UPNPCOMMAND_SUCCESS;
+		p = GetValueFromNameValueList(&pdata, "OutboundPinholeTimeout");
+		if(p)
+			*opTimeout = my_atoui(p);
+	}
+	ClearNameValueList(&pdata);
+	free(GetOutboundPinholeTimeoutArgs);
+	return ret;
+}
+
+LIBSPEC int
+UPNP_AddPinhole(const char * controlURL, const char * servicetype,
+                    const char * remoteHost,
+                    const char * remotePort,
+                    const char * intClient,
+                    const char * intPort,
+                    const char * proto,
+                    const char * leaseTime,
+                    char * uniqueID)
+{
+	struct UPNParg * AddPinholeArgs;
+	char * buffer;
+	int bufsize;
+	struct NameValueParserData pdata;
+	const char * resVal;
+	char * p;
+	int ret;
+
+	if(!intPort || !intClient || !proto || !remoteHost || !remotePort || !leaseTime)
+		return UPNPCOMMAND_INVALID_ARGS;
+
+	AddPinholeArgs = calloc(7, sizeof(struct UPNParg));
+	/* RemoteHost can be wilcarded */
+	if(strncmp(remoteHost, "empty", 5)==0)
+	{
+		AddPinholeArgs[0].elt = "RemoteHost";
+		AddPinholeArgs[0].val = "";
+	}
+	else
+	{
+		AddPinholeArgs[0].elt = "RemoteHost";
+		AddPinholeArgs[0].val = remoteHost;
+	}
+	AddPinholeArgs[1].elt = "RemotePort";
+	AddPinholeArgs[1].val = remotePort;
+	AddPinholeArgs[2].elt = "Protocol";
+	AddPinholeArgs[2].val = proto;
+	AddPinholeArgs[3].elt = "InternalPort";
+	AddPinholeArgs[3].val = intPort;
+	if(strncmp(intClient, "empty", 5)==0)
+	{
+		AddPinholeArgs[4].elt = "InternalClient";
+		AddPinholeArgs[4].val = "";
+	}
+	else
+	{
+		AddPinholeArgs[4].elt = "InternalClient";
+		AddPinholeArgs[4].val = intClient;
+	}
+	AddPinholeArgs[5].elt = "LeaseTime";
+	AddPinholeArgs[5].val = leaseTime;
+	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                           "AddPinhole", AddPinholeArgs, &bufsize);
+	if(!buffer)
+		return UPNPCOMMAND_HTTP_ERROR;
+	ParseNameValue(buffer, bufsize, &pdata);
+	free(buffer); buffer = NULL;
+	p = GetValueFromNameValueList(&pdata, "UniqueID");
+	if(p)
+	{
+		strncpy(uniqueID, p, 8);
+		uniqueID[7] = '\0';
+	}
+	resVal = GetValueFromNameValueList(&pdata, "errorCode");
+	if(resVal)
+	{
+		/*printf("AddPortMapping errorCode = '%s'\n", resVal);*/
+		ret = UPNPCOMMAND_UNKNOWN_ERROR;
+		sscanf(resVal, "%d", &ret);
+	}
+	else
+	{
+		ret = UPNPCOMMAND_SUCCESS;
+	}
+	ClearNameValueList(&pdata);
+	free(AddPinholeArgs);
+	return ret;
+}
+
+LIBSPEC int
+UPNP_UpdatePinhole(const char * controlURL, const char * servicetype,
+                    const char * uniqueID,
+                    const char * leaseTime)
+{
+	struct UPNParg * UpdatePinholeArgs;
+	char * buffer;
+	int bufsize;
+	struct NameValueParserData pdata;
+	const char * resVal;
+	int ret;
+
+	if(!uniqueID || !leaseTime)
+		return UPNPCOMMAND_INVALID_ARGS;
+
+	UpdatePinholeArgs = calloc(3, sizeof(struct UPNParg));
+	UpdatePinholeArgs[0].elt = "UniqueID";
+	UpdatePinholeArgs[0].val = uniqueID;
+	UpdatePinholeArgs[1].elt = "NewLeaseTime";
+	UpdatePinholeArgs[1].val = leaseTime;
+	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                           "UpdatePinhole", UpdatePinholeArgs, &bufsize);
+	if(!buffer)
+		return UPNPCOMMAND_HTTP_ERROR;
+	ParseNameValue(buffer, bufsize, &pdata);
+	free(buffer); buffer = NULL;
+	resVal = GetValueFromNameValueList(&pdata, "errorCode");
+	if(resVal)
+	{
+		/*printf("AddPortMapping errorCode = '%s'\n", resVal); */
+		ret = UPNPCOMMAND_UNKNOWN_ERROR;
+		sscanf(resVal, "%d", &ret);
+	}
+	else
+	{
+		ret = UPNPCOMMAND_SUCCESS;
+	}
+	ClearNameValueList(&pdata);
+	free(UpdatePinholeArgs);
+	return ret;
+}
+
+LIBSPEC int
+UPNP_DeletePinhole(const char * controlURL, const char * servicetype, const char * uniqueID)
+{
+	/*struct NameValueParserData pdata;*/
+	struct UPNParg * DeletePinholeArgs;
+	char * buffer;
+	int bufsize;
+	struct NameValueParserData pdata;
+	const char * resVal;
+	int ret;
+
+	if(!uniqueID)
+		return UPNPCOMMAND_INVALID_ARGS;
+
+	DeletePinholeArgs = calloc(2, sizeof(struct UPNParg));
+	DeletePinholeArgs[0].elt = "UniqueID";
+	DeletePinholeArgs[0].val = uniqueID;
+	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                           "DeletePinhole", DeletePinholeArgs, &bufsize);
+	if(!buffer)
+		return UPNPCOMMAND_HTTP_ERROR;
+	/*DisplayNameValueList(buffer, bufsize);*/
+	ParseNameValue(buffer, bufsize, &pdata);
+	free(buffer); buffer = NULL;
+	resVal = GetValueFromNameValueList(&pdata, "errorCode");
+	if(resVal)
+	{
+		ret = UPNPCOMMAND_UNKNOWN_ERROR;
+		sscanf(resVal, "%d", &ret);
+	}
+	else
+	{
+		ret = UPNPCOMMAND_SUCCESS;
+	}
+	ClearNameValueList(&pdata);
+	free(DeletePinholeArgs);
+	return ret;
+}
+
+LIBSPEC int
+UPNP_CheckPinholeWorking(const char * controlURL, const char * servicetype,
+                                 const char * uniqueID, int * isWorking)
+{
+	struct NameValueParserData pdata;
+	struct UPNParg * CheckPinholeWorkingArgs;
+	char * buffer;
+	int bufsize;
+	char * p;
+	int ret = UPNPCOMMAND_UNKNOWN_ERROR;
+
+	if(!uniqueID)
+		return UPNPCOMMAND_INVALID_ARGS;
+
+	CheckPinholeWorkingArgs = calloc(4, sizeof(struct UPNParg));
+	CheckPinholeWorkingArgs[0].elt = "UniqueID";
+	CheckPinholeWorkingArgs[0].val = uniqueID;
+	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                           "CheckPinholeWorking", CheckPinholeWorkingArgs, &bufsize);
+	if(!buffer)
+		return UPNPCOMMAND_HTTP_ERROR;
+	ParseNameValue(buffer, bufsize, &pdata);
+	free(buffer); buffer = NULL;
+
+	p = GetValueFromNameValueList(&pdata, "IsWorking");
+	if(p)
+	{
+		*isWorking=my_atoui(p);
+		ret = UPNPCOMMAND_SUCCESS;
+	}
+	else
+		*isWorking = 0;
+
+	p = GetValueFromNameValueList(&pdata, "errorCode");
+	if(p)
+	{
+		ret = UPNPCOMMAND_UNKNOWN_ERROR;
+		sscanf(p, "%d", &ret);
+	}
+
+	ClearNameValueList(&pdata);
+	free(CheckPinholeWorkingArgs);
+	return ret;
+}
+
+LIBSPEC int
+UPNP_GetPinholePackets(const char * controlURL, const char * servicetype,
+                                 const char * uniqueID, int * packets)
+{
+	struct NameValueParserData pdata;
+	struct UPNParg * GetPinholePacketsArgs;
+	char * buffer;
+	int bufsize;
+	char * p;
+	int ret = UPNPCOMMAND_UNKNOWN_ERROR;
+
+	if(!uniqueID)
+		return UPNPCOMMAND_INVALID_ARGS;
+
+	GetPinholePacketsArgs = calloc(4, sizeof(struct UPNParg));
+	GetPinholePacketsArgs[0].elt = "UniqueID";
+	GetPinholePacketsArgs[0].val = uniqueID;
+	buffer = simpleUPnPcommand(-1, controlURL, servicetype,
+	                           "GetPinholePackets", GetPinholePacketsArgs, &bufsize);
+	if(!buffer)
+		return UPNPCOMMAND_HTTP_ERROR;
+	ParseNameValue(buffer, bufsize, &pdata);
+	free(buffer); buffer = NULL;
+
+	p = GetValueFromNameValueList(&pdata, "PinholePackets");
+	if(p)
+	{
+		*packets=my_atoui(p);
+		ret = UPNPCOMMAND_SUCCESS;
+	}
+
+	p = GetValueFromNameValueList(&pdata, "errorCode");
+	if(p)
+	{
+		ret = UPNPCOMMAND_UNKNOWN_ERROR;
+		sscanf(p, "%d", &ret);
+	}
+
+	ClearNameValueList(&pdata);
+	free(GetPinholePacketsArgs);
+	return ret;
+}
+
+
diff --git a/Externals/miniupnpc/src/upnpcommands.h b/Externals/miniupnpc/src/upnpcommands.h
new file mode 100644
index 0000000000..ee3ce89df2
--- /dev/null
+++ b/Externals/miniupnpc/src/upnpcommands.h
@@ -0,0 +1,271 @@
+/* $Id: upnpcommands.h,v 1.25 2012/09/27 15:42:10 nanard Exp $ */
+/* Miniupnp project : http://miniupnp.free.fr/
+ * Author : Thomas Bernard
+ * Copyright (c) 2005-2011 Thomas Bernard
+ * This software is subject to the conditions detailed in the
+ * LICENCE file provided within this distribution */
+#ifndef UPNPCOMMANDS_H_INCLUDED
+#define UPNPCOMMANDS_H_INCLUDED
+
+#include "upnpreplyparse.h"
+#include "portlistingparse.h"
+#include "declspec.h"
+#include "miniupnpctypes.h"
+
+/* MiniUPnPc return codes : */
+#define UPNPCOMMAND_SUCCESS (0)
+#define UPNPCOMMAND_UNKNOWN_ERROR (-1)
+#define UPNPCOMMAND_INVALID_ARGS (-2)
+#define UPNPCOMMAND_HTTP_ERROR (-3)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+LIBSPEC UNSIGNED_INTEGER
+UPNP_GetTotalBytesSent(const char * controlURL,
+					const char * servicetype);
+
+LIBSPEC UNSIGNED_INTEGER
+UPNP_GetTotalBytesReceived(const char * controlURL,
+						const char * servicetype);
+
+LIBSPEC UNSIGNED_INTEGER
+UPNP_GetTotalPacketsSent(const char * controlURL,
+					const char * servicetype);
+
+LIBSPEC UNSIGNED_INTEGER
+UPNP_GetTotalPacketsReceived(const char * controlURL,
+					const char * servicetype);
+
+/* UPNP_GetStatusInfo()
+ * status and lastconnerror are 64 byte buffers
+ * Return values :
+ * UPNPCOMMAND_SUCCESS, UPNPCOMMAND_INVALID_ARGS, UPNPCOMMAND_UNKNOWN_ERROR
+ * or a UPnP Error code */
+LIBSPEC int
+UPNP_GetStatusInfo(const char * controlURL,
+			       const char * servicetype,
+				   char * status,
+				   unsigned int * uptime,
+                   char * lastconnerror);
+
+/* UPNP_GetConnectionTypeInfo()
+ * argument connectionType is a 64 character buffer
+ * Return Values :
+ * UPNPCOMMAND_SUCCESS, UPNPCOMMAND_INVALID_ARGS, UPNPCOMMAND_UNKNOWN_ERROR
+ * or a UPnP Error code */
+LIBSPEC int
+UPNP_GetConnectionTypeInfo(const char * controlURL,
+                           const char * servicetype,
+						   char * connectionType);
+
+/* UPNP_GetExternalIPAddress() call the corresponding UPNP method.
+ * if the third arg is not null the value is copied to it.
+ * at least 16 bytes must be available
+ *
+ * Return values :
+ * 0 : SUCCESS
+ * NON ZERO : ERROR Either an UPnP error code or an unknown error.
+ *
+ * possible UPnP Errors :
+ * 402 Invalid Args - See UPnP Device Architecture section on Control.
+ * 501 Action Failed - See UPnP Device Architecture section on Control. */
+LIBSPEC int
+UPNP_GetExternalIPAddress(const char * controlURL,
+                          const char * servicetype,
+                          char * extIpAdd);
+
+/* UPNP_GetLinkLayerMaxBitRates()
+ * call WANCommonInterfaceConfig:1#GetCommonLinkProperties
+ *
+ * return values :
+ * UPNPCOMMAND_SUCCESS, UPNPCOMMAND_INVALID_ARGS, UPNPCOMMAND_UNKNOWN_ERROR
+ * or a UPnP Error Code. */
+LIBSPEC int
+UPNP_GetLinkLayerMaxBitRates(const char* controlURL,
+							const char* servicetype,
+							unsigned int * bitrateDown,
+							unsigned int * bitrateUp);
+
+/* UPNP_AddPortMapping()
+ * if desc is NULL, it will be defaulted to "libminiupnpc"
+ * remoteHost is usually NULL because IGD don't support it.
+ *
+ * Return values :
+ * 0 : SUCCESS
+ * NON ZERO : ERROR. Either an UPnP error code or an unknown error.
+ *
+ * List of possible UPnP errors for AddPortMapping :
+ * errorCode errorDescription (short) - Description (long)
+ * 402 Invalid Args - See UPnP Device Architecture section on Control.
+ * 501 Action Failed - See UPnP Device Architecture section on Control.
+ * 715 WildCardNotPermittedInSrcIP - The source IP address cannot be
+ *                                   wild-carded
+ * 716 WildCardNotPermittedInExtPort - The external port cannot be wild-carded
+ * 718 ConflictInMappingEntry - The port mapping entry specified conflicts
+ *                     with a mapping assigned previously to another client
+ * 724 SamePortValuesRequired - Internal and External port values
+ *                              must be the same
+ * 725 OnlyPermanentLeasesSupported - The NAT implementation only supports
+ *                  permanent lease times on port mappings
+ * 726 RemoteHostOnlySupportsWildcard - RemoteHost must be a wildcard
+ *                             and cannot be a specific IP address or DNS name
+ * 727 ExternalPortOnlySupportsWildcard - ExternalPort must be a wildcard and
+ *                                        cannot be a specific port value */
+LIBSPEC int
+UPNP_AddPortMapping(const char * controlURL, const char * servicetype,
+                    const char * extPort,
+				    const char * inPort,
+					const char * inClient,
+					const char * desc,
+                    const char * proto,
+                    const char * remoteHost,
+                    const char * leaseDuration);
+
+/* UPNP_DeletePortMapping()
+ * Use same argument values as what was used for AddPortMapping().
+ * remoteHost is usually NULL because IGD don't support it.
+ * Return Values :
+ * 0 : SUCCESS
+ * NON ZERO : error. Either an UPnP error code or an undefined error.
+ *
+ * List of possible UPnP errors for DeletePortMapping :
+ * 402 Invalid Args - See UPnP Device Architecture section on Control.
+ * 714 NoSuchEntryInArray - The specified value does not exist in the array */
+LIBSPEC int
+UPNP_DeletePortMapping(const char * controlURL, const char * servicetype,
+                       const char * extPort, const char * proto,
+                       const char * remoteHost);
+
+/* UPNP_GetPortMappingNumberOfEntries()
+ * not supported by all routers */
+LIBSPEC int
+UPNP_GetPortMappingNumberOfEntries(const char* controlURL,
+                                   const char* servicetype,
+                                   unsigned int * num);
+
+/* UPNP_GetSpecificPortMappingEntry()
+ *    retrieves an existing port mapping
+ * params :
+ *  in   extPort
+ *  in   proto
+ *  out  intClient (16 bytes)
+ *  out  intPort (6 bytes)
+ *  out  desc (80 bytes)
+ *  out  enabled (4 bytes)
+ *  out  leaseDuration (16 bytes)
+ *
+ * return value :
+ * UPNPCOMMAND_SUCCESS, UPNPCOMMAND_INVALID_ARGS, UPNPCOMMAND_UNKNOWN_ERROR
+ * or a UPnP Error Code. */
+LIBSPEC int
+UPNP_GetSpecificPortMappingEntry(const char * controlURL,
+                                 const char * servicetype,
+                                 const char * extPort,
+                                 const char * proto,
+                                 char * intClient,
+                                 char * intPort,
+                                 char * desc,
+                                 char * enabled,
+                                 char * leaseDuration);
+
+/* UPNP_GetGenericPortMappingEntry()
+ * params :
+ *  in   index
+ *  out  extPort (6 bytes)
+ *  out  intClient (16 bytes)
+ *  out  intPort (6 bytes)
+ *  out  protocol (4 bytes)
+ *  out  desc (80 bytes)
+ *  out  enabled (4 bytes)
+ *  out  rHost (64 bytes)
+ *  out  duration (16 bytes)
+ *
+ * return value :
+ * UPNPCOMMAND_SUCCESS, UPNPCOMMAND_INVALID_ARGS, UPNPCOMMAND_UNKNOWN_ERROR
+ * or a UPnP Error Code.
+ *
+ * Possible UPNP Error codes :
+ * 402 Invalid Args - See UPnP Device Architecture section on Control.
+ * 713 SpecifiedArrayIndexInvalid - The specified array index is out of bounds
+ */
+LIBSPEC int
+UPNP_GetGenericPortMappingEntry(const char * controlURL,
+                                const char * servicetype,
+								const char * index,
+								char * extPort,
+								char * intClient,
+								char * intPort,
+								char * protocol,
+								char * desc,
+								char * enabled,
+								char * rHost,
+								char * duration);
+
+/* UPNP_GetListOfPortMappings()      Available in IGD v2
+ *
+ *
+ * Possible UPNP Error codes :
+ * 606 Action not Authorized
+ * 730 PortMappingNotFound - no port mapping is found in the specified range.
+ * 733 InconsistantParameters - NewStartPort and NewEndPort values are not
+ *                              consistent.
+ */
+LIBSPEC int
+UPNP_GetListOfPortMappings(const char * controlURL,
+                           const char * servicetype,
+                           const char * startPort,
+                           const char * endPort,
+                           const char * protocol,
+                           const char * numberOfPorts,
+                           struct PortMappingParserData * data);
+
+/* IGD:2, functions for service WANIPv6FirewallControl:1 */
+LIBSPEC int
+UPNP_GetFirewallStatus(const char * controlURL,
+				const char * servicetype,
+				int * firewallEnabled,
+				int * inboundPinholeAllowed);
+
+LIBSPEC int
+UPNP_GetOutboundPinholeTimeout(const char * controlURL, const char * servicetype,
+                    const char * remoteHost,
+                    const char * remotePort,
+                    const char * intClient,
+                    const char * intPort,
+                    const char * proto,
+                    int * opTimeout);
+
+LIBSPEC int
+UPNP_AddPinhole(const char * controlURL, const char * servicetype,
+                    const char * remoteHost,
+                    const char * remotePort,
+                    const char * intClient,
+                    const char * intPort,
+                    const char * proto,
+                    const char * leaseTime,
+                    char * uniqueID);
+
+LIBSPEC int
+UPNP_UpdatePinhole(const char * controlURL, const char * servicetype,
+                    const char * uniqueID,
+                    const char * leaseTime);
+
+LIBSPEC int
+UPNP_DeletePinhole(const char * controlURL, const char * servicetype, const char * uniqueID);
+
+LIBSPEC int
+UPNP_CheckPinholeWorking(const char * controlURL, const char * servicetype,
+                                 const char * uniqueID, int * isWorking);
+
+LIBSPEC int
+UPNP_GetPinholePackets(const char * controlURL, const char * servicetype,
+                                 const char * uniqueID, int * packets);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/Externals/miniupnpc/src/upnperrors.c b/Externals/miniupnpc/src/upnperrors.c
new file mode 100644
index 0000000000..644098f0d7
--- /dev/null
+++ b/Externals/miniupnpc/src/upnperrors.c
@@ -0,0 +1,104 @@
+/* $Id: upnperrors.c,v 1.6 2012/03/15 01:02:03 nanard Exp $ */
+/* Project : miniupnp
+ * Author : Thomas BERNARD
+ * copyright (c) 2007 Thomas Bernard
+ * All Right reserved.
+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * This software is subjet to the conditions detailed in the
+ * provided LICENCE file. */
+#include <string.h>
+#include "upnperrors.h"
+#include "upnpcommands.h"
+#include "miniupnpc.h"
+
+const char * strupnperror(int err)
+{
+	const char * s = NULL;
+	switch(err) {
+	case UPNPCOMMAND_SUCCESS:
+		s = "Success";
+		break;
+	case UPNPCOMMAND_UNKNOWN_ERROR:
+		s = "Miniupnpc Unknown Error";
+		break;
+	case UPNPCOMMAND_INVALID_ARGS:
+		s = "Miniupnpc Invalid Arguments";
+		break;
+	case UPNPDISCOVER_SOCKET_ERROR:
+		s = "Miniupnpc Socket error";
+		break;
+	case UPNPDISCOVER_MEMORY_ERROR:
+		s = "Miniupnpc Memory allocation error";
+		break;
+	case 401:
+		s = "Invalid Action";
+		break;
+	case 402:
+		s = "Invalid Args";
+		break;
+	case 501:
+		s = "Action Failed";
+		break;
+	case 606:
+		s = "Action not authorized";
+		break;
+	case 701:
+		s = "PinholeSpaceExhausted";
+		break;
+	case 702:
+		s = "FirewallDisabled";
+		break;
+	case 703:
+		s = "InboundPinholeNotAllowed";
+		break;
+	case 704:
+		s = "NoSuchEntry";
+		break;
+	case 705:
+		s = "ProtocolNotSupported";
+		break;
+	case 706:
+		s = "InternalPortWildcardingNotAllowed";
+		break;
+	case 707:
+		s = "ProtocolWildcardingNotAllowed";
+		break;
+	case 708:
+		s = "WildcardNotPermittedInSrcIP";
+		break;
+	case 709:
+		s = "NoPacketSent";
+		break;
+	case 713:
+		s = "SpecifiedArrayIndexInvalid";
+		break;
+	case 714:
+		s = "NoSuchEntryInArray";
+		break;
+	case 715:
+		s = "WildCardNotPermittedInSrcIP";
+		break;
+	case 716:
+		s = "WildCardNotPermittedInExtPort";
+		break;
+	case 718:
+		s = "ConflictInMappingEntry";
+		break;
+	case 724:
+		s = "SamePortValuesRequired";
+		break;
+	case 725:
+		s = "OnlyPermanentLeasesSupported";
+		break;
+	case 726:
+		s = "RemoteHostOnlySupportsWildcard";
+		break;
+	case 727:
+		s = "ExternalPortOnlySupportsWildcard";
+		break;
+	default:
+		s = "UnknownError";
+		break;
+	}
+	return s;
+}
diff --git a/Externals/miniupnpc/src/upnperrors.h b/Externals/miniupnpc/src/upnperrors.h
new file mode 100644
index 0000000000..077d6938b2
--- /dev/null
+++ b/Externals/miniupnpc/src/upnperrors.h
@@ -0,0 +1,26 @@
+/* $Id: upnperrors.h,v 1.4 2012/09/27 15:42:11 nanard Exp $ */
+/* (c) 2007 Thomas Bernard
+ * All rights reserved.
+ * MiniUPnP Project.
+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * This software is subjet to the conditions detailed in the
+ * provided LICENCE file. */
+#ifndef UPNPERRORS_H_INCLUDED
+#define UPNPERRORS_H_INCLUDED
+
+#include "declspec.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* strupnperror()
+ * Return a string description of the UPnP error code
+ * or NULL for undefinded errors */
+LIBSPEC const char * strupnperror(int err);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Externals/miniupnpc/src/upnpreplyparse.c b/Externals/miniupnpc/src/upnpreplyparse.c
new file mode 100644
index 0000000000..e3a0e992fc
--- /dev/null
+++ b/Externals/miniupnpc/src/upnpreplyparse.c
@@ -0,0 +1,152 @@
+/* $Id: upnpreplyparse.c,v 1.12 2012/03/05 19:42:48 nanard Exp $ */
+/* MiniUPnP project
+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * (c) 2006-2011 Thomas Bernard
+ * This software is subject to the conditions detailed
+ * in the LICENCE file provided within the distribution */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "upnpreplyparse.h"
+#include "minixml.h"
+
+static void
+NameValueParserStartElt(void * d, const char * name, int l)
+{
+    struct NameValueParserData * data = (struct NameValueParserData *)d;
+    if(l>63)
+        l = 63;
+    memcpy(data->curelt, name, l);
+    data->curelt[l] = '\0';
+}
+
+static void
+NameValueParserGetData(void * d, const char * datas, int l)
+{
+    struct NameValueParserData * data = (struct NameValueParserData *)d;
+    struct NameValue * nv;
+	if(strcmp(data->curelt, "NewPortListing") == 0)
+	{
+		/* specific case for NewPortListing which is a XML Document */
+		data->portListing = malloc(l + 1);
+		if(!data->portListing)
+		{
+			/* malloc error */
+			return;
+		}
+		memcpy(data->portListing, datas, l);
+		data->portListing[l] = '\0';
+		data->portListingLength = l;
+	}
+	else
+	{
+		/* standard case. Limited to 63 chars strings */
+	    nv = malloc(sizeof(struct NameValue));
+	    if(l>63)
+	        l = 63;
+	    strncpy(nv->name, data->curelt, 64);
+		nv->name[63] = '\0';
+	    memcpy(nv->value, datas, l);
+	    nv->value[l] = '\0';
+	    LIST_INSERT_HEAD( &(data->head), nv, entries);
+	}
+}
+
+void
+ParseNameValue(const char * buffer, int bufsize,
+               struct NameValueParserData * data)
+{
+    struct xmlparser parser;
+    LIST_INIT(&(data->head));
+	data->portListing = NULL;
+	data->portListingLength = 0;
+    /* init xmlparser object */
+    parser.xmlstart = buffer;
+    parser.xmlsize = bufsize;
+    parser.data = data;
+    parser.starteltfunc = NameValueParserStartElt;
+    parser.endeltfunc = 0;
+    parser.datafunc = NameValueParserGetData;
+	parser.attfunc = 0;
+    parsexml(&parser);
+}
+
+void
+ClearNameValueList(struct NameValueParserData * pdata)
+{
+    struct NameValue * nv;
+	if(pdata->portListing)
+	{
+		free(pdata->portListing);
+		pdata->portListing = NULL;
+		pdata->portListingLength = 0;
+	}
+    while((nv = pdata->head.lh_first) != NULL)
+    {
+        LIST_REMOVE(nv, entries);
+        free(nv);
+    }
+}
+
+char *
+GetValueFromNameValueList(struct NameValueParserData * pdata,
+                          const char * Name)
+{
+    struct NameValue * nv;
+    char * p = NULL;
+    for(nv = pdata->head.lh_first;
+        (nv != NULL) && (p == NULL);
+        nv = nv->entries.le_next)
+    {
+        if(strcmp(nv->name, Name) == 0)
+            p = nv->value;
+    }
+    return p;
+}
+
+#if 0
+/* useless now that minixml ignores namespaces by itself */
+char *
+GetValueFromNameValueListIgnoreNS(struct NameValueParserData * pdata,
+                                  const char * Name)
+{
+	struct NameValue * nv;
+	char * p = NULL;
+	char * pname;
+	for(nv = pdata->head.lh_first;
+	    (nv != NULL) && (p == NULL);
+		nv = nv->entries.le_next)
+	{
+		pname = strrchr(nv->name, ':');
+		if(pname)
+			pname++;
+		else
+			pname = nv->name;
+		if(strcmp(pname, Name)==0)
+			p = nv->value;
+	}
+	return p;
+}
+#endif
+
+/* debug all-in-one function
+ * do parsing then display to stdout */
+#ifdef DEBUG
+void
+DisplayNameValueList(char * buffer, int bufsize)
+{
+    struct NameValueParserData pdata;
+    struct NameValue * nv;
+    ParseNameValue(buffer, bufsize, &pdata);
+    for(nv = pdata.head.lh_first;
+        nv != NULL;
+        nv = nv->entries.le_next)
+    {
+        printf("%s = %s\n", nv->name, nv->value);
+    }
+    ClearNameValueList(&pdata);
+}
+#endif
+
diff --git a/Externals/miniupnpc/src/upnpreplyparse.h b/Externals/miniupnpc/src/upnpreplyparse.h
new file mode 100644
index 0000000000..78949167fa
--- /dev/null
+++ b/Externals/miniupnpc/src/upnpreplyparse.h
@@ -0,0 +1,64 @@
+/* $Id: upnpreplyparse.h,v 1.14 2012/09/27 15:42:11 nanard Exp $ */
+/* MiniUPnP project
+ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ * (c) 2006-2012 Thomas Bernard
+ * This software is subject to the conditions detailed
+ * in the LICENCE file provided within the distribution */
+
+#ifndef UPNPREPLYPARSE_H_INCLUDED
+#define UPNPREPLYPARSE_H_INCLUDED
+
+#if defined(NO_SYS_QUEUE_H) || defined(_WIN32) || defined(__HAIKU__)
+#include "bsdqueue.h"
+#else
+#include <sys/queue.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct NameValue {
+    LIST_ENTRY(NameValue) entries;
+    char name[64];
+    char value[64];
+};
+
+struct NameValueParserData {
+    LIST_HEAD(listhead, NameValue) head;
+    char curelt[64];
+	char * portListing;
+	int portListingLength;
+};
+
+/* ParseNameValue() */
+void
+ParseNameValue(const char * buffer, int bufsize,
+               struct NameValueParserData * data);
+
+/* ClearNameValueList() */
+void
+ClearNameValueList(struct NameValueParserData * pdata);
+
+/* GetValueFromNameValueList() */
+char *
+GetValueFromNameValueList(struct NameValueParserData * pdata,
+                          const char * Name);
+
+/* GetValueFromNameValueListIgnoreNS() */
+char *
+GetValueFromNameValueListIgnoreNS(struct NameValueParserData * pdata,
+                                  const char * Name);
+
+/* DisplayNameValueList() */
+#ifdef DEBUG
+void
+DisplayNameValueList(char * buffer, int bufsize);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj
index a191d86282..53000b2cc9 100644
--- a/Source/Core/Core/Core.vcxproj
+++ b/Source/Core/Core/Core.vcxproj
@@ -1,602 +1,602 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8C60E805-0DA5-4E25-8F84-038DB504BB0D}</ProjectGuid>
-    <RootNamespace>Core</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\VSProps\Base.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_Debug.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\VSProps\Base.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_Debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\VSProps\Base.props" />
-    <Import Project="..\..\VSProps\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\VSProps\Base.props" />
-    <Import Project="..\..\VSProps\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\VSProps\Base.props" />
-    <Import Project="..\..\VSProps\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\VSProps\Base.props" />
-    <Import Project="..\..\VSProps\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalLibraryDirectories>
-      </AdditionalLibraryDirectories>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="Src\ActionReplay.cpp" />
-    <ClCompile Include="Src\ARDecrypt.cpp" />
-    <ClCompile Include="Src\BootManager.cpp" />
-    <ClCompile Include="Src\Boot\Boot.cpp" />
-    <ClCompile Include="Src\Boot\Boot_BS2Emu.cpp" />
-    <ClCompile Include="Src\Boot\Boot_DOL.cpp" />
-    <ClCompile Include="Src\Boot\Boot_ELF.cpp" />
-    <ClCompile Include="Src\Boot\Boot_WiiWAD.cpp" />
-    <ClCompile Include="Src\Boot\ElfReader.cpp" />
-    <ClCompile Include="Src\ConfigManager.cpp" />
-    <ClCompile Include="Src\Console.cpp" />
-    <ClCompile Include="Src\Core.cpp" />
-    <ClCompile Include="Src\CoreParameter.cpp" />
-    <ClCompile Include="Src\CoreTiming.cpp" />
-    <ClCompile Include="Src\Debugger\Debugger_SymbolMap.cpp" />
-    <ClCompile Include="Src\Debugger\Dump.cpp" />
-    <ClCompile Include="Src\Debugger\PPCDebugInterface.cpp" />
-    <ClCompile Include="Src\DSP\assemble.cpp" />
-    <ClCompile Include="Src\DSP\disassemble.cpp" />
-    <ClCompile Include="Src\DSP\DSPAccelerator.cpp" />
-    <ClCompile Include="Src\DSP\DSPAnalyzer.cpp" />
-    <ClCompile Include="Src\DSP\DSPCodeUtil.cpp" />
-    <ClCompile Include="Src\DSP\DSPCore.cpp" />
-    <ClCompile Include="Src\DSP\DSPEmitter.cpp" />
-    <ClCompile Include="Src\DSP\DSPHWInterface.cpp" />
-    <ClCompile Include="Src\DSP\DspIntArithmetic.cpp" />
-    <ClCompile Include="Src\DSP\DspIntBranch.cpp" />
-    <ClCompile Include="Src\DSP\DSPIntCCUtil.cpp" />
-    <ClCompile Include="Src\DSP\DSPInterpreter.cpp" />
-    <ClCompile Include="Src\DSP\DSPIntExtOps.cpp" />
-    <ClCompile Include="Src\DSP\DspIntLoadStore.cpp" />
-    <ClCompile Include="Src\DSP\DspIntMisc.cpp" />
-    <ClCompile Include="Src\DSP\DspIntMultiplier.cpp" />
-    <ClCompile Include="Src\DSP\DSPMemoryMap.cpp" />
-    <ClCompile Include="Src\DSP\DSPStacks.cpp" />
-    <ClCompile Include="Src\DSP\DSPTables.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitArithmetic.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitBranch.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitCCUtil.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitExtOps.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitLoadStore.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitMisc.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitMultiplier.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitRegCache.cpp" />
-    <ClCompile Include="Src\DSP\Jit\DSPJitUtil.cpp" />
-    <ClCompile Include="Src\DSP\LabelMap.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoAnalyzer.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoPlaybackAnalyzer.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoDataFile.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoPlayer.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoRecordAnalyzer.cpp" />
-    <ClCompile Include="Src\FifoPlayer\FifoRecorder.cpp" />
-    <ClCompile Include="Src\GeckoCode.cpp" />
-    <ClCompile Include="Src\GeckoCodeConfig.cpp" />
-    <ClCompile Include="Src\HLE\HLE.cpp" />
-    <ClCompile Include="Src\HLE\HLE_Misc.cpp" />
-    <ClCompile Include="Src\HLE\HLE_OS.cpp" />
-    <ClCompile Include="Src\HW\AudioInterface.cpp" />
-    <ClCompile Include="Src\HW\BBA-TAP\TAP_Win32.cpp" />
-    <ClCompile Include="Src\HW\CPU.cpp" />
-    <ClCompile Include="Src\HW\DSP.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\DSPHLE.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\HLEMixer.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\MailHandler.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCodes.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_AX.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_CARD.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_GBA.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_InitAudioSystem.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_ROM.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_ADPCM.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Synth.cpp" />
-    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Voice.cpp" />
-    <ClCompile Include="Src\HW\DSPLLE\DSPDebugInterface.cpp" />
-    <ClCompile Include="Src\HW\DSPLLE\DSPHost.cpp" />
-    <ClCompile Include="Src\HW\DSPLLE\DSPLLE.cpp" />
-    <ClCompile Include="Src\HW\DSPLLE\DSPLLEGlobals.cpp" />
-    <ClCompile Include="Src\HW\DSPLLE\DSPLLETools.cpp" />
-    <ClCompile Include="Src\HW\DSPLLE\DSPSymbols.cpp" />
-    <ClCompile Include="Src\HW\DVDInterface.cpp" />
-    <ClCompile Include="Src\HW\EXI.cpp" />
-    <ClCompile Include="Src\HW\EXI_Channel.cpp" />
-    <ClCompile Include="Src\HW\EXI_Device.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceAD16.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceAMBaseboard.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceEthernet.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceGecko.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceIPL.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceMemoryCard.cpp" />
-    <ClCompile Include="Src\HW\EXI_DeviceMic.cpp" />
-    <ClCompile Include="Src\HW\GCMemcard.cpp" />
-    <ClCompile Include="Src\HW\GCPad.cpp" />
-    <ClCompile Include="Src\HW\GCPadEmu.cpp" />
-    <ClCompile Include="Src\HW\GPFifo.cpp" />
-    <ClCompile Include="Src\HW\HW.cpp" />
-    <ClCompile Include="Src\HW\Memmap.cpp" />
-    <ClCompile Include="Src\HW\MemmapFunctions.cpp" />
-    <ClCompile Include="Src\HW\MemoryInterface.cpp" />
-    <ClCompile Include="Src\HW\ProcessorInterface.cpp" />
-    <ClCompile Include="Src\HW\SI.cpp" />
-    <ClCompile Include="Src\HW\SI_Device.cpp" />
-    <ClCompile Include="Src\HW\SI_DeviceAMBaseboard.cpp" />
-    <ClCompile Include="Src\HW\SI_DeviceDanceMat.cpp" />
-    <ClCompile Include="Src\HW\SI_DeviceGBA.cpp" />
-    <ClCompile Include="Src\HW\SI_DeviceGCController.cpp" />
-    <ClCompile Include="Src\HW\SI_DeviceGCSteeringWheel.cpp" />
-    <ClCompile Include="Src\HW\Sram.cpp" />
-    <ClCompile Include="Src\HW\StreamADPCM.cpp" />
-    <ClCompile Include="Src\HW\SystemTimers.cpp" />
-    <ClCompile Include="Src\HW\VideoInterface.cpp" />
-    <ClCompile Include="Src\HW\Wiimote.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Attachment.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Classic.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Drums.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Guitar.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Nunchuk.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Turntable.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\EmuSubroutines.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Encryption.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\Speaker.cpp" />
-    <ClCompile Include="Src\HW\WiimoteEmu\WiimoteEmu.cpp" />
-    <ClCompile Include="Src\HW\WiimoteReal\IOWin.cpp" />
-    <ClCompile Include="Src\HW\WiimoteReal\WiimoteReal.cpp" />
-    <ClCompile Include="Src\HW\WII_IOB.cpp" />
-    <ClCompile Include="Src\HW\WII_IPC.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WiiMote_HID_Attr.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_DI.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_es.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_fs.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_net.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb_kbd.cpp" />
-    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_WiiMote.cpp" />
-    <ClCompile Include="Src\x64MemTools.cpp" />
-    <ClCompile Include="Src\Movie.cpp" />
-    <ClCompile Include="Src\NetPlay.cpp" />
-    <ClCompile Include="Src\NetPlayClient.cpp" />
-    <ClCompile Include="Src\NetPlayServer.cpp" />
-    <ClCompile Include="Src\PatchEngine.cpp" />
-    <ClCompile Include="Src\DSPEmulator.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Branch.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_FloatingPoint.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Integer.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_LoadStore.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_LoadStorePaired.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Paired.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_SystemRegisters.cpp" />
-    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Tables.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\IR.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\IR_X86.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitILAsm.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Branch.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_FloatingPoint.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Integer.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStore.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStoreFloating.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStorePaired.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Paired.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_SystemRegisters.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Tables.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit64_Tables.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\JitAsm.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\JitRegCache.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_Branch.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_FloatingPoint.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_Integer.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStore.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStoreFloating.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStorePaired.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_Paired.cpp" />
-    <ClCompile Include="Src\PowerPC\Jit64\Jit_SystemRegisters.cpp" />
-    <ClCompile Include="Src\PowerPC\JitCommon\JitAsmCommon.cpp" />
-    <ClCompile Include="Src\PowerPC\JitCommon\JitBackpatch.cpp" />
-    <ClCompile Include="Src\PowerPC\JitCommon\JitBase.cpp" />
-    <ClCompile Include="Src\PowerPC\JitCommon\JitCache.cpp" />
-    <ClCompile Include="Src\PowerPC\JitCommon\Jit_Util.cpp" />
-    <ClCompile Include="Src\PowerPC\JitInterface.cpp" />
-    <ClCompile Include="Src\PowerPC\LUT_frsqrtex.cpp" />
-    <ClCompile Include="Src\PowerPC\PowerPC.cpp" />
-    <ClCompile Include="Src\PowerPC\PPCAnalyst.cpp" />
-    <ClCompile Include="Src\PowerPC\PPCCache.cpp" />
-    <ClCompile Include="Src\PowerPC\PPCSymbolDB.cpp" />
-    <ClCompile Include="Src\PowerPC\PPCTables.cpp" />
-    <ClCompile Include="Src\PowerPC\Profiler.cpp" />
-    <ClCompile Include="Src\PowerPC\SignatureDB.cpp" />
-    <ClCompile Include="Src\State.cpp">
-      <OpenMPSupport Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">false</OpenMPSupport>
-      <OpenMPSupport Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</OpenMPSupport>
-      <OpenMPSupport Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</OpenMPSupport>
-    </ClCompile>
-    <ClCompile Include="Src\stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Src\Tracer.cpp" />
-    <ClCompile Include="Src\VolumeHandler.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\ActionReplay.h" />
-    <ClInclude Include="Src\ARDecrypt.h" />
-    <ClInclude Include="Src\BootManager.h" />
-    <ClInclude Include="Src\Boot\Boot.h" />
-    <ClInclude Include="Src\Boot\Boot_DOL.h" />
-    <ClInclude Include="Src\Boot\Boot_ELF.h" />
-    <ClInclude Include="Src\Boot\ElfReader.h" />
-    <ClInclude Include="Src\Boot\ElfTypes.h" />
-    <ClInclude Include="Src\ConfigManager.h" />
-    <ClInclude Include="Src\Console.h" />
-    <ClInclude Include="Src\Core.h" />
-    <ClInclude Include="Src\CoreParameter.h" />
-    <ClInclude Include="Src\CoreTiming.h" />
-    <ClInclude Include="Src\Debugger\Debugger_SymbolMap.h" />
-    <ClInclude Include="Src\Debugger\Dump.h" />
-    <ClInclude Include="Src\Debugger\GCELF.h" />
-    <ClInclude Include="Src\Debugger\PPCDebugInterface.h" />
-    <ClInclude Include="Src\DSP\assemble.h" />
-    <ClInclude Include="Src\DSP\disassemble.h" />
-    <ClInclude Include="Src\DSP\DSPAccelerator.h" />
-    <ClInclude Include="Src\DSP\DSPAnalyzer.h" />
-    <ClInclude Include="Src\DSP\DSPBreakpoints.h" />
-    <ClInclude Include="Src\DSP\DSPCodeUtil.h" />
-    <ClInclude Include="Src\DSP\DSPCommon.h" />
-    <ClInclude Include="Src\DSP\DSPCore.h" />
-    <ClInclude Include="Src\DSP\DSPEmitter.h" />
-    <ClInclude Include="Src\DSP\DSPHost.h" />
-    <ClInclude Include="Src\DSP\DSPHWInterface.h" />
-    <ClInclude Include="Src\DSP\DSPIntCCUtil.h" />
-    <ClInclude Include="Src\DSP\DSPInterpreter.h" />
-    <ClInclude Include="Src\DSP\DSPIntExtOps.h" />
-    <ClInclude Include="Src\DSP\DSPIntUtil.h" />
-    <ClInclude Include="Src\DSP\DSPMemoryMap.h" />
-    <ClInclude Include="Src\DSP\DSPStacks.h" />
-    <ClInclude Include="Src\DSP\DSPTables.h" />
-    <ClInclude Include="Src\DSP\Jit\DSPJitRegCache.h" />
-    <ClInclude Include="Src\DSP\Jit\DSPJitUtil.h" />
-    <ClInclude Include="Src\DSP\LabelMap.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoAnalyzer.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoPlaybackAnalyzer.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoDataFile.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoFileStruct.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoPlayer.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoRecorder.h" />
-    <ClInclude Include="Src\FifoPlayer\FifoRecordAnalyzer.h" />
-    <ClInclude Include="Src\GeckoCode.h" />
-    <ClInclude Include="Src\GeckoCodeConfig.h" />
-    <ClInclude Include="Src\HLE\HLE.h" />
-    <ClInclude Include="Src\HLE\HLE_Misc.h" />
-    <ClInclude Include="Src\HLE\HLE_OS.h" />
-    <ClInclude Include="Src\Host.h" />
-    <ClInclude Include="Src\HW\AudioInterface.h" />
-    <ClInclude Include="Src\HW\BBA-TAP\TAP_Win32.h" />
-    <ClInclude Include="Src\HW\CPU.h" />
-    <ClInclude Include="Src\HW\DSP.h" />
-    <ClInclude Include="Src\HW\DSPHLE\DSPHLE.h" />
-    <ClInclude Include="Src\HW\DSPHLE\HLEMixer.h" />
-    <ClInclude Include="Src\HW\DSPHLE\MailHandler.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCodes.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXStructs.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX_Voice.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_CARD.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_GBA.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_InitAudioSystem.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_ROM.h" />
-    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_Zelda.h" />
-    <ClInclude Include="Src\HW\DSPLLE\DSPDebugInterface.h" />
-    <ClInclude Include="Src\HW\DSPLLE\DSPLLE.h" />
-    <ClInclude Include="Src\HW\DSPLLE\DSPLLEGlobals.h" />
-    <ClInclude Include="Src\HW\DSPLLE\DSPLLETools.h" />
-    <ClInclude Include="Src\HW\DSPLLE\DSPSymbols.h" />
-    <ClInclude Include="Src\HW\DVDInterface.h" />
-    <ClInclude Include="Src\HW\EXI.h" />
-    <ClInclude Include="Src\HW\EXI_Channel.h" />
-    <ClInclude Include="Src\HW\EXI_Device.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceAD16.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceAMBaseboard.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceEthernet.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceGecko.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceIPL.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceMemoryCard.h" />
-    <ClInclude Include="Src\HW\EXI_DeviceMic.h" />
-    <ClInclude Include="Src\HW\GCMemcard.h" />
-    <ClInclude Include="Src\HW\GCPad.h" />
-    <ClInclude Include="Src\HW\GCPadEmu.h" />
-    <ClInclude Include="Src\HW\GPFifo.h" />
-    <ClInclude Include="Src\HW\HW.h" />
-    <ClInclude Include="Src\HW\Memmap.h" />
-    <ClInclude Include="Src\HW\MemoryInterface.h" />
-    <ClInclude Include="Src\HW\ProcessorInterface.h" />
-    <ClInclude Include="Src\HW\SI.h" />
-    <ClInclude Include="Src\HW\SI_Device.h" />
-    <ClInclude Include="Src\HW\SI_DeviceAMBaseboard.h" />
-    <ClInclude Include="Src\HW\SI_DeviceDanceMat.h" />
-    <ClInclude Include="Src\HW\SI_DeviceGBA.h" />
-    <ClInclude Include="Src\HW\SI_DeviceGCController.h" />
-    <ClInclude Include="Src\HW\SI_DeviceGCSteeringWheel.h" />
-    <ClInclude Include="Src\HW\Sram.h" />
-    <ClInclude Include="Src\HW\StreamADPCM.h" />
-    <ClInclude Include="Src\HW\SystemTimers.h" />
-    <ClInclude Include="Src\HW\VideoInterface.h" />
-    <ClInclude Include="Src\HW\Wiimote.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Attachment.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Classic.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Drums.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Guitar.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Nunchuk.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Turntable.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\Encryption.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\MatrixMath.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\UDPTLayer.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\WiimoteEmu.h" />
-    <ClInclude Include="Src\HW\WiimoteEmu\WiimoteHid.h" />
-    <ClInclude Include="Src\HW\WiimoteReal\WiimoteReal.h" />
-    <ClInclude Include="Src\HW\WiimoteReal\WiimoteRealBase.h" />
-    <ClInclude Include="Src\HW\WII_IOB.h" />
-    <ClInclude Include="Src\HW\WII_IPC.h" />
-    <ClInclude Include="Src\IPC_HLE\hci.h" />
-    <ClInclude Include="Src\IPC_HLE\l2cap.h" />
-    <ClInclude Include="Src\IPC_HLE\WiiMote_HID_Attr.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_DI.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_es.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_fs.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_net.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_stm.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb_kbd.h" />
-    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_WiiMote.h" />
-    <ClInclude Include="Src\MemTools.h" />
-    <ClInclude Include="Src\Movie.h" />
-    <ClInclude Include="Src\NetPlay.h" />
-    <ClInclude Include="Src\PatchEngine.h" />
-    <ClInclude Include="Src\DSPEmulator.h" />
-    <ClInclude Include="Src\PowerPC\CPUCoreBase.h" />
-    <ClInclude Include="Src\PowerPC\Gekko.h" />
-    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter.h" />
-    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter_FPUtils.h" />
-    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter_Tables.h" />
-    <ClInclude Include="Src\PowerPC\Jit64IL\IR.h" />
-    <ClInclude Include="Src\PowerPC\Jit64IL\JitIL.h" />
-    <ClInclude Include="Src\PowerPC\Jit64IL\JitILAsm.h" />
-    <ClInclude Include="Src\PowerPC\Jit64IL\JitIL_Tables.h" />
-    <ClInclude Include="Src\PowerPC\Jit64\Jit.h" />
-    <ClInclude Include="Src\PowerPC\Jit64\Jit64_Tables.h" />
-    <ClInclude Include="Src\PowerPC\Jit64\JitAsm.h" />
-    <ClInclude Include="Src\PowerPC\Jit64\JitRegCache.h" />
-    <ClInclude Include="Src\PowerPC\JitCommon\JitAsmCommon.h" />
-    <ClInclude Include="Src\PowerPC\JitCommon\JitBackpatch.h" />
-    <ClInclude Include="Src\PowerPC\JitCommon\JitBase.h" />
-    <ClInclude Include="Src\PowerPC\JitCommon\JitCache.h" />
-    <ClInclude Include="Src\PowerPC\JitCommon\Jit_Util.h" />
-    <ClInclude Include="Src\PowerPC\JitInterface.h" />
-    <ClInclude Include="Src\PowerPC\LUT_frsqrtex.h" />
-    <ClInclude Include="Src\PowerPC\PowerPC.h" />
-    <ClInclude Include="Src\PowerPC\PPCAnalyst.h" />
-    <ClInclude Include="Src\PowerPC\PPCCache.h" />
-    <ClInclude Include="Src\PowerPC\PPCSymbolDB.h" />
-    <ClInclude Include="Src\PowerPC\PPCTables.h" />
-    <ClInclude Include="Src\PowerPC\Profiler.h" />
-    <ClInclude Include="Src\PowerPC\SignatureDB.h" />
-    <ClInclude Include="Src\State.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\Tracer.h" />
-    <ClInclude Include="Src\VolumeHandler.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
-    <None Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Obsolete.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Externals\Bochs_disasm\Bochs_disasm.vcxproj">
-      <Project>{cd3d4c3c-1027-4d33-b047-aec7b56d0bf6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\AudioCommon\AudioCommon.vcxproj">
-      <Project>{37d007bd-d66c-4eaf-b56c-bd1aac340a05}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\Common\Common.vcxproj">
-      <Project>{c87a4178-44f6-49b2-b7aa-c79af1b8c534}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\DiscIO\DiscIO.vcxproj">
-      <Project>{b6398059-ebb6-4c34-b547-95f365b71ff4}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\VideoCommon\VideoCommon.vcxproj">
-      <Project>{3e5c4e02-1ba9-4776-bdbe-e3f91ffa34cf}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="DebugFast|Win32">
+      <Configuration>DebugFast</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugFast|x64">
+      <Configuration>DebugFast</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8C60E805-0DA5-4E25-8F84-038DB504BB0D}</ProjectGuid>
+    <RootNamespace>Core</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\VSProps\Base.props" />
+    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+    <Import Project="..\..\VSProps\CodeGen_Debug.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\VSProps\Base.props" />
+    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+    <Import Project="..\..\VSProps\CodeGen_Debug.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\VSProps\Base.props" />
+    <Import Project="..\..\VSProps\CodeGen_Release.props" />
+    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\VSProps\Base.props" />
+    <Import Project="..\..\VSProps\CodeGen_DebugFast.props" />
+    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\VSProps\Base.props" />
+    <Import Project="..\..\VSProps\CodeGen_Release.props" />
+    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\VSProps\Base.props" />
+    <Import Project="..\..\VSProps\CodeGen_DebugFast.props" />
+    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>.\Src;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\DiscIO\Src;..\InputCommon\Src;..\wiiuse\Src;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\SFML\include;..\..\..\Externals\LZO;..\..\..\Externals\portaudio\include;..\..\..\Externals\zlib;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="Src\ActionReplay.cpp" />
+    <ClCompile Include="Src\ARDecrypt.cpp" />
+    <ClCompile Include="Src\BootManager.cpp" />
+    <ClCompile Include="Src\Boot\Boot.cpp" />
+    <ClCompile Include="Src\Boot\Boot_BS2Emu.cpp" />
+    <ClCompile Include="Src\Boot\Boot_DOL.cpp" />
+    <ClCompile Include="Src\Boot\Boot_ELF.cpp" />
+    <ClCompile Include="Src\Boot\Boot_WiiWAD.cpp" />
+    <ClCompile Include="Src\Boot\ElfReader.cpp" />
+    <ClCompile Include="Src\ConfigManager.cpp" />
+    <ClCompile Include="Src\Console.cpp" />
+    <ClCompile Include="Src\Core.cpp" />
+    <ClCompile Include="Src\CoreParameter.cpp" />
+    <ClCompile Include="Src\CoreTiming.cpp" />
+    <ClCompile Include="Src\Debugger\Debugger_SymbolMap.cpp" />
+    <ClCompile Include="Src\Debugger\Dump.cpp" />
+    <ClCompile Include="Src\Debugger\PPCDebugInterface.cpp" />
+    <ClCompile Include="Src\DSP\assemble.cpp" />
+    <ClCompile Include="Src\DSP\disassemble.cpp" />
+    <ClCompile Include="Src\DSP\DSPAccelerator.cpp" />
+    <ClCompile Include="Src\DSP\DSPAnalyzer.cpp" />
+    <ClCompile Include="Src\DSP\DSPCodeUtil.cpp" />
+    <ClCompile Include="Src\DSP\DSPCore.cpp" />
+    <ClCompile Include="Src\DSP\DSPEmitter.cpp" />
+    <ClCompile Include="Src\DSP\DSPHWInterface.cpp" />
+    <ClCompile Include="Src\DSP\DspIntArithmetic.cpp" />
+    <ClCompile Include="Src\DSP\DspIntBranch.cpp" />
+    <ClCompile Include="Src\DSP\DSPIntCCUtil.cpp" />
+    <ClCompile Include="Src\DSP\DSPInterpreter.cpp" />
+    <ClCompile Include="Src\DSP\DSPIntExtOps.cpp" />
+    <ClCompile Include="Src\DSP\DspIntLoadStore.cpp" />
+    <ClCompile Include="Src\DSP\DspIntMisc.cpp" />
+    <ClCompile Include="Src\DSP\DspIntMultiplier.cpp" />
+    <ClCompile Include="Src\DSP\DSPMemoryMap.cpp" />
+    <ClCompile Include="Src\DSP\DSPStacks.cpp" />
+    <ClCompile Include="Src\DSP\DSPTables.cpp" />
+    <ClCompile Include="Src\DSP\Jit\DSPJitArithmetic.cpp" />
+    <ClCompile Include="Src\DSP\Jit\DSPJitBranch.cpp" />
+    <ClCompile Include="Src\DSP\Jit\DSPJitCCUtil.cpp" />
+    <ClCompile Include="Src\DSP\Jit\DSPJitExtOps.cpp" />
+    <ClCompile Include="Src\DSP\Jit\DSPJitLoadStore.cpp" />
+    <ClCompile Include="Src\DSP\Jit\DSPJitMisc.cpp" />
+    <ClCompile Include="Src\DSP\Jit\DSPJitMultiplier.cpp" />
+    <ClCompile Include="Src\DSP\Jit\DSPJitRegCache.cpp" />
+    <ClCompile Include="Src\DSP\Jit\DSPJitUtil.cpp" />
+    <ClCompile Include="Src\DSP\LabelMap.cpp" />
+    <ClCompile Include="Src\FifoPlayer\FifoAnalyzer.cpp" />
+    <ClCompile Include="Src\FifoPlayer\FifoPlaybackAnalyzer.cpp" />
+    <ClCompile Include="Src\FifoPlayer\FifoDataFile.cpp" />
+    <ClCompile Include="Src\FifoPlayer\FifoPlayer.cpp" />
+    <ClCompile Include="Src\FifoPlayer\FifoRecordAnalyzer.cpp" />
+    <ClCompile Include="Src\FifoPlayer\FifoRecorder.cpp" />
+    <ClCompile Include="Src\GeckoCode.cpp" />
+    <ClCompile Include="Src\GeckoCodeConfig.cpp" />
+    <ClCompile Include="Src\HLE\HLE.cpp" />
+    <ClCompile Include="Src\HLE\HLE_Misc.cpp" />
+    <ClCompile Include="Src\HLE\HLE_OS.cpp" />
+    <ClCompile Include="Src\HW\AudioInterface.cpp" />
+    <ClCompile Include="Src\HW\BBA-TAP\TAP_Win32.cpp" />
+    <ClCompile Include="Src\HW\CPU.cpp" />
+    <ClCompile Include="Src\HW\DSP.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\DSPHLE.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\HLEMixer.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\MailHandler.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCodes.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_AX.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_CARD.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_GBA.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_InitAudioSystem.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_ROM.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_ADPCM.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Synth.cpp" />
+    <ClCompile Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Voice.cpp" />
+    <ClCompile Include="Src\HW\DSPLLE\DSPDebugInterface.cpp" />
+    <ClCompile Include="Src\HW\DSPLLE\DSPHost.cpp" />
+    <ClCompile Include="Src\HW\DSPLLE\DSPLLE.cpp" />
+    <ClCompile Include="Src\HW\DSPLLE\DSPLLEGlobals.cpp" />
+    <ClCompile Include="Src\HW\DSPLLE\DSPLLETools.cpp" />
+    <ClCompile Include="Src\HW\DSPLLE\DSPSymbols.cpp" />
+    <ClCompile Include="Src\HW\DVDInterface.cpp" />
+    <ClCompile Include="Src\HW\EXI.cpp" />
+    <ClCompile Include="Src\HW\EXI_Channel.cpp" />
+    <ClCompile Include="Src\HW\EXI_Device.cpp" />
+    <ClCompile Include="Src\HW\EXI_DeviceAD16.cpp" />
+    <ClCompile Include="Src\HW\EXI_DeviceAMBaseboard.cpp" />
+    <ClCompile Include="Src\HW\EXI_DeviceEthernet.cpp" />
+    <ClCompile Include="Src\HW\EXI_DeviceGecko.cpp" />
+    <ClCompile Include="Src\HW\EXI_DeviceIPL.cpp" />
+    <ClCompile Include="Src\HW\EXI_DeviceMemoryCard.cpp" />
+    <ClCompile Include="Src\HW\EXI_DeviceMic.cpp" />
+    <ClCompile Include="Src\HW\GCMemcard.cpp" />
+    <ClCompile Include="Src\HW\GCPad.cpp" />
+    <ClCompile Include="Src\HW\GCPadEmu.cpp" />
+    <ClCompile Include="Src\HW\GPFifo.cpp" />
+    <ClCompile Include="Src\HW\HW.cpp" />
+    <ClCompile Include="Src\HW\Memmap.cpp" />
+    <ClCompile Include="Src\HW\MemmapFunctions.cpp" />
+    <ClCompile Include="Src\HW\MemoryInterface.cpp" />
+    <ClCompile Include="Src\HW\ProcessorInterface.cpp" />
+    <ClCompile Include="Src\HW\SI.cpp" />
+    <ClCompile Include="Src\HW\SI_Device.cpp" />
+    <ClCompile Include="Src\HW\SI_DeviceAMBaseboard.cpp" />
+    <ClCompile Include="Src\HW\SI_DeviceDanceMat.cpp" />
+    <ClCompile Include="Src\HW\SI_DeviceGBA.cpp" />
+    <ClCompile Include="Src\HW\SI_DeviceGCController.cpp" />
+    <ClCompile Include="Src\HW\SI_DeviceGCSteeringWheel.cpp" />
+    <ClCompile Include="Src\HW\Sram.cpp" />
+    <ClCompile Include="Src\HW\StreamADPCM.cpp" />
+    <ClCompile Include="Src\HW\SystemTimers.cpp" />
+    <ClCompile Include="Src\HW\VideoInterface.cpp" />
+    <ClCompile Include="Src\HW\Wiimote.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Attachment.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Classic.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Drums.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Guitar.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Nunchuk.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\Attachment\Turntable.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\EmuSubroutines.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\Encryption.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\Speaker.cpp" />
+    <ClCompile Include="Src\HW\WiimoteEmu\WiimoteEmu.cpp" />
+    <ClCompile Include="Src\HW\WiimoteReal\IOWin.cpp" />
+    <ClCompile Include="Src\HW\WiimoteReal\WiimoteReal.cpp" />
+    <ClCompile Include="Src\HW\WII_IOB.cpp" />
+    <ClCompile Include="Src\HW\WII_IPC.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WiiMote_HID_Attr.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_DI.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_es.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_fs.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_net.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb_kbd.cpp" />
+    <ClCompile Include="Src\IPC_HLE\WII_IPC_HLE_WiiMote.cpp" />
+    <ClCompile Include="Src\x64MemTools.cpp" />
+    <ClCompile Include="Src\Movie.cpp" />
+    <ClCompile Include="Src\NetPlay.cpp" />
+    <ClCompile Include="Src\NetPlayClient.cpp" />
+    <ClCompile Include="Src\NetPlayServer.cpp" />
+    <ClCompile Include="Src\PatchEngine.cpp" />
+    <ClCompile Include="Src\DSPEmulator.cpp" />
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter.cpp" />
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Branch.cpp" />
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_FloatingPoint.cpp" />
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Integer.cpp" />
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_LoadStore.cpp" />
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_LoadStorePaired.cpp" />
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Paired.cpp" />
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_SystemRegisters.cpp" />
+    <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Tables.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\IR.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\IR_X86.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitILAsm.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Branch.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_FloatingPoint.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Integer.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStore.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStoreFloating.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_LoadStorePaired.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Paired.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_SystemRegisters.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64IL\JitIL_Tables.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit64_Tables.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\JitAsm.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\JitRegCache.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_Branch.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_FloatingPoint.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_Integer.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStore.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStoreFloating.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_LoadStorePaired.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_Paired.cpp" />
+    <ClCompile Include="Src\PowerPC\Jit64\Jit_SystemRegisters.cpp" />
+    <ClCompile Include="Src\PowerPC\JitCommon\JitAsmCommon.cpp" />
+    <ClCompile Include="Src\PowerPC\JitCommon\JitBackpatch.cpp" />
+    <ClCompile Include="Src\PowerPC\JitCommon\JitBase.cpp" />
+    <ClCompile Include="Src\PowerPC\JitCommon\JitCache.cpp" />
+    <ClCompile Include="Src\PowerPC\JitCommon\Jit_Util.cpp" />
+    <ClCompile Include="Src\PowerPC\JitInterface.cpp" />
+    <ClCompile Include="Src\PowerPC\LUT_frsqrtex.cpp" />
+    <ClCompile Include="Src\PowerPC\PowerPC.cpp" />
+    <ClCompile Include="Src\PowerPC\PPCAnalyst.cpp" />
+    <ClCompile Include="Src\PowerPC\PPCCache.cpp" />
+    <ClCompile Include="Src\PowerPC\PPCSymbolDB.cpp" />
+    <ClCompile Include="Src\PowerPC\PPCTables.cpp" />
+    <ClCompile Include="Src\PowerPC\Profiler.cpp" />
+    <ClCompile Include="Src\PowerPC\SignatureDB.cpp" />
+    <ClCompile Include="Src\State.cpp">
+      <OpenMPSupport Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">false</OpenMPSupport>
+      <OpenMPSupport Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</OpenMPSupport>
+      <OpenMPSupport Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</OpenMPSupport>
+    </ClCompile>
+    <ClCompile Include="Src\stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="Src\Tracer.cpp" />
+    <ClCompile Include="Src\VolumeHandler.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Src\ActionReplay.h" />
+    <ClInclude Include="Src\ARDecrypt.h" />
+    <ClInclude Include="Src\BootManager.h" />
+    <ClInclude Include="Src\Boot\Boot.h" />
+    <ClInclude Include="Src\Boot\Boot_DOL.h" />
+    <ClInclude Include="Src\Boot\Boot_ELF.h" />
+    <ClInclude Include="Src\Boot\ElfReader.h" />
+    <ClInclude Include="Src\Boot\ElfTypes.h" />
+    <ClInclude Include="Src\ConfigManager.h" />
+    <ClInclude Include="Src\Console.h" />
+    <ClInclude Include="Src\Core.h" />
+    <ClInclude Include="Src\CoreParameter.h" />
+    <ClInclude Include="Src\CoreTiming.h" />
+    <ClInclude Include="Src\Debugger\Debugger_SymbolMap.h" />
+    <ClInclude Include="Src\Debugger\Dump.h" />
+    <ClInclude Include="Src\Debugger\GCELF.h" />
+    <ClInclude Include="Src\Debugger\PPCDebugInterface.h" />
+    <ClInclude Include="Src\DSP\assemble.h" />
+    <ClInclude Include="Src\DSP\disassemble.h" />
+    <ClInclude Include="Src\DSP\DSPAccelerator.h" />
+    <ClInclude Include="Src\DSP\DSPAnalyzer.h" />
+    <ClInclude Include="Src\DSP\DSPBreakpoints.h" />
+    <ClInclude Include="Src\DSP\DSPCodeUtil.h" />
+    <ClInclude Include="Src\DSP\DSPCommon.h" />
+    <ClInclude Include="Src\DSP\DSPCore.h" />
+    <ClInclude Include="Src\DSP\DSPEmitter.h" />
+    <ClInclude Include="Src\DSP\DSPHost.h" />
+    <ClInclude Include="Src\DSP\DSPHWInterface.h" />
+    <ClInclude Include="Src\DSP\DSPIntCCUtil.h" />
+    <ClInclude Include="Src\DSP\DSPInterpreter.h" />
+    <ClInclude Include="Src\DSP\DSPIntExtOps.h" />
+    <ClInclude Include="Src\DSP\DSPIntUtil.h" />
+    <ClInclude Include="Src\DSP\DSPMemoryMap.h" />
+    <ClInclude Include="Src\DSP\DSPStacks.h" />
+    <ClInclude Include="Src\DSP\DSPTables.h" />
+    <ClInclude Include="Src\DSP\Jit\DSPJitRegCache.h" />
+    <ClInclude Include="Src\DSP\Jit\DSPJitUtil.h" />
+    <ClInclude Include="Src\DSP\LabelMap.h" />
+    <ClInclude Include="Src\FifoPlayer\FifoAnalyzer.h" />
+    <ClInclude Include="Src\FifoPlayer\FifoPlaybackAnalyzer.h" />
+    <ClInclude Include="Src\FifoPlayer\FifoDataFile.h" />
+    <ClInclude Include="Src\FifoPlayer\FifoFileStruct.h" />
+    <ClInclude Include="Src\FifoPlayer\FifoPlayer.h" />
+    <ClInclude Include="Src\FifoPlayer\FifoRecorder.h" />
+    <ClInclude Include="Src\FifoPlayer\FifoRecordAnalyzer.h" />
+    <ClInclude Include="Src\GeckoCode.h" />
+    <ClInclude Include="Src\GeckoCodeConfig.h" />
+    <ClInclude Include="Src\HLE\HLE.h" />
+    <ClInclude Include="Src\HLE\HLE_Misc.h" />
+    <ClInclude Include="Src\HLE\HLE_OS.h" />
+    <ClInclude Include="Src\Host.h" />
+    <ClInclude Include="Src\HW\AudioInterface.h" />
+    <ClInclude Include="Src\HW\BBA-TAP\TAP_Win32.h" />
+    <ClInclude Include="Src\HW\CPU.h" />
+    <ClInclude Include="Src\HW\DSP.h" />
+    <ClInclude Include="Src\HW\DSPHLE\DSPHLE.h" />
+    <ClInclude Include="Src\HW\DSPHLE\HLEMixer.h" />
+    <ClInclude Include="Src\HW\DSPHLE\MailHandler.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCodes.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXStructs.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AXWii.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_AX_Voice.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_CARD.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_GBA.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_InitAudioSystem.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_ROM.h" />
+    <ClInclude Include="Src\HW\DSPHLE\UCodes\UCode_Zelda.h" />
+    <ClInclude Include="Src\HW\DSPLLE\DSPDebugInterface.h" />
+    <ClInclude Include="Src\HW\DSPLLE\DSPLLE.h" />
+    <ClInclude Include="Src\HW\DSPLLE\DSPLLEGlobals.h" />
+    <ClInclude Include="Src\HW\DSPLLE\DSPLLETools.h" />
+    <ClInclude Include="Src\HW\DSPLLE\DSPSymbols.h" />
+    <ClInclude Include="Src\HW\DVDInterface.h" />
+    <ClInclude Include="Src\HW\EXI.h" />
+    <ClInclude Include="Src\HW\EXI_Channel.h" />
+    <ClInclude Include="Src\HW\EXI_Device.h" />
+    <ClInclude Include="Src\HW\EXI_DeviceAD16.h" />
+    <ClInclude Include="Src\HW\EXI_DeviceAMBaseboard.h" />
+    <ClInclude Include="Src\HW\EXI_DeviceEthernet.h" />
+    <ClInclude Include="Src\HW\EXI_DeviceGecko.h" />
+    <ClInclude Include="Src\HW\EXI_DeviceIPL.h" />
+    <ClInclude Include="Src\HW\EXI_DeviceMemoryCard.h" />
+    <ClInclude Include="Src\HW\EXI_DeviceMic.h" />
+    <ClInclude Include="Src\HW\GCMemcard.h" />
+    <ClInclude Include="Src\HW\GCPad.h" />
+    <ClInclude Include="Src\HW\GCPadEmu.h" />
+    <ClInclude Include="Src\HW\GPFifo.h" />
+    <ClInclude Include="Src\HW\HW.h" />
+    <ClInclude Include="Src\HW\Memmap.h" />
+    <ClInclude Include="Src\HW\MemoryInterface.h" />
+    <ClInclude Include="Src\HW\ProcessorInterface.h" />
+    <ClInclude Include="Src\HW\SI.h" />
+    <ClInclude Include="Src\HW\SI_Device.h" />
+    <ClInclude Include="Src\HW\SI_DeviceAMBaseboard.h" />
+    <ClInclude Include="Src\HW\SI_DeviceDanceMat.h" />
+    <ClInclude Include="Src\HW\SI_DeviceGBA.h" />
+    <ClInclude Include="Src\HW\SI_DeviceGCController.h" />
+    <ClInclude Include="Src\HW\SI_DeviceGCSteeringWheel.h" />
+    <ClInclude Include="Src\HW\Sram.h" />
+    <ClInclude Include="Src\HW\StreamADPCM.h" />
+    <ClInclude Include="Src\HW\SystemTimers.h" />
+    <ClInclude Include="Src\HW\VideoInterface.h" />
+    <ClInclude Include="Src\HW\Wiimote.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Attachment.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Classic.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Drums.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Guitar.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Nunchuk.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\Attachment\Turntable.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\Encryption.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\MatrixMath.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\UDPTLayer.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\WiimoteEmu.h" />
+    <ClInclude Include="Src\HW\WiimoteEmu\WiimoteHid.h" />
+    <ClInclude Include="Src\HW\WiimoteReal\WiimoteReal.h" />
+    <ClInclude Include="Src\HW\WiimoteReal\WiimoteRealBase.h" />
+    <ClInclude Include="Src\HW\WII_IOB.h" />
+    <ClInclude Include="Src\HW\WII_IPC.h" />
+    <ClInclude Include="Src\IPC_HLE\hci.h" />
+    <ClInclude Include="Src\IPC_HLE\l2cap.h" />
+    <ClInclude Include="Src\IPC_HLE\WiiMote_HID_Attr.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_DI.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_es.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_fs.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_net.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_sdio_slot0.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_stm.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_Device_usb_kbd.h" />
+    <ClInclude Include="Src\IPC_HLE\WII_IPC_HLE_WiiMote.h" />
+    <ClInclude Include="Src\MemTools.h" />
+    <ClInclude Include="Src\Movie.h" />
+    <ClInclude Include="Src\NetPlay.h" />
+    <ClInclude Include="Src\PatchEngine.h" />
+    <ClInclude Include="Src\DSPEmulator.h" />
+    <ClInclude Include="Src\PowerPC\CPUCoreBase.h" />
+    <ClInclude Include="Src\PowerPC\Gekko.h" />
+    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter.h" />
+    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter_FPUtils.h" />
+    <ClInclude Include="Src\PowerPC\Interpreter\Interpreter_Tables.h" />
+    <ClInclude Include="Src\PowerPC\Jit64IL\IR.h" />
+    <ClInclude Include="Src\PowerPC\Jit64IL\JitIL.h" />
+    <ClInclude Include="Src\PowerPC\Jit64IL\JitILAsm.h" />
+    <ClInclude Include="Src\PowerPC\Jit64IL\JitIL_Tables.h" />
+    <ClInclude Include="Src\PowerPC\Jit64\Jit.h" />
+    <ClInclude Include="Src\PowerPC\Jit64\Jit64_Tables.h" />
+    <ClInclude Include="Src\PowerPC\Jit64\JitAsm.h" />
+    <ClInclude Include="Src\PowerPC\Jit64\JitRegCache.h" />
+    <ClInclude Include="Src\PowerPC\JitCommon\JitAsmCommon.h" />
+    <ClInclude Include="Src\PowerPC\JitCommon\JitBackpatch.h" />
+    <ClInclude Include="Src\PowerPC\JitCommon\JitBase.h" />
+    <ClInclude Include="Src\PowerPC\JitCommon\JitCache.h" />
+    <ClInclude Include="Src\PowerPC\JitCommon\Jit_Util.h" />
+    <ClInclude Include="Src\PowerPC\JitInterface.h" />
+    <ClInclude Include="Src\PowerPC\LUT_frsqrtex.h" />
+    <ClInclude Include="Src\PowerPC\PowerPC.h" />
+    <ClInclude Include="Src\PowerPC\PPCAnalyst.h" />
+    <ClInclude Include="Src\PowerPC\PPCCache.h" />
+    <ClInclude Include="Src\PowerPC\PPCSymbolDB.h" />
+    <ClInclude Include="Src\PowerPC\PPCTables.h" />
+    <ClInclude Include="Src\PowerPC\Profiler.h" />
+    <ClInclude Include="Src\PowerPC\SignatureDB.h" />
+    <ClInclude Include="Src\State.h" />
+    <ClInclude Include="Src\stdafx.h" />
+    <ClInclude Include="Src\Tracer.h" />
+    <ClInclude Include="Src\VolumeHandler.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="CMakeLists.txt" />
+    <None Include="Src\HW\DSPHLE\UCodes\UCode_Zelda_Obsolete.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Externals\Bochs_disasm\Bochs_disasm.vcxproj">
+      <Project>{cd3d4c3c-1027-4d33-b047-aec7b56d0bf6}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\AudioCommon\AudioCommon.vcxproj">
+      <Project>{37d007bd-d66c-4eaf-b56c-bd1aac340a05}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\Common\Common.vcxproj">
+      <Project>{c87a4178-44f6-49b2-b7aa-c79af1b8c534}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\DiscIO\DiscIO.vcxproj">
+      <Project>{b6398059-ebb6-4c34-b547-95f365b71ff4}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\VideoCommon\VideoCommon.vcxproj">
+      <Project>{3e5c4e02-1ba9-4776-bdbe-e3f91ffa34cf}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Core/Core/Src/NetPlay.h b/Source/Core/Core/Src/NetPlay.h
index ab0d0cc848..7bed7c6421 100644
--- a/Source/Core/Core/Src/NetPlay.h
+++ b/Source/Core/Core/Src/NetPlay.h
@@ -192,6 +192,10 @@ public:
 	u64 CalculateMinimumBufferTime();
 	void AdjustPadBufferSize(unsigned int size);
 
+#ifdef USE_UPNP
+	void TryPortmapping(u16 port);
+#endif
+
 private:
 	class Client : public Player
 	{
@@ -215,6 +219,22 @@ private:
 	Common::Timer	m_ping_timer;
 	u32		m_ping_key;
 	bool	m_update_pings;
+	
+#ifdef USE_UPNP
+	static void mapPortThread(const u16 port);
+	static void unmapPortThread();
+
+	static bool initUPnP();
+	static bool UPnPMapPort(const std::string& addr, const u16 port);
+	static bool UPnPUnmapPort(const u16 port);
+
+	static struct UPNPUrls m_upnp_urls;
+	static struct IGDdatas m_upnp_data;
+	static u16 m_upnp_mapped;
+	static bool m_upnp_inited;
+	static bool m_upnp_error;
+	static std::thread m_upnp_thread;
+#endif
 };
 
 class NetPlayClient : public NetPlay
diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp
index 4677894f72..850954ac55 100644
--- a/Source/Core/Core/Src/NetPlayServer.cpp
+++ b/Source/Core/Core/Src/NetPlayServer.cpp
@@ -11,7 +11,14 @@ NetPlayServer::~NetPlayServer()
 	{
 		m_do_loop = false;
 		m_thread.join();
-	}	
+	}
+
+#ifdef USE_UPNP
+	if (m_upnp_thread.joinable())
+		m_upnp_thread.join();
+	m_upnp_thread = std::thread(&NetPlayServer::unmapPortThread);
+	m_upnp_thread.join();
+#endif
 }
 
 // called from ---GUI--- thread
@@ -632,3 +639,161 @@ void NetPlayServer::SendToClients(sf::Packet& packet, const PlayerId skip_pid)
 		if (i->second.pid && (i->second.pid != skip_pid))
 			i->second.socket.Send(packet);
 }
+
+#ifdef USE_UPNP
+#include <miniwget.h>
+#include <miniupnpc.h>
+#include <upnpcommands.h>
+
+struct UPNPUrls NetPlayServer::m_upnp_urls;
+struct IGDdatas NetPlayServer::m_upnp_data;
+u16 NetPlayServer::m_upnp_mapped = 0;
+bool NetPlayServer::m_upnp_inited = false;
+bool NetPlayServer::m_upnp_error = false;
+std::thread NetPlayServer::m_upnp_thread;
+
+// called from ---GUI--- thread
+void NetPlayServer::TryPortmapping(u16 port)
+{
+	if (m_upnp_thread.joinable())
+		m_upnp_thread.join();
+	m_upnp_thread = std::thread(&NetPlayServer::mapPortThread, port);
+}
+
+// UPnP thread: try to map a port
+void NetPlayServer::mapPortThread(const u16 port)
+{
+	std::string ourIP = sf::IPAddress::GetLocalAddress().ToString();
+
+	if (!m_upnp_inited)
+		if (!initUPnP())
+			goto fail;
+
+	if (!UPnPMapPort(ourIP, port))
+		goto fail;
+
+	NOTICE_LOG(NETPLAY, "Successfully mapped port %d to %s.", port, ourIP.c_str());
+	return;
+fail:
+	WARN_LOG(NETPLAY, "Failed to map port %d to %s.", port, ourIP.c_str());
+	return;
+}
+
+// UPnP thread: try to unmap a port
+void NetPlayServer::unmapPortThread()
+{
+	if (m_upnp_mapped > 0)
+		UPnPUnmapPort(m_upnp_mapped);
+}
+
+// called from ---UPnP--- thread
+// discovers the IGD
+bool NetPlayServer::initUPnP()
+{
+	UPNPDev *devlist, *dev;
+	std::vector<UPNPDev *> igds;
+	int descXMLsize = 0, upnperror = 0;
+	char *descXML;
+
+	// Don't init if already inited
+	if (m_upnp_inited)
+		return true;
+
+	// Don't init if it failed before
+	if (m_upnp_error)
+		return false;
+
+	memset(&m_upnp_urls, 0, sizeof(UPNPUrls));
+	memset(&m_upnp_data, 0, sizeof(IGDdatas));
+
+	// Find all UPnP devices
+	devlist = upnpDiscover(2000, NULL, NULL, 0, 0, &upnperror);
+	if (!devlist)
+	{
+		WARN_LOG(NETPLAY, "An error occured trying to discover UPnP devices.");
+
+		m_upnp_error = true;
+		m_upnp_inited = false;
+
+		return false;
+	}
+
+	// Look for the IGD
+	dev = devlist;
+	while (dev)
+	{
+		if (strstr(dev->st, "InternetGatewayDevice"))
+			igds.push_back(dev);
+		dev = dev->pNext;
+	}
+
+	std::vector<UPNPDev *>::iterator i;
+	for (i = igds.begin(); i != igds.end(); i++)
+	{
+		dev = *i;
+		descXML = (char *) miniwget(dev->descURL, &descXMLsize, 0);
+		if (descXML)
+		{
+			parserootdesc(descXML, descXMLsize, &m_upnp_data);
+			free(descXML);
+			descXML = 0;
+			GetUPNPUrls(&m_upnp_urls, &m_upnp_data, dev->descURL, 0);
+
+			NOTICE_LOG(NETPLAY, "Got info from IGD at %s.", dev->descURL);
+			break;
+		}
+		else
+		{
+			WARN_LOG(NETPLAY, "Error getting info from IGD at %s.", dev->descURL);
+		}
+	}
+
+	freeUPNPDevlist(devlist);
+
+	return true;
+}
+
+// called from ---UPnP--- thread
+// Attempt to portforward!
+bool NetPlayServer::UPnPMapPort(const std::string& addr, const u16 port)
+{
+	char port_str[6] = { 0 };
+	int result;
+
+	if (m_upnp_mapped > 0)
+		UPnPUnmapPort(m_upnp_mapped);
+
+	sprintf(port_str, "%d", port);
+	result = UPNP_AddPortMapping(m_upnp_urls.controlURL, m_upnp_data.first.servicetype,
+	                             port_str, port_str, addr.c_str(),
+	                             (std::string("dolphin-emu TCP on ") + addr).c_str(),
+	                             "TCP", NULL, NULL);
+
+	if(result != 0)
+		return false;
+
+	m_upnp_mapped = port;
+
+	return true;
+}
+
+// called from ---UPnP--- thread
+// Attempt to stop portforwarding.
+// --
+// NOTE: It is important that this happens! A few very crappy routers
+// apparently do not delete UPnP mappings on their own, so if you leave them
+// hanging, the NVRAM will fill with portmappings, and eventually all UPnP
+// requests will fail silently, with the only recourse being a factory reset.
+// --
+bool NetPlayServer::UPnPUnmapPort(const u16 port)
+{
+	char port_str[6] = { 0 };
+
+	sprintf(port_str, "%d", port);
+	UPNP_DeletePortMapping(m_upnp_urls.controlURL, m_upnp_data.first.servicetype,
+	                       port_str, "TCP", NULL);
+
+	return true;
+}
+#endif
+
diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
index 9e40bbd90b..7f876b43f5 100644
--- a/Source/Core/DolphinWX/CMakeLists.txt
+++ b/Source/Core/DolphinWX/CMakeLists.txt
@@ -164,6 +164,10 @@ else()
 	set(DOLPHIN_EXE ${DOLPHIN_EXE_BASE}-nogui)
 endif()
 
+if(USE_UPNP)
+  set(LIBS  ${LIBS} miniupnpc)
+endif()
+
 if(ANDROID)
 	add_library(${DOLPHIN_EXE} SHARED ${SRCS})
 	target_link_libraries(${DOLPHIN_EXE} 
diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj
index fe0b1dcd2b..3de7126767 100644
--- a/Source/Core/DolphinWX/Dolphin.vcxproj
+++ b/Source/Core/DolphinWX/Dolphin.vcxproj
@@ -1,396 +1,399 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugFast|Win32">
-      <Configuration>DebugFast</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugFast|x64">
-      <Configuration>DebugFast</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1B099EF8-6F87-47A2-A3E7-898A24584F49}</ProjectGuid>
-    <RootNamespace>Dolphin</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\VSProps\Base.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\CodeGen_Debug.props" />
-    <Import Project="..\..\VSProps\Dolphin.Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\VSProps\Base.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\Dolphin.x64.props" />
-    <Import Project="..\..\VSProps\CodeGen_Debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\VSProps\Base.props" />
-    <Import Project="..\..\VSProps\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\Dolphin.Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\VSProps\Base.props" />
-    <Import Project="..\..\VSProps\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\Dolphin.Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\VSProps\Base.props" />
-    <Import Project="..\..\VSProps\CodeGen_Release.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\Dolphin.x64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\VSProps\Base.props" />
-    <Import Project="..\..\VSProps\CodeGen_DebugFast.props" />
-    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
-    <Import Project="..\..\VSProps\Dolphin.x64.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)D</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>$(ProjectName)D</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <TargetName>$(ProjectName)DF</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <TargetName>$(ProjectName)DF</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link />
-    <PostBuildEvent>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="DebugFast|Win32">
+      <Configuration>DebugFast</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugFast|x64">
+      <Configuration>DebugFast</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{1B099EF8-6F87-47A2-A3E7-898A24584F49}</ProjectGuid>
+    <RootNamespace>Dolphin</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\VSProps\Base.props" />
+    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+    <Import Project="..\..\VSProps\CodeGen_Debug.props" />
+    <Import Project="..\..\VSProps\Dolphin.Win32.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\VSProps\Base.props" />
+    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+    <Import Project="..\..\VSProps\Dolphin.x64.props" />
+    <Import Project="..\..\VSProps\CodeGen_Debug.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\VSProps\Base.props" />
+    <Import Project="..\..\VSProps\CodeGen_Release.props" />
+    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+    <Import Project="..\..\VSProps\Dolphin.Win32.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\VSProps\Base.props" />
+    <Import Project="..\..\VSProps\CodeGen_DebugFast.props" />
+    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+    <Import Project="..\..\VSProps\Dolphin.Win32.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\VSProps\Base.props" />
+    <Import Project="..\..\VSProps\CodeGen_Release.props" />
+    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+    <Import Project="..\..\VSProps\Dolphin.x64.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\VSProps\Base.props" />
+    <Import Project="..\..\VSProps\CodeGen_DebugFast.props" />
+    <Import Project="..\..\VSProps\PrecompiledHeader.props" />
+    <Import Project="..\..\VSProps\Dolphin.x64.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <TargetName>$(ProjectName)D</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetName>$(ProjectName)D</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
+    <TargetName>$(ProjectName)DF</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
+    <TargetName>$(ProjectName)DF</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link />
+    <PostBuildEvent>
       <Command>xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d
 echo Copying External .dlls
 xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d
 xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
-</Command>
-      <Message>Copying Data\* to $(TargetDir)</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link />
-    <PostBuildEvent>
+</Command>
+      <Message>Copying Data\* to $(TargetDir)</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link />
+    <PostBuildEvent>
       <Command>xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d
 echo Copying External .dlls
 xcopy "$(SolutionDir)..\Externals\OpenAL\Win64\*.dll" "$(TargetDir)" /e /s /y /q /d
 xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
-</Command>
-      <Message>Copying Data\* to $(TargetDir)</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OpenMPSupport>
-      </OpenMPSupport>
-    </ClCompile>
-    <Link />
-    <PostBuildEvent>
+</Command>
+      <Message>Copying Data\* to $(TargetDir)</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OpenMPSupport>
+      </OpenMPSupport>
+    </ClCompile>
+    <Link />
+    <PostBuildEvent>
       <Command>xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d
 echo Copying External .dlls
 xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d
 xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
-</Command>
-      <Message>Copying Data\* to $(TargetDir)</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link />
-    <PostBuildEvent>
+</Command>
+      <Message>Copying Data\* to $(TargetDir)</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link />
+    <PostBuildEvent>
       <Command>xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d
 echo Copying External .dlls
 xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d
 xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
-</Command>
-      <Message>Copying Data\* to $(TargetDir)</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <OpenMPSupport>
-      </OpenMPSupport>
-    </ClCompile>
-    <Link />
-    <PostBuildEvent>
+</Command>
+      <Message>Copying Data\* to $(TargetDir)</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <OpenMPSupport>
+      </OpenMPSupport>
+    </ClCompile>
+    <Link />
+    <PostBuildEvent>
       <Command>xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d
 echo Copying External .dlls
 xcopy "$(SolutionDir)..\Externals\OpenAL\Win64\*.dll" "$(TargetDir)" /e /s /y /q /d
 xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
-</Command>
-      <Message>Copying Data\* to $(TargetDir)</Message>
-    </PostBuildEvent>
-    <ResourceCompile>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\InputUICommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link />
-    <PostBuildEvent>
+</Command>
+      <Message>Copying Data\* to $(TargetDir)</Message>
+    </PostBuildEvent>
+    <ResourceCompile>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\Externals\GLew\include;..\Common\Src;..\VideoCommon\Src;..\AudioCommon\Src;..\Core\Src;..\Core\Src\PowerPC\JitCommon;..\DebuggerWX\Src;..\..\..\Externals\Bochs_disasm;..\InputCommon\Src;..\DiscIO\Src;..\..\..\Externals\SFML\include;..\..\..\Externals\wxWidgets3;..\..\..\Externals\wxWidgets3\include;..\..\..\Externals\CLRun\include;..\..\..\Externals\miniupnpc\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link />
+    <PostBuildEvent>
       <Command>xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d
 echo Copying External .dlls
 xcopy "$(SolutionDir)..\Externals\OpenAL\Win64\*.dll" "$(TargetDir)" /e /s /y /q /d
 xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d
-</Command>
-      <Message>Copying Data\* to $(TargetDir)</Message>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="Src\AboutDolphin.cpp" />
-    <ClCompile Include="Src\ARCodeAddEdit.cpp" />
-    <ClCompile Include="Src\Debugger\BreakpointDlg.cpp" />
-    <ClCompile Include="Src\Debugger\BreakpointView.cpp" />
-    <ClCompile Include="Src\Debugger\BreakpointWindow.cpp" />
-    <ClCompile Include="Src\CheatsWindow.cpp" />
-    <ClCompile Include="Src\Debugger\CodeView.cpp" />
-    <ClCompile Include="Src\Debugger\CodeWindow.cpp" />
-    <ClCompile Include="Src\Debugger\CodeWindowFunctions.cpp" />
-    <ClCompile Include="Src\ConfigMain.cpp" />
-    <ClCompile Include="Src\Debugger\DebuggerPanel.cpp" />
-    <ClCompile Include="Src\Debugger\DebuggerUIUtil.cpp" />
-    <ClCompile Include="Src\Debugger\DSPDebugWindow.cpp" />
-    <ClCompile Include="Src\Debugger\DSPRegisterView.cpp" />
-    <ClCompile Include="Src\FifoPlayerDlg.cpp" />
-    <ClCompile Include="Src\Frame.cpp" />
-    <ClCompile Include="Src\FrameAui.cpp" />
-    <ClCompile Include="Src\FrameTools.cpp" />
-    <ClCompile Include="Src\GameListCtrl.cpp" />
-    <ClCompile Include="Src\GCMicDlg.cpp" />
-    <ClCompile Include="Src\GeckoCodeDiag.cpp" />
-    <ClCompile Include="Src\HotkeyDlg.cpp" />
-    <ClCompile Include="Src\InputConfigDiag.cpp" />
-    <ClCompile Include="Src\InputConfigDiagBitmaps.cpp" />
-    <ClCompile Include="Src\ISOFile.cpp" />
-    <ClCompile Include="Src\ISOProperties.cpp" />
-    <ClCompile Include="Src\Debugger\JitWindow.cpp" />
-    <ClCompile Include="Src\LogConfigWindow.cpp" />
-    <ClCompile Include="Src\LogWindow.cpp" />
-    <ClCompile Include="Src\Main.cpp" />
-    <ClCompile Include="Src\MainNoGUI.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="Src\MemcardManager.cpp" />
-    <ClCompile Include="Src\MemoryCards\WiiSaveCrypted.cpp" />
-    <ClCompile Include="Src\Debugger\MemoryCheckDlg.cpp" />
-    <ClCompile Include="Src\Debugger\MemoryView.cpp" />
-    <ClCompile Include="Src\Debugger\MemoryWindow.cpp" />
-    <ClCompile Include="Src\NetWindow.cpp" />
-    <ClCompile Include="Src\PatchAddEdit.cpp" />
-    <ClCompile Include="Src\PHackSettings.cpp" />
-    <ClCompile Include="Src\Debugger\RegisterView.cpp" />
-    <ClCompile Include="Src\Debugger\RegisterWindow.cpp" />
-	<ClCompile Include="Src\GLInterface\WGL.cpp" />
-    <ClCompile Include="Src\stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="Src\TASInputDlg.cpp" />
-    <ClCompile Include="Src\UDPConfigDiag.cpp" />
-    <ClCompile Include="Src\VideoConfigDiag.cpp" />
-    <ClCompile Include="Src\WiimoteConfigDiag.cpp" />
-    <ClCompile Include="Src\WXInputBase.cpp" />
-    <ClCompile Include="Src\WxUtils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="Src\AboutDolphin.h" />
-    <ClInclude Include="Src\ARCodeAddEdit.h" />
-    <ClInclude Include="Src\Debugger\BreakpointDlg.h" />
-    <ClInclude Include="Src\Debugger\BreakpointView.h" />
-    <ClInclude Include="Src\Debugger\BreakpointWindow.h" />
-    <ClInclude Include="Src\CheatsWindow.h" />
-    <ClInclude Include="Src\Debugger\CodeView.h" />
-    <ClInclude Include="Src\Debugger\CodeWindow.h" />
-    <ClInclude Include="Src\ConfigMain.h" />
-    <ClInclude Include="Src\Debugger\DebuggerPanel.h" />
-    <ClInclude Include="Src\Debugger\DebuggerUIUtil.h" />
-    <ClInclude Include="Src\Debugger\DSPDebugWindow.h" />
-    <ClInclude Include="Src\Debugger\DSPRegisterView.h" />
-    <ClInclude Include="Src\FifoPlayerDlg.h" />
-    <ClInclude Include="Src\Frame.h" />
-    <ClInclude Include="Src\GameListCtrl.h" />
-    <ClInclude Include="Src\GCMicDlg.h" />
-    <ClInclude Include="Src\GeckoCodeDiag.h" />
-    <ClInclude Include="Src\Globals.h" />
-    <ClInclude Include="Src\HotkeyDlg.h" />
-    <ClInclude Include="Src\InputConfigDiag.h" />
-    <ClInclude Include="Src\ISOFile.h" />
-    <ClInclude Include="Src\ISOProperties.h" />
-    <ClInclude Include="Src\Debugger\JitWindow.h" />
-    <ClInclude Include="Src\LogConfigWindow.h" />
-    <ClInclude Include="Src\LogWindow.h" />
-    <ClInclude Include="Src\Main.h" />
-    <ClInclude Include="Src\MemcardManager.h" />
-    <ClInclude Include="Src\MemoryCards\WiiSaveCrypted.h" />
-    <ClInclude Include="Src\Debugger\MemoryCheckDlg.h" />
-    <ClInclude Include="Src\Debugger\MemoryView.h" />
-    <ClInclude Include="Src\Debugger\MemoryWindow.h" />
-    <ClInclude Include="Src\NetWindow.h" />
-    <ClInclude Include="Src\PatchAddEdit.h" />
-    <ClInclude Include="Src\PHackSettings.h" />
-    <ClInclude Include="Src\Debugger\RegisterView.h" />
-    <ClInclude Include="Src\Debugger\RegisterWindow.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\TASInputDlg.h" />
-    <ClInclude Include="Src\UDPConfigDiag.h" />
-    <ClInclude Include="Src\VideoConfigDiag.h" />
-    <ClInclude Include="Src\WiimoteConfigDiag.h" />
-    <ClInclude Include="Src\WXInputBase.h" />
-    <ClInclude Include="Src\WxUtils.h" />
-    <ClInclude Include="Src\GLInterface.h" />
-    <ClInclude Include="Src\GLInterface\InterfaceBase.h" />
-    <ClInclude Include="Src\GLInterface\WGL.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\Installer\Dolphin.ico" />
-    <None Include="CMakeLists.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Externals\Bochs_disasm\Bochs_disasm.vcxproj">
-      <Project>{cd3d4c3c-1027-4d33-b047-aec7b56d0bf6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Externals\libpng\png\png.vcxproj">
-      <Project>{01573c36-ac6e-49f6-94ba-572517eb9740}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Externals\LZO\LZO.vcxproj">
-      <Project>{d8890b98-26f7-4cff-bbfb-b95f371b5f20}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Externals\SFML\build\vc2010\SFML_Network.vcxproj">
-      <Project>{93d73454-2512-424e-9cda-4bb357fe13dd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Externals\wxWidgets3\build\msw\wx_base.vcxproj">
-      <Project>{1c8436c9-dbaf-42be-83bc-cf3ec9175abe}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Externals\zlib\zlib.vcxproj">
-      <Project>{3e1339f5-9311-4122-9442-369702e8fcad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Plugins\Plugin_VideoDX11\Plugin_VideoDX11.vcxproj">
-      <Project>{9a4c733c-bade-4ac6-b58a-6e274395e90e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Plugins\Plugin_VideoDX9\Plugin_VideoDX9.vcxproj">
-      <Project>{dc7d7af4-ce47-49e8-8b63-265cb6233a49}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Plugins\Plugin_VideoOGL\Plugin_VideoOGL.vcxproj">
-      <Project>{1909cd2d-1707-456f-86ca-0df42a727c99}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Plugins\Plugin_VideoSoftware\Plugin_VideoSoftware.vcxproj">
-      <Project>{9e9da440-e9ad-413c-b648-91030e792211}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\AudioCommon\AudioCommon.vcxproj">
-      <Project>{37d007bd-d66c-4eaf-b56c-bd1aac340a05}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\Common\Common.vcxproj">
-      <Project>{c87a4178-44f6-49b2-b7aa-c79af1b8c534}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\Core\Core.vcxproj">
-      <Project>{8c60e805-0da5-4e25-8f84-038db504bb0d}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\DiscIO\DiscIO.vcxproj">
-      <Project>{b6398059-ebb6-4c34-b547-95f365b71ff4}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\InputCommon\InputCommon.vcxproj">
-      <Project>{b39ac394-5db5-4da9-9d98-09d46ca3701f}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\VideoCommon\VideoCommon.vcxproj">
-      <Project>{3e5c4e02-1ba9-4776-bdbe-e3f91ffa34cf}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="DolphinWX.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
+</Command>
+      <Message>Copying Data\* to $(TargetDir)</Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="Src\AboutDolphin.cpp" />
+    <ClCompile Include="Src\ARCodeAddEdit.cpp" />
+    <ClCompile Include="Src\Debugger\BreakpointDlg.cpp" />
+    <ClCompile Include="Src\Debugger\BreakpointView.cpp" />
+    <ClCompile Include="Src\Debugger\BreakpointWindow.cpp" />
+    <ClCompile Include="Src\CheatsWindow.cpp" />
+    <ClCompile Include="Src\Debugger\CodeView.cpp" />
+    <ClCompile Include="Src\Debugger\CodeWindow.cpp" />
+    <ClCompile Include="Src\Debugger\CodeWindowFunctions.cpp" />
+    <ClCompile Include="Src\ConfigMain.cpp" />
+    <ClCompile Include="Src\Debugger\DebuggerPanel.cpp" />
+    <ClCompile Include="Src\Debugger\DebuggerUIUtil.cpp" />
+    <ClCompile Include="Src\Debugger\DSPDebugWindow.cpp" />
+    <ClCompile Include="Src\Debugger\DSPRegisterView.cpp" />
+    <ClCompile Include="Src\FifoPlayerDlg.cpp" />
+    <ClCompile Include="Src\Frame.cpp" />
+    <ClCompile Include="Src\FrameAui.cpp" />
+    <ClCompile Include="Src\FrameTools.cpp" />
+    <ClCompile Include="Src\GameListCtrl.cpp" />
+    <ClCompile Include="Src\GCMicDlg.cpp" />
+    <ClCompile Include="Src\GeckoCodeDiag.cpp" />
+    <ClCompile Include="Src\HotkeyDlg.cpp" />
+    <ClCompile Include="Src\InputConfigDiag.cpp" />
+    <ClCompile Include="Src\InputConfigDiagBitmaps.cpp" />
+    <ClCompile Include="Src\ISOFile.cpp" />
+    <ClCompile Include="Src\ISOProperties.cpp" />
+    <ClCompile Include="Src\Debugger\JitWindow.cpp" />
+    <ClCompile Include="Src\LogConfigWindow.cpp" />
+    <ClCompile Include="Src\LogWindow.cpp" />
+    <ClCompile Include="Src\Main.cpp" />
+    <ClCompile Include="Src\MainNoGUI.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="Src\MemcardManager.cpp" />
+    <ClCompile Include="Src\MemoryCards\WiiSaveCrypted.cpp" />
+    <ClCompile Include="Src\Debugger\MemoryCheckDlg.cpp" />
+    <ClCompile Include="Src\Debugger\MemoryView.cpp" />
+    <ClCompile Include="Src\Debugger\MemoryWindow.cpp" />
+    <ClCompile Include="Src\NetWindow.cpp" />
+    <ClCompile Include="Src\PatchAddEdit.cpp" />
+    <ClCompile Include="Src\PHackSettings.cpp" />
+    <ClCompile Include="Src\Debugger\RegisterView.cpp" />
+    <ClCompile Include="Src\Debugger\RegisterWindow.cpp" />
+    <ClCompile Include="Src\GLInterface\WGL.cpp" />
+    <ClCompile Include="Src\stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugFast|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="Src\TASInputDlg.cpp" />
+    <ClCompile Include="Src\UDPConfigDiag.cpp" />
+    <ClCompile Include="Src\VideoConfigDiag.cpp" />
+    <ClCompile Include="Src\WiimoteConfigDiag.cpp" />
+    <ClCompile Include="Src\WXInputBase.cpp" />
+    <ClCompile Include="Src\WxUtils.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="Src\AboutDolphin.h" />
+    <ClInclude Include="Src\ARCodeAddEdit.h" />
+    <ClInclude Include="Src\Debugger\BreakpointDlg.h" />
+    <ClInclude Include="Src\Debugger\BreakpointView.h" />
+    <ClInclude Include="Src\Debugger\BreakpointWindow.h" />
+    <ClInclude Include="Src\CheatsWindow.h" />
+    <ClInclude Include="Src\Debugger\CodeView.h" />
+    <ClInclude Include="Src\Debugger\CodeWindow.h" />
+    <ClInclude Include="Src\ConfigMain.h" />
+    <ClInclude Include="Src\Debugger\DebuggerPanel.h" />
+    <ClInclude Include="Src\Debugger\DebuggerUIUtil.h" />
+    <ClInclude Include="Src\Debugger\DSPDebugWindow.h" />
+    <ClInclude Include="Src\Debugger\DSPRegisterView.h" />
+    <ClInclude Include="Src\FifoPlayerDlg.h" />
+    <ClInclude Include="Src\Frame.h" />
+    <ClInclude Include="Src\GameListCtrl.h" />
+    <ClInclude Include="Src\GCMicDlg.h" />
+    <ClInclude Include="Src\GeckoCodeDiag.h" />
+    <ClInclude Include="Src\Globals.h" />
+    <ClInclude Include="Src\HotkeyDlg.h" />
+    <ClInclude Include="Src\InputConfigDiag.h" />
+    <ClInclude Include="Src\ISOFile.h" />
+    <ClInclude Include="Src\ISOProperties.h" />
+    <ClInclude Include="Src\Debugger\JitWindow.h" />
+    <ClInclude Include="Src\LogConfigWindow.h" />
+    <ClInclude Include="Src\LogWindow.h" />
+    <ClInclude Include="Src\Main.h" />
+    <ClInclude Include="Src\MemcardManager.h" />
+    <ClInclude Include="Src\MemoryCards\WiiSaveCrypted.h" />
+    <ClInclude Include="Src\Debugger\MemoryCheckDlg.h" />
+    <ClInclude Include="Src\Debugger\MemoryView.h" />
+    <ClInclude Include="Src\Debugger\MemoryWindow.h" />
+    <ClInclude Include="Src\NetWindow.h" />
+    <ClInclude Include="Src\PatchAddEdit.h" />
+    <ClInclude Include="Src\PHackSettings.h" />
+    <ClInclude Include="Src\Debugger\RegisterView.h" />
+    <ClInclude Include="Src\Debugger\RegisterWindow.h" />
+    <ClInclude Include="Src\stdafx.h" />
+    <ClInclude Include="Src\TASInputDlg.h" />
+    <ClInclude Include="Src\UDPConfigDiag.h" />
+    <ClInclude Include="Src\VideoConfigDiag.h" />
+    <ClInclude Include="Src\WiimoteConfigDiag.h" />
+    <ClInclude Include="Src\WXInputBase.h" />
+    <ClInclude Include="Src\WxUtils.h" />
+    <ClInclude Include="Src\GLInterface.h" />
+    <ClInclude Include="Src\GLInterface\InterfaceBase.h" />
+    <ClInclude Include="Src\GLInterface\WGL.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\Installer\Dolphin.ico" />
+    <None Include="CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Externals\Bochs_disasm\Bochs_disasm.vcxproj">
+      <Project>{cd3d4c3c-1027-4d33-b047-aec7b56d0bf6}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Externals\libpng\png\png.vcxproj">
+      <Project>{01573c36-ac6e-49f6-94ba-572517eb9740}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Externals\LZO\LZO.vcxproj">
+      <Project>{d8890b98-26f7-4cff-bbfb-b95f371b5f20}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Externals\miniupnpc\miniupnpc.vcxproj">
+      <Project>{a680190d-0764-485b-9cf3-a82c5edd5715}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Externals\SFML\build\vc2010\SFML_Network.vcxproj">
+      <Project>{93d73454-2512-424e-9cda-4bb357fe13dd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Externals\wxWidgets3\build\msw\wx_base.vcxproj">
+      <Project>{1c8436c9-dbaf-42be-83bc-cf3ec9175abe}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Externals\zlib\zlib.vcxproj">
+      <Project>{3e1339f5-9311-4122-9442-369702e8fcad}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Plugins\Plugin_VideoDX11\Plugin_VideoDX11.vcxproj">
+      <Project>{9a4c733c-bade-4ac6-b58a-6e274395e90e}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Plugins\Plugin_VideoDX9\Plugin_VideoDX9.vcxproj">
+      <Project>{dc7d7af4-ce47-49e8-8b63-265cb6233a49}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Plugins\Plugin_VideoOGL\Plugin_VideoOGL.vcxproj">
+      <Project>{1909cd2d-1707-456f-86ca-0df42a727c99}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Plugins\Plugin_VideoSoftware\Plugin_VideoSoftware.vcxproj">
+      <Project>{9e9da440-e9ad-413c-b648-91030e792211}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\AudioCommon\AudioCommon.vcxproj">
+      <Project>{37d007bd-d66c-4eaf-b56c-bd1aac340a05}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\Common\Common.vcxproj">
+      <Project>{c87a4178-44f6-49b2-b7aa-c79af1b8c534}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\Core\Core.vcxproj">
+      <Project>{8c60e805-0da5-4e25-8f84-038db504bb0d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\DiscIO\DiscIO.vcxproj">
+      <Project>{b6398059-ebb6-4c34-b547-95f365b71ff4}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\InputCommon\InputCommon.vcxproj">
+      <Project>{b39ac394-5db5-4da9-9d98-09d46ca3701f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\VideoCommon\VideoCommon.vcxproj">
+      <Project>{3e5c4e02-1ba9-4776-bdbe-e3f91ffa34cf}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="DolphinWX.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj.filters b/Source/Core/DolphinWX/Dolphin.vcxproj.filters
index 61ae0826fc..f4b70dd4ef 100644
--- a/Source/Core/DolphinWX/Dolphin.vcxproj.filters
+++ b/Source/Core/DolphinWX/Dolphin.vcxproj.filters
@@ -1,305 +1,309 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="Src\Main.cpp" />
-    <ClCompile Include="Src\MainNoGUI.cpp" />
-    <ClCompile Include="Src\stdafx.cpp" />
-    <ClCompile Include="Src\WXInputBase.cpp" />
-    <ClCompile Include="Src\WxUtils.cpp" />
-    <ClCompile Include="Src\MemoryCards\WiiSaveCrypted.cpp">
-      <Filter>GUI\Saves</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\NetWindow.cpp">
-      <Filter>GUI\NetPlay</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\InputConfigDiag.cpp">
-      <Filter>GUI\InputConfig</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\InputConfigDiagBitmaps.cpp">
-      <Filter>GUI\InputConfig</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\AboutDolphin.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ARCodeAddEdit.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\CheatsWindow.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ConfigMain.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Frame.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FrameAui.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FrameTools.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\GameListCtrl.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\GeckoCodeDiag.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\HotkeyDlg.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ISOProperties.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\LogWindow.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\MemcardManager.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PatchAddEdit.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\UDPConfigDiag.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\WiimoteConfigDiag.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\ISOFile.cpp">
-      <Filter>Misc</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\PHackSettings.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\DebuggerUIUtil.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\VideoConfigDiag.cpp">
-      <Filter>GUI\Video</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\CodeView.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\MemoryView.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\DebuggerPanel.cpp">
-      <Filter>GUI\Video</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\BreakpointDlg.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\BreakpointWindow.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\CodeWindow.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\CodeWindowFunctions.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\DSPDebugWindow.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\JitWindow.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\MemoryCheckDlg.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\MemoryWindow.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\RegisterWindow.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\RegisterView.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\DSPRegisterView.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\Debugger\BreakpointView.cpp">
-      <Filter>GUI\Debugger</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\LogConfigWindow.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\FifoPlayerDlg.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\TASInputDlg.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-    <ClCompile Include="Src\GCMicDlg.cpp">
-      <Filter>GUI</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Src\Main.h" />
-    <ClInclude Include="Src\stdafx.h" />
-    <ClInclude Include="Src\WXInputBase.h" />
-    <ClInclude Include="Src\WxUtils.h" />
-    <ClInclude Include="Src\MemoryCards\WiiSaveCrypted.h">
-      <Filter>GUI\Saves</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\NetWindow.h">
-      <Filter>GUI\NetPlay</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\InputConfigDiag.h">
-      <Filter>GUI\InputConfig</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ARCodeAddEdit.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\AboutDolphin.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ConfigMain.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\CheatsWindow.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\GeckoCodeDiag.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Frame.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\GameListCtrl.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Globals.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\HotkeyDlg.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ISOProperties.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\LogWindow.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\MemcardManager.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PatchAddEdit.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\UDPConfigDiag.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\WiimoteConfigDiag.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\ISOFile.h">
-      <Filter>Misc</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Resources</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\PHackSettings.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\DebuggerUIUtil.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\VideoConfigDiag.h">
-      <Filter>GUI\Video</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\CodeView.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\MemoryView.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\DebuggerPanel.h">
-      <Filter>GUI\Video</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\BreakpointDlg.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\BreakpointWindow.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\CodeWindow.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\DSPDebugWindow.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\JitWindow.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\MemoryCheckDlg.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\MemoryWindow.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\RegisterWindow.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\RegisterView.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\DSPRegisterView.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\Debugger\BreakpointView.h">
-      <Filter>GUI\Debugger</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\LogConfigWindow.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\FifoPlayerDlg.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\TASInputDlg.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-    <ClInclude Include="Src\GCMicDlg.h">
-      <Filter>GUI</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CMakeLists.txt" />
-    <None Include="..\..\..\Installer\Dolphin.ico">
-      <Filter>Resources</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="GUI">
-      <UniqueIdentifier>{2f20d058-1119-4738-bda8-90fe900e8d69}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="GUI\InputConfig">
-      <UniqueIdentifier>{70eb2f12-fab7-4953-8ad1-a981837c3a7e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="GUI\NetPlay">
-      <UniqueIdentifier>{38fc863a-0392-4c5d-ab28-7fe1f70e8a70}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="GUI\Saves">
-      <UniqueIdentifier>{3727fb17-2efd-43ce-b71f-d110f0f40474}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Misc">
-      <UniqueIdentifier>{0721c9ae-4d49-49d6-997b-3731f8ab64cc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resources">
-      <UniqueIdentifier>{9dd3ef96-b03a-4c14-9d35-6a4850acd430}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="GUI\Debugger">
-      <UniqueIdentifier>{8ab1ce40-f5e7-47b8-9706-59c924af4eaa}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="GUI\Video">
-      <UniqueIdentifier>{ff5180be-244f-4c0e-8a35-bd4bffb6a343}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="DolphinWX.rc">
-      <Filter>Resources</Filter>
-    </ResourceCompile>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="Src\Main.cpp" />
+    <ClCompile Include="Src\MainNoGUI.cpp" />
+    <ClCompile Include="Src\stdafx.cpp" />
+    <ClCompile Include="Src\WXInputBase.cpp" />
+    <ClCompile Include="Src\WxUtils.cpp" />
+    <ClCompile Include="Src\MemoryCards\WiiSaveCrypted.cpp">
+      <Filter>GUI\Saves</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\NetWindow.cpp">
+      <Filter>GUI\NetPlay</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\InputConfigDiag.cpp">
+      <Filter>GUI\InputConfig</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\InputConfigDiagBitmaps.cpp">
+      <Filter>GUI\InputConfig</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\AboutDolphin.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\ARCodeAddEdit.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\CheatsWindow.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\ConfigMain.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Frame.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\FrameAui.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\FrameTools.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\GameListCtrl.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\GeckoCodeDiag.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\HotkeyDlg.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\ISOProperties.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\LogWindow.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\MemcardManager.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PatchAddEdit.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\UDPConfigDiag.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\WiimoteConfigDiag.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\ISOFile.cpp">
+      <Filter>Misc</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\PHackSettings.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Debugger\DebuggerUIUtil.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\VideoConfigDiag.cpp">
+      <Filter>GUI\Video</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Debugger\CodeView.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Debugger\MemoryView.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Debugger\DebuggerPanel.cpp">
+      <Filter>GUI\Video</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Debugger\BreakpointDlg.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Debugger\BreakpointWindow.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Debugger\CodeWindow.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Debugger\CodeWindowFunctions.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Debugger\DSPDebugWindow.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Debugger\JitWindow.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Debugger\MemoryCheckDlg.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Debugger\MemoryWindow.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Debugger\RegisterWindow.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Debugger\RegisterView.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Debugger\DSPRegisterView.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\Debugger\BreakpointView.cpp">
+      <Filter>GUI\Debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\LogConfigWindow.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\FifoPlayerDlg.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\TASInputDlg.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\GCMicDlg.cpp">
+      <Filter>GUI</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\GLInterface\WGL.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Src\Main.h" />
+    <ClInclude Include="Src\stdafx.h" />
+    <ClInclude Include="Src\WXInputBase.h" />
+    <ClInclude Include="Src\WxUtils.h" />
+    <ClInclude Include="Src\MemoryCards\WiiSaveCrypted.h">
+      <Filter>GUI\Saves</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\NetWindow.h">
+      <Filter>GUI\NetPlay</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\InputConfigDiag.h">
+      <Filter>GUI\InputConfig</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\ARCodeAddEdit.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\AboutDolphin.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\ConfigMain.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\CheatsWindow.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\GeckoCodeDiag.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Frame.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\GameListCtrl.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Globals.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\HotkeyDlg.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\ISOProperties.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\LogWindow.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\MemcardManager.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PatchAddEdit.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\UDPConfigDiag.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\WiimoteConfigDiag.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\ISOFile.h">
+      <Filter>Misc</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Resources</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\PHackSettings.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Debugger\DebuggerUIUtil.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\VideoConfigDiag.h">
+      <Filter>GUI\Video</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Debugger\CodeView.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Debugger\MemoryView.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Debugger\DebuggerPanel.h">
+      <Filter>GUI\Video</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Debugger\BreakpointDlg.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Debugger\BreakpointWindow.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Debugger\CodeWindow.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Debugger\DSPDebugWindow.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Debugger\JitWindow.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Debugger\MemoryCheckDlg.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Debugger\MemoryWindow.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Debugger\RegisterWindow.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Debugger\RegisterView.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Debugger\DSPRegisterView.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\Debugger\BreakpointView.h">
+      <Filter>GUI\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\LogConfigWindow.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\FifoPlayerDlg.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\TASInputDlg.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\GCMicDlg.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="Src\GLInterface.h" />
+    <ClInclude Include="Src\GLInterface\InterfaceBase.h" />
+    <ClInclude Include="Src\GLInterface\WGL.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="CMakeLists.txt" />
+    <None Include="..\..\..\Installer\Dolphin.ico">
+      <Filter>Resources</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="GUI">
+      <UniqueIdentifier>{2f20d058-1119-4738-bda8-90fe900e8d69}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GUI\InputConfig">
+      <UniqueIdentifier>{70eb2f12-fab7-4953-8ad1-a981837c3a7e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GUI\NetPlay">
+      <UniqueIdentifier>{38fc863a-0392-4c5d-ab28-7fe1f70e8a70}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GUI\Saves">
+      <UniqueIdentifier>{3727fb17-2efd-43ce-b71f-d110f0f40474}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Misc">
+      <UniqueIdentifier>{0721c9ae-4d49-49d6-997b-3731f8ab64cc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resources">
+      <UniqueIdentifier>{9dd3ef96-b03a-4c14-9d35-6a4850acd430}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GUI\Debugger">
+      <UniqueIdentifier>{8ab1ce40-f5e7-47b8-9706-59c924af4eaa}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GUI\Video">
+      <UniqueIdentifier>{ff5180be-244f-4c0e-8a35-bd4bffb6a343}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="DolphinWX.rc">
+      <Filter>Resources</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp
index d569ddc397..9cba383f26 100644
--- a/Source/Core/DolphinWX/Src/NetWindow.cpp
+++ b/Source/Core/DolphinWX/Src/NetWindow.cpp
@@ -149,6 +149,10 @@ NetPlaySetupDiag::NetPlaySetupDiag(wxWindow* const parent, const CGameListCtrl*
 	wxBoxSizer* const top_szr = new wxBoxSizer(wxHORIZONTAL);
 	top_szr->Add(port_lbl, 0, wxCENTER | wxRIGHT, 5);
 	top_szr->Add(m_host_port_text, 0);
+#ifdef USE_UPNP
+	m_upnp_chk = new wxCheckBox(host_tab, wxID_ANY, _("Forward port (UPnP)"));
+	top_szr->Add(m_upnp_chk, 0, wxALL | wxALIGN_RIGHT, 5);
+#endif
 
 	wxBoxSizer* const host_szr = new wxBoxSizer(wxVERTICAL);
 	host_szr->Add(top_szr, 0, wxALL | wxEXPAND, 5);
@@ -220,6 +224,10 @@ void NetPlaySetupDiag::OnHost(wxCommandEvent&)
 		, WxStrToStr(m_nickname_text->GetValue()), npd, game);
 	if (netplay_ptr->is_connected)
 	{
+#ifdef USE_UPNP
+		if(m_upnp_chk->GetValue())
+			((NetPlayServer*)netplay_ptr)->TryPortmapping(port);
+#endif
 		npd->Show();
 		Destroy();
 	}
diff --git a/Source/Core/DolphinWX/Src/NetWindow.h b/Source/Core/DolphinWX/Src/NetWindow.h
index 3c7cbe99a7..76fbc03431 100644
--- a/Source/Core/DolphinWX/Src/NetWindow.h
+++ b/Source/Core/DolphinWX/Src/NetWindow.h
@@ -48,6 +48,9 @@ private:
 		*m_connect_ip_text;
 
 	wxListBox*		m_game_lbox;
+#ifdef USE_UPNP
+	wxCheckBox*		m_upnp_chk;
+#endif
 
 	const CGameListCtrl* const m_game_list;
 };
diff --git a/Source/Dolphin_2010.sln b/Source/Dolphin_2010.sln
index 6e304983dc..7706250490 100644
--- a/Source/Dolphin_2010.sln
+++ b/Source/Dolphin_2010.sln
@@ -112,6 +112,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoundTouch", "..\Externals\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "UnitTests\UnitTests.vcxproj", "{40C636FA-B5BF-4D67-ABC8-376B524A7551}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniupnpc", "..\Externals\miniupnpc\miniupnpc.vcxproj", "{A680190D-0764-485B-9CF3-A82C5EDD5715}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -409,6 +411,18 @@ Global
 		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Release|Win32.Build.0 = Release|Win32
 		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Release|x64.ActiveCfg = Release|x64
 		{40C636FA-B5BF-4D67-ABC8-376B524A7551}.Release|x64.Build.0 = Release|x64
+		{A680190D-0764-485B-9CF3-A82C5EDD5715}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A680190D-0764-485B-9CF3-A82C5EDD5715}.Debug|Win32.Build.0 = Debug|Win32
+		{A680190D-0764-485B-9CF3-A82C5EDD5715}.Debug|x64.ActiveCfg = Debug|x64
+		{A680190D-0764-485B-9CF3-A82C5EDD5715}.Debug|x64.Build.0 = Debug|x64
+		{A680190D-0764-485B-9CF3-A82C5EDD5715}.DebugFast|Win32.ActiveCfg = Debug|Win32
+		{A680190D-0764-485B-9CF3-A82C5EDD5715}.DebugFast|Win32.Build.0 = Debug|Win32
+		{A680190D-0764-485B-9CF3-A82C5EDD5715}.DebugFast|x64.ActiveCfg = Debug|x64
+		{A680190D-0764-485B-9CF3-A82C5EDD5715}.DebugFast|x64.Build.0 = Debug|x64
+		{A680190D-0764-485B-9CF3-A82C5EDD5715}.Release|Win32.ActiveCfg = Release|Win32
+		{A680190D-0764-485B-9CF3-A82C5EDD5715}.Release|Win32.Build.0 = Release|Win32
+		{A680190D-0764-485B-9CF3-A82C5EDD5715}.Release|x64.ActiveCfg = Release|x64
+		{A680190D-0764-485B-9CF3-A82C5EDD5715}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
index bb2f7e6efa..e1201912fd 100644
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <StructMemberAlignment>16Bytes</StructMemberAlignment>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <BaseAddress>0x00400000</BaseAddress>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;USE_UPNP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <StructMemberAlignment>16Bytes</StructMemberAlignment>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <BaseAddress>0x00400000</BaseAddress>
+    </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup />
 </Project>
\ No newline at end of file
diff --git a/Source/VSProps/Dolphin.Win32.props b/Source/VSProps/Dolphin.Win32.props
index a82093460e..f9585b861f 100644
--- a/Source/VSProps/Dolphin.Win32.props
+++ b/Source/VSProps/Dolphin.Win32.props
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir>..\..\..\Binary\$(PlatformName)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <Link>
-      <AdditionalLibraryDirectories>..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\portaudio\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;opengl32.lib;glew32s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>..\..\..\Binary\$(PlatformName)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <AdditionalLibraryDirectories>..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\portaudio\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;opengl32.lib;glew32s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
\ No newline at end of file
diff --git a/Source/VSProps/Dolphin.x64.props b/Source/VSProps/Dolphin.x64.props
index e225d0a7f6..9ec1a10f53 100644
--- a/Source/VSProps/Dolphin.x64.props
+++ b/Source/VSProps/Dolphin.x64.props
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Dolphin.x64</_PropertySheetDisplayName>
-    <OutDir>..\..\..\Binary\$(PlatformName)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <Link>
-      <AdditionalLibraryDirectories>..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\portaudio\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;opengl32.lib;glew64s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_PropertySheetDisplayName>Dolphin.x64</_PropertySheetDisplayName>
+    <OutDir>..\..\..\Binary\$(PlatformName)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <AdditionalLibraryDirectories>..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\portaudio\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;opengl32.lib;glew64s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>
\ No newline at end of file

From 44db30560221c349868e266d3180b2bbe05789d7 Mon Sep 17 00:00:00 2001
From: John Chadwick <johnwchadwick@gmail.com>
Date: Tue, 9 Jul 2013 18:19:56 -0400
Subject: [PATCH 265/352] Disable UPnP on Android. (Sorry :()

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ea7cfeca7..73c4361a68 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -299,6 +299,7 @@ if(ANDROID)
 	add_definitions(-DANDROID)
 	set(USE_X11 0)
 	set(USE_WAYLAND 0)
+	set(USE_UPNP 0)
 endif()
 ########################################
 # Dependency checking

From 1f6b70bf87f45c1706886cdc111cb466135b8d66 Mon Sep 17 00:00:00 2001
From: Glenn Rice <glennricster@gmail.com>
Date: Tue, 9 Jul 2013 22:07:27 -0500
Subject: [PATCH 266/352] On linux check for a new enough system version of
 miniupnpc.  Fall back to building the version in the externals if it is not
 available.

---
 CMakeLists.txt                 |  36 ++++---
 CMakeTests/FindMiniupnpc.cmake | 179 +++++++++++++++++++++++++++++++++
 2 files changed, 201 insertions(+), 14 deletions(-)
 create mode 100644 CMakeTests/FindMiniupnpc.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73c4361a68..1662b3f0c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -523,17 +523,17 @@ if(NOT ANDROID)
 	else(SDL2_FOUND)
 		# SDL2 not found, try SDL
 		if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-		include(FindSDL OPTIONAL)
-	endif()
-	if(SDL_FOUND)
-		message("Using shared SDL")
-		include_directories(${SDL_INCLUDE_DIR})
-	else(SDL_FOUND)
-		# TODO: Use the prebuilt one on Windows
-		message("Using static SDL from Externals")
-		include_directories(Externals/SDL/SDL Externals/SDL Externals/SDL/include)
-		add_subdirectory(Externals/SDL)
-	endif(SDL_FOUND)
+			include(FindSDL OPTIONAL)
+		endif()
+		if(SDL_FOUND)
+			message("Using shared SDL")
+			include_directories(${SDL_INCLUDE_DIR})
+		else(SDL_FOUND)
+			# TODO: Use the prebuilt one on Windows
+			message("Using static SDL from Externals")
+			include_directories(Externals/SDL/SDL Externals/SDL Externals/SDL/include)
+			add_subdirectory(Externals/SDL)
+		endif(SDL_FOUND)
 	endif(SDL2_FOUND)
 endif()
 
@@ -552,9 +552,17 @@ else()
 endif()
 
 if(USE_UPNP)
-	message("Using static MiniUPnP client from Externals")
-	add_subdirectory(Externals/miniupnpc)
-	include_directories(Externals/miniupnpc/src)
+	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
+		include(FindMiniupnpc)
+	endif()
+	if(MINIUPNP_FOUND AND NOT MINIUPNPC_VERSION_PRE1_7)
+		message("Using shared miniupnpc")
+		include_directories(${MINIUPNP_INCLUDE_DIR})
+	else()
+		message("Using static miniupnpc from Externals")
+		add_subdirectory(Externals/miniupnpc)
+		include_directories(Externals/miniupnpc/src)
+	endif()
 	add_definitions(-DUSE_UPNP)
 endif()
 
diff --git a/CMakeTests/FindMiniupnpc.cmake b/CMakeTests/FindMiniupnpc.cmake
new file mode 100644
index 0000000000..8f919cacb3
--- /dev/null
+++ b/CMakeTests/FindMiniupnpc.cmake
@@ -0,0 +1,179 @@
+# Locate miniupnp library
+# This module defines
+#  MINIUPNP_FOUND, if false, do not try to link to miniupnp
+#  MINIUPNP_LIBRARY, the miniupnp variant
+#  MINIUPNP_INCLUDE_DIR, where to find miniupnpc.h and family)
+#  MINIUPNPC_VERSION_PRE1_6 --> set if we detect the version of miniupnpc is
+#                               pre 1.6
+#  MINIUPNPC_VERSION_PRE1_5 --> set if we detect the version of miniupnpc is
+#                               pre 1.5
+#
+# Note that the expected include convention is
+#  #include "miniupnpc.h"
+# and not
+#  #include <miniupnpc/miniupnpc.h>
+# This is because, the miniupnpc location is not standardized and may exist
+# in locations other than miniupnpc/
+
+#=============================================================================
+# Copyright 2011 Mark Vejvoda
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+if (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY)
+	# Already in cache, be silent
+	set(MINIUPNP_FIND_QUIETLY TRUE)
+endif (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY)
+
+find_path(MINIUPNP_INCLUDE_DIR miniupnpc.h
+	PATH_SUFFIXES miniupnpc)
+find_library(MINIUPNP_LIBRARY miniupnpc)
+
+if (MINIUPNP_INCLUDE_DIR AND MINIUPNP_LIBRARY)
+	set (MINIUPNP_FOUND TRUE)
+endif ()
+
+if (MINIUPNP_FOUND)
+	if (NOT MINIUPNP_FIND_QUIETLY)
+		message (STATUS "Found the miniupnpc libraries at ${MINIUPNP_LIBRARY}")
+		message (STATUS "Found the miniupnpc headers at ${MINIUPNP_INCLUDE_DIR}")
+	endif (NOT MINIUPNP_FIND_QUIETLY)
+
+	message(STATUS "Detecting version of miniupnpc in path: ${MINIUPNP_INCLUDE_DIR}")
+
+	set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
+	set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
+	check_cxx_source_runs("
+	#include <miniwget.h>
+	#include <miniupnpc.h>
+	#include <upnpcommands.h>
+	#include <stdio.h>
+	int main()
+	{
+	static struct UPNPUrls urls;
+	static struct IGDdatas data;
+
+	GetUPNPUrls (&urls, &data, \"myurl\",0);
+
+	return 0;
+	}"
+	MINIUPNPC_VERSION_1_7_OR_HIGHER)
+
+IF (NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
+	set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
+	set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
+	check_cxx_source_runs("
+	#include <miniwget.h>
+	#include <miniupnpc.h>
+	#include <upnpcommands.h>
+	#include <stdio.h>
+	int main()
+	{
+	struct UPNPDev *devlist = NULL;
+	int upnp_delay = 5000;
+	const char *upnp_multicastif = NULL;
+	const char *upnp_minissdpdsock = NULL;
+	int upnp_sameport = 0;
+	int upnp_ipv6 = 0;
+	int upnp_error = 0;
+	devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error);
+
+	return 0;
+	}"
+	MINIUPNPC_VERSION_PRE1_7)
+   ENDIF()
+
+   IF (NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
+	   set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
+	   set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
+	   check_cxx_source_runs("
+	   #include <miniwget.h>
+	   #include <miniupnpc.h>
+	   #include <upnpcommands.h>
+	   #include <stdio.h>
+	   int main()
+	   {
+	   struct UPNPDev *devlist = NULL;
+	   int upnp_delay = 5000;
+	   const char *upnp_multicastif = NULL;
+	   const char *upnp_minissdpdsock = NULL;
+	   int upnp_sameport = 0;
+	   int upnp_ipv6 = 0;
+	   int upnp_error = 0;
+	   devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport);
+
+	   return 0;
+	   }"
+	   MINIUPNPC_VERSION_PRE1_6)
+
+   ENDIF()
+
+   IF (NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
+	   set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
+	   set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
+	   check_cxx_source_runs("
+	   #include <miniwget.h>
+	   #include <miniupnpc.h>
+	   #include <upnpcommands.h>
+	   #include <stdio.h>
+	   static struct UPNPUrls urls;
+	   static struct IGDdatas data;
+	   int main()
+	   {
+	   char externalIP[16]     = "";
+	   UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIP);
+
+	   return 0;
+	   }"
+	   MINIUPNPC_VERSION_1_5_OR_HIGHER)
+	ENDIF()
+
+	IF (NOT MINIUPNPC_VERSION_1_5_OR_HIGHER AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7 AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
+		set(CMAKE_REQUIRED_INCLUDES ${MINIUPNP_INCLUDE_DIR})
+		set(CMAKE_REQUIRED_LIBRARIES ${MINIUPNP_LIBRARY})
+		check_cxx_source_runs("
+		#include <miniwget.h>
+		#include <miniupnpc.h>
+		#include <upnpcommands.h>
+		#include <stdio.h>
+		static struct UPNPUrls urls;
+		static struct IGDdatas data;
+		int main()
+		{
+		char externalIP[16]     = "";
+		UPNP_GetExternalIPAddress(urls.controlURL, data.servicetype, externalIP);
+
+		return 0;
+		}"
+		MINIUPNPC_VERSION_PRE1_5)
+
+ENDIF()
+
+IF(MINIUPNPC_VERSION_PRE1_5)
+	message(STATUS "Found miniupnpc version is pre v1.5")
+ENDIF()
+IF(MINIUPNPC_VERSION_PRE1_6)
+	message(STATUS "Found miniupnpc version is pre v1.6")
+ENDIF()
+IF(MINIUPNPC_VERSION_PRE1_7)
+	message(STATUS "Found miniupnpc version is pre v1.7")
+ENDIF()
+
+IF(NOT MINIUPNPC_VERSION_PRE1_5 AND NOT MINIUPNPC_VERSION_PRE1_6 AND NOT MINIUPNPC_VERSION_PRE1_7)
+	message(STATUS "Found miniupnpc version is v1.7 or higher")
+ENDIF()
+
+else ()
+	message (STATUS "Could not find miniupnp")
+endif ()
+
+MARK_AS_ADVANCED(MINIUPNP_INCLUDE_DIR MINIUPNP_LIBRARY)
+

From 8b65775ee11c8571eef970b74a0f8404f16c09c2 Mon Sep 17 00:00:00 2001
From: Glenn Rice <glennricster@gmail.com>
Date: Wed, 10 Jul 2013 15:07:57 -0500
Subject: [PATCH 267/352] Fix a couple of compiler warnings that have cropped
 up.

---
 Source/Core/DolphinWX/Src/InputConfigDiag.cpp | 1 -
 Source/Core/DolphinWX/Src/Main.cpp            | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
index 033eca8da0..6a740aae45 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
@@ -239,7 +239,6 @@ void GamepadPage::UpdateGUI()
 		std::vector<ControlButton*>::const_iterator i = (*g)->control_buttons.begin()
 			, e = (*g)->control_buttons.end();
 		for (; i!=e; ++i) {
-			ControllerInterface::ControlReference *r = (*i)->control_reference;
 			wxString expr = StrToWxStr((*i)->control_reference->expression);
 			expr.Replace("&", "&&");
 			(*i)->SetLabel(expr);
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index 1cb52b828f..0cbfab1031 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -658,7 +658,7 @@ void Host_SetWiiMoteConnectionState(int _State)
 	// Update field 1 or 2
 	event.SetInt(1);
 
-	NOTICE_LOG(WIIMOTE, event.GetString().c_str());
+	NOTICE_LOG(WIIMOTE, "%s", static_cast<const char*>(event.GetString().c_str()));
 
 	main_frame->GetEventHandler()->AddPendingEvent(event);
 }

From 1aca5fe79894e4688197233a64da5e70cead4e62 Mon Sep 17 00:00:00 2001
From: Glenn Rice <glennricster@gmail.com>
Date: Wed, 10 Jul 2013 21:49:13 -0500
Subject: [PATCH 268/352] Remove the cmake check for wxWidgets 2.8.9 that
 somehow got readded to the code before the correct check for wxWidgets
 2.9.3/2.9.4. Also clean up the indentation in the CMakeLists.txt file.

---
 CMakeLists.txt | 109 +++++++++++++++++++++----------------------------
 1 file changed, 47 insertions(+), 62 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1662b3f0c7..7c0d4f6f22 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,22 +85,22 @@ endfunction(enable_precompiled_headers)
 # for revision info
 include(FindGit OPTIONAL)
 if(GIT_FOUND AND NOT DOLPHIN_WC_REVISION)
-# defines DOLPHIN_WC_REVISION
+	# defines DOLPHIN_WC_REVISION
 	EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
-	OUTPUT_VARIABLE DOLPHIN_WC_REVISION
-	OUTPUT_STRIP_TRAILING_WHITESPACE)
-# defines DOLPHIN_WC_DESCRIBE
+		OUTPUT_VARIABLE DOLPHIN_WC_REVISION
+		OUTPUT_STRIP_TRAILING_WHITESPACE)
+	# defines DOLPHIN_WC_DESCRIBE
 	EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty
-	OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
-	OUTPUT_STRIP_TRAILING_WHITESPACE)
+		OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
+		OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-# remove hash from description
+	# remove hash from description
 	STRING(REGEX REPLACE "-[^-]+((-dirty)?)$" "\\1" DOLPHIN_WC_DESCRIBE "${DOLPHIN_WC_DESCRIBE}")
 
-# defines DOLPHIN_WC_BRANCH
+	# defines DOLPHIN_WC_BRANCH
 	EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
-	OUTPUT_VARIABLE DOLPHIN_WC_BRANCH
-	OUTPUT_STRIP_TRAILING_WHITESPACE)
+		OUTPUT_VARIABLE DOLPHIN_WC_BRANCH
+		OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif()
 
 # version number
@@ -118,7 +118,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
 	add_definitions(-marm -march=armv7-a)
 	add_definitions(-D_M_ARM=1)
 	add_definitions(-D_M_GENERIC=1)
-# Set generic options so you don't have to pass anything to cmake to build ARM
+	# Set generic options so you don't have to pass anything to cmake to build ARM
 	set(USE_GLES 1)
 endif()
 
@@ -191,13 +191,13 @@ if(APPLE)
 	set(SYSROOT_LEGACY_PATH "/Developer/SDKs/MacOSX10.7.sdk")
 	set(SYSROOT_PATH "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk")
 	if(EXISTS "${SYSROOT_PATH}/")
-        set(TARGET_SYSROOT ${SYSROOT_PATH})
+		set(TARGET_SYSROOT ${SYSROOT_PATH})
 	elseif(EXISTS "${SYSROOT_LEGACY_PATH}/")
-        set(TARGET_SYSROOT ${SYSROOT_LEGACY_PATH})
+		set(TARGET_SYSROOT ${SYSROOT_LEGACY_PATH})
 	endif()
 	if(${TARGET_SYSROOT})
-        set(TARGET_FLAGS "${TARGET_FLAGS} -isysroot ${TARGET_SYSROOT}")
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-syslibroot,${TARGET_SYSROOT}")
+		set(TARGET_FLAGS "${TARGET_FLAGS} -isysroot ${TARGET_SYSROOT}")
+		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-syslibroot,${TARGET_SYSROOT}")
 	endif()
 	# Do not warn about frameworks that are not available on all architectures.
 	# This avoids a warning when linking with QuickTime.
@@ -288,7 +288,7 @@ if(USE_EGL)
 	message("EGL OpenGL interface enabled")
 	add_definitions(-DUSE_EGL=1)
 else()
-# Using GLX
+	# Using GLX
 	set(USE_X11 1)
 	set(USE_WAYLAND 0)
 endif()
@@ -376,8 +376,8 @@ if(NOT ANDROID)
 	endif(OPENAL_FOUND)
 
 	if(UNIX AND NOT APPLE)
-# Note: The convention is to check USE_X11 or USE_WAYLAND where needed.
-# This is where we detect platforms and set the variables accordingly.
+		# Note: The convention is to check USE_X11 or USE_WAYLAND where needed.
+		# This is where we detect platforms and set the variables accordingly.
 		pkg_check_modules(WAYLAND wayland-egl wayland-client wayland-cursor)
 		if(USE_WAYLAND AND WAYLAND_FOUND)
 			pkg_check_modules(XKBCOMMON xkbcommon)
@@ -393,8 +393,8 @@ if(NOT ANDROID)
 			add_definitions(-DHAVE_WAYLAND=0)
 		endif(USE_WAYLAND AND WAYLAND_FOUND)
 
-# Note: We do not need to explicitly check for X11 as it is done in the cmake
-# FindOpenGL module on linux.
+		# Note: We do not need to explicitly check for X11 as it is done in the cmake
+		# FindOpenGL module on linux.
 		if(USE_X11 AND X11_FOUND)
 			set(USE_X11 1)
 			add_definitions(-DHAVE_X11=1)
@@ -406,11 +406,11 @@ if(NOT ANDROID)
 			message("X11 support disabled")
 			add_definitions(-DHAVE_X11=0)
 		endif(USE_X11 AND X11_FOUND)
-	
+
 		if (NOT USE_WAYLAND AND NOT USE_X11)
 			message(FATAL_ERROR "\n"
-			"No suitable display platform found\n"
-			"Requires wayland or x11 to run")
+				"No suitable display platform found\n"
+				"Requires wayland or x11 to run")
 		endif()
 	endif()
 
@@ -544,11 +544,11 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
 	include(FindSFML OPTIONAL)
 endif()
 if(SFML_FOUND AND NOT SFML_VERSION_MAJOR) # SFML 1.x doesn't define SFML_VERSION_MAJOR
-       message("Using shared SFML")
+	message("Using shared SFML")
 else()
-       message("Using static SFML ${SFML_FIND_VERSION_MAJOR}.${SFML_FIND_VERSION_MINOR} from Externals")
-       add_subdirectory(Externals/SFML)
-       include_directories(Externals/SFML/include)
+	message("Using static SFML ${SFML_FIND_VERSION_MAJOR}.${SFML_FIND_VERSION_MINOR} from Externals")
+	add_subdirectory(Externals/SFML)
+	include_directories(Externals/SFML/include)
 endif()
 
 if(USE_UPNP)
@@ -623,22 +623,7 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 	if(wxWidgets_FOUND)
 		EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} 
 			COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
-				${wxWidgets_CONFIG_OPTIONS} --version
-			OUTPUT_VARIABLE wxWidgets_VERSION
-			OUTPUT_STRIP_TRAILING_WHITESPACE
-			ERROR_QUIET
-			)
-		message("Found wxWidgets version ${wxWidgets_VERSION}")
-		if(${wxWidgets_VERSION} VERSION_LESS "2.8.9")
-			message("At least 2.8.9 is required; ignoring found version")
-			unset(wxWidgets_FOUND)
-		endif()
-	endif(wxWidgets_FOUND)
-		
-	if(wxWidgets_FOUND)
-		EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} 
-			COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}"
-				${wxWidgets_CONFIG_OPTIONS} --version
+			${wxWidgets_CONFIG_OPTIONS} --version
 			OUTPUT_VARIABLE wxWidgets_VERSION
 			OUTPUT_STRIP_TRAILING_WHITESPACE
 			ERROR_QUIET
@@ -655,26 +640,26 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 		endif()
 	endif(wxWidgets_FOUND)
 
-		if(UNIX AND NOT APPLE)
-			# There is a bug in the FindGTK module in cmake version 2.8.2 that
-			# does not find gdk-pixbuf-2.0.  On the other hand some 2.8.3
-			# users have complained that pkg-config does not find
-			# gdk-pixbuf-2.0.  On yet another hand, cmake version 2.8.3 in
-			# Ubuntu Natty does not find the glib libraries correctly.
-			# Ugly!!!
-			execute_process(COMMAND lsb_release -c -s
-				OUTPUT_VARIABLE DIST_NAME
-				ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-			if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}
-					VERSION_EQUAL 2.8.2 OR "${DIST_NAME}" STREQUAL "natty")
-				check_lib(GTK2 gtk+-2.0 gtk.h REQUIRED)
-			else()
-				include(FindGTK2)
-				if(GTK2_FOUND)
-					include_directories(${GTK2_INCLUDE_DIRS})
-				endif()
+	if(UNIX AND NOT APPLE)
+		# There is a bug in the FindGTK module in cmake version 2.8.2 that
+		# does not find gdk-pixbuf-2.0.  On the other hand some 2.8.3
+		# users have complained that pkg-config does not find
+		# gdk-pixbuf-2.0.  On yet another hand, cmake version 2.8.3 in
+		# Ubuntu Natty does not find the glib libraries correctly.
+		# Ugly!!!
+		execute_process(COMMAND lsb_release -c -s
+			OUTPUT_VARIABLE DIST_NAME
+			ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+		if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}
+				VERSION_EQUAL 2.8.2 OR "${DIST_NAME}" STREQUAL "natty")
+			check_lib(GTK2 gtk+-2.0 gtk.h REQUIRED)
+		else()
+			include(FindGTK2)
+			if(GTK2_FOUND)
+				include_directories(${GTK2_INCLUDE_DIRS})
 			endif()
 		endif()
+	endif()
 
 	if(wxWidgets_FOUND)
 		include(${wxWidgets_USE_FILE})
@@ -697,7 +682,7 @@ if(NOT DISABLE_WX AND NOT ANDROID)
 		else()
 			message(FATAL_ERROR "wxWidgets in Externals is not compatible with your platform")
 		endif()
-		
+
 		include_directories(
 			Externals/wxWidgets3
 			Externals/wxWidgets3/include)

From 33ca0101155389e45cca46c7b41c0b05a6a77c6d Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Thu, 11 Jul 2013 03:56:27 -0500
Subject: [PATCH 269/352] [Android] Derp Squad. Show compressed files in the
 browse folder dialog. Show in red text and if one clicks on it. Say we don't
 support compressed file formats.

---
 Source/Android/.idea/workspace.xml            | 216 ++++++++++--------
 .../dolphinemu/dolphinemu/AboutActivity.java  |   2 +-
 .../dolphinemu/dolphinemu/FolderBrowser.java  |  20 +-
 .../dolphinemu/FolderBrowserAdapter.java      |   5 +
 .../dolphinemu/GameListFragment.java          |   2 +-
 .../dolphinemu/dolphinemu/GameListItem.java   |   8 +-
 6 files changed, 146 insertions(+), 107 deletions(-)

diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index 140ae23672..d3a0e0282d 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -103,16 +103,16 @@
       <file leaf-file-name="DolphinEmulator.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="224" column="45" selection-start="6730" selection-end="6769" vertical-scroll-proportion="0.0" vertical-offset="2668" max-vertical-offset="3315">
+            <state line="224" column="45" selection-start="6730" selection-end="6769" vertical-scroll-proportion="0.0" vertical-offset="3345" max-vertical-offset="3810">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="InputConfigActivity.java" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="InputConfigActivity.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="24" column="39" selection-start="651" selection-end="651" vertical-scroll-proportion="0.15189873" vertical-offset="90" max-vertical-offset="2775">
+            <state line="97" column="16" selection-start="3629" selection-end="3721" vertical-scroll-proportion="0.0" vertical-offset="900" max-vertical-offset="2775">
               <folding />
             </state>
           </provider>
@@ -130,7 +130,25 @@
       <file leaf-file-name="FolderBrowser.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="82" column="39" selection-start="2671" selection-end="2671" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1365">
+            <state line="73" column="12" selection-start="2651" selection-end="2651" vertical-scroll-proportion="0.0" vertical-offset="540" max-vertical-offset="1500">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="FolderBrowserAdapter.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="45" column="42" selection-start="1242" selection-end="1242" vertical-scroll-proportion="0.28030303" vertical-offset="459" max-vertical-offset="855">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="GameListItem.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="22" column="24" selection-start="570" selection-end="570" vertical-scroll-proportion="0.0" vertical-offset="405" max-vertical-offset="1140">
               <folding />
             </state>
           </provider>
@@ -159,22 +177,22 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListView.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigAdapter.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java" />
         <option value="$PROJECT_DIR$/bin/AndroidManifest.xml" />
         <option value="$PROJECT_DIR$/res/layout/folderbrowser.xml" />
         <option value="$PROJECT_DIR$/project.properties" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/AboutActivity.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java" />
         <option value="$PROJECT_DIR$/assets/GCPadNew.ini" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeLibrary.java" />
         <option value="$PROJECT_DIR$/AndroidManifest.xml" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/AboutActivity.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListFragment.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java" />
       </list>
     </option>
   </component>
@@ -228,44 +246,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dolphinemu" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
       <pane id="Scope">
         <subPane subId="Project Files">
           <PATH>
@@ -326,6 +306,44 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="ProjectPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Android" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dolphinemu" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="PackagesPane" />
     </panes>
   </component>
@@ -347,12 +365,12 @@
     <property name="AndroidRunProguardForReleaseBuild" value="false" />
     <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
     <property name="restartRequiresConfirmation" value="true" />
-    <property name="FullScreen" value="false" />
     <property name="MemberChooser.showClasses" value="true" />
+    <property name="FullScreen" value="false" />
     <property name="GoToClass.includeLibraries" value="false" />
-    <property name="dynamic.classpath" value="false" />
-    <property name="options.searchVisible" value="true" />
     <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="options.searchVisible" value="true" />
+    <property name="dynamic.classpath" value="false" />
   </component>
   <component name="RunManager" selected="Android Application.Dolphin Emulator">
     <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
@@ -563,8 +581,8 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.21378776" sideWeight="0.70637584" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29362416" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21378776" sideWeight="0.7080537" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29194632" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -586,18 +604,18 @@
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29865772" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2179289" sideWeight="0.29026845" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21378776" sideWeight="0.70637584" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29362416" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
   <component name="VcsContentAnnotationSettings">
@@ -661,20 +679,6 @@
     <breakpoint-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListAdapter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="12" column="13" selection-start="300" selection-end="300" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="825">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigItem.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="7" column="13" selection-start="167" selection-end="167" vertical-scroll-proportion="0.18421052" vertical-offset="0" max-vertical-offset="930">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuItem.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="8" column="13" selection-start="168" selection-end="168" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="630">
@@ -694,20 +698,6 @@
         <state line="13" column="17" selection-start="562" selection-end="562" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="300" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/AboutActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="12" column="3" selection-start="265" selection-end="265" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="555">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="22" column="36" selection-start="580" selection-end="580" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1050">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="191" column="26" selection-start="6216" selection-end="6216" vertical-scroll-proportion="2.9667833" vertical-offset="838" max-vertical-offset="3390">
@@ -744,20 +734,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="3" column="26" selection-start="174" selection-end="174" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="825">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="82" column="39" selection-start="2671" selection-end="2671" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1365">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="224" column="45" selection-start="6730" selection-end="6769" vertical-scroll-proportion="0.0" vertical-offset="2668" max-vertical-offset="3315">
@@ -765,9 +741,51 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="3" column="26" selection-start="174" selection-end="174" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="825">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="22" column="24" selection-start="570" selection-end="570" vertical-scroll-proportion="0.0" vertical-offset="405" max-vertical-offset="1140">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="24" column="39" selection-start="651" selection-end="651" vertical-scroll-proportion="0.15189873" vertical-offset="90" max-vertical-offset="2775">
+        <state line="97" column="16" selection-start="3629" selection-end="3721" vertical-scroll-proportion="0.0" vertical-offset="900" max-vertical-offset="2775">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/AboutActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="26" column="125" selection-start="741" selection-end="741" vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="495">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListFragment.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="60" column="151" selection-start="2013" selection-end="2013" vertical-scroll-proportion="-1.4281985" vertical-offset="1237" max-vertical-offset="1620">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="73" column="12" selection-start="2651" selection-end="2651" vertical-scroll-proportion="0.0" vertical-offset="540" max-vertical-offset="1500">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="45" column="42" selection-start="1242" selection-end="1242" vertical-scroll-proportion="0.28030303" vertical-offset="459" max-vertical-offset="855">
           <folding />
         </state>
       </provider>
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/AboutActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/AboutActivity.java
index 613523c8dd..5725651c9b 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/AboutActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/AboutActivity.java
@@ -24,7 +24,7 @@ public class AboutActivity extends ListActivity {
 		List<GameListItem> Input = new ArrayList<GameListItem>();
 		int a = 0;
 
-		Input.add(a++, new GameListItem(getApplicationContext(), "Build Revision", NativeLibrary.GetVersionString(), ""));
+		Input.add(a++, new GameListItem(getApplicationContext(), "Build Revision", NativeLibrary.GetVersionString(), "", true));
 		adapter = new FolderBrowserAdapter(this, R.layout.folderbrowser, Input);
 		setListAdapter(adapter);
 	}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
index d0e16e67a5..471278e50c 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
@@ -9,6 +9,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ListView;
+import android.widget.Toast;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -31,16 +32,22 @@ public class FolderBrowser extends ListActivity {
 			{
 				if (ff.getName().charAt(0) != '.')
 					if(ff.isDirectory())
-	                	dir.add(new GameListItem(getApplicationContext(), ff.getName(),"Folder",ff.getAbsolutePath()));
+	                	dir.add(new GameListItem(getApplicationContext(), ff.getName(),"Folder",ff.getAbsolutePath(), true));
 					else
+					{
 						if (ff.getName().toLowerCase().contains(".gcm") ||
 		                		ff.getName().toLowerCase().contains(".iso") ||
 		                		ff.getName().toLowerCase().contains(".wbfs") ||
 		                		ff.getName().toLowerCase().contains(".gcz") ||
 		                		ff.getName().toLowerCase().contains(".dol") ||
 		                		ff.getName().toLowerCase().contains(".elf"))
-		                			fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath()));
-             }
+		                			fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath(), true));
+						else if (ff.getName().toLowerCase().contains(".zip") ||
+								ff.getName().toLowerCase().contains(".rar") ||
+								ff.getName().toLowerCase().contains(".7z"))
+									fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath(), false));
+					}
+			}
          }
          catch(Exception e)
          {
@@ -50,7 +57,7 @@ public class FolderBrowser extends ListActivity {
         Collections.sort(fls);
         dir.addAll(fls);
 	    if (!f.getPath().equalsIgnoreCase("/"))
-	        dir.add(0, new GameListItem(getApplicationContext(), "..", "Parent Directory", f.getParent()));
+	        dir.add(0, new GameListItem(getApplicationContext(), "..", "Parent Directory", f.getParent(), true));
 
          adapter = new FolderBrowserAdapter(this,R.layout.folderbrowser,dir);
 		 this.setListAdapter(adapter);
@@ -65,7 +72,10 @@ public class FolderBrowser extends ListActivity {
 			Fill(currentDir);
 		}
 		else
-			FolderSelected();
+			if (o.isValid())
+				FolderSelected();
+			else
+				Toast.makeText(this, "Can not use compressed file types.", Toast.LENGTH_LONG).show();
 	}
 	
 	@Override
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java
index b201125a62..30c1747781 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java
@@ -22,6 +22,7 @@ public class FolderBrowserAdapter extends ArrayAdapter<GameListItem>{
 		id = textViewResourceId;
 		items = objects;
 	}
+
 	public GameListItem getItem(int i)
 	{
 		return items.get(i);
@@ -39,7 +40,11 @@ public class FolderBrowserAdapter extends ArrayAdapter<GameListItem>{
 			TextView t2 = (TextView) v.findViewById(R.id.FolderSubTitle);
 
 			if(t1!=null)
+			{
 				t1.setText(o.getName());
+				if (!o.isValid())
+					t1.setTextColor(0xFFFF0000);
+			}
 			if(t2!=null)
 				t2.setText(o.getData());
 
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java
index 4d2e0d4236..e7b7c25c33 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java
@@ -58,7 +58,7 @@ public class GameListFragment extends Fragment
 									ff.getName().toLowerCase().contains(".dol") ||
 									ff.getName().toLowerCase().contains(".elf") ||
 									ff.getName().toLowerCase().contains(".dff"))
-								fls.add(new GameListItem(mMe.getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath()));
+								fls.add(new GameListItem(mMe.getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath(), true));
 				}
 			}
 			catch(Exception ignored)
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java
index 6e5bfea66f..427cd132f8 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java
@@ -13,12 +13,14 @@ public class GameListItem implements Comparable<GameListItem>{
     private String data;
     private String path;
     private Bitmap image;
+	private boolean m_valid;
 
-    public GameListItem(Context ctx, String n,String d,String p)
+    public GameListItem(Context ctx, String n,String d,String p, boolean valid)
     {
         name = n;
         data = d;
         path = p;
+	    m_valid = valid;
         File file = new File(path);
         if (!file.isDirectory() && !path.equals(""))
         {
@@ -58,6 +60,10 @@ public class GameListItem implements Comparable<GameListItem>{
     {
     	return image;
     }
+	public boolean isValid()
+	{
+		return m_valid;
+	}
     
     public int compareTo(GameListItem o) 
     {

From 012c32c14c21211a93719395b4f168fa5765888b Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Thu, 11 Jul 2013 08:58:10 -0500
Subject: [PATCH 270/352] [Android] Undefine the swaps in Android completely,
 not just on ARM Android.

---
 Source/Core/Common/Src/CommonFuncs.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Source/Core/Common/Src/CommonFuncs.h b/Source/Core/Common/Src/CommonFuncs.h
index 7ea2c8e490..73320a3ac2 100644
--- a/Source/Core/Common/Src/CommonFuncs.h
+++ b/Source/Core/Common/Src/CommonFuncs.h
@@ -164,16 +164,17 @@ namespace Common
 inline u8 swap8(u8 _data) {return _data;}
 inline u32 swap24(const u8* _data) {return (_data[0] << 16) | (_data[1] << 8) | _data[2];}
 
-#ifdef _WIN32
-inline u16 swap16(u16 _data) {return _byteswap_ushort(_data);}
-inline u32 swap32(u32 _data) {return _byteswap_ulong (_data);}
-inline u64 swap64(u64 _data) {return _byteswap_uint64(_data);}
-#elif _M_ARM
 #ifdef ANDROID
 #undef swap16
 #undef swap32
 #undef swap64
 #endif
+
+#ifdef _WIN32
+inline u16 swap16(u16 _data) {return _byteswap_ushort(_data);}
+inline u32 swap32(u32 _data) {return _byteswap_ulong (_data);}
+inline u64 swap64(u64 _data) {return _byteswap_uint64(_data);}
+#elif _M_ARM
 inline u16 swap16 (u16 _data) { u32 data = _data; __asm__ ("rev16 %0, %1\n" : "=l" (data) : "l" (data)); return (u16)data;} 
 inline u32 swap32 (u32 _data) {__asm__ ("rev %0, %1\n" : "=l" (_data) : "l" (_data)); return _data;} 
 inline u64 swap64(u64 _data) {return ((u64)swap32(_data) << 32) | swap32(_data >> 32);}

From 6e74d4b21d3c814a01d38b59ceb139b46571bfa8 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Thu, 11 Jul 2013 09:00:08 -0500
Subject: [PATCH 271/352] [Android] Disable x64MemTools' backpatching. It isn't
 available on x86 anyway.

---
 Source/Core/Core/Src/x64MemTools.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Source/Core/Core/Src/x64MemTools.cpp b/Source/Core/Core/Src/x64MemTools.cpp
index dad10d9e56..2594598303 100644
--- a/Source/Core/Core/Src/x64MemTools.cpp
+++ b/Source/Core/Core/Src/x64MemTools.cpp
@@ -7,8 +7,10 @@
 #else
 #include <stdio.h>
 #include <signal.h>
+#ifndef ANDROID
 #include <sys/ucontext.h>   // Look in here for the context definition.
 #endif
+#endif
 
 #ifdef __APPLE__
 #define CREG_RAX(ctx) (*(ctx))->__ss.__rax
@@ -150,6 +152,7 @@ void InstallExceptionHandler()
 
 #else  // _WIN32
 
+#ifndef ANDROID
 #if defined __APPLE__ || defined __linux__ || defined __FreeBSD__ || defined _WIN32
 #ifndef _WIN32
 #include <execinfo.h>
@@ -235,19 +238,21 @@ void sigsegv_handler(int signal, siginfo_t *info, void *raw_context)
 	}
 #endif
 }
+#endif
 
 void InstallExceptionHandler()
 {
 #ifdef _M_IX86
 	PanicAlertT("InstallExceptionHandler called, but this platform does not yet support it.");
 	return;
-#endif
+#else
 	struct sigaction sa;
 	sa.sa_handler = 0;
 	sa.sa_sigaction = &sigsegv_handler;
 	sa.sa_flags = SA_SIGINFO;
 	sigemptyset(&sa.sa_mask);
 	sigaction(SIGSEGV, &sa, NULL);
+#endif
 }
 
 #endif

From e24a551515f78deb1bea34902b141d5dfcfe926c Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Thu, 11 Jul 2013 09:10:44 -0500
Subject: [PATCH 272/352] [Android] MIPS support...lol

---
 CMakeLists.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c0d4f6f22..a6447f961e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,6 +122,13 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
 	set(USE_GLES 1)
 endif()
 
+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "mips")
+	set(_M_GENERIC 1)
+	set(_M_MIPS 1)
+	add_definitions(-D_M_MIPS=1)
+	add_definitions(-D_M_GENERIC=1)
+endif()
+
 # Set these next two lines to test generic
 #set(_M_GENERIC 1)
 #add_definitions(-D_M_GENERIC=1)

From e1f641424de268385649be6982d90182a8bfab2f Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Thu, 11 Jul 2013 10:18:03 -0500
Subject: [PATCH 273/352] [Android] Show JIT cores based on host arch.

---
 Source/Android/.idea/workspace.xml            | 363 +++++++++++-------
 Source/Android/res/layout/prefs.xml           |   9 +-
 Source/Android/res/values/prefvalues.xml      |  10 -
 .../dolphinemu/dolphinemu/PrefsActivity.java  |  45 +++
 4 files changed, 271 insertions(+), 156 deletions(-)

diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index d3a0e0282d..1272e30c4c 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -103,7 +103,16 @@
       <file leaf-file-name="DolphinEmulator.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="224" column="45" selection-start="6730" selection-end="6769" vertical-scroll-proportion="0.0" vertical-offset="3345" max-vertical-offset="3810">
+            <state line="224" column="45" selection-start="6730" selection-end="6769" vertical-scroll-proportion="0.0" vertical-offset="2846" max-vertical-offset="3585">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="GameListActivity.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="173" column="16" selection-start="5541" selection-end="5638" vertical-scroll-proportion="0.0" vertical-offset="2070" max-vertical-offset="3390">
               <folding />
             </state>
           </provider>
@@ -112,7 +121,7 @@
       <file leaf-file-name="InputConfigActivity.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="97" column="16" selection-start="3629" selection-end="3721" vertical-scroll-proportion="0.0" vertical-offset="900" max-vertical-offset="2775">
+            <state line="97" column="16" selection-start="3629" selection-end="3721" vertical-scroll-proportion="0.0" vertical-offset="1230" max-vertical-offset="2775">
               <folding />
             </state>
           </provider>
@@ -127,19 +136,40 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="FolderBrowser.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
+      <file leaf-file-name="PrefsActivity.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="73" column="12" selection-start="2651" selection-end="2651" vertical-scroll-proportion="0.0" vertical-offset="540" max-vertical-offset="1500">
+            <state line="62" column="0" selection-start="1857" selection-end="1857" vertical-scroll-proportion="0.0" vertical-offset="720" max-vertical-offset="1260">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="FolderBrowserAdapter.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java">
+      <file leaf-file-name="prefs.xml" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="45" column="42" selection-start="1242" selection-end="1242" vertical-scroll-proportion="0.28030303" vertical-offset="459" max-vertical-offset="855">
+            <state line="6" column="37" selection-start="267" selection-end="267" vertical-scroll-proportion="0.2425876" vertical-offset="0" max-vertical-offset="420">
+              <folding />
+            </state>
+          </provider>
+          <provider editor-type-id="android-designer">
+            <state />
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="strings.xml" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/res/values/strings.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="210">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="prefvalues.xml" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="1" column="11" selection-start="50" selection-end="50" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
               <folding />
             </state>
           </provider>
@@ -148,7 +178,7 @@
       <file leaf-file-name="GameListItem.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="22" column="24" selection-start="570" selection-end="570" vertical-scroll-proportion="0.0" vertical-offset="405" max-vertical-offset="1140">
+            <state line="22" column="24" selection-start="570" selection-end="570" vertical-scroll-proportion="0.0" vertical-offset="315" max-vertical-offset="1230">
               <folding />
             </state>
           </provider>
@@ -177,9 +207,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigAdapter.java" />
-        <option value="$PROJECT_DIR$/bin/AndroidManifest.xml" />
-        <option value="$PROJECT_DIR$/res/layout/folderbrowser.xml" />
         <option value="$PROJECT_DIR$/project.properties" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java" />
         <option value="$PROJECT_DIR$/assets/GCPadNew.ini" />
@@ -189,10 +216,13 @@
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/AboutActivity.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListFragment.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java" />
+        <option value="$PROJECT_DIR$/res/layout/prefs.xml" />
+        <option value="$PROJECT_DIR$/res/values/prefvalues.xml" />
+        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java" />
       </list>
     </option>
   </component>
@@ -246,66 +276,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope">
-        <subPane subId="Project Files">
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="src">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="org/dolphinemu/dolphinemu">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="libs">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="assets">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -345,6 +315,116 @@
         </subPane>
       </pane>
       <pane id="PackagesPane" />
+      <pane id="Scope">
+        <subPane subId="Project Files">
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="src">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="org/dolphinemu/dolphinemu">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="res">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="values">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="res">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="layout">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="res">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="libs">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT USER_OBJECT="Root">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="Android">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT USER_OBJECT="assets">
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -365,12 +445,12 @@
     <property name="AndroidRunProguardForReleaseBuild" value="false" />
     <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
     <property name="restartRequiresConfirmation" value="true" />
-    <property name="MemberChooser.showClasses" value="true" />
     <property name="FullScreen" value="false" />
+    <property name="MemberChooser.showClasses" value="true" />
     <property name="GoToClass.includeLibraries" value="false" />
-    <property name="options.splitter.details.proportions" value="0.2" />
-    <property name="options.searchVisible" value="true" />
     <property name="dynamic.classpath" value="false" />
+    <property name="options.searchVisible" value="true" />
+    <property name="options.splitter.details.proportions" value="0.2" />
   </component>
   <component name="RunManager" selected="Android Application.Dolphin Emulator">
     <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
@@ -569,6 +649,7 @@
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6912752" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29865772" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -584,7 +665,6 @@
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21378776" sideWeight="0.7080537" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29194632" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -604,18 +684,18 @@
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29865772" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2179289" sideWeight="0.29026845" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2179289" sideWeight="0.29026845" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21378776" sideWeight="0.70637584" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29362416" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29362416" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
   <component name="VcsContentAnnotationSettings">
@@ -679,39 +759,6 @@
     <breakpoint-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/SideMenuItem.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="8" column="13" selection-start="168" selection-end="168" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="630">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="8" column="0" selection-start="215" selection-end="332" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="630">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/project.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="13" column="17" selection-start="562" selection-end="562" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="300" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="191" column="26" selection-start="6216" selection-end="6216" vertical-scroll-proportion="2.9667833" vertical-offset="838" max-vertical-offset="3390">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="26" column="0" selection-start="1180" selection-end="1180" vertical-scroll-proportion="-0.6708408" vertical-offset="765" max-vertical-offset="1470">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/assets/GCPadNew.ini">
       <provider selected="true" editor-type-id="text-editor">
         <state line="3" column="13" selection-start="76" selection-end="76" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="525" />
@@ -734,20 +781,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="224" column="45" selection-start="6730" selection-end="6769" vertical-scroll-proportion="0.0" vertical-offset="2668" max-vertical-offset="3315">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="3" column="26" selection-start="174" selection-end="174" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="825">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="22" column="24" selection-start="570" selection-end="570" vertical-scroll-proportion="0.0" vertical-offset="405" max-vertical-offset="1140">
@@ -755,13 +788,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="97" column="16" selection-start="3629" selection-end="3721" vertical-scroll-proportion="0.0" vertical-offset="900" max-vertical-offset="2775">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/AboutActivity.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="26" column="125" selection-start="741" selection-end="741" vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="495">
@@ -776,20 +802,79 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="73" column="12" selection-start="2651" selection-end="2651" vertical-scroll-proportion="0.0" vertical-offset="540" max-vertical-offset="1500">
+        <state line="45" column="42" selection-start="1242" selection-end="1242" vertical-scroll-proportion="0.50174826" vertical-offset="283" max-vertical-offset="855">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java">
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="45" column="42" selection-start="1242" selection-end="1242" vertical-scroll-proportion="0.28030303" vertical-offset="459" max-vertical-offset="855">
+        <state line="73" column="12" selection-start="2651" selection-end="2651" vertical-scroll-proportion="0.026223777" vertical-offset="1080" max-vertical-offset="1710">
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="173" column="16" selection-start="5541" selection-end="5638" vertical-scroll-proportion="0.0" vertical-offset="2070" max-vertical-offset="3390">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="224" column="45" selection-start="6730" selection-end="6769" vertical-scroll-proportion="0.0" vertical-offset="2668" max-vertical-offset="3315">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="97" column="16" selection-start="3629" selection-end="3721" vertical-scroll-proportion="0.0" vertical-offset="900" max-vertical-offset="2775">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="3" column="26" selection-start="174" selection-end="174" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="825">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/values/strings.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="396">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="1" column="11" selection-start="50" selection-end="50" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="62" column="0" selection-start="1857" selection-end="1857" vertical-scroll-proportion="0.0" vertical-offset="720" max-vertical-offset="1260">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="6" column="37" selection-start="267" selection-end="267" vertical-scroll-proportion="0.2425876" vertical-offset="0" max-vertical-offset="420">
+          <folding />
+        </state>
+      </provider>
+      <provider editor-type-id="android-designer">
+        <state />
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/Source/Android/res/layout/prefs.xml b/Source/Android/res/layout/prefs.xml
index bceb581c36..f98512d087 100644
--- a/Source/Android/res/layout/prefs.xml
+++ b/Source/Android/res/layout/prefs.xml
@@ -3,13 +3,8 @@
         >
     <PreferenceCategory
             android:summary="Settings"
-            android:title="CPU Settings" >
-        <ListPreference
-                android:entries="@array/cpuOptions"
-                android:entryValues="@array/cpuValues"
-                android:key="cpupref"
-                android:summary="Emulation core to use"
-                android:title="CPU Core" />
+            android:title="CPU Settings"
+            android:key="cpuprefcat">
         <CheckBoxPreference
                 android:key="dualcorepref"
                 android:summary="On/Off"
diff --git a/Source/Android/res/values/prefvalues.xml b/Source/Android/res/values/prefvalues.xml
index 3ba1f1a09a..409666e328 100644
--- a/Source/Android/res/values/prefvalues.xml
+++ b/Source/Android/res/values/prefvalues.xml
@@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string-array name="cpuOptions">
-        <item>Interpreter</item>
-        <item>ARM JIT Recompiler</item>
-    </string-array>
-
-    <string-array name="cpuValues">
-        <item>0</item>
-        <item>3</item>
-    </string-array>
-
     <string-array name="gpuOptions">
         <item>Software Renderer</item>
         <item>OpenGL ES 3</item>
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java
index e12e37c10a..a46138a29c 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java
@@ -2,8 +2,11 @@ package org.dolphinemu.dolphinemu;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
+import android.preference.ListPreference;
 import android.preference.PreferenceActivity;
+import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 
 /**
@@ -12,6 +15,7 @@ import android.preference.PreferenceFragment;
  * Refer to the license.txt file included.
  */
 public class PrefsActivity extends PreferenceActivity {
+	private PrefsActivity m_activity;
 
     public class PrefsFragment extends PreferenceFragment {
 
@@ -21,12 +25,53 @@ public class PrefsActivity extends PreferenceActivity {
 
             // Load the preferences from an XML resource
             addPreferencesFromResource(R.layout.prefs);
+
+	        final ListPreference etp = new ListPreference(m_activity);
+	        CharSequence[] _entries;
+	        CharSequence[] _entryvalues;
+
+	        if (Build.CPU_ABI.contains("x86"))
+	        {
+		        _entries = new CharSequence[] {
+			        "Interpreter",
+			        "JIT64 Recompiler",
+			        "JITIL Recompiler",
+		        };
+		        _entryvalues = new CharSequence[] {"0", "1", "2"};
+	        }
+	        else if (Build.CPU_ABI.contains("arm"))
+	        {
+		        _entries = new CharSequence[] {
+				        "Interpreter",
+				        "JIT ARM Recompiler",
+		        };
+		        _entryvalues = new CharSequence[] {"0", "3"};
+	        }
+	        else
+	        {
+		        _entries = new CharSequence[] {
+				        "Interpreter",
+		        };
+		        _entryvalues = new CharSequence[] {"0"};
+	        }
+
+	        etp.setEntries(_entries);
+	        etp.setEntryValues(_entryvalues);
+	        etp.setKey("cpupref");
+	        etp.setTitle("CPU Core");
+	        etp.setSummary("Emulation core to use");
+
+	        PreferenceCategory mCategory = (PreferenceCategory) findPreference("cpuprefcat");
+	        mCategory.addPreference(etp);
         }
     }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+	    m_activity = this;
+
         getFragmentManager().beginTransaction().replace(android.R.id.content,
                 new PrefsFragment()).commit();
     }

From e36757bec1bc5d4c4ad037e9f7f1ae68db8f4015 Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Thu, 11 Jul 2013 07:16:02 +0200
Subject: [PATCH 274/352] Adding read data reply to the real Wiimote

because the emulated program expect it
---
 Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
index f518cebf7f..93f9a4eae6 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
@@ -299,6 +299,11 @@ void Wiimote::Update()
 		return;
 	}
 
+	WiimoteEmu::Wiimote *const wm = (WiimoteEmu::Wiimote*)::Wiimote::GetPlugin()->controllers[index];
+
+	if (wm->Step())
+		return;
+
 	// Pop through the queued reports
 	const Report& rpt = ProcessReadQueue();
 

From fd4a4410e56d0f92c91408bbb353eea43ccbda89 Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Thu, 11 Jul 2013 08:17:00 +0200
Subject: [PATCH 275/352] Removing wait for real Wiimote connection

when

* opening the Wiimote configuration dialog
* booting from the emulated program entry point rather than a state

because

* it doesn't have meaning in these scenarios
* it has meaning when booting from a state
---
 Source/Core/Core/Src/Core.cpp                 |  2 +-
 Source/Core/Core/Src/HW/Wiimote.cpp           |  4 ++--
 Source/Core/Core/Src/HW/Wiimote.h             |  4 ++--
 .../Core/Src/HW/WiimoteReal/WiimoteReal.cpp   | 21 +++++++++++--------
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index e3addf2f59..721bcbf3e3 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -391,7 +391,7 @@ void EmuThread()
 	// Load and Init Wiimotes - only if we are booting in wii mode	
 	if (g_CoreStartupParameter.bWii)
 	{
-		Wiimote::Initialize(g_pWindowHandle);
+		Wiimote::Initialize(g_pWindowHandle, !g_stateFileName.empty());
 
 		// Activate wiimotes which don't have source set to "None"
 		for (unsigned int i = 0; i != MAX_BBMOTES; ++i)
diff --git a/Source/Core/Core/Src/HW/Wiimote.cpp b/Source/Core/Core/Src/HW/Wiimote.cpp
index 8cbe62dfcd..0bf10b343d 100644
--- a/Source/Core/Core/Src/HW/Wiimote.cpp
+++ b/Source/Core/Core/Src/HW/Wiimote.cpp
@@ -38,7 +38,7 @@ void Shutdown()
 }
 
 // if plugin isn't initialized, init and load config
-void Initialize(void* const hwnd)
+void Initialize(void* const hwnd, bool wait)
 {
 	// add 4 wiimotes
 	for (unsigned int i = WIIMOTE_CHAN_0; i<MAX_BBMOTES; ++i)
@@ -50,7 +50,7 @@ void Initialize(void* const hwnd)
 
 	g_plugin.LoadConfig(false);
 
-	WiimoteReal::Initialize();
+	WiimoteReal::Initialize(wait);
 	
 	// reload Wiimotes with our settings
 	if (Movie::IsPlayingInput() || Movie::IsRecordingInput())
diff --git a/Source/Core/Core/Src/HW/Wiimote.h b/Source/Core/Core/Src/HW/Wiimote.h
index fcab058828..04c09c5ab5 100644
--- a/Source/Core/Core/Src/HW/Wiimote.h
+++ b/Source/Core/Core/Src/HW/Wiimote.h
@@ -35,7 +35,7 @@ namespace Wiimote
 {
 
 void Shutdown();
-void Initialize(void* const hwnd);
+void Initialize(void* const hwnd, bool wait = false);
 void Resume();
 void Pause();
 
@@ -53,7 +53,7 @@ void Update(int _number);
 namespace WiimoteReal
 {
 
-void Initialize();
+void Initialize(bool wait = false);
 void Shutdown();
 void Resume();
 void Pause();
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
index 93f9a4eae6..8568a8ed2a 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
@@ -538,7 +538,7 @@ void LoadSettings()
 }
 
 // config dialog calls this when some settings change
-void Initialize()
+void Initialize(bool wait)
 {
 	if (SConfig::GetInstance().m_WiimoteContinuousScanning)
 		g_wiimote_scanner.StartScanning();
@@ -551,16 +551,19 @@ void Initialize()
 	g_wiimote_scanner.WantBB(0 != CalculateWantedBB());
 
 	// wait for connection because it should exist before state load
-	int timeout = 100;
-	std::vector<Wiimote*> found_wiimotes;
-	Wiimote* found_board = NULL;
-	g_wiimote_scanner.FindWiimotes(found_wiimotes, found_board);
-	if (SConfig::GetInstance().m_WiimoteContinuousScanning)
+	if (wait)
 	{
-		while(CalculateWantedWiimotes() && CalculateConnectedWiimotes() < found_wiimotes.size() && timeout)
+		int timeout = 100;
+		std::vector<Wiimote*> found_wiimotes;
+		Wiimote* found_board = NULL;
+		g_wiimote_scanner.FindWiimotes(found_wiimotes, found_board);
+		if (SConfig::GetInstance().m_WiimoteContinuousScanning)
 		{
-			Common::SleepCurrentThread(100);
-			timeout--;
+			while(CalculateWantedWiimotes() && CalculateConnectedWiimotes() < found_wiimotes.size() && timeout)
+			{
+				Common::SleepCurrentThread(100);
+				timeout--;
+			}
 		}
 	}
 

From 95d4dc92c1fecb18fd07cac2e1bd486bb608e532 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Thu, 11 Jul 2013 11:21:24 -0500
Subject: [PATCH 276/352] [Android] Show the OpenGL ES 3 backend video option
 only on devices that support it.

---
 Source/Android/.idea/workspace.xml            | 106 ++++++--------
 Source/Android/res/layout/prefs.xml           |   3 +-
 .../dolphinemu/dolphinemu/PrefsActivity.java  | 134 ++++++++++++++++++
 3 files changed, 182 insertions(+), 61 deletions(-)

diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index 1272e30c4c..4306ba1d4c 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -118,37 +118,21 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="InputConfigActivity.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="97" column="16" selection-start="3629" selection-end="3721" vertical-scroll-proportion="0.0" vertical-offset="1230" max-vertical-offset="2775">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="AndroidManifest.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="3" column="26" selection-start="174" selection-end="174" vertical-scroll-proportion="0.0" vertical-offset="30" max-vertical-offset="825">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PrefsActivity.java" pinned="false" current="false" current-in-tab="false">
+      <file leaf-file-name="PrefsActivity.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="62" column="0" selection-start="1857" selection-end="1857" vertical-scroll-proportion="0.0" vertical-offset="720" max-vertical-offset="1260">
-              <folding />
+            <state line="177" column="17" selection-start="5357" selection-end="5357" vertical-scroll-proportion="0.09090909" vertical-offset="2619" max-vertical-offset="3375">
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="prefs.xml" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="prefs.xml" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="6" column="37" selection-start="267" selection-end="267" vertical-scroll-proportion="0.2425876" vertical-offset="0" max-vertical-offset="420">
+            <state line="20" column="33" selection-start="799" selection-end="819" vertical-scroll-proportion="-12.0" vertical-offset="0" max-vertical-offset="435">
               <folding />
             </state>
           </provider>
@@ -169,7 +153,7 @@
       <file leaf-file-name="prefvalues.xml" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="1" column="11" selection-start="50" selection-end="50" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
+            <state line="8" column="14" selection-start="231" selection-end="248" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
               <folding />
             </state>
           </provider>
@@ -178,7 +162,7 @@
       <file leaf-file-name="GameListItem.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="22" column="24" selection-start="570" selection-end="570" vertical-scroll-proportion="0.0" vertical-offset="315" max-vertical-offset="1230">
+            <state line="22" column="24" selection-start="570" selection-end="570" vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="1140">
               <folding />
             </state>
           </provider>
@@ -220,8 +204,8 @@
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListFragment.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java" />
-        <option value="$PROJECT_DIR$/res/layout/prefs.xml" />
         <option value="$PROJECT_DIR$/res/values/prefvalues.xml" />
+        <option value="$PROJECT_DIR$/res/layout/prefs.xml" />
         <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java" />
       </list>
     </option>
@@ -781,13 +765,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="22" column="24" selection-start="570" selection-end="570" vertical-scroll-proportion="0.0" vertical-offset="405" max-vertical-offset="1140">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/AboutActivity.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="26" column="125" selection-start="741" selection-end="741" vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="495">
@@ -816,13 +793,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="173" column="16" selection-start="5541" selection-end="5638" vertical-scroll-proportion="0.0" vertical-offset="2070" max-vertical-offset="3390">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="224" column="45" selection-start="6730" selection-end="6769" vertical-scroll-proportion="0.0" vertical-offset="2668" max-vertical-offset="3315">
@@ -830,13 +800,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="97" column="16" selection-start="3629" selection-end="3721" vertical-scroll-proportion="0.0" vertical-offset="900" max-vertical-offset="2775">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state line="3" column="26" selection-start="174" selection-end="174" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="825">
@@ -844,6 +807,20 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="97" column="16" selection-start="3629" selection-end="3721" vertical-scroll-proportion="0.03787879" vertical-offset="1230" max-vertical-offset="2775">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="22" column="24" selection-start="570" selection-end="570" vertical-scroll-proportion="0.0" vertical-offset="405" max-vertical-offset="1140">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/res/values/strings.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="396">
@@ -851,30 +828,39 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="20" column="33" selection-start="799" selection-end="819" vertical-scroll-proportion="-12.0" vertical-offset="0" max-vertical-offset="435">
+          <folding />
+        </state>
+      </provider>
+      <provider editor-type-id="android-designer">
+        <state />
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="1" column="11" selection-start="50" selection-end="50" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
+        <state line="8" column="14" selection-start="231" selection-end="248" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="173" column="16" selection-start="5541" selection-end="5638" vertical-scroll-proportion="0.0" vertical-offset="2070" max-vertical-offset="3390">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="62" column="0" selection-start="1857" selection-end="1857" vertical-scroll-proportion="0.0" vertical-offset="720" max-vertical-offset="1260">
-          <folding />
+        <state line="177" column="17" selection-start="5357" selection-end="5357" vertical-scroll-proportion="0.09090909" vertical-offset="2619" max-vertical-offset="3375">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="6" column="37" selection-start="267" selection-end="267" vertical-scroll-proportion="0.2425876" vertical-offset="0" max-vertical-offset="420">
-          <folding />
-        </state>
-      </provider>
-      <provider editor-type-id="android-designer">
-        <state />
-      </provider>
-    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/Source/Android/res/layout/prefs.xml b/Source/Android/res/layout/prefs.xml
index f98512d087..34700f56b7 100644
--- a/Source/Android/res/layout/prefs.xml
+++ b/Source/Android/res/layout/prefs.xml
@@ -12,7 +12,8 @@
     </PreferenceCategory>
     <PreferenceCategory
             android:summary="Settings"
-            android:title="Video Settings" >
+            android:title="Video Settings"
+            android:key="videoprefcat">
         <ListPreference
                 android:entries="@array/gpuOptions"
                 android:entryValues="@array/gpuValues"
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java
index a46138a29c..4ce82beefe 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java
@@ -2,6 +2,7 @@ package org.dolphinemu.dolphinemu;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.opengl.GLSurfaceView;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.ListPreference;
@@ -9,6 +10,9 @@ import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 
+import javax.microedition.khronos.egl.*;
+import javax.microedition.khronos.opengles.GL10;
+
 /**
  * Copyright 2013 Dolphin Emulator Project
  * Licensed under GPLv2
@@ -16,6 +20,85 @@ import android.preference.PreferenceFragment;
  */
 public class PrefsActivity extends PreferenceActivity {
 	private PrefsActivity m_activity;
+	private String m_GLVersion;
+	private String m_GLVendor;
+	private String m_GLRenderer;
+
+
+	public class VersionCheck {
+		GLSurfaceView.Renderer mRenderer; // borrow this interface
+
+		EGL10 mEGL;
+		EGLDisplay mEGLDisplay;
+		EGLConfig[] mEGLConfigs;
+		EGLConfig mEGLConfig;
+		EGLContext mEGLContext;
+		EGLSurface mEGLSurface;
+		GL10 mGL;
+
+		String mThreadOwner;
+
+		public VersionCheck() {
+
+			int[] version = new int[2];
+			int[] attribList = new int[] {
+					EGL10.EGL_WIDTH, 1,
+					EGL10.EGL_HEIGHT, 1,
+					EGL10.EGL_RENDERABLE_TYPE, 4,
+					EGL10.EGL_NONE
+			};
+
+			// No error checking performed, minimum required code to elucidate logic
+			mEGL = (EGL10) EGLContext.getEGL();
+			mEGLDisplay = mEGL.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
+			mEGL.eglInitialize(mEGLDisplay, version);
+			mEGLConfig = chooseConfig(); // Choosing a config is a little more complicated
+			mEGLContext = mEGL.eglCreateContext(mEGLDisplay, mEGLConfig, EGL10.EGL_NO_CONTEXT, null);
+			mEGLSurface = mEGL.eglCreatePbufferSurface(mEGLDisplay, mEGLConfig,  attribList);
+			mEGL.eglMakeCurrent(mEGLDisplay, mEGLSurface, mEGLSurface, mEGLContext);
+			mGL = (GL10) mEGLContext.getGL();
+
+			// Record thread owner of OpenGL context
+			mThreadOwner = Thread.currentThread().getName();
+		}
+
+		public String getVersion()
+		{
+			return mGL.glGetString(GL10.GL_VERSION);
+		}
+
+		public String getVendor()
+		{
+			return mGL.glGetString(GL10.GL_VENDOR);
+		}
+		public String getRenderer()
+		{
+			return mGL.glGetString(GL10.GL_RENDERER);
+		}
+		private EGLConfig chooseConfig() {
+			int[] attribList = new int[] {
+					EGL10.EGL_DEPTH_SIZE, 0,
+					EGL10.EGL_STENCIL_SIZE, 0,
+					EGL10.EGL_RED_SIZE, 8,
+					EGL10.EGL_GREEN_SIZE, 8,
+					EGL10.EGL_BLUE_SIZE, 8,
+					EGL10.EGL_ALPHA_SIZE, 8,
+					EGL10.EGL_NONE
+			};
+
+			// No error checking performed, minimum required code to elucidate logic
+			// Expand on this logic to be more selective in choosing a configuration
+			int[] numConfig = new int[1];
+			mEGL.eglChooseConfig(mEGLDisplay, attribList, null, 0, numConfig);
+			int configSize = numConfig[0];
+			mEGLConfigs = new EGLConfig[configSize];
+			mEGL.eglChooseConfig(mEGLDisplay, attribList, mEGLConfigs, configSize, numConfig);
+
+			return mEGLConfigs[0];  // Best match is probably the first configuration
+		}
+	}
+
+
 
     public class PrefsFragment extends PreferenceFragment {
 
@@ -63,6 +146,57 @@ public class PrefsActivity extends PreferenceActivity {
 
 	        PreferenceCategory mCategory = (PreferenceCategory) findPreference("cpuprefcat");
 	        mCategory.addPreference(etp);
+	        VersionCheck mbuffer = new VersionCheck();
+	        m_GLVersion = mbuffer.getVersion();
+	        m_GLVendor = mbuffer.getVendor();
+	        m_GLRenderer = mbuffer.getRenderer();
+
+	        boolean mSupportsGLES3 = false;
+
+	        if (m_GLVersion.contains("OpenGL ES 3.0")) // 3.0 support
+	            mSupportsGLES3 = true;
+			if (!mSupportsGLES3 && m_GLVendor.equals("Qualcomm"))
+	        {
+		        if (m_GLRenderer.contains("Adreno (TM) 3"))
+		        {
+			        int mVStart, mVEnd = 0;
+			        float mVersion;
+			        mVStart = m_GLVersion.indexOf("V@") + 2;
+			        for (int a = mVStart; a < m_GLVersion.length(); ++a)
+				        if (m_GLVersion.charAt(a) == ' ')
+				        {
+					        mVEnd = a;
+					        break;
+				        }
+			        mVersion = Float.parseFloat(m_GLVersion.substring(mVStart, mVEnd));
+
+			        if (mVersion >= 14.0f)
+				        mSupportsGLES3 = true;
+		        }
+	        }
+
+	        if (!mSupportsGLES3)
+	        {
+		        mCategory = (PreferenceCategory) findPreference("videoprefcat");
+		        ListPreference mPref = (ListPreference) findPreference("gpupref");
+		        mCategory.removePreference(mPref);
+
+		        final ListPreference videobackend = new ListPreference(m_activity);
+
+		        _entries = new CharSequence[] {
+				        "Software Renderer",
+		        };
+		        _entryvalues = new CharSequence[] {"Software Renderer"};
+
+		        videobackend.setKey("gpupref");
+		        videobackend.setTitle("Video Backend");
+		        videobackend.setSummary("Video backend to use");
+
+		        videobackend.setEntries(_entries);
+		        videobackend.setEntryValues(_entryvalues);
+
+		        mCategory.addPreference(videobackend);
+	        }
         }
     }
 

From a1822a3acaf112dd37ed98818acdc0bc5014caba Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Thu, 11 Jul 2013 21:22:38 +0200
Subject: [PATCH 277/352] fix AudioCommon::Mixer Buffer indices

This fix the 1h32 audio bug which outputs static sound after 1h32.

The mixer is used for 32->48kHz resampling and as output buffer for the async audio backends.
So this buffer was indiced by a writing and a reading pointer and the count of samples in it.
As this is redundant and the sample count isn't accurate calculateable because of the interpolation,
both indices gets out of sync. So after some time (~92min), this buffer overflows and return only garbage.

thx @ moosehunter + delroth for debugging on this issue. You did the most work :-)
---
 Source/Core/AudioCommon/Src/Mixer.cpp | 95 +++++++++++++++++----------
 Source/Core/AudioCommon/Src/Mixer.h   |  6 +-
 2 files changed, 62 insertions(+), 39 deletions(-)

diff --git a/Source/Core/AudioCommon/Src/Mixer.cpp b/Source/Core/AudioCommon/Src/Mixer.cpp
index 146314088d..2c526cf3bd 100644
--- a/Source/Core/AudioCommon/Src/Mixer.cpp
+++ b/Source/Core/AudioCommon/Src/Mixer.cpp
@@ -32,7 +32,7 @@ unsigned int CMixer::Mix(short* samples, unsigned int numSamples)
 		return numSamples;
 	}
 
-	unsigned int numLeft = Common::AtomicLoad(m_numSamples);
+	unsigned int numLeft = GetNumSamples();
 	if (m_AIplaying) {
 		if (numLeft < numSamples)//cannot do much about this
 			m_AIplaying = false;
@@ -43,6 +43,16 @@ unsigned int CMixer::Mix(short* samples, unsigned int numSamples)
 			m_AIplaying = true;
 	}
 
+	// Cache access in non-volatile variable
+	// This is the only function changing the read value, so it's safe to
+	// cache it locally although it's written here.
+	// The writing pointer will be modified outside, but it will only increase,
+	// so we will just ignore new written data while interpolating.
+	// Without this cache, the compiler wouldn't be allowed to optimize the
+	// interpolation loop.
+	u32 indexR = Common::AtomicLoad(m_indexR);
+	u32 indexW = Common::AtomicLoad(m_indexW);
+	
 	if (m_AIplaying) {
 		numLeft = (numLeft > numSamples) ? numSamples : numLeft;
 
@@ -57,7 +67,7 @@ unsigned int CMixer::Mix(short* samples, unsigned int numSamples)
 
 				for (unsigned int i = 0; i < numLeft * 2; i += 8)
 				{
-					_mm_storeu_si128((__m128i *)&samples[i], _mm_shuffle_epi8(_mm_loadu_si128((__m128i *)&m_buffer[(m_indexR + i) & INDEX_MASK]), sr_mask));
+					_mm_storeu_si128((__m128i *)&samples[i], _mm_shuffle_epi8(_mm_loadu_si128((__m128i *)&m_buffer[(indexR + i) & INDEX_MASK]), sr_mask));
 				}
 			}
 			else
@@ -65,38 +75,38 @@ unsigned int CMixer::Mix(short* samples, unsigned int numSamples)
 			{
 				for (unsigned int i = 0; i < numLeft * 2; i+=2)
 				{
-					samples[i] = Common::swap16(m_buffer[(m_indexR + i + 1) & INDEX_MASK]);
-					samples[i+1] = Common::swap16(m_buffer[(m_indexR + i) & INDEX_MASK]);
+					samples[i] = Common::swap16(m_buffer[(indexR + i + 1) & INDEX_MASK]);
+					samples[i+1] = Common::swap16(m_buffer[(indexR + i) & INDEX_MASK]);
 				}
 			}
-			m_indexR += numLeft * 2;
+			indexR += numLeft * 2;
 		}
 		else //linear interpolation
 		{
 			//render numleft sample pairs to samples[]
-			//advance m_indexR with sample position
+			//advance indexR with sample position
 			//remember fractional offset
 
 			static u32 frac = 0;
 			const u32 ratio = (u32)( 65536.0f * (float)AudioInterface::GetAIDSampleRate() / (float)m_sampleRate );
 
 			for (u32 i = 0; i < numLeft * 2; i+=2) {
-				u32 m_indexR2 = m_indexR + 2; //next sample
-				if ((m_indexR2 & INDEX_MASK) == (m_indexW & INDEX_MASK)) //..if it exists
-					m_indexR2 = m_indexR;
+				u32 indexR2 = indexR + 2; //next sample
+				if ((indexR2 & INDEX_MASK) == (indexW & INDEX_MASK)) //..if it exists
+					indexR2 = indexR;
 
-				s16 l1 = Common::swap16(m_buffer[m_indexR & INDEX_MASK]); //current
-				s16 l2 = Common::swap16(m_buffer[m_indexR2 & INDEX_MASK]); //next
+				s16 l1 = Common::swap16(m_buffer[indexR & INDEX_MASK]); //current
+				s16 l2 = Common::swap16(m_buffer[indexR2 & INDEX_MASK]); //next
 				int sampleL = ((l1 << 16) + (l2 - l1) * (u16)frac)  >> 16;
 				samples[i+1] = sampleL;
 
-				s16 r1 = Common::swap16(m_buffer[(m_indexR + 1) & INDEX_MASK]); //current
-				s16 r2 = Common::swap16(m_buffer[(m_indexR2 + 1) & INDEX_MASK]); //next
+				s16 r1 = Common::swap16(m_buffer[(indexR + 1) & INDEX_MASK]); //current
+				s16 r2 = Common::swap16(m_buffer[(indexR2 + 1) & INDEX_MASK]); //next
 				int sampleR = ((r1 << 16) + (r2 - r1) * (u16)frac)  >> 16;
 				samples[i] = sampleR;
 
 				frac += ratio;
-				m_indexR += 2 * (u16)(frac >> 16);
+				indexR += 2 * (u16)(frac >> 16);
 				frac &= 0xffff;
 			}
 		}
@@ -109,12 +119,15 @@ unsigned int CMixer::Mix(short* samples, unsigned int numSamples)
 	if (numSamples > numLeft)
 	{
 		unsigned short s[2];
-		s[0] = Common::swap16(m_buffer[(m_indexR - 1) & INDEX_MASK]);
-		s[1] = Common::swap16(m_buffer[(m_indexR - 2) & INDEX_MASK]);
+		s[0] = Common::swap16(m_buffer[(indexR - 1) & INDEX_MASK]);
+		s[1] = Common::swap16(m_buffer[(indexR - 2) & INDEX_MASK]);
 		for (unsigned int i = numLeft*2; i < numSamples*2; i+=2)
 			*(u32*)(samples+i) = *(u32*)(s);
 //		memset(&samples[numLeft * 2], 0, (numSamples - numLeft) * 4);
 	}
+	
+	// Flush cached variable	
+	Common::AtomicStore(m_indexR, indexR);
 
 	//when logging, also throttle HLE audio
 	if (m_logAudio) {
@@ -135,19 +148,21 @@ unsigned int CMixer::Mix(short* samples, unsigned int numSamples)
 		AudioInterface::Callback_GetStreaming(samples, numSamples, m_sampleRate);
 	}
 
-
-	Common::AtomicAdd(m_numSamples, -(s32)numLeft);
-
 	return numSamples;
 }
 
 
 void CMixer::PushSamples(const short *samples, unsigned int num_samples)
 {
+	// Cache access in non-volatile variable
+	// indexR isn't allowed to cache in the audio throttling loop as it
+	// needs to get updates to not deadlock.
+	u32 indexW = Common::AtomicLoad(m_indexW);
+	
 	if (m_throttle)
 	{
 		// The auto throttle function. This loop will put a ceiling on the CPU MHz.
-		while (num_samples + Common::AtomicLoad(m_numSamples) > MAX_SAMPLES)
+		while (num_samples * 2 + ((indexW - Common::AtomicLoad(m_indexR)) & INDEX_MASK) >= MAX_SAMPLES * 2)
 		{
 			if (*PowerPC::GetStatePtr() != PowerPC::CPU_RUNNING || soundStream->IsMuted()) 
 				break;
@@ -160,37 +175,47 @@ void CMixer::PushSamples(const short *samples, unsigned int num_samples)
 	}
 
 	// Check if we have enough free space
-	if (num_samples + Common::AtomicLoad(m_numSamples) > MAX_SAMPLES)
+	// indexW == m_indexR results in empty buffer, so indexR must always be smaller than indexW
+	if (num_samples * 2 + ((indexW - Common::AtomicLoad(m_indexR)) & INDEX_MASK) >= MAX_SAMPLES * 2)
 		return;
 
 	// AyuanX: Actual re-sampling work has been moved to sound thread
 	// to alleviate the workload on main thread
 	// and we simply store raw data here to make fast mem copy
-	int over_bytes = num_samples * 4 - (MAX_SAMPLES * 2 - (m_indexW & INDEX_MASK)) * sizeof(short);
+	int over_bytes = num_samples * 4 - (MAX_SAMPLES * 2 - (indexW & INDEX_MASK)) * sizeof(short);
 	if (over_bytes > 0)
 	{
-		memcpy(&m_buffer[m_indexW & INDEX_MASK], samples, num_samples * 4 - over_bytes);
+		memcpy(&m_buffer[indexW & INDEX_MASK], samples, num_samples * 4 - over_bytes);
 		memcpy(&m_buffer[0], samples + (num_samples * 4 - over_bytes) / sizeof(short), over_bytes);
 	}
 	else
 	{
-		memcpy(&m_buffer[m_indexW & INDEX_MASK], samples, num_samples * 4);
+		memcpy(&m_buffer[indexW & INDEX_MASK], samples, num_samples * 4);
 	}
-
-	m_indexW += num_samples * 2;
-
-	if (AudioInterface::GetAIDSampleRate() == m_sampleRate)
-		Common::AtomicAdd(m_numSamples, num_samples);
-	else if ((AudioInterface::GetAIDSampleRate() == 32000) && (m_sampleRate == 48000))
-		Common::AtomicAdd(m_numSamples, num_samples * 3 / 2);
-	else
-		Common::AtomicAdd(m_numSamples, num_samples * 2 / 3);
-
+	
+	Common::AtomicAdd(m_indexW, num_samples * 2);
+	
 	return;
 }
 
 unsigned int CMixer::GetNumSamples()
 {
-	return Common::AtomicLoad(m_numSamples);
+	// Guess how many samples would be available after interpolation.
+	// As interpolation needs at least on sample from the future to
+	// linear interpolate between them, one sample less is available.
+	// We also can't say the current interpolation state (specially
+	// the frac), so to be sure, subtract one again to be sure not
+	// to underflow the fifo.
+	
+	u32 numSamples = ((Common::AtomicLoad(m_indexW) - Common::AtomicLoad(m_indexR)) & INDEX_MASK) / 2;
+
+	if (AudioInterface::GetAIDSampleRate() == m_sampleRate)
+		numSamples = numSamples; // 1:1
+	else if (m_sampleRate == 48000 && AudioInterface::GetAIDSampleRate() == 32000)
+		numSamples = numSamples * 3 / 2 - 2; // most common case
+	else
+		numSamples = numSamples * m_sampleRate / AudioInterface::GetAIDSampleRate() - 2;
+
+	return numSamples;
 }
 
diff --git a/Source/Core/AudioCommon/Src/Mixer.h b/Source/Core/AudioCommon/Src/Mixer.h
index 6dcbe78ece..6d797d5c3e 100644
--- a/Source/Core/AudioCommon/Src/Mixer.h
+++ b/Source/Core/AudioCommon/Src/Mixer.h
@@ -23,7 +23,6 @@ public:
 		, m_channels(2)
 		, m_HLEready(false)
 		, m_logAudio(0)
-		, m_numSamples(0)
 		, m_indexW(0)
 		, m_indexR(0)
 		, m_AIplaying(true)
@@ -97,9 +96,8 @@ protected:
 	bool m_throttle;
 
 	short m_buffer[MAX_SAMPLES * 2];
-	volatile u32 m_numSamples;
-	u32 m_indexW;
-	u32 m_indexR;
+	volatile u32 m_indexW;
+	volatile u32 m_indexR;
 
 	bool m_AIplaying;
 	std::mutex m_csMixing;

From c52a583090f5fe8dd36a57b2d7628e18ef5f2721 Mon Sep 17 00:00:00 2001
From: John Peterson <john.s.peterson@live.com>
Date: Thu, 11 Jul 2013 23:25:06 +0200
Subject: [PATCH 278/352] Removing reading of the emulated Wiimote state in the
 real Wiimote mode

because

* the purpose of the emulated Wiimote state in the real Wiimote mode is to store the real Wiimote state rather than synchronise with an emulated Wiimote
---
 Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp | 8 +++++---
 Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp     | 2 ++
 Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp   | 5 -----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp
index 47d54725c0..f1904e9534 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp
@@ -760,7 +760,8 @@ void Wiimote::HidOutputReport(const wm_report* const sr, const bool send_ack)
 		break;
 
 	case WM_REQUEST_STATUS : // 0x15
-		RequestStatus((wm_request_status*)sr->data);
+		if (WIIMOTE_SRC_EMU & g_wiimote_sources[m_index])
+			RequestStatus((wm_request_status*)sr->data);
 		return;	// sends its own ack
 		break;
 
@@ -769,7 +770,8 @@ void Wiimote::HidOutputReport(const wm_report* const sr, const bool send_ack)
 		break;
 
 	case WM_READ_DATA : // 0x17
-		ReadData((wm_read_data*)sr->data);
+		if (WIIMOTE_SRC_EMU & g_wiimote_sources[m_index])
+			ReadData((wm_read_data*)sr->data);
 		return;	// sends its own ack
 		break;
 
@@ -811,7 +813,7 @@ void Wiimote::HidOutputReport(const wm_report* const sr, const bool send_ack)
 	}
 
 	// send ack
-	if (send_ack)
+	if (send_ack && WIIMOTE_SRC_EMU & g_wiimote_sources[m_index])
 		SendAck(sr->wm);
 }
 
diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
index f530bc8dea..9645b735b7 100644
--- a/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -863,6 +863,8 @@ void Wiimote::InterruptChannel(const u16 _channelID, const void* _pData, u32 _Si
 						// these two types are handled in RequestStatus() & ReadData()
 					case WM_REQUEST_STATUS :
 					case WM_READ_DATA :
+						if (WIIMOTE_SRC_REAL == g_wiimote_sources[m_index])
+							WiimoteReal::InterruptChannel(m_index, _channelID, _pData, _Size);
 						break;
 
 					default :
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
index 8568a8ed2a..b5297d8655 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
@@ -299,11 +299,6 @@ void Wiimote::Update()
 		return;
 	}
 
-	WiimoteEmu::Wiimote *const wm = (WiimoteEmu::Wiimote*)::Wiimote::GetPlugin()->controllers[index];
-
-	if (wm->Step())
-		return;
-
 	// Pop through the queued reports
 	const Report& rpt = ProcessReadQueue();
 

From b64e882ba5f34f63bf588ed2e14ff28247675982 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 12 Jul 2013 13:26:09 -0400
Subject: [PATCH 279/352] ExpressionParser: Parse fully qualified control names
 correctly

Without clearing out the "accumulator" for the backtick parsing,
our control name was full of junk (the previous device name) causing
us to not correctly find the control.

Ensure that always we clear the "accumulator" string during backtick
parsing.
---
 .../InputCommon/Src/ControllerInterface/ExpressionParser.cpp     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
index 0677a04abb..d91fbc587c 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
@@ -95,6 +95,7 @@ public:
 
 	bool FetchBacktickString(std::string &value, char otherDelim = 0)
 	{
+		value = "";
 		while (it != expr.end())
 		{
 			char c = *it;

From 52cb398804a4f7f4e31e2040bbabd1bf90c581f6 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sat, 13 Jul 2013 10:32:06 -0500
Subject: [PATCH 280/352] [Android] Actually push the library file to the
 correct location.

---
 Source/Core/DolphinWX/CMakeLists.txt | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
index 7f876b43f5..1ad6c56047 100644
--- a/Source/Core/DolphinWX/CMakeLists.txt
+++ b/Source/Core/DolphinWX/CMakeLists.txt
@@ -177,11 +177,20 @@ if(ANDROID)
 	${LIBS}
 	"-Wl,--no-whole-archive"
 	)
+	if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "mips")
+		set (SO_TARGET "mips")
+	endif()
+	if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
+		set (SO_TARGET "armeabi-v7a")
+	endif()
+	if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "i686")
+		set (SO_TARGET "x86")
+	endif()
 	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
-		COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/libs/armeabi-v7a/
+		COMMAND mkdir ARGS -p ${CMAKE_SOURCE_DIR}/Source/Android/libs/${SO_TARGET}
 	)
 	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
-		COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/libs/armeabi-v7a/lib${DOLPHIN_EXE}.so ${CMAKE_SOURCE_DIR}/Source/Android/libs/armeabi-v7a/
+		COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/libs/${SO_TARGET}/lib${DOLPHIN_EXE}.so ${CMAKE_SOURCE_DIR}/Source/Android/libs/${SO_TARGET}/
 	)
 	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
 		COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/GC/* ${CMAKE_SOURCE_DIR}/Source/Android/assets/

From 737df2a68cd5c5cdfa1e73cede0dbf85bde01abc Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sat, 13 Jul 2013 17:24:23 -0500
Subject: [PATCH 281/352] Patch from Degasus that removes the last of the the
 GL_TEXTURE_RECTANGLE usages. This is needed to have GLES3 support.

---
 Source/Android/.idea/compiler.xml             |   6 +
 .../.idea/copyright/profiles_settings.xml     |   6 +-
 Source/Android/.idea/workspace.xml            | 149 +++++++++---------
 .../dolphinemu/dolphinemu/PrefsActivity.java  |   4 +-
 Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp    |   2 +-
 Source/Core/DolphinWX/Src/GLInterface/EGL.h   |   4 +
 .../Src/FramebufferManager.cpp                |  33 ++--
 .../Plugin_VideoOGL/Src/FramebufferManager.h  |  12 ++
 Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h   |  10 ++
 .../Src/ProgramShaderCache.cpp                |  10 +-
 .../Plugin_VideoOGL/Src/RasterFont.cpp        |   3 +-
 Source/Plugins/Plugin_VideoOGL/Src/Render.cpp |   4 +-
 .../Plugin_VideoOGL/Src/SamplerCache.cpp      |   6 +-
 .../Plugin_VideoOGL/Src/TextureCache.cpp      |  12 +-
 .../Plugin_VideoOGL/Src/TextureConverter.cpp  |  28 ++--
 15 files changed, 163 insertions(+), 126 deletions(-)

diff --git a/Source/Android/.idea/compiler.xml b/Source/Android/.idea/compiler.xml
index 217af471a9..9292f81c68 100644
--- a/Source/Android/.idea/compiler.xml
+++ b/Source/Android/.idea/compiler.xml
@@ -2,6 +2,9 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
+    <excludeFromCompile>
+      <directory url="file://$PROJECT_DIR$/gen" includeSubdirectories="true" />
+    </excludeFromCompile>
     <resourceExtensions />
     <wildcardResourcePatterns>
       <entry name="!?*.java" />
@@ -19,5 +22,8 @@
       </profile>
     </annotationProcessing>
   </component>
+  <component name="JavacSettings">
+    <option name="MAXIMUM_HEAP_SIZE" value="512" />
+  </component>
 </project>
 
diff --git a/Source/Android/.idea/copyright/profiles_settings.xml b/Source/Android/.idea/copyright/profiles_settings.xml
index 3572571ad8..d02d5cbd75 100644
--- a/Source/Android/.idea/copyright/profiles_settings.xml
+++ b/Source/Android/.idea/copyright/profiles_settings.xml
@@ -1,5 +1,7 @@
 <component name="CopyrightManager">
-  <settings default="">
-    <module2copyright />
+  <settings default="Dolphin">
+    <module2copyright>
+      <element module="Copywrite" copyright="Dolphin" />
+    </module2copyright>
   </settings>
 </component>
\ No newline at end of file
diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
index 4306ba1d4c..c39565e7e4 100644
--- a/Source/Android/.idea/workspace.xml
+++ b/Source/Android/.idea/workspace.xml
@@ -47,6 +47,9 @@
     <rightPanel />
     <splitter proportion="0.5" />
   </component>
+  <component name="CompilerWorkspaceConfiguration">
+    <option name="PARALLEL_COMPILATION" value="true" />
+  </component>
   <component name="CreatePatchCommitExecutor">
     <option name="PATCH_PATH" value="" />
   </component>
@@ -54,7 +57,6 @@
     <disable_hints />
   </component>
   <component name="DebuggerManager">
-    <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
     <breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
       <breakpoint>
         <option name="NOTIFY_CAUGHT" value="true" />
@@ -91,6 +93,7 @@
         <option name="LOG_MESSAGE" value="" />
       </breakpoint>
     </breakpoint_any>
+    <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
     <breakpoint_rules />
     <ui_properties />
   </component>
@@ -103,7 +106,7 @@
       <file leaf-file-name="DolphinEmulator.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="224" column="45" selection-start="6730" selection-end="6769" vertical-scroll-proportion="0.0" vertical-offset="2846" max-vertical-offset="3585">
+            <state line="224" column="45" selection-start="6730" selection-end="6769" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4302">
               <folding />
             </state>
           </provider>
@@ -112,7 +115,7 @@
       <file leaf-file-name="GameListActivity.java" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="173" column="16" selection-start="5541" selection-end="5638" vertical-scroll-proportion="0.0" vertical-offset="2070" max-vertical-offset="3390">
+            <state line="173" column="16" selection-start="5541" selection-end="5638" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4068">
               <folding />
             </state>
           </provider>
@@ -121,7 +124,7 @@
       <file leaf-file-name="PrefsActivity.java" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="177" column="17" selection-start="5357" selection-end="5357" vertical-scroll-proportion="0.09090909" vertical-offset="2619" max-vertical-offset="3375">
+            <state line="21" column="4" selection-start="629" selection-end="629" vertical-scroll-proportion="0.7099237" vertical-offset="99" max-vertical-offset="4014">
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -129,45 +132,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="prefs.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="20" column="33" selection-start="799" selection-end="819" vertical-scroll-proportion="-12.0" vertical-offset="0" max-vertical-offset="435">
-              <folding />
-            </state>
-          </provider>
-          <provider editor-type-id="android-designer">
-            <state />
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="strings.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/res/values/strings.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="210">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="prefvalues.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="8" column="14" selection-start="231" selection-end="248" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="GameListItem.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="22" column="24" selection-start="570" selection-end="570" vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="1140">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FindManager">
@@ -260,6 +224,16 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="" />
+              <option name="myItemType" value="" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -298,7 +272,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
       <pane id="Scope">
         <subPane subId="Project Files">
           <PATH>
@@ -419,7 +392,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="recentsLimit" value="5" />
     <property name="ExportedApkPath" value="$USER_HOME$/Desktop/DolphinEmu-0.9.apk" />
-    <property name="options.lastSelected" value="project.propCompiler" />
+    <property name="options.lastSelected" value="copyright" />
     <property name="ExportedModule" value="Android" />
     <property name="last_opened_file_path" value="$USER_HOME$/NavigationDrawer/libs/android-support-v4.jar" />
     <property name="project.structure.side.proportion" value="0.2" />
@@ -427,7 +400,7 @@
     <property name="MemberChooser.copyJavadoc" value="false" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
     <property name="AndroidRunProguardForReleaseBuild" value="false" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="YES" />
+    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="Mips" />
     <property name="restartRequiresConfirmation" value="true" />
     <property name="FullScreen" value="false" />
     <property name="MemberChooser.showClasses" value="true" />
@@ -640,14 +613,15 @@
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2179289" sideWeight="0.29026845" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32659933" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21378776" sideWeight="0.7080537" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29194632" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21301317" sideWeight="0.7104377" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28956228" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -752,8 +726,8 @@
       <provider selected="true" editor-type-id="text-editor">
         <state line="59" column="5" selection-start="1460" selection-end="1460" vertical-scroll-proportion="0.8684211" vertical-offset="360" max-vertical-offset="975">
           <folding>
-            <element signature="e#493#661#0" expanded="true" />
-            <element signature="e#654#655#0" expanded="true" />
+            <element signature="e#493#661#0" expanded="false" />
+            <element signature="e#654#655#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -793,13 +767,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="224" column="45" selection-start="6730" selection-end="6769" vertical-scroll-proportion="0.0" vertical-offset="2668" max-vertical-offset="3315">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state line="3" column="26" selection-start="174" selection-end="174" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="825">
@@ -821,6 +788,27 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="173" column="16" selection-start="5541" selection-end="5638" vertical-scroll-proportion="0.0" vertical-offset="2070" max-vertical-offset="3390">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="224" column="45" selection-start="6730" selection-end="6769" vertical-scroll-proportion="0.0" vertical-offset="2668" max-vertical-offset="3315">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="8" column="14" selection-start="231" selection-end="248" vertical-scroll-proportion="0.25396827" vertical-offset="0" max-vertical-offset="567">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/res/values/strings.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="396">
@@ -830,7 +818,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="20" column="33" selection-start="799" selection-end="819" vertical-scroll-proportion="-12.0" vertical-offset="0" max-vertical-offset="435">
+        <state line="20" column="33" selection-start="799" selection-end="819" vertical-scroll-proportion="0.66790354" vertical-offset="0" max-vertical-offset="539">
           <folding />
         </state>
       </provider>
@@ -838,23 +826,9 @@
         <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="8" column="14" selection-start="231" selection-end="248" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="173" column="16" selection-start="5541" selection-end="5638" vertical-scroll-proportion="0.0" vertical-offset="2070" max-vertical-offset="3390">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="177" column="17" selection-start="5357" selection-end="5357" vertical-scroll-proportion="0.09090909" vertical-offset="2619" max-vertical-offset="3375">
+        <state line="21" column="4" selection-start="629" selection-end="629" vertical-scroll-proportion="0.7099237" vertical-offset="99" max-vertical-offset="4014">
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -876,6 +850,18 @@
           </splitter-proportions>
         </settings>
       </state>
+      <state key="Copyright.UI">
+        <settings>
+          <last-edited>Dolphin</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
       <state key="FacetStructureConfigurable.UI">
         <settings>
           <last-edited>Dolphin Emulator (Android)|Android</last-edited>
@@ -948,6 +934,21 @@
           </splitter-proportions>
         </settings>
       </state>
+      <state key="ScopeChooserConfigurable.UI">
+        <settings>
+          <last-edited>Copywrite</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+          <order>
+            <scope name="Copywrite" />
+          </order>
+        </settings>
+      </state>
     </states>
   </component>
 </project>
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java
index 4ce82beefe..772f2b9cb6 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java
@@ -2,7 +2,6 @@ package org.dolphinemu.dolphinemu;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.opengl.GLSurfaceView;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.ListPreference;
@@ -20,14 +19,13 @@ import javax.microedition.khronos.opengles.GL10;
  */
 public class PrefsActivity extends PreferenceActivity {
 	private PrefsActivity m_activity;
+	
 	private String m_GLVersion;
 	private String m_GLVendor;
 	private String m_GLRenderer;
 
 
 	public class VersionCheck {
-		GLSurfaceView.Renderer mRenderer; // borrow this interface
-
 		EGL10 mEGL;
 		EGLDisplay mEGLDisplay;
 		EGLConfig[] mEGLConfigs;
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
index 50266d7f84..488b2fdec6 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
@@ -666,7 +666,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
 		{
 			char ppcInst[256];
 			DisassembleGekko(ops[i].inst.hex, em_address, ppcInst, 256);
-			NOTICE_LOG(DYNA_REC, "Unflushed register: %s", ppcInst);
+			//NOTICE_LOG(DYNA_REC, "Unflushed register: %s", ppcInst);
 		}
 #endif
 		if (js.skipnext) {
diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.h b/Source/Core/DolphinWX/Src/GLInterface/EGL.h
index cf218ad760..cd0969c4b7 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/EGL.h
+++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.h
@@ -18,7 +18,11 @@
 #define _INTERFACEEGL_H_
 
 #if USE_GLES
+#ifdef USE_GLES3
+#include <GLES3/gl3.h>
+#else
 #include <GLES2/gl2.h>
+#endif
 #else
 #include <GL/glxew.h>
 #include <GL/gl.h>
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
index 5ce106601f..27a5dff2de 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
@@ -59,6 +59,7 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
 	// Create EFB target.
 
 	glGenFramebuffers(1, &m_efbFramebuffer);
+	glActiveTexture(GL_TEXTURE0 + 9);
 
 	if (m_msaaSamples <= 1)
 	{
@@ -69,20 +70,20 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
 		m_efbColor = glObj[0];
 		m_efbDepth = glObj[1];
 
-		glBindTexture(GL_TEXTURE_RECTANGLE, m_efbColor);
-		glTexImage2D(GL_TEXTURE_RECTANGLE, 0, GL_RGBA8, m_targetWidth, m_targetHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+		glBindTexture(getFbType(), m_efbColor);
+		glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
+		glTexImage2D(getFbType(), 0, GL_RGBA8, m_targetWidth, m_targetHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
 
-		glBindTexture(GL_TEXTURE_RECTANGLE, m_efbDepth);
-		glTexImage2D(GL_TEXTURE_RECTANGLE, 0, GL_DEPTH_COMPONENT24, m_targetWidth, m_targetHeight, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL);
-
-		glBindTexture(GL_TEXTURE_RECTANGLE, 0);
+		glBindTexture(getFbType(), m_efbDepth);
+		glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
+		glTexImage2D(getFbType(), 0, GL_DEPTH_COMPONENT24, m_targetWidth, m_targetHeight, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL);
 
 		// Bind target textures to the EFB framebuffer.
 
 		glBindFramebuffer(GL_FRAMEBUFFER, m_efbFramebuffer);
 
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_RECTANGLE, m_efbColor, 0);
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_RECTANGLE, m_efbDepth, 0);
+		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, getFbType(), m_efbColor, 0);
+		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, getFbType(), m_efbDepth, 0);
 
 		GL_REPORT_FBO_ERROR();
 	}
@@ -131,20 +132,20 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
 		m_resolvedColorTexture = glObj[0];
 		m_resolvedDepthTexture = glObj[1];
 
-		glBindTexture(GL_TEXTURE_RECTANGLE, m_resolvedColorTexture);
-		glTexImage2D(GL_TEXTURE_RECTANGLE, 0, GL_RGBA8, m_targetWidth, m_targetHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+		glBindTexture(getFbType(), m_resolvedColorTexture);
+		glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
+		glTexImage2D(getFbType(), 0, GL_RGBA8, m_targetWidth, m_targetHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
 
-		glBindTexture(GL_TEXTURE_RECTANGLE, m_resolvedDepthTexture);
-		glTexImage2D(GL_TEXTURE_RECTANGLE, 0, GL_DEPTH_COMPONENT24, m_targetWidth, m_targetHeight, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL);
-
-		glBindTexture(GL_TEXTURE_RECTANGLE, 0);
+		glBindTexture(getFbType(), m_resolvedDepthTexture);
+		glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
+		glTexImage2D(getFbType(), 0, GL_DEPTH_COMPONENT24, m_targetWidth, m_targetHeight, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL);
 
 		// Bind resolved textures to resolved framebuffer.
 
 		glBindFramebuffer(GL_FRAMEBUFFER, m_resolvedFramebuffer);
 
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_RECTANGLE, m_resolvedColorTexture, 0);
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_RECTANGLE, m_resolvedDepthTexture, 0);
+		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, getFbType(), m_resolvedColorTexture, 0);
+		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, getFbType(), m_resolvedDepthTexture, 0);
 
 		GL_REPORT_FBO_ERROR();
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h
index e0c96ed8a6..4a8b09722c 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h
@@ -7,6 +7,7 @@
 
 #include "GLUtil.h"
 #include "FramebufferManagerBase.h"
+#include "Render.h"
 
 // On the GameCube, the game sends a request for the graphics processor to
 // transfer its internal EFB (Embedded Framebuffer) to an area in GameCube RAM
@@ -55,6 +56,17 @@ struct XFBSource : public XFBSourceBase
 	const GLuint renderbuf;
 };
 
+inline GLenum getFbType()
+{
+#ifndef USE_GLES3
+	if(g_ogl_config.eSupportedGLSLVersion == GLSL_120)
+	{
+		return GL_TEXTURE_RECTANGLE;
+	}
+#endif
+	return GL_TEXTURE_2D;
+}
+
 class FramebufferManager : public FramebufferManagerBase
 {
 public:
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
index 6057fa99f4..8beee0fd89 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
@@ -23,12 +23,22 @@
 #define TEXFUNC "texture2D"
 #ifdef USE_GLES3
 #include "GLFunctions.h"
+#define GLAPIENTRY GL_APIENTRY
+#define GL_SAMPLES_PASSED GL_ANY_SAMPLES_PASSED
+#define GL_READ_ONLY                      0x88B8
+#define GL_WRITE_ONLY                     0x88B9
+#define GL_READ_WRITE                     0x88BA
+#define GL_SRC1_ALPHA 0
+#define GL_BGRA GL_RGBA
+#define glDrawElementsBaseVertex
+#define GLRENDERBUFFERFORMAT 0x8058 /* RGBA8_OES */ 
 #endif
 #else
 #define TEX2D	GL_TEXTURE_RECTANGLE_ARB
 #define PREC 
 #define TEXTYPE "sampler2DRect"
 #define TEXFUNC "texture2DRect"
+#define GLRENDERBUFFERFORMAT GL_RGBA
 #endif
 
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index 1da28f9cc5..1eed65a01e 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -509,7 +509,6 @@ void ProgramShaderCache::CreateHeader ( void )
 	snprintf(s_glsl_header, sizeof(s_glsl_header), 
 		"#version %s\n"
 		"%s\n" // default precision
-		"%s\n" // tex_rect
 		"%s\n" // ubo
 		
 		"\n"// A few required defines and ones that will make our lives a lot easier
@@ -534,10 +533,14 @@ void ProgramShaderCache::CreateHeader ( void )
 		"%s\n"
 		"%s\n"
 		"#define COLOROUT(name) %s\n"
+		
+		// texture2d hack
+		"%s\n"
+		"%s\n"
+		"%s\n"
 				
 		, v==GLSLES3 ? "300 es" : v==GLSL_120 ? "120" : v==GLSL_130 ? "130" : "140"
 		, v==GLSLES3 ? "precision highp float;" : ""
-		, v==GLSLES3 ? "" : v<=GLSL_130 ? "#extension GL_ARB_texture_rectangle : enable" : "#define texture2DRect texture"
 		, g_ActiveConfig.backend_info.bSupportsGLSLUBO && v<GLSL_140 ? "#extension GL_ARB_uniform_buffer_object : enable" : ""
 		, v==GLSL_120 ? "attribute" : "in"
 		, v==GLSL_120 ? "attribute" : "out"
@@ -549,6 +552,9 @@ void ProgramShaderCache::CreateHeader ( void )
 		, v==GLSL_120 ? "#define ocol0 gl_FragColor" : ""
 		, v==GLSL_120 ? "#define ocol1 gl_FragColor" : "" //TODO: implement dual source blend
 		, v==GLSL_120 ? "" : "out vec4 name;"
+		, v==GLSL_120 ? "#extension GL_ARB_texture_rectangle : enable" : ""
+		, v==GLSL_120 ? "" : "#define texture2DRect(samp, uv)  texelFetch(samp, ivec2(floor(uv)), 0)"
+		, v==GLSL_120 ? "" : "#define sampler2DRect sampler2D"
 	);
 }
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
index acc77d1f0e..9011b072e8 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
@@ -149,8 +149,7 @@ RasterFont::RasterFont()
 			}
 		}
 	}
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, char_width*char_count, char_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data);
 	delete [] texture_data;
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index 07a59c5983..fab248ca90 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -984,7 +984,7 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data)
 #ifdef USE_GLES3
 				// XXX: Swap colours
 				glReadPixels(targetPixelRc.left, targetPixelRc.bottom, targetPixelRcWidth, targetPixelRcHeight,
-				             GL_RGBA, GL_UNSIGNED_INT, colorMap);
+				             GL_RGBA, GL_UNSIGNED_BYTE, colorMap);
 #else
 				glReadPixels(targetPixelRc.left, targetPixelRc.bottom, targetPixelRcWidth, targetPixelRcHeight,
 				             GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, colorMap);
@@ -1559,7 +1559,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 
 	// For testing zbuffer targets.
 	// Renderer::SetZBufferRender();
-	// SaveTexture("tex.tga", GL_TEXTURE_RECTANGLE_ARB, s_FakeZTarget,
+	// SaveTexture("tex.tga", GL_TEXTURE_2D, s_FakeZTarget,
 	//	      GetTargetWidth(), GetTargetHeight());
 	Core::Callback_VideoCopiedToXFB(XFBWrited || (g_ActiveConfig.bUseXFB && g_ActiveConfig.bUseRealXFB));
 	XFBWrited = false;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp
index 87aac2da0c..3fe2737e3f 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp
@@ -95,13 +95,15 @@ void SamplerCache::SetParameters(GLuint sampler_id, const Params& params)
 	glSamplerParameteri(sampler_id, GL_TEXTURE_WRAP_S, wrap_settings[tm0.wrap_s]);
 	glSamplerParameteri(sampler_id, GL_TEXTURE_WRAP_T, wrap_settings[tm0.wrap_t]);
 	
-	glSamplerParameterf(sampler_id, GL_TEXTURE_LOD_BIAS, tm0.lod_bias / 32.f);
-	
 	glSamplerParameterf(sampler_id, GL_TEXTURE_MIN_LOD, tm1.min_lod / 16.f);
 	glSamplerParameterf(sampler_id, GL_TEXTURE_MAX_LOD, tm1.max_lod / 16.f);
 
+#ifndef USE_GLES3
+	glSamplerParameterf(sampler_id, GL_TEXTURE_LOD_BIAS, tm0.lod_bias / 32.f);
+
 	if (g_ActiveConfig.iMaxAnisotropy > 0)
 		glSamplerParameterf(sampler_id, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)(1 << g_ActiveConfig.iMaxAnisotropy));
+#endif
 }
 
 void SamplerCache::Clear()
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
index c53bb2485a..da3a4b33e9 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
@@ -63,6 +63,7 @@ static std::map<u64,VBOCache> s_VBO;
 
 bool SaveTexture(const char* filename, u32 textarget, u32 tex, int virtual_width, int virtual_height, unsigned int level)
 {
+#ifndef USE_GLES3
 	int width = std::max(virtual_width >> level, 1);
 	int height = std::max(virtual_height >> level, 1);
 	std::vector<u32> data(width * height);
@@ -80,6 +81,9 @@ bool SaveTexture(const char* filename, u32 textarget, u32 tex, int virtual_width
 	}
 
 	return SaveTGA(filename, width, height, &data[0]);
+#else
+	return false;
+#endif
 }
 
 TextureCache::TCacheEntry::~TCacheEntry()
@@ -158,7 +162,7 @@ TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width,
 			gl_iformat = GL_RGBA;
 			gl_type = GL_UNSIGNED_BYTE;
 			break;
-
+#ifndef USE_GLES3
 		case PC_TEX_FMT_I4_AS_I8:
 			gl_format = GL_LUMINANCE;
 			gl_iformat = GL_INTENSITY4;
@@ -182,7 +186,7 @@ TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width,
 			gl_iformat = GL_LUMINANCE8_ALPHA8;
 			gl_type = GL_UNSIGNED_BYTE;
 			break;
-
+#endif
 		case PC_TEX_FMT_RGB565:
 			gl_format = GL_RGB;
 			gl_iformat = GL_RGB;
@@ -296,7 +300,7 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
 		GL_REPORT_ERRORD();
 
 		glActiveTexture(GL_TEXTURE0+9);
-		glBindTexture(GL_TEXTURE_RECTANGLE, read_texture);
+		glBindTexture(getFbType(), read_texture);
 
 		glViewport(0, 0, virtual_width, virtual_height);
 
@@ -360,8 +364,6 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
 		glBindVertexArray(vbo_it->second.vao);
 		glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 
-		glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
-
 		GL_REPORT_ERRORD();
 	}
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
index 8e8ae4b21c..d3e73b177b 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
@@ -167,11 +167,10 @@ void Init()
 	s_srcTextureWidth = 0;
 	s_srcTextureHeight = 0;
 
+	glActiveTexture(GL_TEXTURE0 + 9);
 	glGenTextures(1, &s_srcTexture);
-	glBindTexture(GL_TEXTURE_RECTANGLE_ARB, s_srcTexture);
-	glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-	glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
+	glBindTexture(getFbType(), s_srcTexture);
+	glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
 	
 	CreatePrograms();
 }
@@ -213,17 +212,17 @@ void EncodeToRamUsingShader(GLuint srcTexture, const TargetRectangle& sourceRc,
 
 	// set source texture
 	glActiveTexture(GL_TEXTURE0+9);
-	glBindTexture(GL_TEXTURE_RECTANGLE, srcTexture);
+	glBindTexture(getFbType(), srcTexture);
 
 	if (linearFilter)
 	{
-		glTexParameteri(GL_TEXTURE_RECTANGLE, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-		glTexParameteri(GL_TEXTURE_RECTANGLE, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		glTexParameteri(getFbType(), GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		glTexParameteri(getFbType(), GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	}
 	else
 	{
-		glTexParameteri(GL_TEXTURE_RECTANGLE, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-		glTexParameteri(GL_TEXTURE_RECTANGLE, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+		glTexParameteri(getFbType(), GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+		glTexParameteri(getFbType(), GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 	}
 
 	GL_REPORT_ERRORD();
@@ -251,8 +250,6 @@ void EncodeToRamUsingShader(GLuint srcTexture, const TargetRectangle& sourceRc,
 	glBindVertexArray( s_encode_VAO );
 	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 	
-	glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
-	
 	GL_REPORT_ERRORD();
 
 	// .. and then read back the results.
@@ -386,17 +383,17 @@ void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destRender
 	// activate source texture
 	// set srcAddr as data for source texture
 	glActiveTexture(GL_TEXTURE0+9);
-	glBindTexture(GL_TEXTURE_RECTANGLE, s_srcTexture);
+	glBindTexture(getFbType(), s_srcTexture);
 
 	// TODO: make this less slow.  (How?)
 	if ((GLsizei)s_srcTextureWidth == (GLsizei)srcFmtWidth && (GLsizei)s_srcTextureHeight == (GLsizei)srcHeight)
 	{
-		glTexSubImage2D(GL_TEXTURE_RECTANGLE, 0,0,0,s_srcTextureWidth, s_srcTextureHeight,
+		glTexSubImage2D(getFbType(), 0,0,0,s_srcTextureWidth, s_srcTextureHeight,
 				GL_BGRA, GL_UNSIGNED_BYTE, srcAddr);
 	}
 	else
 	{
-		glTexImage2D(GL_TEXTURE_RECTANGLE, 0, GL_RGBA8, (GLsizei)srcFmtWidth, (GLsizei)srcHeight,
+		glTexImage2D(getFbType(), 0, GL_RGBA8, (GLsizei)srcFmtWidth, (GLsizei)srcHeight,
 				0, GL_BGRA, GL_UNSIGNED_BYTE, srcAddr);
 		s_srcTextureWidth = (GLsizei)srcFmtWidth;
 		s_srcTextureHeight = (GLsizei)srcHeight;
@@ -431,9 +428,6 @@ void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destRender
 	
 	GL_REPORT_ERRORD();
 
-	// reset state
-	glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
-
 	VertexShaderManager::SetViewportChanged();
 
 	FramebufferManager::SetFramebuffer(0);

From ea146627e6352609ce5ba1471387652e1c548d78 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sat, 13 Jul 2013 18:42:04 -0500
Subject: [PATCH 282/352] [Android] Enable OpenGL ES 3 by default. Add in a
 modified GLES3/gl3.h header for supporting it.

---
 CMakeLists.txt                      |   16 +-
 Externals/GLES3/GLES3/gl3.h         | 1035 +++++++++++++++++++++++++++
 Externals/GLES3/GLES3/gl3ext.h      |   24 +
 Externals/GLES3/GLES3/gl3platform.h |   30 +
 Source/Android/AndroidManifest.xml  |    4 +-
 5 files changed, 1100 insertions(+), 9 deletions(-)
 create mode 100644 Externals/GLES3/GLES3/gl3.h
 create mode 100644 Externals/GLES3/GLES3/gl3ext.h
 create mode 100644 Externals/GLES3/GLES3/gl3platform.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6447f961e..cd05dcf32a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -268,6 +268,15 @@ if(FASTLOG)
 	add_definitions(-DDEBUGFAST)
 endif()
 
+if(ANDROID)
+	message("Building for Android")
+	add_definitions(-DANDROID)
+	set(USE_X11 0)
+	set(USE_WAYLAND 0)
+	set(USE_UPNP 0)
+	set(USE_GLES3 1)
+endif()
+
 # For now GLES and EGL are tied to each other.
 # Enabling GLES also disables the OpenGL plugin.
 if(USE_GLES3)
@@ -301,13 +310,6 @@ else()
 endif()
 add_definitions(-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
 
-if(ANDROID)
-	message("Building for Android")
-	add_definitions(-DANDROID)
-	set(USE_X11 0)
-	set(USE_WAYLAND 0)
-	set(USE_UPNP 0)
-endif()
 ########################################
 # Dependency checking
 #
diff --git a/Externals/GLES3/GLES3/gl3.h b/Externals/GLES3/GLES3/gl3.h
new file mode 100644
index 0000000000..2360101b6d
--- /dev/null
+++ b/Externals/GLES3/GLES3/gl3.h
@@ -0,0 +1,1035 @@
+#ifndef __gl3_h_
+#define __gl3_h_
+
+/* 
+ * gl3.h last updated on $Date: 2013-02-12 14:37:24 -0800 (Tue, 12 Feb 2013) $
+ */
+
+#include <GLES3/gl3platform.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2007-2013 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/*-------------------------------------------------------------------------
+ * Data type definitions
+ *-----------------------------------------------------------------------*/
+
+/* OpenGL ES 2.0 */
+
+typedef void             GLvoid;
+typedef char             GLchar;
+typedef unsigned int     GLenum;
+typedef unsigned char    GLboolean;
+typedef unsigned int     GLbitfield;
+typedef khronos_int8_t   GLbyte;
+typedef short            GLshort;
+typedef int              GLint;
+typedef int              GLsizei;
+typedef khronos_uint8_t  GLubyte;
+typedef unsigned short   GLushort;
+typedef unsigned int     GLuint;
+typedef khronos_float_t  GLfloat;
+typedef khronos_float_t  GLclampf;
+typedef khronos_int32_t  GLfixed;
+typedef khronos_intptr_t GLintptr;
+typedef khronos_ssize_t  GLsizeiptr;
+
+/* OpenGL ES 3.0 */
+
+typedef unsigned short   GLhalf;
+typedef khronos_int64_t  GLint64;
+typedef khronos_uint64_t GLuint64;
+typedef struct __GLsync *GLsync;
+
+/*-------------------------------------------------------------------------
+ * Token definitions
+ *-----------------------------------------------------------------------*/
+
+/* OpenGL ES core versions */
+#define GL_ES_VERSION_3_0                                1
+#define GL_ES_VERSION_2_0                                1
+
+/* OpenGL ES 2.0 */
+
+/* ClearBufferMask */
+#define GL_DEPTH_BUFFER_BIT                              0x00000100
+#define GL_STENCIL_BUFFER_BIT                            0x00000400
+#define GL_COLOR_BUFFER_BIT                              0x00004000
+
+/* Boolean */
+#define GL_FALSE                                         0
+#define GL_TRUE                                          1
+
+/* BeginMode */
+#define GL_POINTS                                        0x0000
+#define GL_LINES                                         0x0001
+#define GL_LINE_LOOP                                     0x0002
+#define GL_LINE_STRIP                                    0x0003
+#define GL_TRIANGLES                                     0x0004
+#define GL_TRIANGLE_STRIP                                0x0005
+#define GL_TRIANGLE_FAN                                  0x0006
+
+/* BlendingFactorDest */
+#define GL_ZERO                                          0
+#define GL_ONE                                           1
+#define GL_SRC_COLOR                                     0x0300
+#define GL_ONE_MINUS_SRC_COLOR                           0x0301
+#define GL_SRC_ALPHA                                     0x0302
+#define GL_ONE_MINUS_SRC_ALPHA                           0x0303
+#define GL_DST_ALPHA                                     0x0304
+#define GL_ONE_MINUS_DST_ALPHA                           0x0305
+
+/* BlendingFactorSrc */
+/*      GL_ZERO */
+/*      GL_ONE */
+#define GL_DST_COLOR                                     0x0306
+#define GL_ONE_MINUS_DST_COLOR                           0x0307
+#define GL_SRC_ALPHA_SATURATE                            0x0308
+/*      GL_SRC_ALPHA */
+/*      GL_ONE_MINUS_SRC_ALPHA */
+/*      GL_DST_ALPHA */
+/*      GL_ONE_MINUS_DST_ALPHA */
+
+/* BlendEquationSeparate */
+#define GL_FUNC_ADD                                      0x8006
+#define GL_BLEND_EQUATION                                0x8009
+#define GL_BLEND_EQUATION_RGB                            0x8009    /* same as BLEND_EQUATION */
+#define GL_BLEND_EQUATION_ALPHA                          0x883D
+
+/* BlendSubtract */
+#define GL_FUNC_SUBTRACT                                 0x800A
+#define GL_FUNC_REVERSE_SUBTRACT                         0x800B
+
+/* Separate Blend Functions */
+#define GL_BLEND_DST_RGB                                 0x80C8
+#define GL_BLEND_SRC_RGB                                 0x80C9
+#define GL_BLEND_DST_ALPHA                               0x80CA
+#define GL_BLEND_SRC_ALPHA                               0x80CB
+#define GL_CONSTANT_COLOR                                0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR                      0x8002
+#define GL_CONSTANT_ALPHA                                0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA                      0x8004
+#define GL_BLEND_COLOR                                   0x8005
+
+/* Buffer Objects */
+#define GL_ARRAY_BUFFER                                  0x8892
+#define GL_ELEMENT_ARRAY_BUFFER                          0x8893
+#define GL_ARRAY_BUFFER_BINDING                          0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING                  0x8895
+
+#define GL_STREAM_DRAW                                   0x88E0
+#define GL_STATIC_DRAW                                   0x88E4
+#define GL_DYNAMIC_DRAW                                  0x88E8
+
+#define GL_BUFFER_SIZE                                   0x8764
+#define GL_BUFFER_USAGE                                  0x8765
+
+#define GL_CURRENT_VERTEX_ATTRIB                         0x8626
+
+/* CullFaceMode */
+#define GL_FRONT                                         0x0404
+#define GL_BACK                                          0x0405
+#define GL_FRONT_AND_BACK                                0x0408
+
+/* DepthFunction */
+/*      GL_NEVER */
+/*      GL_LESS */
+/*      GL_EQUAL */
+/*      GL_LEQUAL */
+/*      GL_GREATER */
+/*      GL_NOTEQUAL */
+/*      GL_GEQUAL */
+/*      GL_ALWAYS */
+
+/* EnableCap */
+#define GL_TEXTURE_2D                                    0x0DE1
+#define GL_CULL_FACE                                     0x0B44
+#define GL_BLEND                                         0x0BE2
+#define GL_DITHER                                        0x0BD0
+#define GL_STENCIL_TEST                                  0x0B90
+#define GL_DEPTH_TEST                                    0x0B71
+#define GL_SCISSOR_TEST                                  0x0C11
+#define GL_POLYGON_OFFSET_FILL                           0x8037
+#define GL_SAMPLE_ALPHA_TO_COVERAGE                      0x809E
+#define GL_SAMPLE_COVERAGE                               0x80A0
+
+/* ErrorCode */
+#define GL_NO_ERROR                                      0
+#define GL_INVALID_ENUM                                  0x0500
+#define GL_INVALID_VALUE                                 0x0501
+#define GL_INVALID_OPERATION                             0x0502
+#define GL_OUT_OF_MEMORY                                 0x0505
+
+/* FrontFaceDirection */
+#define GL_CW                                            0x0900
+#define GL_CCW                                           0x0901
+
+/* GetPName */
+#define GL_LINE_WIDTH                                    0x0B21
+#define GL_ALIASED_POINT_SIZE_RANGE                      0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE                      0x846E
+#define GL_CULL_FACE_MODE                                0x0B45
+#define GL_FRONT_FACE                                    0x0B46
+#define GL_DEPTH_RANGE                                   0x0B70
+#define GL_DEPTH_WRITEMASK                               0x0B72
+#define GL_DEPTH_CLEAR_VALUE                             0x0B73
+#define GL_DEPTH_FUNC                                    0x0B74
+#define GL_STENCIL_CLEAR_VALUE                           0x0B91
+#define GL_STENCIL_FUNC                                  0x0B92
+#define GL_STENCIL_FAIL                                  0x0B94
+#define GL_STENCIL_PASS_DEPTH_FAIL                       0x0B95
+#define GL_STENCIL_PASS_DEPTH_PASS                       0x0B96
+#define GL_STENCIL_REF                                   0x0B97
+#define GL_STENCIL_VALUE_MASK                            0x0B93
+#define GL_STENCIL_WRITEMASK                             0x0B98
+#define GL_STENCIL_BACK_FUNC                             0x8800
+#define GL_STENCIL_BACK_FAIL                             0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL                  0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS                  0x8803
+#define GL_STENCIL_BACK_REF                              0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK                       0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK                        0x8CA5
+#define GL_VIEWPORT                                      0x0BA2
+#define GL_SCISSOR_BOX                                   0x0C10
+/*      GL_SCISSOR_TEST */
+#define GL_COLOR_CLEAR_VALUE                             0x0C22
+#define GL_COLOR_WRITEMASK                               0x0C23
+#define GL_UNPACK_ALIGNMENT                              0x0CF5
+#define GL_PACK_ALIGNMENT                                0x0D05
+#define GL_MAX_TEXTURE_SIZE                              0x0D33
+#define GL_MAX_VIEWPORT_DIMS                             0x0D3A
+#define GL_SUBPIXEL_BITS                                 0x0D50
+#define GL_RED_BITS                                      0x0D52
+#define GL_GREEN_BITS                                    0x0D53
+#define GL_BLUE_BITS                                     0x0D54
+#define GL_ALPHA_BITS                                    0x0D55
+#define GL_DEPTH_BITS                                    0x0D56
+#define GL_STENCIL_BITS                                  0x0D57
+#define GL_POLYGON_OFFSET_UNITS                          0x2A00
+/*      GL_POLYGON_OFFSET_FILL */
+#define GL_POLYGON_OFFSET_FACTOR                         0x8038
+#define GL_TEXTURE_BINDING_2D                            0x8069
+#define GL_SAMPLE_BUFFERS                                0x80A8
+#define GL_SAMPLES                                       0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE                         0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT                        0x80AB
+
+/* GetTextureParameter */
+/*      GL_TEXTURE_MAG_FILTER */
+/*      GL_TEXTURE_MIN_FILTER */
+/*      GL_TEXTURE_WRAP_S */
+/*      GL_TEXTURE_WRAP_T */
+
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS                0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS                    0x86A3
+
+/* HintMode */
+#define GL_DONT_CARE                                     0x1100
+#define GL_FASTEST                                       0x1101
+#define GL_NICEST                                        0x1102
+
+/* HintTarget */
+#define GL_GENERATE_MIPMAP_HINT                          0x8192
+
+/* DataType */
+#define GL_BYTE                                          0x1400
+#define GL_UNSIGNED_BYTE                                 0x1401
+#define GL_SHORT                                         0x1402
+#define GL_UNSIGNED_SHORT                                0x1403
+#define GL_INT                                           0x1404
+#define GL_UNSIGNED_INT                                  0x1405
+#define GL_FLOAT                                         0x1406
+#define GL_FIXED                                         0x140C
+
+/* PixelFormat */
+#define GL_DEPTH_COMPONENT                               0x1902
+#define GL_ALPHA                                         0x1906
+#define GL_RGB                                           0x1907
+#define GL_RGBA                                          0x1908
+#define GL_LUMINANCE                                     0x1909
+#define GL_LUMINANCE_ALPHA                               0x190A
+
+/* PixelType */
+/*      GL_UNSIGNED_BYTE */
+#define GL_UNSIGNED_SHORT_4_4_4_4                        0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1                        0x8034
+#define GL_UNSIGNED_SHORT_5_6_5                          0x8363
+
+/* Shaders */
+#define GL_FRAGMENT_SHADER                               0x8B30
+#define GL_VERTEX_SHADER                                 0x8B31
+#define GL_MAX_VERTEX_ATTRIBS                            0x8869
+#define GL_MAX_VERTEX_UNIFORM_VECTORS                    0x8DFB
+#define GL_MAX_VARYING_VECTORS                           0x8DFC
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS              0x8B4D
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS                0x8B4C
+#define GL_MAX_TEXTURE_IMAGE_UNITS                       0x8872
+#define GL_MAX_FRAGMENT_UNIFORM_VECTORS                  0x8DFD
+#define GL_SHADER_TYPE                                   0x8B4F
+#define GL_DELETE_STATUS                                 0x8B80
+#define GL_LINK_STATUS                                   0x8B82
+#define GL_VALIDATE_STATUS                               0x8B83
+#define GL_ATTACHED_SHADERS                              0x8B85
+#define GL_ACTIVE_UNIFORMS                               0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH                     0x8B87
+#define GL_ACTIVE_ATTRIBUTES                             0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH                   0x8B8A
+#define GL_SHADING_LANGUAGE_VERSION                      0x8B8C
+#define GL_CURRENT_PROGRAM                               0x8B8D
+
+/* StencilFunction */
+#define GL_NEVER                                         0x0200
+#define GL_LESS                                          0x0201
+#define GL_EQUAL                                         0x0202
+#define GL_LEQUAL                                        0x0203
+#define GL_GREATER                                       0x0204
+#define GL_NOTEQUAL                                      0x0205
+#define GL_GEQUAL                                        0x0206
+#define GL_ALWAYS                                        0x0207
+
+/* StencilOp */
+/*      GL_ZERO */
+#define GL_KEEP                                          0x1E00
+#define GL_REPLACE                                       0x1E01
+#define GL_INCR                                          0x1E02
+#define GL_DECR                                          0x1E03
+#define GL_INVERT                                        0x150A
+#define GL_INCR_WRAP                                     0x8507
+#define GL_DECR_WRAP                                     0x8508
+
+/* StringName */
+#define GL_VENDOR                                        0x1F00
+#define GL_RENDERER                                      0x1F01
+#define GL_VERSION                                       0x1F02
+#define GL_EXTENSIONS                                    0x1F03
+
+/* TextureMagFilter */
+#define GL_NEAREST                                       0x2600
+#define GL_LINEAR                                        0x2601
+
+/* TextureMinFilter */
+/*      GL_NEAREST */
+/*      GL_LINEAR */
+#define GL_NEAREST_MIPMAP_NEAREST                        0x2700
+#define GL_LINEAR_MIPMAP_NEAREST                         0x2701
+#define GL_NEAREST_MIPMAP_LINEAR                         0x2702
+#define GL_LINEAR_MIPMAP_LINEAR                          0x2703
+
+/* TextureParameterName */
+#define GL_TEXTURE_MAG_FILTER                            0x2800
+#define GL_TEXTURE_MIN_FILTER                            0x2801
+#define GL_TEXTURE_WRAP_S                                0x2802
+#define GL_TEXTURE_WRAP_T                                0x2803
+
+/* TextureTarget */
+/*      GL_TEXTURE_2D */
+#define GL_TEXTURE                                       0x1702
+
+#define GL_TEXTURE_CUBE_MAP                              0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP                      0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X                   0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X                   0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y                   0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y                   0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z                   0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z                   0x851A
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE                     0x851C
+
+/* TextureUnit */
+#define GL_TEXTURE0                                      0x84C0
+#define GL_TEXTURE1                                      0x84C1
+#define GL_TEXTURE2                                      0x84C2
+#define GL_TEXTURE3                                      0x84C3
+#define GL_TEXTURE4                                      0x84C4
+#define GL_TEXTURE5                                      0x84C5
+#define GL_TEXTURE6                                      0x84C6
+#define GL_TEXTURE7                                      0x84C7
+#define GL_TEXTURE8                                      0x84C8
+#define GL_TEXTURE9                                      0x84C9
+#define GL_TEXTURE10                                     0x84CA
+#define GL_TEXTURE11                                     0x84CB
+#define GL_TEXTURE12                                     0x84CC
+#define GL_TEXTURE13                                     0x84CD
+#define GL_TEXTURE14                                     0x84CE
+#define GL_TEXTURE15                                     0x84CF
+#define GL_TEXTURE16                                     0x84D0
+#define GL_TEXTURE17                                     0x84D1
+#define GL_TEXTURE18                                     0x84D2
+#define GL_TEXTURE19                                     0x84D3
+#define GL_TEXTURE20                                     0x84D4
+#define GL_TEXTURE21                                     0x84D5
+#define GL_TEXTURE22                                     0x84D6
+#define GL_TEXTURE23                                     0x84D7
+#define GL_TEXTURE24                                     0x84D8
+#define GL_TEXTURE25                                     0x84D9
+#define GL_TEXTURE26                                     0x84DA
+#define GL_TEXTURE27                                     0x84DB
+#define GL_TEXTURE28                                     0x84DC
+#define GL_TEXTURE29                                     0x84DD
+#define GL_TEXTURE30                                     0x84DE
+#define GL_TEXTURE31                                     0x84DF
+#define GL_ACTIVE_TEXTURE                                0x84E0
+
+/* TextureWrapMode */
+#define GL_REPEAT                                        0x2901
+#define GL_CLAMP_TO_EDGE                                 0x812F
+#define GL_MIRRORED_REPEAT                               0x8370
+
+/* Uniform Types */
+#define GL_FLOAT_VEC2                                    0x8B50
+#define GL_FLOAT_VEC3                                    0x8B51
+#define GL_FLOAT_VEC4                                    0x8B52
+#define GL_INT_VEC2                                      0x8B53
+#define GL_INT_VEC3                                      0x8B54
+#define GL_INT_VEC4                                      0x8B55
+#define GL_BOOL                                          0x8B56
+#define GL_BOOL_VEC2                                     0x8B57
+#define GL_BOOL_VEC3                                     0x8B58
+#define GL_BOOL_VEC4                                     0x8B59
+#define GL_FLOAT_MAT2                                    0x8B5A
+#define GL_FLOAT_MAT3                                    0x8B5B
+#define GL_FLOAT_MAT4                                    0x8B5C
+#define GL_SAMPLER_2D                                    0x8B5E
+#define GL_SAMPLER_CUBE                                  0x8B60
+
+/* Vertex Arrays */
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED                   0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE                      0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE                    0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE                      0x8625
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED                0x886A
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER                   0x8645
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING            0x889F
+
+/* Read Format */
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE                0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT              0x8B9B
+
+/* Shader Source */
+#define GL_COMPILE_STATUS                                0x8B81
+#define GL_INFO_LOG_LENGTH                               0x8B84
+#define GL_SHADER_SOURCE_LENGTH                          0x8B88
+#define GL_SHADER_COMPILER                               0x8DFA
+
+/* Shader Binary */
+#define GL_SHADER_BINARY_FORMATS                         0x8DF8
+#define GL_NUM_SHADER_BINARY_FORMATS                     0x8DF9
+
+/* Shader Precision-Specified Types */
+#define GL_LOW_FLOAT                                     0x8DF0
+#define GL_MEDIUM_FLOAT                                  0x8DF1
+#define GL_HIGH_FLOAT                                    0x8DF2
+#define GL_LOW_INT                                       0x8DF3
+#define GL_MEDIUM_INT                                    0x8DF4
+#define GL_HIGH_INT                                      0x8DF5
+
+/* Framebuffer Object. */
+#define GL_FRAMEBUFFER                                   0x8D40
+#define GL_RENDERBUFFER                                  0x8D41
+
+#define GL_RGBA4                                         0x8056
+#define GL_RGB5_A1                                       0x8057
+#define GL_RGB565                                        0x8D62
+#define GL_DEPTH_COMPONENT16                             0x81A5
+#define GL_STENCIL_INDEX8                                0x8D48
+
+#define GL_RENDERBUFFER_WIDTH                            0x8D42
+#define GL_RENDERBUFFER_HEIGHT                           0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT                  0x8D44
+#define GL_RENDERBUFFER_RED_SIZE                         0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE                       0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE                        0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE                       0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE                       0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE                     0x8D55
+
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE            0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME            0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL          0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE  0x8CD3
+
+#define GL_COLOR_ATTACHMENT0                             0x8CE0
+#define GL_DEPTH_ATTACHMENT                              0x8D00
+#define GL_STENCIL_ATTACHMENT                            0x8D20
+
+#define GL_NONE                                          0
+
+#define GL_FRAMEBUFFER_COMPLETE                          0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT             0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT     0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS             0x8CD9
+#define GL_FRAMEBUFFER_UNSUPPORTED                       0x8CDD
+
+#define GL_FRAMEBUFFER_BINDING                           0x8CA6
+#define GL_RENDERBUFFER_BINDING                          0x8CA7
+#define GL_MAX_RENDERBUFFER_SIZE                         0x84E8
+
+#define GL_INVALID_FRAMEBUFFER_OPERATION                 0x0506
+
+/* OpenGL ES 3.0 */
+
+#define GL_READ_BUFFER                                   0x0C02
+#define GL_UNPACK_ROW_LENGTH                             0x0CF2
+#define GL_UNPACK_SKIP_ROWS                              0x0CF3
+#define GL_UNPACK_SKIP_PIXELS                            0x0CF4
+#define GL_PACK_ROW_LENGTH                               0x0D02
+#define GL_PACK_SKIP_ROWS                                0x0D03
+#define GL_PACK_SKIP_PIXELS                              0x0D04
+#define GL_COLOR                                         0x1800
+#define GL_DEPTH                                         0x1801
+#define GL_STENCIL                                       0x1802
+#define GL_RED                                           0x1903
+#define GL_RGB8                                          0x8051
+#define GL_RGBA8                                         0x8058
+#define GL_RGB10_A2                                      0x8059
+#define GL_TEXTURE_BINDING_3D                            0x806A
+#define GL_UNPACK_SKIP_IMAGES                            0x806D
+#define GL_UNPACK_IMAGE_HEIGHT                           0x806E
+#define GL_TEXTURE_3D                                    0x806F
+#define GL_TEXTURE_WRAP_R                                0x8072
+#define GL_MAX_3D_TEXTURE_SIZE                           0x8073
+#define GL_UNSIGNED_INT_2_10_10_10_REV                   0x8368
+#define GL_MAX_ELEMENTS_VERTICES                         0x80E8
+#define GL_MAX_ELEMENTS_INDICES                          0x80E9
+#define GL_TEXTURE_MIN_LOD                               0x813A
+#define GL_TEXTURE_MAX_LOD                               0x813B
+#define GL_TEXTURE_BASE_LEVEL                            0x813C
+#define GL_TEXTURE_MAX_LEVEL                             0x813D
+#define GL_MIN                                           0x8007
+#define GL_MAX                                           0x8008
+#define GL_DEPTH_COMPONENT24                             0x81A6
+#define GL_MAX_TEXTURE_LOD_BIAS                          0x84FD
+#define GL_TEXTURE_COMPARE_MODE                          0x884C
+#define GL_TEXTURE_COMPARE_FUNC                          0x884D
+#define GL_CURRENT_QUERY                                 0x8865
+#define GL_QUERY_RESULT                                  0x8866
+#define GL_QUERY_RESULT_AVAILABLE                        0x8867
+#define GL_BUFFER_MAPPED                                 0x88BC
+#define GL_BUFFER_MAP_POINTER                            0x88BD
+#define GL_STREAM_READ                                   0x88E1
+#define GL_STREAM_COPY                                   0x88E2
+#define GL_STATIC_READ                                   0x88E5
+#define GL_STATIC_COPY                                   0x88E6
+#define GL_DYNAMIC_READ                                  0x88E9
+#define GL_DYNAMIC_COPY                                  0x88EA
+#define GL_MAX_DRAW_BUFFERS                              0x8824
+#define GL_DRAW_BUFFER0                                  0x8825
+#define GL_DRAW_BUFFER1                                  0x8826
+#define GL_DRAW_BUFFER2                                  0x8827
+#define GL_DRAW_BUFFER3                                  0x8828
+#define GL_DRAW_BUFFER4                                  0x8829
+#define GL_DRAW_BUFFER5                                  0x882A
+#define GL_DRAW_BUFFER6                                  0x882B
+#define GL_DRAW_BUFFER7                                  0x882C
+#define GL_DRAW_BUFFER8                                  0x882D
+#define GL_DRAW_BUFFER9                                  0x882E
+#define GL_DRAW_BUFFER10                                 0x882F
+#define GL_DRAW_BUFFER11                                 0x8830
+#define GL_DRAW_BUFFER12                                 0x8831
+#define GL_DRAW_BUFFER13                                 0x8832
+#define GL_DRAW_BUFFER14                                 0x8833
+#define GL_DRAW_BUFFER15                                 0x8834
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS               0x8B49
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS                 0x8B4A
+#define GL_SAMPLER_3D                                    0x8B5F
+#define GL_SAMPLER_2D_SHADOW                             0x8B62
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT               0x8B8B
+#define GL_PIXEL_PACK_BUFFER                             0x88EB
+#define GL_PIXEL_UNPACK_BUFFER                           0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING                     0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING                   0x88EF
+#define GL_FLOAT_MAT2x3                                  0x8B65
+#define GL_FLOAT_MAT2x4                                  0x8B66
+#define GL_FLOAT_MAT3x2                                  0x8B67
+#define GL_FLOAT_MAT3x4                                  0x8B68
+#define GL_FLOAT_MAT4x2                                  0x8B69
+#define GL_FLOAT_MAT4x3                                  0x8B6A
+#define GL_SRGB                                          0x8C40
+#define GL_SRGB8                                         0x8C41
+#define GL_SRGB8_ALPHA8                                  0x8C43
+#define GL_COMPARE_REF_TO_TEXTURE                        0x884E
+#define GL_MAJOR_VERSION                                 0x821B
+#define GL_MINOR_VERSION                                 0x821C
+#define GL_NUM_EXTENSIONS                                0x821D
+#define GL_RGBA32F                                       0x8814
+#define GL_RGB32F                                        0x8815
+#define GL_RGBA16F                                       0x881A
+#define GL_RGB16F                                        0x881B
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER                   0x88FD
+#define GL_MAX_ARRAY_TEXTURE_LAYERS                      0x88FF
+#define GL_MIN_PROGRAM_TEXEL_OFFSET                      0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET                      0x8905
+#define GL_MAX_VARYING_COMPONENTS                        0x8B4B
+#define GL_TEXTURE_2D_ARRAY                              0x8C1A
+#define GL_TEXTURE_BINDING_2D_ARRAY                      0x8C1D
+#define GL_R11F_G11F_B10F                                0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV                  0x8C3B
+#define GL_RGB9_E5                                       0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV                      0x8C3E
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH         0x8C76
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE                0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS    0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS                   0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START               0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE                0x8C85
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN         0x8C88
+#define GL_RASTERIZER_DISCARD                            0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS       0x8C8B
+#define GL_INTERLEAVED_ATTRIBS                           0x8C8C
+#define GL_SEPARATE_ATTRIBS                              0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER                     0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING             0x8C8F
+#define GL_RGBA32UI                                      0x8D70
+#define GL_RGB32UI                                       0x8D71
+#define GL_RGBA16UI                                      0x8D76
+#define GL_RGB16UI                                       0x8D77
+#define GL_RGBA8UI                                       0x8D7C
+#define GL_RGB8UI                                        0x8D7D
+#define GL_RGBA32I                                       0x8D82
+#define GL_RGB32I                                        0x8D83
+#define GL_RGBA16I                                       0x8D88
+#define GL_RGB16I                                        0x8D89
+#define GL_RGBA8I                                        0x8D8E
+#define GL_RGB8I                                         0x8D8F
+#define GL_RED_INTEGER                                   0x8D94
+#define GL_RGB_INTEGER                                   0x8D98
+#define GL_RGBA_INTEGER                                  0x8D99
+#define GL_SAMPLER_2D_ARRAY                              0x8DC1
+#define GL_SAMPLER_2D_ARRAY_SHADOW                       0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW                           0x8DC5
+#define GL_UNSIGNED_INT_VEC2                             0x8DC6
+#define GL_UNSIGNED_INT_VEC3                             0x8DC7
+#define GL_UNSIGNED_INT_VEC4                             0x8DC8
+#define GL_INT_SAMPLER_2D                                0x8DCA
+#define GL_INT_SAMPLER_3D                                0x8DCB
+#define GL_INT_SAMPLER_CUBE                              0x8DCC
+#define GL_INT_SAMPLER_2D_ARRAY                          0x8DCF
+#define GL_UNSIGNED_INT_SAMPLER_2D                       0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D                       0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE                     0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY                 0x8DD7
+#define GL_BUFFER_ACCESS_FLAGS                           0x911F
+#define GL_BUFFER_MAP_LENGTH                             0x9120
+#define GL_BUFFER_MAP_OFFSET                             0x9121
+#define GL_DEPTH_COMPONENT32F                            0x8CAC
+#define GL_DEPTH32F_STENCIL8                             0x8CAD
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV                0x8DAD
+#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING         0x8210
+#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE         0x8211
+#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE               0x8212
+#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE             0x8213
+#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE              0x8214
+#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE             0x8215
+#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE             0x8216
+#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE           0x8217
+#define GL_FRAMEBUFFER_DEFAULT                           0x8218
+#define GL_FRAMEBUFFER_UNDEFINED                         0x8219
+#define GL_DEPTH_STENCIL_ATTACHMENT                      0x821A
+#define GL_DEPTH_STENCIL                                 0x84F9
+#define GL_UNSIGNED_INT_24_8                             0x84FA
+#define GL_DEPTH24_STENCIL8                              0x88F0
+#define GL_UNSIGNED_NORMALIZED                           0x8C17
+#define GL_DRAW_FRAMEBUFFER_BINDING                      GL_FRAMEBUFFER_BINDING
+#define GL_READ_FRAMEBUFFER                              0x8CA8
+#define GL_DRAW_FRAMEBUFFER                              0x8CA9
+#define GL_READ_FRAMEBUFFER_BINDING                      0x8CAA
+#define GL_RENDERBUFFER_SAMPLES                          0x8CAB
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER          0x8CD4
+#define GL_MAX_COLOR_ATTACHMENTS                         0x8CDF
+#define GL_COLOR_ATTACHMENT1                             0x8CE1
+#define GL_COLOR_ATTACHMENT2                             0x8CE2
+#define GL_COLOR_ATTACHMENT3                             0x8CE3
+#define GL_COLOR_ATTACHMENT4                             0x8CE4
+#define GL_COLOR_ATTACHMENT5                             0x8CE5
+#define GL_COLOR_ATTACHMENT6                             0x8CE6
+#define GL_COLOR_ATTACHMENT7                             0x8CE7
+#define GL_COLOR_ATTACHMENT8                             0x8CE8
+#define GL_COLOR_ATTACHMENT9                             0x8CE9
+#define GL_COLOR_ATTACHMENT10                            0x8CEA
+#define GL_COLOR_ATTACHMENT11                            0x8CEB
+#define GL_COLOR_ATTACHMENT12                            0x8CEC
+#define GL_COLOR_ATTACHMENT13                            0x8CED
+#define GL_COLOR_ATTACHMENT14                            0x8CEE
+#define GL_COLOR_ATTACHMENT15                            0x8CEF
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE            0x8D56
+#define GL_MAX_SAMPLES                                   0x8D57
+#define GL_HALF_FLOAT                                    0x140B
+#define GL_MAP_READ_BIT                                  0x0001
+#define GL_MAP_WRITE_BIT                                 0x0002
+#define GL_MAP_INVALIDATE_RANGE_BIT                      0x0004
+#define GL_MAP_INVALIDATE_BUFFER_BIT                     0x0008
+#define GL_MAP_FLUSH_EXPLICIT_BIT                        0x0010
+#define GL_MAP_UNSYNCHRONIZED_BIT                        0x0020
+#define GL_RG                                            0x8227
+#define GL_RG_INTEGER                                    0x8228
+#define GL_R8                                            0x8229
+#define GL_RG8                                           0x822B
+#define GL_R16F                                          0x822D
+#define GL_R32F                                          0x822E
+#define GL_RG16F                                         0x822F
+#define GL_RG32F                                         0x8230
+#define GL_R8I                                           0x8231
+#define GL_R8UI                                          0x8232
+#define GL_R16I                                          0x8233
+#define GL_R16UI                                         0x8234
+#define GL_R32I                                          0x8235
+#define GL_R32UI                                         0x8236
+#define GL_RG8I                                          0x8237
+#define GL_RG8UI                                         0x8238
+#define GL_RG16I                                         0x8239
+#define GL_RG16UI                                        0x823A
+#define GL_RG32I                                         0x823B
+#define GL_RG32UI                                        0x823C
+#define GL_VERTEX_ARRAY_BINDING                          0x85B5
+#define GL_R8_SNORM                                      0x8F94
+#define GL_RG8_SNORM                                     0x8F95
+#define GL_RGB8_SNORM                                    0x8F96
+#define GL_RGBA8_SNORM                                   0x8F97
+#define GL_SIGNED_NORMALIZED                             0x8F9C
+#define GL_PRIMITIVE_RESTART_FIXED_INDEX                 0x8D69
+#define GL_COPY_READ_BUFFER                              0x8F36
+#define GL_COPY_WRITE_BUFFER                             0x8F37
+#define GL_COPY_READ_BUFFER_BINDING                      GL_COPY_READ_BUFFER
+#define GL_COPY_WRITE_BUFFER_BINDING                     GL_COPY_WRITE_BUFFER
+#define GL_UNIFORM_BUFFER                                0x8A11
+#define GL_UNIFORM_BUFFER_BINDING                        0x8A28
+#define GL_UNIFORM_BUFFER_START                          0x8A29
+#define GL_UNIFORM_BUFFER_SIZE                           0x8A2A
+#define GL_MAX_VERTEX_UNIFORM_BLOCKS                     0x8A2B
+#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS                   0x8A2D
+#define GL_MAX_COMBINED_UNIFORM_BLOCKS                   0x8A2E
+#define GL_MAX_UNIFORM_BUFFER_BINDINGS                   0x8A2F
+#define GL_MAX_UNIFORM_BLOCK_SIZE                        0x8A30
+#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS        0x8A31
+#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS      0x8A33
+#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT               0x8A34
+#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH          0x8A35
+#define GL_ACTIVE_UNIFORM_BLOCKS                         0x8A36
+#define GL_UNIFORM_TYPE                                  0x8A37
+#define GL_UNIFORM_SIZE                                  0x8A38
+#define GL_UNIFORM_NAME_LENGTH                           0x8A39
+#define GL_UNIFORM_BLOCK_INDEX                           0x8A3A
+#define GL_UNIFORM_OFFSET                                0x8A3B
+#define GL_UNIFORM_ARRAY_STRIDE                          0x8A3C
+#define GL_UNIFORM_MATRIX_STRIDE                         0x8A3D
+#define GL_UNIFORM_IS_ROW_MAJOR                          0x8A3E
+#define GL_UNIFORM_BLOCK_BINDING                         0x8A3F
+#define GL_UNIFORM_BLOCK_DATA_SIZE                       0x8A40
+#define GL_UNIFORM_BLOCK_NAME_LENGTH                     0x8A41
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS                 0x8A42
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES          0x8A43
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER     0x8A44
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER   0x8A46
+#define GL_INVALID_INDEX                                 0xFFFFFFFFu
+#define GL_MAX_VERTEX_OUTPUT_COMPONENTS                  0x9122
+#define GL_MAX_FRAGMENT_INPUT_COMPONENTS                 0x9125
+#define GL_MAX_SERVER_WAIT_TIMEOUT                       0x9111
+#define GL_OBJECT_TYPE                                   0x9112
+#define GL_SYNC_CONDITION                                0x9113
+#define GL_SYNC_STATUS                                   0x9114
+#define GL_SYNC_FLAGS                                    0x9115
+#define GL_SYNC_FENCE                                    0x9116
+#define GL_SYNC_GPU_COMMANDS_COMPLETE                    0x9117
+#define GL_UNSIGNALED                                    0x9118
+#define GL_SIGNALED                                      0x9119
+#define GL_ALREADY_SIGNALED                              0x911A
+#define GL_TIMEOUT_EXPIRED                               0x911B
+#define GL_CONDITION_SATISFIED                           0x911C
+#define GL_WAIT_FAILED                                   0x911D
+#define GL_SYNC_FLUSH_COMMANDS_BIT                       0x00000001
+#define GL_TIMEOUT_IGNORED                               0xFFFFFFFFFFFFFFFFull
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR                   0x88FE
+#define GL_ANY_SAMPLES_PASSED                            0x8C2F
+#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE               0x8D6A
+#define GL_SAMPLER_BINDING                               0x8919
+#define GL_RGB10_A2UI                                    0x906F
+#define GL_TEXTURE_SWIZZLE_R                             0x8E42
+#define GL_TEXTURE_SWIZZLE_G                             0x8E43
+#define GL_TEXTURE_SWIZZLE_B                             0x8E44
+#define GL_TEXTURE_SWIZZLE_A                             0x8E45
+#define GL_GREEN                                         0x1904
+#define GL_BLUE                                          0x1905
+#define GL_INT_2_10_10_10_REV                            0x8D9F
+#define GL_TRANSFORM_FEEDBACK                            0x8E22
+#define GL_TRANSFORM_FEEDBACK_PAUSED                     0x8E23
+#define GL_TRANSFORM_FEEDBACK_ACTIVE                     0x8E24
+#define GL_TRANSFORM_FEEDBACK_BINDING                    0x8E25
+#define GL_PROGRAM_BINARY_RETRIEVABLE_HINT               0x8257
+#define GL_PROGRAM_BINARY_LENGTH                         0x8741
+#define GL_NUM_PROGRAM_BINARY_FORMATS                    0x87FE
+#define GL_PROGRAM_BINARY_FORMATS                        0x87FF
+#define GL_COMPRESSED_R11_EAC                            0x9270
+#define GL_COMPRESSED_SIGNED_R11_EAC                     0x9271
+#define GL_COMPRESSED_RG11_EAC                           0x9272
+#define GL_COMPRESSED_SIGNED_RG11_EAC                    0x9273
+#define GL_COMPRESSED_RGB8_ETC2                          0x9274
+#define GL_COMPRESSED_SRGB8_ETC2                         0x9275
+#define GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2      0x9276
+#define GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2     0x9277
+#define GL_COMPRESSED_RGBA8_ETC2_EAC                     0x9278
+#define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC              0x9279
+#define GL_TEXTURE_IMMUTABLE_FORMAT                      0x912F
+#define GL_MAX_ELEMENT_INDEX                             0x8D6B
+#define GL_NUM_SAMPLE_COUNTS                             0x9380
+#define GL_TEXTURE_IMMUTABLE_LEVELS                      0x82DF
+
+/*-------------------------------------------------------------------------
+ * Entrypoint definitions
+ *-----------------------------------------------------------------------*/
+
+/* OpenGL ES 2.0 */
+
+GL_APICALL void           GL_APIENTRY glActiveTexture (GLenum texture);
+GL_APICALL void           GL_APIENTRY glAttachShader (GLuint program, GLuint shader);
+GL_APICALL void           GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar* name);
+GL_APICALL void           GL_APIENTRY glBindBuffer (GLenum target, GLuint buffer);
+GL_APICALL void           GL_APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer);
+GL_APICALL void           GL_APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer);
+GL_APICALL void           GL_APIENTRY glBindTexture (GLenum target, GLuint texture);
+GL_APICALL void           GL_APIENTRY glBlendColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+GL_APICALL void           GL_APIENTRY glBlendEquation (GLenum mode);
+GL_APICALL void           GL_APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha);
+GL_APICALL void           GL_APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
+GL_APICALL void           GL_APIENTRY glBlendFuncSeparate (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+GL_APICALL void           GL_APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage);
+GL_APICALL void           GL_APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data);
+GL_APICALL GLenum         GL_APIENTRY glCheckFramebufferStatus (GLenum target);
+GL_APICALL void           GL_APIENTRY glClear (GLbitfield mask);
+GL_APICALL void           GL_APIENTRY glClearColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+GL_APICALL void           GL_APIENTRY glClearDepthf (GLfloat depth);
+GL_APICALL void           GL_APIENTRY glClearStencil (GLint s);
+GL_APICALL void           GL_APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+GL_APICALL void           GL_APIENTRY glCompileShader (GLuint shader);
+GL_APICALL void           GL_APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid* data);
+GL_APICALL void           GL_APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid* data);
+GL_APICALL void           GL_APIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GL_APICALL void           GL_APIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GL_APICALL GLuint         GL_APIENTRY glCreateProgram (void);
+GL_APICALL GLuint         GL_APIENTRY glCreateShader (GLenum type);
+GL_APICALL void           GL_APIENTRY glCullFace (GLenum mode);
+GL_APICALL void           GL_APIENTRY glDeleteBuffers (GLsizei n, const GLuint* buffers);
+GL_APICALL void           GL_APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint* framebuffers);
+GL_APICALL void           GL_APIENTRY glDeleteProgram (GLuint program);
+GL_APICALL void           GL_APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint* renderbuffers);
+GL_APICALL void           GL_APIENTRY glDeleteShader (GLuint shader);
+GL_APICALL void           GL_APIENTRY glDeleteTextures (GLsizei n, const GLuint* textures);
+GL_APICALL void           GL_APIENTRY glDepthFunc (GLenum func);
+GL_APICALL void           GL_APIENTRY glDepthMask (GLboolean flag);
+GL_APICALL void           GL_APIENTRY glDepthRangef (GLfloat n, GLfloat f);
+GL_APICALL void           GL_APIENTRY glDetachShader (GLuint program, GLuint shader);
+GL_APICALL void           GL_APIENTRY glDisable (GLenum cap);
+GL_APICALL void           GL_APIENTRY glDisableVertexAttribArray (GLuint index);
+GL_APICALL void           GL_APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
+GL_APICALL void           GL_APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid* indices);
+GL_APICALL void           GL_APIENTRY glEnable (GLenum cap);
+GL_APICALL void           GL_APIENTRY glEnableVertexAttribArray (GLuint index);
+GL_APICALL void           GL_APIENTRY glFinish (void);
+GL_APICALL void           GL_APIENTRY glFlush (void);
+GL_APICALL void           GL_APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GL_APICALL void           GL_APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GL_APICALL void           GL_APIENTRY glFrontFace (GLenum mode);
+GL_APICALL void           GL_APIENTRY glGenBuffers (GLsizei n, GLuint* buffers);
+GL_APICALL void           GL_APIENTRY glGenerateMipmap (GLenum target);
+GL_APICALL void           GL_APIENTRY glGenFramebuffers (GLsizei n, GLuint* framebuffers);
+GL_APICALL void           GL_APIENTRY glGenRenderbuffers (GLsizei n, GLuint* renderbuffers);
+GL_APICALL void           GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures);
+GL_APICALL void           GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
+GL_APICALL void           GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
+GL_APICALL void           GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
+GL_APICALL GLint          GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
+GL_APICALL void           GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params);
+GL_APICALL void           GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params);
+GL_APICALL GLenum         GL_APIENTRY glGetError (void);
+GL_APICALL void           GL_APIENTRY glGetFloatv (GLenum pname, GLfloat* params);
+GL_APICALL void           GL_APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint* params);
+GL_APICALL void           GL_APIENTRY glGetIntegerv (GLenum pname, GLint* params);
+GL_APICALL void           GL_APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint* params);
+GL_APICALL void           GL_APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufsize, GLsizei* length, GLchar* infolog);
+GL_APICALL void           GL_APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint* params);
+GL_APICALL void           GL_APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint* params);
+GL_APICALL void           GL_APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* infolog);
+GL_APICALL void           GL_APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision);
+GL_APICALL void           GL_APIENTRY glGetShaderSource (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* source);
+GL_APICALL const GLubyte* GL_APIENTRY glGetString (GLenum name);
+GL_APICALL void           GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat* params);
+GL_APICALL void           GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params);
+GL_APICALL void           GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params);
+GL_APICALL void           GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params);
+GL_APICALL GLint          GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
+GL_APICALL void           GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params);
+GL_APICALL void           GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params);
+GL_APICALL void           GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer);
+GL_APICALL void           GL_APIENTRY glHint (GLenum target, GLenum mode);
+GL_APICALL GLboolean      GL_APIENTRY glIsBuffer (GLuint buffer);
+GL_APICALL GLboolean      GL_APIENTRY glIsEnabled (GLenum cap);
+GL_APICALL GLboolean      GL_APIENTRY glIsFramebuffer (GLuint framebuffer);
+GL_APICALL GLboolean      GL_APIENTRY glIsProgram (GLuint program);
+GL_APICALL GLboolean      GL_APIENTRY glIsRenderbuffer (GLuint renderbuffer);
+GL_APICALL GLboolean      GL_APIENTRY glIsShader (GLuint shader);
+GL_APICALL GLboolean      GL_APIENTRY glIsTexture (GLuint texture);
+GL_APICALL void           GL_APIENTRY glLineWidth (GLfloat width);
+GL_APICALL void           GL_APIENTRY glLinkProgram (GLuint program);
+GL_APICALL void           GL_APIENTRY glPixelStorei (GLenum pname, GLint param);
+GL_APICALL void           GL_APIENTRY glPolygonOffset (GLfloat factor, GLfloat units);
+GL_APICALL void           GL_APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels);
+GL_APICALL void           GL_APIENTRY glReleaseShaderCompiler (void);
+GL_APICALL void           GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+GL_APICALL void           GL_APIENTRY glSampleCoverage (GLfloat value, GLboolean invert);
+GL_APICALL void           GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
+GL_APICALL void           GL_APIENTRY glShaderBinary (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length);
+GL_APICALL void           GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
+GL_APICALL void           GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
+GL_APICALL void           GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
+GL_APICALL void           GL_APIENTRY glStencilMask (GLuint mask);
+GL_APICALL void           GL_APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
+GL_APICALL void           GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
+GL_APICALL void           GL_APIENTRY glStencilOpSeparate (GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
+GL_APICALL void           GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
+GL_APICALL void           GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
+GL_APICALL void           GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat* params);
+GL_APICALL void           GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
+GL_APICALL void           GL_APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint* params);
+GL_APICALL void           GL_APIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid* pixels);
+GL_APICALL void           GL_APIENTRY glUniform1f (GLint location, GLfloat x);
+GL_APICALL void           GL_APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat* v);
+GL_APICALL void           GL_APIENTRY glUniform1i (GLint location, GLint x);
+GL_APICALL void           GL_APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint* v);
+GL_APICALL void           GL_APIENTRY glUniform2f (GLint location, GLfloat x, GLfloat y);
+GL_APICALL void           GL_APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat* v);
+GL_APICALL void           GL_APIENTRY glUniform2i (GLint location, GLint x, GLint y);
+GL_APICALL void           GL_APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint* v);
+GL_APICALL void           GL_APIENTRY glUniform3f (GLint location, GLfloat x, GLfloat y, GLfloat z);
+GL_APICALL void           GL_APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat* v);
+GL_APICALL void           GL_APIENTRY glUniform3i (GLint location, GLint x, GLint y, GLint z);
+GL_APICALL void           GL_APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint* v);
+GL_APICALL void           GL_APIENTRY glUniform4f (GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GL_APICALL void           GL_APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat* v);
+GL_APICALL void           GL_APIENTRY glUniform4i (GLint location, GLint x, GLint y, GLint z, GLint w);
+GL_APICALL void           GL_APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint* v);
+GL_APICALL void           GL_APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+GL_APICALL void           GL_APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+GL_APICALL void           GL_APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+GL_APICALL void           GL_APIENTRY glUseProgram (GLuint program);
+GL_APICALL void           GL_APIENTRY glValidateProgram (GLuint program);
+GL_APICALL void           GL_APIENTRY glVertexAttrib1f (GLuint indx, GLfloat x);
+GL_APICALL void           GL_APIENTRY glVertexAttrib1fv (GLuint indx, const GLfloat* values);
+GL_APICALL void           GL_APIENTRY glVertexAttrib2f (GLuint indx, GLfloat x, GLfloat y);
+GL_APICALL void           GL_APIENTRY glVertexAttrib2fv (GLuint indx, const GLfloat* values);
+GL_APICALL void           GL_APIENTRY glVertexAttrib3f (GLuint indx, GLfloat x, GLfloat y, GLfloat z);
+GL_APICALL void           GL_APIENTRY glVertexAttrib3fv (GLuint indx, const GLfloat* values);
+GL_APICALL void           GL_APIENTRY glVertexAttrib4f (GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GL_APICALL void           GL_APIENTRY glVertexAttrib4fv (GLuint indx, const GLfloat* values);
+GL_APICALL void           GL_APIENTRY glVertexAttribPointer (GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr);
+GL_APICALL void           GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
+
+/* OpenGL ES 3.0 */
+
+GL_APICALL void           GL_APIENTRY glReadBuffer (GLenum mode);
+GL_APICALL void           GL_APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid* indices);
+GL_APICALL void           GL_APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
+GL_APICALL void           GL_APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels);
+GL_APICALL void           GL_APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GL_APICALL void           GL_APIENTRY glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data);
+GL_APICALL void           GL_APIENTRY glCompressedTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data);
+GL_APICALL GLboolean      GL_APIENTRY glIsQuery (GLuint id);
+GL_APICALL void           GL_APIENTRY glGetQueryiv (GLenum target, GLenum pname, GLint* params);
+GL_APICALL void           GL_APIENTRY glGetBufferPointerv (GLenum target, GLenum pname, GLvoid** params);
+GL_APICALL void           GL_APIENTRY glDrawBuffers (GLsizei n, const GLenum* bufs);
+GL_APICALL void           GL_APIENTRY glUniformMatrix2x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+GL_APICALL void           GL_APIENTRY glUniformMatrix3x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+GL_APICALL void           GL_APIENTRY glUniformMatrix2x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+GL_APICALL void           GL_APIENTRY glUniformMatrix4x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+GL_APICALL void           GL_APIENTRY glUniformMatrix3x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+GL_APICALL void           GL_APIENTRY glUniformMatrix4x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+GL_APICALL void           GL_APIENTRY glRenderbufferStorageMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+GL_APICALL void           GL_APIENTRY glFramebufferTextureLayer (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GL_APICALL void           GL_APIENTRY glFlushMappedBufferRange (GLenum target, GLintptr offset, GLsizeiptr length);
+GL_APICALL GLboolean      GL_APIENTRY glIsVertexArray (GLuint array);
+GL_APICALL void           GL_APIENTRY glGetIntegeri_v (GLenum target, GLuint index, GLint* data);
+GL_APICALL void           GL_APIENTRY glBeginTransformFeedback (GLenum primitiveMode);
+GL_APICALL void           GL_APIENTRY glEndTransformFeedback (void);
+GL_APICALL void           GL_APIENTRY glBindBufferBase (GLenum target, GLuint index, GLuint buffer);
+GL_APICALL void           GL_APIENTRY glTransformFeedbackVaryings (GLuint program, GLsizei count, const GLchar* const* varyings, GLenum bufferMode);
+GL_APICALL void           GL_APIENTRY glGetTransformFeedbackVarying (GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, GLchar* name);
+GL_APICALL void           GL_APIENTRY glVertexAttribIPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid* pointer);
+GL_APICALL void           GL_APIENTRY glGetVertexAttribIiv (GLuint index, GLenum pname, GLint* params);
+GL_APICALL void           GL_APIENTRY glGetVertexAttribIuiv (GLuint index, GLenum pname, GLuint* params);
+GL_APICALL void           GL_APIENTRY glVertexAttribI4i (GLuint index, GLint x, GLint y, GLint z, GLint w);
+GL_APICALL void           GL_APIENTRY glVertexAttribI4ui (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GL_APICALL void           GL_APIENTRY glVertexAttribI4iv (GLuint index, const GLint* v);
+GL_APICALL void           GL_APIENTRY glVertexAttribI4uiv (GLuint index, const GLuint* v);
+GL_APICALL void           GL_APIENTRY glGetUniformuiv (GLuint program, GLint location, GLuint* params);
+GL_APICALL GLint          GL_APIENTRY glGetFragDataLocation (GLuint program, const GLchar *name);
+GL_APICALL void           GL_APIENTRY glUniform1ui (GLint location, GLuint v0);
+GL_APICALL void           GL_APIENTRY glUniform2ui (GLint location, GLuint v0, GLuint v1);
+GL_APICALL void           GL_APIENTRY glUniform3ui (GLint location, GLuint v0, GLuint v1, GLuint v2);
+GL_APICALL void           GL_APIENTRY glUniform4ui (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GL_APICALL void           GL_APIENTRY glUniform1uiv (GLint location, GLsizei count, const GLuint* value);
+GL_APICALL void           GL_APIENTRY glUniform2uiv (GLint location, GLsizei count, const GLuint* value);
+GL_APICALL void           GL_APIENTRY glUniform3uiv (GLint location, GLsizei count, const GLuint* value);
+GL_APICALL void           GL_APIENTRY glUniform4uiv (GLint location, GLsizei count, const GLuint* value);
+GL_APICALL void           GL_APIENTRY glClearBufferiv (GLenum buffer, GLint drawbuffer, const GLint* value);
+GL_APICALL void           GL_APIENTRY glClearBufferuiv (GLenum buffer, GLint drawbuffer, const GLuint* value);
+GL_APICALL void           GL_APIENTRY glClearBufferfv (GLenum buffer, GLint drawbuffer, const GLfloat* value);
+GL_APICALL void           GL_APIENTRY glClearBufferfi (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+GL_APICALL const GLubyte* GL_APIENTRY glGetStringi (GLenum name, GLuint index);
+GL_APICALL void           GL_APIENTRY glCopyBufferSubData (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+GL_APICALL void           GL_APIENTRY glGetUniformIndices (GLuint program, GLsizei uniformCount, const GLchar* const* uniformNames, GLuint* uniformIndices);
+GL_APICALL void           GL_APIENTRY glGetActiveUniformsiv (GLuint program, GLsizei uniformCount, const GLuint* uniformIndices, GLenum pname, GLint* params);
+GL_APICALL void           GL_APIENTRY glGetActiveUniformBlockiv (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint* params);
+GL_APICALL void           GL_APIENTRY glGetActiveUniformBlockName (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformBlockName);
+GL_APICALL void           GL_APIENTRY glDrawArraysInstanced (GLenum mode, GLint first, GLsizei count, GLsizei instanceCount);
+GL_APICALL void           GL_APIENTRY glDrawElementsInstanced (GLenum mode, GLsizei count, GLenum type, const GLvoid* indices, GLsizei instanceCount);
+GL_APICALL GLboolean      GL_APIENTRY glIsSync (GLsync sync);
+GL_APICALL void           GL_APIENTRY glWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
+GL_APICALL void           GL_APIENTRY glGetInteger64v (GLenum pname, GLint64* params);
+GL_APICALL void           GL_APIENTRY glGetSynciv (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values);
+GL_APICALL void           GL_APIENTRY glGetInteger64i_v (GLenum target, GLuint index, GLint64* data);
+GL_APICALL void           GL_APIENTRY glGetBufferParameteri64v (GLenum target, GLenum pname, GLint64* params);
+GL_APICALL GLboolean      GL_APIENTRY glIsSampler (GLuint sampler);
+GL_APICALL void           GL_APIENTRY glSamplerParameteriv (GLuint sampler, GLenum pname, const GLint* param);
+GL_APICALL void           GL_APIENTRY glGetSamplerParameteriv (GLuint sampler, GLenum pname, GLint* params);
+GL_APICALL void           GL_APIENTRY glGetSamplerParameterfv (GLuint sampler, GLenum pname, GLfloat* params);
+GL_APICALL void           GL_APIENTRY glVertexAttribDivisor (GLuint index, GLuint divisor);
+GL_APICALL void           GL_APIENTRY glBindTransformFeedback (GLenum target, GLuint id);
+GL_APICALL void           GL_APIENTRY glDeleteTransformFeedbacks (GLsizei n, const GLuint* ids);
+GL_APICALL void           GL_APIENTRY glGenTransformFeedbacks (GLsizei n, GLuint* ids);
+GL_APICALL GLboolean      GL_APIENTRY glIsTransformFeedback (GLuint id);
+GL_APICALL void           GL_APIENTRY glPauseTransformFeedback (void);
+GL_APICALL void           GL_APIENTRY glResumeTransformFeedback (void);
+GL_APICALL void           GL_APIENTRY glInvalidateFramebuffer (GLenum target, GLsizei numAttachments, const GLenum* attachments);
+GL_APICALL void           GL_APIENTRY glInvalidateSubFramebuffer (GLenum target, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height);
+GL_APICALL void           GL_APIENTRY glTexStorage2D (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+GL_APICALL void           GL_APIENTRY glTexStorage3D (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+GL_APICALL void           GL_APIENTRY glGetInternalformativ (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint* params);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Externals/GLES3/GLES3/gl3ext.h b/Externals/GLES3/GLES3/gl3ext.h
new file mode 100644
index 0000000000..4d4ea96c4d
--- /dev/null
+++ b/Externals/GLES3/GLES3/gl3ext.h
@@ -0,0 +1,24 @@
+#ifndef __gl3ext_h_
+#define __gl3ext_h_
+
+/* $Revision: 17809 $ on $Date:: 2012-05-14 08:03:36 -0700 #$ */
+
+/*
+ * This document is licensed under the SGI Free Software B License Version
+ * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
+ */
+
+/* OpenGL ES 3 Extensions
+ *
+ * After an OES extension's interactions with OpenGl ES 3.0 have been documented,
+ * its tokens and function definitions should be added to this file in a manner
+ * that does not conflict with gl2ext.h or gl3.h.
+ *
+ * Tokens and function definitions for extensions that have become standard
+ * features in OpenGL ES 3.0 will not be added to this file.
+ *
+ * Applications using OpenGL-ES-2-only extensions should include gl2ext.h
+ */
+
+#endif /* __gl3ext_h_ */
+
diff --git a/Externals/GLES3/GLES3/gl3platform.h b/Externals/GLES3/GLES3/gl3platform.h
new file mode 100644
index 0000000000..1bd1a850fa
--- /dev/null
+++ b/Externals/GLES3/GLES3/gl3platform.h
@@ -0,0 +1,30 @@
+#ifndef __gl3platform_h_
+#define __gl3platform_h_
+
+/* $Revision: 18437 $ on $Date:: 2012-07-08 23:31:39 -0700 #$ */
+
+/*
+ * This document is licensed under the SGI Free Software B License Version
+ * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
+ */
+
+/* Platform-specific types and definitions for OpenGL ES 3.X  gl3.h
+ *
+ * Adopters may modify khrplatform.h and this file to suit their platform.
+ * You are encouraged to submit all modifications to the Khronos group so that
+ * they can be included in future versions of this file.  Please submit changes
+ * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
+ * by filing a bug against product "OpenGL-ES" component "Registry".
+ */
+
+#include <KHR/khrplatform.h>
+
+#ifndef GL_APICALL
+#define GL_APICALL  KHRONOS_APICALL
+#endif
+
+#ifndef GL_APIENTRY
+#define GL_APIENTRY KHRONOS_APIENTRY
+#endif
+
+#endif /* __gl3platform_h_ */
diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index 125bb474eb..a265840ea2 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.dolphinemu.dolphinemu"
-    android:versionCode="9"
-    android:versionName="0.9" >
+    android:versionCode="10"
+    android:versionName="0.10" >
 
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14"/>
     

From c86480d08288a7fc3299b3de08d14c6aa13ccf58 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Sun, 14 Jul 2013 16:31:47 -0500
Subject: [PATCH 283/352] [Android] Fix a null pointer exception.

---
 .../src/org/dolphinemu/dolphinemu/InputConfigActivity.java      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java
index 607af71766..0057901eec 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java
@@ -29,6 +29,8 @@ public class InputConfigActivity extends ListActivity {
 
 	static public String getInputDesc(InputDevice input)
 	{
+		if (input == null)
+			return "null"; // Happens when the inputdevice is from an unknown source
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
 			return input.getDescriptor();
 		else

From 4e8c3b2f1277ed5e3e9640b29dd7e3f5da7af2a6 Mon Sep 17 00:00:00 2001
From: lioncash <mathew1900@hotmail.com>
Date: Mon, 15 Jul 2013 09:16:20 -0400
Subject: [PATCH 284/352] [Android] Make FolderBrowser.Fill look slightly
 nicer. Improve readability a bit.

- Added a basic function description.

- Modified the main parameter to be more informative of what should be passed. Helps people who read the codebase for the first time.

- Made a variable for storing the entry name so getName() isn't called a bunch of times.

- Added some comments to explain some parts.

- Rename the exception catch variable to ignored, since it currently isn't being used.
---
 .../dolphinemu/dolphinemu/FolderBrowser.java  | 73 +++++++++++--------
 1 file changed, 42 insertions(+), 31 deletions(-)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
index 471278e50c..3b9fe9a0e5 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
@@ -19,48 +19,59 @@ import java.util.List;
 public class FolderBrowser extends ListActivity {
 	private FolderBrowserAdapter adapter;
 	private static File currentDir = null;
-	private void Fill(File f)
+
+	// Populates the FolderView with the given currDir's contents.
+	private void Fill(File currDir)
     {
-		File[]dirs = f.listFiles();
-		this.setTitle("Current Dir: " + f.getName());
+		this.setTitle("Current Dir: " + currDir.getName());
+		File[] dirs = currDir.listFiles();
 		List<GameListItem>dir = new ArrayList<GameListItem>();
 		List<GameListItem>fls = new ArrayList<GameListItem>();
-         
+
+		// Search for any directories or supported files within the current dir.
 		try
 		{
-			for(File ff: dirs)
+			for(File entry : dirs)
 			{
-				if (ff.getName().charAt(0) != '.')
-					if(ff.isDirectory())
-	                	dir.add(new GameListItem(getApplicationContext(), ff.getName(),"Folder",ff.getAbsolutePath(), true));
+				String entryName = entry.getName();
+
+				if (entryName.charAt(0) != '.')
+				{
+					if(entry.isDirectory())
+					{
+						dir.add(new GameListItem(getApplicationContext(), entryName,"Folder",entry.getAbsolutePath(), true));
+					}
 					else
 					{
-						if (ff.getName().toLowerCase().contains(".gcm") ||
-		                		ff.getName().toLowerCase().contains(".iso") ||
-		                		ff.getName().toLowerCase().contains(".wbfs") ||
-		                		ff.getName().toLowerCase().contains(".gcz") ||
-		                		ff.getName().toLowerCase().contains(".dol") ||
-		                		ff.getName().toLowerCase().contains(".elf"))
-		                			fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath(), true));
-						else if (ff.getName().toLowerCase().contains(".zip") ||
-								ff.getName().toLowerCase().contains(".rar") ||
-								ff.getName().toLowerCase().contains(".7z"))
-									fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath(), false));
+						if (entryName.toLowerCase().contains(".gcm") ||
+								entryName.toLowerCase().contains(".iso") ||
+								entryName.toLowerCase().contains(".wbfs") ||
+								entryName.toLowerCase().contains(".gcz") ||
+								entryName.toLowerCase().contains(".dol") ||
+								entryName.toLowerCase().contains(".elf"))
+									fls.add(new GameListItem(getApplicationContext(), entryName,"File Size: "+entry.length(),entry.getAbsolutePath(), true));
+						else if (entryName.toLowerCase().contains(".zip") ||
+								entryName.toLowerCase().contains(".rar") ||
+								entryName.toLowerCase().contains(".7z"))
+									fls.add(new GameListItem(getApplicationContext(), entryName,"File Size: "+entry.length(),entry.getAbsolutePath(), false));
 					}
+				}
 			}
-         }
-         catch(Exception e)
-         {
-         }
-         
-		Collections.sort(dir);
-        Collections.sort(fls);
-        dir.addAll(fls);
-	    if (!f.getPath().equalsIgnoreCase("/"))
-	        dir.add(0, new GameListItem(getApplicationContext(), "..", "Parent Directory", f.getParent(), true));
+		}
+		catch(Exception ignored)
+		{
+		}
 
-         adapter = new FolderBrowserAdapter(this,R.layout.folderbrowser,dir);
-		 this.setListAdapter(adapter);
+		Collections.sort(dir);
+		Collections.sort(fls);
+		dir.addAll(fls);
+
+		// Check for a parent directory to the one we're currently in.
+		if (!currDir.getPath().equalsIgnoreCase("/"))
+			dir.add(0, new GameListItem(getApplicationContext(), "..", "Parent Directory", currDir.getParent(), true));
+
+		adapter = new FolderBrowserAdapter(this,R.layout.folderbrowser,dir);
+		this.setListAdapter(adapter);
     }
 
 	@Override

From 13f30d1d1d2a7124c1046daf0ff59a2b26b0a7b6 Mon Sep 17 00:00:00 2001
From: lioncash <mathew1900@hotmail.com>
Date: Mon, 15 Jul 2013 09:35:45 -0400
Subject: [PATCH 285/352] [Android] Simplify GameListFragment.Fill a little
 bit.

Made the filtering check against a HashSet of specified supported extensions.
Not only does this get rid of the multitude of checks for extensions in the if-statement, but it also makes for less typing in the future if new file extensions/formats are used. Simply add the extension to support to the set, and you're done.
---
 .../dolphinemu/GameListFragment.java          | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java
index e7b7c25c33..627549b926 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java
@@ -13,8 +13,11 @@ import android.widget.Toast;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Copyright 2013 Dolphin Emulator Project
@@ -40,6 +43,10 @@ public class GameListFragment extends Fragment
 		List<GameListItem> fls = new ArrayList<GameListItem>();
 		String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
 		int intDirectories = Integer.parseInt(Directories);
+
+		// Extensions to filter by.
+		Set<String> exts = new HashSet<String>(Arrays.asList(".gcm", ".iso", ".wbfs", ".gcz", ".dol", ".elf", ".dff"));
+
 		for (int a = 0; a < intDirectories; ++a)
 		{
 			String BrowseDir = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPath" + Integer.toString(a), "");
@@ -47,18 +54,18 @@ public class GameListFragment extends Fragment
 			File[]dirs = currentDir.listFiles();
 			try
 			{
-				for(File ff: dirs)
+				for(File entry : dirs)
 				{
-					if (ff.getName().charAt(0) != '.')
-						if(!ff.isDirectory())
-							if (ff.getName().toLowerCase().contains(".gcm") ||
-									ff.getName().toLowerCase().contains(".iso") ||
-									ff.getName().toLowerCase().contains(".wbfs") ||
-									ff.getName().toLowerCase().contains(".gcz") ||
-									ff.getName().toLowerCase().contains(".dol") ||
-									ff.getName().toLowerCase().contains(".elf") ||
-									ff.getName().toLowerCase().contains(".dff"))
-								fls.add(new GameListItem(mMe.getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath(), true));
+					String entryName = entry.getName();
+
+					if (entryName.charAt(0) != '.')
+					{
+						if(!entry.isDirectory())
+						{
+							if (exts.contains(entryName.toLowerCase()))
+								fls.add(new GameListItem(mMe.getApplicationContext(), entryName,"File Size: "+entry.length(),entry.getAbsolutePath(), true));
+						}
+					}
 				}
 			}
 			catch(Exception ignored)

From 0ba25943394ec94ff22bb8e5a56abec4180b794d Mon Sep 17 00:00:00 2001
From: lioncash <mathew1900@hotmail.com>
Date: Mon, 15 Jul 2013 09:58:54 -0400
Subject: [PATCH 286/352] Use HashSets in FolderBrowser as well, like the last
 commit for GameListFragment.

Should have originally done this with the first refactor. My bad.
---
 .../dolphinemu/dolphinemu/FolderBrowser.java  | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
index 3b9fe9a0e5..9947e95d36 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
@@ -12,9 +12,12 @@ import android.widget.ListView;
 import android.widget.Toast;
 
 import java.io.File;
+import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 public class FolderBrowser extends ListActivity {
 	private FolderBrowserAdapter adapter;
@@ -28,6 +31,10 @@ public class FolderBrowser extends ListActivity {
 		List<GameListItem>dir = new ArrayList<GameListItem>();
 		List<GameListItem>fls = new ArrayList<GameListItem>();
 
+		// Supported extensions to filter by
+		Set<String> validExts = new HashSet<String>(Arrays.asList(".gcm", ".iso", ".wbfs", ".gcz", ".dol", ".elf"));
+		Set<String> archiveExts = new HashSet<String>(Arrays.asList(".zip", ".rar", ".7z"));
+
 		// Search for any directories or supported files within the current dir.
 		try
 		{
@@ -43,17 +50,14 @@ public class FolderBrowser extends ListActivity {
 					}
 					else
 					{
-						if (entryName.toLowerCase().contains(".gcm") ||
-								entryName.toLowerCase().contains(".iso") ||
-								entryName.toLowerCase().contains(".wbfs") ||
-								entryName.toLowerCase().contains(".gcz") ||
-								entryName.toLowerCase().contains(".dol") ||
-								entryName.toLowerCase().contains(".elf"))
-									fls.add(new GameListItem(getApplicationContext(), entryName,"File Size: "+entry.length(),entry.getAbsolutePath(), true));
-						else if (entryName.toLowerCase().contains(".zip") ||
-								entryName.toLowerCase().contains(".rar") ||
-								entryName.toLowerCase().contains(".7z"))
-									fls.add(new GameListItem(getApplicationContext(), entryName,"File Size: "+entry.length(),entry.getAbsolutePath(), false));
+						if (validExts.contains(entryName.toLowerCase()))
+						{
+							fls.add(new GameListItem(getApplicationContext(), entryName,"File Size: "+entry.length(),entry.getAbsolutePath(), true));
+						}
+						else if (archiveExts.contains(entryName.toLowerCase()))
+						{
+							fls.add(new GameListItem(getApplicationContext(), entryName,"File Size: "+entry.length(),entry.getAbsolutePath(), false));
+						}
 					}
 				}
 			}

From c35916a3e57e9d8d5d8f690afab9ea246e4d2108 Mon Sep 17 00:00:00 2001
From: lioncash <mathew1900@hotmail.com>
Date: Mon, 15 Jul 2013 10:01:04 -0400
Subject: [PATCH 287/352] Add .dff FIFO logs to the list of valid extensions in
 FolderBrowser.

---
 Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
index 9947e95d36..c5bfc380f8 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
@@ -32,7 +32,7 @@ public class FolderBrowser extends ListActivity {
 		List<GameListItem>fls = new ArrayList<GameListItem>();
 
 		// Supported extensions to filter by
-		Set<String> validExts = new HashSet<String>(Arrays.asList(".gcm", ".iso", ".wbfs", ".gcz", ".dol", ".elf"));
+		Set<String> validExts = new HashSet<String>(Arrays.asList(".gcm", ".iso", ".wbfs", ".gcz", ".dol", ".elf", ".dff"));
 		Set<String> archiveExts = new HashSet<String>(Arrays.asList(".zip", ".rar", ".7z"));
 
 		// Search for any directories or supported files within the current dir.

From f4e5f213fa017eb8a8e1eed7ce2b867332606acc Mon Sep 17 00:00:00 2001
From: "kostamarino@hotmail.com" <kostamarino@hotmail.com>
Date: Mon, 15 Jul 2013 17:18:35 +0300
Subject: [PATCH 288/352] Gameini database update, fixes issues 6374, 6375,
 6376. Also update Simpson's Hit and Run (gc) and PSO III.

---
 Data/User/GameConfig/GHQE7D.ini | 13 ++++++++++---
 Data/User/GameConfig/GHQP7D.ini | 19 +++++++++++++++++++
 Data/User/GameConfig/GKLD69.ini | 18 ++++++++++++++++++
 Data/User/GameConfig/GKLI69.ini | 18 ++++++++++++++++++
 Data/User/GameConfig/GKLJ69.ini | 18 ++++++++++++++++++
 Data/User/GameConfig/GKOP6V.ini | 19 +++++++++++++------
 Data/User/GameConfig/GPHD52.ini | 14 ++++++++++++++
 Data/User/GameConfig/GPHP52.ini | 14 ++++++++++++++
 Data/User/GameConfig/GPSE8P.ini |  8 ++++++--
 9 files changed, 130 insertions(+), 11 deletions(-)
 create mode 100644 Data/User/GameConfig/GHQP7D.ini
 create mode 100644 Data/User/GameConfig/GKLD69.ini
 create mode 100644 Data/User/GameConfig/GKLI69.ini
 create mode 100644 Data/User/GameConfig/GKLJ69.ini
 create mode 100644 Data/User/GameConfig/GPHD52.ini
 create mode 100644 Data/User/GameConfig/GPHP52.ini

diff --git a/Data/User/GameConfig/GHQE7D.ini b/Data/User/GameConfig/GHQE7D.ini
index 1f37590cbe..7bf847a3f5 100644
--- a/Data/User/GameConfig/GHQE7D.ini
+++ b/Data/User/GameConfig/GHQE7D.ini
@@ -2,11 +2,18 @@
 [Core] Values set here will override the main dolphin settings.
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 3
-EmulationIssues = 
+EmulationStateId = 4
+EmulationIssues = Needs Real Xfb for the videos to display.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
 ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
 [Gecko]
-
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/User/GameConfig/GHQP7D.ini b/Data/User/GameConfig/GHQP7D.ini
new file mode 100644
index 0000000000..7ac2ee0fb2
--- /dev/null
+++ b/Data/User/GameConfig/GHQP7D.ini
@@ -0,0 +1,19 @@
+# GHQP7D - The Simpsons Hit & Run
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = Needs Real Xfb for the videos to display.
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
diff --git a/Data/User/GameConfig/GKLD69.ini b/Data/User/GameConfig/GKLD69.ini
new file mode 100644
index 0000000000..1688bef9da
--- /dev/null
+++ b/Data/User/GameConfig/GKLD69.ini
@@ -0,0 +1,18 @@
+# GKLD69 - The Lord of the Rings; The Return of the King
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]

+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/GKLI69.ini b/Data/User/GameConfig/GKLI69.ini
new file mode 100644
index 0000000000..b2364c1808
--- /dev/null
+++ b/Data/User/GameConfig/GKLI69.ini
@@ -0,0 +1,18 @@
+# GKLI69 - The Lord of the Rings; The Return of the King
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]

+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/GKLJ69.ini b/Data/User/GameConfig/GKLJ69.ini
new file mode 100644
index 0000000000..60677ef83b
--- /dev/null
+++ b/Data/User/GameConfig/GKLJ69.ini
@@ -0,0 +1,18 @@
+# GKLJ69 - The Lord of the Rings; The Return of the King
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+PH_SZNear = 0
+PH_SZFar = 0
+PH_ExtraParam = 0
+PH_ZNear = 
+PH_ZFar = 
+[Gecko]
+[Video_Settings]

+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/GKOP6V.ini b/Data/User/GameConfig/GKOP6V.ini
index bbfa00ade7..b9fda4cf5b 100644
--- a/Data/User/GameConfig/GKOP6V.ini
+++ b/Data/User/GameConfig/GKOP6V.ini
@@ -1,6 +1,13 @@
-# GKOP6V - Kao the kangaroo
-[Core] Values set here will override the main dolphin settings.
-[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 2
-[OnFrame] Add memory patches to be applied every frame here.
-[ActionReplay] Add action replay cheats here.
+# GKOP6V - Kao the kangaroo
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+[Gecko]
+[Video_Settings]

+SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/GPHD52.ini b/Data/User/GameConfig/GPHD52.ini
new file mode 100644
index 0000000000..7e3bdfa85e
--- /dev/null
+++ b/Data/User/GameConfig/GPHD52.ini
@@ -0,0 +1,14 @@
+# GPHD52 - Pitfall: The Lost Expedition
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+[Gecko]
+[Video_Settings]

+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/User/GameConfig/GPHP52.ini b/Data/User/GameConfig/GPHP52.ini
new file mode 100644
index 0000000000..72316bf234
--- /dev/null
+++ b/Data/User/GameConfig/GPHP52.ini
@@ -0,0 +1,14 @@
+# GPHP52 - Pitfall: The Lost Expedition
+[Core] Values set here will override the main dolphin settings.
+TLBHack = 1
+[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
+EmulationStateId = 4
+EmulationIssues = 
+[OnFrame] Add memory patches to be applied every frame here.
+[ActionReplay] Add action replay cheats here.
+[Video]
+ProjectionHack = 0
+[Gecko]
+[Video_Settings]

+SafeTextureCacheColorSamples = 512
+
diff --git a/Data/User/GameConfig/GPSE8P.ini b/Data/User/GameConfig/GPSE8P.ini
index 0f76245508..5d99a75f22 100644
--- a/Data/User/GameConfig/GPSE8P.ini
+++ b/Data/User/GameConfig/GPSE8P.ini
@@ -1,8 +1,8 @@
 # GPSE8P - PSO CARD BATTLE
 [Core] Values set here will override the main dolphin settings.
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationStateId = 1
-EmulationIssues = 
+EmulationStateId = 4
+EmulationIssues = Needs Real Xfb for the videos to display. D3D11 has issues.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -13,3 +13,7 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [Gecko]
+[Video_Settings]
+UseXFB = True
+UseRealXFB = True
+SafeTextureCacheColorSamples = 512

From b2950adc520c87fc4effb8992c8449a8f9f91f29 Mon Sep 17 00:00:00 2001
From: Glenn Rice <glennricster@gmail.com>
Date: Mon, 15 Jul 2013 09:20:43 -0500
Subject: [PATCH 289/352] When cmake checks for miniupnpc use the
 MINIUPNPC_VERSION_1_7_OR_HIGHER variable instead of MINIUPNPC_VERSION_PRE1_7.
  This should fix issue 6422.

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd05dcf32a..959f28e24b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -564,7 +564,7 @@ if(USE_UPNP)
 	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
 		include(FindMiniupnpc)
 	endif()
-	if(MINIUPNP_FOUND AND NOT MINIUPNPC_VERSION_PRE1_7)
+	if(MINIUPNP_FOUND AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
 		message("Using shared miniupnpc")
 		include_directories(${MINIUPNP_INCLUDE_DIR})
 	else()

From 63e334f59e4ceb4723b515797857111aaad050d7 Mon Sep 17 00:00:00 2001
From: Glenn Rice <glennricster@gmail.com>
Date: Mon, 15 Jul 2013 09:22:47 -0500
Subject: [PATCH 290/352] Uh, that was stupid.  Forgot to remove the NOT.

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 959f28e24b..ac4e97e944 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -564,7 +564,7 @@ if(USE_UPNP)
 	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
 		include(FindMiniupnpc)
 	endif()
-	if(MINIUPNP_FOUND AND NOT MINIUPNPC_VERSION_1_7_OR_HIGHER)
+	if(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER)
 		message("Using shared miniupnpc")
 		include_directories(${MINIUPNP_INCLUDE_DIR})
 	else()

From a24901688e7c01a7ebc48798767d3288bdf1be2c Mon Sep 17 00:00:00 2001
From: lioncash <mathew1900@hotmail.com>
Date: Mon, 15 Jul 2013 12:17:51 -0400
Subject: [PATCH 291/352] Remove Action Replay master codes from game inis that
 contained them, since they're unnecessary.

Fixes issue 6367: https://code.google.com/p/dolphin-emu/issues/detail?id=6367

Also fixed an AR code missing an '$' symbol beside its description name in G4NJDA.ini
---
 Data/User/GameConfig/G2FE78.ini | 2 --
 Data/User/GameConfig/G4NJDA.ini | 5 +----
 Data/User/GameConfig/G4QE01.ini | 2 --
 Data/User/GameConfig/GAUE08.ini | 2 --
 Data/User/GameConfig/GB4E51.ini | 2 --
 Data/User/GameConfig/GBOP51.ini | 2 --
 Data/User/GameConfig/GDDE41.ini | 2 --
 Data/User/GameConfig/GDTE69.ini | 2 --
 Data/User/GameConfig/GE5EA4.ini | 2 --
 Data/User/GameConfig/GF8E69.ini | 2 --
 Data/User/GameConfig/GFYE69.ini | 2 --
 Data/User/GameConfig/GHME4F.ini | 2 --
 Data/User/GameConfig/GICE78.ini | 2 --
 Data/User/GameConfig/GINE69.ini | 2 --
 Data/User/GameConfig/GIQE78.ini | 2 --
 Data/User/GameConfig/GJCE8P.ini | 2 --
 Data/User/GameConfig/GJUE78.ini | 2 --
 Data/User/GameConfig/GJWE78.ini | 2 --
 Data/User/GameConfig/GKNEB2.ini | 2 --
 Data/User/GameConfig/GNWE69.ini | 2 --
 Data/User/GameConfig/GOYE69.ini | 7 -------
 Data/User/GameConfig/GPNP08.ini | 4 ----
 Data/User/GameConfig/GSSE8P.ini | 2 --
 Data/User/GameConfig/GT6E70.ini | 2 --
 Data/User/GameConfig/GZLE01.ini | 2 --
 25 files changed, 1 insertion(+), 59 deletions(-)

diff --git a/Data/User/GameConfig/G2FE78.ini b/Data/User/GameConfig/G2FE78.ini
index 38d183c72b..106b53a3ff 100644
--- a/Data/User/GameConfig/G2FE78.ini
+++ b/Data/User/GameConfig/G2FE78.ini
@@ -5,8 +5,6 @@ TLBHack = 1
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C43213D8 0000FF01
 $Infinite Health
 04112828 48232224
 04344A4C D017021C
diff --git a/Data/User/GameConfig/G4NJDA.ini b/Data/User/GameConfig/G4NJDA.ini
index d2e307f90b..fd2fc912cf 100644
--- a/Data/User/GameConfig/G4NJDA.ini
+++ b/Data/User/GameConfig/G4NJDA.ini
@@ -5,10 +5,7 @@
 #The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
 [OnFrame]
-Master Code
-0FC07078 A8000000
-C4175B8C 0000FF00
 [ActionReplay]
-Everything unlocked
+$Everything unlocked
 042232F0 00FFFFFF
 002232FC 00002FFF
\ No newline at end of file
diff --git a/Data/User/GameConfig/G4QE01.ini b/Data/User/GameConfig/G4QE01.ini
index 90242bcad3..a25f1339f9 100644
--- a/Data/User/GameConfig/G4QE01.ini
+++ b/Data/User/GameConfig/G4QE01.ini
@@ -6,8 +6,6 @@ EmulationStateId = 5
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C425B280 0000FF01
 $Press D-Pad Up - Team 1 Wins
 4A32C348 00000008
 40371238 00003F32
diff --git a/Data/User/GameConfig/GAUE08.ini b/Data/User/GameConfig/GAUE08.ini
index 744661cae1..27e9e69b3d 100644
--- a/Data/User/GameConfig/GAUE08.ini
+++ b/Data/User/GameConfig/GAUE08.ini
@@ -12,8 +12,6 @@ PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C40EBABC 0000FF00
 $Max Total Races Played
 021B301C 0000270F
 $Low Total Play Time
diff --git a/Data/User/GameConfig/GB4E51.ini b/Data/User/GameConfig/GB4E51.ini
index 71bb37a3db..0926bb8e1d 100644
--- a/Data/User/GameConfig/GB4E51.ini
+++ b/Data/User/GameConfig/GB4E51.ini
@@ -5,8 +5,6 @@ EmulationStateId = 5
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C412A730 0000FF00
 $Infinite Boost
 04220D04 42C80000
 $Offensive Driving Complete
diff --git a/Data/User/GameConfig/GBOP51.ini b/Data/User/GameConfig/GBOP51.ini
index 5654ad819f..854f4e6d77 100644
--- a/Data/User/GameConfig/GBOP51.ini
+++ b/Data/User/GameConfig/GBOP51.ini
@@ -5,8 +5,6 @@ EmulationStateId = 3
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C4170264 00000800
 $Infinite Continues
 04233DD8 00000063
 $Infinite Boost
diff --git a/Data/User/GameConfig/GDDE41.ini b/Data/User/GameConfig/GDDE41.ini
index 46cd32c50f..a1d77fb493 100644
--- a/Data/User/GameConfig/GDDE41.ini
+++ b/Data/User/GameConfig/GDDE41.ini
@@ -5,8 +5,6 @@ EmulationStateId = 2
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C40486D0 00000800
 $Have Infinite Lives
 04765074 00000063
 $Always Have 99 Cogs
diff --git a/Data/User/GameConfig/GDTE69.ini b/Data/User/GameConfig/GDTE69.ini
index 7dabfe85cd..c54039a9b0 100644
--- a/Data/User/GameConfig/GDTE69.ini
+++ b/Data/User/GameConfig/GDTE69.ini
@@ -5,8 +5,6 @@ EmulationIssues =
 EmulationStateId = 5
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C40C840C 0000FF00
 $Player 1 Max Health Tank
 041B9B10 43A80000
 $Player 1 No Health Tank
diff --git a/Data/User/GameConfig/GE5EA4.ini b/Data/User/GameConfig/GE5EA4.ini
index ad7e0c40ea..2401ed6d39 100644
--- a/Data/User/GameConfig/GE5EA4.ini
+++ b/Data/User/GameConfig/GE5EA4.ini
@@ -5,8 +5,6 @@ TLBHack = 1
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C41E605C 0000FF01
 $Infinite Health
 052278A8 00000226
 $Press R+Y For More Time
diff --git a/Data/User/GameConfig/GF8E69.ini b/Data/User/GameConfig/GF8E69.ini
index 5fa4328270..1af4d29771 100644
--- a/Data/User/GameConfig/GF8E69.ini
+++ b/Data/User/GameConfig/GF8E69.ini
@@ -6,8 +6,6 @@ EmulationStateId = 4
 EmulationIssues = The videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C431F6C8 0000FF01
 $Unlock All Venues
 043D2290 00000001
 $Unlock All Kits
diff --git a/Data/User/GameConfig/GFYE69.ini b/Data/User/GameConfig/GFYE69.ini
index 6100e5913c..043d96b489 100644
--- a/Data/User/GameConfig/GFYE69.ini
+++ b/Data/User/GameConfig/GFYE69.ini
@@ -6,8 +6,6 @@ EmulationStateId = 4
 EmulationIssues = Videos are messed up, skip them.
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C4344534 0000FF01
 $Home Team Starts With 10
 2843491F 0000000A
 0043491F 0000000A
diff --git a/Data/User/GameConfig/GHME4F.ini b/Data/User/GameConfig/GHME4F.ini
index dfce92de40..3fc5b957fa 100644
--- a/Data/User/GameConfig/GHME4F.ini
+++ b/Data/User/GameConfig/GHME4F.ini
@@ -6,8 +6,6 @@ EmulationIssues =
 EmulationStateId = 5
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C4229E7C 0000FF00
 $Infinite Ammo + Rapid Fire
 0417CA4C 60000000
 0417CA50 60000000
diff --git a/Data/User/GameConfig/GICE78.ini b/Data/User/GameConfig/GICE78.ini
index c3deac6195..0187973aa6 100644
--- a/Data/User/GameConfig/GICE78.ini
+++ b/Data/User/GameConfig/GICE78.ini
@@ -5,7 +5,5 @@ TLBHack = 1
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C422AD48 0000FF01
 $Infinite Health
 04097DB8 38000064
diff --git a/Data/User/GameConfig/GINE69.ini b/Data/User/GameConfig/GINE69.ini
index 77e14f98c2..078d294a40 100644
--- a/Data/User/GameConfig/GINE69.ini
+++ b/Data/User/GameConfig/GINE69.ini
@@ -6,8 +6,6 @@ EmulationStateId = 4
 EmulationIssues = FPS drops to 20 in some areas(don't know if this is normal)
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C42FE4A8 0002FF01
 $Infinite Health
 040CF5D0 60000000
 $Infinite Item Use
diff --git a/Data/User/GameConfig/GIQE78.ini b/Data/User/GameConfig/GIQE78.ini
index 3cb9063eb1..434868e993 100644
--- a/Data/User/GameConfig/GIQE78.ini
+++ b/Data/User/GameConfig/GIQE78.ini
@@ -5,8 +5,6 @@ EmulationIssues = Needs real XFB for videos to show up.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C421D274 0000FF01
 $Infinite Specials
 003BD9DB 00000003
 003BED0B 00000003
diff --git a/Data/User/GameConfig/GJCE8P.ini b/Data/User/GameConfig/GJCE8P.ini
index 2307738f12..d9321af76c 100644
--- a/Data/User/GameConfig/GJCE8P.ini
+++ b/Data/User/GameConfig/GJCE8P.ini
@@ -4,8 +4,6 @@
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C4210448 0000FF01
 $Infinite Health
 040B4C6C 38000064
 040B4C70 9003022C
diff --git a/Data/User/GameConfig/GJUE78.ini b/Data/User/GameConfig/GJUE78.ini
index ad0fdca372..7060bef305 100644
--- a/Data/User/GameConfig/GJUE78.ini
+++ b/Data/User/GameConfig/GJUE78.ini
@@ -6,8 +6,6 @@ EmulationIssues =
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C4131BDC 0000FF00
 $Infinite Health
 04001A00 2C050000
 04001A04 41820008
diff --git a/Data/User/GameConfig/GJWE78.ini b/Data/User/GameConfig/GJWE78.ini
index 1ae68295c5..f1723ad5ac 100644
--- a/Data/User/GameConfig/GJWE78.ini
+++ b/Data/User/GameConfig/GJWE78.ini
@@ -6,8 +6,6 @@ EmulationIssues =
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C438BBEC 0000FF01
 $Infinite Health
 041D1558 D0180240
 041D155C C1B80240
diff --git a/Data/User/GameConfig/GKNEB2.ini b/Data/User/GameConfig/GKNEB2.ini
index b6223f1e4e..38cc6bfe5d 100644
--- a/Data/User/GameConfig/GKNEB2.ini
+++ b/Data/User/GameConfig/GKNEB2.ini
@@ -4,8 +4,6 @@
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C410EE24 0000FF00
 $Infinite KIN Medals
 02296DD6 0000270F
 $All Toys
diff --git a/Data/User/GameConfig/GNWE69.ini b/Data/User/GameConfig/GNWE69.ini
index 6b538fea9c..b48f5843da 100644
--- a/Data/User/GameConfig/GNWE69.ini
+++ b/Data/User/GameConfig/GNWE69.ini
@@ -9,8 +9,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C426D8F0 0000FF01
 $Max/Infinite Cash
 044477E0 05F5E0FF
 040476F4 80AD0000
diff --git a/Data/User/GameConfig/GOYE69.ini b/Data/User/GameConfig/GOYE69.ini
index 808f83e4e9..6657678869 100644
--- a/Data/User/GameConfig/GOYE69.ini
+++ b/Data/User/GameConfig/GOYE69.ini
@@ -6,13 +6,6 @@ EmulationIssues = Videos are messed up, skip them.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-0C3F0328 4E800020
-C43F0328 0000FF01
-0C0135B8 4E800020
-C40135B8 0000FF02
-0C71AEC8 4E800020
-C471AEC8 0000FF03
 $Never Lose Health
 040A0D44 60000000
 $Never Lose Armor
diff --git a/Data/User/GameConfig/GPNP08.ini b/Data/User/GameConfig/GPNP08.ini
index 6903360604..148980cb6f 100644
--- a/Data/User/GameConfig/GPNP08.ini
+++ b/Data/User/GameConfig/GPNP08.ini
@@ -10,10 +10,6 @@ EmulationStateId = 4
 [ActionReplay]
 #Add decrypted action replay cheats here.
 
-$(m) (Updated Master Code From GCNrd) 
-03E04B5F 98000000
-C41118D4 0000FF01
-
 $Title Screen Picture Swapper;L+D-Pad Left = Prima Fusion; L+D-Pad Right = Black Bird;L+D-Pad Down = Papillion 
 03E017EC 18000000
 0A19FB0E 00000041
diff --git a/Data/User/GameConfig/GSSE8P.ini b/Data/User/GameConfig/GSSE8P.ini
index 91802d2e33..47f67fbf00 100644
--- a/Data/User/GameConfig/GSSE8P.ini
+++ b/Data/User/GameConfig/GSSE8P.ini
@@ -5,8 +5,6 @@ EmulationIssues = Needs real xfb for the videos to display.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C419DA20 00000800
 $El Fuego Have Tons Of Cash
 04238F74 05F5E0FF
 $Spirit Have Tons Of Cash
diff --git a/Data/User/GameConfig/GT6E70.ini b/Data/User/GameConfig/GT6E70.ini
index 0ac6253eb4..6794440dca 100644
--- a/Data/User/GameConfig/GT6E70.ini
+++ b/Data/User/GameConfig/GT6E70.ini
@@ -6,8 +6,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$Master Code
-C4389A80 0000FF01
 $Infinite Health
 04197798 60000000
 041977A4 D01F016C
diff --git a/Data/User/GameConfig/GZLE01.ini b/Data/User/GameConfig/GZLE01.ini
index adf073b2ce..1efdf7f2ef 100644
--- a/Data/User/GameConfig/GZLE01.ini
+++ b/Data/User/GameConfig/GZLE01.ini
@@ -20,8 +20,6 @@ $Snow test room
 0x803C9D48:dword:0x49546573
 0x803C9D4C:dword:0x74363200
 [ActionReplay]
-$Master Code (useless)
-C4323EA8 0000FF00
 $Shadow Link
 423BCDA0 00BCFFFF
 423BCDA0 00BDFF87

From 5b4af4f795e3adb722a4f82ef581da5c9511c3d7 Mon Sep 17 00:00:00 2001
From: lioncash <mathew1900@hotmail.com>
Date: Mon, 15 Jul 2013 12:28:58 -0400
Subject: [PATCH 292/352] Goddamnit. Forgot that Master codes are also
 abbreviated as (M).

Ok. NOW  issue 6367 : https://code.google.com/p/dolphin-emu/issues/detail?id=6367 is fixed.

I wish I'd remember these things before committing and not after.
---
 Data/User/GameConfig/G2ME01.ini |  7 -------
 Data/User/GameConfig/G2MP01.ini |  5 -----
 Data/User/GameConfig/G4GEE9.ini |  4 ----
 Data/User/GameConfig/G4SP01.ini |  8 --------
 Data/User/GameConfig/G8ME01.ini |  2 --
 Data/User/GameConfig/G8WP01.ini |  3 ---
 Data/User/GameConfig/GAFE01.ini |  3 ---
 Data/User/GameConfig/GALE01.ini |  3 ---
 Data/User/GameConfig/GBHEC8.ini |  3 ---
 Data/User/GameConfig/GCCE01.ini |  3 ---
 Data/User/GameConfig/GCVEEB.ini |  3 ---
 Data/User/GameConfig/GF7E01.ini |  2 --
 Data/User/GameConfig/GF7P01.ini |  3 ---
 Data/User/GameConfig/GFZE01.ini |  3 ---
 Data/User/GameConfig/GGTE01.ini |  3 ---
 Data/User/GameConfig/GHRE78.ini |  4 ----
 Data/User/GameConfig/GK4E01.ini |  3 ---
 Data/User/GameConfig/GMSP01.ini |  3 ---
 Data/User/GameConfig/GO7P69.ini | 12 ------------
 Data/User/GameConfig/GOME01.ini |  2 --
 Data/User/GameConfig/GP5E01.ini |  3 ---
 Data/User/GameConfig/GPIE01.ini |  3 ---
 Data/User/GameConfig/GPVE01.ini |  4 ----
 Data/User/GameConfig/GQSEAF.ini |  3 ---
 Data/User/GameConfig/GREE08.ini |  3 ---
 Data/User/GameConfig/GRNE52.ini |  3 ---
 Data/User/GameConfig/GRSPAF.ini |  3 ---
 Data/User/GameConfig/GRUE78.ini |  2 --
 Data/User/GameConfig/GSAP01.ini |  3 ---
 Data/User/GameConfig/GTEE01.ini |  2 --
 Data/User/GameConfig/GTSE4F.ini |  2 --
 Data/User/GameConfig/GUNE5D.ini |  3 ---
 Data/User/GameConfig/GWRE01.ini |  2 --
 Data/User/GameConfig/GWRP01.ini |  2 --
 Data/User/GameConfig/GXSP8P.ini |  8 --------
 Data/User/GameConfig/GZ2P01.ini |  2 --
 Data/User/GameConfig/GZLP01.ini |  2 --
 37 files changed, 129 deletions(-)

diff --git a/Data/User/GameConfig/G2ME01.ini b/Data/User/GameConfig/G2ME01.ini
index 46652d1f2b..544966c234 100644
--- a/Data/User/GameConfig/G2ME01.ini
+++ b/Data/User/GameConfig/G2ME01.ini
@@ -7,13 +7,6 @@ EmulationIssues = EFB to RAM is needed for the scanner/visors to work properly.
 0x803758bc=400
 [OnFrame]
 [ActionReplay]
-$(M)
-C4354E70 0000FF01
-C436F000 0000FF02
-4D30294C 4E800020
-C530294C 0000FF03
-0441FD80 00000000
-C6004010 000000FF
 $This Code Must Be On!
 043BC410 906D0000
 043BC414 88030004
diff --git a/Data/User/GameConfig/G2MP01.ini b/Data/User/GameConfig/G2MP01.ini
index c6b40b4ce5..d4b91a5cbf 100644
--- a/Data/User/GameConfig/G2MP01.ini
+++ b/Data/User/GameConfig/G2MP01.ini
@@ -8,11 +8,6 @@ EmulationIssues = EFB to RAM is needed for the scanner/visors to work properly.
 0x80375c68=400
 [OnFrame]
 [ActionReplay]
-$(M)
-C43552C8 0000FF01
-C436F41C 0000FF02
-0D30294C 4E800020
-C530294C 0000FF03
 $Infinite Health
 423DDE0C 000A44BB
 423DDE0C 000B6000
diff --git a/Data/User/GameConfig/G4GEE9.ini b/Data/User/GameConfig/G4GEE9.ini
index 7633ba159a..25401724e9 100644
--- a/Data/User/GameConfig/G4GEE9.ini
+++ b/Data/User/GameConfig/G4GEE9.ini
@@ -10,10 +10,6 @@ EmulationStateId = 2
 [ActionReplay]
 #Add decrypted action replay cheats here.
 
-$(M) 
-06C2E568 88000000
-C41D3578 0000FF01
-
 $Infinite Money 
 06C2E569 08000000
 050943A8 0098967F
diff --git a/Data/User/GameConfig/G4SP01.ini b/Data/User/GameConfig/G4SP01.ini
index 293ec3ec48..93ebfa67fb 100644
--- a/Data/User/GameConfig/G4SP01.ini
+++ b/Data/User/GameConfig/G4SP01.ini
@@ -5,14 +5,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay]
-$(M)
-0658E214 98000000
-C404F588 0002FF00
-$Infinite Health
-0658E215 18000000
-04247EDC 80030BF8
-04247EE0 90030BFC
-04247EE4 4800000C
 $Max Health
 0658E216 18000000
 0425AB40 38000020
diff --git a/Data/User/GameConfig/G8ME01.ini b/Data/User/GameConfig/G8ME01.ini
index 3c84c3fcc4..24b7019f0c 100644
--- a/Data/User/GameConfig/G8ME01.ini
+++ b/Data/User/GameConfig/G8ME01.ini
@@ -9,8 +9,6 @@ EmulationStateId = 4
 EmulationIssues = Needs Efb to Ram for BBox (proper graphics).
 [OnFrame]
 [ActionReplay]
-$(M) Must Be ON
-C402F310 0000FF01
 $Mario: Max/Infinite Health
 04B07BD0 03E703E7
 02B07BEE 000003E7
diff --git a/Data/User/GameConfig/G8WP01.ini b/Data/User/GameConfig/G8WP01.ini
index afe5bd513d..dedca89e90 100644
--- a/Data/User/GameConfig/G8WP01.ini
+++ b/Data/User/GameConfig/G8WP01.ini
@@ -6,9 +6,6 @@
 EmulationStateId = 4
 [OnFrame]
 [ActionReplay]
-$(M)
-0752E976 88000000
-C41641BC 0000FF01
 $Invincible
 0752E977 08000000
 04338650 00000001
diff --git a/Data/User/GameConfig/GAFE01.ini b/Data/User/GameConfig/GAFE01.ini
index 73e01b1138..bd19648ca7 100644
--- a/Data/User/GameConfig/GAFE01.ini
+++ b/Data/User/GameConfig/GAFE01.ini
@@ -5,9 +5,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$(M) (Datel)
-01521549 88000000
-C40959EC 0000FF00
 $Make Game Save Copyable (donny2112)
 01522C0A 08000000
 8C091F20 909C0028
diff --git a/Data/User/GameConfig/GALE01.ini b/Data/User/GameConfig/GALE01.ini
index 66924cd847..436dff7eef 100644
--- a/Data/User/GameConfig/GALE01.ini
+++ b/Data/User/GameConfig/GALE01.ini
@@ -5,9 +5,6 @@ EmulationStateId = 5
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$(m)
-00080176 88000000
-C434E304 00000800
 $All 293 trophies
 00087EF5 08000000
 0245A3C8 00000125
diff --git a/Data/User/GameConfig/GBHEC8.ini b/Data/User/GameConfig/GBHEC8.ini
index 30fa0f7380..c460233a79 100644
--- a/Data/User/GameConfig/GBHEC8.ini
+++ b/Data/User/GameConfig/GBHEC8.ini
@@ -5,9 +5,6 @@ EmulationStateId = 4
 EmulationIssues = Needs Real xfb for the videos to display.
 [OnFrame]
 [ActionReplay]
-$(m)
-01180C36 88000000
-C4201E68 0000FF00
 $Max Health
 01180C37 08000000
 02264788 0000270F
diff --git a/Data/User/GameConfig/GCCE01.ini b/Data/User/GameConfig/GCCE01.ini
index 585d980d85..d193ef6c2e 100644
--- a/Data/User/GameConfig/GCCE01.ini
+++ b/Data/User/GameConfig/GCCE01.ini
@@ -7,9 +7,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$(M)
-04EC59D3 88000000
-C418D2E0 0000FF01
 $Infinite Health: Single Player
 04EC59D4 08000000
 0410B494 A0A3001A
diff --git a/Data/User/GameConfig/GCVEEB.ini b/Data/User/GameConfig/GCVEEB.ini
index 4ef414e7a3..b98605e404 100644
--- a/Data/User/GameConfig/GCVEEB.ini
+++ b/Data/User/GameConfig/GCVEEB.ini
@@ -7,9 +7,6 @@ EmulationStateId = 5
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$(m)
-010C0B93 88000000
-C4148F04 00001000
 $Max Lovebits
 010C0B94 08000000
 02350350 000003E7
diff --git a/Data/User/GameConfig/GF7E01.ini b/Data/User/GameConfig/GF7E01.ini
index c45903999d..4d070c4e16 100644
--- a/Data/User/GameConfig/GF7E01.ini
+++ b/Data/User/GameConfig/GF7E01.ini
@@ -5,8 +5,6 @@ EmulationStateId = 4
 EmulationIssues = EFB must be an integer (integral, 1x, 2x, 3x).
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$(M)
-C4159190 0000FF01
 $Infinite Health
 0402C334 380006C0
 0402C3E0 380006C0
diff --git a/Data/User/GameConfig/GF7P01.ini b/Data/User/GameConfig/GF7P01.ini
index 4fef9f4188..f262c027e1 100644
--- a/Data/User/GameConfig/GF7P01.ini
+++ b/Data/User/GameConfig/GF7P01.ini
@@ -5,9 +5,6 @@ EmulationStateId = 4
 EmulationIssues = EFB must be an integer (integral, 1x, 2x, 3x).
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay]
-$(M)
-06A0E452 98000000
-C4141B8C 0002FF00
 $Single Mode
 06A0E453 15008000
 $Unlock Missions
diff --git a/Data/User/GameConfig/GFZE01.ini b/Data/User/GameConfig/GFZE01.ini
index d6ffdecdf1..ccb8bd547e 100644
--- a/Data/User/GameConfig/GFZE01.ini
+++ b/Data/User/GameConfig/GFZE01.ini
@@ -15,9 +15,6 @@ PH_ExtraParam = 0
 PH_ZNear = 20
 PH_ZFar = 1.7555555
 [ActionReplay]
-$(m)
-8C034168 4E800020
-C4034168 0000FF01
 $Beat All Cups (unlock Master class/Diamond Cup)
 9C0030C8 00120000
 840030C8 0023DC50
diff --git a/Data/User/GameConfig/GGTE01.ini b/Data/User/GameConfig/GGTE01.ini
index a202ef9d55..ba8c7e02d3 100644
--- a/Data/User/GameConfig/GGTE01.ini
+++ b/Data/User/GameConfig/GGTE01.ini
@@ -6,9 +6,6 @@
 EmulationStateId = 5
 [OnFrame]
 [ActionReplay]
-$(M)
-0728E818 88000000
-C4173C94 0000FF01
 $Max Battery Energy
 0728E819 08000000
 0438F74C 4479C000
diff --git a/Data/User/GameConfig/GHRE78.ini b/Data/User/GameConfig/GHRE78.ini
index 29543f3f5d..f6bfa15991 100644
--- a/Data/User/GameConfig/GHRE78.ini
+++ b/Data/User/GameConfig/GHRE78.ini
@@ -10,10 +10,6 @@ EmulationStateId = 4
 [ActionReplay]
 #Add decrypted action replay cheats here.
 
-$(M) 
-0554D8EE 88000000
-C41F2764 0000FF01
-
 $Infinite Continues 
 0554D8EF 08000000
 040BF890 39200009
\ No newline at end of file
diff --git a/Data/User/GameConfig/GK4E01.ini b/Data/User/GameConfig/GK4E01.ini
index c4ea14e82e..05641b2dfe 100644
--- a/Data/User/GameConfig/GK4E01.ini
+++ b/Data/User/GameConfig/GK4E01.ini
@@ -7,9 +7,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$(M)
-0768EA5C 88000000
-C41AF4FC 0000FF01
 $Save Anywhere
 0768EA5D 08000000
 002AE324 00000001
diff --git a/Data/User/GameConfig/GMSP01.ini b/Data/User/GameConfig/GMSP01.ini
index d104e0f26a..b2b0b8d251 100644
--- a/Data/User/GameConfig/GMSP01.ini
+++ b/Data/User/GameConfig/GMSP01.ini
@@ -5,9 +5,6 @@ EmulationStateId = 4
 EmulationIssues = needs EFB to Ram
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay]
-$(M)
-00E60ADD 98000000
-C4347930 00000200
 $99 Lives
 00E60ADE 18000000
 00570967 00000063
diff --git a/Data/User/GameConfig/GO7P69.ini b/Data/User/GameConfig/GO7P69.ini
index d39a8b9f2c..8ac8832e28 100644
--- a/Data/User/GameConfig/GO7P69.ini
+++ b/Data/User/GameConfig/GO7P69.ini
@@ -4,18 +4,6 @@
 EmulationIssues=
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay]
-$(M)
-018010A2 98000000
-0C554E8C 4E800020
-C4554E8C 0000FF00
-4C169C34 4E800020
-C4169C34 0002FF01
-C415795C 0000FF03
-0C5036C0 4E800020
-C45036C0 0000FF04
-4C1C3498 4E800020
-C41C3498 0000FF05
-C41438BC 0000FF06
 
 $Infinite Health
 0180E47C 18000000
diff --git a/Data/User/GameConfig/GOME01.ini b/Data/User/GameConfig/GOME01.ini
index 21d099781a..e152298243 100644
--- a/Data/User/GameConfig/GOME01.ini
+++ b/Data/User/GameConfig/GOME01.ini
@@ -5,8 +5,6 @@ EmulationStateId = 4
 EmulationIssues = Bad Graphics
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$(M)
-C4091E74 0000FF01
 $Score Once To Win Game
 00537C69 00000003
 0053932A 00000003
diff --git a/Data/User/GameConfig/GP5E01.ini b/Data/User/GameConfig/GP5E01.ini
index 96b6520c59..7100d2d403 100644
--- a/Data/User/GameConfig/GP5E01.ini
+++ b/Data/User/GameConfig/GP5E01.ini
@@ -7,9 +7,6 @@ EmulationIssues =
 #Add memory patches to be loaded once on boot here.
 [OnFrame]
 [ActionReplay]
-$(M)
-044E31C5 88000000
-C4154E00 0000FF00
 $All Mini-Games Unlocked
 044E31C6 08000000
 0222A77C 0005FFFF
diff --git a/Data/User/GameConfig/GPIE01.ini b/Data/User/GameConfig/GPIE01.ini
index 8a9256b879..9f166265bc 100644
--- a/Data/User/GameConfig/GPIE01.ini
+++ b/Data/User/GameConfig/GPIE01.ini
@@ -7,9 +7,6 @@ EmulationStateId = 5
 EmulationIssues =
 [OnFrame]
 [ActionReplay]
-$(m)
-04CE586A 88000000
-C4205638 0000FF00
 $Infinite Health: Captain Olimar
 04CE586B 08000000
 423D1E50 006C42C8
diff --git a/Data/User/GameConfig/GPVE01.ini b/Data/User/GameConfig/GPVE01.ini
index 99e38b6f21..f59dae22e8 100644
--- a/Data/User/GameConfig/GPVE01.ini
+++ b/Data/User/GameConfig/GPVE01.ini
@@ -10,10 +10,6 @@ EmulationStateId = 2
 [ActionReplay]
 #Add decrypted action replay cheats here.
 
-$(M) 
-05B4DC4E 88000000
-C40F5B4C 0000FF01
-
 $Infinite Health 
 05B4DC4F 08000000
 04144540 60000000
diff --git a/Data/User/GameConfig/GQSEAF.ini b/Data/User/GameConfig/GQSEAF.ini
index df7fae9cf3..c0eee4cb00 100644
--- a/Data/User/GameConfig/GQSEAF.ini
+++ b/Data/User/GameConfig/GQSEAF.ini
@@ -429,9 +429,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$(M) (Datel)
-05A0DBAC 88000000
-C4114108 0000FF01
 $Infinite Gald
 05A0DBAD 08000000
 045B68C0 05F5E0FF
diff --git a/Data/User/GameConfig/GREE08.ini b/Data/User/GameConfig/GREE08.ini
index 378288f10e..e37e3275be 100644
--- a/Data/User/GameConfig/GREE08.ini
+++ b/Data/User/GameConfig/GREE08.ini
@@ -7,9 +7,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$(m)
-0358272E 88000000
-C42F7B90 0000FF00
 $Infinite Health
 0358272F 08000000
 424FFC30 0008270F
diff --git a/Data/User/GameConfig/GRNE52.ini b/Data/User/GameConfig/GRNE52.ini
index 5acfae2fd8..d5aadc11dc 100644
--- a/Data/User/GameConfig/GRNE52.ini
+++ b/Data/User/GameConfig/GRNE52.ini
@@ -5,9 +5,6 @@ EmulationStateId = 5
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$(m)
-00260171 88000000
-C40CDD58 00000800
 $Infinite health
 0026005B 08000000
 0218777E 00000063
diff --git a/Data/User/GameConfig/GRSPAF.ini b/Data/User/GameConfig/GRSPAF.ini
index afb3c53169..43154ce375 100644
--- a/Data/User/GameConfig/GRSPAF.ini
+++ b/Data/User/GameConfig/GRSPAF.ini
@@ -5,9 +5,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay]
-$(M)
-03EC2BE2 98000000
-C4193E28 0000FF00
 $Infinite Time
 03EC2BE3 18000000
 043A3694 00000063
diff --git a/Data/User/GameConfig/GRUE78.ini b/Data/User/GameConfig/GRUE78.ini
index 2ec6ad5185..dc46e16e61 100644
--- a/Data/User/GameConfig/GRUE78.ini
+++ b/Data/User/GameConfig/GRUE78.ini
@@ -5,8 +5,6 @@ EmulationIssues = Needs Real XFB to display videos.
 EmulationStateId = 4
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$(M)
-C413F568 0000FF01
 $Infinite Health
 04069830 38000004
 $Quick Dino Bolts
diff --git a/Data/User/GameConfig/GSAP01.ini b/Data/User/GameConfig/GSAP01.ini
index c0f3c41a47..53f97d11be 100644
--- a/Data/User/GameConfig/GSAP01.ini
+++ b/Data/User/GameConfig/GSAP01.ini
@@ -5,9 +5,6 @@ EmulationStateId = 2
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay]
-$(m)
-017E1098 98000000
-C404AC04 0000FF01
 $Fox: Infinite Health
 017E1099 18000000
 023A4A54 00001C1C
diff --git a/Data/User/GameConfig/GTEE01.ini b/Data/User/GameConfig/GTEE01.ini
index d9746e96e4..6434e1fb94 100644
--- a/Data/User/GameConfig/GTEE01.ini
+++ b/Data/User/GameConfig/GTEE01.ini
@@ -5,8 +5,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$(M)
-C413E40C 0000FF01
 $Infinite Health
 04272F18 0000003C
 $Max Power
diff --git a/Data/User/GameConfig/GTSE4F.ini b/Data/User/GameConfig/GTSE4F.ini
index 236227829e..781f52218c 100644
--- a/Data/User/GameConfig/GTSE4F.ini
+++ b/Data/User/GameConfig/GTSE4F.ini
@@ -9,8 +9,6 @@ EmulationIssues = can crash on some systems(unknown)
 #Add memory patches to be loaded once on boot here.
 [OnFrame]
 [ActionReplay]
-$(M) (Datel)
-C427768C 0000FF00
 $Inf Ammo/No Reloads
 04122D9C 60000000
 04122D70 60000000
diff --git a/Data/User/GameConfig/GUNE5D.ini b/Data/User/GameConfig/GUNE5D.ini
index a1879e42e4..306890609b 100644
--- a/Data/User/GameConfig/GUNE5D.ini
+++ b/Data/User/GameConfig/GUNE5D.ini
@@ -7,9 +7,6 @@ EmulationStateId = 5
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$(m)
-0020016E 88000000
-C40FE518 00000800
 $Player 1 health 9999
 0020004A 08000000
 04277374 461C3C00
diff --git a/Data/User/GameConfig/GWRE01.ini b/Data/User/GameConfig/GWRE01.ini
index 17d0f32cdf..73de1f2ea0 100644
--- a/Data/User/GameConfig/GWRE01.ini
+++ b/Data/User/GameConfig/GWRE01.ini
@@ -5,8 +5,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
-$(m)
-C4116318 00000800
 $Always 0 missed Buoys
 046199F4 00000000
 $Always turbo
diff --git a/Data/User/GameConfig/GWRP01.ini b/Data/User/GameConfig/GWRP01.ini
index bdeeeb8654..74347b2c20 100644
--- a/Data/User/GameConfig/GWRP01.ini
+++ b/Data/User/GameConfig/GWRP01.ini
@@ -7,8 +7,6 @@ EmulationIssues =
 [Video]
 ProjectionHack = 0
 [ActionReplay] Add action replay cheats here.
-$(M)
-C411794C 00000800
 $Always First Place
 0061C57B 00000000
 $Never Out of Bounds
diff --git a/Data/User/GameConfig/GXSP8P.ini b/Data/User/GameConfig/GXSP8P.ini
index 1729479301..97bf5797f5 100644
--- a/Data/User/GameConfig/GXSP8P.ini
+++ b/Data/User/GameConfig/GXSP8P.ini
@@ -4,14 +4,6 @@
 EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay]
-$(m)
-038C28E4 98000000
-C4046DD0 0000FF00
-040032C0 3FE08000
-040032C4 90BF32BC
-040032C8 7CBF2B78
-040032CC 483E1C18
-043E4EE0 4BC1E3E0
 $999 Rings
 038C28E5 18000000
 027884C8 000003E6
diff --git a/Data/User/GameConfig/GZ2P01.ini b/Data/User/GameConfig/GZ2P01.ini
index a226bf296d..1f717e63c5 100644
--- a/Data/User/GameConfig/GZ2P01.ini
+++ b/Data/User/GameConfig/GZ2P01.ini
@@ -9,8 +9,6 @@ EmulationStateId = 4
 EmulationIssues = 
 [OnFrame]
 [ActionReplay]
-$(M)
-C435E298 0000FF01
 $Infinite Health
 00408163 00000050
 $Max Health
diff --git a/Data/User/GameConfig/GZLP01.ini b/Data/User/GameConfig/GZLP01.ini
index 1b502564f7..94ba72f520 100644
--- a/Data/User/GameConfig/GZLP01.ini
+++ b/Data/User/GameConfig/GZLP01.ini
@@ -21,8 +21,6 @@ $Snow test room
 0x803C9D48:dword:0x49546573
 0x803C9D4C:dword:0x74363200
 [ActionReplay]
-$(M)
-C4329400 0000FF00
 $Maximum Health
 003CC531 00000050
 $Infinite Health

From 4c807fa7b4523cd075c8faeae62b25373559b840 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Mon, 15 Jul 2013 16:24:12 -0400
Subject: [PATCH 293/352] Fix Device.h placement in VC++

---
 Source/Core/InputCommon/InputCommon.vcxproj.filters | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Core/InputCommon/InputCommon.vcxproj.filters b/Source/Core/InputCommon/InputCommon.vcxproj.filters
index ce4558f1ad..c93a9289f4 100644
--- a/Source/Core/InputCommon/InputCommon.vcxproj.filters
+++ b/Source/Core/InputCommon/InputCommon.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="Src\ControllerEmu.cpp" />
@@ -46,7 +46,7 @@
       <Filter>ControllerInterface</Filter>
     </ClInclude>
     <ClInclude Include="Src\ControllerInterface\Device.h">
-      <Filter>ControllerInterface\Device</Filter>
+      <Filter>ControllerInterface</Filter>
     </ClInclude>
     <ClInclude Include="Src\ControllerInterface\ExpressionParser.h">
       <Filter>ControllerInterface</Filter>

From 9123f58bd5fdd57514b3d199308b98022685c251 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 16 Jul 2013 01:22:06 -0500
Subject: [PATCH 294/352] Check for IDIVA/IDIVT correctly. Cortex-A5 parts
 would have had this set since it supports VFPv4 but not IDIVA. Qualcomm
 Krait/Krait 300 still doesn't report in the kernel that it supports this.

---
 Source/Core/Common/Src/ArmCPUDetect.cpp | 57 +++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 4 deletions(-)

diff --git a/Source/Core/Common/Src/ArmCPUDetect.cpp b/Source/Core/Common/Src/ArmCPUDetect.cpp
index 33eee9f05e..ca277ade02 100644
--- a/Source/Core/Common/Src/ArmCPUDetect.cpp
+++ b/Source/Core/Common/Src/ArmCPUDetect.cpp
@@ -44,6 +44,56 @@ char *GetCPUString()
 	}
 	return cpu_string;
 }
+
+unsigned char GetCPUImplementer()
+{
+	const char marker[] = "CPU implementer\t: ";
+	char *implementer_string = 0;
+	unsigned char implementer = 0;
+	char buf[1024];
+
+	File::IOFile file(procfile, "r");
+	auto const fp = file.GetHandle();
+	if (!fp)
+		return 0;
+
+	while (fgets(buf, sizeof(buf), fp))
+	{
+		if (strncmp(buf, marker, sizeof(marker) - 1))
+			continue;
+		implementer_string = buf + sizeof(marker) - 1;
+		implementer_string = strndup(implementer_string, strlen(implementer_string) - 1); // Strip the newline
+		sscanf(implementer_string, "0x%02hhx", &implementer);
+		break;
+	}
+	return implementer;
+}
+
+unsigned short GetCPUPart()
+{
+	const char marker[] = "CPU part\t: ";
+	char *part_string = 0;
+	unsigned short part = 0;
+	char buf[1024];
+
+	File::IOFile file(procfile, "r");
+	auto const fp = file.GetHandle();
+	if (!fp)
+		return 0;
+
+	while (fgets(buf, sizeof(buf), fp))
+	{
+		if (strncmp(buf, marker, sizeof(marker) - 1))
+			continue;
+		part_string = buf + sizeof(marker) - 1;
+		part_string = strndup(part_string, strlen(part_string) - 1); // Strip the newline
+		sscanf(part_string, "0x%03hx", &part);
+		break;
+	}
+	return part;
+
+}
+
 bool CheckCPUFeature(const char *feature)
 {
 	const char marker[] = "Features\t: ";
@@ -123,10 +173,9 @@ void CPUInfo::Detect()
 	bIDIVa = CheckCPUFeature("idiva");
 	bIDIVt = CheckCPUFeature("idivt");
 
-	// On some buggy kernels(Qualcomm) they show that they support VFPv4 but not IDIVa
-	// All VFPv4 CPUs will support IDIVa
-	if (bVFPv4)
-		bIDIVa = bIDIVt = true;
+	// Qualcomm Krait supports IDIVA but it doesn't report it. Check for krait.
+	if (GetCPUImplementer() == 0x51 && GetCPUPart() == 0x6F) // Krait(300) is 0x6F, Scorpion is 0x4D
+		bIDIVa = bIDIVt = true; 
 
 	// These two are ARMv8 specific.
 	bFP = CheckCPUFeature("fp");

From fbd67325a6c0351069286c814bf3e2a8106ccb26 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 16 Jul 2013 03:47:45 -0500
Subject: [PATCH 295/352] [Android] If one wants to use Android Studio. They
 can import the folder themselves.

---
 Source/Android/.idea/.name                    |   1 -
 Source/Android/.idea/compiler.xml             |  29 -
 .../.idea/copyright/profiles_settings.xml     |   7 -
 Source/Android/.idea/encodings.xml            |   5 -
 Source/Android/.idea/libraries/dexedLibs.xml  |  10 -
 Source/Android/.idea/misc.xml                 |  10 -
 Source/Android/.idea/modules.xml              |   9 -
 .../Android/.idea/scopes/scope_settings.xml   |   5 -
 Source/Android/.idea/vcs.xml                  |   7 -
 Source/Android/.idea/workspace.xml            | 955 ------------------
 Source/Android/Android.iml                    |  26 -
 11 files changed, 1064 deletions(-)
 delete mode 100644 Source/Android/.idea/.name
 delete mode 100644 Source/Android/.idea/compiler.xml
 delete mode 100644 Source/Android/.idea/copyright/profiles_settings.xml
 delete mode 100644 Source/Android/.idea/encodings.xml
 delete mode 100644 Source/Android/.idea/libraries/dexedLibs.xml
 delete mode 100644 Source/Android/.idea/misc.xml
 delete mode 100644 Source/Android/.idea/modules.xml
 delete mode 100644 Source/Android/.idea/scopes/scope_settings.xml
 delete mode 100644 Source/Android/.idea/vcs.xml
 delete mode 100644 Source/Android/.idea/workspace.xml
 delete mode 100644 Source/Android/Android.iml

diff --git a/Source/Android/.idea/.name b/Source/Android/.idea/.name
deleted file mode 100644
index 1429c13e57..0000000000
--- a/Source/Android/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-Android
\ No newline at end of file
diff --git a/Source/Android/.idea/compiler.xml b/Source/Android/.idea/compiler.xml
deleted file mode 100644
index 9292f81c68..0000000000
--- a/Source/Android/.idea/compiler.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <excludeFromCompile>
-      <directory url="file://$PROJECT_DIR$/gen" includeSubdirectories="true" />
-    </excludeFromCompile>
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-  <component name="JavacSettings">
-    <option name="MAXIMUM_HEAP_SIZE" value="512" />
-  </component>
-</project>
-
diff --git a/Source/Android/.idea/copyright/profiles_settings.xml b/Source/Android/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index d02d5cbd75..0000000000
--- a/Source/Android/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="Dolphin">
-    <module2copyright>
-      <element module="Copywrite" copyright="Dolphin" />
-    </module2copyright>
-  </settings>
-</component>
\ No newline at end of file
diff --git a/Source/Android/.idea/encodings.xml b/Source/Android/.idea/encodings.xml
deleted file mode 100644
index e206d70d85..0000000000
--- a/Source/Android/.idea/encodings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
diff --git a/Source/Android/.idea/libraries/dexedLibs.xml b/Source/Android/.idea/libraries/dexedLibs.xml
deleted file mode 100644
index d8e5061380..0000000000
--- a/Source/Android/.idea/libraries/dexedLibs.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="dexedLibs">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/bin/dexedLibs/library-f3f525b7017bd70eb33262cbaaf909f6.jar!/" />
-      <root url="jar://$PROJECT_DIR$/bin/dexedLibs/library-7180f05db1823245b4a6600ab592b5c5.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/Source/Android/.idea/misc.xml b/Source/Android/.idea/misc.xml
deleted file mode 100644
index 1c9e3220c5..0000000000
--- a/Source/Android/.idea/misc.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android 4.2.2" project-jdk-type="Android SDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
-
diff --git a/Source/Android/.idea/modules.xml b/Source/Android/.idea/modules.xml
deleted file mode 100644
index 746019cd05..0000000000
--- a/Source/Android/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/Android.iml" filepath="$PROJECT_DIR$/Android.iml" />
-    </modules>
-  </component>
-</project>
-
diff --git a/Source/Android/.idea/scopes/scope_settings.xml b/Source/Android/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b843..0000000000
--- a/Source/Android/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/Source/Android/.idea/vcs.xml b/Source/Android/.idea/vcs.xml
deleted file mode 100644
index def6a6a184..0000000000
--- a/Source/Android/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
-  </component>
-</project>
-
diff --git a/Source/Android/.idea/workspace.xml b/Source/Android/.idea/workspace.xml
deleted file mode 100644
index c39565e7e4..0000000000
--- a/Source/Android/.idea/workspace.xml
+++ /dev/null
@@ -1,955 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AndroidLayoutPreviewToolWindow">
-    <option name="state">
-      <GlobalState>
-        <option name="visible" value="false" />
-      </GlobalState>
-    </option>
-  </component>
-  <component name="AndroidLayouts">
-    <shared>
-      <config>
-        <target>android-17</target>
-      </config>
-    </shared>
-    <layouts>
-      <layout url="file://$PROJECT_DIR$/res/layout/folderbrowser.xml">
-        <config>
-          <device>Nexus 4</device>
-          <theme>@android:style/Theme.Holo</theme>
-        </config>
-      </layout>
-      <layout url="file://$PROJECT_DIR$/res/layout/gamelist_layout.xml">
-        <config>
-          <device>Nexus 4</device>
-          <theme>@android:style/Theme.Holo</theme>
-        </config>
-      </layout>
-    </layouts>
-  </component>
-  <component name="BookmarkManager">
-    <bookmark url="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" line="27" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="682e8195-a9c2-48a7-a941-e8c10f5cb64a" name="Default" comment="" />
-    <ignored path="Android.iws" />
-    <ignored path=".idea/workspace.xml" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
-  <component name="Commander">
-    <leftPanel />
-    <rightPanel />
-    <splitter proportion="0.5" />
-  </component>
-  <component name="CompilerWorkspaceConfiguration">
-    <option name="PARALLEL_COMPILATION" value="true" />
-  </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="DaemonCodeAnalyzer">
-    <disable_hints />
-  </component>
-  <component name="DebuggerManager">
-    <breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
-      <breakpoint>
-        <option name="NOTIFY_CAUGHT" value="true" />
-        <option name="NOTIFY_UNCAUGHT" value="true" />
-        <option name="ENABLED" value="false" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="REMOVE_AFTER_HIT" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="SUSPEND" value="true" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="true" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-      <breakpoint>
-        <option name="NOTIFY_CAUGHT" value="true" />
-        <option name="NOTIFY_UNCAUGHT" value="true" />
-        <option name="ENABLED" value="false" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="REMOVE_AFTER_HIT" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="SUSPEND" value="true" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="true" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-    </breakpoint_any>
-    <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
-    <breakpoint_rules />
-    <ui_properties />
-  </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
-  <component name="FavoritesManager">
-    <favorites_list name="Android" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="DolphinEmulator.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="224" column="45" selection-start="6730" selection-end="6769" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4302">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="GameListActivity.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="173" column="16" selection-start="5541" selection-end="5638" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4068">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PrefsActivity.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="21" column="4" selection-start="629" selection-end="629" vertical-scroll-proportion="0.7099237" vertical-offset="99" max-vertical-offset="4014">
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FindManager">
-    <FindUsagesManager>
-      <setting name="OPEN_NEW_TAB" value="false" />
-    </FindUsagesManager>
-  </component>
-  <component name="GenerateSignedApkSettings">
-    <option name="KEY_STORE_PATH" value="$USER_HOME$/my-release-key.keystore" />
-    <option name="KEY_ALIAS" value="ryanhkey" />
-    <option name="REMEMBER_PASSWORDS" value="true" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../.." />
-  </component>
-  <component name="GitLogSettings">
-    <option name="myDateState">
-      <MyDateState />
-    </option>
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="changedFiles">
-      <list>
-        <option value="$PROJECT_DIR$/project.properties" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java" />
-        <option value="$PROJECT_DIR$/assets/GCPadNew.ini" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeLibrary.java" />
-        <option value="$PROJECT_DIR$/AndroidManifest.xml" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/AboutActivity.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListFragment.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java" />
-        <option value="$PROJECT_DIR$/res/values/prefvalues.xml" />
-        <option value="$PROJECT_DIR$/res/layout/prefs.xml" />
-        <option value="$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java" />
-      </list>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState />
-  </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="27" />
-    <option name="width" value="1339" />
-    <option name="height" value="744" />
-  </component>
-  <component name="ProjectInspectionProfilesVisibleTreeState">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State>
-            <id />
-          </State>
-        </expanded-state>
-        <selected-state>
-          <State>
-            <id>Abstraction issues</id>
-          </State>
-        </selected-state>
-      </profile-state>
-    </entry>
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="1" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectReloadState">
-    <option name="STATE" value="0" />
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="Scope" currentSubView="Project Files" proportions="" version="1" splitterProportion="0.5">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-    </navigator>
-    <panes>
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Android" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dolphinemu" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="Scope">
-        <subPane subId="Project Files">
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="src">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="org/dolphinemu/dolphinemu">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="res">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="values">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="res">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="layout">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="res">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="libs">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT USER_OBJECT="Root">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="Android">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT USER_OBJECT="assets">
-              <option name="myItemId" value="" />
-              <option name="myItemType" value="" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="project.structure.last.edited" value="Artifacts" />
-    <property name="project.structure.proportion" value="0.0" />
-    <property name="options.splitter.main.proportions" value="0.3" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="recentsLimit" value="5" />
-    <property name="ExportedApkPath" value="$USER_HOME$/Desktop/DolphinEmu-0.9.apk" />
-    <property name="options.lastSelected" value="copyright" />
-    <property name="ExportedModule" value="Android" />
-    <property name="last_opened_file_path" value="$USER_HOME$/NavigationDrawer/libs/android-support-v4.jar" />
-    <property name="project.structure.side.proportion" value="0.2" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="978fa698" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-    <property name="AndroidRunProguardForReleaseBuild" value="false" />
-    <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="Mips" />
-    <property name="restartRequiresConfirmation" value="true" />
-    <property name="FullScreen" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="dynamic.classpath" value="false" />
-    <property name="options.searchVisible" value="true" />
-    <property name="options.splitter.details.proportions" value="0.2" />
-  </component>
-  <component name="RunManager" selected="Android Application.Dolphin Emulator">
-    <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
-      <module name="" />
-      <option name="TESTING_TYPE" value="0" />
-      <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="CLASS_NAME" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="USE_COMMAND_LINE" value="true" />
-      <option name="COMMAND_LINE" value="" />
-      <option name="WIPE_USER_DATA" value="false" />
-      <option name="DISABLE_BOOT_ANIMATION" value="false" />
-      <option name="NETWORK_SPEED" value="full" />
-      <option name="NETWORK_LATENCY" value="none" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <module name="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <method />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs />
-      <patterns />
-      <method />
-    </configuration>
-    <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
-      <module name="" />
-      <option name="ACTIVITY_CLASS" value="" />
-      <option name="MODE" value="default_activity" />
-      <option name="DEPLOY" value="true" />
-      <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="USE_COMMAND_LINE" value="true" />
-      <option name="COMMAND_LINE" value="" />
-      <option name="WIPE_USER_DATA" value="false" />
-      <option name="DISABLE_BOOT_ANIMATION" value="false" />
-      <option name="NETWORK_SPEED" value="full" />
-      <option name="NETWORK_LATENCY" value="none" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <method />
-    </configuration>
-    <configuration default="false" name="Dolphin Emulator" type="AndroidRunConfigurationType" factoryName="Android Application">
-      <module name="Android" />
-      <option name="ACTIVITY_CLASS" value="" />
-      <option name="MODE" value="default_activity" />
-      <option name="DEPLOY" value="true" />
-      <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-      <option name="PREFERRED_AVD" value="" />
-      <option name="USE_COMMAND_LINE" value="true" />
-      <option name="COMMAND_LINE" value="" />
-      <option name="WIPE_USER_DATA" value="false" />
-      <option name="DISABLE_BOOT_ANIMATION" value="false" />
-      <option name="NETWORK_SPEED" value="full" />
-      <option name="NETWORK_LATENCY" value="none" />
-      <option name="CLEAR_LOGCAT" value="false" />
-      <RunnerSettings RunnerId="AndroidDebugRunner" />
-      <ConfigurationWrapper RunnerId="AndroidDebugRunner" />
-      <method />
-    </configuration>
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="Android Application.Dolphin Emulator" />
-    </list>
-    <configuration name="&lt;template&gt;" type="TestNG" default="true" selected="false">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    </configuration>
-    <configuration name="&lt;template&gt;" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" default="true" selected="false">
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-    </configuration>
-    <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
-      <Host>localhost</Host>
-      <Port>5050</Port>
-    </configuration>
-  </component>
-  <component name="ShelveChangesManager" show_recycled="false" />
-  <component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="false" SSL_PROTOCOLS="all">
-    <option name="USER" value="" />
-    <option name="PASSWORD" value="" />
-    <option name="mySSHConnectionTimeout" value="30000" />
-    <option name="mySSHReadTimeout" value="30000" />
-    <option name="LAST_MERGED_REVISION" />
-    <option name="MERGE_DRY_RUN" value="false" />
-    <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
-    <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
-    <option name="IGNORE_SPACES_IN_MERGE" value="false" />
-    <option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
-    <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
-    <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
-    <option name="FORCE_UPDATE" value="false" />
-    <option name="IGNORE_EXTERNALS" value="false" />
-    <myIsUseDefaultProxy>false</myIsUseDefaultProxy>
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="682e8195-a9c2-48a7-a941-e8c10f5cb64a" name="Default" comment="" />
-      <created>1368695084085</created>
-      <updated>1368695084085</updated>
-      <workItem from="1368695097983" duration="553000" />
-      <workItem from="1368695712903" duration="805000" />
-      <workItem from="1368849359745" duration="3003000" />
-      <workItem from="1368867565839" duration="1956000" />
-      <workItem from="1368872339338" duration="8211000" />
-      <workItem from="1368954925765" duration="561000" />
-      <workItem from="1368955681290" duration="2332000" />
-      <workItem from="1368958063194" duration="125000" />
-      <workItem from="1368958842851" duration="47000" />
-      <workItem from="1369030521257" duration="6092000" />
-      <workItem from="1369127738883" duration="3497000" />
-      <workItem from="1369215536267" duration="2414000" />
-      <workItem from="1369296443609" duration="7832000" />
-      <workItem from="1369308108390" duration="81000" />
-      <workItem from="1369310924441" duration="263000" />
-      <workItem from="1369391881947" duration="6610000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="47388000" />
-  </component>
-  <component name="TodoView" selected-index="0">
-    <todo-panel id="selected-file">
-      <are-packages-shown value="false" />
-      <are-modules-shown value="false" />
-      <flatten-packages value="false" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-    <todo-panel id="all">
-      <are-packages-shown value="true" />
-      <are-modules-shown value="false" />
-      <flatten-packages value="false" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-    <todo-panel id="default-changelist">
-      <are-packages-shown value="false" />
-      <are-modules-shown value="false" />
-      <flatten-packages value="false" />
-      <is-autoscroll-to-source value="false" />
-    </todo-panel>
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="27" y="0" width="1339" height="744" extended-state="0" />
-    <editor active="true" />
-    <layout>
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6912752" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29865772" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2179289" sideWeight="0.29026845" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32659933" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21301317" sideWeight="0.7104377" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28956228" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-    </layout>
-    <layout-to-restore>
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13678516" sideWeight="0.6912752" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17851622" sideWeight="0.6912752" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17619784" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32885906" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29865772" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2179289" sideWeight="0.29026845" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32718122" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7466443" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998326" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32998455" sideWeight="0.69630873" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21378776" sideWeight="0.70637584" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2496136" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29362416" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-    </layout-to-restore>
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
-    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
-    <option name="CHECK_NEW_TODO" value="true" />
-    <option name="myTodoPanelSettings">
-      <value>
-        <are-packages-shown value="false" />
-        <are-modules-shown value="false" />
-        <flatten-packages value="false" />
-        <is-autoscroll-to-source value="false" />
-      </value>
-    </option>
-    <option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
-    <option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
-    <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
-    <option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
-    <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
-    <option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
-    <option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
-    <option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
-    <option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
-    <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
-    <option name="DEFAULT_PATCH_EXTENSION" value="patch" />
-    <option name="SHORT_DIFF_HORIZONTALLY" value="true" />
-    <option name="SHORT_DIFF_EXTRA_LINES" value="2" />
-    <option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
-    <option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
-    <option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
-    <option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
-    <option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="false" />
-    <option name="SHOW_DIRTY_RECURSIVELY" value="false" />
-    <option name="LIMIT_HISTORY" value="true" />
-    <option name="MAXIMUM_HISTORY_ROWS" value="1000" />
-    <option name="UPDATE_FILTER_SCOPE_NAME" />
-    <option name="USE_COMMIT_MESSAGE_MARGIN" value="false" />
-    <option name="COMMIT_MESSAGE_MARGIN_SIZE" value="72" />
-    <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="false" />
-    <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" />
-    <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
-    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
-    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
-    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
-    <option name="ACTIVE_VCS_NAME" />
-    <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
-    <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
-    <option name="UPDATE_FILTER_BY_SCOPE" value="false" />
-    <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
-    <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/assets/GCPadNew.ini">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="3" column="13" selection-start="76" selection-end="76" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="525" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeGLSurfaceView.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="59" column="5" selection-start="1460" selection-end="1460" vertical-scroll-proportion="0.8684211" vertical-offset="360" max-vertical-offset="975">
-          <folding>
-            <element signature="e#493#661#0" expanded="false" />
-            <element signature="e#654#655#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/NativeLibrary.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="23" column="46" selection-start="1055" selection-end="1055" vertical-scroll-proportion="0.4467005" vertical-offset="154" max-vertical-offset="630">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/AboutActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="26" column="125" selection-start="741" selection-end="741" vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="495">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListFragment.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="60" column="151" selection-start="2013" selection-end="2013" vertical-scroll-proportion="-1.4281985" vertical-offset="1237" max-vertical-offset="1620">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="45" column="42" selection-start="1242" selection-end="1242" vertical-scroll-proportion="0.50174826" vertical-offset="283" max-vertical-offset="855">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/FolderBrowser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="73" column="12" selection-start="2651" selection-end="2651" vertical-scroll-proportion="0.026223777" vertical-offset="1080" max-vertical-offset="1710">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="3" column="26" selection-start="174" selection-end="174" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="825">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/InputConfigActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="97" column="16" selection-start="3629" selection-end="3721" vertical-scroll-proportion="0.03787879" vertical-offset="1230" max-vertical-offset="2775">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListItem.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="22" column="24" selection-start="570" selection-end="570" vertical-scroll-proportion="0.0" vertical-offset="405" max-vertical-offset="1140">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/GameListActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="173" column="16" selection-start="5541" selection-end="5638" vertical-scroll-proportion="0.0" vertical-offset="2070" max-vertical-offset="3390">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/DolphinEmulator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="224" column="45" selection-start="6730" selection-end="6769" vertical-scroll-proportion="0.0" vertical-offset="2668" max-vertical-offset="3315">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/res/values/prefvalues.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="8" column="14" selection-start="231" selection-end="248" vertical-scroll-proportion="0.25396827" vertical-offset="0" max-vertical-offset="567">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/res/values/strings.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="396">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/res/layout/prefs.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="20" column="33" selection-start="799" selection-end="819" vertical-scroll-proportion="0.66790354" vertical-offset="0" max-vertical-offset="539">
-          <folding />
-        </state>
-      </provider>
-      <provider editor-type-id="android-designer">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/dolphinemu/dolphinemu/PrefsActivity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="21" column="4" selection-start="629" selection-end="629" vertical-scroll-proportion="0.7099237" vertical-offset="99" max-vertical-offset="4014">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ArtifactsStructureConfigurable.UI">
-        <settings>
-          <artifact-editor />
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="Copyright.UI">
-        <settings>
-          <last-edited>Dolphin</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="FacetStructureConfigurable.UI">
-        <settings>
-          <last-edited>Dolphin Emulator (Android)|Android</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ModuleStructureConfigurable.UI">
-        <settings>
-          <last-edited>Android</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-                <option value="0.5" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>Android 4.2.2</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>dexedLibs</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ScopeChooserConfigurable.UI">
-        <settings>
-          <last-edited>Copywrite</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-          <order>
-            <scope name="Copywrite" />
-          </order>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>
-
diff --git a/Source/Android/Android.iml b/Source/Android/Android.iml
deleted file mode 100644
index 3ad11d598f..0000000000
--- a/Source/Android/Android.iml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Dolphin Emulator">
-      <configuration>
-        <notImportedProperties>
-          <property>MANIFEST_FILE_PATH</property>
-          <property>RESOURCES_DIR_PATH</property>
-          <property>ASSETS_DIR_PATH</property>
-          <property>NATIVE_LIBS_DIR_PATH</property>
-        </notImportedProperties>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="android-support-v13" level="project" />
-  </component>
-</module>
-

From 023922cd5ba260ff12e69feeb36dc8449445b734 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 16 Jul 2013 05:32:14 -0500
Subject: [PATCH 296/352] [Android] Start making it so the side pane is visible
 on all activities by converting them to fragments. Only Browse Folder and
 Gamepad Config remain. Fix a issue that Lioncash introduced where no games
 would show up in the folder browser or the game list.

---
 Source/Android/AndroidManifest.xml            |   4 +-
 .../dolphinemu/dolphinemu/AboutActivity.java  |  31 ---
 .../dolphinemu/dolphinemu/AboutFragment.java  |  61 +++++
 .../dolphinemu/dolphinemu/FolderBrowser.java  |   4 +-
 .../dolphinemu/GameListActivity.java          | 154 +++++++------
 .../dolphinemu/GameListFragment.java          |   2 +-
 .../dolphinemu/dolphinemu/PrefsActivity.java  | 217 ------------------
 .../dolphinemu/dolphinemu/PrefsFragment.java  | 207 +++++++++++++++++
 8 files changed, 363 insertions(+), 317 deletions(-)
 delete mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/AboutActivity.java
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
 delete mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java
 create mode 100644 Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java

diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index a265840ea2..3cd0b19614 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -36,13 +36,13 @@
             android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
         </activity>
         <activity
-                android:name=".PrefsActivity" >
+                android:name=".PrefsFragment" >
         </activity>
         <activity
             android:name=".GameListActivity" >
         </activity>
         <activity
-            android:name=".AboutActivity" >
+            android:name=".AboutFragment" >
         </activity>
     </application>
 
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/AboutActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/AboutActivity.java
deleted file mode 100644
index 5725651c9b..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/AboutActivity.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.dolphinemu.dolphinemu;
-
-import android.app.ListActivity;
-import android.os.Bundle;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-public class AboutActivity extends ListActivity {
-	private FolderBrowserAdapter adapter;
-	private int configPosition = 0;
-	boolean Configuring = false;
-	boolean firstEvent = true;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState)
-	{
-		super.onCreate(savedInstanceState);
-		List<GameListItem> Input = new ArrayList<GameListItem>();
-		int a = 0;
-
-		Input.add(a++, new GameListItem(getApplicationContext(), "Build Revision", NativeLibrary.GetVersionString(), "", true));
-		adapter = new FolderBrowserAdapter(this, R.layout.folderbrowser, Input);
-		setListAdapter(adapter);
-	}
-}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
new file mode 100644
index 0000000000..4f0cf10702
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
@@ -0,0 +1,61 @@
+package org.dolphinemu.dolphinemu;
+
+import android.app.Activity;
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2
+ * Refer to the license.txt file included.
+ */
+public class AboutFragment extends Fragment {
+	private static Activity m_activity;
+
+	private ListView mMainList;
+
+	private FolderBrowserAdapter adapter;
+	private int configPosition = 0;
+	boolean Configuring = false;
+	boolean firstEvent = true;
+
+	public AboutFragment() {
+		// Empty constructor required for fragment subclasses
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+	                         Bundle savedInstanceState) {
+		View rootView = inflater.inflate(R.layout.gamelist_listview, container, false);
+		mMainList = (ListView) rootView.findViewById(R.id.gamelist);
+
+		List<GameListItem> Input = new ArrayList<GameListItem>();
+		int a = 0;
+
+		Input.add(a++, new GameListItem(m_activity, "Build Revision", NativeLibrary.GetVersionString(), "", true));
+		adapter = new FolderBrowserAdapter(m_activity, R.layout.folderbrowser, Input);
+		mMainList.setAdapter(adapter);
+
+		return mMainList;
+	}
+	@Override
+	public void onAttach(Activity activity) {
+		super.onAttach(activity);
+
+		// This makes sure that the container activity has implemented
+		// the callback interface. If not, it throws an exception
+		try {
+			m_activity = activity;
+		} catch (ClassCastException e) {
+			throw new ClassCastException(activity.toString()
+					+ " must implement OnGameListZeroListener");
+		}
+	}
+}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
index c5bfc380f8..130919cf8d 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
@@ -50,11 +50,11 @@ public class FolderBrowser extends ListActivity {
 					}
 					else
 					{
-						if (validExts.contains(entryName.toLowerCase()))
+						if (validExts.contains(entryName.toLowerCase().substring(entryName.lastIndexOf('.'))))
 						{
 							fls.add(new GameListItem(getApplicationContext(), entryName,"File Size: "+entry.length(),entry.getAbsolutePath(), true));
 						}
-						else if (archiveExts.contains(entryName.toLowerCase()))
+						else if (archiveExts.contains(entryName.toLowerCase().substring(entryName.lastIndexOf('.'))))
 						{
 							fls.add(new GameListItem(getApplicationContext(), entryName,"File Size: "+entry.length(),entry.getAbsolutePath(), false));
 						}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
index cedf728574..2c8a0e61a8 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
@@ -28,6 +28,7 @@ import java.util.List;
 public class GameListActivity extends Activity
 		implements GameListFragment.OnGameListZeroListener{
 
+	private int mCurPage = 0;
 	enum keyTypes {TYPE_STRING, TYPE_BOOL};
 
 	private ActionBarDrawerToggle mDrawerToggle;
@@ -53,10 +54,11 @@ public class GameListActivity extends Activity
 		mDrawerList = (ListView) findViewById(R.id.left_drawer);
 
 		List<SideMenuItem> dir = new ArrayList<SideMenuItem>();
-		dir.add(new SideMenuItem("Browse Folder", 0));
-		dir.add(new SideMenuItem("Settings", 1));
-		dir.add(new SideMenuItem("Gamepad Config", 2));
-		dir.add(new SideMenuItem("About", 3));
+		dir.add(new SideMenuItem("Game List", 0));
+		dir.add(new SideMenuItem("Browse Folder", 1));
+		dir.add(new SideMenuItem("Settings", 2));
+		dir.add(new SideMenuItem("Gamepad Config", 3));
+		dir.add(new SideMenuItem("About", 4));
 
 		mDrawerAdapter = new SideMenuAdapter(this, R.layout.sidemenu, dir);
 		mDrawerList.setAdapter(mDrawerAdapter);
@@ -94,67 +96,15 @@ public class GameListActivity extends Activity
 		FragmentManager fragmentManager = getFragmentManager();
 		fragmentManager.beginTransaction().replace(R.id.content_frame, fragment).commit();
 	}
-
-	private AdapterView.OnItemClickListener mMenuItemClickListener = new AdapterView.OnItemClickListener()
+	private void SwitchPage(int toPage)
 	{
-		public void onItemClick(AdapterView<?> parent, View view, int position, long id)
+		if (mCurPage == toPage)
+			return;
+		switch (mCurPage)
 		{
-			SideMenuItem o = mDrawerAdapter.getItem(position);
-			mDrawerLayout.closeDrawer(mDrawerList);
-
-			switch(o.getID())
-			{
-				case 0:
-					Toast.makeText(mMe, "Loading up the browser", Toast.LENGTH_SHORT).show();
-					Intent ListIntent = new Intent(mMe, FolderBrowser.class);
-					startActivityForResult(ListIntent, 1);
-					break;
-				case 1:
-					Toast.makeText(mMe, "Loading up settings", Toast.LENGTH_SHORT).show();
-					Intent SettingIntent = new Intent(mMe, PrefsActivity.class);
-					startActivityForResult(SettingIntent, 2);
-					break;
-				case 2:
-					Toast.makeText(mMe, "Loading up gamepad config", Toast.LENGTH_SHORT).show();
-					Intent ConfigIntent = new Intent(mMe, InputConfigActivity.class);
-					startActivityForResult(ConfigIntent, 3);
-					break;
-				case 3:
-					Toast.makeText(mMe, "Loading up About", Toast.LENGTH_SHORT).show();
-					Intent AboutIntent = new Intent(mMe, AboutActivity.class);
-					startActivityForResult(AboutIntent, 3);
-					break;
-				default:
-					break;
-			}
-
-		}
-	};
-	@Override
-	public void onActivityResult(int requestCode, int resultCode, Intent data)
-	{
-		super.onActivityResult(requestCode, resultCode, data);
-
-		switch (requestCode)
-		{
-			// Browse
-			case 1:
-				if (resultCode == Activity.RESULT_OK)
-				{
-					String FileName = data.getStringExtra("Select");
-					Toast.makeText(this, "Folder Selected: " + FileName, Toast.LENGTH_SHORT).show();
-					String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
-					int intDirectories = Integer.parseInt(Directories);
-					Directories = Integer.toString(intDirectories + 1);
-					NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPathes", Directories);
-					NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPath" + Integer.toString(intDirectories), FileName);
-
-					recreateFragment();
-				}
-				break;
 			// Settings
 			case 2:
-
+			{
 				String Keys[] = {
 						"cpupref",
 						"dualcorepref",
@@ -193,9 +143,85 @@ public class GameListActivity extends Activity
 					}
 
 				}
-				break;
+			}
+			break;
+			case 0: // Settings
 			case 3: // Gamepad settings
-		        /* Do Nothing */
+	        /* Do Nothing */
+				break;
+		}
+		switch(toPage)
+		{
+			case 0:
+			{
+				mCurPage = 0;
+				Fragment fragment = new GameListFragment();
+				FragmentManager fragmentManager = getFragmentManager();
+				fragmentManager.beginTransaction().replace(R.id.content_frame, fragment).commit();
+			}
+			break;
+			case 1:
+				Toast.makeText(mMe, "Loading up the browser", Toast.LENGTH_SHORT).show();
+				Intent ListIntent = new Intent(mMe, FolderBrowser.class);
+				startActivityForResult(ListIntent, 1);
+				break;
+			case 2:
+			{
+				Toast.makeText(mMe, "Loading up settings", Toast.LENGTH_SHORT).show();
+				mCurPage = 2;
+				Fragment fragment = new PrefsFragment();
+				FragmentManager fragmentManager = getFragmentManager();
+				fragmentManager.beginTransaction().replace(R.id.content_frame, fragment).commit();
+			}
+			break;
+			case 3:
+				Toast.makeText(mMe, "Loading up gamepad config", Toast.LENGTH_SHORT).show();
+				Intent ConfigIntent = new Intent(mMe, InputConfigActivity.class);
+				startActivityForResult(ConfigIntent, 3);
+				break;
+			case 4:
+			{
+				Toast.makeText(mMe, "Loading up About", Toast.LENGTH_SHORT).show();
+				mCurPage = 4;
+				Fragment fragment = new AboutFragment();
+				FragmentManager fragmentManager = getFragmentManager();
+				fragmentManager.beginTransaction().replace(R.id.content_frame, fragment).commit();
+			}
+			break;
+			default:
+				break;
+		}
+	}
+	private AdapterView.OnItemClickListener mMenuItemClickListener = new AdapterView.OnItemClickListener()
+	{
+		public void onItemClick(AdapterView<?> parent, View view, int position, long id)
+		{
+			SideMenuItem o = mDrawerAdapter.getItem(position);
+			mDrawerLayout.closeDrawer(mDrawerList);
+			SwitchPage(o.getID());
+		}
+	};
+	@Override
+	public void onActivityResult(int requestCode, int resultCode, Intent data)
+	{
+		super.onActivityResult(requestCode, resultCode, data);
+
+		switch (requestCode)
+		{
+			// Browse
+			case 1:
+				if (resultCode == Activity.RESULT_OK)
+				{
+					String FileName = data.getStringExtra("Select");
+					Toast.makeText(this, "Folder Selected: " + FileName, Toast.LENGTH_SHORT).show();
+					String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
+					int intDirectories = Integer.parseInt(Directories);
+					Directories = Integer.toString(intDirectories + 1);
+					NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPathes", Directories);
+					NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPath" + Integer.toString(intDirectories), FileName);
+
+					recreateFragment();
+				}
 				break;
 		}
 	}
@@ -235,7 +261,7 @@ public class GameListActivity extends Activity
 	}
 	public void onBackPressed()
 	{
-
+		SwitchPage(0);
 	}
 
 
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java
index 627549b926..152c18662b 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java
@@ -62,7 +62,7 @@ public class GameListFragment extends Fragment
 					{
 						if(!entry.isDirectory())
 						{
-							if (exts.contains(entryName.toLowerCase()))
+							if (exts.contains(entryName.toLowerCase().substring(entryName.lastIndexOf('.'))))
 								fls.add(new GameListItem(mMe.getApplicationContext(), entryName,"File Size: "+entry.length(),entry.getAbsolutePath(), true));
 						}
 					}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java
deleted file mode 100644
index 772f2b9cb6..0000000000
--- a/Source/Android/src/org/dolphinemu/dolphinemu/PrefsActivity.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package org.dolphinemu.dolphinemu;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.ListPreference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceCategory;
-import android.preference.PreferenceFragment;
-
-import javax.microedition.khronos.egl.*;
-import javax.microedition.khronos.opengles.GL10;
-
-/**
- * Copyright 2013 Dolphin Emulator Project
- * Licensed under GPLv2
- * Refer to the license.txt file included.
- */
-public class PrefsActivity extends PreferenceActivity {
-	private PrefsActivity m_activity;
-	
-	private String m_GLVersion;
-	private String m_GLVendor;
-	private String m_GLRenderer;
-
-
-	public class VersionCheck {
-		EGL10 mEGL;
-		EGLDisplay mEGLDisplay;
-		EGLConfig[] mEGLConfigs;
-		EGLConfig mEGLConfig;
-		EGLContext mEGLContext;
-		EGLSurface mEGLSurface;
-		GL10 mGL;
-
-		String mThreadOwner;
-
-		public VersionCheck() {
-
-			int[] version = new int[2];
-			int[] attribList = new int[] {
-					EGL10.EGL_WIDTH, 1,
-					EGL10.EGL_HEIGHT, 1,
-					EGL10.EGL_RENDERABLE_TYPE, 4,
-					EGL10.EGL_NONE
-			};
-
-			// No error checking performed, minimum required code to elucidate logic
-			mEGL = (EGL10) EGLContext.getEGL();
-			mEGLDisplay = mEGL.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
-			mEGL.eglInitialize(mEGLDisplay, version);
-			mEGLConfig = chooseConfig(); // Choosing a config is a little more complicated
-			mEGLContext = mEGL.eglCreateContext(mEGLDisplay, mEGLConfig, EGL10.EGL_NO_CONTEXT, null);
-			mEGLSurface = mEGL.eglCreatePbufferSurface(mEGLDisplay, mEGLConfig,  attribList);
-			mEGL.eglMakeCurrent(mEGLDisplay, mEGLSurface, mEGLSurface, mEGLContext);
-			mGL = (GL10) mEGLContext.getGL();
-
-			// Record thread owner of OpenGL context
-			mThreadOwner = Thread.currentThread().getName();
-		}
-
-		public String getVersion()
-		{
-			return mGL.glGetString(GL10.GL_VERSION);
-		}
-
-		public String getVendor()
-		{
-			return mGL.glGetString(GL10.GL_VENDOR);
-		}
-		public String getRenderer()
-		{
-			return mGL.glGetString(GL10.GL_RENDERER);
-		}
-		private EGLConfig chooseConfig() {
-			int[] attribList = new int[] {
-					EGL10.EGL_DEPTH_SIZE, 0,
-					EGL10.EGL_STENCIL_SIZE, 0,
-					EGL10.EGL_RED_SIZE, 8,
-					EGL10.EGL_GREEN_SIZE, 8,
-					EGL10.EGL_BLUE_SIZE, 8,
-					EGL10.EGL_ALPHA_SIZE, 8,
-					EGL10.EGL_NONE
-			};
-
-			// No error checking performed, minimum required code to elucidate logic
-			// Expand on this logic to be more selective in choosing a configuration
-			int[] numConfig = new int[1];
-			mEGL.eglChooseConfig(mEGLDisplay, attribList, null, 0, numConfig);
-			int configSize = numConfig[0];
-			mEGLConfigs = new EGLConfig[configSize];
-			mEGL.eglChooseConfig(mEGLDisplay, attribList, mEGLConfigs, configSize, numConfig);
-
-			return mEGLConfigs[0];  // Best match is probably the first configuration
-		}
-	}
-
-
-
-    public class PrefsFragment extends PreferenceFragment {
-
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-
-            // Load the preferences from an XML resource
-            addPreferencesFromResource(R.layout.prefs);
-
-	        final ListPreference etp = new ListPreference(m_activity);
-	        CharSequence[] _entries;
-	        CharSequence[] _entryvalues;
-
-	        if (Build.CPU_ABI.contains("x86"))
-	        {
-		        _entries = new CharSequence[] {
-			        "Interpreter",
-			        "JIT64 Recompiler",
-			        "JITIL Recompiler",
-		        };
-		        _entryvalues = new CharSequence[] {"0", "1", "2"};
-	        }
-	        else if (Build.CPU_ABI.contains("arm"))
-	        {
-		        _entries = new CharSequence[] {
-				        "Interpreter",
-				        "JIT ARM Recompiler",
-		        };
-		        _entryvalues = new CharSequence[] {"0", "3"};
-	        }
-	        else
-	        {
-		        _entries = new CharSequence[] {
-				        "Interpreter",
-		        };
-		        _entryvalues = new CharSequence[] {"0"};
-	        }
-
-	        etp.setEntries(_entries);
-	        etp.setEntryValues(_entryvalues);
-	        etp.setKey("cpupref");
-	        etp.setTitle("CPU Core");
-	        etp.setSummary("Emulation core to use");
-
-	        PreferenceCategory mCategory = (PreferenceCategory) findPreference("cpuprefcat");
-	        mCategory.addPreference(etp);
-	        VersionCheck mbuffer = new VersionCheck();
-	        m_GLVersion = mbuffer.getVersion();
-	        m_GLVendor = mbuffer.getVendor();
-	        m_GLRenderer = mbuffer.getRenderer();
-
-	        boolean mSupportsGLES3 = false;
-
-	        if (m_GLVersion.contains("OpenGL ES 3.0")) // 3.0 support
-	            mSupportsGLES3 = true;
-			if (!mSupportsGLES3 && m_GLVendor.equals("Qualcomm"))
-	        {
-		        if (m_GLRenderer.contains("Adreno (TM) 3"))
-		        {
-			        int mVStart, mVEnd = 0;
-			        float mVersion;
-			        mVStart = m_GLVersion.indexOf("V@") + 2;
-			        for (int a = mVStart; a < m_GLVersion.length(); ++a)
-				        if (m_GLVersion.charAt(a) == ' ')
-				        {
-					        mVEnd = a;
-					        break;
-				        }
-			        mVersion = Float.parseFloat(m_GLVersion.substring(mVStart, mVEnd));
-
-			        if (mVersion >= 14.0f)
-				        mSupportsGLES3 = true;
-		        }
-	        }
-
-	        if (!mSupportsGLES3)
-	        {
-		        mCategory = (PreferenceCategory) findPreference("videoprefcat");
-		        ListPreference mPref = (ListPreference) findPreference("gpupref");
-		        mCategory.removePreference(mPref);
-
-		        final ListPreference videobackend = new ListPreference(m_activity);
-
-		        _entries = new CharSequence[] {
-				        "Software Renderer",
-		        };
-		        _entryvalues = new CharSequence[] {"Software Renderer"};
-
-		        videobackend.setKey("gpupref");
-		        videobackend.setTitle("Video Backend");
-		        videobackend.setSummary("Video backend to use");
-
-		        videobackend.setEntries(_entries);
-		        videobackend.setEntryValues(_entryvalues);
-
-		        mCategory.addPreference(videobackend);
-	        }
-        }
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-	    m_activity = this;
-
-        getFragmentManager().beginTransaction().replace(android.R.id.content,
-                new PrefsFragment()).commit();
-    }
-    @Override
-    public void onBackPressed() {
-        Intent intent = new Intent();
-        setResult(Activity.RESULT_OK, intent);
-        this.finish();
-        super.onBackPressed();
-    }
-}
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java
new file mode 100644
index 0000000000..d039c236bb
--- /dev/null
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java
@@ -0,0 +1,207 @@
+package org.dolphinemu.dolphinemu;
+
+import android.app.Activity;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.ListPreference;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceFragment;
+
+import javax.microedition.khronos.egl.*;
+import javax.microedition.khronos.opengles.GL10;
+
+/**
+ * Copyright 2013 Dolphin Emulator Project
+ * Licensed under GPLv2
+ * Refer to the license.txt file included.
+ */
+public class PrefsFragment extends PreferenceFragment {
+	private Activity m_activity;
+	
+	private String m_GLVersion;
+	private String m_GLVendor;
+	private String m_GLRenderer;
+
+
+	public class VersionCheck {
+		EGL10 mEGL;
+		EGLDisplay mEGLDisplay;
+		EGLConfig[] mEGLConfigs;
+		EGLConfig mEGLConfig;
+		EGLContext mEGLContext;
+		EGLSurface mEGLSurface;
+		GL10 mGL;
+
+		String mThreadOwner;
+
+		public VersionCheck() {
+
+			int[] version = new int[2];
+			int[] attribList = new int[] {
+					EGL10.EGL_WIDTH, 1,
+					EGL10.EGL_HEIGHT, 1,
+					EGL10.EGL_RENDERABLE_TYPE, 4,
+					EGL10.EGL_NONE
+			};
+
+			// No error checking performed, minimum required code to elucidate logic
+			mEGL = (EGL10) EGLContext.getEGL();
+			mEGLDisplay = mEGL.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
+			mEGL.eglInitialize(mEGLDisplay, version);
+			mEGLConfig = chooseConfig(); // Choosing a config is a little more complicated
+			mEGLContext = mEGL.eglCreateContext(mEGLDisplay, mEGLConfig, EGL10.EGL_NO_CONTEXT, null);
+			mEGLSurface = mEGL.eglCreatePbufferSurface(mEGLDisplay, mEGLConfig,  attribList);
+			mEGL.eglMakeCurrent(mEGLDisplay, mEGLSurface, mEGLSurface, mEGLContext);
+			mGL = (GL10) mEGLContext.getGL();
+
+			// Record thread owner of OpenGL context
+			mThreadOwner = Thread.currentThread().getName();
+		}
+
+		public String getVersion()
+		{
+			return mGL.glGetString(GL10.GL_VERSION);
+		}
+
+		public String getVendor()
+		{
+			return mGL.glGetString(GL10.GL_VENDOR);
+		}
+		public String getRenderer()
+		{
+			return mGL.glGetString(GL10.GL_RENDERER);
+		}
+		private EGLConfig chooseConfig() {
+			int[] attribList = new int[] {
+					EGL10.EGL_DEPTH_SIZE, 0,
+					EGL10.EGL_STENCIL_SIZE, 0,
+					EGL10.EGL_RED_SIZE, 8,
+					EGL10.EGL_GREEN_SIZE, 8,
+					EGL10.EGL_BLUE_SIZE, 8,
+					EGL10.EGL_ALPHA_SIZE, 8,
+					EGL10.EGL_NONE
+			};
+
+			// No error checking performed, minimum required code to elucidate logic
+			// Expand on this logic to be more selective in choosing a configuration
+			int[] numConfig = new int[1];
+			mEGL.eglChooseConfig(mEGLDisplay, attribList, null, 0, numConfig);
+			int configSize = numConfig[0];
+			mEGLConfigs = new EGLConfig[configSize];
+			mEGL.eglChooseConfig(mEGLDisplay, attribList, mEGLConfigs, configSize, numConfig);
+
+			return mEGLConfigs[0];  // Best match is probably the first configuration
+		}
+	}
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Load the preferences from an XML resource
+        addPreferencesFromResource(R.layout.prefs);
+
+        final ListPreference etp = new ListPreference(m_activity);
+        CharSequence[] _entries;
+        CharSequence[] _entryvalues;
+
+        if (Build.CPU_ABI.contains("x86"))
+        {
+	        _entries = new CharSequence[] {
+		        "Interpreter",
+		        "JIT64 Recompiler",
+		        "JITIL Recompiler",
+	        };
+	        _entryvalues = new CharSequence[] {"0", "1", "2"};
+        }
+        else if (Build.CPU_ABI.contains("arm"))
+        {
+	        _entries = new CharSequence[] {
+			        "Interpreter",
+			        "JIT ARM Recompiler",
+	        };
+	        _entryvalues = new CharSequence[] {"0", "3"};
+        }
+        else
+        {
+	        _entries = new CharSequence[] {
+			        "Interpreter",
+	        };
+	        _entryvalues = new CharSequence[] {"0"};
+        }
+
+        etp.setEntries(_entries);
+        etp.setEntryValues(_entryvalues);
+        etp.setKey("cpupref");
+        etp.setTitle("CPU Core");
+        etp.setSummary("Emulation core to use");
+
+        PreferenceCategory mCategory = (PreferenceCategory) findPreference("cpuprefcat");
+        mCategory.addPreference(etp);
+        VersionCheck mbuffer = new VersionCheck();
+        m_GLVersion = mbuffer.getVersion();
+        m_GLVendor = mbuffer.getVendor();
+        m_GLRenderer = mbuffer.getRenderer();
+
+        boolean mSupportsGLES3 = false;
+
+        if (m_GLVersion.contains("OpenGL ES 3.0")) // 3.0 support
+            mSupportsGLES3 = true;
+		if (!mSupportsGLES3 && m_GLVendor.equals("Qualcomm"))
+        {
+	        if (m_GLRenderer.contains("Adreno (TM) 3"))
+	        {
+		        int mVStart, mVEnd = 0;
+		        float mVersion;
+		        mVStart = m_GLVersion.indexOf("V@") + 2;
+		        for (int a = mVStart; a < m_GLVersion.length(); ++a)
+			        if (m_GLVersion.charAt(a) == ' ')
+			        {
+				        mVEnd = a;
+				        break;
+			        }
+		        mVersion = Float.parseFloat(m_GLVersion.substring(mVStart, mVEnd));
+
+		        if (mVersion >= 14.0f)
+			        mSupportsGLES3 = true;
+	        }
+        }
+
+        if (!mSupportsGLES3)
+        {
+	        mCategory = (PreferenceCategory) findPreference("videoprefcat");
+	        ListPreference mPref = (ListPreference) findPreference("gpupref");
+	        mCategory.removePreference(mPref);
+
+	        final ListPreference videobackend = new ListPreference(m_activity);
+
+	        _entries = new CharSequence[] {
+			        "Software Renderer",
+	        };
+	        _entryvalues = new CharSequence[] {"Software Renderer"};
+
+	        videobackend.setKey("gpupref");
+	        videobackend.setTitle("Video Backend");
+	        videobackend.setSummary("Video backend to use");
+
+	        videobackend.setEntries(_entries);
+	        videobackend.setEntryValues(_entryvalues);
+
+	        mCategory.addPreference(videobackend);
+        }
+    }
+
+	@Override
+	public void onAttach(Activity activity) {
+		super.onAttach(activity);
+
+		// This makes sure that the container activity has implemented
+		// the callback interface. If not, it throws an exception
+		try {
+			m_activity = activity;
+		} catch (ClassCastException e) {
+			throw new ClassCastException(activity.toString()
+					+ " must implement OnGameListZeroListener");
+		}
+	}
+}

From ee26564c65fe697202097337f1868178eac2760f Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 16 Jul 2013 05:43:45 -0500
Subject: [PATCH 297/352] [Android] In the About pane, show if the phone
 supports OpenGL ES 3. Makes it less confusing for users.

---
 .../dolphinemu/dolphinemu/AboutFragment.java  |  1 +
 .../dolphinemu/dolphinemu/PrefsFragment.java  | 70 ++++++++++---------
 2 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
index 4f0cf10702..5c47b79a3e 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
@@ -40,6 +40,7 @@ public class AboutFragment extends Fragment {
 		int a = 0;
 
 		Input.add(a++, new GameListItem(m_activity, "Build Revision", NativeLibrary.GetVersionString(), "", true));
+		Input.add(a++, new GameListItem(m_activity, "Supports OpenGL ES 3", PrefsFragment.SupportsGLES3() ? "Yes" : "No", "", true));
 		adapter = new FolderBrowserAdapter(m_activity, R.layout.folderbrowser, Input);
 		mMainList.setAdapter(adapter);
 
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java
index d039c236bb..08ed852cdc 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java
@@ -17,13 +17,8 @@ import javax.microedition.khronos.opengles.GL10;
  */
 public class PrefsFragment extends PreferenceFragment {
 	private Activity m_activity;
-	
-	private String m_GLVersion;
-	private String m_GLVendor;
-	private String m_GLRenderer;
 
-
-	public class VersionCheck {
+	static public class VersionCheck {
 		EGL10 mEGL;
 		EGLDisplay mEGLDisplay;
 		EGLConfig[] mEGLConfigs;
@@ -93,7 +88,42 @@ public class PrefsFragment extends PreferenceFragment {
 			return mEGLConfigs[0];  // Best match is probably the first configuration
 		}
 	}
+	static public boolean SupportsGLES3()
+	{
+		String m_GLVersion;
+		String m_GLVendor;
+		String m_GLRenderer;
 
+		VersionCheck mbuffer = new VersionCheck();
+		m_GLVersion = mbuffer.getVersion();
+		m_GLVendor = mbuffer.getVendor();
+		m_GLRenderer = mbuffer.getRenderer();
+
+		boolean mSupportsGLES3 = false;
+
+		if (m_GLVersion.contains("OpenGL ES 3.0")) // 3.0 support
+			mSupportsGLES3 = true;
+		if (!mSupportsGLES3 && m_GLVendor.equals("Qualcomm"))
+		{
+			if (m_GLRenderer.contains("Adreno (TM) 3"))
+			{
+				int mVStart, mVEnd = 0;
+				float mVersion;
+				mVStart = m_GLVersion.indexOf("V@") + 2;
+				for (int a = mVStart; a < m_GLVersion.length(); ++a)
+					if (m_GLVersion.charAt(a) == ' ')
+					{
+						mVEnd = a;
+						break;
+					}
+				mVersion = Float.parseFloat(m_GLVersion.substring(mVStart, mVEnd));
+
+				if (mVersion >= 14.0f)
+					mSupportsGLES3 = true;
+			}
+		}
+		return mSupportsGLES3;
+	}
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -138,34 +168,8 @@ public class PrefsFragment extends PreferenceFragment {
 
         PreferenceCategory mCategory = (PreferenceCategory) findPreference("cpuprefcat");
         mCategory.addPreference(etp);
-        VersionCheck mbuffer = new VersionCheck();
-        m_GLVersion = mbuffer.getVersion();
-        m_GLVendor = mbuffer.getVendor();
-        m_GLRenderer = mbuffer.getRenderer();
 
-        boolean mSupportsGLES3 = false;
-
-        if (m_GLVersion.contains("OpenGL ES 3.0")) // 3.0 support
-            mSupportsGLES3 = true;
-		if (!mSupportsGLES3 && m_GLVendor.equals("Qualcomm"))
-        {
-	        if (m_GLRenderer.contains("Adreno (TM) 3"))
-	        {
-		        int mVStart, mVEnd = 0;
-		        float mVersion;
-		        mVStart = m_GLVersion.indexOf("V@") + 2;
-		        for (int a = mVStart; a < m_GLVersion.length(); ++a)
-			        if (m_GLVersion.charAt(a) == ' ')
-			        {
-				        mVEnd = a;
-				        break;
-			        }
-		        mVersion = Float.parseFloat(m_GLVersion.substring(mVStart, mVEnd));
-
-		        if (mVersion >= 14.0f)
-			        mSupportsGLES3 = true;
-	        }
-        }
+	    boolean mSupportsGLES3 = SupportsGLES3();
 
         if (!mSupportsGLES3)
         {

From d1baa8edd949f64c26464b65cd135cd0acff2cd7 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 16 Jul 2013 06:30:50 -0500
Subject: [PATCH 298/352] [Android] Change input configuration to a fragment.

---
 Source/Android/AndroidManifest.xml            |   3 +-
 .../dolphinemu/DolphinEmulator.java           |   4 +-
 .../dolphinemu/GameListActivity.java          |  81 +++++++---
 ...Activity.java => InputConfigFragment.java} | 143 +++++++++---------
 4 files changed, 137 insertions(+), 94 deletions(-)
 rename Source/Android/src/org/dolphinemu/dolphinemu/{InputConfigActivity.java => InputConfigFragment.java} (62%)

diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index 3cd0b19614..a0194eb6e0 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -18,7 +18,6 @@
             android:name=".DolphinEmulator"
             android:label="@string/app_name"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-            android:screenOrientation="landscape"
             android:configChanges="locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -31,7 +30,7 @@
             android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
         </activity>
         <activity
-            android:name="org.dolphinemu.dolphinemu.InputConfigActivity"
+            android:name=".InputConfigFragment"
             android:label="@string/app_name"
             android:configChanges="orientation|locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
         </activity>
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index af2f2df326..a883cd7b49 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -222,7 +222,7 @@ public class DolphinEmulator<MainActivity> extends Activity
 					return false;
 			}
 			InputDevice input = event.getDevice();
-			NativeLibrary.onGamePadEvent(InputConfigActivity.getInputDesc(input), event.getKeyCode(), action);
+			NativeLibrary.onGamePadEvent(InputConfigFragment.getInputDesc(input), event.getKeyCode(), action);
 			return true;
 		}
 		return false;
@@ -240,7 +240,7 @@ public class DolphinEmulator<MainActivity> extends Activity
 		{
 			InputDevice.MotionRange range;
 			range = motions.get(a);
-			NativeLibrary.onGamePadMoveEvent(InputConfigActivity.getInputDesc(input), range.getAxis(), event.getAxisValue(range.getAxis()));
+			NativeLibrary.onGamePadMoveEvent(InputConfigFragment.getInputDesc(input), range.getAxis(), event.getAxisValue(range.getAxis()));
 		}
 
 		return true;
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
index 2c8a0e61a8..3606c462d2 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
@@ -10,9 +10,7 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.app.ActionBarDrawerToggle;
 import android.support.v4.widget.DrawerLayout;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
+import android.view.*;
 import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.Toast;
@@ -28,7 +26,8 @@ import java.util.List;
 public class GameListActivity extends Activity
 		implements GameListFragment.OnGameListZeroListener{
 
-	private int mCurPage = 0;
+	private int mCurFragmentNum = 0;
+	private Fragment mCurFragment;
 	enum keyTypes {TYPE_STRING, TYPE_BOOL};
 
 	private ActionBarDrawerToggle mDrawerToggle;
@@ -92,15 +91,15 @@ public class GameListActivity extends Activity
 
 	private void recreateFragment()
 	{
-		Fragment fragment = new GameListFragment();
+		mCurFragment = new GameListFragment();
 		FragmentManager fragmentManager = getFragmentManager();
-		fragmentManager.beginTransaction().replace(R.id.content_frame, fragment).commit();
+		fragmentManager.beginTransaction().replace(R.id.content_frame, mCurFragment).commit();
 	}
 	private void SwitchPage(int toPage)
 	{
-		if (mCurPage == toPage)
+		if (mCurFragmentNum == toPage)
 			return;
-		switch (mCurPage)
+		switch (mCurFragmentNum)
 		{
 			// Settings
 			case 2:
@@ -145,8 +144,24 @@ public class GameListActivity extends Activity
 				}
 			}
 			break;
-			case 0: // Settings
 			case 3: // Gamepad settings
+			{
+				InputConfigAdapter adapter = ((InputConfigFragment)mCurFragment).getAdapter();
+				for (int a = 0; a < adapter.getCount(); ++a)
+				{
+					InputConfigItem o = adapter.getItem(a);
+					String config = o.getConfig();
+					String bind = o.getBind();
+					String ConfigValues[] = config.split("-");
+					String Key = ConfigValues[0];
+					String Value = ConfigValues[1];
+					NativeLibrary.SetConfig("Dolphin.ini", Key, Value, bind);
+				}
+			}
+			break;
+			case 0: // Game List
+			case 1: // Folder browser
+			case 4: // About
 	        /* Do Nothing */
 				break;
 		}
@@ -154,10 +169,10 @@ public class GameListActivity extends Activity
 		{
 			case 0:
 			{
-				mCurPage = 0;
-				Fragment fragment = new GameListFragment();
+				mCurFragmentNum = 0;
+				mCurFragment = new GameListFragment();
 				FragmentManager fragmentManager = getFragmentManager();
-				fragmentManager.beginTransaction().replace(R.id.content_frame, fragment).commit();
+				fragmentManager.beginTransaction().replace(R.id.content_frame, mCurFragment).commit();
 			}
 			break;
 			case 1:
@@ -168,24 +183,28 @@ public class GameListActivity extends Activity
 			case 2:
 			{
 				Toast.makeText(mMe, "Loading up settings", Toast.LENGTH_SHORT).show();
-				mCurPage = 2;
-				Fragment fragment = new PrefsFragment();
+				mCurFragmentNum = 2;
+				mCurFragment = new PrefsFragment();
 				FragmentManager fragmentManager = getFragmentManager();
-				fragmentManager.beginTransaction().replace(R.id.content_frame, fragment).commit();
+				fragmentManager.beginTransaction().replace(R.id.content_frame, mCurFragment).commit();
 			}
 			break;
 			case 3:
+			{
 				Toast.makeText(mMe, "Loading up gamepad config", Toast.LENGTH_SHORT).show();
-				Intent ConfigIntent = new Intent(mMe, InputConfigActivity.class);
-				startActivityForResult(ConfigIntent, 3);
-				break;
+				mCurFragmentNum = 3;
+				mCurFragment = new InputConfigFragment();
+				FragmentManager fragmentManager = getFragmentManager();
+				fragmentManager.beginTransaction().replace(R.id.content_frame, mCurFragment).commit();
+			}
+			break;
 			case 4:
 			{
 				Toast.makeText(mMe, "Loading up About", Toast.LENGTH_SHORT).show();
-				mCurPage = 4;
-				Fragment fragment = new AboutFragment();
+				mCurFragmentNum = 4;
+				mCurFragment = new AboutFragment();
 				FragmentManager fragmentManager = getFragmentManager();
-				fragmentManager.beginTransaction().replace(R.id.content_frame, fragment).commit();
+				fragmentManager.beginTransaction().replace(R.id.content_frame, mCurFragment).commit();
 			}
 			break;
 			default:
@@ -264,5 +283,25 @@ public class GameListActivity extends Activity
 		SwitchPage(0);
 	}
 
+	public interface OnGameConfigListener {
+		public boolean onMotionEvent(MotionEvent event);
+		public boolean onKeyEvent(KeyEvent event);
+	}
+	// Gets move(triggers, joystick) events
+	@Override
+	public boolean dispatchGenericMotionEvent(MotionEvent event) {
+		if (mCurFragmentNum == 3)
+			if (((OnGameConfigListener)mCurFragment).onMotionEvent(event))
+				return true;
+		return super.dispatchGenericMotionEvent(event);
+	}
+	// Gets button presses
+	@Override
+	public boolean dispatchKeyEvent(KeyEvent event) {
+		if (mCurFragmentNum == 3)
+			if (((OnGameConfigListener)mCurFragment).onKeyEvent(event))
+				return true;
+		return super.dispatchKeyEvent(event);
+	}
 
 }
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigFragment.java
similarity index 62%
rename from Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java
rename to Source/Android/src/org/dolphinemu/dolphinemu/InputConfigFragment.java
index 0057901eec..3a6e855c3b 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigFragment.java
@@ -1,15 +1,12 @@
 package org.dolphinemu.dolphinemu;
 
 import android.app.Activity;
-import android.app.ListActivity;
-import android.content.Intent;
+import android.app.Fragment;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.InputDevice;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.View;
+import android.view.*;
+import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.Toast;
 
@@ -21,7 +18,10 @@ import java.util.List;
  * Licensed under GPLv2
  * Refer to the license.txt file included.
  */
-public class InputConfigActivity extends ListActivity {
+public class InputConfigFragment extends Fragment
+		implements GameListActivity.OnGameConfigListener{
+	private Activity m_activity;
+	private ListView mDrawerList;
 	private InputConfigAdapter adapter;
 	private int configPosition = 0;
 	boolean Configuring = false;
@@ -43,9 +43,9 @@ public class InputConfigActivity extends ListActivity {
 		}
 	}
 	@Override
-	public void onCreate(Bundle savedInstanceState)
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+	                         Bundle savedInstanceState)
 	{
-		super.onCreate(savedInstanceState);
 		List<InputConfigItem> Input = new ArrayList<InputConfigItem>();
 		int a = 0;
 
@@ -71,42 +71,49 @@ public class InputConfigActivity extends ListActivity {
 		Input.add(a++, new InputConfigItem("Trigger L", "Android-InputL"));
 		Input.add(a++, new InputConfigItem("Trigger R", "Android-InputR"));
 
-		adapter = new InputConfigAdapter(this, R.layout.folderbrowser, Input);
-		setListAdapter(adapter);
-	}
-	@Override
-	protected void onListItemClick(ListView l, View v, int position, long id) {
-		super.onListItemClick(l, v, position, id);
-		InputConfigItem o = adapter.getItem(position);
-		switch(position)
-		{
-			case 0: // On screen controls
-				String newBind;
-				if (o.getBind().equals("True"))
-				{
-					Toast.makeText(this, "Not Drawing on screen controls", Toast.LENGTH_SHORT).show();
-					newBind = "False";
-				}
-				else
-				{
-					Toast.makeText(this, "Drawing on screen controls", Toast.LENGTH_SHORT).show();
-					newBind = "True";
-				}
-				adapter.remove(o);
-				o.setBind(newBind);
-				adapter.insert(o, position);
-			break;
-			default: // gamepad controls
-				Toast.makeText(this, "Press button to configure " + o.getName(), Toast.LENGTH_SHORT).show();
-				configPosition = position;
-				Configuring = true;
-				firstEvent = true;
-			break;
-		}
+		adapter = new InputConfigAdapter(m_activity, R.layout.folderbrowser, Input);
+		View rootView = inflater.inflate(R.layout.gamelist_listview, container, false);
+		mDrawerList = (ListView) rootView.findViewById(R.id.gamelist);
 
+		mDrawerList.setAdapter(adapter);
+		mDrawerList.setOnItemClickListener(mMenuItemClickListener);
+		return mDrawerList;
 	}
+	private AdapterView.OnItemClickListener mMenuItemClickListener = new AdapterView.OnItemClickListener()
+	{
+		public void onItemClick(AdapterView<?> parent, View view, int position, long id)
+		{
+			InputConfigItem o = adapter.getItem(position);
+			switch(position)
+			{
+				case 0: // On screen controls
+					String newBind;
+					if (o.getBind().equals("True"))
+					{
+						Toast.makeText(m_activity, "Not Drawing on screen controls", Toast.LENGTH_SHORT).show();
+						newBind = "False";
+					}
+					else
+					{
+						Toast.makeText(m_activity, "Drawing on screen controls", Toast.LENGTH_SHORT).show();
+						newBind = "True";
+					}
+					adapter.remove(o);
+					o.setBind(newBind);
+					adapter.insert(o, position);
+					break;
+				default: // gamepad controls
+					Toast.makeText(m_activity, "Press button to configure " + o.getName(), Toast.LENGTH_SHORT).show();
+					configPosition = position;
+					Configuring = true;
+					firstEvent = true;
+					break;
+			}
+		}
+	};
+
 	static ArrayList<Float> m_values = new ArrayList<Float>();
-	// Gets move(triggers, joystick) events
+
 	void AssignBind(String bind)
 	{
 		InputConfigItem o = adapter.getItem(configPosition);
@@ -114,12 +121,16 @@ public class InputConfigActivity extends ListActivity {
 		o.setBind(bind);
 		adapter.insert(o, configPosition);
 	}
+	public InputConfigAdapter getAdapter()
+	{
+		return adapter;
+	}
+	// Called from GameListActivity
+	public boolean onMotionEvent(MotionEvent event)
+	{
+		if (((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) == 0))
+			return false;
 
-	@Override
-	public boolean dispatchGenericMotionEvent(MotionEvent event) {
-		if (((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) == 0)) {
-			return super.dispatchGenericMotionEvent(event);
-		}
 		InputDevice input = event.getDevice();
 		List<InputDevice.MotionRange> motions = input.getMotionRanges();
 		if (Configuring)
@@ -140,12 +151,12 @@ public class InputConfigActivity extends ListActivity {
 					range = motions.get(a);
 					if (m_values.get(a) > (event.getAxisValue(range.getAxis()) + 0.5f))
 					{
-						AssignBind("Device '" + InputConfigActivity.getInputDesc(input) + "'-Axis " + range.getAxis() + "-");
+						AssignBind("Device '" + InputConfigFragment.getInputDesc(input) + "'-Axis " + range.getAxis() + "-");
 						Configuring = false;
 					}
 					else if (m_values.get(a) < (event.getAxisValue(range.getAxis()) - 0.5f))
 					{
-						AssignBind("Device '" + InputConfigActivity.getInputDesc(input) + "'-Axis " + range.getAxis() + "+");
+						AssignBind("Device '" + InputConfigFragment.getInputDesc(input) + "'-Axis " + range.getAxis() + "+");
 						Configuring = false;
 					}
 				}
@@ -153,10 +164,8 @@ public class InputConfigActivity extends ListActivity {
 		}
 		return true;
 	}
-
-	// Gets button presses
-	@Override
-	public boolean dispatchKeyEvent(KeyEvent event) {
+	public boolean onKeyEvent(KeyEvent event)
+	{
 		Log.w("Dolphinemu", "Got Event " + event.getAction());
 		switch (event.getAction()) {
 			case KeyEvent.ACTION_DOWN:
@@ -164,7 +173,7 @@ public class InputConfigActivity extends ListActivity {
 				if (Configuring)
 				{
 					InputDevice input = event.getDevice();
-					AssignBind("Device '" + InputConfigActivity.getInputDesc(input) + "'-Button " + event.getKeyCode());
+					AssignBind("Device '" + InputConfigFragment.getInputDesc(input) + "'-Button " + event.getKeyCode());
 					Configuring = false;
 					return true;
 				}
@@ -172,24 +181,20 @@ public class InputConfigActivity extends ListActivity {
 				break;
 		}
 
-		return super.dispatchKeyEvent(event);
+		return false;
 	}
 
 	@Override
-	public void onBackPressed() {
-		for (int a = 0; a < adapter.getCount(); ++a)
-		{
-			InputConfigItem o = adapter.getItem(a);
-			String config = o.getConfig();
-			String bind = o.getBind();
-			String ConfigValues[] = config.split("-");
-			String Key = ConfigValues[0];
-			String Value = ConfigValues[1];
-			NativeLibrary.SetConfig("Dolphin.ini", Key, Value, bind);
+	public void onAttach(Activity activity) {
+		super.onAttach(activity);
+
+		// This makes sure that the container activity has implemented
+		// the callback interface. If not, it throws an exception
+		try {
+			m_activity = activity;
+		} catch (ClassCastException e) {
+			throw new ClassCastException(activity.toString()
+					+ " must implement OnGameListZeroListener");
 		}
-		Intent intent = new Intent();
-		setResult(Activity.RESULT_OK, intent);
-		this.finish();
-		super.onBackPressed();
 	}
 }

From aa1fc077b4a65d4418ab59229481799fc3e73949 Mon Sep 17 00:00:00 2001
From: "kostamarino@hotmail.com" <kostamarino@hotmail.com>
Date: Tue, 16 Jul 2013 14:44:03 +0300
Subject: [PATCH 299/352] Fix for my previous commit.

---
 Data/User/GameConfig/GHQE7D.ini | 4 ++--
 Data/User/GameConfig/GHQP7D.ini | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Data/User/GameConfig/GHQE7D.ini b/Data/User/GameConfig/GHQE7D.ini
index 7bf847a3f5..8e13676fa4 100644
--- a/Data/User/GameConfig/GHQE7D.ini
+++ b/Data/User/GameConfig/GHQE7D.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for the videos to display.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -16,4 +16,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 UseXFB = True
-UseRealXFB = True
+UseRealXFB = False
diff --git a/Data/User/GameConfig/GHQP7D.ini b/Data/User/GameConfig/GHQP7D.ini
index 7ac2ee0fb2..b60c0ec5b4 100644
--- a/Data/User/GameConfig/GHQP7D.ini
+++ b/Data/User/GameConfig/GHQP7D.ini
@@ -3,7 +3,7 @@
 TLBHack = 1
 [EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs Real Xfb for the videos to display.
+EmulationIssues = 
 [OnFrame] Add memory patches to be applied every frame here.
 [ActionReplay] Add action replay cheats here.
 [Video]
@@ -16,4 +16,4 @@ PH_ZFar =
 [Gecko]
 [Video_Settings]
 UseXFB = True
-UseRealXFB = True
+UseRealXFB = False

From bd6218685fbcdded60cf13db1b448449bc1adc2d Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 16 Jul 2013 06:58:51 -0500
Subject: [PATCH 300/352] [Android] Folder Browser a fragment as well. Removes
 the menu item for selected path, because it was just a confusing mechanic
 anyway. People just tap on the ISO in the browser anyway.

---
 .../dolphinemu/dolphinemu/FolderBrowser.java  | 115 ++++++++++--------
 .../dolphinemu/GameListActivity.java          |  42 ++-----
 2 files changed, 75 insertions(+), 82 deletions(-)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
index 130919cf8d..9094486197 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
@@ -1,32 +1,30 @@
 package org.dolphinemu.dolphinemu;
 
 import android.app.Activity;
-import android.app.ListActivity;
-import android.content.Intent;
+import android.app.Fragment;
 import android.os.Bundle;
 import android.os.Environment;
-import android.view.Menu;
-import android.view.MenuItem;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.Toast;
 
 import java.io.File;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
-public class FolderBrowser extends ListActivity {
+public class FolderBrowser extends Fragment {
+	private Activity m_activity;
 	private FolderBrowserAdapter adapter;
+	private ListView mDrawerList;
+	private View rootView;
 	private static File currentDir = null;
 
 	// Populates the FolderView with the given currDir's contents.
 	private void Fill(File currDir)
     {
-		this.setTitle("Current Dir: " + currDir.getName());
+	    m_activity.setTitle("Current Dir: " + currDir.getName());
 		File[] dirs = currDir.listFiles();
 		List<GameListItem>dir = new ArrayList<GameListItem>();
 		List<GameListItem>fls = new ArrayList<GameListItem>();
@@ -46,17 +44,17 @@ public class FolderBrowser extends ListActivity {
 				{
 					if(entry.isDirectory())
 					{
-						dir.add(new GameListItem(getApplicationContext(), entryName,"Folder",entry.getAbsolutePath(), true));
+						dir.add(new GameListItem(m_activity, entryName,"Folder",entry.getAbsolutePath(), true));
 					}
 					else
 					{
 						if (validExts.contains(entryName.toLowerCase().substring(entryName.lastIndexOf('.'))))
 						{
-							fls.add(new GameListItem(getApplicationContext(), entryName,"File Size: "+entry.length(),entry.getAbsolutePath(), true));
+							fls.add(new GameListItem(m_activity, entryName,"File Size: "+entry.length(),entry.getAbsolutePath(), true));
 						}
 						else if (archiveExts.contains(entryName.toLowerCase().substring(entryName.lastIndexOf('.'))))
 						{
-							fls.add(new GameListItem(getApplicationContext(), entryName,"File Size: "+entry.length(),entry.getAbsolutePath(), false));
+							fls.add(new GameListItem(m_activity, entryName,"File Size: "+entry.length(),entry.getAbsolutePath(), false));
 						}
 					}
 				}
@@ -72,52 +70,65 @@ public class FolderBrowser extends ListActivity {
 
 		// Check for a parent directory to the one we're currently in.
 		if (!currDir.getPath().equalsIgnoreCase("/"))
-			dir.add(0, new GameListItem(getApplicationContext(), "..", "Parent Directory", currDir.getParent(), true));
+			dir.add(0, new GameListItem(m_activity, "..", "Parent Directory", currDir.getParent(), true));
 
-		adapter = new FolderBrowserAdapter(this,R.layout.folderbrowser,dir);
-		this.setListAdapter(adapter);
+		adapter = new FolderBrowserAdapter(m_activity, R.layout.folderbrowser, dir);
+	    mDrawerList = (ListView) rootView.findViewById(R.id.gamelist);
+	    mDrawerList.setAdapter(adapter);
+	    mDrawerList.setOnItemClickListener(mMenuItemClickListener);
     }
-
 	@Override
-	protected void onListItemClick(ListView l, View v, int position, long id) {
-		super.onListItemClick(l, v, position, id);
-		GameListItem o = adapter.getItem(position);
-		if(o.getData().equalsIgnoreCase("folder") || o.getData().equalsIgnoreCase("parent directory")){
-			currentDir = new File(o.getPath());
-			Fill(currentDir);
-		}
-		else
-			if (o.isValid())
-				FolderSelected();
-			else
-				Toast.makeText(this, "Can not use compressed file types.", Toast.LENGTH_LONG).show();
-	}
-	
-	@Override
-	public void onCreate(Bundle savedInstanceState) 
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+	                         Bundle savedInstanceState)
 	{
-		super.onCreate(savedInstanceState);
-		 
 		if(currentDir == null)
 			currentDir = new File(Environment.getExternalStorageDirectory().getPath());
+
+		rootView = inflater.inflate(R.layout.gamelist_listview, container, false);
+
 		Fill(currentDir);
+		return mDrawerList;
+	}
+
+	private AdapterView.OnItemClickListener mMenuItemClickListener = new AdapterView.OnItemClickListener()
+	{
+		public void onItemClick(AdapterView<?> parent, View view, int position, long id)
+		{
+			GameListItem o = adapter.getItem(position);
+			if(o.getData().equalsIgnoreCase("folder") || o.getData().equalsIgnoreCase("parent directory"))
+			{
+				currentDir = new File(o.getPath());
+				Fill(currentDir);
+			}
+			else
+				if (o.isValid())
+					FolderSelected();
+				else
+					Toast.makeText(m_activity, "Can not use compressed file types.", Toast.LENGTH_LONG).show();
+		}
+	};
+
+	@Override
+	public void onAttach(Activity activity) {
+		super.onAttach(activity);
+
+		// This makes sure that the container activity has implemented
+		// the callback interface. If not, it throws an exception
+		try {
+			m_activity = activity;
+		} catch (ClassCastException e) {
+			throw new ClassCastException(activity.toString()
+					+ " must implement OnGameListZeroListener");
+		}
 	}
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu)
-    {
-        menu.add("Add current folder");
-        return true;
-    }
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-		FolderSelected();
-		return true;
-    }
 	private void FolderSelected()
 	{
-		Intent intent = new Intent();
-		intent.putExtra("Select", currentDir.getPath());
-		setResult(Activity.RESULT_OK, intent);
-		this.finish();
+		String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
+		int intDirectories = Integer.parseInt(Directories);
+		Directories = Integer.toString(intDirectories + 1);
+		NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPathes", Directories);
+		NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPath" + Integer.toString(intDirectories), currentDir.getPath());
+
+		((GameListActivity)m_activity).SwitchPage(0);
 	}
 }
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
index 3606c462d2..9a48de4d8b 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListActivity.java
@@ -3,7 +3,6 @@ package org.dolphinemu.dolphinemu;
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.FragmentManager;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.Bundle;
@@ -95,12 +94,16 @@ public class GameListActivity extends Activity
 		FragmentManager fragmentManager = getFragmentManager();
 		fragmentManager.beginTransaction().replace(R.id.content_frame, mCurFragment).commit();
 	}
-	private void SwitchPage(int toPage)
+	public void SwitchPage(int toPage)
 	{
 		if (mCurFragmentNum == toPage)
 			return;
 		switch (mCurFragmentNum)
 		{
+			// Folder browser
+			case 1:
+				recreateFragment();
+			break;
 			// Settings
 			case 2:
 			{
@@ -160,7 +163,6 @@ public class GameListActivity extends Activity
 			}
 			break;
 			case 0: // Game List
-			case 1: // Folder browser
 			case 4: // About
 	        /* Do Nothing */
 				break;
@@ -176,10 +178,14 @@ public class GameListActivity extends Activity
 			}
 			break;
 			case 1:
+			{
 				Toast.makeText(mMe, "Loading up the browser", Toast.LENGTH_SHORT).show();
-				Intent ListIntent = new Intent(mMe, FolderBrowser.class);
-				startActivityForResult(ListIntent, 1);
-				break;
+				mCurFragmentNum = 1;
+				mCurFragment = new FolderBrowser();
+				FragmentManager fragmentManager = getFragmentManager();
+				fragmentManager.beginTransaction().replace(R.id.content_frame, mCurFragment).commit();
+			}
+			break;
 			case 2:
 			{
 				Toast.makeText(mMe, "Loading up settings", Toast.LENGTH_SHORT).show();
@@ -220,30 +226,6 @@ public class GameListActivity extends Activity
 			SwitchPage(o.getID());
 		}
 	};
-	@Override
-	public void onActivityResult(int requestCode, int resultCode, Intent data)
-	{
-		super.onActivityResult(requestCode, resultCode, data);
-
-		switch (requestCode)
-		{
-			// Browse
-			case 1:
-				if (resultCode == Activity.RESULT_OK)
-				{
-					String FileName = data.getStringExtra("Select");
-					Toast.makeText(this, "Folder Selected: " + FileName, Toast.LENGTH_SHORT).show();
-					String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
-					int intDirectories = Integer.parseInt(Directories);
-					Directories = Integer.toString(intDirectories + 1);
-					NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPathes", Directories);
-					NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPath" + Integer.toString(intDirectories), FileName);
-
-					recreateFragment();
-				}
-				break;
-		}
-	}
 	/**
 	 * When using the ActionBarDrawerToggle, you must call it during
 	 * onPostCreate() and onConfigurationChanged()...

From a1b9a4dc5eb9fe1c8de3dbc49d3f7577e896e3ca Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 16 Jul 2013 09:08:41 -0500
Subject: [PATCH 301/352] [Android] Oops. Keep the screenOrientation setting to
 landscape.

---
 Source/Android/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
index a0194eb6e0..a6918f867b 100644
--- a/Source/Android/AndroidManifest.xml
+++ b/Source/Android/AndroidManifest.xml
@@ -18,6 +18,7 @@
             android:name=".DolphinEmulator"
             android:label="@string/app_name"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+            android:screenOrientation="landscape"
             android:configChanges="locale|keyboard|keyboardHidden|navigation|fontScale|uiMode" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

From f4b414a9c170d3acf3e475e4383c6c5e82d895c6 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 16 Jul 2013 22:18:15 -0500
Subject: [PATCH 302/352] Fix encoding issue with VADD(Integer)

---
 Source/Core/Common/Src/ArmEmitter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/Common/Src/ArmEmitter.cpp b/Source/Core/Common/Src/ArmEmitter.cpp
index eff366312c..1b20a1784e 100644
--- a/Source/Core/Common/Src/ArmEmitter.cpp
+++ b/Source/Core/Common/Src/ArmEmitter.cpp
@@ -868,7 +868,7 @@ void ARMXEmitter::VADD(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm)
 
 	Write32((0xF2 << 24) | ((Vd & 0x10) << 18) | (Size << 20) | ((Vn & 0xF) << 16) \
 		| ((Vd & 0xF) << 12) | (0x8 << 8) | ((Vn & 0x10) << 3) | (register_quad << 6) \
-		| ((Vm & 0x10) << 2) | (Vm & 0xF)); 
+		| ((Vm & 0x10) << 1) | (Vm & 0xF)); 
 
 }
 void ARMXEmitter::VSUB(IntegerSize Size, ARMReg Vd, ARMReg Vn, ARMReg Vm)

From bab3032185bd54db995c616b0c58897901adbdd1 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 16 Jul 2013 22:20:18 -0500
Subject: [PATCH 303/352] On ARM Hosts, increase the instruction run count to
 64bit. 32bit is /very/ quickly overflown.

---
 Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp | 13 ++++++++++---
 Source/Core/Core/Src/PowerPC/PPCTables.h      |  4 ++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp
index 2c25268c23..a4988f7c17 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.cpp
@@ -457,13 +457,20 @@ const u8* JitArm::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlo
 		if (Core::g_CoreStartupParameter.bEnableDebugging)
 		{
 			// Add run count
+			static const u64 One = 1;
 			ARMReg RA = gpr.GetReg();
 			ARMReg RB = gpr.GetReg();
+			ARMReg VA = fpr.GetReg();
+			ARMReg VB = fpr.GetReg();
 			MOVI2R(RA, (u32)&opinfo->runCount);
-			LDR(RB, RA);
-			ADD(RB, RB, 1);
-			STR(RB, RA);
+			MOVI2R(RB, (u32)&One);
+			VLDR(VA, RA, 0);
+			VLDR(VB, RB, 0);
+			VADD(I_I64, VA, VA, VB);
+			VSTR(VA, RA, 0);
 			gpr.Unlock(RA, RB);
+			fpr.Unlock(VA);
+			fpr.Unlock(VB);
 		}
 		if (!ops[i].skip)
 		{
diff --git a/Source/Core/Core/Src/PowerPC/PPCTables.h b/Source/Core/Core/Src/PowerPC/PPCTables.h
index f47df6e552..5b4fb5d11c 100644
--- a/Source/Core/Core/Src/PowerPC/PPCTables.h
+++ b/Source/Core/Core/Src/PowerPC/PPCTables.h
@@ -77,7 +77,11 @@ struct GekkoOPInfo
 	int type;
 	int flags;
 	int numCyclesMinusOne;
+#ifdef _M_ARM
+	u64 runCount;
+#else
 	int runCount;
+#endif
 	int compileCount;
 	u32 lastUse;
 };

From fc6e06cb722bc4009d58b2758db49ba1517504be Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Wed, 17 Jul 2013 01:25:06 -0500
Subject: [PATCH 304/352] [ARM] Implement mfmsr

---
 Source/Core/Core/Src/PowerPC/JitArm32/Jit.h                | 1 +
 .../Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp   | 7 +++++++
 Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp    | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
index b610ec1eec..02eceff386 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
@@ -162,6 +162,7 @@ public:
 
 	// System Registers
 	void mtmsr(UGeckoInstruction _inst);
+	void mfmsr(UGeckoInstruction _inst);
 	void mtspr(UGeckoInstruction _inst);
 	void mfspr(UGeckoInstruction _inst);
 
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp
index 7eb8963e15..ab3f56b5d9 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp
@@ -102,3 +102,10 @@ void JitArm::mtmsr(UGeckoInstruction inst)
 	STR(gpr.R(inst.RS), R9, PPCSTATE_OFF(msr));
 	WriteExit(js.compilerPC + 4, 0);
 }
+void JitArm::mfmsr(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(SystemRegisters)
+
+	LDR(gpr.R(inst.RD), R9, PPCSTATE_OFF(msr));
+}
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
index 7a873f724b..3636729119 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
@@ -280,7 +280,7 @@ static GekkoOPTemplate table31[] =
 	{983, &JitArm::Default}, //"stfiwx", OPTYPE_STOREFP, FL_IN_A0 | FL_IN_B}},
 
 	{19,  &JitArm::Default}, //"mfcr",   OPTYPE_SYSTEM, FL_OUT_D}},
-	{83,  &JitArm::Default}, //"mfmsr",  OPTYPE_SYSTEM, FL_OUT_D}},
+	{83,  &JitArm::mfmsr}, //"mfmsr",  OPTYPE_SYSTEM, FL_OUT_D}},
 	{144, &JitArm::Default}, //"mtcrf",  OPTYPE_SYSTEM, 0}},
 	{146, &JitArm::mtmsr}, //"mtmsr",  OPTYPE_SYSTEM, FL_ENDBLOCK}},
 	{210, &JitArm::Default}, //"mtsr",   OPTYPE_SYSTEM, 0}},

From 58990138768e7eafbf1628646e87a03b3412001d Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Wed, 17 Jul 2013 01:35:07 -0500
Subject: [PATCH 305/352] [ARM] Implement MFTB

---
 Source/Core/Core/Src/PowerPC/JitArm32/Jit.h                | 1 +
 .../Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp   | 7 ++++++-
 Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp    | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
index 02eceff386..5d1908ace4 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
@@ -165,6 +165,7 @@ public:
 	void mfmsr(UGeckoInstruction _inst);
 	void mtspr(UGeckoInstruction _inst);
 	void mfspr(UGeckoInstruction _inst);
+	void mftb(UGeckoInstruction _inst);
 
 	// LoadStore
 	void icbi(UGeckoInstruction _inst);
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp
index ab3f56b5d9..8e6e11b366 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp
@@ -72,7 +72,12 @@ void JitArm::mtspr(UGeckoInstruction inst)
 	// OK, this is easy.
 	STR(RD, R9,  PPCSTATE_OFF(spr) + iIndex * 4);
 }
-
+void JitArm::mftb(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(SystemRegisters)
+	mfspr(inst);
+}
 void JitArm::mfspr(UGeckoInstruction inst)
 {
 	INSTRUCTION_START
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
index 3636729119..9cacb31821 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
@@ -287,7 +287,7 @@ static GekkoOPTemplate table31[] =
 	{242, &JitArm::Default}, //"mtsrin", OPTYPE_SYSTEM, 0}},
 	{339, &JitArm::mfspr}, //"mfspr",  OPTYPE_SPR, FL_OUT_D}},
 	{467, &JitArm::mtspr}, //"mtspr",  OPTYPE_SPR, 0, 2}},
-	{371, &JitArm::Default}, //"mftb",   OPTYPE_SYSTEM, FL_OUT_D | FL_TIMER}},
+	{371, &JitArm::mftb}, //"mftb",   OPTYPE_SYSTEM, FL_OUT_D | FL_TIMER}},
 	{512, &JitArm::Default}, //"mcrxr",  OPTYPE_SYSTEM, 0}},
 	{595, &JitArm::Default}, //"mfsr",   OPTYPE_SYSTEM, FL_OUT_D, 2}},
 	{659, &JitArm::Default}, //"mfsrin", OPTYPE_SYSTEM, FL_OUT_D, 2}},

From b30a6973554ddd44fb567878f00173a145666f44 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Wed, 17 Jul 2013 02:25:21 -0500
Subject: [PATCH 306/352] [ARM] Disable mfmsr. Implement stb and subfx.

---
 Source/Core/Core/Src/PowerPC/JitArm32/Jit.h   |  2 +
 .../Src/PowerPC/JitArm32/JitArm_Integer.cpp   | 12 +++++
 .../Src/PowerPC/JitArm32/JitArm_LoadStore.cpp | 49 +++++++++++++++++++
 .../JitArm32/JitArm_SystemRegisters.cpp       |  4 +-
 .../Src/PowerPC/JitArm32/JitArm_Tables.cpp    |  4 +-
 5 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
index 5d1908ace4..8669d75c73 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
@@ -157,6 +157,7 @@ public:
 	void orx(UGeckoInstruction _inst);
 	void rlwimix(UGeckoInstruction _inst);
 	void rlwinmx(UGeckoInstruction _inst);
+	void subfx(UGeckoInstruction _inst);
 	void extshx(UGeckoInstruction inst);
 	void extsbx(UGeckoInstruction inst);
 
@@ -173,6 +174,7 @@ public:
 	void lhz(UGeckoInstruction _inst);
 	void lwz(UGeckoInstruction _inst);
 	void lwzx(UGeckoInstruction _inst);
+	void stb(UGeckoInstruction _inst);
 	void stbu(UGeckoInstruction _inst);
 	void sth(UGeckoInstruction _inst);
 	void sthu(UGeckoInstruction _inst);
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp
index 444d1a6090..12e5bff023 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp
@@ -99,6 +99,18 @@ void JitArm::addx(UGeckoInstruction inst)
 	ADDS(RD, RA, RB);
 	if (inst.Rc) ComputeRC();
 }
+void JitArm::subfx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(Integer)
+
+	ARMReg RA = gpr.R(inst.RA);
+	ARMReg RB = gpr.R(inst.RB);
+	ARMReg RD = gpr.R(inst.RD);
+	SUBS(RD, RB, RA);
+	if (inst.OE) PanicAlert("OE: subfx");
+	if (inst.Rc) GenerateRC();
+}
 void JitArm::mulli(UGeckoInstruction inst)
 {
 	INSTRUCTION_START
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp
index 11433477e0..bd13100695 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStore.cpp
@@ -36,6 +36,55 @@
 #else
 #define FASTMEM 0
 #endif
+void JitArm::stb(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(LoadStore)
+
+	ARMReg RS = gpr.R(inst.RS);
+#if 0 // FASTMEM
+	// R10 contains the dest address
+	ARMReg Value = R11;
+	ARMReg RA;
+	if (inst.RA)
+		RA = gpr.R(inst.RA);
+	MOV(Value, RS);
+	if (inst.RA)
+	{
+		MOVI2R(R10, inst.SIMM_16, false);
+		ADD(R10, R10, RA);
+	}
+	else
+	{
+		MOVI2R(R10, (u32)inst.SIMM_16, false);
+		NOP(1);
+	}
+	StoreFromReg(R10, Value, 16, 0);
+#else
+	ARMReg ValueReg = gpr.GetReg();
+	ARMReg Addr = gpr.GetReg();
+	ARMReg Function = gpr.GetReg();
+
+	MOV(ValueReg, RS);
+	if (inst.RA)
+	{
+		MOVI2R(Addr, inst.SIMM_16);
+		ARMReg RA = gpr.R(inst.RA);
+		ADD(Addr, Addr, RA);
+	}
+	else
+		MOVI2R(Addr, (u32)inst.SIMM_16);
+	
+	MOVI2R(Function, (u32)&Memory::Write_U8);	
+	PUSH(4, R0, R1, R2, R3);
+	MOV(R0, ValueReg);
+	MOV(R1, Addr);
+	BL(Function);
+	POP(4, R0, R1, R2, R3);
+	gpr.Unlock(ValueReg, Addr, Function);
+#endif
+}
+
 void JitArm::stbu(UGeckoInstruction inst)
 {
 	INSTRUCTION_START
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp
index 8e6e11b366..cf7535136f 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_SystemRegisters.cpp
@@ -111,6 +111,8 @@ void JitArm::mfmsr(UGeckoInstruction inst)
 {
 	INSTRUCTION_START
 	JITDISABLE(SystemRegisters)
-
+	Default(inst); return;
+	
 	LDR(gpr.R(inst.RD), R9, PPCSTATE_OFF(msr));
 }
+
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
index 9cacb31821..799b9e7c8f 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
@@ -91,7 +91,7 @@ static GekkoOPTemplate primarytable[] =
 	{45, &JitArm::sthu}, //"sthu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}},
 	{36, &JitArm::stw}, //"stw",  OPTYPE_STORE, FL_IN_A | FL_IN_S}},
 	{37, &JitArm::stwu}, //"stwu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}},
-	{38, &JitArm::Default}, //"stb",  OPTYPE_STORE, FL_IN_A | FL_IN_S}},
+	{38, &JitArm::stb}, //"stb",  OPTYPE_STORE, FL_IN_A | FL_IN_S}},
 	{39, &JitArm::stbu}, //"stbu", OPTYPE_STORE, FL_OUT_A | FL_IN_A | FL_IN_S}},
 
 	{46, &JitArm::Default}, //"lmw",   OPTYPE_SYSTEM, FL_EVIL, 10}},
@@ -322,7 +322,7 @@ static GekkoOPTemplate table31_2[] =
 	{235,  &JitArm::Default}, //"mullwx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
 	{747,  &JitArm::Default}, //"mullwox",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT, 4}},
 	{104,  &JitArm::negx}, //"negx",    OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
-	{40,   &JitArm::Default}, //"subfx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
+	{40,   &JitArm::subfx}, //"subfx",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
 	{552,  &JitArm::Default}, //"subox",   OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_RC_BIT}},
 	{8,    &JitArm::Default}, //"subfcx",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_SET_CA | FL_RC_BIT}},
 	{136,  &JitArm::Default}, //"subfex",  OPTYPE_INTEGER, FL_OUT_D | FL_IN_AB | FL_READ_CA | FL_SET_CA | FL_RC_BIT}},

From 5147e5167b3cd02a6051e9c387ac06adbcd037f4 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Wed, 17 Jul 2013 02:34:20 -0500
Subject: [PATCH 307/352] [ARM] Implement xorx

---
 Source/Core/Core/Src/PowerPC/JitArm32/Jit.h         |  1 +
 .../Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp    | 13 +++++++++++++
 .../Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp     |  2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
index 8669d75c73..6bef59aa03 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
@@ -155,6 +155,7 @@ public:
 	void ori(UGeckoInstruction _inst);	
 	void oris(UGeckoInstruction _inst);	
 	void orx(UGeckoInstruction _inst);
+	void xorx(UGeckoInstruction _inst);
 	void rlwimix(UGeckoInstruction _inst);
 	void rlwinmx(UGeckoInstruction _inst);
 	void subfx(UGeckoInstruction _inst);
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp
index 12e5bff023..e19112c1b5 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Integer.cpp
@@ -147,6 +147,7 @@ void JitArm::oris(UGeckoInstruction inst)
 	ORR(RA, RS, rA);
 	gpr.Unlock(rA);
 }
+
 void JitArm::orx(UGeckoInstruction inst)
 {
 	INSTRUCTION_START
@@ -160,6 +161,18 @@ void JitArm::orx(UGeckoInstruction inst)
 		ComputeRC();
 }
 
+void JitArm::xorx(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(Integer)
+
+	ARMReg rA = gpr.R(inst.RA);
+	ARMReg rS = gpr.R(inst.RS);
+	ARMReg rB = gpr.R(inst.RB);
+	EORS(rA, rS, rB);
+	if (inst.Rc)
+		ComputeRC();
+}
 void JitArm::extshx(UGeckoInstruction inst)
 {
 	INSTRUCTION_START
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
index 799b9e7c8f..4308a6765b 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
@@ -198,7 +198,7 @@ static GekkoOPTemplate table31[] =
 	{60,  &JitArm::Default}, //"andcx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
 	{444, &JitArm::orx}, //"orx",    OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
 	{124, &JitArm::Default}, //"norx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
-	{316, &JitArm::Default}, //"xorx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
+	{316, &JitArm::xorx}, //"xorx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
 	{412, &JitArm::Default}, //"orcx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
 	{476, &JitArm::Default}, //"nandx",  OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},
 	{284, &JitArm::Default}, //"eqvx",   OPTYPE_INTEGER, FL_OUT_A | FL_IN_SB | FL_RC_BIT}},

From dc66b3d47460256e66c217881b21d397766bcd42 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Wed, 17 Jul 2013 04:22:47 -0500
Subject: [PATCH 308/352] Add Read_F32 and Read_F64 helper functions to
 MemmapFunctions.

---
 Source/Core/Core/Src/HW/Memmap.h            |  5 +++++
 Source/Core/Core/Src/HW/MemmapFunctions.cpp | 24 +++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/Source/Core/Core/Src/HW/Memmap.h b/Source/Core/Core/Src/HW/Memmap.h
index 85deac8fce..a4cef35cf6 100644
--- a/Source/Core/Core/Src/HW/Memmap.h
+++ b/Source/Core/Core/Src/HW/Memmap.h
@@ -136,6 +136,11 @@ u16 Read_U16(const u32 _Address);
 u32 Read_U32(const u32 _Address);
 u64 Read_U64(const u32 _Address);
 
+// Useful helper functions, used by ARM JIT
+float Read_F32(const u32 _Address);
+double Read_F64(const u32 _Address);
+
+
 // used by JIT. Return zero-extended 32bit values
 u32 Read_U8_ZX(const u32 _Address);
 u32 Read_U16_ZX(const u32 _Address);
diff --git a/Source/Core/Core/Src/HW/MemmapFunctions.cpp b/Source/Core/Core/Src/HW/MemmapFunctions.cpp
index e7422490c9..b60fd8d50d 100644
--- a/Source/Core/Core/Src/HW/MemmapFunctions.cpp
+++ b/Source/Core/Core/Src/HW/MemmapFunctions.cpp
@@ -403,6 +403,30 @@ u64 Read_U64(const u32 _Address)
 	return _var;
 }
 
+double Read_F64(const u32 _Address)
+{
+	union
+	{
+		u64 i;
+		double d;
+	} cvt;
+	
+	cvt.i = Read_U64(_Address);
+	return cvt.d;
+}
+
+float Read_F32(const u32 _Address)
+{
+	union
+	{
+		u32 i;
+		float d;
+	} cvt;
+
+	cvt.i = Read_U32(_Address);
+	return cvt.d;
+}
+
 u32 Read_U8_ZX(const u32 _Address)
 {
 	return (u32)Read_U8(_Address);

From 86826b28dce8d6bf7a370e9a97dc12114e3ae616 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Wed, 17 Jul 2013 04:23:38 -0500
Subject: [PATCH 309/352] [ARM] Implement LFD. Reorder VFP register allocation
 a bit.

---
 Source/Core/Core/Src/PowerPC/JitArm32/Jit.h   |  1 +
 .../JitArm32/JitArm_LoadStoreFloating.cpp     | 47 +++++++++++++++----
 .../Src/PowerPC/JitArm32/JitArm_Tables.cpp    |  2 +-
 .../Core/Src/PowerPC/JitArm32/JitFPRCache.cpp |  8 ++--
 4 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
index 6bef59aa03..e5a07b3bac 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/Jit.h
@@ -189,6 +189,7 @@ public:
 
 	// Floating point loadStore
 	void lfs(UGeckoInstruction _inst);
+	void lfd(UGeckoInstruction _inst);
 };
 
 #endif // _JIT64_H
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp
index dd36f145a9..708aff9022 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_LoadStoreFloating.cpp
@@ -53,20 +53,51 @@ void JitArm::lfs(UGeckoInstruction inst)
 	else
 		MOVI2R(rB, (u32)inst.SIMM_16);
 
-	MOVI2R(rA, (u32)&Memory::Read_U32);	
+	ARMReg v0 = fpr.R0(inst.FD, false);
+	ARMReg v1 = fpr.R1(inst.FD, false);
+
+	MOVI2R(rA, (u32)&Memory::Read_F32);	
 	PUSH(4, R0, R1, R2, R3);
 	MOV(R0, rB);
 	BL(rA);
-	MOV(rA, R0);
+	// XXX: Need to use VCVT here.
+	VMOV(v0, D0);
+	VMOV(v1, D0);
 	POP(4, R0, R1, R2, R3);
 	
-	ARMReg v0 = fpr.R0(inst.FD, false);
-	ARMReg v1 = fpr.R1(inst.FD, false);
-	
-	VMOV(v0, rA, false);
-	VMOV(v1, rA, false);
-
 	gpr.Unlock(rA, rB);
 	SetJumpTarget(DoNotLoad);
 }
 
+void JitArm::lfd(UGeckoInstruction inst)
+{
+	INSTRUCTION_START
+	JITDISABLE(LoadStoreFloating)
+
+	ARMReg rA = gpr.GetReg();
+	ARMReg rB = gpr.GetReg();
+	LDR(rA, R9, PPCSTATE_OFF(Exceptions));
+	CMP(rA, EXCEPTION_DSI);
+	FixupBranch DoNotLoad = B_CC(CC_EQ);
+
+	if (inst.RA)
+	{
+		MOVI2R(rB, inst.SIMM_16);
+		ARMReg RA = gpr.R(inst.RA);
+		ADD(rB, rB, RA);
+	}
+	else
+		MOVI2R(rB, (u32)inst.SIMM_16);
+
+	ARMReg v0 = fpr.R0(inst.FD, false);
+
+	MOVI2R(rA, (u32)&Memory::Read_F64);	
+	PUSH(4, R0, R1, R2, R3);
+	MOV(R0, rB);
+	BL(rA);
+	VMOV(v0, D0);
+	POP(4, R0, R1, R2, R3);
+
+	gpr.Unlock(rA, rB);
+	SetJumpTarget(DoNotLoad);
+}
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
index 4308a6765b..3b97640ff2 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_Tables.cpp
@@ -99,7 +99,7 @@ static GekkoOPTemplate primarytable[] =
 
 	{48, &JitArm::lfs}, //"lfs",  OPTYPE_LOADFP, FL_IN_A}},
 	{49, &JitArm::Default}, //"lfsu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}},
-	{50, &JitArm::Default}, //"lfd",  OPTYPE_LOADFP, FL_IN_A}},
+	{50, &JitArm::lfd}, //"lfd",  OPTYPE_LOADFP, FL_IN_A}},
 	{51, &JitArm::Default}, //"lfdu", OPTYPE_LOADFP, FL_OUT_A | FL_IN_A}},
 
 	{52, &JitArm::Default}, //"stfs",  OPTYPE_STOREFP, FL_IN_A}},
diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp
index 535f8446c7..cdc13c48e2 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitFPRCache.cpp
@@ -56,9 +56,9 @@ ARMReg *ArmFPRCache::GetPPCAllocationOrder(int &count)
 	// the ppc side.
 	static ARMReg allocationOrder[] = 
 	{
-		D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, D10,
-		D11, D12, D13, D14, D15, D16, D17, D18, D19,
-		D20, D21, D22, D23, D24, D25, D26, D27
+		D4, D5, D6, D7, D8, D9, D10, D11, D12, D13, 
+		D14, D15, D16, D17, D18, D19, D20, D21, D22, 
+		D23, D24, D25, D26, D27, D28, D29, D30, D31
 	};
 	count = sizeof(allocationOrder) / sizeof(const int);
 	return allocationOrder;
@@ -69,7 +69,7 @@ ARMReg *ArmFPRCache::GetAllocationOrder(int &count)
 	// the host side.
 	static ARMReg allocationOrder[] = 
 	{
-		D31, D30, D29, D28
+		D0, D1, D2, D3
 	};
 	count = sizeof(allocationOrder) / sizeof(const int);
 	return allocationOrder;

From a3e289e802be341cd69b3abf787e19d3e28ab5de Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Wed, 17 Jul 2013 04:29:17 -0500
Subject: [PATCH 310/352] [ARM] Reenable FMRX, it seems to work fine.

---
 Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp
index fe4c0e3f22..c82c7d3877 100644
--- a/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitArm32/JitArm_FloatingPoint.cpp
@@ -68,7 +68,6 @@ void JitArm::fmrx(UGeckoInstruction inst)
 {
 	INSTRUCTION_START
 	JITDISABLE(FloatingPoint)
-	Default(inst); return;
 
 	ARMReg vD = fpr.R0(inst.FD);
 	ARMReg vB = fpr.R0(inst.FB);

From 2e92e3814e6590a3dc2a96fb37759b7eaa5df217 Mon Sep 17 00:00:00 2001
From: lioncash <mathew1900@hotmail.com>
Date: Thu, 18 Jul 2013 09:00:20 -0400
Subject: [PATCH 311/352] [Android] Tiny cleanup regarding method indentation
 in GameListAdapter.

getItem() and getView were a little off-kilter with the rest of the class. Keeps things more consistent, etc.
---
 .../dolphinemu/GameListAdapter.java           | 74 +++++++++----------
 1 file changed, 36 insertions(+), 38 deletions(-)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListAdapter.java
index a970db2f2a..986f33555b 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListAdapter.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListAdapter.java
@@ -12,46 +12,44 @@ import java.util.List;
 
 public class GameListAdapter extends ArrayAdapter<GameListItem>{
 
-	private Context c;
-	private int id;
-	private List<GameListItem>items;
-	
-	public GameListAdapter(Context context, int textViewResourceId,
-			List<GameListItem> objects) {
-		super(context, textViewResourceId, objects);
-		c = context;
-		id = textViewResourceId;
-		items = objects;
-	}
-	public GameListItem getItem(int i)
-	 {
-		 return items.get(i);
-	 }
-	 @Override
-      public View getView(int position, View convertView, ViewGroup parent) {
-              View v = convertView;
-              if (v == null) {
-                  LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-                  v = vi.inflate(id, null);
-              }
-              final GameListItem o = items.get(position);
-              if (o != null) {
-                      TextView t1 = (TextView) v.findViewById(R.id.GameItemTitle);
-                      TextView t2 = (TextView) v.findViewById(R.id.GameItemSubText);
-                      ImageView v1 = (ImageView) v.findViewById(R.id.GameItemIcon);
-                      
-                      if(t1!=null)
-                      	t1.setText(o.getName());
-                      if(t2!=null)
-                      	t2.setText(o.getData());
-                      if(v1!=null)
-                    	  v1.setImageBitmap(o.getImage());
-                      
-              }
-              return v;
-      }
+    private Context c;
+    private int id;
+    private List<GameListItem>items;
 
+    public GameListAdapter(Context context, int textViewResourceId, List<GameListItem> objects) {
+        super(context, textViewResourceId, objects);
+        c = context;
+        id = textViewResourceId;
+        items = objects;
+    }
 
+    public GameListItem getItem(int i)
+    {
+         return items.get(i);
+    }
 
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        View v = convertView;
+        if (v == null) {
+            LayoutInflater vi = (LayoutInflater)c.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            v = vi.inflate(id, null);
+        }
+
+        final GameListItem o = items.get(position);
+        if (o != null) {
+            TextView t1 = (TextView) v.findViewById(R.id.GameItemTitle);
+            TextView t2 = (TextView) v.findViewById(R.id.GameItemSubText);
+            ImageView v1 = (ImageView) v.findViewById(R.id.GameItemIcon);
+
+            if(t1!=null)
+                t1.setText(o.getName());
+            if(t2!=null)
+                t2.setText(o.getData());
+            if(v1!=null)
+                v1.setImageBitmap(o.getImage());
+          }
+        return v;
+    }
 }
 

From 0e1efd7d3894799aac3ccaf9eeadf22d0cdbdc88 Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Fri, 19 Jul 2013 15:01:04 -0400
Subject: [PATCH 312/352] Poll the controllers with the same timing as movies
 for netplay. Might help prevent desyncs.

---
 Source/Core/Core/Src/HW/SI.cpp   | 3 ++-
 Source/Core/Core/Src/NetPlay.cpp | 5 +++++
 Source/Core/Core/Src/NetPlay.h   | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Source/Core/Core/Src/HW/SI.cpp b/Source/Core/Core/Src/HW/SI.cpp
index f4fcec5743..5d34cef284 100644
--- a/Source/Core/Core/Src/HW/SI.cpp
+++ b/Source/Core/Core/Src/HW/SI.cpp
@@ -7,6 +7,7 @@
 #include "../ConfigManager.h"
 #include "../CoreTiming.h"
 #include "../Movie.h"
+#include "../NetPlay.h"
 
 #include "SystemTimers.h"
 #include "ProcessorInterface.h"
@@ -641,7 +642,7 @@ void RunSIBuffer()
 int GetTicksToNextSIPoll()
 {
 	// Poll for input at regular intervals (once per frame) when playing or recording a movie
-	if (Movie::IsPlayingInput() || Movie::IsRecordingInput())
+	if (Movie::IsPlayingInput() || Movie::IsRecordingInput() || NetPlay::GetNetPlayPtr())
 	{
 		return SystemTimers::GetTicksPerSecond() / VideoInterface::TargetRefreshRate;
 	}
diff --git a/Source/Core/Core/Src/NetPlay.cpp b/Source/Core/Core/Src/NetPlay.cpp
index 7f4b838ffc..56944dec00 100644
--- a/Source/Core/Core/Src/NetPlay.cpp
+++ b/Source/Core/Core/Src/NetPlay.cpp
@@ -386,3 +386,8 @@ bool CWII_IPC_HLE_WiiMote::NetPlay_WiimoteInput(int, u16, const void*, u32&)
 	else
 		return false;
 }
+
+NetPlay* NetPlay::GetNetPlayPtr()
+{
+	return netplay_ptr;
+}
diff --git a/Source/Core/Core/Src/NetPlay.h b/Source/Core/Core/Src/NetPlay.h
index 7bed7c6421..05d999e604 100644
--- a/Source/Core/Core/Src/NetPlay.h
+++ b/Source/Core/Core/Src/NetPlay.h
@@ -119,6 +119,7 @@ public:
 	//void PushPadStates(unsigned int count);
 
 	u8 GetPadNum(u8 numPAD);
+	static NetPlay* GetNetPlayPtr();
 
 protected:
 	//void GetBufferedPad(const u8 pad_nb, NetPad* const netvalues);

From 919e54c6951fe1150f865e243afadb91557abf9d Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Fri, 19 Jul 2013 15:53:20 -0400
Subject: [PATCH 313/352] Automatically connect the appropriate controllers for
 netplay.

---
 Source/Core/Core/Src/HW/SI.cpp   | 2 ++
 Source/Core/Core/Src/NetPlay.cpp | 5 +++++
 Source/Core/Core/Src/NetPlay.h   | 1 +
 3 files changed, 8 insertions(+)

diff --git a/Source/Core/Core/Src/HW/SI.cpp b/Source/Core/Core/Src/HW/SI.cpp
index 5d34cef284..738b97917d 100644
--- a/Source/Core/Core/Src/HW/SI.cpp
+++ b/Source/Core/Core/Src/HW/SI.cpp
@@ -262,6 +262,8 @@ void Init()
 
 		if (Movie::IsRecordingInput() || Movie::IsPlayingInput())
 			AddDevice(Movie::IsUsingPad(i) ?  (Movie::IsUsingBongo(i) ? SIDEVICE_GC_TARUKONGA : SIDEVICE_GC_CONTROLLER) : SIDEVICE_NONE, i);
+		else if (NetPlay::GetNetPlayPtr())
+			AddDevice(NetPlay::IsUsingPad(i) ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE, i);
 		else
 			AddDevice(SConfig::GetInstance().m_SIDevice[i], i);
 	}
diff --git a/Source/Core/Core/Src/NetPlay.cpp b/Source/Core/Core/Src/NetPlay.cpp
index 56944dec00..de788d7657 100644
--- a/Source/Core/Core/Src/NetPlay.cpp
+++ b/Source/Core/Core/Src/NetPlay.cpp
@@ -391,3 +391,8 @@ NetPlay* NetPlay::GetNetPlayPtr()
 {
 	return netplay_ptr;
 }
+
+bool NetPlay::IsUsingPad(int pad)
+{
+	return netplay_ptr->m_local_player->pad_map[pad] != -1;
+}
\ No newline at end of file
diff --git a/Source/Core/Core/Src/NetPlay.h b/Source/Core/Core/Src/NetPlay.h
index 05d999e604..0ea5cb1b3f 100644
--- a/Source/Core/Core/Src/NetPlay.h
+++ b/Source/Core/Core/Src/NetPlay.h
@@ -120,6 +120,7 @@ public:
 
 	u8 GetPadNum(u8 numPAD);
 	static NetPlay* GetNetPlayPtr();
+	static bool IsUsingPad(int pad);
 
 protected:
 	//void GetBufferedPad(const u8 pad_nb, NetPad* const netvalues);

From e4767aec5574feb8c8442e4626674bc00966f2e8 Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Fri, 19 Jul 2013 18:48:27 -0400
Subject: [PATCH 314/352] Sync some important settings with server during
 netplay.

---
 Source/Core/Core/Src/BootManager.cpp   | 12 +++++++++++-
 Source/Core/Core/Src/NetPlay.cpp       | 19 ++++++++++++++++++-
 Source/Core/Core/Src/NetPlay.h         | 12 +++++++++++-
 Source/Core/Core/Src/NetPlayClient.cpp | 11 ++++++++---
 Source/Core/Core/Src/NetPlayServer.cpp |  8 +++++++-
 5 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp
index 33f656ca4d..871af5059c 100644
--- a/Source/Core/Core/Src/BootManager.cpp
+++ b/Source/Core/Core/Src/BootManager.cpp
@@ -34,6 +34,7 @@
 #include "Host.h"
 #include "VideoBackendBase.h"
 #include "Movie.h"
+#include "NetPlay.h"
 
 namespace BootManager
 {
@@ -42,7 +43,7 @@ namespace BootManager
 // Apply fire liberally
 struct ConfigCache
 {
-	bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bDCBZOFF,
+	bool valid, bCPUThread, bSkipIdle, bEnableFPRF, bMMU, bDCBZOFF, m_EnableJIT,
 		bVBeamSpeedHack, bSyncGPU, bFastDiscSpeed, bMergeBlocks, bDSPHLE, bHLE_BS2;
 	int iTLBHack, iCPUCore;
 	std::string strBackend;
@@ -91,6 +92,7 @@ bool BootCore(const std::string& _rFilename)
 		config_cache.bDSPHLE = StartUp.bDSPHLE;
 		config_cache.strBackend = StartUp.m_strVideoBackend;
 		config_cache.bHLE_BS2 = StartUp.bHLE_BS2;
+		config_cache.m_EnableJIT = SConfig::GetInstance().m_EnableJIT;
 
 		// General settings
 		game_ini.Get("Core", "CPUThread",			&StartUp.bCPUThread, StartUp.bCPUThread);
@@ -134,6 +136,13 @@ bool BootCore(const std::string& _rFilename)
 		}
 	}
 
+	if (NetPlay::GetNetPlayPtr())
+	{
+		StartUp.bCPUThread = g_NetPlaySettings.m_CPUthread;
+		StartUp.bDSPHLE = g_NetPlaySettings.m_DSPHLE;
+		SConfig::GetInstance().m_EnableJIT = g_NetPlaySettings.m_DSPEnableJIT;
+	}
+
 	// Run the game
 	// Init the core
 	if (!Core::Init())
@@ -170,6 +179,7 @@ void Stop()
 		StartUp.m_strVideoBackend = config_cache.strBackend;
 		VideoBackend::ActivateBackend(StartUp.m_strVideoBackend);
 		StartUp.bHLE_BS2 = config_cache.bHLE_BS2;
+		SConfig::GetInstance().m_EnableJIT = config_cache.m_EnableJIT;
 	}
 }
 
diff --git a/Source/Core/Core/Src/NetPlay.cpp b/Source/Core/Core/Src/NetPlay.cpp
index de788d7657..b9c5e95a5b 100644
--- a/Source/Core/Core/Src/NetPlay.cpp
+++ b/Source/Core/Core/Src/NetPlay.cpp
@@ -15,9 +15,11 @@
 #include "HW/EXI_DeviceIPL.h"
 // for wiimote/ OSD messages
 #include "Core.h"
+#include "ConfigManager.h"
 
 std::mutex crit_netplay_ptr;
 static NetPlay* netplay_ptr = NULL;
+NetSettings g_NetPlaySettings;
 
 #define RPT_SIZE_HACK	(1 << 16)
 
@@ -281,6 +283,21 @@ u8 NetPlay::GetPadNum(u8 numPAD)
 	return i;
 }
 
+void NetPlay::GetNetSettings()
+{
+	SConfig &instance = SConfig::GetInstance();
+	g_NetPlaySettings.m_CPUthread = instance.m_LocalCoreStartupParameter.bCPUThread;
+	g_NetPlaySettings.m_DSPHLE = instance.m_LocalCoreStartupParameter.bDSPHLE;
+	g_NetPlaySettings.m_DSPEnableJIT = instance.m_EnableJIT;
+	for (int i = 0; i < 4; ++i)
+		{
+			if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER)
+				g_NetPlaySettings.m_Controllers |= (1 << i);
+			if (g_wiimote_sources[i] != WIIMOTE_SRC_NONE)
+				g_NetPlaySettings.m_Controllers |= (1 << (i + 4));
+		}
+}
+
 // stuff hacked into dolphin
 
 // called from ---CPU--- thread
@@ -394,5 +411,5 @@ NetPlay* NetPlay::GetNetPlayPtr()
 
 bool NetPlay::IsUsingPad(int pad)
 {
-	return netplay_ptr->m_local_player->pad_map[pad] != -1;
+	return ((g_NetPlaySettings.m_Controllers & (1 << pad)) != 0);
 }
\ No newline at end of file
diff --git a/Source/Core/Core/Src/NetPlay.h b/Source/Core/Core/Src/NetPlay.h
index 0ea5cb1b3f..08199b21a3 100644
--- a/Source/Core/Core/Src/NetPlay.h
+++ b/Source/Core/Core/Src/NetPlay.h
@@ -31,6 +31,15 @@ public:
 	u32 nLo;
 };
 
+struct NetSettings
+{
+	bool m_CPUthread;
+	bool m_DSPHLE;
+	bool m_DSPEnableJIT;
+	u8 m_Controllers;
+};
+extern NetSettings g_NetPlaySettings;
+
 struct Rpt : public std::vector<u8>
 {
 	u16		channel;
@@ -38,7 +47,7 @@ struct Rpt : public std::vector<u8>
 
 typedef std::vector<Rpt>	NetWiimote;
 
-#define NETPLAY_VERSION		"Dolphin NetPlay 2013-04-11"
+#define NETPLAY_VERSION		"Dolphin NetPlay 2013-07-19"
 
 // messages
 enum
@@ -125,6 +134,7 @@ public:
 protected:
 	//void GetBufferedPad(const u8 pad_nb, NetPad* const netvalues);
 	void ClearBuffers();
+	void GetNetSettings();
 	virtual void SendPadState(const PadMapping local_nb, const NetPad& np) = 0;
 
 	struct
diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp
index aa7a678230..fb60764256 100644
--- a/Source/Core/Core/Src/NetPlayClient.cpp
+++ b/Source/Core/Core/Src/NetPlayClient.cpp
@@ -193,6 +193,10 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
 			{
 			std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
 			packet >> m_current_game;
+			packet >> g_NetPlaySettings.m_CPUthread;
+			packet >> g_NetPlaySettings.m_DSPEnableJIT;
+			packet >> g_NetPlaySettings.m_DSPHLE;
+			packet >> g_NetPlaySettings.m_Controllers;
 			}
 
 			m_dialog->OnMsgStartGame();
@@ -317,13 +321,14 @@ bool NetPlayClient::StartGame(const std::string &path)
 {
 	std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
 
-	if (false == NetPlay::StartGame(path))
-		return false;
-
 	// tell server i started the game
 	sf::Packet spac;
 	spac << (MessageId)NP_MSG_START_GAME;
 	spac << m_current_game;
+	spac << (char *)&g_NetPlaySettings;
+
+	if (false == NetPlay::StartGame(path))
+		return false;
 
 	std::lock_guard<std::recursive_mutex> lks(m_crit.send);
 	m_socket.Send(spac);
diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp
index 850954ac55..90ac6b7f59 100644
--- a/Source/Core/Core/Src/NetPlayServer.cpp
+++ b/Source/Core/Core/Src/NetPlayServer.cpp
@@ -590,6 +590,7 @@ bool NetPlayServer::StartGame(const std::string &path)
 {
 	std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
 
+	GetNetSettings();
 	if (false == NetPlay::StartGame(path))
 		return false;
 
@@ -602,7 +603,12 @@ bool NetPlayServer::StartGame(const std::string &path)
 	// tell clients to start game
 	sf::Packet spac;
 	spac << (MessageId)NP_MSG_START_GAME;
-	spac << m_current_game;
+	spac << NetPlay::m_current_game;
+	spac << g_NetPlaySettings.m_CPUthread;
+	spac << g_NetPlaySettings.m_DSPEnableJIT;
+	spac << g_NetPlaySettings.m_DSPHLE;
+	spac << g_NetPlaySettings.m_Controllers;
+
 
 	std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
 	std::lock_guard<std::recursive_mutex> lks(m_crit.send);

From 96219df4fde48c9e88fb7f372380b9274009c7f5 Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Fri, 19 Jul 2013 22:58:33 -0400
Subject: [PATCH 315/352] Allow non-SIDEVICE_GC_CONTROLLER controllers in
 netplay again.

---
 Source/Core/Core/Src/HW/SI.cpp         |  2 +-
 Source/Core/Core/Src/NetPlay.cpp       | 15 +++------------
 Source/Core/Core/Src/NetPlay.h         |  3 +--
 Source/Core/Core/Src/NetPlayClient.cpp |  3 ++-
 Source/Core/Core/Src/NetPlayServer.cpp |  4 ++--
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/Source/Core/Core/Src/HW/SI.cpp b/Source/Core/Core/Src/HW/SI.cpp
index 738b97917d..85c84f92dd 100644
--- a/Source/Core/Core/Src/HW/SI.cpp
+++ b/Source/Core/Core/Src/HW/SI.cpp
@@ -263,7 +263,7 @@ void Init()
 		if (Movie::IsRecordingInput() || Movie::IsPlayingInput())
 			AddDevice(Movie::IsUsingPad(i) ?  (Movie::IsUsingBongo(i) ? SIDEVICE_GC_TARUKONGA : SIDEVICE_GC_CONTROLLER) : SIDEVICE_NONE, i);
 		else if (NetPlay::GetNetPlayPtr())
-			AddDevice(NetPlay::IsUsingPad(i) ? SIDEVICE_GC_CONTROLLER : SIDEVICE_NONE, i);
+			AddDevice((SIDevices) g_NetPlaySettings.m_Controllers[i], i);
 		else
 			AddDevice(SConfig::GetInstance().m_SIDevice[i], i);
 	}
diff --git a/Source/Core/Core/Src/NetPlay.cpp b/Source/Core/Core/Src/NetPlay.cpp
index b9c5e95a5b..48eb6f5cad 100644
--- a/Source/Core/Core/Src/NetPlay.cpp
+++ b/Source/Core/Core/Src/NetPlay.cpp
@@ -289,13 +289,9 @@ void NetPlay::GetNetSettings()
 	g_NetPlaySettings.m_CPUthread = instance.m_LocalCoreStartupParameter.bCPUThread;
 	g_NetPlaySettings.m_DSPHLE = instance.m_LocalCoreStartupParameter.bDSPHLE;
 	g_NetPlaySettings.m_DSPEnableJIT = instance.m_EnableJIT;
-	for (int i = 0; i < 4; ++i)
-		{
-			if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER)
-				g_NetPlaySettings.m_Controllers |= (1 << i);
-			if (g_wiimote_sources[i] != WIIMOTE_SRC_NONE)
-				g_NetPlaySettings.m_Controllers |= (1 << (i + 4));
-		}
+
+	for (unsigned int i = 0; i < 4; ++i)
+		g_NetPlaySettings.m_Controllers[i] = SConfig::GetInstance().m_SIDevice[i];
 }
 
 // stuff hacked into dolphin
@@ -408,8 +404,3 @@ NetPlay* NetPlay::GetNetPlayPtr()
 {
 	return netplay_ptr;
 }
-
-bool NetPlay::IsUsingPad(int pad)
-{
-	return ((g_NetPlaySettings.m_Controllers & (1 << pad)) != 0);
-}
\ No newline at end of file
diff --git a/Source/Core/Core/Src/NetPlay.h b/Source/Core/Core/Src/NetPlay.h
index 08199b21a3..d8ecee016a 100644
--- a/Source/Core/Core/Src/NetPlay.h
+++ b/Source/Core/Core/Src/NetPlay.h
@@ -36,7 +36,7 @@ struct NetSettings
 	bool m_CPUthread;
 	bool m_DSPHLE;
 	bool m_DSPEnableJIT;
-	u8 m_Controllers;
+	u8 m_Controllers[4];
 };
 extern NetSettings g_NetPlaySettings;
 
@@ -129,7 +129,6 @@ public:
 
 	u8 GetPadNum(u8 numPAD);
 	static NetPlay* GetNetPlayPtr();
-	static bool IsUsingPad(int pad);
 
 protected:
 	//void GetBufferedPad(const u8 pad_nb, NetPad* const netvalues);
diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp
index fb60764256..c72c94efa4 100644
--- a/Source/Core/Core/Src/NetPlayClient.cpp
+++ b/Source/Core/Core/Src/NetPlayClient.cpp
@@ -196,7 +196,8 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
 			packet >> g_NetPlaySettings.m_CPUthread;
 			packet >> g_NetPlaySettings.m_DSPEnableJIT;
 			packet >> g_NetPlaySettings.m_DSPHLE;
-			packet >> g_NetPlaySettings.m_Controllers;
+			for (unsigned int i = 0; i < 4; ++i)
+				packet >> g_NetPlaySettings.m_Controllers[i];
 			}
 
 			m_dialog->OnMsgStartGame();
diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp
index 90ac6b7f59..d19b6d684a 100644
--- a/Source/Core/Core/Src/NetPlayServer.cpp
+++ b/Source/Core/Core/Src/NetPlayServer.cpp
@@ -607,8 +607,8 @@ bool NetPlayServer::StartGame(const std::string &path)
 	spac << g_NetPlaySettings.m_CPUthread;
 	spac << g_NetPlaySettings.m_DSPEnableJIT;
 	spac << g_NetPlaySettings.m_DSPHLE;
-	spac << g_NetPlaySettings.m_Controllers;
-
+	for (unsigned int i = 0; i < 4; ++i)
+		spac << g_NetPlaySettings.m_Controllers[i];
 
 	std::lock_guard<std::recursive_mutex> lkp(m_crit.players);
 	std::lock_guard<std::recursive_mutex> lks(m_crit.send);

From 41fe2e1466d1e8939b2716c686d094112753a703 Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Sat, 20 Jul 2013 13:20:14 -0400
Subject: [PATCH 316/352] Don't sync dual core setting in netplay.

---
 Source/Core/Core/Src/BootManager.cpp   | 1 -
 Source/Core/Core/Src/NetPlay.cpp       | 1 -
 Source/Core/Core/Src/NetPlay.h         | 1 -
 Source/Core/Core/Src/NetPlayClient.cpp | 1 -
 Source/Core/Core/Src/NetPlayServer.cpp | 1 -
 5 files changed, 5 deletions(-)

diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp
index 871af5059c..60f718db53 100644
--- a/Source/Core/Core/Src/BootManager.cpp
+++ b/Source/Core/Core/Src/BootManager.cpp
@@ -138,7 +138,6 @@ bool BootCore(const std::string& _rFilename)
 
 	if (NetPlay::GetNetPlayPtr())
 	{
-		StartUp.bCPUThread = g_NetPlaySettings.m_CPUthread;
 		StartUp.bDSPHLE = g_NetPlaySettings.m_DSPHLE;
 		SConfig::GetInstance().m_EnableJIT = g_NetPlaySettings.m_DSPEnableJIT;
 	}
diff --git a/Source/Core/Core/Src/NetPlay.cpp b/Source/Core/Core/Src/NetPlay.cpp
index 48eb6f5cad..59b6a05538 100644
--- a/Source/Core/Core/Src/NetPlay.cpp
+++ b/Source/Core/Core/Src/NetPlay.cpp
@@ -286,7 +286,6 @@ u8 NetPlay::GetPadNum(u8 numPAD)
 void NetPlay::GetNetSettings()
 {
 	SConfig &instance = SConfig::GetInstance();
-	g_NetPlaySettings.m_CPUthread = instance.m_LocalCoreStartupParameter.bCPUThread;
 	g_NetPlaySettings.m_DSPHLE = instance.m_LocalCoreStartupParameter.bDSPHLE;
 	g_NetPlaySettings.m_DSPEnableJIT = instance.m_EnableJIT;
 
diff --git a/Source/Core/Core/Src/NetPlay.h b/Source/Core/Core/Src/NetPlay.h
index d8ecee016a..8b84f43250 100644
--- a/Source/Core/Core/Src/NetPlay.h
+++ b/Source/Core/Core/Src/NetPlay.h
@@ -33,7 +33,6 @@ public:
 
 struct NetSettings
 {
-	bool m_CPUthread;
 	bool m_DSPHLE;
 	bool m_DSPEnableJIT;
 	u8 m_Controllers[4];
diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp
index c72c94efa4..f01f2155c6 100644
--- a/Source/Core/Core/Src/NetPlayClient.cpp
+++ b/Source/Core/Core/Src/NetPlayClient.cpp
@@ -193,7 +193,6 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
 			{
 			std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
 			packet >> m_current_game;
-			packet >> g_NetPlaySettings.m_CPUthread;
 			packet >> g_NetPlaySettings.m_DSPEnableJIT;
 			packet >> g_NetPlaySettings.m_DSPHLE;
 			for (unsigned int i = 0; i < 4; ++i)
diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp
index d19b6d684a..31731daa47 100644
--- a/Source/Core/Core/Src/NetPlayServer.cpp
+++ b/Source/Core/Core/Src/NetPlayServer.cpp
@@ -604,7 +604,6 @@ bool NetPlayServer::StartGame(const std::string &path)
 	sf::Packet spac;
 	spac << (MessageId)NP_MSG_START_GAME;
 	spac << NetPlay::m_current_game;
-	spac << g_NetPlaySettings.m_CPUthread;
 	spac << g_NetPlaySettings.m_DSPEnableJIT;
 	spac << g_NetPlaySettings.m_DSPHLE;
 	for (unsigned int i = 0; i < 4; ++i)

From 9fbc5ff27cef0acac37a5a5a1a2c0d060ec226e1 Mon Sep 17 00:00:00 2001
From: Max Eliaser <max@meliaserlow.dyndns.tv>
Date: Tue, 9 Jul 2013 22:49:58 -0800
Subject: [PATCH 317/352] Add X11 XInput2 input plugin, including MPX and with
 support for axis controls. Based on the original XLib plugin, and thus shares
 some of its warts.

---
 CMakeLists.txt                                |   6 +
 CMakeTests/FindX11XInput2.cmake               |  30 ++
 Source/Core/InputCommon/CMakeLists.txt        |   4 +
 .../ControllerInterface.cpp                   |   6 +
 .../ControllerInterface/ControllerInterface.h |   3 +
 .../Src/ControllerInterface/Xlib/XInput2.cpp  | 387 ++++++++++++++++++
 .../Src/ControllerInterface/Xlib/XInput2.h    | 124 ++++++
 7 files changed, 560 insertions(+)
 create mode 100644 CMakeTests/FindX11XInput2.cmake
 create mode 100644 Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.cpp
 create mode 100644 Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac4e97e944..324a2406b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -430,6 +430,12 @@ if(NOT ANDROID)
 		else()
 			add_definitions(-DHAVE_XRANDR=0)
 		endif(XRANDR_FOUND)
+		include(FindX11XInput2)
+		if(X11_Xinput2_FOUND)
+			add_definitions(-DHAVE_X11_XINPUT2=1)
+		else()
+			add_definitions(-DHAVE_X11_XINPUT2=0)
+		endif(X11_Xinput2_FOUND)
 	endif()
 	if(ENCODE_FRAMEDUMPS)
 		check_libav()
diff --git a/CMakeTests/FindX11XInput2.cmake b/CMakeTests/FindX11XInput2.cmake
new file mode 100644
index 0000000000..1b1f26f2cd
--- /dev/null
+++ b/CMakeTests/FindX11XInput2.cmake
@@ -0,0 +1,30 @@
+# For finding the X11 XInput extension, version 2. Because the standard CMake
+# FindX11.cmake may only know to look for version 1. Newer versions of CMake
+# than 2.8.7 might not have this problem, I wouldn't know. Better to be safe.
+
+
+if(USE_X11)
+    
+    IF(NOT X11_FOUND)
+        INCLUDE(FindX11)
+    ENDIF(NOT X11_FOUND)
+
+    IF(X11_FOUND)
+        FIND_PATH(X11_Xinput2_INCLUDE_PATH X11/extensions/XInput2.h ${X11_INC_SEARCH_PATH})
+        
+        FIND_LIBRARY(X11_Xinput2_LIB Xi ${X11_LIB_SEARCH_PATH})
+        
+        IF (X11_Xinput2_INCLUDE_PATH AND X11_Xinput2_LIB)
+            SET(X11_Xinput2_FOUND TRUE)
+            SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xinput2_INCLUDE_PATH})
+            message("X11 Xinput2 found")
+        ENDIF (X11_Xinput2_INCLUDE_PATH AND X11_Xinput2_LIB)
+        
+        MARK_AS_ADVANCED(
+            X11_Xinput2_INCLUDE_PATH
+            X11_Xinput2_LIB
+        )
+        
+    ENDIF(X11_FOUND)
+
+endif()
diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt
index 518bdbb3ba..05ea6eb35e 100644
--- a/Source/Core/InputCommon/CMakeLists.txt
+++ b/Source/Core/InputCommon/CMakeLists.txt
@@ -23,6 +23,10 @@ elseif(X11_FOUND)
 	set(SRCS	${SRCS}
 				Src/ControllerInterface/SDL/SDL.cpp
 				Src/ControllerInterface/Xlib/Xlib.cpp)
+	if(X11_Xinput2_FOUND)
+		set(SRCS	${SRCS}
+					Src/ControllerInterface/Xlib/XInput2.cpp)
+	endif()
 elseif(ANDROID)
 	set(SRCS	${SRCS}
 				Src/ControllerInterface/Android/Android.cpp)
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
index 58e0653bbe..f0870a18a4 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
@@ -8,6 +8,9 @@
 #endif
 #ifdef CIFACE_USE_XLIB
 	#include "Xlib/Xlib.h"
+	#ifdef CIFACE_USE_X11_XINPUT2
+		#include "Xlib/XInput2.h"
+	#endif
 #endif
 #ifdef CIFACE_USE_OSX
 	#include "OSX/OSX.h"
@@ -48,6 +51,9 @@ void ControllerInterface::Initialize()
 #endif
 #ifdef CIFACE_USE_XLIB
 	ciface::Xlib::Init(m_devices, m_hwnd);
+	#ifdef CIFACE_USE_X11_XINPUT2
+		ciface::XInput2::Init(m_devices, m_hwnd);
+	#endif
 #endif
 #ifdef CIFACE_USE_OSX
 	ciface::OSX::Init(m_devices, m_hwnd);
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
index 57903a08a7..711f393894 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
@@ -21,6 +21,9 @@
 #if defined(HAVE_X11) && HAVE_X11
 	#define CIFACE_USE_XLIB
 	#define CIFACE_USE_SDL
+	#if defined(HAVE_X11_XINPUT2) && HAVE_X11_XINPUT2
+		#define CIFACE_USE_X11_XINPUT2
+	#endif
 #endif
 #if defined(__APPLE__)
 	#define CIFACE_USE_OSX
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.cpp
new file mode 100644
index 0000000000..e4abe03f2f
--- /dev/null
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.cpp
@@ -0,0 +1,387 @@
+// Copyright 2013 Max Eliaser
+// Licensed under the GNU General Public License, version 2 or higher.
+// Refer to the license.txt file included.
+
+
+#include "XInput2.h"
+#include <X11/XKBlib.h>
+#include <cmath>
+
+// This is an input plugin using the XInput 2.0 extension to the X11 protocol,
+// loosely based on the old XLib plugin. (Has nothing to do with the XInput 
+// API on Windows.) 
+
+// This plugin creates one KeyboardMouse object for each master pointer/
+// keyboard pair. Each KeyboardMouse object exports four types of controls:
+// *    Mouse button controls: hardcoded at five of them, but could be made to
+//      support infinitely many mouse buttons in theory; XInput2 has no limit.
+// *    Mouse cursor controls: one for each cardinal direction. Calculated by
+//      comparing the absolute position of the mouse pointer on screen to the
+//      center of the emulator window.
+// *    Mouse axis controls: one for each cardinal direction. Calculated using
+//      a running average of relative mouse motion on each axis.
+// *    Key controls: these correspond to a limited subset of the keyboard 
+//      keys.
+
+
+// Mouse axis control tuning. Unlike absolute mouse position, relative mouse
+// motion data needs to be tweaked and smoothed out a bit to be usable.
+
+// Mouse axis control output is simply divided by this number. In practice, 
+// that just means you can use a smaller "dead zone" if you bind axis controls
+// to a joystick. No real need to make this customizable.
+#define MOUSE_AXIS_SENSITIVITY		8.0f
+
+// The mouse axis controls use a weighted running average. Each frame, the new
+// value is the average of the old value and the amount of relative mouse 
+// motion during that frame. The old value is weighted by a ratio of
+// MOUSE_AXIS_SMOOTHING:1 compared to the new value. Increasing
+// MOUSE_AXIS_SMOOTHING makes the controls smoother, decreasing it makes them
+// more responsive. This might be useful as a user-customizable option.
+#define MOUSE_AXIS_SMOOTHING		1.5f
+
+namespace ciface
+{
+namespace XInput2
+{
+
+// This function will add zero or more KeyboardMouse objects to devices.
+void Init(std::vector<Core::Device*>& devices, void* const hwnd)
+{
+	Display* dpy;
+	
+	dpy = XOpenDisplay(NULL);
+	
+	// xi_opcode is important; it will be used to identify XInput events by 
+	// the polling loop in UpdateInput.
+	int xi_opcode, event, error;
+	
+	// verify that the XInput extension is available
+	if (!XQueryExtension(dpy, "XInputExtension", &xi_opcode, &event, &error))
+		return;
+	
+	// verify that the XInput extension is at at least version 2.0
+	int major = 2, minor = 0;
+	
+	if (XIQueryVersion(dpy, &major, &minor) != Success)
+		return;
+	
+	// register all master devices with Dolphin
+	
+	XIDeviceInfo*	all_masters;
+	XIDeviceInfo*	current_master;
+	int				num_masters;
+	
+	all_masters = XIQueryDevice(dpy, XIAllMasterDevices, &num_masters);
+	
+	for (int i = 0; i < num_masters; i++)
+	{
+		current_master = &all_masters[i];
+		if (current_master->use == XIMasterPointer)
+			// Since current_master is a master pointer, its attachment must
+			// be a master keyboard.
+			devices.push_back(new KeyboardMouse((Window)hwnd, xi_opcode, current_master->deviceid, current_master->attachment));
+	}
+	
+	XCloseDisplay(dpy);
+	
+	XIFreeDeviceInfo(all_masters);
+}
+
+// Apply the event mask to the device and all its slaves. Only used in the 
+// constructor. Remember, each KeyboardMouse has its own copy of the event
+// stream, which is how multiple event masks can "coexist."
+void KeyboardMouse::SelectEventsForDevice(Window window, XIEventMask *mask, int deviceid)
+{
+	// Set the event mask for the master device.
+	
+	mask->deviceid = deviceid;
+	XISelectEvents(m_display, window, mask, 1);
+	
+	// Query all the master device's slaves and set the same event mask for
+	// those too. There are two reasons we want to do this. For mouse devices,
+	// we want the raw motion events, and only slaves (i.e. physical hardware
+	// devices) emit those. For keyboard devices, selecting slaves avoids
+	// dealing with key focus.
+	
+	XIDeviceInfo*	all_slaves;
+	XIDeviceInfo*	current_slave;
+	int				num_slaves;
+	
+	all_slaves = XIQueryDevice(m_display, XIAllDevices, &num_slaves);
+	
+	for (int i = 0; i < num_slaves; i++)
+	{
+		current_slave = &all_slaves[i];
+		if ((current_slave->use != XISlavePointer && current_slave->use != XISlaveKeyboard) || current_slave->attachment != deviceid)
+			continue;
+		mask->deviceid = current_slave->deviceid;
+		XISelectEvents(m_display, window, mask, 1);
+	}
+	
+	XIFreeDeviceInfo(all_slaves);
+}
+
+KeyboardMouse::KeyboardMouse(Window window, int opcode, int pointer, int keyboard) 
+	: m_window(window), xi_opcode(opcode), pointer_deviceid(pointer), keyboard_deviceid(keyboard)
+{
+	memset(&m_state, 0, sizeof(m_state));
+	
+	// The cool thing about each KeyboardMouse object having its own Display
+	// is that each one gets its own separate copy of the X11 event stream,
+	// which it can individually filter to get just the events it's interested
+	// in. So be aware that each KeyboardMouse object actually has its own X11
+	// "context."
+	m_display = XOpenDisplay(NULL);
+	
+	int min_keycode, max_keycode;
+	XDisplayKeycodes(m_display, &min_keycode, &max_keycode);
+	
+	int unused; // should always be 1
+	XIDeviceInfo* pointer_device = XIQueryDevice(m_display, pointer_deviceid, &unused);
+	name = std::string(pointer_device->name);
+	XIFreeDeviceInfo(pointer_device);
+	
+	XIEventMask		mask;
+	unsigned char	mask_buf[(XI_LASTEVENT + 7)/8];
+	
+	mask.mask_len = sizeof(mask_buf);
+	mask.mask = mask_buf;
+	memset(mask_buf, 0, sizeof(mask_buf));
+
+	XISetMask(mask_buf, XI_ButtonPress);
+	XISetMask(mask_buf, XI_ButtonRelease);
+	XISetMask(mask_buf, XI_RawMotion);
+	XISetMask(mask_buf, XI_KeyPress);
+	XISetMask(mask_buf, XI_KeyRelease);
+
+	SelectEventsForDevice(DefaultRootWindow(m_display), &mask, pointer_deviceid);	
+	SelectEventsForDevice(DefaultRootWindow(m_display), &mask, keyboard_deviceid);
+	
+	// Keyboard Keys
+	for (int i = min_keycode; i <= max_keycode; ++i)
+	{
+		Key* temp_key = new Key(m_display, i, m_state.keyboard);
+		if (temp_key->m_keyname.length())
+			AddInput(temp_key);
+		else
+			delete temp_key;
+	}
+
+	// Mouse Buttons
+	for (int i = 0; i < 5; i++)
+		AddInput(new Button(i, m_state.buttons));
+
+	// Mouse Cursor, X-/+ and Y-/+
+	for (int i = 0; i != 4; ++i)
+		AddInput(new Cursor(!!(i & 2), !!(i & 1), (&m_state.cursor.x)[!!(i & 2)]));
+	
+	// Mouse Axis, X-/+ and Y-/+
+	for (int i = 0; i != 4; ++i)
+		AddInput(new Axis(!!(i & 2), !!(i & 1), (&m_state.axis.x)[!!(i & 2)]));
+}
+
+KeyboardMouse::~KeyboardMouse()
+{
+	XCloseDisplay(m_display);
+}
+
+// Update the mouse cursor controls
+void KeyboardMouse::UpdateCursor()
+{
+	double root_x, root_y, win_x, win_y;
+	Window root, child;
+	
+	// unused-- we're not interested in button presses here, as those are 
+	// updated using events
+	XIButtonState button_state;
+	XIModifierState mods;
+	XIGroupState group;
+	
+	XIQueryPointer(m_display, pointer_deviceid, m_window, &root, &child, &root_x, &root_y, &win_x, &win_y, &button_state, &mods, &group);
+	
+	free (button_state.mask);
+
+	XWindowAttributes win_attribs;
+	XGetWindowAttributes(m_display, m_window, &win_attribs);
+
+	// the mouse position as a range from -1 to 1
+	m_state.cursor.x = win_x / (float)win_attribs.width * 2 - 1;
+	m_state.cursor.y = win_y / (float)win_attribs.height * 2 - 1;
+}
+
+bool KeyboardMouse::UpdateInput()
+{
+	XFlush(m_display);
+	
+	// Get the absolute position of the mouse pointer
+	UpdateCursor();
+	
+	// for the axis controls
+	float delta_x = 0.0f, delta_y = 0.0f;
+	double delta_delta;
+	
+	// Iterate through the event queue - update the axis controls, mouse
+	// button controls, and keyboard controls.
+	XEvent event;
+	while (XPending(m_display)) 
+	{
+		XNextEvent(m_display, &event);
+		
+		if (event.xcookie.type != GenericEvent)
+			continue;
+		if (event.xcookie.extension != xi_opcode)
+			continue;
+		if (!XGetEventData(m_display, &event.xcookie))
+			continue;
+		
+		// only one of these will get used
+		XIDeviceEvent* dev_event = (XIDeviceEvent*)event.xcookie.data;
+		XIRawEvent* raw_event = (XIRawEvent*)event.xcookie.data;
+		
+		switch (event.xcookie.evtype)
+		{
+		case XI_ButtonPress:
+			m_state.buttons |= 1<<(dev_event->detail-1);
+			break;
+		case XI_ButtonRelease:
+			m_state.buttons &= ~(1<<(dev_event->detail-1));
+			break;
+		case XI_KeyPress:
+			m_state.keyboard[dev_event->detail / 8] |= 1<<(dev_event->detail % 8);
+			break;
+		case XI_KeyRelease:
+			m_state.keyboard[dev_event->detail / 8] &= ~(1<<(dev_event->detail % 8));
+			break;
+		case XI_RawMotion:
+			// always safe because there is always at least one byte in 
+			// raw_event->valuators.mask, and if a bit is set in the mask,
+			// then the value in raw_values is also available.
+			if (XIMaskIsSet(raw_event->valuators.mask, 0))
+			{
+				delta_delta = raw_event->raw_values[0];
+				// test for inf and nan
+				if (delta_delta == delta_delta && 1+delta_delta != delta_delta)
+					delta_x += delta_delta;
+			}
+			if (XIMaskIsSet(raw_event->valuators.mask, 1))
+			{
+				delta_delta = raw_event->raw_values[1];
+				// test for inf and nan
+				if (delta_delta == delta_delta && 1+delta_delta != delta_delta)
+					delta_y += delta_delta;
+			}
+			break;
+		}
+		
+		XFreeEventData(m_display, &event.xcookie);
+	}
+	
+	// apply axis smoothing
+	m_state.axis.x *= MOUSE_AXIS_SMOOTHING;
+	m_state.axis.x += delta_x;
+	m_state.axis.x /= MOUSE_AXIS_SMOOTHING+1.0f;
+	m_state.axis.y *= MOUSE_AXIS_SMOOTHING;
+	m_state.axis.y += delta_y;
+	m_state.axis.y /= MOUSE_AXIS_SMOOTHING+1.0f;
+	
+	return true;
+}
+
+bool KeyboardMouse::UpdateOutput()
+{
+	return true;
+}
+
+std::string KeyboardMouse::GetName() const
+{
+	// This is the name string we got from the X server for this master
+	// pointer/keyboard pair.
+	return name;
+}
+
+std::string KeyboardMouse::GetSource() const
+{
+	return "XInput2";
+}
+
+int KeyboardMouse::GetId() const
+{
+	return -1;
+}
+
+KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* keyboard)
+	: m_display(display), m_keyboard(keyboard), m_keycode(keycode)
+{
+	int i = 0;
+	KeySym keysym = 0;
+	do
+	{
+		keysym = XkbKeycodeToKeysym(m_display, keycode, i, 0);
+		i++;
+	}
+	while (keysym == NoSymbol && i < 8);
+
+	// Convert to upper case for the keyname	
+	if (keysym >= 97 && keysym <= 122)
+		keysym -= 32;
+	
+	// 0x0110ffff is the top of the unicode character range according
+	// to keysymdef.h although it is probably more than we need.
+	if (keysym == NoSymbol || keysym > 0x0110ffff ||
+		XKeysymToString(keysym) == NULL)
+		m_keyname = std::string();
+	else
+		m_keyname = std::string(XKeysymToString(keysym));
+}
+
+ControlState KeyboardMouse::Key::GetState() const
+{
+	return (m_keyboard[m_keycode / 8] & (1 << (m_keycode % 8))) != 0;
+}
+
+ControlState KeyboardMouse::Button::GetState() const
+{
+	return ((m_buttons & (1 << m_index)) != 0);
+}
+
+ControlState KeyboardMouse::Cursor::GetState() const
+{
+	return std::max(0.0f, m_cursor / (m_positive ? 1.0f : -1.0f));
+}
+
+ControlState KeyboardMouse::Axis::GetState() const
+{
+	return std::max(0.0f, m_axis / (m_positive ? MOUSE_AXIS_SENSITIVITY : -MOUSE_AXIS_SENSITIVITY));
+}
+
+std::string KeyboardMouse::Key::GetName() const
+{
+	return m_keyname;
+}
+
+std::string KeyboardMouse::Cursor::GetName() const
+{
+	static char tmpstr[] = "Cursor ..";
+	tmpstr[7] = (char)('X' + m_index);
+	tmpstr[8] = (m_positive ? '+' : '-');
+	return tmpstr;
+}
+
+std::string KeyboardMouse::Axis::GetName() const
+{
+	static char tmpstr[] = "Axis ..";
+	tmpstr[5] = (char)('X' + m_index);
+	tmpstr[6] = (m_positive ? '+' : '-');
+	return tmpstr;
+}
+
+std::string KeyboardMouse::Button::GetName() const
+{
+	static char tmpstr[] = "Click .";
+	tmpstr[6] = m_index + '1';
+	return tmpstr;
+}
+
+}
+}
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.h
new file mode 100644
index 0000000000..3f138f1416
--- /dev/null
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.h
@@ -0,0 +1,124 @@
+// Copyright 2013 Max Eliaser
+// Licensed under the GNU General Public License, version 2 or higher.
+// Refer to the license.txt file included.
+
+// See XInput2.cpp for extensive documentation.
+
+#ifndef _CIFACE_X11_XINPUT2_H_
+#define _CIFACE_X11_XINPUT2_H_
+
+#include "../Device.h"
+
+extern "C" {
+#include <X11/Xlib.h>
+#include <X11/extensions/XInput2.h>
+#include <X11/keysym.h>
+}
+
+namespace ciface
+{
+namespace XInput2
+{
+
+void Init(std::vector<Core::Device*>& devices, void* const hwnd);
+
+class KeyboardMouse : public Core::Device
+{
+
+private:
+	struct State
+	{
+		char keyboard[32];
+		unsigned int buttons;
+		struct
+		{
+			float x, y;
+		} cursor, axis;
+	};
+	
+	class Key : public Input
+	{
+		friend class KeyboardMouse;
+	public:
+		std::string GetName() const;
+		Key(Display* display, KeyCode keycode, const char* keyboard);
+		ControlState GetState() const;
+		
+	private:
+		std::string	m_keyname;
+		Display* const	m_display;
+		const char* const m_keyboard;
+		const KeyCode	m_keycode;
+	};
+	
+	class Button : public Input
+	{
+	public:
+		std::string GetName() const;
+		Button(unsigned int index, unsigned int& buttons)
+			: m_buttons(buttons), m_index(index) {}
+		ControlState GetState() const;
+		
+	private:
+		const unsigned int& m_buttons;
+		const unsigned int m_index;
+	};
+
+	class Cursor : public Input
+	{
+	public:
+		std::string GetName() const;
+		bool IsDetectable() { return false; }
+		Cursor(u8 index, bool positive, const float& cursor)
+			: m_cursor(cursor), m_index(index), m_positive(positive) {}
+		ControlState GetState() const;
+	
+	private:
+		const float& m_cursor;
+		const u8 m_index;
+		const bool m_positive;
+	};
+	
+	class Axis : public Input
+	{
+	public:
+		std::string GetName() const;
+		bool IsDetectable() { return false; }
+		Axis(u8 index, bool positive, const float& axis)
+			: m_axis(axis), m_index(index), m_positive(positive) {}
+		ControlState GetState() const;
+
+	private:
+		const float& m_axis;
+		const u8 m_index;
+		const bool m_positive;
+	};
+	
+private:
+	void SelectEventsForDevice(Window window, XIEventMask *mask, int deviceid);
+	void UpdateCursor();
+	
+public:
+	bool UpdateInput();
+	bool UpdateOutput();
+	
+	KeyboardMouse(Window window, int opcode, int pointer_deviceid, int keyboard_deviceid);
+	~KeyboardMouse();
+	
+	std::string GetName() const;
+	std::string GetSource() const;
+	int GetId() const;
+	
+private:
+	Window m_window;
+	Display* m_display;
+	State m_state;
+	int				xi_opcode;
+	const int		pointer_deviceid, keyboard_deviceid;
+	std::string		name;
+};
+
+}
+}
+
+#endif

From fe2fe8b6cc847aa7521b8713263fc183fa074947 Mon Sep 17 00:00:00 2001
From: Max Eliaser <max@meliaserlow.dyndns.tv>
Date: Sat, 20 Jul 2013 13:39:28 -0800
Subject: [PATCH 318/352] Clean up all the GetName methods for XInput2
 controls.

---
 .../Src/ControllerInterface/Xlib/XInput2.cpp  | 47 ++++++++-----------
 .../Src/ControllerInterface/Xlib/XInput2.h    | 20 ++++----
 2 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.cpp
index e4abe03f2f..b42eda1f21 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.cpp
@@ -340,48 +340,39 @@ ControlState KeyboardMouse::Key::GetState() const
 	return (m_keyboard[m_keycode / 8] & (1 << (m_keycode % 8))) != 0;
 }
 
+KeyboardMouse::Button::Button(unsigned int index, unsigned int& buttons)
+	: m_buttons(buttons), m_index(index)
+{
+	// this will be a problem if we remove the hardcoded five-button limit
+	name = std::string("Click ") + (char)('1' + m_index);
+}
+
 ControlState KeyboardMouse::Button::GetState() const
 {
 	return ((m_buttons & (1 << m_index)) != 0);
 }
 
+KeyboardMouse::Cursor::Cursor(u8 index, bool positive, const float& cursor)
+	: m_cursor(cursor), m_index(index), m_positive(positive)
+{
+	name = std::string("Cursor ") + (char)('X' + m_index) + (m_positive ? '+' : '-');
+}
+
 ControlState KeyboardMouse::Cursor::GetState() const
 {
 	return std::max(0.0f, m_cursor / (m_positive ? 1.0f : -1.0f));
 }
 
+KeyboardMouse::Axis::Axis(u8 index, bool positive, const float& axis)
+	: m_axis(axis), m_index(index), m_positive(positive)
+{
+	name = std::string("Axis ") + (char)('X' + m_index) + (m_positive ? '+' : '-');
+}
+
 ControlState KeyboardMouse::Axis::GetState() const
 {
 	return std::max(0.0f, m_axis / (m_positive ? MOUSE_AXIS_SENSITIVITY : -MOUSE_AXIS_SENSITIVITY));
 }
 
-std::string KeyboardMouse::Key::GetName() const
-{
-	return m_keyname;
-}
-
-std::string KeyboardMouse::Cursor::GetName() const
-{
-	static char tmpstr[] = "Cursor ..";
-	tmpstr[7] = (char)('X' + m_index);
-	tmpstr[8] = (m_positive ? '+' : '-');
-	return tmpstr;
-}
-
-std::string KeyboardMouse::Axis::GetName() const
-{
-	static char tmpstr[] = "Axis ..";
-	tmpstr[5] = (char)('X' + m_index);
-	tmpstr[6] = (m_positive ? '+' : '-');
-	return tmpstr;
-}
-
-std::string KeyboardMouse::Button::GetName() const
-{
-	static char tmpstr[] = "Click .";
-	tmpstr[6] = m_index + '1';
-	return tmpstr;
-}
-
 }
 }
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.h
index 3f138f1416..58a1a38c8c 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/Xlib/XInput2.h
@@ -40,7 +40,7 @@ private:
 	{
 		friend class KeyboardMouse;
 	public:
-		std::string GetName() const;
+		std::string GetName() const { return m_keyname; }
 		Key(Display* display, KeyCode keycode, const char* keyboard);
 		ControlState GetState() const;
 		
@@ -54,44 +54,44 @@ private:
 	class Button : public Input
 	{
 	public:
-		std::string GetName() const;
-		Button(unsigned int index, unsigned int& buttons)
-			: m_buttons(buttons), m_index(index) {}
+		std::string GetName() const { return name; }
+		Button(unsigned int index, unsigned int& buttons);
 		ControlState GetState() const;
 		
 	private:
 		const unsigned int& m_buttons;
 		const unsigned int m_index;
+		std::string name;
 	};
 
 	class Cursor : public Input
 	{
 	public:
-		std::string GetName() const;
+		std::string GetName() const { return name; }
 		bool IsDetectable() { return false; }
-		Cursor(u8 index, bool positive, const float& cursor)
-			: m_cursor(cursor), m_index(index), m_positive(positive) {}
+		Cursor(u8 index, bool positive, const float& cursor);
 		ControlState GetState() const;
 	
 	private:
 		const float& m_cursor;
 		const u8 m_index;
 		const bool m_positive;
+		std::string name;
 	};
 	
 	class Axis : public Input
 	{
 	public:
-		std::string GetName() const;
+		std::string GetName() const { return name; }
 		bool IsDetectable() { return false; }
-		Axis(u8 index, bool positive, const float& axis)
-			: m_axis(axis), m_index(index), m_positive(positive) {}
+		Axis(u8 index, bool positive, const float& axis);
 		ControlState GetState() const;
 
 	private:
 		const float& m_axis;
 		const u8 m_index;
 		const bool m_positive;
+		std::string name;
 	};
 	
 private:

From 3239e4946fef14aa298846ca9745221c81c2b6a3 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sun, 21 Jul 2013 00:43:48 -0400
Subject: [PATCH 319/352] Use pkg-config to check for XInput2

---
 CMakeLists.txt                  |  7 ++++---
 CMakeTests/FindX11XInput2.cmake | 30 ------------------------------
 2 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 CMakeTests/FindX11XInput2.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 324a2406b4..d05c5cda02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -430,12 +430,13 @@ if(NOT ANDROID)
 		else()
 			add_definitions(-DHAVE_XRANDR=0)
 		endif(XRANDR_FOUND)
-		include(FindX11XInput2)
-		if(X11_Xinput2_FOUND)
+
+		pkg_check_modules(XINPUT2 xi>=1.5.0)
+		if(XINPUT2_FOUND)
 			add_definitions(-DHAVE_X11_XINPUT2=1)
 		else()
 			add_definitions(-DHAVE_X11_XINPUT2=0)
-		endif(X11_Xinput2_FOUND)
+		endif(XINPUT2_FOUND)
 	endif()
 	if(ENCODE_FRAMEDUMPS)
 		check_libav()
diff --git a/CMakeTests/FindX11XInput2.cmake b/CMakeTests/FindX11XInput2.cmake
deleted file mode 100644
index 1b1f26f2cd..0000000000
--- a/CMakeTests/FindX11XInput2.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-# For finding the X11 XInput extension, version 2. Because the standard CMake
-# FindX11.cmake may only know to look for version 1. Newer versions of CMake
-# than 2.8.7 might not have this problem, I wouldn't know. Better to be safe.
-
-
-if(USE_X11)
-    
-    IF(NOT X11_FOUND)
-        INCLUDE(FindX11)
-    ENDIF(NOT X11_FOUND)
-
-    IF(X11_FOUND)
-        FIND_PATH(X11_Xinput2_INCLUDE_PATH X11/extensions/XInput2.h ${X11_INC_SEARCH_PATH})
-        
-        FIND_LIBRARY(X11_Xinput2_LIB Xi ${X11_LIB_SEARCH_PATH})
-        
-        IF (X11_Xinput2_INCLUDE_PATH AND X11_Xinput2_LIB)
-            SET(X11_Xinput2_FOUND TRUE)
-            SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xinput2_INCLUDE_PATH})
-            message("X11 Xinput2 found")
-        ENDIF (X11_Xinput2_INCLUDE_PATH AND X11_Xinput2_LIB)
-        
-        MARK_AS_ADVANCED(
-            X11_Xinput2_INCLUDE_PATH
-            X11_Xinput2_LIB
-        )
-        
-    ENDIF(X11_FOUND)
-
-endif()

From bd7ca7625bb415f376859f6375026dc17b0c7182 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sun, 21 Jul 2013 00:50:50 -0400
Subject: [PATCH 320/352] Fix up last commit

I forgot to git add this change.
---
 Source/Core/InputCommon/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt
index 05ea6eb35e..76871e5b3b 100644
--- a/Source/Core/InputCommon/CMakeLists.txt
+++ b/Source/Core/InputCommon/CMakeLists.txt
@@ -23,7 +23,7 @@ elseif(X11_FOUND)
 	set(SRCS	${SRCS}
 				Src/ControllerInterface/SDL/SDL.cpp
 				Src/ControllerInterface/Xlib/Xlib.cpp)
-	if(X11_Xinput2_FOUND)
+	if(XINPUT2_FOUND)
 		set(SRCS	${SRCS}
 					Src/ControllerInterface/Xlib/XInput2.cpp)
 	endif()

From ca97b10dda41f5ae6386d7eb1ee4f550156ddb82 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sun, 21 Jul 2013 01:59:36 -0400
Subject: [PATCH 321/352] Actually link to XI2

No idea how this was working before
---
 Source/Core/DolphinWX/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
index 1ad6c56047..524a14f13c 100644
--- a/Source/Core/DolphinWX/CMakeLists.txt
+++ b/Source/Core/DolphinWX/CMakeLists.txt
@@ -11,6 +11,7 @@ set(LIBS	core
 if(NOT ANDROID)
 	if(USE_X11)
 	  set(LIBS  ${LIBS} ${X11_LIBRARIES}
+              ${XINPUT2_LIBRARIES}
 	      ${XRANDR_LIBRARIES})
 	endif()
 	if(USE_WAYLAND)

From 01ff85506d9e0fca76408c3dea2c72e37fb720ff Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sun, 21 Jul 2013 01:01:11 -0400
Subject: [PATCH 322/352] X11: Don't use a client event as a wrapper for
 XMoveResizeWindow

Simply configure the window from here
---
 Source/Core/DolphinWX/Src/FrameTools.cpp      |  6 ++++--
 .../DolphinWX/Src/GLInterface/X11_Util.cpp    |  5 -----
 Source/Core/DolphinWX/Src/X11Utils.cpp        | 20 -------------------
 Source/Core/DolphinWX/Src/X11Utils.h          |  2 --
 4 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index 3b59352585..e04bdde5fc 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -795,8 +795,10 @@ void CFrame::OnRenderParentResize(wxSizeEvent& event)
 		}
 #if defined(HAVE_X11) && HAVE_X11
 		wxRect client_rect = m_RenderParent->GetClientRect();
-		X11Utils::SendClientEvent(X11Utils::XDisplayFromHandle(GetHandle()),
-				"RESIZE", client_rect.x, client_rect.y, client_rect.width, client_rect.height);
+		XMoveResizeWindow(X11Utils::XDisplayFromHandle(GetHandle()),
+				  X11Utils::XWindowFromHandle(GetHandle()),
+				  client_rect.x, client_rect.y,
+				  client_rect.width, client_rect.height);
 #endif
 		m_LogWindow->Refresh();
 		m_LogWindow->Update();
diff --git a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
index f6e678151f..3bfe9fb86f 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
@@ -313,11 +313,6 @@ void cX11Window::XEventThread()
 					if ((unsigned long) event.xclient.data.l[0] ==
 							XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", False))
 						Host_Message(WM_USER_STOP);
-					if ((unsigned long) event.xclient.data.l[0] ==
-							XInternAtom(GLWin.evdpy, "RESIZE", False))
-						XMoveResizeWindow(GLWin.evdpy, GLWin.win,
-								event.xclient.data.l[1], event.xclient.data.l[2],
-								event.xclient.data.l[3], event.xclient.data.l[4]);
 					break;
 				default:
 					break;
diff --git a/Source/Core/DolphinWX/Src/X11Utils.cpp b/Source/Core/DolphinWX/Src/X11Utils.cpp
index 9be4d23fbf..4ee0cc63e9 100644
--- a/Source/Core/DolphinWX/Src/X11Utils.cpp
+++ b/Source/Core/DolphinWX/Src/X11Utils.cpp
@@ -32,26 +32,6 @@ extern char **environ;
 namespace X11Utils
 {
 
-void SendClientEvent(Display *dpy, const char *message,
-	   	int data1, int data2, int data3, int data4)
-{
-	XEvent event;
-	Window win = (Window)Core::GetWindowHandle();
-
-	// Init X event structure for client message
-	event.xclient.type = ClientMessage;
-	event.xclient.format = 32;
-	event.xclient.data.l[0] = XInternAtom(dpy, message, False);
-	event.xclient.data.l[1] = data1;
-	event.xclient.data.l[2] = data2;
-	event.xclient.data.l[3] = data3;
-	event.xclient.data.l[4] = data4;
-
-	// Send the event
-	if (!XSendEvent(dpy, win, False, False, &event))
-		ERROR_LOG(VIDEO, "Failed to send message %s to the emulator window.", message);
-}
-
 void SendKeyEvent(Display *dpy, int key)
 {
 	XEvent event;
diff --git a/Source/Core/DolphinWX/Src/X11Utils.h b/Source/Core/DolphinWX/Src/X11Utils.h
index ff4171e249..dd8d888d17 100644
--- a/Source/Core/DolphinWX/Src/X11Utils.h
+++ b/Source/Core/DolphinWX/Src/X11Utils.h
@@ -43,8 +43,6 @@
 namespace X11Utils
 {
 
-void SendClientEvent(Display *dpy, const char *message,
-	   	int data1, int data2, int data3, int data4);
 void SendKeyEvent(Display *dpy, int key);
 void SendButtonEvent(Display *dpy, int button, int x, int y, bool pressed);
 void SendMotionEvent(Display *dpy, int x, int y);

From fec641d14ad943e58dabba00bc747ccea8f0470d Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sun, 21 Jul 2013 01:02:10 -0400
Subject: [PATCH 323/352] X11: Don't do a round-trip to the server to figure
 out our size on configure

Simply use the values from the event structure.
---
 Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
index 3bfe9fb86f..89766b284d 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
@@ -303,11 +303,7 @@ void cX11Window::XEventThread()
 					}
 					break;
 				case ConfigureNotify:
-					Window winDummy;
-					unsigned int borderDummy, depthDummy;
-					XGetGeometry(GLWin.evdpy, GLWin.win, &winDummy, &GLWin.x, &GLWin.y,
-							&GLWin.width, &GLWin.height, &borderDummy, &depthDummy);
-					GLInterface->SetBackBufferDimensions(GLWin.width, GLWin.height);
+					GLInterface->SetBackBufferDimensions(event.xconfigure.width, event.xconfigure.height);
 					break;
 				case ClientMessage:
 					if ((unsigned long) event.xclient.data.l[0] ==

From 6194234a5481b2ea941f440f159adbb046ba2625 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@Gmail.com>
Date: Sun, 21 Jul 2013 11:17:21 +0000
Subject: [PATCH 324/352] Fix a issue in the texture conversion shaders that
 was multiplying an integer with a float.

---
 Source/Core/VideoCommon/Src/TextureConversionShader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
index 40873b903e..b21a852e4c 100644
--- a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
+++ b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
@@ -246,7 +246,7 @@ void WriteSampleColor(char*& p, const char* colorComp, const char* dest, API_TYP
 	else
 		texSampleIncrementUnit = I_COLORS"[0].x";
 
-	WRITE(p, "  %s = %s(samp0, sampleUv + float2(%d * (%s), 0)).%s;\n",
+	WRITE(p, "  %s = %s(samp0, sampleUv + float2(%d.0f * (%s), 0)).%s;\n",
 		dest, texSampleOpName, s_incrementSampleXCount, texSampleIncrementUnit, colorComp);
 }
 

From 83a79c28ca40eb352572260d8a4b0312de3bd485 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@Gmail.com>
Date: Sun, 21 Jul 2013 11:27:26 +0000
Subject: [PATCH 325/352] Continuation of the previous commit. I missed a
 integer.

---
 Source/Core/VideoCommon/Src/TextureConversionShader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
index b21a852e4c..24893c8597 100644
--- a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
+++ b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
@@ -246,7 +246,7 @@ void WriteSampleColor(char*& p, const char* colorComp, const char* dest, API_TYP
 	else
 		texSampleIncrementUnit = I_COLORS"[0].x";
 
-	WRITE(p, "  %s = %s(samp0, sampleUv + float2(%d.0f * (%s), 0)).%s;\n",
+	WRITE(p, "  %s = %s(samp0, sampleUv + float2(%d.0f * (%s), 0.0f)).%s;\n",
 		dest, texSampleOpName, s_incrementSampleXCount, texSampleIncrementUnit, colorComp);
 }
 

From 82f7b20b915c46924c5227a583e30fb430ea2de4 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@Gmail.com>
Date: Sun, 21 Jul 2013 12:00:20 +0000
Subject: [PATCH 326/352] There. Fix all the issues where we are using integers
 when we should be using floats in the texture conversion shaders.

---
 .../Src/TextureConversionShader.cpp           | 70 +++++++++----------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
index 24893c8597..de5198c9fe 100644
--- a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
+++ b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
@@ -204,14 +204,14 @@ void Write32BitSwizzler(char*& p, u32 format, API_TYPE ApiType)
 	WRITE(p, "  float yb = yl * %f;\n", blkH);
 	WRITE(p, "  float yoff = uv1.y - yb;\n");
 	WRITE(p, "  float xp = uv1.x + (yoff * " I_COLORS"[1].x);\n");
-	WRITE(p, "  float xel = floor(xp / 2);\n");
+	WRITE(p, "  float xel = floor(xp / 2.0f);\n");
 	WRITE(p, "  float xb = floor(xel / %f);\n", blkH);
 	WRITE(p, "  float xoff = xel - (xb * %f);\n", blkH);
 
-	WRITE(p, "  float x2 = uv1.x * 2;\n");
+	WRITE(p, "  float x2 = uv1.x * 2.0f;\n");
 	WRITE(p, "  float xl = floor(x2 / %f);\n", blkW);	
 	WRITE(p, "  float xib = x2 - (xl * %f);\n", blkW);
-	WRITE(p, "  float halfxb = floor(xb / 2);\n");
+	WRITE(p, "  float halfxb = floor(xb / 2.0f);\n");
 
 	WRITE(p, "  sampleUv.x = xib + (halfxb * %f);\n", blkW);
 	WRITE(p, "  sampleUv.y = yb + xoff;\n");
@@ -541,7 +541,7 @@ void WriteRGBA8Encoder(char* p,API_TYPE ApiType)
 {
 	Write32BitSwizzler(p, GX_TF_RGBA8, ApiType);
 
-	WRITE(p, "  float cl1 = xb - (halfxb * 2);\n");
+	WRITE(p, "  float cl1 = xb - (halfxb * 2.0f);\n");
 	WRITE(p, "  float cl0 = 1.0f - cl1;\n");
 
 	WRITE(p, "  float4 texSample;\n");
@@ -702,24 +702,24 @@ void WriteZ16Encoder(char* p,API_TYPE ApiType)
 	WriteSampleColor(p, "b", "depth", ApiType);
 
 	WRITE(p, "  depth *= 16777215.0f;\n");
-	WRITE(p, "  expanded.r = floor(depth / (256 * 256));\n");
-	WRITE(p, "  depth -= expanded.r * 256 * 256;\n");
-	WRITE(p, "  expanded.g = floor(depth / 256);\n");
+	WRITE(p, "  expanded.r = floor(depth / (256.0f * 256.0f));\n");
+	WRITE(p, "  depth -= expanded.r * 256.0f * 256.0f;\n");
+	WRITE(p, "  expanded.g = floor(depth / 256.0f);\n");
 
-	WRITE(p, "  ocol0.b = expanded.g / 255;\n");
-	WRITE(p, "  ocol0.g = expanded.r / 255;\n");
+	WRITE(p, "  ocol0.b = expanded.g / 255.0f;\n");
+	WRITE(p, "  ocol0.g = expanded.r / 255.0f;\n");
 
 	WriteIncrementSampleX(p, ApiType);
 
 	WriteSampleColor(p, "b", "depth", ApiType);
 
 	WRITE(p, "  depth *= 16777215.0f;\n");
-	WRITE(p, "  expanded.r = floor(depth / (256 * 256));\n");
-	WRITE(p, "  depth -= expanded.r * 256 * 256;\n");
-	WRITE(p, "  expanded.g = floor(depth / 256);\n");
+	WRITE(p, "  expanded.r = floor(depth / (256.0f * 256.0f));\n");
+	WRITE(p, "  depth -= expanded.r * 256.0f * 256.0f;\n");
+	WRITE(p, "  expanded.g = floor(depth / 256.0f);\n");
 
-	WRITE(p, "  ocol0.r = expanded.g / 255;\n");
-	WRITE(p, "  ocol0.a = expanded.r / 255;\n");
+	WRITE(p, "  ocol0.r = expanded.g / 255.0f;\n");
+	WRITE(p, "  ocol0.a = expanded.r / 255.0f;\n");
 
 	WriteEncoderEnd(p, ApiType);
 }
@@ -736,24 +736,24 @@ void WriteZ16LEncoder(char* p,API_TYPE ApiType)
 	WriteSampleColor(p, "b", "depth", ApiType);
 
 	WRITE(p, "  depth *= 16777215.0f;\n");
-	WRITE(p, "  expanded.r = floor(depth / (256 * 256));\n");
-	WRITE(p, "  depth -= expanded.r * 256 * 256;\n");
-	WRITE(p, "  expanded.g = floor(depth / 256);\n");
-	WRITE(p, "  depth -= expanded.g * 256;\n");
+	WRITE(p, "  expanded.r = floor(depth / (256.0f * 256.0f));\n");
+	WRITE(p, "  depth -= expanded.r * 256.0f * 256.0f;\n");
+	WRITE(p, "  expanded.g = floor(depth / 256.0f);\n");
+	WRITE(p, "  depth -= expanded.g * 256.0f;\n");
 	WRITE(p, "  expanded.b = depth;\n");
 
-	WRITE(p, "  ocol0.b = expanded.b / 255;\n");
-	WRITE(p, "  ocol0.g = expanded.g / 255;\n");
+	WRITE(p, "  ocol0.b = expanded.b / 255.0f;\n");
+	WRITE(p, "  ocol0.g = expanded.g / 255.0f;\n");
 
 	WriteIncrementSampleX(p, ApiType);
 
 	WriteSampleColor(p, "b", "depth", ApiType);
 
 	WRITE(p, "  depth *= 16777215.0f;\n");
-	WRITE(p, "  expanded.r = floor(depth / (256 * 256));\n");
-	WRITE(p, "  depth -= expanded.r * 256 * 256;\n");
-	WRITE(p, "  expanded.g = floor(depth / 256);\n");
-	WRITE(p, "  depth -= expanded.g * 256;\n");
+	WRITE(p, "  expanded.r = floor(depth / (256.0f * 256.0f));\n");
+	WRITE(p, "  depth -= expanded.r * 256.0f * 256.0f;\n");
+	WRITE(p, "  expanded.g = floor(depth / 256.0f);\n");
+	WRITE(p, "  depth -= expanded.g * 256.0f;\n");
 	WRITE(p, "  expanded.b = depth;\n");
 
 	WRITE(p, "  ocol0.r = expanded.b;\n");
@@ -766,7 +766,7 @@ void WriteZ24Encoder(char* p, API_TYPE ApiType)
 {
 	Write32BitSwizzler(p, GX_TF_Z24X8, ApiType);
 
-	WRITE(p, "  float cl = xb - (halfxb * 2);\n");
+	WRITE(p, "  float cl = xb - (halfxb * 2.0f);\n");
 
 	WRITE(p, "  float depth0;\n");
 	WRITE(p, "  float depth1;\n");
@@ -781,25 +781,25 @@ void WriteZ24Encoder(char* p, API_TYPE ApiType)
 	{
 		WRITE(p, "  depth%i *= 16777215.0f;\n", i);
 
-		WRITE(p, "  expanded%i.r = floor(depth%i / (256 * 256));\n", i, i);
-		WRITE(p, "  depth%i -= expanded%i.r * 256 * 256;\n", i, i);
-		WRITE(p, "  expanded%i.g = floor(depth%i / 256);\n", i, i);
-		WRITE(p, "  depth%i -= expanded%i.g * 256;\n", i, i);
+		WRITE(p, "  expanded%i.r = floor(depth%i / (256.0f * 256.0f));\n", i, i);
+		WRITE(p, "  depth%i -= expanded%i.r * 256.0f * 256.0f;\n", i, i);
+		WRITE(p, "  expanded%i.g = floor(depth%i / 256.0f);\n", i, i);
+		WRITE(p, "  depth%i -= expanded%i.g * 256.0f;\n", i, i);
 		WRITE(p, "  expanded%i.b = depth%i;\n", i, i);
 	}
 
 	WRITE(p, "  if(cl > 0.5f) {\n");
 	// upper 16
-	WRITE(p, "     ocol0.b = expanded0.g / 255;\n");
-	WRITE(p, "     ocol0.g = expanded0.b / 255;\n");
-	WRITE(p, "     ocol0.r = expanded1.g / 255;\n");
-	WRITE(p, "     ocol0.a = expanded1.b / 255;\n");
+	WRITE(p, "     ocol0.b = expanded0.g / 255.0f;\n");
+	WRITE(p, "     ocol0.g = expanded0.b / 255.0f;\n");
+	WRITE(p, "     ocol0.r = expanded1.g / 255.0f;\n");
+	WRITE(p, "     ocol0.a = expanded1.b / 255.0f;\n");
 	WRITE(p, "  } else {\n");
 	// lower 8
 	WRITE(p, "     ocol0.b = 1.0f;\n");
-	WRITE(p, "     ocol0.g = expanded0.r / 255;\n");
+	WRITE(p, "     ocol0.g = expanded0.r / 255.0f;\n");
 	WRITE(p, "     ocol0.r = 1.0f;\n");
-	WRITE(p, "     ocol0.a = expanded1.r / 255;\n");
+	WRITE(p, "     ocol0.a = expanded1.r / 255.0f;\n");
 	WRITE(p, "  }\n");
 
 	WriteEncoderEnd(p, ApiType);

From 3b2932011319f501f376f16384c2063fc78dc2d7 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sun, 21 Jul 2013 17:51:13 -0400
Subject: [PATCH 327/352] wx: Prevent warnings when compiling with recent
 versions of g++

g++ tends to think this is a string literal instead of concatenation.
---
 Externals/wxWidgets3/include/wx/defs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Externals/wxWidgets3/include/wx/defs.h b/Externals/wxWidgets3/include/wx/defs.h
index 0c2a8e024c..27e685a535 100644
--- a/Externals/wxWidgets3/include/wx/defs.h
+++ b/Externals/wxWidgets3/include/wx/defs.h
@@ -3345,7 +3345,7 @@ typedef const void* WXWidget;
     "/manifestdependency:\"type='win32'         \
      name='Microsoft.Windows.Common-Controls'   \
      version='6.0.0.0'                          \
-     processorArchitecture='"cpu"'              \
+     processorArchitecture='" cpu "'            \
      publicKeyToken='6595b64144ccf1df'          \
      language='*'\""
 

From 4981b7cdd3e37f1f5846e4f94e2ed1a9538d18e5 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sun, 21 Jul 2013 17:51:41 -0400
Subject: [PATCH 328/352] VertexShaderManager: Make ProjectionHack private

There's no reason to make this public, and it prevents a build
issue with the next commit.
---
 Source/Core/VideoCommon/Src/VertexShaderManager.cpp | 9 +++++++++
 Source/Core/VideoCommon/Src/VertexShaderManager.h   | 9 ---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp
index 75e6735577..ee9fde97f6 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp
@@ -63,6 +63,15 @@ inline void SetMultiVSConstant4fv(unsigned int const_number, unsigned int count,
 	g_renderer->SetMultiVSConstant4fv(const_number, count, f);
 }
 
+struct ProjectionHack
+{
+	float sign;
+	float value;
+	ProjectionHack() { }
+	ProjectionHack(float new_sign, float new_value)
+		: sign(new_sign), value(new_value) {}
+};
+
 namespace
 {
 // Control Variables
diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.h b/Source/Core/VideoCommon/Src/VertexShaderManager.h
index c357b36e61..8a87f7644f 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderManager.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderManager.h
@@ -9,15 +9,6 @@
 
 class PointerWrap;
 
-struct ProjectionHack
-{
-	float sign;
-	float value;
-	ProjectionHack() { }
-	ProjectionHack(float new_sign, float new_value)
-		: sign(new_sign), value(new_value) {}
-};
-
 void UpdateProjectionHack(int iParams[], std::string sParams[]);
 
 void UpdateViewportWithCorrection();

From e742b32c6540bfd83bbd5eefa318839a7d57d313 Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Sun, 21 Jul 2013 22:25:26 -0400
Subject: [PATCH 329/352] Drag and drop.

---
 Source/Core/DolphinWX/Src/GameListCtrl.cpp | 35 ++++++++++++++++++++++
 Source/Core/DolphinWX/Src/GameListCtrl.h   |  1 +
 2 files changed, 36 insertions(+)

diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
index a3c6fbe59a..c8e2e94072 100644
--- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
@@ -23,6 +23,7 @@
 #include "WxUtils.h"
 #include "Main.h"
 #include "MathUtil.h"
+#include "HW/DVDInterface.h"
 
 #include "../resources/Flag_Europe.xpm"
 #include "../resources/Flag_Germany.xpm"
@@ -174,6 +175,8 @@ CGameListCtrl::CGameListCtrl(wxWindow* parent, const wxWindowID id, const
 		wxPoint& pos, const wxSize& size, long style)
 	: wxListCtrl(parent, id, pos, size, style), toolTip(0)
 {
+	DragAcceptFiles(true);
+	Connect(wxEVT_DROP_FILES, wxDropFilesEventHandler(CGameListCtrl::OnDropFiles), NULL, this);
 }
 
 CGameListCtrl::~CGameListCtrl()
@@ -1298,4 +1301,36 @@ void CGameListCtrl::UnselectAll()
 	}
 }
 
+void CGameListCtrl::OnDropFiles(wxDropFilesEvent& event)
+{
+	if (event.GetNumberOfFiles() != 1)
+		return;
+	if (File::IsDirectory(WxStrToStr(event.GetFiles()[0])))
+		return;
 
+	wxFileName file = event.GetFiles()[0];
+
+	if (file.GetExt() == "dtm")
+	{
+		if (Core::IsRunning())
+			return;
+
+		if (!Movie::IsReadOnly())
+		{
+			// let's make the read-only flag consistent at the start of a movie.
+			Movie::SetReadOnly(true);
+			main_frame->GetMenuBar()->FindItem(IDM_RECORDREADONLY)->Check(true);
+		}
+
+		if (Movie::PlayInput(file.GetFullPath().c_str()))
+			main_frame->BootGame(std::string(""));
+	}
+	else if (!Core::IsRunning())
+	{
+		main_frame->BootGame(WxStrToStr(file.GetFullPath()));
+	}
+	else
+	{
+		DVDInterface::ChangeDisc(WxStrToStr(file.GetFullPath()).c_str());
+	}
+}
diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.h b/Source/Core/DolphinWX/Src/GameListCtrl.h
index fbca71bed3..ad46ec6d67 100644
--- a/Source/Core/DolphinWX/Src/GameListCtrl.h
+++ b/Source/Core/DolphinWX/Src/GameListCtrl.h
@@ -97,6 +97,7 @@ private:
 	void OnMultiCompressGCM(wxCommandEvent& event);
 	void OnMultiDecompressGCM(wxCommandEvent& event);
 	void OnInstallWAD(wxCommandEvent& event);
+	void OnDropFiles(wxDropFilesEvent& event);
 
 	void CompressSelection(bool _compress);
 	void AutomaticColumnWidth();

From 52482115e17875d0cc56197e79dfe612e2ed35e1 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sun, 21 Jul 2013 17:54:43 -0400
Subject: [PATCH 330/352] Move in-game keybinding handling to a central
 location

Instead of handling it separately in every backend.
---
 Source/Core/Common/Src/Common.h               |  1 -
 Source/Core/DolphinWX/Src/Frame.cpp           | 85 ++++++++++++----
 .../DolphinWX/Src/GLInterface/X11_Util.cpp    | 73 --------------
 Source/Core/DolphinWX/Src/X11Utils.cpp        | 16 ---
 Source/Core/DolphinWX/Src/X11Utils.h          |  1 -
 Source/Core/VideoCommon/Src/EmuWindow.cpp     | 99 -------------------
 6 files changed, 66 insertions(+), 209 deletions(-)

diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index b197eb0ff5..9a1ebab8e9 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -143,7 +143,6 @@ enum HOST_COMM
 	WM_USER_STOP = 10,
 	WM_USER_CREATE,
 	WM_USER_SETCURSOR,
-	WM_USER_KEYDOWN,
 };
 
 // Used for notification on emulation state
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index 14a1276eef..13a181783e 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -30,6 +30,9 @@
 #include "State.h"
 #include "VolumeHandler.h"
 #include "Movie.h"
+#include "RenderBase.h"
+#include "VideoConfig.h"
+#include "VertexShaderManager.h"
 
 #include "VideoBackendBase.h"
 
@@ -873,28 +876,72 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
 			ConnectWiimote(WiimoteId, connect);
 		}
 
-		// Send the OSD hotkeys to the video backend
-		if (event.GetKeyCode() >= '3' && event.GetKeyCode() <= '7' && event.GetModifiers() == wxMOD_NONE)
+		if (g_Config.bOSDHotKey && event.GetModifiers() == wxMOD_NONE)
 		{
-#ifdef _WIN32
-			PostMessage((HWND)Core::GetWindowHandle(), WM_USER, WM_USER_KEYDOWN, event.GetKeyCode());
-#elif defined(HAVE_X11) && HAVE_X11
-			X11Utils::SendKeyEvent(X11Utils::XDisplayFromHandle(GetHandle()), event.GetKeyCode());
-#endif
+			switch (event.GetKeyCode())
+			{
+			case '3':
+				OSDChoice = 1;
+				// Toggle native resolution
+				g_Config.iEFBScale = g_Config.iEFBScale + 1;
+				if (g_Config.iEFBScale > 7) g_Config.iEFBScale = 0;
+				break;
+			case '4':
+				OSDChoice = 2;
+				// Toggle aspect ratio
+				g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3;
+				break;
+			case '5':
+				OSDChoice = 3;
+				// Toggle EFB copy
+				if (!g_Config.bEFBCopyEnable || g_Config.bCopyEFBToTexture)
+				{
+					g_Config.bEFBCopyEnable ^= true;
+					g_Config.bCopyEFBToTexture = false;
+				}
+				else
+				{
+					g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture;
+				}
+				break;
+			case '6':
+				OSDChoice = 4;
+				g_Config.bDisableFog = !g_Config.bDisableFog;
+				break;
+			default:
+				break;
+			}
 		}
-		// Send the freelook hotkeys to the video backend
-		if ((event.GetKeyCode() == ')' || event.GetKeyCode() == '(' ||
-					event.GetKeyCode() == '0' || event.GetKeyCode() == '9' ||
-					event.GetKeyCode() == 'W' || event.GetKeyCode() == 'S' ||
-					event.GetKeyCode() == 'A' || event.GetKeyCode() == 'D' ||
-					event.GetKeyCode() == 'R')
-				&& event.GetModifiers() == wxMOD_SHIFT)
+
+		if (g_Config.bFreeLook && event.GetModifiers() == wxMOD_SHIFT)
 		{
-#ifdef _WIN32
-			PostMessage((HWND)Core::GetWindowHandle(), WM_USER, WM_USER_KEYDOWN, event.GetKeyCode());
-#elif defined(HAVE_X11) && HAVE_X11
-			X11Utils::SendKeyEvent(X11Utils::XDisplayFromHandle(GetHandle()), event.GetKeyCode());
-#endif
+			static float debugSpeed = 1.0f;
+			switch (event.GetKeyCode())
+			{
+			case '9':
+				debugSpeed /= 2.0f;
+				break;
+			case '0':
+				debugSpeed *= 2.0f;
+				break;
+			case 'W':
+				VertexShaderManager::TranslateView(0.0f, debugSpeed);
+				break;
+			case 'S':
+				VertexShaderManager::TranslateView(0.0f, -debugSpeed);
+				break;
+			case 'A':
+				VertexShaderManager::TranslateView(debugSpeed, 0.0f);
+				break;
+			case 'D':
+				VertexShaderManager::TranslateView(-debugSpeed, 0.0f);
+				break;
+			case 'R':
+				VertexShaderManager::ResetView();
+				break;
+			default:
+				break;
+			}
 		}
 	}
 	else
diff --git a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
index 89766b284d..e57c095d86 100644
--- a/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
+++ b/Source/Core/DolphinWX/Src/GLInterface/X11_Util.cpp
@@ -16,7 +16,6 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include "Host.h"
-#include "RenderBase.h"
 #include "VideoConfig.h"
 #include "../GLInterface.h"
 #include "VertexShaderManager.h"
@@ -174,82 +173,10 @@ void cX11Window::XEventThread()
 	while (GLWin.win)
 	{
 		XEvent event;
-		KeySym key;
 		for (int num_events = XPending(GLWin.evdpy); num_events > 0; num_events--)
 		{
 			XNextEvent(GLWin.evdpy, &event);
 			switch(event.type) {
-				case KeyPress:
-					key = XLookupKeysym((XKeyEvent*)&event, 0);
-					if (g_Config.bOSDHotKey)
-					{
-						switch (key)
-						{
-							case XK_3:
-								OSDChoice = 1;
-								// Toggle native resolution
-								g_Config.iEFBScale = g_Config.iEFBScale + 1;
-								if (g_Config.iEFBScale > 7) g_Config.iEFBScale = 0;
-								break;
-
-							case XK_4:
-								OSDChoice = 2;
-								// Toggle aspect ratio
-								g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3;
-								break;
-
-							case XK_5:
-								OSDChoice = 3;
-								// Toggle EFB copy
-								if (!g_Config.bEFBCopyEnable || g_Config.bCopyEFBToTexture)
-								{
-									g_Config.bEFBCopyEnable ^= true;
-									g_Config.bCopyEFBToTexture = false;
-								}
-								else
-								{
-									g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture;
-								}
-								break;
-
-							case XK_6:
-								OSDChoice = 4;
-								g_Config.bDisableFog = !g_Config.bDisableFog;
-								break;
-
-							default:
-								break;
-						}
-					}
-					if (g_Config.bFreeLook)
-					{
-						static float debugSpeed = 1.0f;
-						switch (key)
-						{
-							case XK_parenleft:
-								debugSpeed /= 2.0f;
-								break;
-							case XK_parenright:
-								debugSpeed *= 2.0f;
-								break;
-							case XK_w:
-								VertexShaderManager::TranslateView(0.0f, debugSpeed);
-								break;
-							case XK_s:
-								VertexShaderManager::TranslateView(0.0f, -debugSpeed);
-								break;
-							case XK_a:
-								VertexShaderManager::TranslateView(debugSpeed, 0.0f);
-								break;
-							case XK_d:
-								VertexShaderManager::TranslateView(-debugSpeed, 0.0f);
-								break;
-							case XK_r:
-								VertexShaderManager::ResetView();
-								break;
-						}
-					}
-					break;
 				case ButtonPress:
 					if (g_Config.bFreeLook)
 					{
diff --git a/Source/Core/DolphinWX/Src/X11Utils.cpp b/Source/Core/DolphinWX/Src/X11Utils.cpp
index 4ee0cc63e9..9c509add91 100644
--- a/Source/Core/DolphinWX/Src/X11Utils.cpp
+++ b/Source/Core/DolphinWX/Src/X11Utils.cpp
@@ -32,22 +32,6 @@ extern char **environ;
 namespace X11Utils
 {
 
-void SendKeyEvent(Display *dpy, int key)
-{
-	XEvent event;
-	Window win = (Window)Core::GetWindowHandle();
-
-	// Init X event structure for key press event
-	event.xkey.type = KeyPress;
-	// WARNING:  This works for ASCII keys.  If in the future other keys are needed
-	// convert with InputCommon::wxCharCodeWXToX from X11InputBase.cpp.
-	event.xkey.keycode = XKeysymToKeycode(dpy, key);
-
-	// Send the event
-	if (!XSendEvent(dpy, win, False, False, &event))
-		ERROR_LOG(VIDEO, "Failed to send key press event to the emulator window.");
-}
-
 void SendButtonEvent(Display *dpy, int button, int x, int y, bool pressed)
 {
 	XEvent event;
diff --git a/Source/Core/DolphinWX/Src/X11Utils.h b/Source/Core/DolphinWX/Src/X11Utils.h
index dd8d888d17..1525e8ec09 100644
--- a/Source/Core/DolphinWX/Src/X11Utils.h
+++ b/Source/Core/DolphinWX/Src/X11Utils.h
@@ -43,7 +43,6 @@
 namespace X11Utils
 {
 
-void SendKeyEvent(Display *dpy, int key);
 void SendButtonEvent(Display *dpy, int button, int x, int y, bool pressed);
 void SendMotionEvent(Display *dpy, int x, int y);
 void EWMH_Fullscreen(Display *dpy, int action);
diff --git a/Source/Core/VideoCommon/Src/EmuWindow.cpp b/Source/Core/VideoCommon/Src/EmuWindow.cpp
index e8fa26a38b..fc4c049c80 100644
--- a/Source/Core/VideoCommon/Src/EmuWindow.cpp
+++ b/Source/Core/VideoCommon/Src/EmuWindow.cpp
@@ -8,7 +8,6 @@
 #include "EmuWindow.h"
 #include "Fifo.h"
 #include "VertexShaderManager.h"
-#include "RenderBase.h"
 #include "VideoBackendBase.h"
 #include "Core.h"
 #include "Host.h"
@@ -42,28 +41,8 @@ HWND GetParentWnd()
 	return m_hParent;
 }
 
-// ---------------------------------------------------------------------
-// KeyDown events
-// -------------
-void OnKeyDown(WPARAM wParam)
-{
-	switch (LOWORD( wParam ))
-	{
-	case '3': // OSD keys
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-		if (g_Config.bOSDHotKey)
-			OSDMenu(wParam);
-		break;
-	}
-}
-// ---------------------------------------------------------------------
-
 void FreeLookInput( UINT iMsg, WPARAM wParam )
 {
-	static float debugSpeed = 1.0f;
 	static bool mouseLookEnabled = false;
 	static bool mouseMoveEnabled = false;
 	static float lastMouse[2];
@@ -71,34 +50,6 @@ void FreeLookInput( UINT iMsg, WPARAM wParam )
 
 	switch(iMsg)
 	{
-	case WM_USER_KEYDOWN:
-	case WM_KEYDOWN:
-		switch (LOWORD(wParam))
-		{
-		case '9':
-			debugSpeed /= 2.0f;
-			break;
-		case '0':
-			debugSpeed *= 2.0f;
-			break;
-		case 'W':
-			VertexShaderManager::TranslateView(0.0f, debugSpeed);
-			break;
-		case 'S':
-			VertexShaderManager::TranslateView(0.0f, -debugSpeed);
-			break;
-		case 'A':
-			VertexShaderManager::TranslateView(debugSpeed, 0.0f);
-			break;
-		case 'D':
-			VertexShaderManager::TranslateView(-debugSpeed, 0.0f);
-			break;
-		case 'R':
-			VertexShaderManager::ResetView();
-			break;
-		}
-		break;
-
 	case WM_MOUSEMOVE:
 		if (mouseLookEnabled)
 		{
@@ -190,11 +141,6 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
 		break;
 
 	case WM_USER:
-		if (wParam == WM_USER_KEYDOWN)
-		{
-			OnKeyDown(lParam);
-			FreeLookInput((u32)wParam, lParam);
-		}
 		break;
 
 	// Called when a screensaver wants to show up while this window is active
@@ -224,51 +170,6 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
 	return 0;
 }
 
-// ---------------------------------------------------------------------
-// OSD Menu
-// -------------
-// Let's begin with 3 since 1 and 2 are default Wii keys
-// -------------
-void OSDMenu(WPARAM wParam)
-{
-	switch( LOWORD( wParam ))
-	{
-	case '3':
-		OSDChoice = 1;
-		// Toggle native resolution
-		g_Config.iEFBScale = g_Config.iEFBScale + 1;
-		if (g_Config.iEFBScale > SCALE_4X) g_Config.iEFBScale = SCALE_AUTO;
-		break;
-	case '4':
-		OSDChoice = 2;
-		// Toggle aspect ratio
-		g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3;
-		break;
-	case '5':
-		OSDChoice = 3;
-		// Toggle EFB copy
-		if (!g_Config.bEFBCopyEnable)
-		{
-			g_Config.bEFBCopyEnable = true;
-			g_Config.bCopyEFBToTexture = false;
-		}
-		else if (!g_Config.bCopyEFBToTexture)
-		{
-			g_Config.bCopyEFBToTexture = true;
-		}
-		else
-		{
-			g_Config.bEFBCopyEnable = false;
-			g_Config.bCopyEFBToTexture = false;
-		}
-		break;
-	case '6':
-		OSDChoice = 4;
-		g_Config.bDisableFog = !g_Config.bDisableFog;
-		break;
-	}
-}
-
 HWND OpenWindow(HWND parent, HINSTANCE hInstance, int width, int height, const TCHAR *title)
 {
 	wndClass.cbSize = sizeof( wndClass );

From 3c7f223aa10412dcd76d6d79f93250c69f96813a Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Mon, 22 Jul 2013 00:14:42 -0400
Subject: [PATCH 331/352] Add "Q" / "E" as freelook keybindings

To move the view up and down.
---
 Source/Core/DolphinWX/Src/Frame.cpp                 | 6 ++++++
 Source/Core/VideoCommon/Src/VertexShaderManager.cpp | 4 ++--
 Source/Core/VideoCommon/Src/VertexShaderManager.h   | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index 13a181783e..aaa16d80cb 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -936,6 +936,12 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
 			case 'D':
 				VertexShaderManager::TranslateView(-debugSpeed, 0.0f);
 				break;
+			case 'Q':
+				VertexShaderManager::TranslateView(0.0f, 0.0f, debugSpeed);
+				break;
+			case 'E':
+				VertexShaderManager::TranslateView(0.0f, 0.0f, -debugSpeed);
+				break;
 			case 'R':
 				VertexShaderManager::ResetView();
 				break;
diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp
index ee9fde97f6..c07286d58f 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp
@@ -619,10 +619,10 @@ void VertexShaderManager::SetMaterialColorChanged(int index)
 	nMaterialsChanged  |= (1 << index);
 }
 
-void VertexShaderManager::TranslateView(float x, float y)
+void VertexShaderManager::TranslateView(float x, float y, float z)
 {
 	float result[3];
-	float vector[3] = { x,0,y };
+	float vector[3] = { x,z,y };
 
 	Matrix33::Multiply(s_viewInvRotationMatrix, vector, result);
 
diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.h b/Source/Core/VideoCommon/Src/VertexShaderManager.h
index 8a87f7644f..b4c5d3907c 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderManager.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderManager.h
@@ -32,7 +32,7 @@ public:
 	static void SetProjectionChanged();
 	static void SetMaterialColorChanged(int index);
 
-	static void TranslateView(float x, float y);
+	static void TranslateView(float x, float y, float z = 0.0f);
 	static void RotateView(float x, float y);
 	static void ResetView();
 };

From bc17798ef26a56e2df3b2145f3cbccccd53d90a2 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Mon, 22 Jul 2013 02:36:26 -0400
Subject: [PATCH 332/352] InputConfigDiag: Add a simple error status label

This tells you what you did wrong at a high level if you messed up.
---
 Source/Core/DolphinWX/Src/InputConfigDiag.cpp  | 18 ++++++++++++++++++
 Source/Core/DolphinWX/Src/InputConfigDiag.h    |  1 +
 .../ControllerInterface.cpp                    |  4 +---
 .../ControllerInterface/ControllerInterface.h  |  1 +
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
index 6a740aae45..33471f9d9b 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
@@ -6,6 +6,9 @@
 #include "UDPConfigDiag.h"
 #include "WxUtils.h"
 #include "HW/Wiimote.h"
+#include "ControllerInterface/ExpressionParser.h"
+
+using namespace ciface::ExpressionParser;
 
 void GamepadPage::ConfigUDPWii(wxCommandEvent &event)
 {
@@ -225,6 +228,18 @@ void ControlDialog::UpdateGUI()
 	// updates the "bound controls:" label
 	m_bound_label->SetLabel(wxString::Format(_("Bound Controls: %lu"),
 		(unsigned long)control_reference->BoundCount()));
+
+	switch (control_reference->parse_error)
+	{
+	case EXPRESSION_PARSE_SYNTAX_ERROR:
+		m_error_label->SetLabel("Syntax error");
+		break;
+	case EXPRESSION_PARSE_NO_DEVICE:
+		m_error_label->SetLabel("Device not found");
+		break;
+	default:
+		m_error_label->SetLabel("");
+	}
 };
 
 void GamepadPage::UpdateGUI()
@@ -560,7 +575,9 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent)
 
 	range_slider->Bind(wxEVT_SCROLL_CHANGED, &GamepadPage::AdjustControlOption, parent);
 	wxStaticText* const range_label = new wxStaticText(this, -1, _("Range"));
+
 	m_bound_label = new wxStaticText(this, -1, wxT(""));
+	m_error_label = new wxStaticText(this, -1, wxT(""));
 
 	wxBoxSizer* const range_sizer = new wxBoxSizer(wxHORIZONTAL);
 	range_sizer->Add(range_label, 0, wxCENTER|wxLEFT, 5);
@@ -579,6 +596,7 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent)
 	main_szr->Add(textctrl, 1, wxEXPAND|wxLEFT|wxRIGHT|wxBOTTOM, 5);
 	main_szr->Add(bottom_btns_sizer, 0, wxEXPAND|wxBOTTOM|wxRIGHT, 5);
 	main_szr->Add(m_bound_label, 0, wxCENTER, 0);
+	main_szr->Add(m_error_label, 0, wxCENTER, 0);
 
 	UpdateListContents();
 
diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.h b/Source/Core/DolphinWX/Src/InputConfigDiag.h
index 475fa9ed5e..0a355c1d2f 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.h
+++ b/Source/Core/DolphinWX/Src/InputConfigDiag.h
@@ -112,6 +112,7 @@ public:
 private:
 	GamepadPage* const		m_parent;
 	wxStaticText*		m_bound_label;
+	wxStaticText*		m_error_label;
 	DeviceQualifier	m_devq;
 	bool GetExpressionForSelectedControl(wxString &expr);
 };
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
index f0870a18a4..d2982bba24 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
@@ -228,9 +228,7 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference*
 	ref->parsed_expression = NULL;
 
 	ControlFinder finder(*this, default_device, ref->is_input);
-	ExpressionParseStatus status;
-	status = ParseExpression(ref->expression, finder, &ref->parsed_expression);
-	// XXX: do something with status?
+	ref->parse_error = ParseExpression(ref->expression, finder, &ref->parsed_expression);
 }
 
 //
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
index 711f393894..00b4b2c07d 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
@@ -64,6 +64,7 @@ public:
 		ControlState range;
 		std::string			expression;
 		const bool			is_input;
+		ciface::ExpressionParser::ExpressionParseStatus parse_error;
 
 		virtual ~ControlReference() {
 			delete parsed_expression;

From f693488c8a523ce7a26e928840baf8a9fcaa9aed Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Mon, 22 Jul 2013 02:48:07 -0400
Subject: [PATCH 333/352] InputConfigDiag: Save the configuration when pressing
 "OK"

This fixes a common UI complaint of the control dialog UI.
Also, don't close the dialog if we have an error with the expression.
---
 Source/Core/DolphinWX/Src/InputConfigDiag.cpp | 9 ++++-----
 Source/Core/DolphinWX/Src/InputConfigDiag.h   | 3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
index 33471f9d9b..574834f940 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/InputConfigDiag.cpp
@@ -292,7 +292,7 @@ void GamepadPage::LoadDefaults(wxCommandEvent&)
 	UpdateGUI();
 }
 
-void ControlDialog::SetControl(wxCommandEvent&)
+bool ControlDialog::Validate()
 {
 	control_reference->expression = WxStrToStr(textctrl->GetValue());
 
@@ -300,6 +300,8 @@ void ControlDialog::SetControl(wxCommandEvent&)
 	g_controller_interface.UpdateReference(control_reference, m_parent->controller->default_device);
 
 	UpdateGUI();
+
+	return (control_reference->parse_error == EXPRESSION_PARSE_SUCCESS);
 }
 
 void GamepadPage::SetDevice(wxCommandEvent&)
@@ -533,7 +535,6 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent)
 	wxButton* const detect_button = new wxButton(this, -1, control_reference->is_input ? _("Detect") : _("Test"));
 
 	wxButton* const clear_button = new  wxButton(this, -1, _("Clear"));
-	wxButton* const set_button = new wxButton(this, -1, _("Set"));
 
 	wxButton* const select_button = new wxButton(this, -1, _("Select"));
 	select_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::SetSelectedControl, this);
@@ -571,7 +572,6 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent)
 
 	detect_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::DetectControl, this);
 	clear_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::ClearControl, this);
-	set_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &ControlDialog::SetControl, this);
 
 	range_slider->Bind(wxEVT_SCROLL_CHANGED, &GamepadPage::AdjustControlOption, parent);
 	wxStaticText* const range_label = new wxStaticText(this, -1, _("Range"));
@@ -587,8 +587,7 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent)
 	ctrls_sizer->Add(control_lbox, 1, wxEXPAND, 0);
 	ctrls_sizer->Add(button_sizer, 0, wxEXPAND, 0);
 
-	wxSizer* const bottom_btns_sizer = CreateButtonSizer(wxOK);
-	bottom_btns_sizer->Prepend(set_button, 0, wxRIGHT, 5);
+	wxSizer* const bottom_btns_sizer = CreateButtonSizer(wxOK|wxAPPLY);
 	bottom_btns_sizer->Prepend(clear_button, 0, wxLEFT, 5);
 
 	main_szr->Add(range_sizer, 0, wxEXPAND|wxLEFT|wxRIGHT, 5);
diff --git a/Source/Core/DolphinWX/Src/InputConfigDiag.h b/Source/Core/DolphinWX/Src/InputConfigDiag.h
index 0a355c1d2f..7d337ed0de 100644
--- a/Source/Core/DolphinWX/Src/InputConfigDiag.h
+++ b/Source/Core/DolphinWX/Src/InputConfigDiag.h
@@ -89,9 +89,10 @@ public:
 	
 	wxStaticBoxSizer* CreateControlChooser(GamepadPage* const parent);
 
+	virtual bool Validate();
+
 	void DetectControl(wxCommandEvent& event);
 	void ClearControl(wxCommandEvent& event);
-	void SetControl(wxCommandEvent& event);
 	void SetDevice(wxCommandEvent& event);
 
 	void UpdateGUI();

From 15b8ac64ef2c3a4c67a137b8955f33647b542ce0 Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Mon, 22 Jul 2013 12:02:16 +0200
Subject: [PATCH 334/352] Implement zcomploc on OpenGL4.2+

---
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 33 +++++++++++++------
 Source/Core/VideoCommon/Src/PixelShaderGen.h  |  1 +
 Source/Core/VideoCommon/Src/VideoConfig.h     |  3 +-
 Source/Plugins/Plugin_VideoDX11/Src/main.cpp  |  1 +
 Source/Plugins/Plugin_VideoDX9/Src/main.cpp   |  1 +
 .../Src/ProgramShaderCache.cpp                |  2 +-
 Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 14 ++++++--
 Source/Plugins/Plugin_VideoOGL/Src/Render.h   |  3 +-
 Source/Plugins/Plugin_VideoOGL/Src/main.cpp   |  3 +-
 9 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index cf0dc8e959..7d629f33ab 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -258,7 +258,8 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 	unsigned int numStages = bpmem.genMode.numtevstages + 1;
 	unsigned int numTexgen = bpmem.genMode.numtexgens;
 
-	const bool per_pixel_depth = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable) || !g_ActiveConfig.bFastDepthCalc;
+	const bool forced_early_z = g_ActiveConfig.backend_info.bSupportsEarlyZ && bpmem.zcontrol.early_ztest && (g_ActiveConfig.bFastDepthCalc || bpmem.alpha_test.TestResult() == AlphaTest::UNDETERMINED);
+	const bool per_pixel_depth = (bpmem.ztex2.op != ZTEXTURE_DISABLE && !bpmem.zcontrol.early_ztest && bpmem.zmode.testenable) || (!g_ActiveConfig.bFastDepthCalc && !forced_early_z);
 
 	out.Write("//Pixel Shader for TEV stages\n");
 	out.Write("//%i TEV stages, %i texgens, %i IND stages\n",
@@ -372,6 +373,14 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 			}
 			out.Write("float4 clipPos;\n");
 		}
+		
+		if (forced_early_z)
+		{
+			// HACK: This doesn't force the driver to write to depth buffer if alpha test fails.
+			// It just allows it, but it seems that all drivers do.
+			out.Write("layout(early_fragment_tests) in;\n");
+		}
+		
 		out.Write("void main()\n{\n");
 	}
 	else
@@ -584,6 +593,7 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 
 	uid_data.ztex_op = bpmem.ztex2.op;
 	uid_data.per_pixel_depth = per_pixel_depth;
+	uid_data.forced_early_z = forced_early_z;
 	uid_data.fast_depth_calc = g_ActiveConfig.bFastDepthCalc;
 	uid_data.early_ztest = bpmem.zcontrol.early_ztest;
 	uid_data.fog_fsel = bpmem.fog.c_proj_fsel.fsel;
@@ -1129,17 +1139,20 @@ static void WriteAlphaTest(T& out, pixel_shader_uid_data& uid_data, API_TYPE Api
 		out.Write("\t\tdepth = 1.f;\n");
 
 	// HAXX: zcomploc (aka early_ztest) is a way to control whether depth test is done before
-	// or after texturing and alpha test. PC GPUs have no way to support this
-	// feature properly as of 2012: depth buffer and depth test are not
+	// or after texturing and alpha test. PC graphics APIs have no way to support this
+	// feature properly as of 2012: Depth buffer and depth test are not
 	// programmable and the depth test is always done after texturing.
-	// Most importantly, PC GPUs do not allow writing to the z-buffer without
+	// Most importantly, they do not allow writing to the z-buffer without
 	// writing a color value (unless color writing is disabled altogether).
-	// We implement "depth test before texturing" by discarding the fragment
-	// when the alpha test fail. This is not a correct implementation because
-	// even if the depth test fails the fragment could be alpha blended, but
-	// we don't have a choice.
-	uid_data.alpha_test_use_zcomploc_hack = bpmem.zcontrol.early_ztest && bpmem.zmode.updateenable;
-	if (!(bpmem.zcontrol.early_ztest && bpmem.zmode.updateenable))
+	// We implement "depth test before texturing" by disabling alpha test when early-z is in use.
+	// It seems to be less buggy than not to update the depth buffer if alpha test fails,
+	// but both ways wouldn't be accurate.
+	
+	// OpenGL 4.2 has a flag which allows the driver to still update the depth buffer 
+	// if alpha test fails. The driver doesn't have to, but I assume they all do because
+	// it's the much faster code path for the GPU.
+	uid_data.alpha_test_use_zcomploc_hack = bpmem.zcontrol.early_ztest && bpmem.zmode.updateenable && !g_ActiveConfig.backend_info.bSupportsEarlyZ;
+	if (!uid_data.alpha_test_use_zcomploc_hack)
 	{
 		out.Write("\t\tdiscard;\n");
 		if (ApiType != API_D3D11)
diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index 21004323f9..c1ca009438 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
@@ -112,6 +112,7 @@ struct pixel_shader_uid_data
 
 	u32 fast_depth_calc : 1;
 	u32 per_pixel_depth : 1;
+	u32 forced_early_z : 1;
 	u32 early_ztest : 1;
 
 	u32 xfregs_numTexGen_numTexGens : 4;
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h
index ec4ad3ed3d..741521c728 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.h
+++ b/Source/Core/VideoCommon/Src/VideoConfig.h
@@ -155,7 +155,8 @@ struct VideoConfig
 		bool bSupportsPixelLighting;
 		bool bSupportsPrimitiveRestart;
 		bool bSupportsSeparateAlphaFunction;
-		bool bSupportsGLSLUBO; // needed by pixelShaderGen, so must stay in videoCommon
+		bool bSupportsGLSLUBO; // needed by PixelShaderGen, so must stay in VideoCommon
+		bool bSupportsEarlyZ; // needed by PixelShaderGen, so must stay in VideoCommon
 	} backend_info;
 
 	// Utility
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp
index 0561885b27..4e03dfb456 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp
@@ -90,6 +90,7 @@ void InitBackendInfo()
 	g_Config.backend_info.bSupportsFormatReinterpretation = true;
 	g_Config.backend_info.bSupportsPixelLighting = true;
 	g_Config.backend_info.bSupportsPrimitiveRestart = true;
+	g_Config.backend_info.bSupportsEarlyZ = false;
 
 	IDXGIFactory* factory;
 	IDXGIAdapter* ad;
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
index 42011d1b9e..19e6441bbd 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
@@ -96,6 +96,7 @@ void InitBackendInfo()
 	g_Config.backend_info.bSupportsDualSourceBlend = false;
 	g_Config.backend_info.bSupportsFormatReinterpretation = true;
 	g_Config.backend_info.bSupportsPixelLighting = C_PLIGHTS + 40 <= maxConstants && C_PMATERIALS + 4 <= maxConstants;
+	g_Config.backend_info.bSupportsEarlyZ = false;
 
 	// adapters
 	g_Config.backend_info.Adapters.clear();
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index 1eed65a01e..c64ddbe1ac 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -539,7 +539,7 @@ void ProgramShaderCache::CreateHeader ( void )
 		"%s\n"
 		"%s\n"
 				
-		, v==GLSLES3 ? "300 es" : v==GLSL_120 ? "120" : v==GLSL_130 ? "130" : "140"
+		, v==GLSLES3 ? "300 es" : v==GLSL_120 ? "120" : v==GLSL_130 ? "130" : v==GLSL_140 ? "140" : "150"
 		, v==GLSLES3 ? "precision highp float;" : ""
 		, g_ActiveConfig.backend_info.bSupportsGLSLUBO && v<GLSL_140 ? "#extension GL_ARB_uniform_buffer_object : enable" : ""
 		, v==GLSL_120 ? "attribute" : "in"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index fab248ca90..12c22b7277 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -342,6 +342,7 @@ Renderer::Renderer()
 	g_Config.backend_info.bSupportsDualSourceBlend = false;
 	g_Config.backend_info.bSupportsGLSLUBO = true; 
 	g_Config.backend_info.bSupportsPrimitiveRestart = false; 
+	g_Config.backend_info.bSupportsEarlyZ = false;
 	
 	g_ogl_config.bSupportsGLSLCache = false; // XXX: Reenable once shaders compile correctly  
 	g_ogl_config.bSupportsGLPinnedMemory = false; 
@@ -433,6 +434,7 @@ Renderer::Renderer()
 	g_Config.backend_info.bSupportsDualSourceBlend = GLEW_ARB_blend_func_extended;
 	g_Config.backend_info.bSupportsGLSLUBO = GLEW_ARB_uniform_buffer_object;
 	g_Config.backend_info.bSupportsPrimitiveRestart = GLEW_VERSION_3_1 || GLEW_NV_primitive_restart;
+	g_Config.backend_info.bSupportsEarlyZ = GLEW_ARB_shader_image_load_store;
 	
 	g_ogl_config.bSupportsGLSLCache = GLEW_ARB_get_program_binary;
 	g_ogl_config.bSupportsGLPinnedMemory = GLEW_AMD_pinned_memory;
@@ -453,14 +455,21 @@ Renderer::Renderer()
 	{
 		g_ogl_config.eSupportedGLSLVersion = GLSL_120;
 		g_Config.backend_info.bSupportsDualSourceBlend = false; //TODO: implement dual source blend
+		g_Config.backend_info.bSupportsEarlyZ = false; // layout keyword is only supported on glsl150+
 	}
 	else if(strstr(g_ogl_config.glsl_version, "1.30"))
 	{
 		g_ogl_config.eSupportedGLSLVersion = GLSL_130;
+		g_Config.backend_info.bSupportsEarlyZ = false; // layout keyword is only supported on glsl150+
+	}
+	else if(strstr(g_ogl_config.glsl_version, "1.40"))
+	{
+		g_ogl_config.eSupportedGLSLVersion = GLSL_140;
+		g_Config.backend_info.bSupportsEarlyZ = false; // layout keyword is only supported on glsl150+
 	}
 	else
 	{
-		g_ogl_config.eSupportedGLSLVersion = GLSL_140;
+		g_ogl_config.eSupportedGLSLVersion = GLSL_150;
 	}
 #endif	
 	
@@ -489,10 +498,11 @@ Renderer::Renderer()
 				g_ogl_config.gl_renderer,
 				g_ogl_config.gl_version).c_str(), 5000);
 	
-	WARN_LOG(VIDEO,"Missing OGL Extensions: %s%s%s%s%s%s%s%s%s",
+	WARN_LOG(VIDEO,"Missing OGL Extensions: %s%s%s%s%s%s%s%s%s%s",
 			g_ActiveConfig.backend_info.bSupportsDualSourceBlend ? "" : "DualSourceBlend ",
 			g_ActiveConfig.backend_info.bSupportsGLSLUBO ? "" : "UniformBuffer ",
 			g_ActiveConfig.backend_info.bSupportsPrimitiveRestart ? "" : "PrimitiveRestart ",
+			g_ActiveConfig.backend_info.bSupportsEarlyZ ? "" : "EarlyZ ",
 			g_ogl_config.bSupportsGLPinnedMemory ? "" : "PinnedMemory ",
 			g_ogl_config.bSupportsGLSLCache ? "" : "ShaderCache ",
 			g_ogl_config.bSupportsGLBaseVertex ? "" : "BaseVertex ",
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.h b/Source/Plugins/Plugin_VideoOGL/Src/Render.h
index 0a0a5a3231..a570faab85 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.h
@@ -12,7 +12,8 @@ void ClearEFBCache();
 enum GLSL_VERSION {
 	GLSL_120,
 	GLSL_130,
-	GLSL_140, // and above
+	GLSL_140,
+	GLSL_150, // and above
 	GLSLES3
 };
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
index 6d71994cf4..1777ecfe22 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
@@ -129,9 +129,10 @@ void InitBackendInfo()
 	g_Config.backend_info.bUseRGBATextures = true;
 	g_Config.backend_info.bUseMinimalMipCount = false;
 	g_Config.backend_info.bSupports3DVision = false;
-	//g_Config.backend_info.bSupportsDualSourceBlend = true; // is gpu depenend and must be set in renderer
+	//g_Config.backend_info.bSupportsDualSourceBlend = true; // is gpu dependent and must be set in renderer
 	g_Config.backend_info.bSupportsFormatReinterpretation = false;
 	g_Config.backend_info.bSupportsPixelLighting = true;
+	//g_Config.backend_info.bSupportsEarlyZ = true; // is gpu dependent and must be set in renderer
 
 	// aamodes
 	const char* caamodes[] = {_trans("None"), "2x", "4x", "8x", "8x CSAA", "8xQ CSAA", "16x CSAA", "16xQ CSAA", "4x SSAA"};

From 2631ec3cff255e9392527046d0289667cda376d0 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Mon, 22 Jul 2013 04:31:49 -0400
Subject: [PATCH 335/352] Core: Remove an unused var

---
 Source/Core/Core/Src/Core.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index 721bcbf3e3..e6ef8d5703 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -80,7 +80,6 @@ void Stop();
 bool g_bStopping = false;
 bool g_bHwInit = false;
 bool g_bStarted = false;
-bool g_bRealWiimote = false;
 void *g_pWindowHandle = NULL;
 std::string g_stateFileName;
 std::thread g_EmuThread;

From 6d463d1b6702aad5a5504934cab25a0f88be01c8 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Mon, 22 Jul 2013 04:03:43 -0400
Subject: [PATCH 336/352] NetPlay: Allow building a server without a game

This isn't hooked up in the UI yet, but it will allow us to
basically start the server and chat system without choosing
a game.
---
 Source/Core/Core/Src/NetPlay.h          |  2 +-
 Source/Core/Core/Src/NetPlayServer.cpp  | 16 ++++++++--------
 Source/Core/DolphinWX/Src/NetWindow.cpp |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Source/Core/Core/Src/NetPlay.h b/Source/Core/Core/Src/NetPlay.h
index 8b84f43250..47f8af18b9 100644
--- a/Source/Core/Core/Src/NetPlay.h
+++ b/Source/Core/Core/Src/NetPlay.h
@@ -183,7 +183,7 @@ class NetPlayServer : public NetPlay
 public:
 	void ThreadFunc();
 
-	NetPlayServer(const u16 port, const std::string& name, NetPlayUI* dialog, const std::string& game = "");
+	NetPlayServer(const u16 port, const std::string& name, NetPlayUI* dialog);
 	~NetPlayServer();
 
 	void GetPlayerList(std::string& list, std::vector<int>& pid_list);
diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp
index 31731daa47..95d139f4cd 100644
--- a/Source/Core/Core/Src/NetPlayServer.cpp
+++ b/Source/Core/Core/Src/NetPlayServer.cpp
@@ -22,10 +22,8 @@ NetPlayServer::~NetPlayServer()
 }
 
 // called from ---GUI--- thread
-NetPlayServer::NetPlayServer(const u16 port, const std::string& name, NetPlayUI* dialog, const std::string& game) : NetPlay(dialog)
+NetPlayServer::NetPlayServer(const u16 port, const std::string& name, NetPlayUI* dialog) : NetPlay(dialog)
 {
-	m_selected_game = game;
-
 	m_update_pings = true;
 
 	if (m_socket.Listen(port))
@@ -229,10 +227,13 @@ unsigned int NetPlayServer::OnConnect(sf::SocketTCP& socket)
 	socket.Send(spac);
 
 	// send new client the selected game
-	spac.Clear();
-	spac << (MessageId)NP_MSG_CHANGE_GAME;
-	spac << m_selected_game;
-	socket.Send(spac);
+	if (m_selected_game != "")
+	{
+		spac.Clear();
+		spac << (MessageId)NP_MSG_CHANGE_GAME;
+		spac << m_selected_game;
+		socket.Send(spac);
+	}
 
 	// sync values with new client
 	for (i = m_players.begin(); i!=e; ++i)
@@ -801,4 +802,3 @@ bool NetPlayServer::UPnPUnmapPort(const u16 port)
 	return true;
 }
 #endif
-
diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp
index 9cba383f26..22cd588236 100644
--- a/Source/Core/DolphinWX/Src/NetWindow.cpp
+++ b/Source/Core/DolphinWX/Src/NetWindow.cpp
@@ -220,8 +220,8 @@ void NetPlaySetupDiag::OnHost(wxCommandEvent&)
 	npd = new NetPlayDiag(m_parent, m_game_list, game, true);
 	unsigned long port = 0;
 	m_host_port_text->GetValue().ToULong(&port);
-	netplay_ptr = new NetPlayServer(u16(port)
-		, WxStrToStr(m_nickname_text->GetValue()), npd, game);
+	netplay_ptr = new NetPlayServer(u16(port), WxStrToStr(m_nickname_text->GetValue()), npd);
+	netplay_ptr->ChangeGame(game);
 	if (netplay_ptr->is_connected)
 	{
 #ifdef USE_UPNP

From a963c621dc5c8d34227c8cb5a68afcef5b796300 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Mon, 22 Jul 2013 06:15:08 -0400
Subject: [PATCH 337/352] NetPlay: Sync across whether to save memcards or not

There's no reason this shouldn't be synced other than laziness.
---
 Source/Core/Core/Src/BootManager.cpp   | 1 +
 Source/Core/Core/Src/NetPlay.cpp       | 6 +-----
 Source/Core/Core/Src/NetPlay.h         | 3 ++-
 Source/Core/Core/Src/NetPlayClient.cpp | 1 +
 Source/Core/Core/Src/NetPlayServer.cpp | 1 +
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp
index 60f718db53..25e3c6396e 100644
--- a/Source/Core/Core/Src/BootManager.cpp
+++ b/Source/Core/Core/Src/BootManager.cpp
@@ -139,6 +139,7 @@ bool BootCore(const std::string& _rFilename)
 	if (NetPlay::GetNetPlayPtr())
 	{
 		StartUp.bDSPHLE = g_NetPlaySettings.m_DSPHLE;
+		StartUp.bEnableMemcardSaving = g_NetPlaySettings.m_WriteToMemcard;
 		SConfig::GetInstance().m_EnableJIT = g_NetPlaySettings.m_DSPEnableJIT;
 	}
 
diff --git a/Source/Core/Core/Src/NetPlay.cpp b/Source/Core/Core/Src/NetPlay.cpp
index 59b6a05538..45d1689abe 100644
--- a/Source/Core/Core/Src/NetPlay.cpp
+++ b/Source/Core/Core/Src/NetPlay.cpp
@@ -264,11 +264,7 @@ bool NetPlay::StopGame()
 void NetPlay::SetMemcardWriteEnabled(bool enabled)
 {
 	std::lock_guard<std::recursive_mutex> lkg(m_crit.game);
-
-	if (m_is_running)
-	{
-		Core::g_CoreStartupParameter.bEnableMemcardSaving = enabled;
-	}
+	g_NetPlaySettings.m_WriteToMemcard = enabled;
 }
 
 // called from ---CPU--- thread
diff --git a/Source/Core/Core/Src/NetPlay.h b/Source/Core/Core/Src/NetPlay.h
index 47f8af18b9..222fb680cf 100644
--- a/Source/Core/Core/Src/NetPlay.h
+++ b/Source/Core/Core/Src/NetPlay.h
@@ -35,6 +35,7 @@ struct NetSettings
 {
 	bool m_DSPHLE;
 	bool m_DSPEnableJIT;
+	bool m_WriteToMemcard;
 	u8 m_Controllers[4];
 };
 extern NetSettings g_NetPlaySettings;
@@ -46,7 +47,7 @@ struct Rpt : public std::vector<u8>
 
 typedef std::vector<Rpt>	NetWiimote;
 
-#define NETPLAY_VERSION		"Dolphin NetPlay 2013-07-19"
+#define NETPLAY_VERSION		"Dolphin NetPlay 2013-07-22"
 
 // messages
 enum
diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp
index f01f2155c6..7163be001a 100644
--- a/Source/Core/Core/Src/NetPlayClient.cpp
+++ b/Source/Core/Core/Src/NetPlayClient.cpp
@@ -195,6 +195,7 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
 			packet >> m_current_game;
 			packet >> g_NetPlaySettings.m_DSPEnableJIT;
 			packet >> g_NetPlaySettings.m_DSPHLE;
+			packet >> g_NetPlaySettings.m_WriteToMemcard;
 			for (unsigned int i = 0; i < 4; ++i)
 				packet >> g_NetPlaySettings.m_Controllers[i];
 			}
diff --git a/Source/Core/Core/Src/NetPlayServer.cpp b/Source/Core/Core/Src/NetPlayServer.cpp
index 95d139f4cd..db3a41a398 100644
--- a/Source/Core/Core/Src/NetPlayServer.cpp
+++ b/Source/Core/Core/Src/NetPlayServer.cpp
@@ -607,6 +607,7 @@ bool NetPlayServer::StartGame(const std::string &path)
 	spac << NetPlay::m_current_game;
 	spac << g_NetPlaySettings.m_DSPEnableJIT;
 	spac << g_NetPlaySettings.m_DSPHLE;
+	spac << g_NetPlaySettings.m_WriteToMemcard;
 	for (unsigned int i = 0; i < 4; ++i)
 		spac << g_NetPlaySettings.m_Controllers[i];
 

From c6ae08fc39e3184fe585fa38248d74d2e8b6fc1f Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Mon, 22 Jul 2013 15:41:10 +0200
Subject: [PATCH 338/352] implement emulate efb format changes on ogl backend

---
 .../Src/FramebufferManager.cpp                | 118 +++++++++++++++++-
 .../Plugin_VideoOGL/Src/FramebufferManager.h  |  14 ++-
 Source/Plugins/Plugin_VideoOGL/Src/Render.cpp |  24 ++--
 Source/Plugins/Plugin_VideoOGL/Src/main.cpp   |   2 +-
 4 files changed, 143 insertions(+), 15 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
index 27a5dff2de..b381cd2375 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
@@ -29,6 +29,12 @@ GLuint FramebufferManager::m_resolvedDepthTexture;
 
 GLuint FramebufferManager::m_xfbFramebuffer;
 
+// reinterpret pixel format
+GLuint FramebufferManager::m_pixel_format_vao;
+GLuint FramebufferManager::m_pixel_format_vbo;
+SHADER FramebufferManager::m_pixel_format_shaders[2];
+
+
 FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int msaaSamples, int msaaCoverageSamples)
 {
 	m_efbFramebuffer = 0;
@@ -65,10 +71,11 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
 	{
 		// EFB targets will be textures in non-MSAA mode.
 
-		GLuint glObj[2];
-		glGenTextures(2, glObj);
+		GLuint glObj[3];
+		glGenTextures(3, glObj);
 		m_efbColor = glObj[0];
 		m_efbDepth = glObj[1];
+		m_resolvedColorTexture = glObj[2]; // needed for pixel format convertion
 
 		glBindTexture(getFbType(), m_efbColor);
 		glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
@@ -77,6 +84,10 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
 		glBindTexture(getFbType(), m_efbDepth);
 		glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
 		glTexImage2D(getFbType(), 0, GL_DEPTH_COMPONENT24, m_targetWidth, m_targetHeight, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL);
+		
+		glBindTexture(getFbType(), m_resolvedColorTexture);
+		glTexParameteri(getFbType(), GL_TEXTURE_MAX_LEVEL, 0);
+		glTexImage2D(getFbType(), 0, GL_RGBA8, m_targetWidth, m_targetHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
 
 		// Bind target textures to the EFB framebuffer.
 
@@ -164,6 +175,60 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
 	glClearColor(0.f, 0.f, 0.f, 1.f);
 	glClearDepthf(1.0f);
 	glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
+	
+	// reinterpret pixel format
+	glGenBuffers(1, &m_pixel_format_vbo);
+	glGenVertexArrays(1, &m_pixel_format_vao);
+	glBindVertexArray(m_pixel_format_vao);
+	glBindBuffer(GL_ARRAY_BUFFER, m_pixel_format_vbo);
+	glEnableVertexAttribArray(SHADER_POSITION_ATTRIB);
+	glVertexAttribPointer(SHADER_POSITION_ATTRIB, 2, GL_FLOAT, 0, sizeof(GLfloat)*2, NULL);
+	
+	float vertices[] = {
+		-1.0,	-1.0,
+		1.0,	-1.0,
+		-1.0,	1.0,
+		1.0,	1.0,
+	};
+	glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
+	
+	char vs[] = 
+		"ATTRIN vec2 rawpos;\n"
+		"void main(void) {\n"
+		"	gl_Position = vec4(rawpos,0,1);\n"
+		"}\n";
+	
+	char ps_rgba6_to_rgb8[] = 
+		"uniform sampler2DRect samp9;\n"
+		"COLOROUT(ocol0)\n"
+		"void main()\n"
+		"{\n"
+		"	ivec4 src6 = ivec4(round(texture2DRect(samp9, gl_FragCoord.xy) * 63.f));\n"
+		"	ivec4 dst8;\n"
+		"	dst8.r = (src6.r << 2) | (src6.g >> 4);\n"
+		"	dst8.g = ((src6.g & 0xF) << 4) | (src6.b >> 2);\n"
+		"	dst8.b = ((src6.b & 0x3) << 6) | src6.a;\n"
+		"	dst8.a = 255;\n"
+		"	ocol0 = float4(dst8) / 255.f;\n"
+		"}";
+		
+	char ps_rgb8_to_rgba6[] = 
+		"uniform sampler2DRect samp9;\n"
+		"COLOROUT(ocol0)\n"
+		"void main()\n"
+		"{\n"
+		"	ivec4 src8 = ivec4(round(texture2DRect(samp9, gl_FragCoord.xy) * 255.f));\n"
+		"	ivec4 dst6;\n"
+		"	dst6.r = src8.r >> 2;\n"
+		"	dst6.g = ((src8.r & 0x3) << 4) | (src8.g >> 4);\n"
+		"	dst6.b = ((src8.g & 0xF) << 2) | (src8.b >> 6);\n"
+		"	dst6.a = src8.b & 0x3F;\n"
+		"	ocol0 = float4(dst6) / 63.f;\n"
+		"}";
+	
+	ProgramShaderCache::CompileShader(m_pixel_format_shaders[0], vs, ps_rgb8_to_rgba6);
+	ProgramShaderCache::CompileShader(m_pixel_format_shaders[1], vs, ps_rgba6_to_rgb8);
+
 }
 
 FramebufferManager::~FramebufferManager()
@@ -195,6 +260,12 @@ FramebufferManager::~FramebufferManager()
 		glDeleteRenderbuffers(2, glObj);
 	m_efbColor = 0;
 	m_efbDepth = 0;
+	
+	// reinterpret pixel format
+	glDeleteVertexArrays(1, &m_pixel_format_vao);
+	glDeleteBuffers(1, &m_pixel_format_vbo);
+	m_pixel_format_shaders[0].Destroy();
+	m_pixel_format_shaders[1].Destroy();
 }
 
 GLuint FramebufferManager::GetEFBColorTexture(const EFBRectangle& sourceRc)
@@ -286,6 +357,49 @@ GLuint FramebufferManager::ResolveAndGetDepthTarget(const EFBRectangle &source_r
 	return GetEFBDepthTexture(source_rect);
 }
 
+void FramebufferManager::ReinterpretPixelData(unsigned int convtype)
+{
+	g_renderer->ResetAPIState();
+	
+	GLuint src_texture = 0;
+	
+	if(m_msaaSamples > 1)
+	{
+		// MSAA mode, so resolve first
+		glBindFramebuffer(GL_READ_FRAMEBUFFER, m_efbFramebuffer);
+		glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_resolvedFramebuffer);
+		glBlitFramebuffer(
+			0, 0, m_targetWidth, m_targetHeight,
+			0, 0, m_targetWidth, m_targetHeight,
+			GL_COLOR_BUFFER_BIT, GL_NEAREST
+		);
+
+		// Return to EFB.
+		glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_efbFramebuffer);
+		
+		src_texture = m_resolvedColorTexture;
+	}
+	else
+	{
+		// non-MSAA mode, so switch textures
+		src_texture = m_efbColor;
+		m_efbColor = m_resolvedColorTexture;
+		m_resolvedColorTexture = src_texture;
+		
+		// also switch them on fbo
+		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, getFbType(), m_efbColor, 0);
+	}
+	glViewport(0,0, m_targetWidth, m_targetHeight);
+	glActiveTexture(GL_TEXTURE0 + 9);
+	glBindTexture(getFbType(), src_texture);
+	
+	m_pixel_format_shaders[convtype ? 1 : 0].Bind();
+	glBindVertexArray(m_pixel_format_vao);
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+	
+	g_renderer->RestoreAPIState();
+}
+
 XFBSource::~XFBSource()
 {
 	glDeleteRenderbuffers(1, &renderbuf);
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h
index 4a8b09722c..0c64a25e58 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.h
@@ -7,6 +7,7 @@
 
 #include "GLUtil.h"
 #include "FramebufferManagerBase.h"
+#include "ProgramShaderCache.h"
 #include "Render.h"
 
 // On the GameCube, the game sends a request for the graphics processor to
@@ -95,6 +96,10 @@ public:
 	// Same as above but for the depth Target.
 	// After calling this, before you render anything else, you MUST bind the framebuffer you want to draw to.
 	static GLuint ResolveAndGetDepthTarget(const EFBRectangle &rect);
+	
+	// Convert EFB content on pixel format change. 
+	// convtype=0 -> rgb8->rgba6, convtype=2 -> rgba6->rgb8
+	static void ReinterpretPixelData(unsigned int convtype);
 
 private:
 	XFBSourceBase* CreateXFBSource(unsigned int target_width, unsigned int target_height);
@@ -111,12 +116,17 @@ private:
 	static GLuint m_efbColor; // Renderbuffer in MSAA mode; Texture otherwise
 	static GLuint m_efbDepth; // Renderbuffer in MSAA mode; Texture otherwise
 
-	// Only used in MSAA mode.
-	static GLuint m_resolvedFramebuffer;
+	// Only used in MSAA mode and to convert pixel format
+	static GLuint m_resolvedFramebuffer; // will be hot swapped with m_efbColor on non-msaa pixel format change
 	static GLuint m_resolvedColorTexture;
 	static GLuint m_resolvedDepthTexture;
 
 	static GLuint m_xfbFramebuffer; // Only used in MSAA mode
+	
+	// For pixel format draw
+	static GLuint m_pixel_format_vbo;
+	static GLuint m_pixel_format_vao;
+	static SHADER m_pixel_format_shaders[2];
 };
 
 }  // namespace OGL
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index 12c22b7277..0bc64a2769 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -547,13 +547,6 @@ Renderer::Renderer()
 	// options while running
 	g_Config.bRunning = true;
 
-	if (GL_REPORT_ERROR() != GL_NO_ERROR)
-		bSuccess = false;
-
-	// Initialize the FramebufferManager
-	g_framebuffer_manager = new FramebufferManager(s_target_width, s_target_height,
-			s_MSAASamples, s_MSAACoverageSamples);
-
 	if (GL_REPORT_ERROR() != GL_NO_ERROR)
 		bSuccess = false;
 	
@@ -601,12 +594,12 @@ Renderer::~Renderer()
 	if (scrshotThread.joinable())
 		scrshotThread.join();
 #endif
-
-	delete g_framebuffer_manager;
 }
 
 void Renderer::Shutdown()
 {
+	delete g_framebuffer_manager;
+	
 	g_Config.bRunning = false;
 	UpdateActiveConfig();
 	
@@ -621,6 +614,10 @@ void Renderer::Shutdown()
 
 void Renderer::Init()
 {
+	// Initialize the FramebufferManager
+	g_framebuffer_manager = new FramebufferManager(s_target_width, s_target_height,
+			s_MSAASamples, s_MSAACoverageSamples);
+	
 	s_pfont = new RasterFont();
 	
 	ProgramShaderCache::CompileShader(s_ShowEFBCopyRegions, 
@@ -1123,7 +1120,14 @@ void Renderer::ClearScreen(const EFBRectangle& rc, bool colorEnable, bool alphaE
 
 void Renderer::ReinterpretPixelData(unsigned int convtype)
 {
-	// TODO
+	if (convtype == 0 || convtype == 2)
+	{
+		FramebufferManager::ReinterpretPixelData(convtype);
+	}
+	else
+	{
+		ERROR_LOG(VIDEO, "Trying to reinterpret pixel data with unsupported conversion type %d", convtype);
+	}
 }
 
 void Renderer::SetBlendMode(bool forceUpdate)
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
index 1777ecfe22..6b2e92c93a 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
@@ -130,7 +130,7 @@ void InitBackendInfo()
 	g_Config.backend_info.bUseMinimalMipCount = false;
 	g_Config.backend_info.bSupports3DVision = false;
 	//g_Config.backend_info.bSupportsDualSourceBlend = true; // is gpu dependent and must be set in renderer
-	g_Config.backend_info.bSupportsFormatReinterpretation = false;
+	g_Config.backend_info.bSupportsFormatReinterpretation = true;
 	g_Config.backend_info.bSupportsPixelLighting = true;
 	//g_Config.backend_info.bSupportsEarlyZ = true; // is gpu dependent and must be set in renderer
 

From 9795d10dcba732bcd3f1fded0b406831b11d7b78 Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@googlemail.com>
Date: Mon, 22 Jul 2013 18:24:56 +0000
Subject: [PATCH 339/352] OGL/SamplerCache: Treat lod_bias as a signed integer.

---
 Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp
index 3fe2737e3f..8f986cd6c7 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/SamplerCache.cpp
@@ -99,7 +99,7 @@ void SamplerCache::SetParameters(GLuint sampler_id, const Params& params)
 	glSamplerParameterf(sampler_id, GL_TEXTURE_MAX_LOD, tm1.max_lod / 16.f);
 
 #ifndef USE_GLES3
-	glSamplerParameterf(sampler_id, GL_TEXTURE_LOD_BIAS, tm0.lod_bias / 32.f);
+	glSamplerParameterf(sampler_id, GL_TEXTURE_LOD_BIAS, (s32)tm0.lod_bias / 32.f);
 
 	if (g_ActiveConfig.iMaxAnisotropy > 0)
 		glSamplerParameterf(sampler_id, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)(1 << g_ActiveConfig.iMaxAnisotropy));

From 0ba6d12e9df5eb9ddfac62b1a00f995c3a3b7762 Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Tue, 23 Jul 2013 02:13:40 +0200
Subject: [PATCH 340/352] fix a small uid awsome bug

---
 Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 7d629f33ab..9c80d078ff 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -1118,7 +1118,7 @@ static void WriteAlphaTest(T& out, pixel_shader_uid_data& uid_data, API_TYPE Api
 	out.Write("\tif(!( ");
 
 	uid_data.alpha_test_comp0 = bpmem.alpha_test.comp0;
-	uid_data.alpha_test_logic = bpmem.alpha_test.comp1;
+	uid_data.alpha_test_comp1 = bpmem.alpha_test.comp1;
 	uid_data.alpha_test_logic = bpmem.alpha_test.logic;
 
 	// Lookup the first component from the alpha function table

From 09338c673cc0486ad0207a2c7e63aef41a6989fc Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Tue, 23 Jul 2013 14:58:16 -0400
Subject: [PATCH 341/352] FrameTools: Use the correct window handle for
 resizing the window

We want to resize the OpenGL window, not the frame window.
---
 Source/Core/DolphinWX/Src/FrameTools.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index e04bdde5fc..27a1aaa097 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -796,7 +796,7 @@ void CFrame::OnRenderParentResize(wxSizeEvent& event)
 #if defined(HAVE_X11) && HAVE_X11
 		wxRect client_rect = m_RenderParent->GetClientRect();
 		XMoveResizeWindow(X11Utils::XDisplayFromHandle(GetHandle()),
-				  X11Utils::XWindowFromHandle(GetHandle()),
+				  (Window) Core::GetWindowHandle(),
 				  client_rect.x, client_rect.y,
 				  client_rect.width, client_rect.height);
 #endif

From 9fdc7360cdeb89779994af845f53ab26c9a465bd Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Tue, 23 Jul 2013 19:24:05 -0400
Subject: [PATCH 342/352] Fix L and R triggers with tas input.

Partially copied from revision 1be844406c02, but allows < fully pressed, and without the typo.
---
 Source/Core/DolphinWX/Src/TASInputDlg.cpp | 62 +++++++++++++++++------
 Source/Core/DolphinWX/Src/TASInputDlg.h   |  3 +-
 2 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
index 5bc24f3262..2030965e8b 100644
--- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp
+++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
@@ -31,7 +31,7 @@ TASInputDlg::TASInputDlg(wxWindow *parent, wxWindowID id, const wxString &title,
 {
 	A_turbo = B_turbo = X_turbo = Y_turbo = Z_turbo = L_turbo = R_turbo = START_turbo = DL_turbo = DR_turbo = DD_turbo = DU_turbo = false;
 	xaxis = yaxis = c_xaxis = c_yaxis = 128;
-	A_cont = B_cont = X_cont = Y_cont = Z_cont = L_cont = R_cont = START_cont = DL_cont = DR_cont = DD_cont = DU_cont = mstickx = msticky = cstickx = csticky = false;
+	A_cont = B_cont = X_cont = Y_cont = Z_cont = L_cont = L_button_cont = R_cont = R_button_cont = START_cont = DL_cont = DR_cont = DD_cont = DU_cont = mstickx = msticky = cstickx = csticky = false;
 	
 	wxBoxSizer* const top_box = new wxBoxSizer(wxHORIZONTAL);
 	wxBoxSizer* const bottom_box = new wxBoxSizer(wxHORIZONTAL);
@@ -364,25 +364,53 @@ void TASInputDlg::GetKeyBoardInput(SPADStatus *PadStatus)
 		Y_cont = false;
 	}
 
-	if(((PadStatus->button & PAD_TRIGGER_L) != 0))
+	if(((PadStatus->triggerLeft) != 0))
 	{
-		wx_l_button->SetValue(true);
+		if (PadStatus->triggerLeft == 255)
+		{
+			wx_l_button->SetValue(true);
+			L_button_cont = true;
+		}
+		else if (L_slider_cont)
+		{
+			wx_l_button->SetValue(false);
+			L_button_cont = false;
+		}
+
+		wx_l_s->SetValue(PadStatus->triggerLeft);
+		wx_l_t->SetValue(wxString::Format(wxT("%i"), PadStatus->triggerLeft));
 		L_cont = true;
 	}
 	else if(L_cont)
 	{
 		wx_l_button->SetValue(false);
+		wx_l_s->SetValue(0);
+		wx_l_t->SetValue(wxT("0"));
 		L_cont = false;
 	}
 	
-	if(((PadStatus->button & PAD_TRIGGER_R) != 0))
+	if(((PadStatus->triggerRight) != 0))
 	{
-		wx_r_button->SetValue(true);
+		if (PadStatus->triggerRight == 255)
+		{
+			wx_r_button->SetValue(true);
+			R_button_cont = true;
+		}
+		else if (R_button_cont)
+		{
+			wx_r_button->SetValue(false);
+			R_button_cont = false;
+		}
+
+		wx_r_s->SetValue(PadStatus->triggerRight);
+		wx_r_t->SetValue(wxString::Format(wxT("%i"), PadStatus->triggerRight));
 		R_cont = true;
 	}
 	else if(R_cont)
 	{
 		wx_r_button->SetValue(false);
+		wx_r_s->SetValue(0);
+		wx_r_t->SetValue(wxT("0"));
 		R_cont = false;
 	}
 
@@ -409,6 +437,19 @@ void TASInputDlg::GetKeyBoardInput(SPADStatus *PadStatus)
 	}
 }
 
+void TASInputDlg::SetLandRTriggers()
+{
+	if (wx_l_button->GetValue())
+		lTrig = 255;
+	else
+		lTrig = wx_l_s->GetValue();
+
+	if (wx_r_button->GetValue())
+		rTrig = 255;
+	else
+		rTrig = wx_r_s->GetValue();
+}
+
 void TASInputDlg::GetValues(SPADStatus *PadStatus, int controllerID)
 {
 	if (!IsShown())
@@ -416,6 +457,7 @@ void TASInputDlg::GetValues(SPADStatus *PadStatus, int controllerID)
 	
 	//TODO:: Make this instant not when polled.
 	GetKeyBoardInput(PadStatus);
+	SetLandRTriggers();
 
 	// TODO: implement support for more controllers
 	if (controllerID != 0)
@@ -480,16 +522,6 @@ void TASInputDlg::GetValues(SPADStatus *PadStatus, int controllerID)
 	else
 		PadStatus->button &= ~PAD_BUTTON_Y;
 
-	if(wx_l_button->IsChecked())
-		PadStatus->button |= PAD_TRIGGER_L;
-	else
-		PadStatus->button &= ~PAD_TRIGGER_L;
-
-	if(wx_r_button->IsChecked())
-		PadStatus->button |= PAD_TRIGGER_R;
-	else
-		PadStatus->button &= ~PAD_TRIGGER_R;
-
 	if(wx_z_button->IsChecked())
 		PadStatus->button |= PAD_TRIGGER_Z;
 	else
diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.h b/Source/Core/DolphinWX/Src/TASInputDlg.h
index 28b3391463..46f2d50405 100644
--- a/Source/Core/DolphinWX/Src/TASInputDlg.h
+++ b/Source/Core/DolphinWX/Src/TASInputDlg.h
@@ -33,6 +33,7 @@ class TASInputDlg : public wxDialog
 		void ButtonTurbo();
 		void GetKeyBoardInput(SPADStatus *PadStatus);
 		bool TextBoxHasFocus();
+		void SetLandRTriggers();
 		bool HasFocus();
 
 		wxBitmap CreateStickBitmap(int x, int y);
@@ -78,7 +79,7 @@ class TASInputDlg : public wxDialog
 		wxStaticBitmap*	static_bitmap_main, *static_bitmap_c;
 		wxBitmap bitmap;
 		bool A_turbo,B_turbo, X_turbo, Y_turbo, Z_turbo, L_turbo, R_turbo, START_turbo,DL_turbo,DR_turbo,DD_turbo,DU_turbo;
-		bool A_cont,B_cont, X_cont, Y_cont, Z_cont, L_cont, R_cont, START_cont,DL_cont,DR_cont,DD_cont,DU_cont,mstickx,msticky,cstickx,csticky;
+		bool A_cont,B_cont, X_cont, Y_cont, Z_cont, L_cont, L_button_cont, R_cont, R_button_cont, START_cont,DL_cont,DR_cont,DD_cont,DU_cont,mstickx,msticky,cstickx,csticky;
 		int xaxis,yaxis,c_xaxis,c_yaxis,update,update_axis;
 
 		DECLARE_EVENT_TABLE();

From 8a4b6f3d73944d84df5c1ae70ec3d331c6f78009 Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Tue, 23 Jul 2013 19:55:17 -0400
Subject: [PATCH 343/352] Forgot this from the last commit.

---
 Source/Core/DolphinWX/Src/TASInputDlg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
index 2030965e8b..5b71009644 100644
--- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp
+++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
@@ -371,7 +371,7 @@ void TASInputDlg::GetKeyBoardInput(SPADStatus *PadStatus)
 			wx_l_button->SetValue(true);
 			L_button_cont = true;
 		}
-		else if (L_slider_cont)
+		else if (L_button_cont)
 		{
 			wx_l_button->SetValue(false);
 			L_button_cont = false;

From 59d6df7046b1ed1137d28da02aec3809e3e6439c Mon Sep 17 00:00:00 2001
From: Braden <Bradenb95@gmail.com>
Date: Sun, 11 Nov 2012 15:35:08 -0600
Subject: [PATCH 344/352] Adds Support for multiple GameCube Controllers

Conflicts:

	Source/Core/DolphinWX/Src/Frame.cpp
---
 Source/Core/DolphinWX/Src/Frame.cpp       | 37 +++++++++++++++++++++--
 Source/Core/DolphinWX/Src/Frame.h         |  6 +++-
 Source/Core/DolphinWX/Src/FrameTools.cpp  | 24 ++++++++++++++-
 Source/Core/DolphinWX/Src/TASInputDlg.cpp |  4 +--
 4 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index aaa16d80cb..287bb6b2f3 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -328,6 +328,10 @@ CFrame::CFrame(wxFrame* parent,
 	m_LogWindow->Disable();
 
 	g_TASInputDlg = new TASInputDlg(this);
+	g_TASInputDlg1 = new TASInputDlg(this);
+    g_TASInputDlg2 = new TASInputDlg(this);
+    g_TASInputDlg3 = new TASInputDlg(this);
+    
 	Movie::SetInputManip(TASManipFunction);
 
 	State::SetOnAfterLoadCallback(OnAfterLoadCallback);
@@ -793,14 +797,41 @@ void OnAfterLoadCallback()
 
 void TASManipFunction(SPADStatus *PadStatus, int controllerID)
 {
-	if (main_frame)
+	if (main_frame && controllerID == 0)
 		main_frame->g_TASInputDlg->GetValues(PadStatus, controllerID);
+    
+    if (main_frame && controllerID == 1)
+		main_frame->g_TASInputDlg1->GetValues(PadStatus, controllerID);
+    
+    if (main_frame && controllerID == 2)
+		main_frame->g_TASInputDlg2->GetValues(PadStatus, controllerID);
+    
+    if (main_frame && controllerID == 3)
+		main_frame->g_TASInputDlg3->GetValues(PadStatus, controllerID);
 }
 
+bool TASInputHasFocus()
+{
+    if(main_frame->g_TASInputDlg->HasFocus())
+        return true;
+    
+    if(main_frame->g_TASInputDlg1->HasFocus())
+        return true;
+    
+    if(main_frame->g_TASInputDlg2->HasFocus())
+        return true;
+    
+    if(main_frame->g_TASInputDlg3->HasFocus())
+        return true;
+    
+    return false;
+}
+
+
 void CFrame::OnKeyDown(wxKeyEvent& event)
 {
 	if(Core::GetState() != Core::CORE_UNINITIALIZED &&
-			(RendererHasFocus() || g_TASInputDlg->HasFocus()))
+			(RendererHasFocus() || TASInputHasFocus()))
 	{
 		int WiimoteId = -1;
 		// Toggle fullscreen
@@ -834,7 +865,7 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
 		else
 		{
 			unsigned int i = NUM_HOTKEYS;
-			if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain || g_TASInputDlg->HasFocus())
+			if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain || TASInputHasFocus())
 			{
 				for (i = 0; i < NUM_HOTKEYS; i++)
 				{
diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h
index 0a29fffd37..b568f34fb9 100644
--- a/Source/Core/DolphinWX/Src/Frame.h
+++ b/Source/Core/DolphinWX/Src/Frame.h
@@ -111,7 +111,10 @@ public:
 	NetPlaySetupDiag* g_NetPlaySetupDiag;
 	wxCheatsWindow* g_CheatsWindow;
 	TASInputDlg* g_TASInputDlg;
-
+    TASInputDlg* g_TASInputDlg1;
+    TASInputDlg* g_TASInputDlg2;
+    TASInputDlg* g_TASInputDlg3;
+    
 	void InitBitmaps();
 	void DoPause();
 	void DoStop();
@@ -349,6 +352,7 @@ void OnAfterLoadCallback();
 
 // For TASInputDlg
 void TASManipFunction(SPADStatus *PadStatus, int controllerID);
+bool TASInputHasFocus();
 
 #endif  // __FRAME_H_
 
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index 27a1aaa097..70b0a26f59 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -647,7 +647,29 @@ void CFrame::OnRecordReadOnly(wxCommandEvent& event)
 
 void CFrame::OnTASInput(wxCommandEvent& event)
 {
-	g_TASInputDlg->Show(true);
+    if(SConfig::GetInstance().m_SIDevice[0] == SIDEVICE_GC_CONTROLLER)
+    {
+        g_TASInputDlg->Show(true);
+        g_TASInputDlg->SetTitle("TAS Input - Controller 1");
+    }
+    
+    if(SConfig::GetInstance().m_SIDevice[1] == SIDEVICE_GC_CONTROLLER)
+    {
+        g_TASInputDlg1->Show(true);
+        g_TASInputDlg1->SetTitle("TAS Input - Controller 2");
+    }
+        
+    if(SConfig::GetInstance().m_SIDevice[2] == SIDEVICE_GC_CONTROLLER)
+    {
+        g_TASInputDlg2->Show(true);
+        g_TASInputDlg2->SetTitle("TAS Input - Controller 3");
+    }
+    
+    if(SConfig::GetInstance().m_SIDevice[3] == SIDEVICE_GC_CONTROLLER)
+    {
+        g_TASInputDlg3->Show(true);
+        g_TASInputDlg3->SetTitle("TAS Input - Controller 4");
+    }
 }
 
 void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED (event))
diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
index 5b71009644..c37a369b11 100644
--- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp
+++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
@@ -460,8 +460,8 @@ void TASInputDlg::GetValues(SPADStatus *PadStatus, int controllerID)
 	SetLandRTriggers();
 
 	// TODO: implement support for more controllers
-	if (controllerID != 0)
-		return;
+	//if (controllerID != 0)
+	//	return;
 
 	PadStatus->stickX = mainX;
 	PadStatus->stickY = mainY;

From ec148008d0638ea4eafffd6bf95706e8d3507c5e Mon Sep 17 00:00:00 2001
From: Braden <Bradenb95@gmail.com>
Date: Sun, 11 Nov 2012 16:38:01 -0600
Subject: [PATCH 345/352] Clean up code for multiple GameCube Controllers

Conflicts:

	Source/Core/DolphinWX/Src/Frame.cpp
	Source/Core/DolphinWX/Src/FrameTools.cpp
---
 Source/Core/DolphinWX/Src/Frame.cpp      | 44 ++++++++----------------
 Source/Core/DolphinWX/Src/Frame.h        |  5 +--
 Source/Core/DolphinWX/Src/FrameTools.cpp | 33 ++++++------------
 3 files changed, 25 insertions(+), 57 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index 287bb6b2f3..af71066314 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -327,11 +327,11 @@ CFrame::CFrame(wxFrame* parent,
 	m_LogWindow->Hide();
 	m_LogWindow->Disable();
 
-	g_TASInputDlg = new TASInputDlg(this);
-	g_TASInputDlg1 = new TASInputDlg(this);
-    g_TASInputDlg2 = new TASInputDlg(this);
-    g_TASInputDlg3 = new TASInputDlg(this);
-    
+	g_TASInputDlg[0] = new TASInputDlg(this);
+	g_TASInputDlg[1] = new TASInputDlg(this);
+	g_TASInputDlg[2] = new TASInputDlg(this);
+	g_TASInputDlg[3] = new TASInputDlg(this);
+
 	Movie::SetInputManip(TASManipFunction);
 
 	State::SetOnAfterLoadCallback(OnAfterLoadCallback);
@@ -788,7 +788,7 @@ int GetCmdForHotkey(unsigned int key)
 void OnAfterLoadCallback()
 {
 	// warning: this gets called from the CPU thread, so we should only queue things to do on the proper thread
-	if(main_frame)
+	if (main_frame)
 	{
 		wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATEGUI);
 		main_frame->GetEventHandler()->AddPendingEvent(event);
@@ -797,34 +797,18 @@ void OnAfterLoadCallback()
 
 void TASManipFunction(SPADStatus *PadStatus, int controllerID)
 {
-	if (main_frame && controllerID == 0)
-		main_frame->g_TASInputDlg->GetValues(PadStatus, controllerID);
-    
-    if (main_frame && controllerID == 1)
-		main_frame->g_TASInputDlg1->GetValues(PadStatus, controllerID);
-    
-    if (main_frame && controllerID == 2)
-		main_frame->g_TASInputDlg2->GetValues(PadStatus, controllerID);
-    
-    if (main_frame && controllerID == 3)
-		main_frame->g_TASInputDlg3->GetValues(PadStatus, controllerID);
+	if (main_frame)
+		main_frame->g_TASInputDlg[controllerID]->GetValues(PadStatus, controllerID);
 }
 
 bool TASInputHasFocus()
 {
-    if(main_frame->g_TASInputDlg->HasFocus())
-        return true;
-    
-    if(main_frame->g_TASInputDlg1->HasFocus())
-        return true;
-    
-    if(main_frame->g_TASInputDlg2->HasFocus())
-        return true;
-    
-    if(main_frame->g_TASInputDlg3->HasFocus())
-        return true;
-    
-    return false;
+	for (int i = 0; i < 4; i++)
+	{
+		if (main_frame->g_TASInputDlg[i]->HasFocus())
+			return true;
+	}
+	return false;
 }
 
 
diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h
index b568f34fb9..7bfe33c1b6 100644
--- a/Source/Core/DolphinWX/Src/Frame.h
+++ b/Source/Core/DolphinWX/Src/Frame.h
@@ -110,10 +110,7 @@ public:
 	CCodeWindow* g_pCodeWindow;
 	NetPlaySetupDiag* g_NetPlaySetupDiag;
 	wxCheatsWindow* g_CheatsWindow;
-	TASInputDlg* g_TASInputDlg;
-    TASInputDlg* g_TASInputDlg1;
-    TASInputDlg* g_TASInputDlg2;
-    TASInputDlg* g_TASInputDlg3;
+	TASInputDlg* g_TASInputDlg[4];
     
 	void InitBitmaps();
 	void DoPause();
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index 70b0a26f59..5409e98f6a 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -647,29 +647,16 @@ void CFrame::OnRecordReadOnly(wxCommandEvent& event)
 
 void CFrame::OnTASInput(wxCommandEvent& event)
 {
-    if(SConfig::GetInstance().m_SIDevice[0] == SIDEVICE_GC_CONTROLLER)
-    {
-        g_TASInputDlg->Show(true);
-        g_TASInputDlg->SetTitle("TAS Input - Controller 1");
-    }
-    
-    if(SConfig::GetInstance().m_SIDevice[1] == SIDEVICE_GC_CONTROLLER)
-    {
-        g_TASInputDlg1->Show(true);
-        g_TASInputDlg1->SetTitle("TAS Input - Controller 2");
-    }
-        
-    if(SConfig::GetInstance().m_SIDevice[2] == SIDEVICE_GC_CONTROLLER)
-    {
-        g_TASInputDlg2->Show(true);
-        g_TASInputDlg2->SetTitle("TAS Input - Controller 3");
-    }
-    
-    if(SConfig::GetInstance().m_SIDevice[3] == SIDEVICE_GC_CONTROLLER)
-    {
-        g_TASInputDlg3->Show(true);
-        g_TASInputDlg3->SetTitle("TAS Input - Controller 4");
-    }
+	std::string number[4] = {"1","2","3","4"};
+
+	for(int i = 0; i < 4; i++)
+	{
+		if(SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER)
+		{
+			g_TASInputDlg[i]->Show(true);
+			g_TASInputDlg[i]->SetTitle("TAS Input - Controller " + number[i]);
+		}
+	}
 }
 
 void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED (event))

From 3f03588decc18ddb4441cd6480eb36885eae7f8a Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Tue, 23 Jul 2013 20:43:51 -0400
Subject: [PATCH 346/352] Tas input works with bongos too.

---
 Source/Core/DolphinWX/Src/Frame.h         | 2 +-
 Source/Core/DolphinWX/Src/FrameTools.cpp  | 4 ++--
 Source/Core/DolphinWX/Src/TASInputDlg.cpp | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h
index 7bfe33c1b6..2891d9931c 100644
--- a/Source/Core/DolphinWX/Src/Frame.h
+++ b/Source/Core/DolphinWX/Src/Frame.h
@@ -111,7 +111,7 @@ public:
 	NetPlaySetupDiag* g_NetPlaySetupDiag;
 	wxCheatsWindow* g_CheatsWindow;
 	TASInputDlg* g_TASInputDlg[4];
-    
+
 	void InitBitmaps();
 	void DoPause();
 	void DoStop();
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index 5409e98f6a..1c70b4e715 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -649,9 +649,9 @@ void CFrame::OnTASInput(wxCommandEvent& event)
 {
 	std::string number[4] = {"1","2","3","4"};
 
-	for(int i = 0; i < 4; i++)
+	for (int i = 0; i < 4; ++i)
 	{
-		if(SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER)
+		if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER || SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA)
 		{
 			g_TASInputDlg[i]->Show(true);
 			g_TASInputDlg[i]->SetTitle("TAS Input - Controller " + number[i]);
diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
index c37a369b11..8845eda961 100644
--- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp
+++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
@@ -459,10 +459,6 @@ void TASInputDlg::GetValues(SPADStatus *PadStatus, int controllerID)
 	GetKeyBoardInput(PadStatus);
 	SetLandRTriggers();
 
-	// TODO: implement support for more controllers
-	//if (controllerID != 0)
-	//	return;
-
 	PadStatus->stickX = mainX;
 	PadStatus->stickY = mainY;
 	PadStatus->substickX = cX;

From 672871b3be4ff59b3d7420098ee0abc3e43481b8 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@Gmail.com>
Date: Thu, 25 Jul 2013 05:44:01 +0000
Subject: [PATCH 347/352] Add in the Mali driver bug so we can call glFlush
 every flush. It seemingly is quicker calling flush every time instead of
 every n times.

---
 Source/Core/VideoCommon/Src/DriverDetails.cpp        |  6 ++++++
 Source/Core/VideoCommon/Src/DriverDetails.h          | 10 ++++++++++
 Source/Plugins/Plugin_VideoOGL/Src/Render.cpp        |  8 ++++++++
 Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp |  2 ++
 4 files changed, 26 insertions(+)

diff --git a/Source/Core/VideoCommon/Src/DriverDetails.cpp b/Source/Core/VideoCommon/Src/DriverDetails.cpp
index 0a6510eb90..153a07226f 100644
--- a/Source/Core/VideoCommon/Src/DriverDetails.cpp
+++ b/Source/Core/VideoCommon/Src/DriverDetails.cpp
@@ -31,6 +31,9 @@ namespace DriverDetails
 		{BUG_BROKENINFOLOG, 300, -1.0, -1.0},
 		{BUG_BROKENBUFFERS, 300, 14.0, -1.0},
 	};
+	BugInfo m_armbugs[] = {
+		{BUG_MALIBROKENBUFFERS, 600, -1.0, -1.0},
+	};
 
 	std::map<std::pair<Vendor, Bug>, BugInfo> m_bugs;
 	
@@ -43,6 +46,9 @@ namespace DriverDetails
 				for (unsigned int a = 0; a < (sizeof(m_qualcommbugs) / sizeof(BugInfo)); ++a)
 					m_bugs[std::make_pair(m_vendor, m_qualcommbugs[a].m_bug)] = m_qualcommbugs[a];
 			break;
+			case VENDOR_ARM:
+				for (unsigned int a = 0; a < (sizeof(m_armbugs) / sizeof(BugInfo)); ++a)
+					m_bugs[std::make_pair(m_vendor, m_armbugs[a].m_bug)] = m_armbugs[a];
 			default:
 			break;
 		}
diff --git a/Source/Core/VideoCommon/Src/DriverDetails.h b/Source/Core/VideoCommon/Src/DriverDetails.h
index f2f3480f70..bf67abe9eb 100644
--- a/Source/Core/VideoCommon/Src/DriverDetails.h
+++ b/Source/Core/VideoCommon/Src/DriverDetails.h
@@ -62,6 +62,16 @@ namespace DriverDetails
 		// The "workaround" is calling swapbuffers every single time we flush
 		// This causes flickering, but it is the only known way to work around it
 		BUG_BROKENBUFFERS,
+		// Bug: Uploading data without swapping causes issues
+		// Affected devices: Mali-T6xx
+		// Started Version: -1
+		// Ended Version: -1
+		// This is similar to the Adreno rendering bug where uploading the data
+		// to the GPU causes the device to quickly run out of RAM.
+		// Unlike the Adreno workaround though, this can be fixed by calling 
+		// either glFlush() or glFinish() after flushing.
+		// glFlush tends to take 0-1Ms on each call
+		BUG_MALIBROKENBUFFERS,
 	};
 	
 	// Initializes our internal vendor, device family, and driver version	
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index 0bc64a2769..74a3033efe 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -307,6 +307,12 @@ void InitDriverInfo()
 			sscanf(g_ogl_config.gl_version, "OpenGL ES %lg V@%lg", &glVersion, &version);
 		}
 		break;
+		case DriverDetails::VENDOR_ARM:
+			if (std::string::npos != srenderer.find("Mali-T6"))
+				devfamily = 600;
+			else if(std::string::npos != srenderer.find("Mali-4"))
+				devfamily = 400;
+		break;
 		// We don't care about these
 		default:
 		break;
@@ -664,6 +670,7 @@ void Renderer::DrawDebugInfo()
 	if (g_ActiveConfig.bShowInputDisplay)
 		p+=sprintf(p, "%s", Movie::GetInputDisplay().c_str());
 
+#ifndef USE_GLES3
 	if (g_ActiveConfig.bShowEFBCopyRegions)
 	{
 		// Set Line Size
@@ -783,6 +790,7 @@ void Renderer::DrawDebugInfo()
 		// Clear stored regions
 		stats.efb_regions.clear();
 	}
+#endif
 
 	if (g_ActiveConfig.bOverlayStats)
 		p = Statistics::ToString(p);
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
index eafe16736c..6c188b04f7 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
@@ -270,6 +270,8 @@ void VertexManager::vFlush()
 	Draw(stride);
 	if (DriverDetails::HasBug(DriverDetails::BUG_BROKENBUFFERS))
 		GLInterface->Swap();
+	if(DriverDetails::HasBug(DriverDetails::BUG_MALIBROKENBUFFERS))
+		glFlush();
 	g_perf_query->DisableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
 	//ERROR_LOG(VIDEO, "PerfQuery result: %d", g_perf_query->GetQueryResult(bpmem.zcontrol.early_ztest ? PQ_ZCOMP_OUTPUT_ZCOMPLOC : PQ_ZCOMP_OUTPUT));
 

From e0a5f7842e6f3122bc01a6647e21bd1800ec8ea8 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@Gmail.com>
Date: Thu, 25 Jul 2013 16:13:33 +0000
Subject: [PATCH 348/352] Fix Mali-T604 shader compilation

---
 .../Core/VideoCommon/Src/PixelShaderGen.cpp   | 54 +++++++++++++++----
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 9c80d078ff..9e831541bd 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -328,13 +328,10 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 
 		if (per_pixel_depth)
 			out.Write("#define depth gl_FragDepth\n");
-		out.Write("float4 rawpos = gl_FragCoord;\n");
 
 		out.Write("VARYIN float4 colors_02;\n");
 		out.Write("VARYIN float4 colors_12;\n");
-		out.Write("float4 colors_0 = colors_02;\n");
-		out.Write("float4 colors_1 = colors_12;\n");
-
+		
 		// compute window position if needed because binding semantic WPOS is not widely supported
 		// Let's set up attributes
 		if (xfregs.numTexGen.numTexGens < 7)
@@ -342,14 +339,11 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 			for (int i = 0; i < 8; ++i)
 			{
 				out.Write("VARYIN float3 uv%d_2;\n", i);
-				out.Write("float3 uv%d = uv%d_2;\n", i, i);
 			}
 			out.Write("VARYIN float4 clipPos_2;\n");
-			out.Write("float4 clipPos = clipPos_2;\n");
 			if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
 			{
 				out.Write("VARYIN float4 Normal_2;\n");
-				out.Write("float4 Normal = Normal_2;\n");
 			}
 		}
 		else
@@ -360,7 +354,6 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 				for (int i = 0; i < 8; ++i)
 				{
 					out.Write("VARYIN float4 uv%d_2;\n", i);
-					out.Write("float4 uv%d = uv%d_2;\n", i, i);
 				}
 			}
 			else
@@ -368,7 +361,6 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 				for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
 				{
 					out.Write("VARYIN float%d uv%d_2;\n", i < 4 ? 4 : 3 , i);
-					out.Write("float%d uv%d = uv%d_2;\n", i < 4 ? 4 : 3 , i, i);
 				}
 			}
 			out.Write("float4 clipPos;\n");
@@ -443,6 +435,50 @@ static void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_TYPE Api
 			"  float4 cc2=float4(0.0f,0.0f,0.0f,0.0f), cprev=float4(0.0f,0.0f,0.0f,0.0f);\n"
 			"  float4 crastemp=float4(0.0f,0.0f,0.0f,0.0f),ckonsttemp=float4(0.0f,0.0f,0.0f,0.0f);\n\n");
 
+	if (ApiType == API_OPENGL)
+	{
+		// On Mali, global variables must be initialized as constants.
+		// This is why we initialize these variables locally instead.
+		out.Write("float4 rawpos = gl_FragCoord;\n");
+		out.Write("float4 colors_0 = colors_02;\n");
+		out.Write("float4 colors_1 = colors_12;\n");
+		// compute window position if needed because binding semantic WPOS is not widely supported
+		// Let's set up attributes
+		if (xfregs.numTexGen.numTexGens < 7)
+		{
+			if(numTexgen)
+			{
+			for (int i = 0; i < 8; ++i)
+			{
+				out.Write("float3 uv%d = uv%d_2;\n", i, i);
+			}
+			}
+			out.Write("float4 clipPos = clipPos_2;\n");
+			if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
+			{
+				out.Write("float4 Normal = Normal_2;\n");
+			}
+		}
+		else
+		{
+			// wpos is in w of first 4 texcoords
+			if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
+			{
+				for (int i = 0; i < 8; ++i)
+				{
+					out.Write("float4 uv%d = uv%d_2;\n", i, i);
+				}
+			}
+			else
+			{
+				for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
+				{
+					out.Write("float%d uv%d = uv%d_2;\n", i < 4 ? 4 : 3 , i, i);
+				}
+			}
+		}
+	}
+
 	if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
 	{
 		uid_data.xfregs_numTexGen_numTexGens = xfregs.numTexGen.numTexGens;

From 3e697b363ed411cb8bc104900f76f63e1a594019 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@Gmail.com>
Date: Thu, 25 Jul 2013 18:39:00 +0000
Subject: [PATCH 349/352] Fix an issue where TextureConverter.cpp was creating
 a renderbuffer with the wrong format. Also a few minor shader issues where
 they were using integers in place of floats.

---
 Source/Plugins/Plugin_VideoOGL/Src/Render.cpp           | 4 ++--
 Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index 74a3033efe..639deecf22 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -631,8 +631,8 @@ void Renderer::Init()
 		"ATTRIN vec3 color0;\n"
 		"VARYOUT vec4 c;\n"
 		"void main(void) {\n"
-		"	gl_Position = vec4(rawpos,0,1);\n"
-		"	c = vec4(color0, 1.0);\n"
+		"	gl_Position = vec4(rawpos, 0.0f, 1.0f);\n"
+		"	c = vec4(color0, 1.0f);\n"
 		"}\n",
 		"VARYIN vec4 c;\n"
 		"COLOROUT(ocol0)\n"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
index d3e73b177b..0ceac2d283 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
@@ -59,7 +59,7 @@ static const char *VProgram =
 	"void main()\n"
 	"{\n"
 	"	uv0 = tex0;\n"
-	"	gl_Position = vec4(rawpos,0,1);\n"
+	"	gl_Position = vec4(rawpos, 0.0f, 1.0f);\n"
 	"}\n";
 
 void CreatePrograms()
@@ -162,7 +162,7 @@ void Init()
 	glGenRenderbuffers(1, &s_dstRenderBuffer);
 	glBindRenderbuffer(GL_RENDERBUFFER, s_dstRenderBuffer);
 	
-	glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA, renderBufferWidth, renderBufferHeight);
+	glRenderbufferStorage(GL_RENDERBUFFER, GLRENDERBUFFERFORMAT, renderBufferWidth, renderBufferHeight);
 
 	s_srcTextureWidth = 0;
 	s_srcTextureHeight = 0;

From bc58e7f42fe0039aff4317bf58a1b62900a16833 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@Gmail.com>
Date: Thu, 25 Jul 2013 18:45:40 +0000
Subject: [PATCH 350/352] [Android] Use equals to compare GL version string
 instead of contains. This should really be some sort of sscanf check so we
 can check if version > 3.0 but we'll worry about that when OpenGL ES 4.0 is
 released.

---
 Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java
index 08ed852cdc..35e6816684 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java
@@ -101,7 +101,7 @@ public class PrefsFragment extends PreferenceFragment {
 
 		boolean mSupportsGLES3 = false;
 
-		if (m_GLVersion.contains("OpenGL ES 3.0")) // 3.0 support
+		if (m_GLVersion.equals("OpenGL ES 3.0")) // 3.0 support
 			mSupportsGLES3 = true;
 		if (!mSupportsGLES3 && m_GLVendor.equals("Qualcomm"))
 		{

From 4deea2bcae93aa62a95c08fe396a4f93a64ec6bc Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@Gmail.com>
Date: Thu, 25 Jul 2013 19:35:01 +0000
Subject: [PATCH 351/352] Revert "[Android] Use equals to compare GL version
 string instead of contains. This should really be some sort of sscanf check
 so we can check if version > 3.0 but we'll worry about that when OpenGL ES
 4.0 is released."

This reverts commit bc58e7f42fe0039aff4317bf58a1b62900a16833.
---
 Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java
index 35e6816684..08ed852cdc 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java
@@ -101,7 +101,7 @@ public class PrefsFragment extends PreferenceFragment {
 
 		boolean mSupportsGLES3 = false;
 
-		if (m_GLVersion.equals("OpenGL ES 3.0")) // 3.0 support
+		if (m_GLVersion.contains("OpenGL ES 3.0")) // 3.0 support
 			mSupportsGLES3 = true;
 		if (!mSupportsGLES3 && m_GLVendor.equals("Qualcomm"))
 		{

From bff2bc1288fa4309e1b2aef1486845ba01311100 Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Thu, 25 Jul 2013 16:43:00 -0400
Subject: [PATCH 352/352] Clear patches on shutdown.

Fixes issue 6434.
---
 Source/Core/Core/Src/Core.cpp        | 3 +++
 Source/Core/Core/Src/PatchEngine.cpp | 5 +++++
 Source/Core/Core/Src/PatchEngine.h   | 1 +
 3 files changed, 9 insertions(+)

diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index e6ef8d5703..0aaa1a89d3 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -56,6 +56,7 @@
 
 #include "State.h"
 #include "Movie.h"
+#include "PatchEngine.h"
 
 // TODO: ugly, remove
 bool g_aspect_wide;
@@ -278,6 +279,8 @@ void Stop()  // - Hammertime!
 
 	INFO_LOG(CONSOLE, "Stop [Main Thread]\t\t---- Shutdown complete ----");
 	Movie::Shutdown();
+	PatchEngine::Shutdown();
+
 	g_bStopping = false;
 }
 
diff --git a/Source/Core/Core/Src/PatchEngine.cpp b/Source/Core/Core/Src/PatchEngine.cpp
index ad990d8fed..2221fe456f 100644
--- a/Source/Core/Core/Src/PatchEngine.cpp
+++ b/Source/Core/Core/Src/PatchEngine.cpp
@@ -211,4 +211,9 @@ void ApplyARPatches()
 	ActionReplay::RunAllActive();
 }
 
+void Shutdown()
+{
+	onFrame.clear();
+}
+
 }  // namespace
diff --git a/Source/Core/Core/Src/PatchEngine.h b/Source/Core/Core/Src/PatchEngine.h
index 700f311b7c..87b3e8c901 100644
--- a/Source/Core/Core/Src/PatchEngine.h
+++ b/Source/Core/Core/Src/PatchEngine.h
@@ -40,6 +40,7 @@ void LoadPatchSection(const char *section, std::vector<Patch> &patches, IniFile
 void LoadPatches(const char *gameID);
 void ApplyFramePatches();
 void ApplyARPatches();
+void Shutdown();
 
 inline int GetPatchTypeCharLength(PatchType type)
 {