mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Use unique_ptr in AlsaPlayer

Browse source
This commit is contained in:
Thomas Goyne 2014-05-22 19:51:55 -07:00
parent b9a683eeb2
commit c2b8892b33
1 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/audio_player_alsa.cpp
View file

@ -215,27 +215,27 @@ do_setup:
clock_gettime(CLOCK_REALTIME, &ps.last_position_time); clock_gettime(CLOCK_REALTIME, &ps.last_position_time);
// Initial buffer-fill // Initial buffer-fill
snd_pcm_sframes_t avail = std::min(snd_pcm_avail(pcm), (snd_pcm_sframes_t)(ps.end_position-position));
char *buf = new char[avail*framesize];
ps.provider->GetAudioWithVolume(buf, position, avail, ps.volume);
snd_pcm_sframes_t written = 0;
while (written <= 0)
{ {
written = snd_pcm_writei(pcm, buf, avail); snd_pcm_sframes_t avail = std::min(snd_pcm_avail(pcm), (snd_pcm_sframes_t)(ps.end_position-position));
if (written == -ESTRPIPE) std::unique_ptr<char[]> buf{new char[avail*framesize]};
ps.provider->GetAudioWithVolume(buf.get(), position, avail, ps.volume);
snd_pcm_sframes_t written = 0;
while (written <= 0)
{ {
snd_pcm_recover(pcm, written, 0); written = snd_pcm_writei(pcm, buf.get(), avail);
} if (written == -ESTRPIPE)
else if (written <= 0) {
{ snd_pcm_recover(pcm, written, 0);
delete[] buf; }
snd_pcm_close(pcm); else if (written <= 0)
LOG_D("audio/player/alsa") << "error filling buffer"; {
return (void*)"snd_pcm_writei"; snd_pcm_close(pcm);
LOG_D("audio/player/alsa") << "error filling buffer";
return (void*)"snd_pcm_writei";
}
} }
position += written;
} }
delete[] buf;
position += written;
// Start playback // Start playback
LOG_D("audio/player/alsa") << "initial buffer filled, hitting start"; LOG_D("audio/player/alsa") << "initial buffer filled, hitting start";
@ -294,30 +294,31 @@ do_setup:
printf("---------\n\n"); printf("---------\n\n");
continue; continue;
} }
buf = new char[avail*framesize];
ps.provider->GetAudioWithVolume(buf, position, avail, ps.volume);
written = 0;
while (written <= 0)
{ {
written = snd_pcm_writei(pcm, buf, avail); std::unique_ptr<char[]> buf{new char[avail*framesize]};
if (written == -ESTRPIPE || written == -EPIPE) ps.provider->GetAudioWithVolume(buf.get(), position, avail, ps.volume);
snd_pcm_sframes_t written = 0;
while (written <= 0)
{ {
snd_pcm_recover(pcm, written, 0); written = snd_pcm_writei(pcm, buf.get(), avail);
} if (written == -ESTRPIPE || written == -EPIPE)
else if (written == 0) {
{ snd_pcm_recover(pcm, written, 0);
break; }
} else if (written == 0)
else if (written < 0) {
{ break;
delete[] buf; }
snd_pcm_close(pcm); else if (written < 0)
LOG_D("audio/player/alsa") << "error filling buffer, written=" << written; {
return (void*)"snd_pcm_writei"; snd_pcm_close(pcm);
LOG_D("audio/player/alsa") << "error filling buffer, written=" << written;
return (void*)"snd_pcm_writei";
}
} }
position += written;
} }
delete[] buf;
position += written;
//LOG_D("audio/player/alsa") << "playback loop, filled buffer"; //LOG_D("audio/player/alsa") << "playback loop, filled buffer";
// Check for end of playback // Check for end of playback