All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Arkadiusz (Arkq) Bokowy" <arkadiusz.bokowy@gmail.com>
To: alsa-devel@alsa-project.org
Subject: [PATCH 3/3] plugio: Check for pointer callback error codes
Date: Sun, 7 Jan 2018 14:32:14 +0100	[thread overview]
Message-ID: <20180107143214.6d31af53@sambook> (raw)

plugio: Check for pointer callback error codes

By checking error code returned by the pointer callback, we can
determine more precisely PCM state. Previous implementation assumed,
that a software PCM can only produce overrun or underrun. It was
impossible to mark software PCM as disconnected.

Signed-off-by: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com>
---
 src/pcm/pcm_ioplug.c | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/pcm/pcm_ioplug.c b/src/pcm/pcm_ioplug.c
index 06c20d7b..cc234611 100644
--- a/src/pcm/pcm_ioplug.c
+++ b/src/pcm/pcm_ioplug.c
@@ -53,20 +53,29 @@ static int snd_pcm_ioplug_hw_ptr_update(snd_pcm_t
*pcm) {
 	ioplug_priv_t *io = pcm->private_data;
 	snd_pcm_sframes_t hw;
+	unsigned int delta;
 
 	hw = io->data->callback->pointer(io->data);
-	if (hw >= 0) {
-		unsigned int delta;
-		if ((unsigned int)hw >= io->last_hw)
-			delta = hw - io->last_hw;
-		else
-			delta = pcm->buffer_size + hw - io->last_hw;
-		snd_pcm_mmap_hw_forward(io->data->pcm, delta);
-		io->last_hw = hw;
-		return 0;
-	} else
-		io->data->state = SNDRV_PCM_STATE_XRUN;
-		return -EPIPE;
+	if (hw < 0) {
+		switch (hw) {
+		case -ESTRPIPE:
+			io->data->state = SND_PCM_STATE_SUSPENDED;
+			break;
+		case -ENODEV:
+			io->data->state = SND_PCM_STATE_DISCONNECTED;
+			break;
+		default:
+			io->data->state = SND_PCM_STATE_XRUN;
+		}
+		return hw;
+	}
+	if ((unsigned int)hw >= io->last_hw)
+		delta = hw - io->last_hw;
+	else
+		delta = pcm->buffer_size + hw - io->last_hw;
+	snd_pcm_mmap_hw_forward(io->data->pcm, delta);
+	io->last_hw = hw;
+	return 0;
 }
 
 static int snd_pcm_ioplug_info(snd_pcm_t *pcm, snd_pcm_info_t *info)
-- 
2.13.6

                 reply	other threads:[~2018-01-07 13:33 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180107143214.6d31af53@sambook \
    --to=arkadiusz.bokowy@gmail.com \
    --cc=alsa-devel@alsa-project.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.