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

fix PCM sample overflow

Browse Source 
fix warning
This commit is contained in:
Glenn Maynard
2004-01-04 07:14:13 +00:00
parent 41e58802e7
commit fb1f167132
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/RageSoundDriver_ALSA9_Software.cpp
+8 -3
View File
@@ -85,9 +85,9 @@ bool RageSound_ALSA9_Software::GetData()
* Get the units straight, * Get the units straight,
* <bytes> = GetPCM(<bytes*>, <bytes>, <frames>) * <bytes> = GetPCM(<bytes*>, <bytes>, <frames>)
*/ */
unsigned got_bytes = sounds[i]->snd->GetPCM( (char *) buf, frames_to_fill*bytes_per_frame, pcm->GetPlayPos() ); const int got_bytes = sounds[i]->snd->GetPCM( (char *) buf, frames_to_fill*bytes_per_frame, pcm->GetPlayPos() );
unsigned got_samples = got_bytes / sizeof(Sint16); const int got_samples = got_bytes / sizeof(Sint16);
unsigned got_frames = got_bytes / bytes_per_frame; const int got_frames = got_bytes / bytes_per_frame;
mix.write((Sint16 *) buf, got_samples ); mix.write((Sint16 *) buf, got_samples );
if( got_frames < frames_to_fill ) if( got_frames < frames_to_fill )
@@ -151,6 +151,11 @@ void RageSound_ALSA9_Software::StopMixing(RageSound *snd)
delete sounds[i]; delete sounds[i];
sounds.erase(sounds.begin()+i, sounds.begin()+i+1); sounds.erase(sounds.begin()+i, sounds.begin()+i+1);
/* If nothing is playing, reset the sample count; this is just to
* prevent eventual overflow. */
if( sounds.empty() )
pcm->Reset();
} }