From c36c26800b9f2f0042719e4bd49f6f4a2b58a869 Mon Sep 17 00:00:00 2001
From: Gauvain 'GovanifY' Roussel-Tarbouriech <gauvain@govanify.com>
Date: Sat, 26 Sep 2020 16:26:38 +0200
Subject: [PATCH] SPU2: remove logo from config

---
 pcsx2/SPU2/Windows/Config.cpp |  6 ++++-
 pcsx2/SPU2/Windows/SPU2.rc    | 44 ++---------------------------------
 pcsx2/SPU2/Windows/resource.h |  1 -
 3 files changed, 7 insertions(+), 44 deletions(-)

diff --git a/pcsx2/SPU2/Windows/Config.cpp b/pcsx2/SPU2/Windows/Config.cpp
index 7324dd8131..74729bc91a 100644
--- a/pcsx2/SPU2/Windows/Config.cpp
+++ b/pcsx2/SPU2/Windows/Config.cpp
@@ -141,6 +141,7 @@ void ReadSettings()
 	Config_WaveOut.NumBuffers = CfgReadInt(L"WAVEOUT", L"Buffer_Count", 4);
 
 	DSoundOut->ReadSettings();
+	PortaudioOut->ReadSettings();
 
 	SoundtouchCfg::ReadSettings();
 	DebugConfig::ReadSettings();
@@ -195,6 +196,7 @@ void WriteSettings()
 	CfgWriteInt(L"DSP PLUGIN", L"ModuleNum", dspPluginModule);
 	CfgWriteBool(L"DSP PLUGIN", L"Enabled", dspPluginEnabled);
 
+ 	PortaudioOut->WriteSettings();
 	DSoundOut->WriteSettings();
 	SoundtouchCfg::WriteSettings();
 	DebugConfig::WriteSettings();
@@ -204,11 +206,13 @@ void CheckOutputModule(HWND window)
 {
 	OutputModule = SendMessage(GetDlgItem(window, IDC_OUTPUT), CB_GETCURSEL, 0, 0);
 	const bool IsConfigurable =
+		mods[OutputModule] == PortaudioOut ||
 		mods[OutputModule] == WaveOut ||
 		mods[OutputModule] == DSoundOut;
 
 	const bool AudioExpansion =
-		mods[OutputModule] == XAudio2Out;
+		mods[OutputModule] == XAudio2Out || 
+		mods[OutputModule] == PortaudioOut;
 
 	EnableWindow(GetDlgItem(window, IDC_OUTCONF), IsConfigurable);
 	EnableWindow(GetDlgItem(window, IDC_SPEAKERS), AudioExpansion);
diff --git a/pcsx2/SPU2/Windows/SPU2.rc b/pcsx2/SPU2/Windows/SPU2.rc
index e37f003035..6975f547e0 100644
--- a/pcsx2/SPU2/Windows/SPU2.rc
+++ b/pcsx2/SPU2/Windows/SPU2.rc
@@ -24,7 +24,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 IDD_CONFIG DIALOGEX 0, 0, 310, 260
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "SPU2 Settings"
 FONT 8, "MS Shell Dlg", 400, 0, 0x0
 BEGIN
@@ -40,7 +40,6 @@ BEGIN
     GROUPBOX        "",IDC_STATIC,6,123,145,45
     CHECKBOX        "Enable Debug Options",IDC_DEBUG_ENABLE,14,135,118,10,NOT WS_TABSTOP
     PUSHBUTTON      "Configure...",IDC_OPEN_CONFIG_DEBUG,14,147,52,13
-    CONTROL         116,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZECONTROL,6,175,145,55,WS_EX_CLIENTEDGE
     GROUPBOX        "Output Settings",IDC_STATIC,157,5,145,225
     LTEXT           "Module:",IDC_STATIC,163,16,50,9,NOT WS_GROUP
     COMBOBOX        IDC_OUTPUT,165,26,129,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -103,7 +102,7 @@ BEGIN
 END
 
 IDD_CONFIG_SOUNDTOUCH DIALOGEX 0, 0, 206, 223
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Soundtouch Advanced Configuration - SPU2"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
@@ -214,45 +213,6 @@ BEGIN
 END
 #endif    // APSTUDIO_INVOKED
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,4851
- PRODUCTVERSION 2,0,0,4851
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "SPU2 Plugin for PS2 Emulators"
-            VALUE "CompanyName", "PCSX2 Dev Team"
-            VALUE "FileDescription", "SPU2 Plugin (git build)"
-            VALUE "FileVersion", "2.0.GIT"
-            VALUE "InternalName", "SPU2"
-            VALUE "LegalCopyright", "Copyright (C) 2011"
-            VALUE "OriginalFilename", "SPU2-2.0.dll"
-            VALUE "ProductName", "SPU2"
-            VALUE "ProductVersion", "2.0.GIT"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
 #endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/pcsx2/SPU2/Windows/resource.h b/pcsx2/SPU2/Windows/resource.h
index 7a3e471117..141c372e1f 100644
--- a/pcsx2/SPU2/Windows/resource.h
+++ b/pcsx2/SPU2/Windows/resource.h
@@ -5,7 +5,6 @@
 #define IDD_DEBUG 105
 #define IDD_DSOUND 106
 #define IDD_WAVEOUT 109
-#define IDB_SPU2X_SMALL 116
 #define IDD_CONFIG_SOUNDTOUCH 117
 #define IDD_CONFIG_DEBUG 118
 #define IDD_PORTAUDIO 119