ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unused 'About Box' references on Linux and Windows from SPU2-X/CMakeLists, ect.

This commit is contained in:
Christian Kenny 2017-06-12 20:49:00 -04:00 committed by Jonathan Li
parent 168402217f
commit a5db116d00
13 changed files with 1 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/include/PS2Edefs.h
View File

@ -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

BIN
plugins/spu2-x/spu2-x.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 88 KiB

1
plugins/spu2-x/src/CMakeLists.txt
View File

@ -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

1
plugins/spu2-x/src/Config.h
View File

@ -100,4 +100,3 @@ extern void ApplySettings(soundtouch::SoundTouch &sndtouch);
extern void ReadSettings();
extern void WriteSettings();
extern void configure();
extern void AboutBox();

23
plugins/spu2-x/src/Linux/AboutBox.cpp
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
#include "Dialogs.h"
void AboutBox()
{
SysMessage("Yay: Aboutbox.");
}

1
plugins/spu2-x/src/Linux/Config.h
View File

@ -97,7 +97,6 @@ void DisplayDialog();
void ReadSettings();
void WriteSettings();
void configure();
void AboutBox();
extern wxFileConfig *spuConfig;
extern bool pathSet;
extern void initIni();

6
plugins/spu2-x/src/PS2E-spu2.cpp
View File

@ -152,12 +152,6 @@ SPU2configure()
configure();
}
EXPORT_C_(void)
SPU2about()
{
AboutBox();
}
EXPORT_C_(s32)
SPU2test()
{

66
plugins/spu2-x/src/Windows/AboutBox.cpp
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
#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);
}

1
plugins/spu2-x/src/Windows/Spu2-X.def
View File

@ -31,7 +31,6 @@ EXPORTS
SPU2configure @9
SPU2test @10
SPU2about @11
SPU2freeze @12
SPU2setSettingsDir @13

28
plugins/spu2-x/src/Windows/Spu2-X.rc
View File

@ -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"
/////////////////////////////////////////////////////////////////////////////

3
plugins/spu2-x/src/Windows/Spu2-X.vcxproj
View File

@ -136,7 +136,6 @@
<ClCompile Include="..\Linux\Dialogs.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="AboutBox.cpp" />
<ClCompile Include="CfgHelpers.cpp" />
<ClCompile Include="Config.cpp" />
<ClCompile Include="ConfigDebug.cpp" />
@ -148,9 +147,7 @@
<ItemGroup>
<None Include="..\..\LGPL.txt" />
<None Include="..\..\License.txt" />
<None Include="..\..\Website.txt" />
<None Include="..\..\spu2-x-sm.bmp" />
<None Include="..\..\spu2-x.bmp" />
<None Include="SndOut_XAudio2.inl" />
<None Include="Spu2-X.def" />
</ItemGroup>

11
plugins/spu2-x/src/Windows/Spu2-X.vcxproj.filters
View File

@ -186,9 +186,6 @@
<ClCompile Include="..\Linux\Dialogs.cpp">
<Filter>Source Files\GUI\Linux</Filter>
</ClCompile>
<ClCompile Include="AboutBox.cpp">
<Filter>Source Files\GUI\Windows</Filter>
</ClCompile>
<ClCompile Include="CfgHelpers.cpp">
<Filter>Source Files\GUI\Windows</Filter>
</ClCompile>
@ -224,15 +221,9 @@
<None Include="..\..\License.txt">
<Filter>Documents</Filter>
</None>
<None Include="..\..\Website.txt">
<Filter>Documents</Filter>
</None>
<None Include="..\..\spu2-x-sm.bmp">
<Filter>Resources</Filter>
</None>
<None Include="..\..\spu2-x.bmp">
<Filter>Resources</Filter>
</None>
<None Include="Spu2-X.def">
<Filter>Resources</Filter>
</None>
@ -245,4 +236,4 @@
<Filter>Resources</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
</Project>

5
plugins/spu2-x/src/Windows/resource.h
View File

@ -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