Properly reset the internal state without leaking the filehandle

Original commit message from CVS:
Properly reset the internal state without leaking the filehandle

diff --git a/sys/oss/gstosscommon.c b/sys/oss/gstosscommon.c
index 50128c798fb4a75e2f1fd49b1a5dc7d5e98d7eee..65c8a7802d7900ce4438c040f0e17e2d5783e52c 100644 (file)
--- a/sys/oss/gstosscommon.c
+++ b/sys/oss/gstosscommon.c
@@ -105,6 +105,12 @@ gst_osscommon_init (GstOssCommon *common)
   common->device = g_strdup ("/dev/dsp");
   common->fd = -1;
 
+  gst_osscommon_reset (common);
+}
+
+void 
+gst_osscommon_reset (GstOssCommon *common) 
+{
   common->law = 0;
   common->endianness = G_BYTE_ORDER;
   common->sign = TRUE;

diff --git a/sys/oss/gstosscommon.h b/sys/oss/gstosscommon.h
index ab5553ff98f94cb19913c2a980e54044d987b2e6..0c35bd061a83400484e38544fee89c2a96b857ae 100644 (file)
--- a/sys/oss/gstosscommon.h
+++ b/sys/oss/gstosscommon.h
@@ -57,6 +57,7 @@ struct _GstOssCommon
 };
 
 void           gst_osscommon_init              (GstOssCommon *common);
+void           gst_osscommon_reset             (GstOssCommon *common);
 
 gboolean       gst_osscommon_open_audio        (GstOssCommon *common, 
                                                 GstOssOpenMode mode, gchar **error);

diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c
index 2360302880d7992c350f7718791bffb5d41de349..ba86f91393fcea90ba5d966e7c054626212dca2b 100644 (file)
--- a/sys/oss/gstosssink.c
+++ b/sys/oss/gstosssink.c
@@ -589,7 +589,7 @@ gst_osssink_change_state (GstElement *element)
     case GST_STATE_PAUSED_TO_READY:
       if (GST_FLAG_IS_SET (element, GST_OSSSINK_OPEN))
         ioctl (osssink->common.fd, SNDCTL_DSP_RESET, 0);
-      gst_osscommon_init (&osssink->common);
+      gst_osscommon_reset (&osssink->common);
       break;
     case GST_STATE_READY_TO_NULL:
       if (GST_FLAG_IS_SET (element, GST_OSSSINK_OPEN)) {