|
 |
ad57e02 |
--- alsa-plugins-1.0.14.lennart/pulse/pcm_pulse.c 2007-09-24 01:43:01.000000000 +0200
|
|
|
ad57e02 |
+++ alsa-plugins-1.0.14/pulse/pcm_pulse.c 2007-10-01 21:36:53.000000000 +0200
|
|
|
ad57e02 |
@@ -36,6 +36,7 @@
|
|
|
ad57e02 |
/* Since ALSA expects a ring buffer we must do some voodoo. */
|
|
|
ad57e02 |
size_t last_size;
|
|
|
ad57e02 |
size_t ptr;
|
|
|
ad57e02 |
+ int underrun;
|
|
|
ad57e02 |
|
|
|
ad57e02 |
size_t offset;
|
|
|
ad57e02 |
|
|
|
ad57e02 |
@@ -90,7 +91,9 @@
|
|
|
ad57e02 |
if (err < 0) {
|
|
|
ad57e02 |
err = -EIO;
|
|
|
ad57e02 |
goto finish;
|
|
|
ad57e02 |
- }
|
|
|
ad57e02 |
+ } else
|
|
|
ad57e02 |
+ pcm->underrun = 0;
|
|
|
ad57e02 |
+
|
|
|
ad57e02 |
|
|
|
ad57e02 |
finish:
|
|
|
ad57e02 |
pa_threaded_mainloop_unlock(pcm->p->mainloop);
|
|
|
ad57e02 |
@@ -200,6 +203,9 @@
|
|
|
ad57e02 |
|
|
|
ad57e02 |
err = snd_pcm_bytes_to_frames(io->pcm, pcm->ptr);
|
|
|
ad57e02 |
|
|
|
ad57e02 |
+ if (pcm->underrun)
|
|
|
ad57e02 |
+ err = -EPIPE;
|
|
|
ad57e02 |
+
|
|
|
ad57e02 |
finish:
|
|
|
ad57e02 |
pa_threaded_mainloop_unlock(pcm->p->mainloop);
|
|
|
ad57e02 |
|
|
|
ad57e02 |
@@ -231,6 +237,10 @@
|
|
|
ad57e02 |
|
|
|
ad57e02 |
*delayp = snd_pcm_bytes_to_frames(io->pcm, pa_usec_to_bytes(lat, &pcm->ss));
|
|
|
ad57e02 |
|
|
|
ad57e02 |
+ /* Yes, this is evil, and we're not supposed to do this. */
|
|
|
ad57e02 |
+ if (pcm->underrun && pcm->io.state == SND_PCM_STATE_RUNNING)
|
|
|
ad57e02 |
+ pcm->io.state = SND_PCM_STATE_XRUN;
|
|
|
ad57e02 |
+
|
|
|
ad57e02 |
finish:
|
|
|
ad57e02 |
pa_threaded_mainloop_unlock(pcm->p->mainloop);
|
|
|
ad57e02 |
|
|
|
ad57e02 |
@@ -273,6 +283,7 @@
|
|
|
ad57e02 |
pulse_poll_deactivate(pcm->p);
|
|
|
ad57e02 |
|
|
|
ad57e02 |
err = size;
|
|
|
ad57e02 |
+ pcm->underrun = 0;
|
|
|
ad57e02 |
|
|
|
ad57e02 |
finish:
|
|
|
ad57e02 |
pa_threaded_mainloop_unlock(pcm->p->mainloop);
|
|
|
ad57e02 |
@@ -354,6 +365,15 @@
|
|
|
ad57e02 |
pulse_poll_activate(pcm->p);
|
|
|
ad57e02 |
}
|
|
|
ad57e02 |
|
|
|
ad57e02 |
+static void stream_underrun_cb(pa_stream *p, void *userdata) {
|
|
|
ad57e02 |
+ snd_pcm_pulse_t *pcm = userdata;
|
|
|
ad57e02 |
+
|
|
|
ad57e02 |
+ assert(pcm);
|
|
|
ad57e02 |
+ assert(pcm->p);
|
|
|
ad57e02 |
+
|
|
|
ad57e02 |
+ pcm->underrun = 1;
|
|
|
ad57e02 |
+}
|
|
|
ad57e02 |
+
|
|
|
ad57e02 |
static int pulse_pcm_poll_descriptors_count(snd_pcm_ioplug_t *io)
|
|
|
ad57e02 |
{
|
|
|
ad57e02 |
snd_pcm_pulse_t *pcm = io->private_data;
|
|
|
ad57e02 |
@@ -461,6 +481,7 @@
|
|
|
ad57e02 |
|
|
|
ad57e02 |
if (io->stream == SND_PCM_STREAM_PLAYBACK) {
|
|
|
ad57e02 |
pa_stream_set_write_callback(pcm->stream, stream_request_cb, pcm);
|
|
|
ad57e02 |
+ pa_stream_set_underflow_callback(pcm->stream, stream_underrun_cb, pcm);
|
|
|
ad57e02 |
pa_stream_connect_playback(pcm->stream, pcm->device, &pcm->buffer_attr,
|
|
|
ad57e02 |
PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_INTERPOLATE_TIMING, NULL, NULL);
|
|
|
ad57e02 |
} else {
|
|
|
ad57e02 |
@@ -480,6 +501,7 @@
|
|
|
ad57e02 |
pcm->last_size = 0;
|
|
|
ad57e02 |
pcm->ptr = 0;
|
|
|
ad57e02 |
pcm->offset = 0;
|
|
|
ad57e02 |
+ pcm->underrun = 0;
|
|
|
ad57e02 |
|
|
|
ad57e02 |
finish:
|
|
|
ad57e02 |
pa_threaded_mainloop_unlock(pcm->p->mainloop);
|