ext/alsa/gstalsasink.c: Ignore errors in reset, these are not fatal. They also grab the element lock which is already...

Original commit message from CVS:
* ext/alsa/gstalsasink.c: (gst_alsasink_reset):
Ignore errors in reset, these are not fatal. They also grab the element
lock which is already taking when this function is called. Fixes
#405451.

2 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 2a9b15ac..00646251 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-15  Wim Taymans  <wim@fluendo.com>
+
+	* ext/alsa/gstalsasink.c: (gst_alsasink_reset):
+	Ignore errors in reset, these are not fatal. They also grab the element
+	lock which is already taking when this function is called. Fixes
+	#405451.
+
 2007-02-13  Stefan Kost  <ensonic@users.sf.net>
 
 	* configure.ac:
diff --git a/ext/alsa/gstalsasink.c b/ext/alsa/gstalsasink.c
index dd8e7984..75bad46d 100644
--- a/ext/alsa/gstalsasink.c
+++ b/ext/alsa/gstalsasink.c
@@ -851,15 +851,15 @@ gst_alsasink_reset (GstAudioSink * asink)
   /* ERRORS */
 drop_error:
   {
-    GST_ELEMENT_ERROR (alsa, RESOURCE, SETTINGS,
-        ("alsa-reset: pcm drop error: %s", snd_strerror (err)), (NULL));
+    GST_ERROR_OBJECT (alsa, "alsa-reset: pcm drop error: %s",
+        snd_strerror (err));
     GST_ALSA_UNLOCK (asink);
     return;
   }
 prepare_error:
   {
-    GST_ELEMENT_ERROR (alsa, RESOURCE, SETTINGS,
-        ("alsa-reset: pcm prepare error: %s", snd_strerror (err)), (NULL));
+    GST_ERROR_OBJECT (alsa, "alsa-reset: pcm prepare error: %s",
+        snd_strerror (err));
     GST_ALSA_UNLOCK (asink);
     return;
   }