From 20081431d1019035f8189b30025476fb2c895d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 12 Feb 2008 20:09:07 +0000 Subject: [PATCH] ext/alsa/gstalsasink.c: Revert patch that makes the sink hold the object lock when calling snd_pcm_delay(), since it ... Original commit message from CVS: * ext/alsa/gstalsasink.c: (gst_alsasink_delay): Revert patch that makes the sink hold the object lock when calling snd_pcm_delay(), since it breaks playback for me. --- ChangeLog | 6 ++++++ ext/alsa/gstalsasink.c | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35a204724d..c504e1fa8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-02-12 Tim-Philipp Müller + + * ext/alsa/gstalsasink.c: (gst_alsasink_delay): + Revert patch that makes the sink hold the object lock when + calling snd_pcm_delay(), since it breaks playback for me. + 2008-02-12 Julien Moutte * tests/examples/seek/seek.c: (rate_spinbutton_changed_cb): Add diff --git a/ext/alsa/gstalsasink.c b/ext/alsa/gstalsasink.c index 9d57be5ec3..35347f4908 100644 --- a/ext/alsa/gstalsasink.c +++ b/ext/alsa/gstalsasink.c @@ -856,9 +856,7 @@ gst_alsasink_delay (GstAudioSink * asink) alsa = GST_ALSA_SINK (asink); - GST_ALSA_SINK_LOCK (asink); res = snd_pcm_delay (alsa->handle, &delay); - GST_ALSA_SINK_UNLOCK (asink); if (G_UNLIKELY (res < 0)) { GST_DEBUG_OBJECT (alsa, "snd_pcm_delay returned %d", res); delay = 0;