SPU2Ghz: Adjusted default values for the worst case (Windows Vista... seriously, what did MS to the audio subsystem?)

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@245 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
ramapcsx2 2008-10-28 13:32:59 +00:00 committed by Gregory Hainaut
parent 0e1f871606
commit f69a63b489
2 changed files with 7 additions and 5 deletions

View File

@ -256,7 +256,7 @@ void ReadSettings()
);
SampleRate=CfgReadInt("OUTPUT","Sample_Rate",48000);
SndOutLatencyMS=CfgReadInt("OUTPUT","Latency",120);
SndOutLatencyMS=CfgReadInt("OUTPUT","Latency",140);
//OutputModule = CfgReadInt("OUTPUT","Output_Module", OUTPUT_DSOUND );
char omodid[128];
@ -278,7 +278,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", 3 );
Config_DSoundOut.NumBuffers = CfgReadInt( "DSOUNDOUT", "Buffer_Count", 4 );
Config_WaveOut.NumBuffers = CfgReadInt( "WAVEOUT", "Buffer_Count", 4 );
// Read DSOUND51 config:

View File

@ -245,7 +245,7 @@ public:
if( timeStretchEnabled )
{
// timeStretcher failed it's job. We need to slow down the audio some.
cTempo -= (cTempo * 0.25f);
if( cTempo < 0.2f ) cTempo = 0.2f;
pSoundTouch->setTempo( cTempo );
@ -488,10 +488,9 @@ void UpdateTempoChange()
if( statusPct < -0.20 || statusPct > 0.20 || cTempo < 0.980 || cTempo > 1.020 )
{
if( cTempo < 0.20f ) cTempo = 0.20f;
else if( cTempo > 5.0f ) cTempo = 5.0f;
else if( cTempo > 10.0f ) cTempo = 10.0f; //5.0 is suggested by soundtouch, but this is fine as well (rama)
pSoundTouch->setTempo( cTempo );
ts_stats_stretchblocks++;
ConLog(" %s * SPU2: TempoChange by %d%% (tempo: %d%%) (buffer: %d%%)\n",
(relation < 0.0) ? "Normalize" : "",
(int)(tempoChange * 100.0), (int)(cTempo * 100.0),
@ -613,6 +612,9 @@ s32 SndWrite(s32 ValL, s32 ValR)
}
static int equalized = 0;
//use this to debug buffer usage in near realtime (rama)
/*if ((sndBuffer->GetStatusPct() < -0.3) || (sndBuffer->GetStatusPct() > 1.3))
printf("Buffer beyond save zone! Usage: %f\n",sndBuffer->GetStatusPct());*/
if(timeStretchEnabled)
{
bool progress = false;