Commit fd0f54c5 authored by Wim Taymans's avatar Wim Taymans
Browse files

ext/alsa/gstalsasink.c: Also release lock when we get an error in _reset(); fix an error message.

Original commit message from CVS:
* ext/alsa/gstalsasink.c: (gst_alsasink_open),
(gst_alsasink_reset):
Also release lock when we get an error in _reset();
fix an error message.
parent 943dfba9
2006-02-17 Wim Taymans <wim@fluendo.com>
* ext/alsa/gstalsasink.c: (gst_alsasink_open),
(gst_alsasink_reset):
Also release lock when we get an error in _reset();
fix an error message.
2006-02-16 Tim-Philipp Müller <tim at centricular dot net>
 
* ext/alsa/gstalsasink.c: (gst_alsasink_class_init),
......
......@@ -713,7 +713,7 @@ gst_alsasink_open (GstAudioSink * asink)
open_error:
{
if (err == -EBUSY) {
GST_ELEMENT_ERROR (alsa, RESOURCE, BUSY, (NULL), (NULL));
GST_ELEMENT_ERROR (alsa, RESOURCE, BUSY, (NULL), ("Device is busy"));
} else {
GST_ELEMENT_ERROR (alsa, RESOURCE, OPEN_WRITE,
(NULL), ("Playback open error: %s", snd_strerror (err)));
......@@ -941,12 +941,14 @@ drop_error:
{
GST_ELEMENT_ERROR (alsa, RESOURCE, SETTINGS,
("alsa-reset: pcm drop error: %s", snd_strerror (err)), (NULL));
GST_ALSA_UNLOCK (asink);
return;
}
prepare_error:
{
GST_ELEMENT_ERROR (alsa, RESOURCE, SETTINGS,
("alsa-reset: pcm prepare error: %s", snd_strerror (err)), (NULL));
GST_ALSA_UNLOCK (asink);
return;
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment