mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Fix crash on underrun in the alsa player

Browse source 
Originally committed to SVN as r6497.
This commit is contained in:
Thomas Goyne 2012-02-20 18:22:43 +00:00
parent fb6d3daf8b
commit 2dd01747f8
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
aegisub/src/audio_player_alsa.cpp
View file

@ -270,7 +270,17 @@ do_setup:
} }
// Fill buffer // Fill buffer
avail = std::min(snd_pcm_avail(pcm), (snd_pcm_sframes_t)(ps.end_position-position)); avail = snd_pcm_avail(pcm);
if (avail == -EPIPE)
{
if (snd_pcm_recover(pcm, -EPIPE, 1) < 0)
{
LOG_D("audio/player/alsa") << "failed to recover from underrun";
return (void*)"snd_pcm_avail";
}
avail = snd_pcm_avail(pcm);
}
avail = std::min(avail, (snd_pcm_sframes_t)(ps.end_position-position));
buf = new char[avail*framesize]; buf = new char[avail*framesize];
ps.provider->GetAudioWithVolume(buf, position, avail, ps.volume); ps.provider->GetAudioWithVolume(buf, position, avail, ps.volume);
written = 0; written = 0;