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

SPU2: windows config and s/SPU2-X/SPU-2/g

This commit is contained in:
GovanifY 2020-09-26 02:55:03 +02:00 committed by refractionpcsx2
parent 7ec2eb050b
commit a3a530adf6
22 changed files with 93 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcsx2/SPU2/Dma.cpp
View File

@ -138,7 +138,7 @@ void V_Core::StartADMAWrite(u16* pMem, u32 sz)
int size = (sz) & (~511);
if (MsgAutoDMA())
ConLog("* SPU2-X: DMA%c AutoDMA Transfer of %d bytes to %x (%02x %x %04x).\n",
ConLog("* SPU-2: DMA%c AutoDMA Transfer of %d bytes to %x (%02x %x %04x).\n",
GetDmaIndexChar(), size << 1, TSA, DMABits, AutoDMACtrl, (~Regs.ATTR) & 0x7fff);
InputDataProgress = 0;
@ -245,7 +245,7 @@ void V_Core::PlainDMAWrite(u16* pMem, u32 size)
cacheLine++;
} while (cacheLine != &cacheEnd);
//ConLog( "* SPU2-X: Cache Clear Range! TSA=0x%x, TDA=0x%x (low8=0x%x, high8=0x%x, len=0x%x)\n",
//ConLog( "* SPU-2: Cache Clear Range! TSA=0x%x, TDA=0x%x (low8=0x%x, high8=0x%x, len=0x%x)\n",
// TSA, buff1end, flagTSA, flagTDA, clearLen );
@ -426,7 +426,7 @@ void V_Core::DoDMAwrite(u16* pMem, u32 size)
{
if (TSA > 0xfffff)
{
ConLog("* SPU2-X: Transfer Start Address out of bounds. TSA is %x\n", TSA);
ConLog("* SPU-2: Transfer Start Address out of bounds. TSA is %x\n", TSA);
}
}
@ -442,7 +442,7 @@ void V_Core::DoDMAwrite(u16* pMem, u32 size)
else
{
if (MsgDMA())
ConLog("* SPU2-X: DMA%c Transfer of %d bytes to %x (%02x %x %04x). IRQE = %d IRQA = %x \n",
ConLog("* SPU-2: DMA%c Transfer of %d bytes to %x (%02x %x %04x). IRQE = %d IRQA = %x \n",
GetDmaIndexChar(), size << 1, TSA, DMABits, AutoDMACtrl, (~Regs.ATTR) & 0x7fff,
Cores[0].IRQEnable, Cores[0].IRQA);

12
pcsx2/SPU2/Linux/Alsa.cpp
View File

@ -44,7 +44,7 @@ protected:
void _InternalCallback()
{
snd_pcm_sframes_t avail;
fprintf(stderr, "* SPU2-X:Iz in your internal callback.\n");
fprintf(stderr, "* SPU-2:Iz in your internal callback.\n");
avail = snd_pcm_avail_update(handle);
while (avail >= (int)period_time)
@ -64,7 +64,7 @@ protected:
// entry point for our C++ified object state. :)
static void ExternalCallback(snd_async_handler_t* pcm_call)
{
fprintf(stderr, "* SPU2-X:Iz in your external callback.\n");
fprintf(stderr, "* SPU-2:Iz in your external callback.\n");
AlsaMod* data = (AlsaMod*)snd_async_handler_get_callback_private(pcm_call);
pxAssume(data != NULL);
@ -73,7 +73,7 @@ protected:
// Not sure if we just need an assert, or something like this:
if (data->handle != snd_async_handler_get_pcm(pcm_call))
{
fprintf(stderr, "* SPU2-X: Failed to handle sound.\n");
fprintf(stderr, "* SPU-2: Failed to handle sound.\n");
return;
}
@ -83,7 +83,7 @@ protected:
public:
s32 Init()
{
//fprintf(stderr,"* SPU2-X: Initing Alsa\n");
//fprintf(stderr,"* SPU-2: Initing Alsa\n");
snd_pcm_hw_params_t* hwparams;
snd_pcm_sw_params_t* swparams;
snd_pcm_status_t* status;
@ -186,7 +186,7 @@ public:
if (handle == NULL)
fprintf(stderr, "No handle.");
//fprintf(stderr,"* SPU2-X:Iz setting your internal callback.\n");
//fprintf(stderr,"* SPU-2:Iz setting your internal callback.\n");
// The external handler never seems to get called after this.
snd_async_add_pcm_handler(&pcm_callback, handle, ExternalCallback, this);
err = snd_pcm_start(handle);
@ -204,7 +204,7 @@ public:
void Close()
{
//fprintf(stderr,"* SPU2-X: Closing Alsa\n");
//fprintf(stderr,"* SPU-2: Closing Alsa\n");
if (handle == NULL)
return;

4
pcsx2/SPU2/Linux/Config.cpp
View File

@ -171,8 +171,8 @@ void ReadSettings()
if (mods[OutputModule] == nullptr)
{
fwprintf(stderr, L"* SPU2-X: Unknown output module '%s' specified in configuration file.\n", temp.wc_str());
fprintf(stderr, "* SPU2-X: Defaulting to SDL (%S).\n", SDLOut->GetIdent());
fwprintf(stderr, L"* SPU-2: Unknown output module '%s' specified in configuration file.\n", temp.wc_str());
fprintf(stderr, "* SPU-2: Defaulting to SDL (%S).\n", SDLOut->GetIdent());
OutputModule = FindOutputModuleById(SDLOut->GetIdent());
}

2
pcsx2/SPU2/Linux/ConfigDebug.cpp
View File

@ -35,7 +35,7 @@ bool _CoresDump = false;
bool _MemDump = false;
bool _RegDump = false;
// this is set true if PCSX2 invokes the SetLogDir callback, which tells SPU2-X to use that over
// this is set true if PCSX2 invokes the SetLogDir callback, which tells SPU-2 to use that over
// the configured crap in the ini file.
static bool LogLocationSetByPcsx2 = false;

8
pcsx2/SPU2/Mixer.cpp
View File

@ -82,7 +82,7 @@ static void __forceinline XA_decode_block(s16* buffer, const s16* block, s32& pr
const s32 shift = (header & 0xF) + 16;
const int id = header >> 4 & 0xF;
if (id > 4 && MsgToConsole())
ConLog("* SPU2-X: Unknown ADPCM coefficients table id %d\n", id);
ConLog("* SPU-2: Unknown ADPCM coefficients table id %d\n", id);
const s32 pred1 = tbl_XA_Factor[id][0];
const s32 pred2 = tbl_XA_Factor[id][1];
@ -169,7 +169,7 @@ static __forceinline s32 GetNextDataBuffered(V_Core& thiscore, uint voiceidx)
if (IsDevBuild)
{
if (MsgVoiceOff())
ConLog("* SPU2-X: Voice Off by EndPoint: %d \n", voiceidx);
ConLog("* SPU-2: Voice Off by EndPoint: %d \n", voiceidx);
}
}
}
@ -206,7 +206,7 @@ static __forceinline s32 GetNextDataBuffered(V_Core& thiscore, uint voiceidx)
vc.Prev1 = vc.SBuffer[27];
vc.Prev2 = vc.SBuffer[26];
//ConLog( "* SPU2-X: Cache Hit! NextA=0x%x, cacheIdx=0x%x\n", vc.NextA, cacheIdx );
//ConLog( "* SPU-2: Cache Hit! NextA=0x%x, cacheIdx=0x%x\n", vc.NextA, cacheIdx );
if (IsDevBuild)
g_counter_cache_hits++;
@ -339,7 +339,7 @@ static __forceinline void CalculateADSR(V_Core& thiscore, uint voiceidx)
if (IsDevBuild)
{
if (MsgVoiceOff())
ConLog("* SPU2-X: Voice Off by ADSR: %d \n", voiceidx);
ConLog("* SPU-2: Voice Off by ADSR: %d \n", voiceidx);
}
vc.Stop();
}

16
pcsx2/SPU2/RegLog.cpp
View File

@ -144,27 +144,27 @@ void SPU2writeLog(const char* action, u32 rmem, u16 value)
break;
case 0x7c4:
if (Spdif.Unknown1 != value)
ConLog("* SPU2-X: SPDIF Unknown Register 1 set to %04x\n", value);
ConLog("* SPU-2: SPDIF Unknown Register 1 set to %04x\n", value);
RegLog(2, "SPDIF_UNKNOWN1", rmem, -1, value);
break;
case SPDIF_MODE:
if (Spdif.Mode != value)
ConLog("* SPU2-X: SPDIF Mode set to %04x\n", value);
ConLog("* SPU-2: SPDIF Mode set to %04x\n", value);
RegLog(2, "SPDIF_MODE", rmem, -1, value);
break;
case SPDIF_MEDIA:
if (Spdif.Media != value)
ConLog("* SPU2-X: SPDIF Media set to %04x\n", value);
ConLog("* SPU-2: SPDIF Media set to %04x\n", value);
RegLog(2, "SPDIF_MEDIA", rmem, -1, value);
break;
case 0x7ca:
if (Spdif.Unknown2 != value)
ConLog("* SPU2-X: SPDIF Unknown Register 2 set to %04x\n", value);
ConLog("* SPU-2: SPDIF Unknown Register 2 set to %04x\n", value);
RegLog(2, "SPDIF_UNKNOWN2", rmem, -1, value);
break;
case SPDIF_PROTECT:
if (Spdif.Protection != value)
ConLog("* SPU2-X: SPDIF Copy set to %04x\n", value);
ConLog("* SPU-2: SPDIF Copy set to %04x\n", value);
RegLog(2, "SPDIF_PROTECT", rmem, -1, value);
break;
}
@ -241,11 +241,11 @@ void SPU2writeLog(const char* action, u32 rmem, u16 value)
RegLog(2, "TSAL", rmem, core, value);
break;
case REG_S_ENDX:
//ConLog("* SPU2-X: Core %d ENDX cleared!\n",core);
//ConLog("* SPU-2: Core %d ENDX cleared!\n",core);
RegLog(2, "ENDX0", rmem, core, value);
break;
case (REG_S_ENDX + 2):
//ConLog("* SPU2-X: Core %d ENDX cleared!\n",core);
//ConLog("* SPU-2: Core %d ENDX cleared!\n",core);
RegLog(2, "ENDX1", rmem, core, value);
break;
case REG_P_MVOLL:
@ -256,7 +256,7 @@ void SPU2writeLog(const char* action, u32 rmem, u16 value)
break;
case REG_S_ADMAS:
RegLog(3, "ADMAS", rmem, core, value);
//ConLog("* SPU2-X: Core %d AutoDMAControl set to %d\n",core,value);
//ConLog("* SPU-2: Core %d AutoDMAControl set to %d\n",core,value);
break;
case REG_P_STATX:
RegLog(3, "STATX", rmem, core, value);

16
pcsx2/SPU2/SndOut_Portaudio.cpp
View File

@ -141,14 +141,14 @@ public:
PaError err = Pa_Initialize();
if (err != paNoError)
{
fprintf(stderr, "* SPU2-X: PortAudio error: %s\n", Pa_GetErrorText(err));
fprintf(stderr, "* SPU-2: PortAudio error: %s\n", Pa_GetErrorText(err));
return -1;
}
started = true;
int deviceIndex = -1;
fprintf(stderr, "* SPU2-X: Enumerating PortAudio devices:\n");
fprintf(stderr, "* SPU-2: Enumerating PortAudio devices:\n");
for (int i = 0, j = 0; i < Pa_GetDeviceCount(); i++)
{
const PaDeviceInfo* info = Pa_GetDeviceInfo(i);
@ -306,7 +306,7 @@ public:
}
if (err != paNoError)
{
fprintf(stderr, "* SPU2-X: PortAudio error: %s\n", Pa_GetErrorText(err));
fprintf(stderr, "* SPU-2: PortAudio error: %s\n", Pa_GetErrorText(err));
Pa_Terminate();
return -1;
}
@ -314,7 +314,7 @@ public:
err = Pa_StartStream(stream);
if (err != paNoError)
{
fprintf(stderr, "* SPU2-X: PortAudio error: %s\n", Pa_GetErrorText(err));
fprintf(stderr, "* SPU-2: PortAudio error: %s\n", Pa_GetErrorText(err));
Pa_CloseStream(stream);
stream = NULL;
Pa_Terminate();
@ -335,12 +335,12 @@ public:
{
err = Pa_StopStream(stream);
if (err != paNoError)
fprintf(stderr, "* SPU2-X: PortAudio error: %s\n", Pa_GetErrorText(err));
fprintf(stderr, "* SPU-2: PortAudio error: %s\n", Pa_GetErrorText(err));
}
err = Pa_CloseStream(stream);
if (err != paNoError)
fprintf(stderr, "* SPU2-X: PortAudio error: %s\n", Pa_GetErrorText(err));
fprintf(stderr, "* SPU-2: PortAudio error: %s\n", Pa_GetErrorText(err));
stream = NULL;
}
@ -348,7 +348,7 @@ public:
// Seems to do more harm than good.
//PaError err = Pa_Terminate();
//if( err != paNoError )
// fprintf(stderr,"* SPU2-X: PortAudio error: %s\n", Pa_GetErrorText( err ) );
// fprintf(stderr,"* SPU-2: PortAudio error: %s\n", Pa_GetErrorText( err ) );
started = false;
}
@ -550,7 +550,7 @@ public:
PaError err = Pa_Initialize(); // Initialization can be done multiple times, PA keeps a counter
if (err != paNoError)
{
fprintf(stderr, "* SPU2-X: PortAudio error: %s\n", Pa_GetErrorText(err));
fprintf(stderr, "* SPU-2: PortAudio error: %s\n", Pa_GetErrorText(err));
return;
}
// keep portaudio initialized until the dialog closes

8
pcsx2/SPU2/SndOut_SDL.cpp
View File

@ -89,7 +89,7 @@ struct SDLAudioMod : public SndOutModule
// Mandatory otherwise, init will be redone in SDL_OpenAudio
if (SDL_Init(SDL_INIT_AUDIO) < 0)
{
std::cerr << "SPU2-X: SDL INIT audio error: " << SDL_GetError() << std::endl;
std::cerr << "SPU-2: SDL INIT audio error: " << SDL_GetError() << std::endl;
return -1;
}
@ -101,7 +101,7 @@ struct SDLAudioMod : public SndOutModule
// Reopen the audio
if (SDL_AudioInit(m_api.c_str()) < 0)
{
std::cerr << "SPU2-X: SDL audio init error: " << SDL_GetError() << std::endl;
std::cerr << "SPU-2: SDL audio init error: " << SDL_GetError() << std::endl;
return -1;
}
}
@ -109,7 +109,7 @@ struct SDLAudioMod : public SndOutModule
if (SDL_OpenAudio(&spec, NULL) < 0)
{
std::cerr << "SPU2-X: SDL audio error: " << SDL_GetError() << std::endl;
std::cerr << "SPU-2: SDL audio error: " << SDL_GetError() << std::endl;
return -1;
}
@ -122,7 +122,7 @@ struct SDLAudioMod : public SndOutModule
buffer = std::unique_ptr<StereoOut_SDL[]>(new StereoOut_SDL[spec.samples]);
if (samples != spec.samples)
{
fprintf(stderr, "SPU2-X: SDL failed to get desired samples (%d) got %d samples instead\n", samples, spec.samples);
fprintf(stderr, "SPU-2: SDL failed to get desired samples (%d) got %d samples instead\n", samples, spec.samples);
// Samples must always be a multiple of packet size.
assert(spec.samples % SndOutPacketSize == 0);

2
pcsx2/SPU2/Timestretcher.cpp
View File

@ -380,7 +380,7 @@ void SndBuffer::UpdateTempoChangeSoundTouch()
pSoundTouch->setTempo(eTempo = (float)newTempo);
/*ConLog("* SPU2-X: [Nominal %d%%] [Emergency: %d%%] (baseTempo: %d%% ) (newTempo: %d%%) (buffer: %d%%)\n",
/*ConLog("* SPU-2: [Nominal %d%%] [Emergency: %d%%] (baseTempo: %d%% ) (newTempo: %d%%) (buffer: %d%%)\n",
//(relation < 0.0) ? "Normalize" : "",
(int)(tempoChange * 100.0 * 0.03),
(int)(emergencyAdj * 100.0),

4
pcsx2/SPU2/Wavedump_wav.cpp
View File

@ -67,7 +67,7 @@ namespace WaveDump
}
catch (std::runtime_error& ex)
{
printf("SPU2-X > %s.\n\tWave Log for this core source disabled.", ex.what());
printf("SPU-2 > %s.\n\tWave Log for this core source disabled.", ex.what());
m_CoreWav[cidx][srcidx] = NULL;
}
}
@ -131,7 +131,7 @@ void RecordStart(std::wstring* filename)
catch (std::runtime_error&)
{
m_wavrecord = NULL; // not needed, but what the heck. :)
SysMessage("SPU2-X couldn't open file for recording: %s.\nRecording to wavfile disabled.", "audio_recording.wav");
SysMessage("SPU-2 couldn't open file for recording: %s.\nRecording to wavfile disabled.", "audio_recording.wav");
}
}

4
pcsx2/SPU2/Windows/CfgHelpers.cpp
View File

@ -32,7 +32,7 @@ void SysMessage(const char* fmt, ...)
va_end(list);
swprintf_s(wtmp, L"%S", tmp);
MessageBox((!!gsWindowHandle) ? (HWND)gsWindowHandle : GetActiveWindow(), wtmp,
L"SPU2-X System Message", MB_OK | MB_SETFOREGROUND);
L"SPU-2 System Message", MB_OK | MB_SETFOREGROUND);
}
void SysMessage(const wchar_t* fmt, ...)
@ -43,7 +43,7 @@ void SysMessage(const wchar_t* fmt, ...)
wtmp.PrintfV(fmt, list);
va_end(list);
MessageBox((!!gsWindowHandle) ? (HWND)gsWindowHandle : GetActiveWindow(), wtmp,
L"SPU2-X System Message", MB_OK | MB_SETFOREGROUND);
L"SPU-2 System Message", MB_OK | MB_SETFOREGROUND);
}
//////

5
pcsx2/SPU2/Windows/Config.cpp
View File

@ -153,8 +153,8 @@ void ReadSettings()
if (mods[OutputModule] == NULL)
{
// Unsupported or legacy module.
fwprintf(stderr, L"* SPU2-X: Unknown output module '%s' specified in configuration file.\n", omodid);
fprintf(stderr, "* SPU2-X: Defaulting to DirectSound (%S).\n", DSoundOut->GetIdent());
fwprintf(stderr, L"* SPU-2: Unknown output module '%s' specified in configuration file.\n", omodid);
fprintf(stderr, "* SPU-2: Defaulting to DirectSound (%S).\n", DSoundOut->GetIdent());
OutputModule = FindOutputModuleById(DSoundOut->GetIdent());
}
}
@ -438,7 +438,6 @@ void configure()
ret = DialogBoxParam(NULL, MAKEINTRESOURCE(IDD_CONFIG), GetActiveWindow(), (DLGPROC)ConfigProc, 1);
if (ret == -1)
{
DWORD dw = GetLastError();
MessageBox(GetActiveWindow(), L"Error Opening the config dialog.", L"OMG ERROR!", MB_OK | MB_SETFOREGROUND);
return;
}

2
pcsx2/SPU2/Windows/ConfigDebug.cpp
View File

@ -38,7 +38,7 @@ bool _RegDump = false;
bool _visual_debug_enabled = false;
// this is set true if PCSX2 invokes the SetLogDir callback, which tells SPU2-X to use that over
// this is set true if PCSX2 invokes the SetLogDir callback, which tells SPU-2 to use that over
// the configured crap in the ini file.
static bool LogLocationSetByPcsx2 = false;

25
pcsx2/SPU2/Windows/Spu2-X.rc → pcsx2/SPU2/Windows/SPU2.rc
View File

@ -7,7 +7,6 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "svnrev.h"
#include "afxresmw.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@ -26,7 +25,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
CAPTION "SPU2-X Settings"
CAPTION "SPU-2 Settings"
FONT 8, "MS Shell Dlg", 400, 0, 0x0
BEGIN
PUSHBUTTON "OK",IDOK,101,238,50,14,NOT WS_TABSTOP
@ -63,7 +62,7 @@ END
IDD_DEBUG DIALOGEX 0, 0, 303, 473
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "SPU2-X Debug"
CAPTION "SPU-2 Debug"
FONT 9, "Lucida Console", 400, 0, 0x0
BEGIN
DEFPUSHBUTTON "Close",IDOK,246,451,50,14
@ -105,7 +104,7 @@ END
IDD_CONFIG_SOUNDTOUCH DIALOGEX 0, 0, 206, 223
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Soundtouch Advanced Configuration - SPU2-X"
CAPTION "Soundtouch Advanced Configuration - SPU-2"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,50,201,50,14
@ -128,7 +127,7 @@ END
IDD_CONFIG_DEBUG DIALOGEX 0, 0, 292, 239
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "SPU2-X Debugging Options"
CAPTION "SPU-2 Debugging Options"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,93,217,50,14
@ -215,14 +214,6 @@ BEGIN
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
//
IDB_SPU2X_SMALL BITMAP "..\\..\\spu2-x-sm.bmp"
/////////////////////////////////////////////////////////////////////////////
//
// Version
@ -247,12 +238,12 @@ BEGIN
BEGIN
VALUE "Comments", "SPU2 Plugin for PS2 Emulators"
VALUE "CompanyName", "PCSX2 Dev Team"
VALUE "FileDescription", "SPU2-X Plugin (git build)"
VALUE "FileDescription", "SPU-2 Plugin (git build)"
VALUE "FileVersion", "2.0.GIT"
VALUE "InternalName", "SPU2-X"
VALUE "InternalName", "SPU-2"
VALUE "LegalCopyright", "Copyright (C) 2011"
VALUE "OriginalFilename", "SPU2-X-2.0.dll"
VALUE "ProductName", "SPU2-X"
VALUE "OriginalFilename", "SPU-2-2.0.dll"
VALUE "ProductName", "SPU-2"
VALUE "ProductVersion", "2.0.GIT"
END
END

4
pcsx2/SPU2/Windows/SndOut_DSound.cpp
View File

@ -85,7 +85,7 @@ private:
if (FAILED(buffer->Lock(poffset, BufferSizeBytes, (LPVOID*)&p1, &s1, &p2, &s2, 0)))
{
assert(0);
fputs("* SPU2-X: Directsound Warning > Buffer lock failure. You may need to increase\n\tyour configured DSound buffer count.\n", stderr);
fputs("* SPU-2: Directsound Warning > Buffer lock failure. You may need to increase\n\tyour configured DSound buffer count.\n", stderr);
continue;
}
oldp1 = p1;
@ -219,7 +219,7 @@ public:
void Close()
{
// Stop Thread
fprintf(stderr, "* SPU2-X: Waiting for DSound thread to finish...");
fprintf(stderr, "* SPU-2: Waiting for DSound thread to finish...");
dsound_running = false;
WaitForSingleObject(thread, INFINITE);

2
pcsx2/SPU2/Windows/SndOut_waveOut.cpp
View File

@ -180,7 +180,7 @@ public:
void Close()
{
// Stop Thread
fprintf(stderr, "* SPU2-X: Waiting for waveOut thread to finish...");
fprintf(stderr, "* SPU-2: Waiting for waveOut thread to finish...");
waveout_running = false;
WaitForSingleObject(thread, INFINITE);

2
pcsx2/SPU2/Windows/dsp.cpp
View File

@ -107,7 +107,7 @@ void DspCloseLibrary()
running = false;
if (WaitForSingleObject(hUpdateThread, 1000) == WAIT_TIMEOUT)
{
ConLog("SPU2-X: WARNING: DSP Thread did not close itself in time. Assuming hung. Terminating.\n");
ConLog("SPU-2: WARNING: DSP Thread did not close itself in time. Assuming hung. Terminating.\n");
TerminateThread(hUpdateThread, 1);
}
}

3
pcsx2/SPU2/Windows/resource.h
View File

@ -1,7 +1,6 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by Spu2-X.rc
//
// Used by SPU2.rc
#define IDD_CONFIG 9
#define IDD_DEBUG 105
#define IDD_DSOUND 106

2
pcsx2/SPU2/regs.h
View File

@ -183,7 +183,7 @@ Core attributes (SD_C)
// --------------------------------------------------------------------------------------
// SPU2-X Register Table LUT
// SPU-2 Register Table LUT
// --------------------------------------------------------------------------------------
#define U16P(x) ((u16*)&(x))

20
pcsx2/SPU2/spu2.cpp
View File

@ -58,7 +58,7 @@ static bool CheckSSE()
}
if( !x86caps.hasStreamingSIMDExtensions || !x86caps.hasStreamingSIMD2Extensions )
{
SysMessage( "Your CPU does not support SSE2 instructions.\nThe SPU2-X plugin requires SSE2 to run." );
SysMessage( "Your CPU does not support SSE2 instructions.\nThe SPU-2 plugin requires SSE2 to run." );
return false;
}
return true;
@ -173,7 +173,7 @@ s32 SPU2reset()
}
catch (std::exception& ex)
{
fprintf(stderr, "SPU2-X Error: Could not initialize device, or something.\nReason: %s", ex.what());
fprintf(stderr, "SPU-2 Error: Could not initialize device, or something.\nReason: %s", ex.what());
SPU2close();
return -1;
}
@ -204,7 +204,7 @@ s32 SPU2ps1reset()
}
catch (std::exception& ex)
{
fprintf(stderr, "SPU2-X Error: Could not initialize device, or something.\nReason: %s", ex.what());
fprintf(stderr, "SPU-2 Error: Could not initialize device, or something.\nReason: %s", ex.what());
SPU2close();
return -1;
}
@ -226,7 +226,7 @@ s32 SPU2init()
if (IsInitialized)
{
printf(" * SPU2-X: Already initialized - Ignoring SPU2init signal.");
printf(" * SPU-2: Already initialized - Ignoring SPU2init signal.");
return 0;
}
@ -259,7 +259,7 @@ s32 SPU2init()
if ((spu2regs == NULL) || (_spu2mem == NULL) || (pcm_cache_data == NULL))
{
SysMessage("SPU2-X: Error allocating Memory\n");
SysMessage("SPU-2: Error allocating Memory\n");
return -1;
}
@ -376,7 +376,7 @@ s32 SPU2open(void* pDsp)
}
catch (std::exception& ex)
{
fprintf(stderr, "SPU2-X Error: Could not initialize device, or something.\nReason: %s", ex.what());
fprintf(stderr, "SPU-2 Error: Could not initialize device, or something.\nReason: %s", ex.what());
SPU2close();
return -1;
}
@ -408,7 +408,7 @@ void SPU2shutdown()
IsInitialized = false;
SPU2_dummy_callback = false;
ConLog("* SPU2-X: Shutting down.\n");
ConLog("* SPU-2: Shutting down.\n");
SPU2close();
@ -550,7 +550,7 @@ u16 SPU2read(u32 rmem)
else if (mem >= 0x800)
{
ret = spu2Ru16(mem);
ConLog("* SPU2-X: Read from reg>=0x800: %x value %x\n", mem, ret);
ConLog("* SPU-2: Read from reg>=0x800: %x value %x\n", mem, ret);
}
else
{
@ -604,7 +604,7 @@ s32 SPU2freeze(int mode, freezeData* data)
pxAssume(data != NULL);
if (!data)
{
printf("SPU2-X savestate null pointer!\n");
printf("SPU-2 savestate null pointer!\n");
return -1;
}
@ -618,7 +618,7 @@ s32 SPU2freeze(int mode, freezeData* data)
if (data->data == NULL)
{
printf("SPU2-X savestate null pointer!\n");
printf("SPU-2 savestate null pointer!\n");
return -1;
}

8
pcsx2/SPU2/spu2freeze.cpp
View File

@ -19,7 +19,7 @@
namespace SPU2Savestate
{
// Arbitrary ID to identify SPU2-X saves.
// Arbitrary ID to identify SPU-2 saves.
static const u32 SAVE_ID = 0x1227521;
// versioning for saves.
@ -34,11 +34,11 @@ namespace SPU2Savestate
struct SPU2Savestate::DataBlock
{
u32 spu2id; // SPU2-X state identifier lets ZeroGS/PeopsSPU2 know this isn't their state)
u32 spu2id; // SPU-2 state identifier lets ZeroGS/PeopsSPU2 know this isn't their state)
u8 unkregs[0x10000]; // SPU2 raw register memory
u8 mem[0x200000]; // SPU2 raw sample memory
u32 version; // SPU2-X version identifier
u32 version; // SPU-2 version identifier
V_Core Cores[2];
V_SPDIF Spdif;
s16 OutPos;
@ -81,7 +81,7 @@ s32 __fastcall SPU2Savestate::ThawIt(DataBlock& spud)
{
if (spud.spu2id != SAVE_ID || spud.version < SAVE_VERSION)
{
fprintf(stderr, "\n*** SPU2-X Warning:\n");
fprintf(stderr, "\n*** SPU-2 Warning:\n");
if (spud.spu2id == SAVE_ID)
fprintf(stderr, "\tSavestate version is from an older version of PCSX2.\n");
else

40
pcsx2/SPU2/spu2sys.cpp
View File

@ -57,7 +57,7 @@ void SetIrqCall(int core)
__forceinline s16* GetMemPtr(u32 addr)
{
#ifndef DEBUG_FAST
// In case you're wondering, this assert is the reason SPU2-X
// In case you're wondering, this assert is the reason SPU-2
// runs so incrediously slow in Debug mode. :P
pxAssume(addr < 0x100000);
#endif
@ -83,7 +83,7 @@ __forceinline void spu2M_Write(u32 addr, s16 value)
pcm_cache_data[cacheIdx].Validated = false;
if (MsgToConsole() && MsgCache())
ConLog("* SPU2-X: PcmCache Block Clear at 0x%x (cacheIdx=0x%x)\n", addr, cacheIdx);
ConLog("* SPU-2: PcmCache Block Clear at 0x%x (cacheIdx=0x%x)\n", addr, cacheIdx);
}
*GetMemPtr(addr) = value;
}
@ -118,7 +118,7 @@ V_Core::~V_Core() throw()
void V_Core::Init(int index)
{
ConLog("* SPU2-X: Init SPU2 core %d \n", index);
ConLog("* SPU-2: Init SPU2 core %d \n", index);
//memset(this, 0, sizeof(V_Core));
// Explicitly initializing variables instead.
Mute = false;
@ -415,7 +415,7 @@ __forceinline void TimeUpdate(u32 cClocks)
{
if (has_to_call_irq)
{
//ConLog("* SPU2-X: Irq Called (%04x) at cycle %d.\n", Spdif.Info, Cycles);
//ConLog("* SPU-2: Irq Called (%04x) at cycle %d.\n", Spdif.Info, Cycles);
has_to_call_irq = false;
if (!SPU2_dummy_callback)
spu2Irq();
@ -486,7 +486,7 @@ __forceinline void UpdateSpdifMode()
if (Spdif.Out & 0x4) // use 24/32bit PCM data streaming
{
PlayMode = 8;
ConLog("* SPU2-X: WARNING: Possibly CDDA mode set!\n");
ConLog("* SPU-2: WARNING: Possibly CDDA mode set!\n");
return;
}
@ -506,12 +506,12 @@ __forceinline void UpdateSpdifMode()
}
if (OPM != PlayMode)
{
ConLog("* SPU2-X: Play Mode Set to %s (%d).\n",
ConLog("* SPU-2: Play Mode Set to %s (%d).\n",
(PlayMode == 0) ? "Normal" : ((PlayMode == 1) ? "PCM Clone" : ((PlayMode == 2) ? "PCM Bypass" : "BitStream Bypass")), PlayMode);
}
}
// Converts an SPU2 register volume write into a 32 bit SPU2-X volume. The value is extended
// Converts an SPU2 register volume write into a 32 bit SPU-2 volume. The value is extended
// properly into the lower 16 bits of the value to provide a full spectrum of volumes.
static s32 GetVol32(u16 src)
{
@ -714,12 +714,12 @@ void V_Core::WriteRegPS1(u32 mem, u16 value)
case 0x1da4:
IRQA = map_spu1to2(value);
//ConLog("SPU2-X Setting IRQA to %x \n", IRQA);
//ConLog("SPU-2 Setting IRQA to %x \n", IRQA);
break;
case 0x1da6:
TSA = map_spu1to2(value);
//ConLog("SPU2-X Setting TSA to %x \n", TSA);
//ConLog("SPU-2 Setting TSA to %x \n", TSA);
break;
case 0x1da8: // Spu Write to Memory
@ -986,11 +986,11 @@ u16 V_Core::ReadRegPS1(u32 mem)
break;
case 0x1da4:
value = map_spu2to1(IRQA);
//ConLog("SPU2-X IRQA read: 0x1da4 = %x , (IRQA = %x)\n", value, IRQA);
//ConLog("SPU-2 IRQA read: 0x1da4 = %x , (IRQA = %x)\n", value, IRQA);
break;
case 0x1da6:
value = map_spu2to1(TSA);
//ConLog("SPU2-X TSA read: 0x1da6 = %x , (TSA = %x)\n", value, TSA);
//ConLog("SPU-2 TSA read: 0x1da6 = %x , (TSA = %x)\n", value, TSA);
break;
case 0x1da8:
value = DmaRead();
@ -998,14 +998,14 @@ u16 V_Core::ReadRegPS1(u32 mem)
break;
case 0x1daa:
value = Cores[0].Regs.ATTR;
//ConLog("SPU2-X ps1 reg psxSPUCNT read return value: %x\n", value);
//ConLog("SPU-2 ps1 reg psxSPUCNT read return value: %x\n", value);
break;
case 0x1dac: // 1F801DACh - Sound RAM Data Transfer Control (should be 0004h)
value = psxSoundDataTransferControl;
break;
case 0x1dae:
value = Cores[0].Regs.STATX;
//ConLog("SPU2-X ps1 reg REG_P_STATX read return value: %x\n", value);
//ConLog("SPU-2 ps1 reg REG_P_STATX read return value: %x\n", value);
break;
}
@ -1230,17 +1230,17 @@ static void __fastcall RegWrite_Core(u16 value)
if (value & 0x000E)
{
if (MsgToConsole())
ConLog("* SPU2-X: Core %d ATTR unknown bits SET! value=%04x\n", core, value);
ConLog("* SPU-2: Core %d ATTR unknown bits SET! value=%04x\n", core, value);
}
if (thiscore.AttrBit0 != bit0)
{
if (MsgToConsole())
ConLog("* SPU2-X: ATTR bit 0 set to %d\n", thiscore.AttrBit0);
ConLog("* SPU-2: ATTR bit 0 set to %d\n", thiscore.AttrBit0);
}
if (thiscore.IRQEnable != irqe)
{
//ConLog("* SPU2-X: Core%d IRQ %s at cycle %d. Current IRQA = %x Current EffectA = %x\n",
//ConLog("* SPU-2: Core%d IRQ %s at cycle %d. Current IRQA = %x Current EffectA = %x\n",
// core, ((thiscore.IRQEnable==0)?"disabled":"enabled"), Cycles, thiscore.IRQA, thiscore.EffectsStartA);
if (!thiscore.IRQEnable)
@ -1417,10 +1417,10 @@ static void __fastcall RegWrite_Core(u16 value)
case REG_S_ADMAS:
if (MsgToConsole())
ConLog("* SPU2-X: Core %d AutoDMAControl set to %d (at cycle %d)\n", core, value, Cycles);
ConLog("* SPU-2: Core %d AutoDMAControl set to %d (at cycle %d)\n", core, value, Cycles);
if (psxmode)
ConLog("* SPU2-X: Writing to REG_S_ADMAS while in PSX mode! value: %x", value);
ConLog("* SPU-2: Writing to REG_S_ADMAS while in PSX mode! value: %x", value);
// hack for ps1driver which writes -1 (and never turns the adma off after psxlogo).
// adma isn't available in psx mode either
if (value == 32767)
@ -1873,7 +1873,7 @@ void StartVoices(int core, u32 value)
V_Voice& thisvc(Cores[core].Voices[vc]);
if (MsgKeyOnOff())
ConLog("* SPU2-X: KeyOn: C%dV%02d: SSA: %8x; M: %s%s%s%s; H: %04x; P: %04x V: %04x/%04x; ADSR: %04x%04x\n",
ConLog("* SPU-2: KeyOn: C%dV%02d: SSA: %8x; M: %s%s%s%s; H: %04x; P: %04x V: %04x/%04x; ADSR: %04x%04x\n",
core, vc, thisvc.StartA,
(Cores[core].VoiceGates[vc].DryL) ? "+" : "-", (Cores[core].VoiceGates[vc].DryR) ? "+" : "-",
(Cores[core].VoiceGates[vc].WetL) ? "+" : "-", (Cores[core].VoiceGates[vc].WetR) ? "+" : "-",
@ -1896,6 +1896,6 @@ void StopVoices(int core, u32 value)
Cores[core].Voices[vc].ADSR.Releasing = true;
if (MsgKeyOnOff())
ConLog("* SPU2-X: KeyOff: Core %d; Voice %d.\n", core, vc);
ConLog("* SPU-2: KeyOff: Core %d; Voice %d.\n", core, vc);
}
}