From 532c5eea391ebd00e0fb7bab6639580a6b15cc6c Mon Sep 17 00:00:00 2001 From: David Schleef Date: Sat, 3 Jan 2004 01:27:31 +0000 Subject: [PATCH] ext/alsa/gstalsasrc.c: Remove bogus "src" request pad. Original commit message from CVS: * ext/alsa/gstalsasrc.c: (gst_alsa_src_pad_factory), (gst_alsa_src_base_init): Remove bogus "src" request pad. * gst/mpegstream/gstmpegparse.c: (gst_mpeg_parse_base_init), (gst_mpeg_parse_class_init): Move pad template registration to class_init, since the derived class (mpegdemux) doesn't want them. --- ChangeLog | 9 +++++++++ ext/alsa/gstalsasrc.c | 12 ------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d3fb0a510..c988f937a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-01-02 David Schleef + + * ext/alsa/gstalsasrc.c: (gst_alsa_src_pad_factory), + (gst_alsa_src_base_init): Remove bogus "src" request pad. + * gst/mpegstream/gstmpegparse.c: (gst_mpeg_parse_base_init), + (gst_mpeg_parse_class_init): Move pad template registration + to class_init, since the derived class (mpegdemux) doesn't + want them. + 2004-01-03 Ronald Bultje * sys/ximage/Makefile.am: diff --git a/ext/alsa/gstalsasrc.c b/ext/alsa/gstalsasrc.c index 781e70ac26..373d107068 100644 --- a/ext/alsa/gstalsasrc.c +++ b/ext/alsa/gstalsasrc.c @@ -37,7 +37,6 @@ static GstElementDetails gst_alsa_src_details = GST_ELEMENT_DETAILS ( ); static GstPadTemplate * gst_alsa_src_pad_factory (void); -static GstPadTemplate * gst_alsa_src_request_pad_factory (void); static void gst_alsa_src_base_init (gpointer g_class); static void gst_alsa_src_class_init (gpointer g_class, gpointer class_data); @@ -65,17 +64,7 @@ gst_alsa_src_pad_factory (void) return template; } -static GstPadTemplate * -gst_alsa_src_request_pad_factory (void) -{ - static GstPadTemplate *template = NULL; - if (!template) - template = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS, - gst_alsa_caps (SND_PCM_FORMAT_UNKNOWN, -1, 1)); - - return template; -} GType gst_alsa_src_get_type (void) { @@ -105,7 +94,6 @@ gst_alsa_src_base_init (gpointer g_class) GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); gst_element_class_add_pad_template (element_class, gst_alsa_src_pad_factory ()); - gst_element_class_add_pad_template (element_class, gst_alsa_src_request_pad_factory ()); gst_element_class_set_details (element_class, &gst_alsa_src_details); }