diff --git a/common/include/PS2Edefs.h b/common/include/PS2Edefs.h index cebcf1b2e0..e3dcc06000 100644 --- a/common/include/PS2Edefs.h +++ b/common/include/PS2Edefs.h @@ -392,7 +392,6 @@ void CALLBACK SPU2setTimeStretcher(short int enable); void CALLBACK SPU2async(u32 cycles); s32 CALLBACK SPU2freeze(int mode, freezeData *data); void CALLBACK SPU2configure(); -void CALLBACK SPU2about(); s32 CALLBACK SPU2test(); #endif diff --git a/plugins/spu2-x/spu2-x.bmp b/plugins/spu2-x/spu2-x.bmp deleted file mode 100644 index c97a5b5a1b..0000000000 Binary files a/plugins/spu2-x/spu2-x.bmp and /dev/null differ diff --git a/plugins/spu2-x/src/CMakeLists.txt b/plugins/spu2-x/src/CMakeLists.txt index 628307ddce..8a683568b2 100644 --- a/plugins/spu2-x/src/CMakeLists.txt +++ b/plugins/spu2-x/src/CMakeLists.txt @@ -89,7 +89,6 @@ if(Windows) include_directories("Windows") else() LIST(APPEND spu2xSources - Linux/AboutBox.cpp Linux/Alsa.cpp Linux/CfgHelpers.cpp Linux/Config.cpp diff --git a/plugins/spu2-x/src/Config.h b/plugins/spu2-x/src/Config.h index 44afa0012d..e6eaa2b190 100644 --- a/plugins/spu2-x/src/Config.h +++ b/plugins/spu2-x/src/Config.h @@ -100,4 +100,3 @@ extern void ApplySettings(soundtouch::SoundTouch &sndtouch); extern void ReadSettings(); extern void WriteSettings(); extern void configure(); -extern void AboutBox(); diff --git a/plugins/spu2-x/src/Linux/AboutBox.cpp b/plugins/spu2-x/src/Linux/AboutBox.cpp deleted file mode 100644 index a425a74967..0000000000 --- a/plugins/spu2-x/src/Linux/AboutBox.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* SPU2-X, A plugin for Emulating the Sound Processing Unit of the Playstation 2 - * Developed and maintained by the Pcsx2 Development Team. - * - * Original portions from SPU2ghz are (c) 2008 by David Quintana [gigaherz] - * - * SPU2-X 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 Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * SPU2-X 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 SPU2-X. If not, see . - */ - -#include "Dialogs.h" - -void AboutBox() -{ - SysMessage("Yay: Aboutbox."); -} diff --git a/plugins/spu2-x/src/Linux/Config.h b/plugins/spu2-x/src/Linux/Config.h index 211a0727af..54f2310a04 100644 --- a/plugins/spu2-x/src/Linux/Config.h +++ b/plugins/spu2-x/src/Linux/Config.h @@ -97,7 +97,6 @@ void DisplayDialog(); void ReadSettings(); void WriteSettings(); void configure(); -void AboutBox(); extern wxFileConfig *spuConfig; extern bool pathSet; extern void initIni(); diff --git a/plugins/spu2-x/src/PS2E-spu2.cpp b/plugins/spu2-x/src/PS2E-spu2.cpp index 861875a76d..6fbb0d4916 100644 --- a/plugins/spu2-x/src/PS2E-spu2.cpp +++ b/plugins/spu2-x/src/PS2E-spu2.cpp @@ -152,12 +152,6 @@ SPU2configure() configure(); } -EXPORT_C_(void) -SPU2about() -{ - AboutBox(); -} - EXPORT_C_(s32) SPU2test() { diff --git a/plugins/spu2-x/src/Windows/AboutBox.cpp b/plugins/spu2-x/src/Windows/AboutBox.cpp deleted file mode 100644 index f45c5707fb..0000000000 --- a/plugins/spu2-x/src/Windows/AboutBox.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/* SPU2-X, A plugin for Emulating the Sound Processing Unit of the Playstation 2 - * Developed and maintained by the Pcsx2 Development Team. - * - * Original portions from SPU2ghz are (c) 2008 by David Quintana [gigaherz] - * - * SPU2-X 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 Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * SPU2-X 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 SPU2-X. If not, see . - */ - -#include "Global.h" -#include "Dialogs.h" - -#include "svnrev.h" - -static LRESULT WINAPI AboutProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - switch (uMsg) { - case WM_INITDIALOG: { - wchar_t outstr[256]; - if (IsDevBuild) - swprintf_s(outstr, L"Build %lld -- Compiled on " _T(__DATE__), SVN_REV); - else - swprintf_s(outstr, L"Release v%d.%d -- Compiled on " _T(__DATE__), - VersionInfo::Release, VersionInfo::Revision); - - SetWindowText(GetDlgItem(hDlg, IDC_LABEL_VERSION_INFO), outstr); - ShowWindow(hDlg, true); - } - return TRUE; - - case WM_COMMAND: - switch (LOWORD(wParam)) { - case IDOK: - EndDialog(hDlg, TRUE); - return TRUE; - - case IDC_LINK_WEBSITE: - ShellExecute(hDlg, L"open", L"http://www.pcsx2.net/", - NULL, NULL, SW_SHOWNORMAL); - return TRUE; - - case IDC_LINK_GOOGLECODE: - ShellExecute(hDlg, L"open", L"https://github.com/PCSX2/pcsx2", - NULL, NULL, SW_SHOWNORMAL); - return TRUE; - } - break; - - default: - return FALSE; - } - return TRUE; -} - -void AboutBox() -{ - DialogBox(hInstance, MAKEINTRESOURCE(IDD_ABOUT), GetActiveWindow(), (DLGPROC)AboutProc); -} diff --git a/plugins/spu2-x/src/Windows/Spu2-X.def b/plugins/spu2-x/src/Windows/Spu2-X.def index 8f9cc18b3a..4896eba2ca 100644 --- a/plugins/spu2-x/src/Windows/Spu2-X.def +++ b/plugins/spu2-x/src/Windows/Spu2-X.def @@ -31,7 +31,6 @@ EXPORTS SPU2configure @9 SPU2test @10 - SPU2about @11 SPU2freeze @12 SPU2setSettingsDir @13 diff --git a/plugins/spu2-x/src/Windows/Spu2-X.rc b/plugins/spu2-x/src/Windows/Spu2-X.rc index 87bb2f3c2c..fa92373b62 100644 --- a/plugins/spu2-x/src/Windows/Spu2-X.rc +++ b/plugins/spu2-x/src/Windows/Spu2-X.rc @@ -24,24 +24,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Dialog // -IDD_ABOUT DIALOGEX 0, 0, 291, 223 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About SPU2-X" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "I've Seen Enough",IDOK,91,204,111,14 - CTEXT "Original portions from SPU2ghz are (c) 2008 by David Quintana [gigaherz]",IDC_STATIC,9,184,273,11 - CONTROL 114,IDC_STATIC,"Static",SS_BITMAP,45,5,203,64,WS_EX_CLIENTEDGE - CTEXT "A Sound Processing Unit 2 plugin for Playstation 2 emulators.",IDC_STATIC,9,71,273,10 - CTEXT "For updates and news, visit the following links:",IDC_STATIC,9,98,273,10 - CTEXT "The SPU2-X project is derived from SPU2ghz v1.9beta released in 2008 and later modified and upgraded by the Pcsx2 Playground Team.",IDC_STATIC,25,161,242,17 - CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME,20,157,252,41 - CTEXT "Compile Date, Revision, Etc.",IDC_LABEL_VERSION_INFO,9,80,273,17 - CTEXT "Pcsx2 Official Git Repository @ GitHub",IDC_LINK_GOOGLECODE,9,121,273,10,SS_NOPREFIX | SS_NOTIFY - CTEXT "Pcsx2 Official Website and Forums",IDC_LINK_WEBSITE,9,110,273,10,SS_NOPREFIX | SS_NOTIFY - CTEXT "Brought to you by the collaborative efforts of the Pcsx2 Development Team.",IDC_STATIC,9,141,273,10 -END - IDD_CONFIG DIALOGEX 0, 0, 319, 302 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "SPU2-X Settings" @@ -70,7 +52,6 @@ BEGIN GROUPBOX "",IDC_STATIC,6,143,129,46 LTEXT "Audio Expansion Mode:",IDC_STATIC,161,176,135,9,NOT WS_GROUP COMBOBOX IDC_SPEAKERS,163,185,135,84,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "WIP - XAudio2 Only",IDC_STATIC,161,204,135,9,NOT WS_GROUP CONTROL "Synchronizing Mode:",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,161,116,131,8 COMBOBOX IDC_SYNCHMODE,163,125,134,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Volume:",IDC_STATIC,192,59,26,8,NOT WS_GROUP @@ -196,14 +177,6 @@ END #ifdef APSTUDIO_INVOKED GUIDELINES DESIGNINFO BEGIN - IDD_ABOUT, DIALOG - BEGIN - LEFTMARGIN, 9 - RIGHTMARGIN, 282 - TOPMARGIN, 5 - BOTTOMMARGIN, 218 - END - IDD_CONFIG, DIALOG BEGIN LEFTMARGIN, 6 @@ -270,7 +243,6 @@ END // Bitmap // -IDB_SPU2X BITMAP "..\\..\\spu2-x.bmp" IDB_SPU2X_SMALL BITMAP "..\\..\\spu2-x-sm.bmp" ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/spu2-x/src/Windows/Spu2-X.vcxproj b/plugins/spu2-x/src/Windows/Spu2-X.vcxproj index be9495af44..a3a1f940f9 100644 --- a/plugins/spu2-x/src/Windows/Spu2-X.vcxproj +++ b/plugins/spu2-x/src/Windows/Spu2-X.vcxproj @@ -136,7 +136,6 @@ true - @@ -148,9 +147,7 @@ - - diff --git a/plugins/spu2-x/src/Windows/Spu2-X.vcxproj.filters b/plugins/spu2-x/src/Windows/Spu2-X.vcxproj.filters index a3b486d926..63006174a7 100644 --- a/plugins/spu2-x/src/Windows/Spu2-X.vcxproj.filters +++ b/plugins/spu2-x/src/Windows/Spu2-X.vcxproj.filters @@ -186,9 +186,6 @@ Source Files\GUI\Linux - - Source Files\GUI\Windows - Source Files\GUI\Windows @@ -224,15 +221,9 @@ Documents - - Documents - Resources - - Resources - Resources @@ -245,4 +236,4 @@ Resources - + \ No newline at end of file diff --git a/plugins/spu2-x/src/Windows/resource.h b/plugins/spu2-x/src/Windows/resource.h index 2a98b88d16..8f4c4a2ad1 100644 --- a/plugins/spu2-x/src/Windows/resource.h +++ b/plugins/spu2-x/src/Windows/resource.h @@ -6,9 +6,7 @@ #define IDD_DEBUG 105 #define IDD_DSOUND 106 #define IDD_WAVEOUT 109 -#define IDD_ABOUT 110 #define IDD_XAUDIO2 111 -#define IDB_SPU2X 114 #define IDB_SPU2X_SMALL 116 #define IDD_CONFIG_SOUNDTOUCH 117 #define IDD_CONFIG_DEBUG 118 @@ -46,9 +44,6 @@ #define IDC_OVERLAP_SLIDER 1045 #define IDC_MSG_PUBLIC_BUILD 1048 #define IDC_XA2_TRIBLE_BUFFER 1050 -#define IDC_LABEL_VERSION_INFO 1054 -#define IDC_LINK_WEBSITE 1055 -#define IDC_LINK_GOOGLECODE 1056 #define IDC_RESET_DEFAULTS 1057 #define IDC_OPEN_CONFIG_SOUNDTOUCH 1058 #define IDC_OPEN_CONFIG_DEBUG 1059