This should have been committed along with the changelog entry a few hours ago

Original commit message from CVS:
This should have been committed along with the changelog entry a few hours ago
This commit is contained in:
Ronald S. Bultje 2004-01-06 20:42:03 +00:00
parent 68d66772de
commit c8e0a3a743

View file

@ -63,29 +63,16 @@ enum {
ARG_IRC, /* IRC server (shoutcast only) */ ARG_IRC, /* IRC server (shoutcast only) */
}; };
static GstPadTemplate* static GstStaticPadTemplate sink_template_factory =
sink_template_factory (void) GST_STATIC_PAD_TEMPLATE (
{ "sink",
static GstPadTemplate *template = NULL; GST_PAD_SINK,
GST_PAD_ALWAYS,
if (!template) { GST_STATIC_CAPS ("audio/mpeg, "
template = gst_pad_template_new ( "mpegversion = (int) 1, "
"sink", "layer = (int) [ 1, 3 ]"
GST_PAD_SINK, )
GST_PAD_ALWAYS, );
gst_caps_new (
"icecastsend_sink",
"audio/mpeg",
gst_props_new (
"mpegversion", GST_PROPS_INT (1),
"layer", GST_PROPS_INT_RANGE (1, 3),
NULL
)),
NULL);
}
return template;
}
static void gst_icecastsend_class_init (GstIcecastSendClass *klass); static void gst_icecastsend_class_init (GstIcecastSendClass *klass);
static void gst_icecastsend_base_init (GstIcecastSendClass *klass); static void gst_icecastsend_base_init (GstIcecastSendClass *klass);
@ -125,7 +112,8 @@ gst_icecastsend_base_init (GstIcecastSendClass *klass)
{ {
GstElementClass *element_class = GST_ELEMENT_CLASS (klass); GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
gst_element_class_add_pad_template (element_class, sink_template_factory()); gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&sink_template_factory));
gst_element_class_set_details (element_class, &icecastsend_details); gst_element_class_set_details (element_class, &icecastsend_details);
} }
@ -204,7 +192,10 @@ gst_icecastsend_class_init (GstIcecastSendClass *klass)
static void static void
gst_icecastsend_init (GstIcecastSend *icecastsend) gst_icecastsend_init (GstIcecastSend *icecastsend)
{ {
icecastsend->sinkpad = gst_pad_new_from_template (sink_template_factory (), "sink"); GstElementClass *klass = GST_ELEMENT_GET_CLASS (icecastsend);
icecastsend->sinkpad = gst_pad_new_from_template (
gst_element_class_get_pad_template (klass, "sink"), "sink");
gst_element_add_pad(GST_ELEMENT(icecastsend),icecastsend->sinkpad); gst_element_add_pad(GST_ELEMENT(icecastsend),icecastsend->sinkpad);
gst_pad_set_chain_function(icecastsend->sinkpad,gst_icecastsend_chain); gst_pad_set_chain_function(icecastsend->sinkpad,gst_icecastsend_chain);