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

fix ALSA problems when going through plug

Browse Source
This commit is contained in:
Glenn Maynard
2004-02-05 21:03:03 +00:00
parent b899848309
commit 990eb50e4a
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/ALSA9Helpers.cpp
+5 -1
View File
@@ -218,7 +218,9 @@ Alsa9Buf::~Alsa9Buf()
} }
int Alsa9Buf::GetNumFramesToFill( int writeahead ) /* Don't fill the buffer any more than than "writeahead". Don't write any
* more than "chunksize" at a time. */
int Alsa9Buf::GetNumFramesToFill( snd_pcm_sframes_t writeahead, snd_pcm_sframes_t chunksize )
{ {
snd_pcm_sframes_t avail_frames = dsnd_pcm_avail_update(pcm); snd_pcm_sframes_t avail_frames = dsnd_pcm_avail_update(pcm);
@@ -253,6 +255,8 @@ int Alsa9Buf::GetNumFramesToFill( int writeahead )
const snd_pcm_sframes_t filled_frames = max( 0l, total_frames - avail_frames ); const snd_pcm_sframes_t filled_frames = max( 0l, total_frames - avail_frames );
snd_pcm_sframes_t frames_to_fill = clamp( writeahead - filled_frames, 0l, (snd_pcm_sframes_t)writeahead ); snd_pcm_sframes_t frames_to_fill = clamp( writeahead - filled_frames, 0l, (snd_pcm_sframes_t)writeahead );
frames_to_fill = min( frames_to_fill, chunksize );
frames_to_fill -= frames_to_fill % xfer_align; frames_to_fill -= frames_to_fill % xfer_align;
return frames_to_fill; return frames_to_fill;
stepmania/src/arch/Sound/ALSA9Helpers.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
Alsa9Buf( hw hardware, int channels ); Alsa9Buf( hw hardware, int channels );
~Alsa9Buf(); ~Alsa9Buf();
int GetNumFramesToFill( int writeahead ); int GetNumFramesToFill( snd_pcm_sframes_t writeahead, snd_pcm_sframes_t chunksize );
void Write( const Sint16 *buffer, int frames ); void Write( const Sint16 *buffer, int frames );
unsigned FindSampleRate( unsigned rate ); unsigned FindSampleRate( unsigned rate );
stepmania/src/arch/Sound/RageSoundDriver_ALSA9.cpp
+1 -4
View File
@@ -56,10 +56,7 @@ RageSound_ALSA9::stream::~stream()
/* Returns the number of frames processed */ /* Returns the number of frames processed */
bool RageSound_ALSA9::stream::GetData(bool init) bool RageSound_ALSA9::stream::GetData(bool init)
{ {
int frames_to_fill = pcm->GetNumFramesToFill( max_writeahead ); int frames_to_fill = pcm->GetNumFramesToFill( max_writeahead, init? max_writeahead:chunksize );
if( !init )
frames_to_fill = min( frames_to_fill, chunksize );
if( frames_to_fill < chunksize ) if( frames_to_fill < chunksize )
return false; return false;
stepmania/src/arch/Sound/RageSoundDriver_ALSA9_Software.cpp
+1 -1
View File
@@ -61,7 +61,7 @@ bool RageSound_ALSA9_Software::GetData()
{ {
const int chunksize = max_writeahead / num_chunks; const int chunksize = max_writeahead / num_chunks;
const int frames_to_fill = min( chunksize, pcm->GetNumFramesToFill( max_writeahead ) ); const int frames_to_fill = pcm->GetNumFramesToFill( max_writeahead, chunksize );
if( frames_to_fill <= 0 ) if( frames_to_fill <= 0 )
return false; return false;