From dab2b58e0ee2758335fa18d80f91dd8d49bff733 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 15 Mar 2005 11:39:51 +0000 Subject: [PATCH] Fix resume of dmix, dsnoop and dshare plugins Fix the resume of dmix, dsnoop and dshare plugins. [This replaces the timer mode with TREAD mode, and may trigger Oops with the older kernel...] --- src/pcm/pcm_direct.c | 13 +++++++++++-- src/pcm/pcm_dmix.c | 16 ++++++++++++---- src/pcm/pcm_dshare.c | 16 ++++++++++++---- src/pcm/pcm_dsnoop.c | 16 ++++++++++++---- 4 files changed, 47 insertions(+), 14 deletions(-) diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c index 80c9b212..f249e195 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c @@ -421,7 +421,7 @@ int snd_pcm_direct_poll_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned in unsigned short events; /* rbuf might be overwriten by multiple plugins */ /* we don't need the value */ - static snd_timer_read_t rbuf[5]; + static snd_timer_tread_t rbuf; assert(pfds && nfds == 1 && revents); events = pfds[0].revents; @@ -440,6 +440,14 @@ int snd_pcm_direct_poll_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned in if (empty) events &= ~(POLLOUT|POLLIN); } + switch (snd_pcm_state(dmix->spcm)) { + case SND_PCM_STATE_XRUN: + case SND_PCM_STATE_SUSPENDED: + events |= POLLERR; + break; + default: + break; + } *revents = events; return 0; } @@ -840,7 +848,7 @@ int snd_pcm_direct_initialize_poll_fd(snd_pcm_direct_t *dmix) snd_pcm_info_get_card(info), snd_pcm_info_get_device(info), snd_pcm_info_get_subdevice(info) * 2 + capture); - ret = snd_timer_open(&dmix->timer, name, SND_TIMER_OPEN_NONBLOCK); + ret = snd_timer_open(&dmix->timer, name, SND_TIMER_OPEN_NONBLOCK | SND_TIMER_OPEN_TREAD); if (ret < 0) { SNDERR("unable to open timer '%s'", name); return ret; @@ -848,6 +856,7 @@ int snd_pcm_direct_initialize_poll_fd(snd_pcm_direct_t *dmix) snd_timer_params_set_auto_start(params, 1); snd_timer_params_set_early_event(params, 1); snd_timer_params_set_ticks(params, 1); + snd_timer_params_set_filter(params, (1<timer, params); if (ret < 0) { SNDERR("unable to set timer parameters", name); diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c index 978368c5..415f75ea 100644 --- a/src/pcm/pcm_dmix.c +++ b/src/pcm/pcm_dmix.c @@ -314,7 +314,7 @@ static snd_pcm_state_t snd_pcm_dmix_state(snd_pcm_t *pcm) snd_pcm_direct_t *dmix = pcm->private_data; switch (snd_pcm_state(dmix->spcm)) { case SND_PCM_STATE_SUSPENDED: - return -ESTRPIPE; + return SND_PCM_STATE_SUSPENDED; case SND_PCM_STATE_DISCONNECTED: dmix->state = SND_PCM_STATE_DISCONNECTED; return -ENOTTY; @@ -493,10 +493,10 @@ static snd_pcm_sframes_t snd_pcm_dmix_forward(snd_pcm_t *pcm, snd_pcm_uframes_t return frames; } -static int snd_pcm_dmix_resume(snd_pcm_t *pcm ATTRIBUTE_UNUSED) +static int snd_pcm_dmix_resume(snd_pcm_t *pcm) { - // snd_pcm_direct_t *dmix = pcm->private_data; - // FIXME + snd_pcm_direct_t *dmix = pcm->private_data; + snd_pcm_resume(dmix->spcm); return 0; } @@ -543,6 +543,14 @@ static snd_pcm_sframes_t snd_pcm_dmix_mmap_commit(snd_pcm_t *pcm, snd_pcm_direct_t *dmix = pcm->private_data; int err; + switch (snd_pcm_state(dmix->spcm)) { + case SND_PCM_STATE_XRUN: + return -EPIPE; + case SND_PCM_STATE_SUSPENDED: + return -ESTRPIPE; + default: + break; + } snd_pcm_mmap_appl_forward(pcm, size); if (dmix->state == SND_PCM_STATE_RUNNING) { err = snd_pcm_dmix_sync_ptr(pcm); diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c index 9b09a8b0..ee5ad0f1 100644 --- a/src/pcm/pcm_dshare.c +++ b/src/pcm/pcm_dshare.c @@ -202,7 +202,7 @@ static snd_pcm_state_t snd_pcm_dshare_state(snd_pcm_t *pcm) snd_pcm_direct_t *dshare = pcm->private_data; switch (snd_pcm_state(dshare->spcm)) { case SND_PCM_STATE_SUSPENDED: - return -ESTRPIPE; + return SND_PCM_STATE_SUSPENDED; case SND_PCM_STATE_DISCONNECTED: dshare->state = SNDRV_PCM_STATE_DISCONNECTED; return -ENOTTY; @@ -379,10 +379,10 @@ static snd_pcm_sframes_t snd_pcm_dshare_forward(snd_pcm_t *pcm, snd_pcm_uframes_ return frames; } -static int snd_pcm_dshare_resume(snd_pcm_t *pcm ATTRIBUTE_UNUSED) +static int snd_pcm_dshare_resume(snd_pcm_t *pcm) { - // snd_pcm_direct_t *dshare = pcm->private_data; - // FIXME + snd_pcm_direct_t *dshare = pcm->private_data; + snd_pcm_resume(dshare->spcm); return 0; } @@ -430,6 +430,14 @@ static snd_pcm_sframes_t snd_pcm_dshare_mmap_commit(snd_pcm_t *pcm, snd_pcm_direct_t *dshare = pcm->private_data; int err; + switch (snd_pcm_state(dshare->spcm)) { + case SND_PCM_STATE_XRUN: + return -EPIPE; + case SND_PCM_STATE_SUSPENDED: + return -ESTRPIPE; + default: + break; + } snd_pcm_mmap_appl_forward(pcm, size); if (dshare->state == SND_PCM_STATE_RUNNING) { err = snd_pcm_dshare_sync_ptr(pcm); diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c index d5934833..c287db67 100644 --- a/src/pcm/pcm_dsnoop.c +++ b/src/pcm/pcm_dsnoop.c @@ -185,7 +185,7 @@ static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm) snd_pcm_direct_t *dsnoop = pcm->private_data; switch (snd_pcm_state(dsnoop->spcm)) { case SND_PCM_STATE_SUSPENDED: - return -ESTRPIPE; + return SND_PCM_STATE_SUSPENDED; case SND_PCM_STATE_DISCONNECTED: dsnoop->state = SNDRV_PCM_STATE_DISCONNECTED; return -ENOTTY; @@ -349,10 +349,10 @@ static snd_pcm_sframes_t snd_pcm_dsnoop_forward(snd_pcm_t *pcm, snd_pcm_uframes_ return frames; } -static int snd_pcm_dsnoop_resume(snd_pcm_t *pcm ATTRIBUTE_UNUSED) +static int snd_pcm_dsnoop_resume(snd_pcm_t *pcm) { - // snd_pcm_direct_t *dsnoop = pcm->private_data; - // FIXME + snd_pcm_direct_t *dsnoop = pcm->private_data; + snd_pcm_resume(dsnoop->spcm); return 0; } @@ -398,6 +398,14 @@ static snd_pcm_sframes_t snd_pcm_dsnoop_mmap_commit(snd_pcm_t *pcm, snd_pcm_direct_t *dsnoop = pcm->private_data; int err; + switch (snd_pcm_state(dsnoop->spcm)) { + case SND_PCM_STATE_XRUN: + return -EPIPE; + case SND_PCM_STATE_SUSPENDED: + return -ESTRPIPE; + default: + break; + } if (dsnoop->state == SND_PCM_STATE_RUNNING) { err = snd_pcm_dsnoop_sync_ptr(pcm); if (err < 0) -- 2.47.1