diff --git a/plugins/spu2ghz/config.cpp b/plugins/spu2ghz/config.cpp index 5f820bfb19..e752faca4e 100644 --- a/plugins/spu2ghz/config.cpp +++ b/plugins/spu2ghz/config.cpp @@ -80,11 +80,11 @@ bool EffectsEnabled=false; // OUTPUT int SampleRate=48000; -int SndOutLatencyMS=140; +int SndOutLatencyMS=160; //int SndOutLatency=1024; //int MaxBufferCount=8; //int CurBufferCount=MaxBufferCount; -bool timeStretchEnabled=false; +bool timeStretchEnabled=true; u32 OutputModule=0; //OUTPUT_DSOUND; @@ -263,16 +263,16 @@ void ReadSettings() EffectsEnabled = false; // force disabled for now. SampleRate=CfgReadInt("OUTPUT","Sample_Rate",48000); - SndOutLatencyMS=CfgReadInt("OUTPUT","Latency", 140); + SndOutLatencyMS=CfgReadInt("OUTPUT","Latency", 160); //OutputModule = CfgReadInt("OUTPUT","Output_Module", OUTPUT_DSOUND ); char omodid[128]; - CfgReadStr( "OUTPUT", "Output_Module", omodid, 127, DSoundOut->GetIdent() ); + CfgReadStr( "OUTPUT", "Output_Module", omodid, 127, XAudio2Out->GetIdent() ); // find the driver index of this module: OutputModule = FindOutputModuleById( omodid ); - VolumeShiftModifier = CfgReadInt( "OUTPUT","Volume_Shift", 0 ); + VolumeShiftModifier = CfgReadInt( "OUTPUT","Volume_Shift", 1 ); LimitMode=CfgReadInt("OUTPUT","Speed_Limit_Mode",0); CfgReadStr("DSP PLUGIN","Filename",dspPlugin,255,""); @@ -285,7 +285,7 @@ void ReadSettings() // Read DSOUNDOUT and WAVEOUT configs: CfgReadStr( "DSOUNDOUT", "Device", Config_DSoundOut.Device, 254, "default" ); CfgReadStr( "WAVEOUT", "Device", Config_WaveOut.Device, 254, "default" ); - Config_DSoundOut.NumBuffers = CfgReadInt( "DSOUNDOUT", "Buffer_Count", 4 ); + Config_DSoundOut.NumBuffers = CfgReadInt( "DSOUNDOUT", "Buffer_Count", 5 ); Config_WaveOut.NumBuffers = CfgReadInt( "WAVEOUT", "Buffer_Count", 4 ); // Read DSOUND51 config: diff --git a/plugins/spu2ghz/dsoundout.cpp b/plugins/spu2ghz/dsoundout.cpp index 27ba64c787..f2070d91ba 100644 --- a/plugins/spu2ghz/dsoundout.cpp +++ b/plugins/spu2ghz/dsoundout.cpp @@ -451,7 +451,7 @@ public: const char* GetLongName() const { - return "DirectSound"; + return "DirectSound (nice)"; } } DS; diff --git a/plugins/spu2ghz/sndout.cpp b/plugins/spu2ghz/sndout.cpp index 0f0222c82a..46ba540251 100644 --- a/plugins/spu2ghz/sndout.cpp +++ b/plugins/spu2ghz/sndout.cpp @@ -57,8 +57,8 @@ SndOutModule* mods[]= &NullOut, WaveOut, DSoundOut, - DSound51Out, - ASIOOut, + //DSound51Out, + //ASIOOut, XAudio2Out, NULL // signals the end of our list }; diff --git a/plugins/spu2ghz/xaudio2out.cpp b/plugins/spu2ghz/xaudio2out.cpp index 9b808ab454..192bd12403 100644 --- a/plugins/spu2ghz/xaudio2out.cpp +++ b/plugins/spu2ghz/xaudio2out.cpp @@ -231,7 +231,7 @@ public: const char* GetLongName() const { - return "XAudio 2 (Experimental)"; + return "XAudio 2 (Recommended)"; } } XA2;