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

SPU2-X: 

- Remove the DSound output module hardware buffer option which caused more harm than good.

Also fixed that IOPx2 hack leftover.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3597 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2010-08-04 16:14:37 +00:00
parent e5f87e068b
commit 181836b5d4
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/gui/Panels/SpeedhacksPanel.cpp
View File

@ -211,7 +211,7 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent )
L"we advance to the time of the next event or the end of the processor's timeslice, whichever comes first."
) );
m_check_fastCDVD->SetToolTip( pxE( ".Tooltip:Speedhacks:IOPx2",
m_check_fastCDVD->SetToolTip( pxE( ".Tooltip:Speedhacks:fastCDVD",
L"Check HDLoader compatibility lists for known games that have issues with this. (Often marked as needing 'mode 1' or 'slow DVD'"
) );

14
plugins/spu2-x/src/Windows/SndOut_DSound.cpp
View File

@ -36,7 +36,6 @@ private:
wxString m_Device;
u8 m_NumBuffers;
bool m_DisableGlobalFocus;
bool m_UseHardware;
ds_device_data m_devices[32];
int ndevs;
@ -167,20 +166,23 @@ public:
// Try a hardware buffer first, and then fall back on a software buffer if
// that one fails.
// Edit:
// Due to too many reports of issues with hardware support we drop it totally.
// It never made a good difference on anything anyway (rama)
desc.dwFlags |= m_UseHardware ? DSBCAPS_LOCHARDWARE : DSBCAPS_LOCSOFTWARE;
desc.dwFlags |= /*m_UseHardware ? DSBCAPS_LOCHARDWARE :*/ DSBCAPS_LOCSOFTWARE;
desc.dwFlags |= m_DisableGlobalFocus ? DSBCAPS_STICKYFOCUS : DSBCAPS_GLOBALFOCUS;
if( FAILED(dsound->CreateSoundBuffer(&desc, &buffer_, 0) ) )
{
if( m_UseHardware )
/*if( m_UseHardware )
{
desc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_CTRLPOSITIONNOTIFY | DSBCAPS_LOCSOFTWARE;
desc.dwFlags |= m_DisableGlobalFocus ? DSBCAPS_STICKYFOCUS : DSBCAPS_GLOBALFOCUS;
if( FAILED(dsound->CreateSoundBuffer(&desc, &buffer_, 0) ) )
throw std::runtime_error( "DirectSound Error: Buffer could not be created." );
}
}*/
throw std::runtime_error( "DirectSound Error: Buffer could not be created." );
}
@ -311,7 +313,6 @@ private:
SetWindowText(GetDlgItem(hWnd,IDC_LATENCY_LABEL),temp);
SET_CHECK( IDC_GLOBALFOCUS_DISABLE, m_DisableGlobalFocus );
SET_CHECK( IDC_USE_HARDWARE, m_UseHardware );
}
break;
@ -364,7 +365,6 @@ private:
break;
HANDLE_CHECK( IDC_GLOBALFOCUS_DISABLE, m_DisableGlobalFocus );
HANDLE_CHECK( IDC_USE_HARDWARE, m_UseHardware );
default:
return FALSE;
@ -458,7 +458,6 @@ public:
CfgReadStr( L"DSOUNDOUT", L"Device", m_Device, L"default" );
m_NumBuffers = CfgReadInt( L"DSOUNDOUT", L"Buffer_Count", 5 );
m_DisableGlobalFocus = CfgReadBool( L"DSOUNDOUT", L"Disable_Global_Focus", false );
m_UseHardware = CfgReadBool( L"DSOUNDOUT", L"Use_Hardware", false );
Clampify( m_NumBuffers, (u8)3, (u8)8 );
}
@ -468,7 +467,6 @@ public:
CfgWriteStr( L"DSOUNDOUT", L"Device", m_Device.empty() ? L"default" : m_Device );
CfgWriteInt( L"DSOUNDOUT", L"Buffer_Count", m_NumBuffers );
CfgWriteBool( L"DSOUNDOUT", L"Disable_Global_Focus", m_DisableGlobalFocus );
CfgWriteBool( L"DSOUNDOUT", L"Use_Hardware", m_UseHardware );
}
} static DS;

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

@ -101,8 +101,7 @@ BEGIN
LTEXT "Increase the buffer count if you are experiencing loopy or studdery audio even when games run at high FPS.",IDC_STATIC,11,157,169,27
CTEXT "8 (80 ms latency)",IDC_LATENCY_LABEL,44,123,95,11
CONTROL "Disable Global Focus",IDC_GLOBALFOCUS_DISABLE,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,4,38,140,10
LTEXT "If you have audio problems, try checking one or both of the options above. They don't really affect sound processing, but some drivers are picky and work nicer with different seetings.",IDC_STATIC,16,68,175,38
CONTROL "Use Hardware Buffers",IDC_USE_HARDWARE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,53,140,10
LTEXT "If you have audio problems, try checking the option above. It doesn't really affect sound processing, but some drivers are picky and work nicer with different seetings.",IDC_STATIC,16,68,175,38
GROUPBOX "Output Buffers",IDC_STATIC,4,111,185,79
END

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

@ -52,7 +52,7 @@
#define IDC_OPEN_CONFIG_DEBUG 1059
#define IDC_GLOBALFOCUS_DISABLE 1060
#define IDC_GLOBALFOCUS_DISABLE2 1061
#define IDC_USE_HARDWARE 1062
#define IDC_USE_HARDWARE 1062 // not used anymore
#define IDC_COMBO1 1063
#define IDC_SYNCHMODE 1064