[PATCH] Alsa plugin fix

[Fabien Chevalier <fabchevalier@free.fr>]

[-- Attachment #1: Type: text/plain, Size: 805 bytes --]

All,

I've spent most of my afternoon fixing the support for my favorite media 
player, the descendant of XMMS : audacious. :-)

Audacious was almost working except for a *very* annoying bug (in our 
side :-( ). It would
eventually stop playing at the end of each song, which meant i would 
have to manually select the next song and hit play again... not very 
funny :-(

Now it looks it works perfectly (didn't have time to check that in 
details, but that should be fixed as soon i tomorrow, after i would
have spent the most part of the day listening to music with Audacious ;-) )

The patch is fairly simple, it implements the delay() call to make sure 
we change the pcm state to the XRUN state whenever the hw_ptr moves
on top of appl_ptr.

Anybody to review it and commit to CVS ?

Cheers,

Fabien

[-- Attachment #2: plugin-xun-fix.diff --]
[-- Type: text/plain, Size: 1391 bytes --]

Index: pcm_bluetooth.c
===================================================================
--- pcm_bluetooth.c	(révision 74)
+++ pcm_bluetooth.c	(copie de travail)
@@ -764,6 +764,25 @@
 	return ret;
 }
 
+static int bluetooth_playback_delay(snd_pcm_ioplug_t *io, 
+				snd_pcm_sframes_t *delayp)
+{
+	DBG("");
+
+	/* This updates io->hw_ptr value using pointer() function */
+	snd_pcm_hwsync(io->pcm);
+ 	
+	*delayp = io->appl_ptr - io->hw_ptr;
+	if ((io->state == SND_PCM_STATE_RUNNING) && (*delayp < 0)) {
+		io->callback->stop(io);
+		io->state = SND_PCM_STATE_XRUN;
+		*delayp = 0;
+	}
+	/* This should never fail, ALSA API is really not
+	prepared to handle a non zero return value */
+	return 0;
+}
+
 static snd_pcm_ioplug_callback_t bluetooth_hsp_playback = {
 	.start			= bluetooth_playback_start,
 	.stop			= bluetooth_playback_stop,
@@ -774,6 +793,7 @@
 	.transfer		= bluetooth_hsp_write,
 	.poll_descriptors	= bluetooth_playback_poll_descriptors,
 	.poll_revents		= bluetooth_playback_poll_revents,
+	.delay			= bluetooth_playback_delay,
 };
 
 static snd_pcm_ioplug_callback_t bluetooth_hsp_capture = {
@@ -798,6 +818,7 @@
 	.transfer		= bluetooth_a2dp_write,
 	.poll_descriptors	= bluetooth_playback_poll_descriptors,
 	.poll_revents		= bluetooth_playback_poll_revents,
+	.delay			= bluetooth_playback_delay,
 };
 
 static snd_pcm_ioplug_callback_t bluetooth_a2dp_capture = {