diff --git a/plugins/spu2-x/src/Windows/Config.cpp b/plugins/spu2-x/src/Windows/Config.cpp index 576a2bb5b6..9c1f239949 100644 --- a/plugins/spu2-x/src/Windows/Config.cpp +++ b/plugins/spu2-x/src/Windows/Config.cpp @@ -24,7 +24,7 @@ static const int LATENCY_MAX = 3000; static const int LATENCY_MAX = 750; #endif -static const int LATENCY_MIN = 40; +static const int LATENCY_MIN = 50; // MIXING int Interpolation = 1; @@ -37,7 +37,7 @@ int Interpolation = 1; bool EffectsDisabled = false; // OUTPUT -int SndOutLatencyMS = 160; +int SndOutLatencyMS = 150; bool timeStretchDisabled = false; u32 OutputModule = 0; @@ -62,7 +62,7 @@ void ReadSettings() EffectsDisabled = CfgReadBool( L"MIXING", L"Disable_Effects", false ); StereoExpansionEnabled = CfgReadBool( L"OUTPUT", L"Enable_StereoExpansion", false ); - SndOutLatencyMS = CfgReadInt(L"OUTPUT",L"Latency", 160); + SndOutLatencyMS = CfgReadInt(L"OUTPUT",L"Latency", 150); wchar_t omodid[128]; CfgReadStr( L"OUTPUT", L"Output_Module", omodid, 127, XAudio2Out->GetIdent() ); @@ -157,7 +157,7 @@ BOOL CALLBACK ConfigProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam) int maxexp = (int)(pow( (double)LATENCY_MAX+2, 1.0/3.0 ) * 128.0); INIT_SLIDER( IDC_LATENCY_SLIDER, minexp, maxexp, 200, 42, 12 ); - SendDialogMsg( hWnd, IDC_LATENCY_SLIDER, TBM_SETPOS, TRUE, (int)((pow( (double)SndOutLatencyMS, 1.0/3.0 ) * 128.0) + 0.5) ); + SendDialogMsg( hWnd, IDC_LATENCY_SLIDER, TBM_SETPOS, TRUE, (int)((pow( (double)SndOutLatencyMS, 1.0/3.0 ) * 128.0) + 1) ); swprintf_s(temp,L"%d ms (avg)",SndOutLatencyMS); SetWindowText(GetDlgItem(hWnd,IDC_LATENCY_LABEL),temp); diff --git a/plugins/spu2-x/src/Windows/ConfigSoundtouch.cpp b/plugins/spu2-x/src/Windows/ConfigSoundtouch.cpp index 864947eba3..dd524b736f 100644 --- a/plugins/spu2-x/src/Windows/ConfigSoundtouch.cpp +++ b/plugins/spu2-x/src/Windows/ConfigSoundtouch.cpp @@ -25,14 +25,14 @@ static int SeekWindowMS = 16; static int OverlapMS = 7; // Timestretch Slider Bounds, Min/Max -static const int SequenceLen_Min = 30; +static const int SequenceLen_Min = 50; static const int SequenceLen_Max = 90; static const int SeekWindow_Min = 10; static const int SeekWindow_Max = 32; static const int Overlap_Min = 3; -static const int Overlap_Max = 15; +static const int Overlap_Max = 25; void SoundtouchCfg::ApplySettings( soundtouch::SoundTouch& sndtouch ) { @@ -50,9 +50,9 @@ static void ClampValues() void SoundtouchCfg::ReadSettings() { - SequenceLenMS = CfgReadInt( L"SOUNDTOUCH", L"SequenceLengthMS", 63 ); - SeekWindowMS = CfgReadInt( L"SOUNDTOUCH", L"SeekWindowMS", 16 ); - OverlapMS = CfgReadInt( L"SOUNDTOUCH", L"OverlapMS", 7 ); + SequenceLenMS = CfgReadInt( L"SOUNDTOUCH", L"SequenceLengthMS", 50 ); + SeekWindowMS = CfgReadInt( L"SOUNDTOUCH", L"SeekWindowMS", 15 ); + OverlapMS = CfgReadInt( L"SOUNDTOUCH", L"OverlapMS", 25 ); ClampValues(); } diff --git a/plugins/spu2-x/src/Windows/Spu2-X.rc b/plugins/spu2-x/src/Windows/Spu2-X.rc index 49dc745d99..b4ea57d3dd 100644 --- a/plugins/spu2-x/src/Windows/Spu2-X.rc +++ b/plugins/spu2-x/src/Windows/Spu2-X.rc @@ -145,12 +145,12 @@ BEGIN CTEXT "Seekwindow Size",IDC_STATIC,70,125,66,9 CONTROL "",IDC_OVERLAP_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,50,170,105,10 CTEXT "Overlap",IDC_STATIC,86,162,34,9 - LTEXT "30",IDC_STATIC,50,112,9,8 + LTEXT "50",IDC_STATIC,50,112,9,8 LTEXT "90",IDC_STATIC,146,112,9,8 LTEXT "10",IDC_STATIC,50,149,9,8 LTEXT "32",IDC_STATIC,146,149,9,8 LTEXT "3",IDC_STATIC,52,184,8,8 - LTEXT "15",IDC_STATIC,146,184,9,8 + LTEXT "25",IDC_STATIC,146,184,9,8 PUSHBUTTON "Reset Defaults",IDC_RESET_DEFAULTS,61,62,82,12 END