Merge pull request hrydgard#968 from sum2012/patch2

Add UI of windows of using Media Engine
Nementon · Mar 12, 2013 · a3ae8d3 · a3ae8d3
2 parents 671818e + 15e6fda
commit a3ae8d3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
@@ -427,6 +427,11 @@ namespace MainWindow
 				UpdateMenus();
 				break;
 
+			case ID_OPTIONS_USEMEDIAENGINE:
+				g_Config.bUseMediaEngine = !g_Config.bUseMediaEngine;
+				UpdateMenus();
+				break;
+
 			case ID_FILE_EXIT:
 				DestroyWindow(hWnd);
 				break;
@@ -685,6 +690,7 @@ namespace MainWindow
 		CHECKITEM(ID_OPTIONS_VERTEXCACHE, g_Config.bVertexCache);
 		CHECKITEM(ID_OPTIONS_SHOWFPS, g_Config.bShowFPSCounter);
 		CHECKITEM(ID_OPTIONS_FRAMESKIP, g_Config.iFrameSkip != 0);
+		CHECKITEM(ID_OPTIONS_USEMEDIAENGINE, g_Config.bUseMediaEngine);
 
 		UINT enable = !Core_IsStepping() ? MF_GRAYED : MF_ENABLED;
 		EnableMenuItem(menu,ID_EMULATION_RUN, g_State.bEmuThreadStarted ? enable : MF_GRAYED);

diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
diff --git a/Windows/resource.h b/Windows/resource.h
@@ -263,6 +263,7 @@
 #define ID_OPTIONS_STRETCHDISPLAY       40138
 #define ID_OPTIONS_FRAMESKIP            40139
 #define IDC_MEMCHECK                    40140
+#define ID_OPTIONS_USEMEDIAENGINE       40141
 #define IDC_STATIC                      -1
 
 // Next default values for new objects