From e4ba5018559d09e153aafca1d1d52d9e1cced648 Mon Sep 17 00:00:00 2001 From: Tim-Philipp Müller Date: Fri, 22 Sep 2006 12:12:10 +0000 Subject: gst/autodetect/: Make static pad templates static to appease valgrind's leak detector. Original commit message from CVS: * gst/autodetect/gstautoaudiosink.c: (gst_auto_audio_sink_base_init): * gst/autodetect/gstautovideosink.c: (gst_auto_video_sink_base_init): Make static pad templates static to appease valgrind's leak detector. * tests/check/Makefile.am: * tests/check/elements/.cvsignore: * tests/check/elements/autodetect.c: (GST_START_TEST), (autodetect_suite): Add simple test for the ghostpad lockup on shutdown fixed in core CVS (audio bit disabled because it would need dozens of alsa suppressions and I'm too lazy to add those now). --- gst/autodetect/gstautoaudiosink.c | 19 ++++++++++--------- gst/autodetect/gstautovideosink.c | 20 +++++++++++--------- 2 files changed, 21 insertions(+), 18 deletions(-) (limited to 'gst/autodetect') diff --git a/gst/autodetect/gstautoaudiosink.c b/gst/autodetect/gstautoaudiosink.c index 13b0e657..8e8f14fa 100644 --- a/gst/autodetect/gstautoaudiosink.c +++ b/gst/autodetect/gstautoaudiosink.c @@ -52,19 +52,20 @@ gst_auto_audio_sink_change_state (GstElement * element, GST_BOILERPLATE (GstAutoAudioSink, gst_auto_audio_sink, GstBin, GST_TYPE_BIN); +static const GstElementDetails gst_auto_audio_sink_details = +GST_ELEMENT_DETAILS ("Auto audio sink", + "Sink/Audio", + "Wrapper audio sink for automatically detected audio sink", + "Ronald Bultje "); +static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS_ANY); + static void gst_auto_audio_sink_base_init (gpointer klass) { GstElementClass *eklass = GST_ELEMENT_CLASS (klass); - const GstElementDetails gst_auto_audio_sink_details = - GST_ELEMENT_DETAILS ("Auto audio sink", - "Sink/Audio", - "Wrapper audio sink for automatically detected audio sink", - "Ronald Bultje "); - GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", - GST_PAD_SINK, - GST_PAD_ALWAYS, - GST_STATIC_CAPS_ANY); gst_element_class_add_pad_template (eklass, gst_static_pad_template_get (&sink_template)); diff --git a/gst/autodetect/gstautovideosink.c b/gst/autodetect/gstautovideosink.c index 779acf12..6d5a9312 100644 --- a/gst/autodetect/gstautovideosink.c +++ b/gst/autodetect/gstautovideosink.c @@ -52,19 +52,21 @@ gst_auto_video_sink_change_state (GstElement * element, GST_BOILERPLATE (GstAutoVideoSink, gst_auto_video_sink, GstBin, GST_TYPE_BIN); +static const GstElementDetails gst_auto_video_sink_details = +GST_ELEMENT_DETAILS ("Auto video sink", + "Sink/Video", + "Wrapper video sink for automatically detected video sink", + "Ronald Bultje "); + +static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", + GST_PAD_SINK, + GST_PAD_ALWAYS, + GST_STATIC_CAPS_ANY); + static void gst_auto_video_sink_base_init (gpointer klass) { GstElementClass *eklass = GST_ELEMENT_CLASS (klass); - const GstElementDetails gst_auto_video_sink_details = - GST_ELEMENT_DETAILS ("Auto video sink", - "Sink/Video", - "Wrapper video sink for automatically detected video sink", - "Ronald Bultje "); - GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", - GST_PAD_SINK, - GST_PAD_ALWAYS, - GST_STATIC_CAPS_ANY); gst_element_class_add_pad_template (eklass, gst_static_pad_template_get (&sink_template)); -- cgit