gst-libs/gst/rtp/gstbasertpaudiopayload.c: Chain up to parent class in dispose functi...

Original commit message from CVS:
Patch by: Olivier Crete  <tester at tester ca>
* gst-libs/gst/rtp/gstbasertpaudiopayload.c:
(gst_base_rtp_audio_payload_class_init),
(gst_base_rtp_audio_payload_init),
(gst_base_rtp_audio_payload_dispose):
Chain up to parent class in dispose function; get rid of
unnecessary 'diposed' flag in private structure (#415001).

diff --git a/ChangeLog b/ChangeLog
index 6b9d3dbe8f182cbfc7f72998f0c3b4136165b566..5852007203cff40894387cb5287db78582c187c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-04-21  Tim-Philipp Müller  <tim at centricular dot net>
+
+       Patch by: Olivier Crete  <tester at tester ca>
+
+       * gst-libs/gst/rtp/gstbasertpaudiopayload.c:
+       (gst_base_rtp_audio_payload_class_init),
+       (gst_base_rtp_audio_payload_init),
+       (gst_base_rtp_audio_payload_dispose):
+         Chain up to parent class in dispose function; get rid of
+         unnecessary 'diposed' flag in private structure (#415001).
+
 2007-04-21  Tim-Philipp Müller  <tim at centricular dot net>
 
        * docs/libs/gst-plugins-base-libs.types:

diff --git a/gst-libs/gst/rtp/gstbasertpaudiopayload.c b/gst-libs/gst/rtp/gstbasertpaudiopayload.c
index b2d002a4a75e799bda54cc20250e74fea204bb9e..0136f47267161bf49609eded888b56ca898441a2 100644 (file)
--- a/gst-libs/gst/rtp/gstbasertpaudiopayload.c
+++ b/gst-libs/gst/rtp/gstbasertpaudiopayload.c
@@ -81,7 +81,6 @@ struct _GstBaseRTPAudioPayloadPrivate
   AudioCodecType type;
   GstAdapter *adapter;
   guint64 min_ptime;
-  gboolean disposed;
 };
 
 #define DEFAULT_MIN_PTIME 0
@@ -153,7 +152,7 @@ gst_base_rtp_audio_payload_class_init (GstBaseRTPAudioPayloadClass * klass)
   gobject_class->set_property = gst_base_rtp_payload_audio_set_property;
   gobject_class->get_property = gst_base_rtp_payload_audio_get_property;
 
-  parent_class = g_type_class_ref (GST_TYPE_BASE_RTP_PAYLOAD);
+  parent_class = g_type_class_peek_parent (klass);
 
   gstbasertppayload_class->handle_buffer =
       GST_DEBUG_FUNCPTR (gst_base_rtp_audio_payload_handle_buffer);
@@ -199,7 +198,6 @@ gst_base_rtp_audio_payload_init (GstBaseRTPAudioPayload * basertpaudiopayload,
   basertpaudiopayload->sample_size = 0;
 
   basertpaudiopayload->priv->adapter = gst_adapter_new ();
-  basertpaudiopayload->priv->disposed = FALSE;
 
   gst_pad_add_event_probe (basertppayload->sinkpad,
       G_CALLBACK (gst_base_rtp_payload_audio_handle_event), NULL);
@@ -213,14 +211,12 @@ gst_base_rtp_audio_payload_dispose (GObject * object)
 
   basertpaudiopayload = GST_BASE_RTP_AUDIO_PAYLOAD (object);
 
-  if (basertpaudiopayload->priv->disposed)
-    return;
-  basertpaudiopayload->priv->disposed = TRUE;
-
   if (basertpaudiopayload->priv->adapter) {
     g_object_unref (basertpaudiopayload->priv->adapter);
     basertpaudiopayload->priv->adapter = NULL;
   }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
 }