mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-09 13:30:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pcm: dshare: Call snd_pcm_dshare_state() directly

Browse source 
... otherwise it may be a deadlock if recursive lock isn't available.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2017-05-30 17:33:17 +02:00
parent eae572ef5e
commit bb862e3bb1
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pcm/pcm_dshare.c
View file

@ -227,6 +227,8 @@ static int snd_pcm_dshare_sync_ptr(snd_pcm_t *pcm)
* plugin implementation * plugin implementation
*/ */
static snd_pcm_state_t snd_pcm_dshare_state(snd_pcm_t *pcm);
static int snd_pcm_dshare_status(snd_pcm_t *pcm, snd_pcm_status_t * status) static int snd_pcm_dshare_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
{ {
snd_pcm_direct_t *dshare = pcm->private_data; snd_pcm_direct_t *dshare = pcm->private_data;
@ -244,7 +246,7 @@ static int snd_pcm_dshare_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
default: default:
break; break;
} }
status->state = snd_pcm_state(pcm); status->state = snd_pcm_dshare_state(pcm);
status->trigger_tstamp = dshare->trigger_tstamp; status->trigger_tstamp = dshare->trigger_tstamp;
status->avail = snd_pcm_mmap_playback_avail(pcm); status->avail = snd_pcm_mmap_playback_avail(pcm);
status->avail_max = status->avail > dshare->avail_max ? status->avail : dshare->avail_max; status->avail_max = status->avail > dshare->avail_max ? status->avail : dshare->avail_max;