From 229c0f16ab8a353184d9be6517ffb255d0e446b9 Mon Sep 17 00:00:00 2001
From: The Dax <daxtsu@gmail.com>
Date: Sat, 17 Aug 2013 07:37:34 -0400
Subject: [PATCH] Eliminate most of the popup menus as per Henrik's request,
 and fix a minor bug with AT3+ in NewUI.

---
 UI/GameSettingsScreen.cpp |   8 +++++++-
 Windows/WndMainWindow.cpp |   7 +++++++
 Windows/WndMainWindow.h   |   1 +
 Windows/ppsspp.rc         | Bin 42720 -> 42446 bytes
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 9f7813108f..cefacc2ffd 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -38,7 +38,10 @@
 
 #ifdef _WIN32
 namespace MainWindow {
-	enum { WM_USER_LOG_STATUS_CHANGED = WM_USER + 200 };
+	enum { 
+		WM_USER_LOG_STATUS_CHANGED = WM_USER + 200,
+		WM_USER_ATRAC_STATUS_CHANGED = WM_USER + 300,
+	};
 	extern HWND hwndMain;
 }
 #endif
@@ -345,6 +348,9 @@ UI::EventReturn GameSettingsScreen::OnBack(UI::EventParams &e) {
 		else Atrac3plus_Decoder::Shutdown();
 	}
 	
+#ifdef _WIN32
+	PostMessage(MainWindow::hwndMain, MainWindow::WM_USER_ATRAC_STATUS_CHANGED, 0, 0);
+#endif
 
 	return UI::EVENT_DONE;
 }
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index d416587bdd..616566dcfb 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -1202,6 +1202,13 @@ namespace MainWindow
 			}
 			break;
 
+		case WM_USER_ATRAC_STATUS_CHANGED:
+			if(g_Config.bEnableAtrac3plus && Atrac3plus_Decoder::IsInstalled())
+				EnableMenuItem(menu, ID_EMULATION_ATRAC3_SOUND, MF_ENABLED);
+			else
+				EnableMenuItem(menu, ID_EMULATION_ATRAC3_SOUND, MF_GRAYED);
+			break;
+
 		case WM_MENUSELECT:
 			// Unfortunately, accelerate keys (hotkeys) shares the same enabled/disabled states
 			// with corresponding menu items.
diff --git a/Windows/WndMainWindow.h b/Windows/WndMainWindow.h
index 3767777857..7f6e5d3394 100644
--- a/Windows/WndMainWindow.h
+++ b/Windows/WndMainWindow.h
@@ -10,6 +10,7 @@ namespace MainWindow
 	enum {
 		WM_USER_SAVESTATE_FINISH = WM_USER + 100,
 		WM_USER_LOG_STATUS_CHANGED = WM_USER + 200,
+		WM_USER_ATRAC_STATUS_CHANGED = WM_USER + 300,
 	};
 
 	enum {
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index 1b26878c735e9f849597d3659c44f8947742ffd4..0dfe0d401267633217383a4af232c7c4d797a32a 100644
GIT binary patch
delta 74
zcmaEGmg(GSrVVKslcg4jO+J*71*Tmx^CqWd+f2T-Kx}eIRuh<hmz4z<+ma(QSuZCK
OEWRaY+2)Mg3QGVf6C+dr

delta 122
zcmX?in(4t=rVVKslf!cOID;AT8A=)Q7*Zye<~UET%E*~)mn$~;S4P3)FS%lq-{l)j
z4$2W?b!G@)2nDOymDw`+R=vdJkgP0Z6_fe0B_<c-cubzq!7^DWy8~<rh`lL$$>eW!
KGMiI!vMd1zGcyPP