MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-26 15:15:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

[alsa] Avoid call to snd_pcm_prepare if already in the right state

Browse Source
This commit is contained in:
ejurgensen 2016-04-12 23:23:29 +02:00
parent 19181007f4
commit e23fed4ac4
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/outputs/alsa.c
View File

@ -531,14 +531,22 @@ static void
playback_start(struct alsa_session *as, uint64_t pos, uint64_t start_pos)
{
snd_output_t *output;
snd_pcm_state_t state;
char *debug_pcm_cfg;
int ret;
ret = snd_pcm_prepare(hdl);
if (ret < 0)
state = snd_pcm_state(hdl);
if (state != SND_PCM_STATE_PREPARED)
{
DPRINTF(E_LOG, L_LAUDIO, "Could not prepare ALSA device '%s': %s\n", as->devname, snd_strerror(ret));
return;
if (state == SND_PCM_STATE_RUNNING)
snd_pcm_drop(hdl);
ret = snd_pcm_prepare(hdl);
if (ret < 0)
{
DPRINTF(E_LOG, L_LAUDIO, "Could not prepare ALSA device '%s' (state %d): %s\n", as->devname, state, snd_strerror(ret));
return;
}
}
// Clear prebuffer in case start somehow got called twice without a stop in between