alsa-plugins/1.0.14-pulse-SND_PCM_STATE_PREPARED.patch
Eric Moret 512001cb3e - Update to upstream 1.0.15 (#429249)
- Add "Requires: pulseaudio" to alsa-plugins-pulseaudio (#368891)
- Fix pulse_hw_params() when state is SND_PCM_STATE_PREPARED (#428030)
- run /sbin/ldconfig on post and postun macros
2008-01-19 08:00:22 +00:00

23 lines
812 B
Diff

diff -up alsa-plugins-1.0.14/pulse/pcm_pulse.c.pulse alsa-plugins-1.0.14/pulse/pcm_pulse.c
--- alsa-plugins-1.0.14/pulse/pcm_pulse.c.pulse 2008-01-08 09:34:40.000000000 -1000
+++ alsa-plugins-1.0.14/pulse/pcm_pulse.c 2008-01-08 09:38:25.000000000 -1000
@@ -512,14 +512,16 @@ finish:
static int pulse_hw_params(snd_pcm_ioplug_t *io, snd_pcm_hw_params_t *params)
{
snd_pcm_pulse_t *pcm = io->private_data;
+ snd_pcm_t *base = io->pcm;
int err = 0;
assert(pcm);
assert(pcm->p);
- pa_threaded_mainloop_lock(pcm->p->mainloop);
+ if (!(base && snd_pcm_state(base) == SND_PCM_STATE_PREPARED))
+ assert(!pcm->stream);
- assert(!pcm->stream);
+ pa_threaded_mainloop_lock(pcm->p->mainloop);
pcm->frame_size = (snd_pcm_format_physical_width(io->format) * io->channels) / 8;