summaryrefslogtreecommitdiffstats
path: root/ext/gconf/gstgconfaudiosrc.c
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2007-03-04 13:52:03 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2007-03-04 13:52:03 +0000
commitde1357a4074d7cab9df163237bcfbce653d417e7 (patch)
treefe0a5f3335039c705d0d7c1b2f1c2367eac4231e /ext/gconf/gstgconfaudiosrc.c
parent382d7f0ba54a4752275446e613b1b295203e9dbf (diff)
Fix a bunch of leaks shown by the newly-added states test.
Original commit message from CVS: * ext/flac/gstflacenc.c: (gst_flac_enc_finalize): * ext/gconf/gstgconfaudiosink.c: (gst_gconf_audio_sink_class_init), (gst_gconf_audio_sink_dispose), (gst_gconf_audio_sink_finalize): * ext/gconf/gstgconfaudiosrc.c: (gst_gconf_audio_src_base_init), (gst_gconf_audio_src_class_init), (gst_gconf_audio_src_dispose), (gst_gconf_audio_src_finalize), (do_toggle_element): * ext/gconf/gstgconfvideosink.c: (gst_gconf_video_sink_base_init), (gst_gconf_video_sink_class_init), (gst_gconf_video_sink_finalize), (do_toggle_element): * ext/gconf/gstgconfvideosrc.c: (gst_gconf_video_src_base_init), (gst_gconf_video_src_class_init), (gst_gconf_video_src_dispose), (gst_gconf_video_src_finalize), (do_toggle_element): * ext/gconf/gstswitchsink.c: (gst_switch_sink_class_init), (gst_switch_sink_reset), (gst_switch_sink_set_child): * ext/hal/gsthalaudiosink.c: (gst_hal_audio_sink_base_init): * ext/hal/gsthalaudiosrc.c: (gst_hal_audio_src_base_init): * ext/shout2/gstshout2.c: (gst_shout2send_class_init), (gst_shout2send_init), (gst_shout2send_finalize): * gst/debug/testplugin.c: (gst_test_class_init), (gst_test_finalize): * gst/flx/gstflxdec.c: (gst_flxdec_class_init), (gst_flxdec_dispose): * gst/multipart/multipartmux.c: (gst_multipart_mux_finalize): * gst/rtp/gstrtpmp4gpay.c: (gst_rtp_mp4g_pay_finalize): * gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_init), (gst_rtspsrc_finalize): * gst/rtsp/rtspextwms.c: (rtsp_ext_wms_free_context): * gst/rtsp/rtspextwms.h: * gst/smpte/gstsmpte.c: (gst_smpte_class_init), (gst_smpte_finalize): * gst/udp/gstmultiudpsink.c: (gst_multiudpsink_finalize): * gst/udp/gstudpsink.c: (gst_udpsink_class_init), (gst_udpsink_finalize): * gst/wavparse/gstwavparse.c: (gst_wavparse_dispose), (gst_wavparse_sink_activate): * sys/oss/gstosssink.c: (gst_oss_sink_finalise): * sys/oss/gstosssrc.c: (gst_oss_src_class_init), (gst_oss_src_finalize): * sys/v4l2/gstv4l2object.c: (gst_v4l2_object_destroy): * sys/v4l2/gstv4l2object.h: * sys/v4l2/gstv4l2src.c: (gst_v4l2src_class_init), (gst_v4l2src_finalize): * sys/ximage/gstximagesrc.c: (gst_ximage_src_ximage_get): Fix a bunch of leaks shown by the newly-added states test.
Diffstat (limited to 'ext/gconf/gstgconfaudiosrc.c')
-rw-r--r--ext/gconf/gstgconfaudiosrc.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/ext/gconf/gstgconfaudiosrc.c b/ext/gconf/gstgconfaudiosrc.c
index 0203c2e2..b9379c4c 100644
--- a/ext/gconf/gstgconfaudiosrc.c
+++ b/ext/gconf/gstgconfaudiosrc.c
@@ -28,6 +28,7 @@
#include "gstgconfaudiosrc.h"
static void gst_gconf_audio_src_dispose (GObject * object);
+static void gst_gconf_audio_src_finalize (GstGConfAudioSrc * src);
static void cb_toggle_element (GConfClient * client,
guint connection_id, GConfEntry * entry, gpointer data);
static GstStateChangeReturn
@@ -45,7 +46,7 @@ gst_gconf_audio_src_base_init (gpointer klass)
"Source/Audio",
"Audio source embedding the GConf-settings for audio input",
"Ronald Bultje <rbultje@ronald.bitfreak.net>");
- GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
+ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
GST_STATIC_CAPS_ANY);
@@ -62,6 +63,7 @@ gst_gconf_audio_src_class_init (GstGConfAudioSrcClass * klass)
GstElementClass *eklass = GST_ELEMENT_CLASS (klass);
oklass->dispose = gst_gconf_audio_src_dispose;
+ oklass->finalize = (GObjectFinalizeFunc) gst_gconf_audio_src_finalize;
eklass->change_state = gst_gconf_audio_src_change_state;
}
@@ -122,10 +124,15 @@ gst_gconf_audio_src_dispose (GObject * object)
src->client = NULL;
}
+ GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
+}
+
+static void
+gst_gconf_audio_src_finalize (GstGConfAudioSrc * src)
+{
g_free (src->gconf_str);
- src->gconf_str = NULL;
- GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
+ GST_CALL_PARENT (G_OBJECT_CLASS, finalize, ((GObject *) (src)));
}
static gboolean
@@ -151,6 +158,7 @@ do_toggle_element (GstGConfAudioSrc * src)
if (cur >= GST_STATE_READY || next == GST_STATE_PAUSED) {
GST_DEBUG_OBJECT (src, "already running, ignoring GConf change");
+ g_free (new_gconf_str);
return TRUE;
}