actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix XRUN being reenabled because setting HWParams resets SWParams

Browse Source
This commit is contained in:
Glenn Maynard
2004-01-03 08:40:43 +00:00
parent dc61e951cf
commit aa74257d26
2 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/ALSA9Helpers.cpp
+35 -28
View File
@@ -79,6 +79,37 @@ bool Alsa9Buf::SetHWParams()
return true;
}
bool Alsa9Buf::SetSWParams()
{
snd_pcm_sw_params_t *swparams;
dsnd_pcm_sw_params_alloca( &swparams );
dsnd_pcm_sw_params_current( pcm, swparams );
int err = dsnd_pcm_sw_params_get_xfer_align( swparams, &xfer_align );
ALSA_ASSERT("dsnd_pcm_sw_params_get_xfer_align");
/* If this fails, we might have bound dsnd_pcm_sw_params_get_xfer_align to
* the old SW API. */
ASSERT( err <= 0 );
/* Disable SND_PCM_STATE_XRUN. */
snd_pcm_uframes_t boundary = 0;
err = dsnd_pcm_sw_params_get_boundary( swparams, &boundary );
ALSA_ASSERT("dsnd_pcm_sw_params_get_boundary");
if( err == 0 )
{
err = dsnd_pcm_sw_params_set_stop_threshold( pcm, swparams, boundary );
ALSA_ASSERT("dsnd_pcm_sw_params_set_stop_threshold");
err = dsnd_pcm_sw_params(pcm, swparams);
ALSA_ASSERT("dsnd_pcm_sw_params");
}
err = dsnd_pcm_prepare(pcm);
ALSA_ASSERT("dsnd_pcm_prepare");
return true;
}
void Alsa9Buf::GetSoundCardDebugInfo()
{
static bool done = false;
@@ -177,31 +208,7 @@ Alsa9Buf::Alsa9Buf( hw hardware, int channels_ )
RageException::ThrowNonfatal( "SetHWParams failed" );
}
snd_pcm_sw_params_t *swparams;
dsnd_pcm_sw_params_alloca( &swparams );
dsnd_pcm_sw_params_current( pcm, swparams );
err = dsnd_pcm_sw_params_get_xfer_align( swparams, &xfer_align );
/* If this fails, we might have bound dsnd_pcm_sw_params_get_xfer_align to
* the old SW API. */
ASSERT( err <= 0 );
ALSA_ASSERT("dsnd_pcm_sw_params_get_xfer_align");
/* Disable SND_PCM_STATE_XRUN. */
snd_pcm_uframes_t boundary = 0;
err = dsnd_pcm_sw_params_get_boundary( swparams, &boundary );
ALSA_ASSERT("dsnd_pcm_sw_params_get_boundary");
if( err == 0 )
{
err = dsnd_pcm_sw_params_set_stop_threshold( pcm, swparams, boundary );
ALSA_ASSERT("dsnd_pcm_sw_params_set_stop_threshold");
err = dsnd_pcm_sw_params(pcm, swparams);
ALSA_ASSERT("dsnd_pcm_sw_params");
}
err = dsnd_pcm_prepare(pcm);
ALSA_ASSERT("dsnd_pcm_prepare");
SetSWParams();
total_frames = dsnd_pcm_avail_update(pcm);
}
@@ -234,7 +241,7 @@ int Alsa9Buf::GetNumFramesToFill( int writeahead )
}
}
if( avail_frames < 0 && Recover(avail_frames) )
if( avail_frames < 0 )
avail_frames = dsnd_pcm_avail_update(pcm);
if( avail_frames < 0 )
@@ -309,6 +316,7 @@ int Alsa9Buf::GetPosition() const
/* delay is returned in frames */
snd_pcm_sframes_t delay;
int err = dsnd_pcm_delay( pcm, &delay );
ALSA_ASSERT("dsnd_pcm_delay");
return last_cursor_pos - delay;
}
@@ -337,7 +345,6 @@ void Alsa9Buf::SetSampleRate(int hz)
samplerate_set_explicitly = true;
SetHWParams();
dsnd_pcm_prepare( pcm );
SetSWParams();
}
stepmania/src/arch/Sound/ALSA9Helpers.h
+1
View File
@@ -21,6 +21,7 @@ private:
bool Recover( int r );
bool SetHWParams();
bool SetSWParams();
static void ErrorHandler(const char *file, int line, const char *function, int err, const char *fmt, ...);