mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

GstPadTemplate <-> gst_pad_template <-> GST_PAD_TEMPLATE same with *factory and typefind.

Browse source 
Original commit message from CVS:
GstPadTemplate <-> gst_pad_template <-> GST_PAD_TEMPLATE

same with *factory and typefind.

also, some -Werror fixes.
This commit is contained in:
Andy Wingo 2002-04-11 20:42:26 +00:00
parent 8c43b5fd9b
commit 06d94641c2
45 changed files with 218 additions and 290 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common

@ -1 +1 @@
Subproject commit d8fa5431e3f6f1b9c8be36bad079719a6c4b529a
Subproject commit 52a8d4bd490c495f1e71725644535dbf2cf209c7

12
examples/capsfilter/capsfilter1.c
View file

@ -39,20 +39,20 @@ main (gint argc, gchar *argv[])
}
pipeline = gst_pipeline_new ("main_pipeline");
filesrc = gst_elementfactory_make ("filesrc", "filesrc");
filesrc = gst_element_factory_make ("filesrc", "filesrc");
g_return_val_if_fail (filesrc, -1);
g_object_set (G_OBJECT (filesrc), "location", argv[1], NULL);
demux = gst_elementfactory_make ("mpegdemux", "demux");
demux = gst_element_factory_make ("mpegdemux", "demux");
g_return_val_if_fail (demux, -1);
g_signal_connect (G_OBJECT (demux), "new_pad", G_CALLBACK (new_pad_func), pipeline);
thread = gst_thread_new ("thread");
queue = gst_elementfactory_make ("queue", "queue");
mpeg2dec = gst_elementfactory_make ("mpeg2dec", "mpeg2dec");
queue = gst_element_factory_make ("queue", "queue");
mpeg2dec = gst_element_factory_make ("mpeg2dec", "mpeg2dec");
g_return_val_if_fail (mpeg2dec, -1);
colorspace = gst_elementfactory_make ("colorspace", "colorspace");
colorspace = gst_element_factory_make ("colorspace", "colorspace");
g_return_val_if_fail (colorspace, -1);
xvideosink = gst_elementfactory_make ("xvideosink", "xvideosink");
xvideosink = gst_element_factory_make ("xvideosink", "xvideosink");
g_return_val_if_fail (xvideosink, -1);
g_object_set (G_OBJECT (xvideosink), "toplevel", TRUE, NULL);

90
ext/arts/gst_arts.c
View file

@ -37,7 +37,7 @@ Stefan Westerfeld <stefan@space.twc.de>",
};
GST_PADTEMPLATE_FACTORY ( sink_temp,
GST_PAD_TEMPLATE_FACTORY ( sink_temp,
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
@ -54,7 +54,7 @@ GST_PADTEMPLATE_FACTORY ( sink_temp,
)
)
GST_PADTEMPLATE_FACTORY ( src_temp,
GST_PAD_TEMPLATE_FACTORY ( src_temp,
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
@ -67,38 +67,11 @@ GST_PADTEMPLATE_FACTORY ( src_temp,
"width", GST_PROPS_INT (16),
"signed", GST_PROPS_BOOLEAN (TRUE),
"channels", GST_PROPS_INT (2),
"endianness", GST_PROPS_INT (G_LITTLE_ENDIAN)
"rate", GST_PROPS_INT (44100),
"endianness", GST_PROPS_INT (G_BYTE_ORDER)
)
)
static GstPadTemplate*
mad_src_template_factory (void)
{
static GstPadTemplate *templ = NULL;
if (!templ) {
templ = gst_padtemplate_new (
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
gst_caps_new (
"mad_src",
"audio/raw",
gst_props_new (
"format", GST_PROPS_STRING ("int"),
"law", GST_PROPS_INT (0),
"endianness", GST_PROPS_INT (G_BYTE_ORDER),
"signed", GST_PROPS_BOOLEAN (TRUE),
"width", GST_PROPS_INT (16),
"depth", GST_PROPS_INT (16),
"rate", GST_PROPS_INT (44100),
"channels", GST_PROPS_INT (2),
NULL)),
NULL);
}
return templ;
}
enum {
ARG_0,
ARG_LAST,
@ -107,10 +80,6 @@ enum {
static void gst_arts_class_init (GstARTSClass *klass);
static void gst_arts_init (GstARTS *arts);
static void gst_arts_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
static void gst_arts_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
static GstElementStateReturn gst_arts_change_state (GstElement *element);
static void gst_arts_loop (GstElement *element);
@ -146,21 +115,15 @@ gst_arts_class_init (GstARTSClass *klass)
gobject_class = (GObjectClass*)klass;
gstelement_class = (GstElementClass*)klass;
gobject_class->set_property = gst_arts_set_property;
gobject_class->get_property = gst_arts_get_property;
gstelement_class->change_state = gst_arts_change_state;
}
static void
gst_arts_init (GstARTS *arts)
{
arts->sinkpad = gst_pad_new_from_template(GST_PADTEMPLATE_GET(sink_temp),"sink");
arts->sinkpad = gst_pad_new_from_template(GST_PAD_TEMPLATE_GET(sink_temp),"sink");
gst_element_add_pad(GST_ELEMENT(arts),arts->sinkpad);
/* arts->srcpad = gst_pad_new_from_template(GST_PADTEMPLATE_GET(src_temp),"src"); */
arts->srcpad = gst_pad_new_from_template(mad_src_template_factory (), "src");
arts->srcpad = gst_pad_new_from_template(GST_PAD_TEMPLATE_GET(src_temp),"src");
gst_element_add_pad(GST_ELEMENT(arts),arts->srcpad);
gst_element_set_loop_function (GST_ELEMENT (arts), gst_arts_loop);
@ -168,40 +131,6 @@ gst_arts_init (GstARTS *arts)
arts->wrapper = gst_arts_wrapper_new(arts->sinkpad,arts->srcpad);
}
static void
gst_arts_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
{
GstARTS *arts = (GstARTS*)object;
GstARTSClass *oclass = (GstARTSClass*)(G_OBJECT_CLASS (object));
}
static void
gst_arts_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
{
GstARTS *arts = (GstARTS*)object;
GstARTSClass *oclass = (GstARTSClass*)(G_OBJECT_CLASS (object));
}
static GstElementStateReturn
gst_arts_change_state (GstElement *element)
{
GstARTS *arts = (GstARTS*)element;
switch (GST_STATE_TRANSITION (element)) {
case GST_STATE_NULL_TO_READY:
break;
default:
break;
}
if (GST_ELEMENT_CLASS (parent_class)->change_state)
return GST_ELEMENT_CLASS (parent_class)->change_state (element);
return GST_STATE_SUCCESS;
}
static void
gst_arts_loop (GstElement *element)
{
@ -219,12 +148,11 @@ plugin_init (GModule *module, GstPlugin *plugin)
parent_class = g_type_class_ref(GST_TYPE_ELEMENT);
gstarts = gst_elementfactory_new("gstarts",GST_TYPE_ARTS,&gst_arts_details);
gstarts = gst_element_factory_new("gstarts",GST_TYPE_ARTS,&gst_arts_details);
g_return_val_if_fail(gstarts != NULL, FALSE);
gst_elementfactory_add_padtemplate(gstarts, GST_PADTEMPLATE_GET(sink_temp));
/* gst_elementfactory_add_padtemplate(gstarts, GST_PADTEMPLATE_GET(src_temp)); */
gst_elementfactory_add_padtemplate(gstarts, mad_src_template_factory ());
gst_element_factory_add_pad_template(gstarts, GST_PAD_TEMPLATE_GET(sink_temp));
gst_element_factory_add_pad_template(gstarts, GST_PAD_TEMPLATE_GET(src_temp));
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (gstarts));

2
ext/arts/gst_artsio_impl.cc
View file

@ -17,7 +17,7 @@ class ArtsStereoSink_impl : virtual public ArtsStereoSink_skel,
{
GstPad *sinkpad;
long remainingsamples;
unsigned long remainingsamples;
GstBuffer *inbuf;
unsigned char *dataptr;

8
ext/artsd/gstartsdsink.c
View file

@ -47,7 +47,7 @@ enum {
ARG_NAME,
};
GST_PADTEMPLATE_FACTORY (sink_factory,
GST_PAD_TEMPLATE_FACTORY (sink_factory,
"sink", /* the name of the pads */
GST_PAD_SINK, /* type of the pad */
GST_PAD_ALWAYS, /* ALWAYS/SOMETIMES */
@ -186,7 +186,7 @@ static void
gst_artsdsink_init(GstArtsdsink *artsdsink)
{
artsdsink->sinkpad = gst_pad_new_from_template (
GST_PADTEMPLATE_GET (sink_factory), "sink");
GST_PAD_TEMPLATE_GET (sink_factory), "sink");
gst_element_add_pad(GST_ELEMENT(artsdsink), artsdsink->sinkpad);
gst_pad_set_chain_function(artsdsink->sinkpad, gst_artsdsink_chain);
@ -323,11 +323,11 @@ plugin_init (GModule *module, GstPlugin *plugin)
{
GstElementFactory *factory;
factory = gst_elementfactory_new("artsdsink", GST_TYPE_ARTSDSINK,
factory = gst_element_factory_new("artsdsink", GST_TYPE_ARTSDSINK,
&artsdsink_details);
g_return_val_if_fail(factory != NULL, FALSE);
gst_elementfactory_add_padtemplate(factory, GST_PADTEMPLATE_GET (sink_factory));
gst_element_factory_add_pad_template(factory, GST_PAD_TEMPLATE_GET (sink_factory));
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));

10
ext/audiofile/gstafsink.c
View file

@ -51,7 +51,7 @@ enum {
/* added a sink factory function to force audio/raw MIME type */
/* I think the caps can be broader, we need to change that somehow */
GST_PADTEMPLATE_FACTORY (afsink_sink_factory,
GST_PAD_TEMPLATE_FACTORY (afsink_sink_factory,
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
@ -178,7 +178,7 @@ gst_afsink_init (GstAFSink *afsink)
/* GstPad *pad; this is now done in the struct */
afsink->sinkpad = gst_pad_new_from_template (
GST_PADTEMPLATE_GET (afsink_sink_factory), "sink");
GST_PAD_TEMPLATE_GET (afsink_sink_factory), "sink");
gst_element_add_pad (GST_ELEMENT (afsink), afsink->sinkpad);
gst_pad_set_chain_function (afsink->sinkpad, gst_afsink_chain);
@ -259,11 +259,11 @@ plugin_init (GModule *module, GstPlugin *plugin)
{
GstElementFactory *factory;
factory = gst_elementfactory_new ("afsink", GST_TYPE_AFSINK,
factory = gst_element_factory_new ("afsink", GST_TYPE_AFSINK,
&afsink_details);
g_return_val_if_fail (factory != NULL, FALSE);
gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (afsink_sink_factory));
gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (afsink_sink_factory));
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
@ -499,7 +499,7 @@ gst_afsink_factory_init (GstElementFactory *factory)
{
GstPadTemplate *sink_pt;
sink_pt = afsink_sink_factory();
gst_elementfactory_add_padtemplate (factory, sink_pt);
gst_element_factory_add_pad_template (factory, sink_pt);
return TRUE;

6
ext/audiofile/gstafsrc.c
View file

@ -50,7 +50,7 @@ enum {
/* added a src factory function to force audio/raw MIME type */
/* I think the caps can be broader, we need to change that somehow */
GST_PADTEMPLATE_FACTORY (afsrc_src_factory,
GST_PAD_TEMPLATE_FACTORY (afsrc_src_factory,
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
@ -276,11 +276,11 @@ plugin_init (GModule *module, GstPlugin *plugin)
{
GstElementFactory *factory;
factory = gst_elementfactory_new ("afsrc", GST_TYPE_AFSRC,
factory = gst_element_factory_new ("afsrc", GST_TYPE_AFSRC,
&afsrc_details);
g_return_val_if_fail (factory != NULL, FALSE);
gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (afsrc_src_factory));
gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (afsrc_src_factory));
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));

20
ext/gsm/gstgsm.c
View file

@ -58,7 +58,7 @@ plugin_init (GModule *module, GstPlugin *plugin)
GstCaps *raw_caps, *gsm_caps;
/* create an elementfactory for the gsmdec element */
enc = gst_elementfactory_new("gsmenc",GST_TYPE_GSMENC,
enc = gst_element_factory_new("gsmenc",GST_TYPE_GSMENC,
&gst_gsmenc_details);
g_return_val_if_fail(enc != NULL, FALSE);
@ -66,35 +66,35 @@ plugin_init (GModule *module, GstPlugin *plugin)
gsm_caps = GST_CAPS_GET (gsm_caps_factory);
/* register sink pads */
gsmenc_sink_template = gst_padtemplate_new ("sink", GST_PAD_SINK,
gsmenc_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK,
GST_PAD_ALWAYS,
raw_caps, NULL);
gst_elementfactory_add_padtemplate (enc, gsmenc_sink_template);
gst_element_factory_add_pad_template (enc, gsmenc_sink_template);
/* register src pads */
gsmenc_src_template = gst_padtemplate_new ("src", GST_PAD_SRC,
gsmenc_src_template = gst_pad_template_new ("src", GST_PAD_SRC,
GST_PAD_ALWAYS,
gsm_caps, NULL);
gst_elementfactory_add_padtemplate (enc, gsmenc_src_template);
gst_element_factory_add_pad_template (enc, gsmenc_src_template);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (enc));
/* create an elementfactory for the gsmdec element */
dec = gst_elementfactory_new("gsmdec",GST_TYPE_GSMDEC,
dec = gst_element_factory_new("gsmdec",GST_TYPE_GSMDEC,
&gst_gsmdec_details);
g_return_val_if_fail(dec != NULL, FALSE);
/* register sink pads */
gsmdec_sink_template = gst_padtemplate_new ("sink", GST_PAD_SINK,
gsmdec_sink_template = gst_pad_template_new ("sink", GST_PAD_SINK,
GST_PAD_ALWAYS,
gsm_caps, NULL);
gst_elementfactory_add_padtemplate (dec, gsmdec_sink_template);
gst_element_factory_add_pad_template (dec, gsmdec_sink_template);
/* register src pads */
gsmdec_src_template = gst_padtemplate_new ("src", GST_PAD_SRC,
gsmdec_src_template = gst_pad_template_new ("src", GST_PAD_SRC,
GST_PAD_ALWAYS,
raw_caps, NULL);
gst_elementfactory_add_padtemplate (dec, gsmdec_src_template);
gst_element_factory_add_pad_template (dec, gsmdec_src_template);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (dec));

20
ext/hermes/gstcolorspace.c
View file

@ -45,7 +45,7 @@ enum {
ARG_DEST,
};
GST_PADTEMPLATE_FACTORY (colorspace_src_template_factory,
GST_PAD_TEMPLATE_FACTORY (colorspace_src_template_factory,
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
@ -62,7 +62,7 @@ GST_PADTEMPLATE_FACTORY (colorspace_src_template_factory,
)
)
GST_PADTEMPLATE_FACTORY (colorspace_sink_template_factory,
GST_PAD_TEMPLATE_FACTORY (colorspace_sink_template_factory,
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
@ -250,7 +250,7 @@ gst_colorspace_getcaps (GstPad *pad, GstCaps *caps)
/* we can do everything our peer can... */
peercaps = gst_caps_copy (gst_pad_get_allowed_caps (space->srcpad));
/* and our own template of course */
ourcaps = gst_caps_copy (gst_pad_get_padtemplate_caps (pad));
ourcaps = gst_caps_copy (gst_pad_get_pad_template_caps (pad));
/* merge them together, we prefer the peercaps first */
result = gst_caps_prepend (ourcaps, peercaps);
@ -397,7 +397,7 @@ static void
gst_colorspace_init (GstColorspace *space)
{
space->sinkpad = gst_pad_new_from_template (
GST_PADTEMPLATE_GET (colorspace_sink_template_factory), "sink");
GST_PAD_TEMPLATE_GET (colorspace_sink_template_factory), "sink");
gst_pad_set_connect_function (space->sinkpad, gst_colorspace_sinkconnect);
gst_pad_set_getcaps_function (space->sinkpad, gst_colorspace_getcaps);
gst_pad_set_bufferpool_function (space->sinkpad, colorspace_get_bufferpool);
@ -405,7 +405,7 @@ gst_colorspace_init (GstColorspace *space)
gst_element_add_pad(GST_ELEMENT(space),space->sinkpad);
space->srcpad = gst_pad_new_from_template (
GST_PADTEMPLATE_GET (colorspace_src_template_factory), "src");
GST_PAD_TEMPLATE_GET (colorspace_src_template_factory), "src");
gst_element_add_pad(GST_ELEMENT(space),space->srcpad);
gst_pad_set_connect_function (space->srcpad, gst_colorspace_srcconnect);
@ -558,14 +558,14 @@ plugin_init (GModule *module, GstPlugin *plugin)
g_return_val_if_fail (hermes_res != 0, FALSE);
#endif
factory = gst_elementfactory_new ("colorspace", GST_TYPE_COLORSPACE,
factory = gst_element_factory_new ("colorspace", GST_TYPE_COLORSPACE,
&colorspace_details);
g_return_val_if_fail (factory != NULL, FALSE);
gst_elementfactory_add_padtemplate (factory,
GST_PADTEMPLATE_GET (colorspace_src_template_factory));
gst_elementfactory_add_padtemplate (factory,
GST_PADTEMPLATE_GET (colorspace_sink_template_factory));
gst_element_factory_add_pad_template (factory,
GST_PAD_TEMPLATE_GET (colorspace_src_template_factory));
gst_element_factory_add_pad_template (factory,
GST_PAD_TEMPLATE_GET (colorspace_sink_template_factory));
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));

14
ext/jack/gstjack.c
View file

@ -157,7 +157,7 @@ gst_jack_src_request_pad_factory(void)
static GstPadTemplate *template = NULL;
if (!template)
template = gst_padtemplate_new("%s", GST_PAD_SRC, GST_PAD_REQUEST,
template = gst_pad_template_new("%s", GST_PAD_SRC, GST_PAD_REQUEST,
gst_caps_new("src", "audio/raw",
GST_AUDIO_FLOAT_MONO_PAD_TEMPLATE_PROPS),
NULL);
@ -171,7 +171,7 @@ gst_jack_sink_request_pad_factory(void)
static GstPadTemplate *template = NULL;
if (!template)
template = gst_padtemplate_new("%s", GST_PAD_SINK, GST_PAD_REQUEST,
template = gst_pad_template_new("%s", GST_PAD_SINK, GST_PAD_REQUEST,
gst_caps_new("sink", "audio/raw",
GST_AUDIO_FLOAT_MONO_PAD_TEMPLATE_PROPS),
NULL);
@ -574,7 +574,7 @@ static void
shutdown (void *arg)
{
GstJackClient *client = (GstJackClient*) arg;
printf ("shutdown\n");
printf ("shutdown %p\n", client);
/* gst_element_set_state (GST_ELEMENT (client->manager), GST_STATE_READY); */
}
@ -588,14 +588,14 @@ plugin_init (GModule *module, GstPlugin *plugin)
return FALSE;
}
factory = gst_elementfactory_new ("jacksrc", GST_TYPE_JACK_SRC, &gst_jack_src_details);
factory = gst_element_factory_new ("jacksrc", GST_TYPE_JACK_SRC, &gst_jack_src_details);
g_return_val_if_fail (factory != NULL, FALSE);
gst_elementfactory_add_padtemplate (factory, gst_jack_src_request_pad_factory());
gst_element_factory_add_pad_template (factory, gst_jack_src_request_pad_factory());
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
factory = gst_elementfactory_new ("jacksink", GST_TYPE_JACK_SINK, &gst_jack_sink_details);
factory = gst_element_factory_new ("jacksink", GST_TYPE_JACK_SINK, &gst_jack_sink_details);
g_return_val_if_fail (factory != NULL, FALSE);
gst_elementfactory_add_padtemplate (factory, gst_jack_sink_request_pad_factory());
gst_element_factory_add_pad_template (factory, gst_jack_sink_request_pad_factory());
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
gst_plugin_set_longname(plugin, "JACK plugin library");

10
ext/ladspa/gstladspa.c
View file

@ -30,7 +30,7 @@ static GstPadTemplate*
ladspa_src_factory (void)
{
return
gst_padtemplate_new (
gst_pad_template_new (
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
@ -52,7 +52,7 @@ static GstPadTemplate*
ladspa_sink_factory (void)
{
return
gst_padtemplate_new (
gst_pad_template_new (
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
@ -936,7 +936,7 @@ ladspa_describe_plugin(const char *pcFullFilename,
details->copyright = g_strdup(desc->Copyright);
/* register the plugin with gstreamer */
factory = gst_elementfactory_new(type_name,type,details);
factory = gst_element_factory_new(type_name,type,details);
g_return_if_fail(factory != NULL);
gst_plugin_add_feature (ladspa_plugin, GST_PLUGIN_FEATURE (factory));
@ -951,13 +951,13 @@ ladspa_describe_plugin(const char *pcFullFilename,
if (LADSPA_IS_PORT_AUDIO(desc->PortDescriptors[j]) &&
LADSPA_IS_PORT_INPUT(desc->PortDescriptors[j])) {
sinktempl = ladspa_sink_factory();
gst_elementfactory_add_padtemplate (factory, sinktempl);
gst_element_factory_add_pad_template (factory, sinktempl);
break;
}
}
srctempl = ladspa_src_factory();
gst_elementfactory_add_padtemplate (factory, srctempl);
gst_element_factory_add_pad_template (factory, srctempl);
}
}

20
ext/lcs/gstcolorspace.c
View file

@ -82,7 +82,7 @@ enum {
ARG_DEST,
};
GST_PADTEMPLATE_FACTORY (colorspace_src_template_factory,
GST_PAD_TEMPLATE_FACTORY (colorspace_src_template_factory,
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
@ -99,7 +99,7 @@ GST_PADTEMPLATE_FACTORY (colorspace_src_template_factory,
)
)
GST_PADTEMPLATE_FACTORY (colorspace_sink_template_factory,
GST_PAD_TEMPLATE_FACTORY (colorspace_sink_template_factory,
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
@ -226,7 +226,7 @@ gst_colorspace_getcaps (GstPad *pad, GstCaps *caps)
/* we can do everything our peer can... */
peercaps = gst_caps_copy (gst_pad_get_allowed_caps (space->srcpad));
/* and our own template of course */
ourcaps = gst_caps_copy (gst_pad_get_padtemplate_caps (pad));
ourcaps = gst_caps_copy (gst_pad_get_pad_template_caps (pad));
/* merge them together, we prefer the peercaps first */
result = gst_caps_prepend (ourcaps, peercaps);
@ -373,7 +373,7 @@ static void
gst_colorspace_init (GstColorspace *space)
{
space->sinkpad = gst_pad_new_from_template (
GST_PADTEMPLATE_GET (colorspace_sink_template_factory), "sink");
GST_PAD_TEMPLATE_GET (colorspace_sink_template_factory), "sink");
gst_pad_set_connect_function (space->sinkpad, gst_colorspace_sinkconnect);
gst_pad_set_getcaps_function (space->sinkpad, gst_colorspace_getcaps);
gst_pad_set_bufferpool_function (space->sinkpad, colorspace_get_bufferpool);
@ -381,7 +381,7 @@ gst_colorspace_init (GstColorspace *space)
gst_element_add_pad(GST_ELEMENT(space),space->sinkpad);
space->srcpad = gst_pad_new_from_template (
GST_PADTEMPLATE_GET (colorspace_src_template_factory), "src");
GST_PAD_TEMPLATE_GET (colorspace_src_template_factory), "src");
gst_element_add_pad(GST_ELEMENT(space),space->srcpad);
gst_pad_set_connect_function (space->srcpad, gst_colorspace_srcconnect);
@ -502,14 +502,14 @@ plugin_init (GModule *module, GstPlugin *plugin)
lcs_init (NULL, NULL);
factory = gst_elementfactory_new ("colorspacelcs", GST_TYPE_COLORSPACE,
factory = gst_element_factory_new ("colorspacelcs", GST_TYPE_COLORSPACE,
&colorspace_details);
g_return_val_if_fail (factory != NULL, FALSE);
gst_elementfactory_add_padtemplate (factory,
GST_PADTEMPLATE_GET (colorspace_src_template_factory));
gst_elementfactory_add_padtemplate (factory,
GST_PADTEMPLATE_GET (colorspace_sink_template_factory));
gst_element_factory_add_pad_template (factory,
GST_PAD_TEMPLATE_GET (colorspace_src_template_factory));
gst_element_factory_add_pad_template (factory,
GST_PAD_TEMPLATE_GET (colorspace_sink_template_factory));
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));

6
ext/sdl/sdlvideosink.c
View file

@ -580,7 +580,7 @@ plugin_init (GModule *module, GstPlugin *plugin)
};
/* create an elementfactory for the sdlvideosink element */
factory = gst_elementfactory_new("sdlvideosink",GST_TYPE_SDLVIDEOSINK,
factory = gst_element_factory_new("sdlvideosink",GST_TYPE_SDLVIDEOSINK,
&gst_sdlvideosink_details);
g_return_val_if_fail(factory != NULL, FALSE);
@ -598,13 +598,13 @@ plugin_init (GModule *module, GstPlugin *plugin)
capslist = gst_caps_append(capslist, caps);
}
sink_template = gst_padtemplate_new (
sink_template = gst_pad_template_new (
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
capslist, NULL);
gst_elementfactory_add_padtemplate (factory, sink_template);
gst_element_factory_add_pad_template (factory, sink_template);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));

6
ext/shout/gstshout.c
View file

@ -70,7 +70,7 @@ sink_template_factory (void)
static GstPadTemplate *template = NULL;
if (!template) {
template = gst_padtemplate_new (
template = gst_pad_template_new (
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
@ -452,10 +452,10 @@ plugin_init (GModule *module, GstPlugin *plugin)
{
GstElementFactory *factory;
factory = gst_elementfactory_new("icecastsend", GST_TYPE_ICECASTSEND, &icecastsend_details);
factory = gst_element_factory_new("icecastsend", GST_TYPE_ICECASTSEND, &icecastsend_details);
g_return_val_if_fail(factory != NULL, FALSE);
gst_elementfactory_add_padtemplate (factory, sink_template_factory ());
gst_element_factory_add_pad_template (factory, sink_template_factory ());
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));

8
ext/smoothwave/demo-osssrc.c
View file

@ -24,14 +24,14 @@ int main(int argc,char *argv[]) {
bin = gst_bin_new("bin");
srcfactory = gst_elementfactory_find("audiosrc");
srcfactory = gst_element_factory_find("audiosrc");
g_return_val_if_fail(srcfactory != NULL, -1);
wavefactory = gst_elementfactory_find("smoothwave");
wavefactory = gst_element_factory_find("smoothwave");
g_return_val_if_fail(wavefactory != NULL, -1);
src = gst_elementfactory_create(srcfactory,"src");
src = gst_element_factory_create(srcfactory,"src");
gtk_object_set(GTK_OBJECT(src),"bytes_per_read",(gulong)2048,NULL);
wave = gst_elementfactory_create(wavefactory,"wave");
wave = gst_element_factory_create(wavefactory,"wave");
gtk_object_set(GTK_OBJECT(wave),"width",256,"height",100,NULL);

2
ext/smoothwave/gstsmoothwave.c
View file

@ -284,7 +284,7 @@ plugin_init (GModule *module, GstPlugin *plugin)
GstElementFactory *factory;
/* create an elementfactory for the smoothwave element */
factory = gst_elementfactory_new("smoothwave",GST_TYPE_SMOOTHWAVE,
factory = gst_element_factory_new("smoothwave",GST_TYPE_SMOOTHWAVE,
&gst_smoothwave_details);
g_return_val_if_fail(factory != NULL, FALSE);

30
ext/tarkin/gsttarkin.c
View file

@ -24,7 +24,7 @@
extern GstElementDetails tarkinenc_details;
extern GstElementDetails tarkindec_details;
static GstCaps* tarkin_typefind (GstBuffer *buf, gpointer private);
static GstCaps* tarkin_type_find (GstBuffer *buf, gpointer private);
GstPadTemplate *enc_src_template, *enc_sink_template;
GstPadTemplate *dec_src_template, *dec_sink_template;
@ -63,11 +63,11 @@ static GstTypeDefinition tarkindefinition =
"tarkin_video/x-ogg",
"video/x-ogg",
".ogg",
tarkin_typefind,
tarkin_type_find,
};
static GstCaps*
tarkin_typefind (GstBuffer *buf, gpointer private)
tarkin_type_find (GstBuffer *buf, gpointer private)
{
gulong head = GULONG_FROM_BE (*((gulong *)GST_BUFFER_DATA (buf)));
@ -77,7 +77,7 @@ tarkin_typefind (GstBuffer *buf, gpointer private)
if (head != 0x4F676753)
return NULL;
return gst_caps_new ("tarkin_typefind", "video/x-ogg", NULL);
return gst_caps_new ("tarkin_type_find", "video/x-ogg", NULL);
}
@ -91,7 +91,7 @@ plugin_init (GModule *module, GstPlugin *plugin)
gst_plugin_set_longname (plugin, "The OGG Vorbis Codec");
/* create an elementfactory for the tarkinenc element */
enc = gst_elementfactory_new ("tarkinenc", GST_TYPE_TARKINENC,
enc = gst_element_factory_new ("tarkinenc", GST_TYPE_TARKINENC,
&tarkinenc_details);
g_return_val_if_fail (enc != NULL, FALSE);
@ -99,25 +99,25 @@ plugin_init (GModule *module, GstPlugin *plugin)
tarkin_caps = tarkin_caps_factory ();
/* register sink pads */
enc_sink_template = gst_padtemplate_new ("sink",
enc_sink_template = gst_pad_template_new ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
raw_caps,
NULL);
gst_elementfactory_add_padtemplate (enc, enc_sink_template);
gst_element_factory_add_pad_template (enc, enc_sink_template);
/* register src pads */
enc_src_template = gst_padtemplate_new ("src",
enc_src_template = gst_pad_template_new ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
tarkin_caps,
NULL);
gst_elementfactory_add_padtemplate (enc, enc_src_template);
gst_element_factory_add_pad_template (enc, enc_src_template);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (enc));
/* create an elementfactory for the tarkindec element */
dec = gst_elementfactory_new ("tarkindec", GST_TYPE_TARKINDEC,
dec = gst_element_factory_new ("tarkindec", GST_TYPE_TARKINDEC,
&tarkindec_details);
g_return_val_if_fail (dec != NULL, FALSE);
@ -125,24 +125,24 @@ plugin_init (GModule *module, GstPlugin *plugin)
tarkin_caps = tarkin_caps_factory ();
/* register sink pads */
dec_sink_template = gst_padtemplate_new ("sink",
dec_sink_template = gst_pad_template_new ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
tarkin_caps,
NULL);
gst_elementfactory_add_padtemplate (dec, dec_sink_template);
gst_element_factory_add_pad_template (dec, dec_sink_template);
/* register src pads */
dec_src_template = gst_padtemplate_new ("src",
dec_src_template = gst_pad_template_new ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
raw_caps,
NULL);
gst_elementfactory_add_padtemplate (dec, dec_src_template);
gst_element_factory_add_pad_template (dec, dec_src_template);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (dec));
type = gst_typefactory_new (&tarkindefinition);
type = gst_type_factory_new (&tarkindefinition);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (type));
return TRUE;

2
gst-libs/gst/audio/audio.h
View file

@ -31,7 +31,7 @@
* for example, to make a source pad that can output mono streams of either
* float or int:
template = gst_padtemplate_new
template = gst_pad_template_new
("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
gst_caps_append(gst_caps_new ("sink_int", "audio/raw",
GST_AUDIO_INT_PAD_TEMPLATE_PROPS),

10
gst/chart/gstchart.c
View file

@ -86,7 +86,7 @@ src_template_factory (void)
static GstPadTemplate *template = NULL;
if (!template) {
template = gst_padtemplate_new (
template = gst_pad_template_new (
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
@ -127,7 +127,7 @@ sink_template_factory (void)
static GstPadTemplate *template = NULL;
if (!template) {
template = gst_padtemplate_new (
template = gst_pad_template_new (
"sink", /* the name of the pads */
GST_PAD_SINK, /* type of the pad */
GST_PAD_ALWAYS, /* ALWAYS/SOMETIMES */
@ -420,12 +420,12 @@ plugin_init (GModule *module, GstPlugin *plugin)
GstElementFactory *factory;
/* create an elementfactory for the chart element */
factory = gst_elementfactory_new("chart",GST_TYPE_CHART,
factory = gst_element_factory_new("chart",GST_TYPE_CHART,
&gst_chart_details);
g_return_val_if_fail(factory != NULL, FALSE);
gst_elementfactory_add_padtemplate (factory, src_template_factory ());
gst_elementfactory_add_padtemplate (factory, sink_template_factory ());
gst_element_factory_add_pad_template (factory, src_template_factory ());
gst_element_factory_add_pad_template (factory, sink_template_factory ());
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));

14
gst/deinterlace/gstdeinterlace.c
View file

@ -47,7 +47,7 @@ enum {
ARG_EDGE_DETECT,
};
GST_PADTEMPLATE_FACTORY (deinterlace_src_factory,
GST_PAD_TEMPLATE_FACTORY (deinterlace_src_factory,
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
@ -60,7 +60,7 @@ GST_PADTEMPLATE_FACTORY (deinterlace_src_factory,
)
)
GST_PADTEMPLATE_FACTORY (deinterlace_sink_factory,
GST_PAD_TEMPLATE_FACTORY (deinterlace_sink_factory,
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
@ -357,14 +357,14 @@ plugin_init (GModule *module, GstPlugin *plugin)
{
GstElementFactory *factory;
factory = gst_elementfactory_new("deinterlace",GST_TYPE_DEINTERLACE,
factory = gst_element_factory_new("deinterlace",GST_TYPE_DEINTERLACE,
&deinterlace_details);
g_return_val_if_fail(factory != NULL, FALSE);
gst_elementfactory_add_padtemplate (factory,
GST_PADTEMPLATE_GET (deinterlace_src_factory));
gst_elementfactory_add_padtemplate (factory,
GST_PADTEMPLATE_GET (deinterlace_sink_factory));
gst_element_factory_add_pad_template (factory,
GST_PAD_TEMPLATE_GET (deinterlace_src_factory));
gst_element_factory_add_pad_template (factory,
GST_PAD_TEMPLATE_GET (deinterlace_sink_factory));
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));

24
gst/flx/gstflxdec.c
View file

@ -24,7 +24,7 @@
#define JIFFIE (1000000/70)
static GstCaps* flxdec_typefind(GstBuffer *buf, gpointer private);
static GstCaps* flxdec_type_find(GstBuffer *buf, gpointer private);
/* flx element information */
static GstElementDetails flxdec_details = {
@ -40,7 +40,7 @@ static GstTypeDefinition flxdec_definition = {
"flxdec_video/fli",
"video/fli",
".flc .fli",
flxdec_typefind,
flxdec_type_find,
};
/* Flx signals and args */
@ -54,7 +54,7 @@ enum {
};
/* input */
GST_PADTEMPLATE_FACTORY (sink_factory,
GST_PAD_TEMPLATE_FACTORY (sink_factory,
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
@ -66,7 +66,7 @@ GST_PADTEMPLATE_FACTORY (sink_factory,
)
/* output */
GST_PADTEMPLATE_FACTORY (src_video_factory,
GST_PAD_TEMPLATE_FACTORY (src_video_factory,
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
@ -108,7 +108,7 @@ static void flx_decode_delta_flc (GstFlxDec *, guchar *, guchar *);
static GstElementClass *parent_class = NULL;
static GstCaps*
flxdec_typefind (GstBuffer *buf, gpointer private)
flxdec_type_find (GstBuffer *buf, gpointer private)
{
guchar *data = GST_BUFFER_DATA(buf);
GstCaps *new;
@ -119,7 +119,7 @@ flxdec_typefind (GstBuffer *buf, gpointer private)
/* check the frame type of the first frame */
if ((data[132] == 0x00 || data[132] == 0xfa) && data[133] == 0xf1) {
g_print("GstFlxDec: found supported flx format\n");
new = gst_caps_new("flxdec_typefind","video/fli", NULL);
new = gst_caps_new("flxdec_type_find","video/fli", NULL);
return new;
}
}
@ -172,12 +172,12 @@ static void
gst_flxdec_init(GstFlxDec *flxdec)
{
flxdec->sinkpad = gst_pad_new_from_template (
GST_PADTEMPLATE_GET (sink_factory), "sink");
GST_PAD_TEMPLATE_GET (sink_factory), "sink");
gst_element_add_pad(GST_ELEMENT(flxdec),flxdec->sinkpad);
gst_element_set_loop_function(GST_ELEMENT(flxdec),gst_flxdec_loop);
flxdec->srcpad = gst_pad_new_from_template (
GST_PADTEMPLATE_GET (src_video_factory), "src");
GST_PAD_TEMPLATE_GET (src_video_factory), "src");
gst_element_add_pad(GST_ELEMENT(flxdec),flxdec->srcpad);
flxdec->bs = NULL;
@ -682,15 +682,15 @@ plugin_init (GModule *module, GstPlugin *plugin)
return FALSE;
}
factory = gst_elementfactory_new("flxdec", GST_TYPE_FLXDEC, &flxdec_details);
factory = gst_element_factory_new("flxdec", GST_TYPE_FLXDEC, &flxdec_details);
g_return_val_if_fail(factory != NULL, FALSE);
gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (sink_factory));
gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (src_video_factory));
gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (sink_factory));
gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (src_video_factory));
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
type = gst_typefactory_new (&flxdec_definition);
type = gst_type_factory_new (&flxdec_definition);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (type));
return TRUE;

14
gst/modplug/gstmodplug.cc
View file

@ -71,7 +71,7 @@ enum {
};
GST_PADTEMPLATE_FACTORY (modplug_src_template_factory,
GST_PAD_TEMPLATE_FACTORY (modplug_src_template_factory,
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
@ -89,7 +89,7 @@ GST_PADTEMPLATE_FACTORY (modplug_src_template_factory,
)
)
GST_PADTEMPLATE_FACTORY (modplug_sink_template_factory,
GST_PAD_TEMPLATE_FACTORY (modplug_sink_template_factory,
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
@ -231,8 +231,8 @@ gst_modplug_class_init (GstModPlugClass *klass)
static void
gst_modplug_init (GstModPlug *modplug)
{
modplug->sinkpad = gst_pad_new_from_template( GST_PADTEMPLATE_GET (modplug_sink_template_factory), "sink");
modplug->srcpad = gst_pad_new_from_template( GST_PADTEMPLATE_GET (modplug_src_template_factory), "src");
modplug->sinkpad = gst_pad_new_from_template( GST_PAD_TEMPLATE_GET (modplug_sink_template_factory), "sink");
modplug->srcpad = gst_pad_new_from_template( GST_PAD_TEMPLATE_GET (modplug_src_template_factory), "src");
gst_element_add_pad(GST_ELEMENT(modplug),modplug->sinkpad);
gst_element_add_pad(GST_ELEMENT(modplug),modplug->srcpad);
@ -547,12 +547,12 @@ plugin_init (GModule *module, GstPlugin *plugin)
{
GstElementFactory *factory;
factory = gst_elementfactory_new("modplug",GST_TYPE_MODPLUG,
factory = gst_element_factory_new("modplug",GST_TYPE_MODPLUG,
&modplug_details);
g_return_val_if_fail(factory != NULL, FALSE);
gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (modplug_sink_template_factory));
gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (modplug_src_template_factory));
gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (modplug_sink_template_factory));
gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (modplug_src_template_factory));
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));

20
gst/mpeg1sys/gstmpeg1systemencode.c
View file

@ -48,7 +48,7 @@ enum {
/* FILL ME */
};
GST_PADTEMPLATE_FACTORY (src_factory,
GST_PAD_TEMPLATE_FACTORY (src_factory,
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
@ -59,7 +59,7 @@ GST_PADTEMPLATE_FACTORY (src_factory,
"systemstream", GST_PROPS_BOOLEAN (TRUE)
)
)
GST_PADTEMPLATE_FACTORY (video_sink_factory,
GST_PAD_TEMPLATE_FACTORY (video_sink_factory,
"video_%d",
GST_PAD_SINK,
GST_PAD_REQUEST,
@ -71,7 +71,7 @@ GST_PADTEMPLATE_FACTORY (video_sink_factory,
)
)
GST_PADTEMPLATE_FACTORY (audio_sink_factory,
GST_PAD_TEMPLATE_FACTORY (audio_sink_factory,
"audio_%d",
GST_PAD_SINK,
GST_PAD_REQUEST,
@ -141,7 +141,7 @@ static void
gst_system_encode_init (GstMPEG1SystemEncode *system_encode)
{
system_encode->srcpad = gst_pad_new_from_template (
GST_PADTEMPLATE_GET (src_factory), "src");
GST_PAD_TEMPLATE_GET (src_factory), "src");
gst_element_add_pad (GST_ELEMENT (system_encode), system_encode->srcpad);
system_encode->video_buffer = mpeg1mux_buffer_new (BUFFER_TYPE_VIDEO, 0xE0);
@ -179,7 +179,7 @@ gst_system_encode_request_new_pad (GstElement *element, GstPadTemplate *templ, c
}
system_encode = GST_SYSTEM_ENCODE (element);
if (templ == GST_PADTEMPLATE_GET (audio_sink_factory)) {
if (templ == GST_PAD_TEMPLATE_GET (audio_sink_factory)) {
name = g_strdup_printf ("audio_%02d", system_encode->num_audio_pads);
g_print ("%s\n", name);
newpad = gst_pad_new_from_template (templ, name);
@ -189,7 +189,7 @@ gst_system_encode_request_new_pad (GstElement *element, GstPadTemplate *templ, c
system_encode->num_audio_pads++;
system_encode->which_streams |= STREAMS_AUDIO;
}
else if (templ == GST_PADTEMPLATE_GET (video_sink_factory)) {
else if (templ == GST_PAD_TEMPLATE_GET (video_sink_factory)) {
name = g_strdup_printf ("video_%02d", system_encode->num_video_pads);
g_print ("%s\n", name);
newpad = gst_pad_new_from_template (templ, name);
@ -551,13 +551,13 @@ plugin_init (GModule *module, GstPlugin *plugin)
}
/* create an elementfactory for the system_encode element */
factory = gst_elementfactory_new("system_encode",GST_TYPE_SYSTEM_ENCODE,
factory = gst_element_factory_new("system_encode",GST_TYPE_SYSTEM_ENCODE,
&system_encode_details);
g_return_val_if_fail(factory != NULL, FALSE);
gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (src_factory));
gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (audio_sink_factory));
gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (video_sink_factory));
gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (src_factory));
gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (audio_sink_factory));
gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (video_sink_factory));
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));

10
gst/mpeg1videoparse/gstmp1videoparse.c
View file

@ -45,7 +45,7 @@ static GstPadTemplate*
src_factory (void)
{
return
gst_padtemplate_new (
gst_pad_template_new (
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
@ -64,7 +64,7 @@ static GstPadTemplate*
sink_factory (void)
{
return
gst_padtemplate_new (
gst_pad_template_new (
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
@ -395,15 +395,15 @@ plugin_init (GModule *module, GstPlugin *plugin)
GstElementFactory *factory;
/* create an elementfactory for the mp1videoparse element */
factory = gst_elementfactory_new("mp1videoparse",GST_TYPE_MP1VIDEOPARSE,
factory = gst_element_factory_new("mp1videoparse",GST_TYPE_MP1VIDEOPARSE,
&mp1videoparse_details);
g_return_val_if_fail(factory != NULL, FALSE);
src_template = src_factory ();
gst_elementfactory_add_padtemplate (factory, src_template);
gst_element_factory_add_pad_template (factory, src_template);
sink_template = sink_factory ();
gst_elementfactory_add_padtemplate (factory, sink_template);
gst_element_factory_add_pad_template (factory, sink_template);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));

2
gst/mpeg2sub/gstmpeg2subt.c
View file

@ -426,7 +426,7 @@ plugin_init (GModule *module, GstPlugin *plugin)
GstElementFactory *factory;
/* create an elementfactory for the mpeg2subt element */
factory = gst_elementfactory_new("mpeg2subt",GST_TYPE_MPEG2SUBT,
factory = gst_element_factory_new("mpeg2subt",GST_TYPE_MPEG2SUBT,
&mpeg2subt_details);
g_return_val_if_fail(factory != NULL, FALSE);

10
gst/mpegaudioparse/gstmp3types.c
View file

@ -21,15 +21,15 @@
#include <gst/gst.h>
#include <string.h> /* memcmp */
static GstCaps* mp3_typefind(GstBuffer *buf, gpointer private);
static GstCaps* mp3_type_find(GstBuffer *buf, gpointer private);
static GstTypeDefinition mp3type_definitions[] = {
{ "mp3types_audio/mp3", "audio/mp3", ".mp3 .mp2 .mp1 .mpga", mp3_typefind },
{ "mp3types_audio/mp3", "audio/mp3", ".mp3 .mp2 .mp1 .mpga", mp3_type_find },
{ NULL, NULL, NULL, NULL },
};
static GstCaps*
mp3_typefind(GstBuffer *buf, gpointer private)
mp3_type_find(GstBuffer *buf, gpointer private)
{
gchar *data;
gulong head;
@ -74,7 +74,7 @@ mp3_typefind(GstBuffer *buf, gpointer private)
if (((head >> 10) & 0x3) == 0x3)
return NULL;
caps = gst_caps_new ("mp3_typefind", "audio/mp3", NULL);
caps = gst_caps_new ("mp3_type_find", "audio/mp3", NULL);
/* gst_caps_set(caps,"layer",GST_PROPS_INT(4-((head>>17)&0x3))); */
return caps;
@ -88,7 +88,7 @@ plugin_init (GModule *module, GstPlugin *plugin)
while (mp3type_definitions[i].name) {
GstTypeFactory *type;
type = gst_typefactory_new (&mp3type_definitions[i]);
type = gst_type_factory_new (&mp3type_definitions[i]);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (type));
i++;
}

10
gst/mpegaudioparse/gstmpegaudioparse.c
View file

@ -35,7 +35,7 @@ static GstPadTemplate*
mp3_src_factory (void)
{
return
gst_padtemplate_new (
gst_pad_template_new (
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
@ -56,7 +56,7 @@ static GstPadTemplate*
mp3_sink_factory (void)
{
return
gst_padtemplate_new (
gst_pad_template_new (
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
@ -480,16 +480,16 @@ plugin_init (GModule *module, GstPlugin *plugin)
GstElementFactory *factory;
/* create an elementfactory for the mp3parse element */
factory = gst_elementfactory_new ("mp3parse",
factory = gst_element_factory_new ("mp3parse",
GST_TYPE_MP3PARSE,
&mp3parse_details);
g_return_val_if_fail (factory != NULL, FALSE);
sink_temp = mp3_sink_factory ();
gst_elementfactory_add_padtemplate (factory, sink_temp);
gst_element_factory_add_pad_template (factory, sink_temp);
src_temp = mp3_src_factory ();
gst_elementfactory_add_padtemplate (factory, src_temp);
gst_element_factory_add_pad_template (factory, src_temp);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));

10
gst/passthrough/gstpassthrough.c
View file

@ -54,7 +54,7 @@ passthrough_sink_factory (void)
static GstPadTemplate *template = NULL;
if (! template) {
template = gst_padtemplate_new
template = gst_pad_template_new
("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
gst_caps_append (gst_caps_new ("sink_int", "audio/raw",
GST_AUDIO_INT_PAD_TEMPLATE_PROPS),
@ -71,7 +71,7 @@ passthrough_src_factory (void)
static GstPadTemplate *template = NULL;
if (! template)
template = gst_padtemplate_new
template = gst_pad_template_new
("src", GST_PAD_SRC, GST_PAD_ALWAYS,
gst_caps_append (gst_caps_new ("src_float", "audio/raw",
GST_AUDIO_FLOAT_MONO_PAD_TEMPLATE_PROPS),
@ -312,11 +312,11 @@ plugin_init (GModule *module, GstPlugin *plugin)
{
GstElementFactory *factory;
factory = gst_elementfactory_new ("passthrough", GST_TYPE_PASSTHROUGH, &passthrough_details);
factory = gst_element_factory_new ("passthrough", GST_TYPE_PASSTHROUGH, &passthrough_details);
g_return_val_if_fail (factory != NULL, FALSE);
gst_elementfactory_add_padtemplate (factory, passthrough_src_factory ());
gst_elementfactory_add_padtemplate (factory, passthrough_sink_factory ());
gst_element_factory_add_pad_template (factory, passthrough_src_factory ());
gst_element_factory_add_pad_template (factory, passthrough_sink_factory ());
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));

8
gst/playondemand/demo-mp3.c
View file

@ -26,10 +26,10 @@ int main(int argc, char **argv)
exit(-1);
}
src = gst_elementfactory_make("filesrc", "filesrc");
mad = gst_elementfactory_make("mad", "mad");
pod = gst_elementfactory_make("playondemand", "playondemand");
osssink = gst_elementfactory_make("osssink", "osssink");
src = gst_element_factory_make("filesrc", "filesrc");
mad = gst_element_factory_make("mad", "mad");
pod = gst_element_factory_make("playondemand", "playondemand");
osssink = gst_element_factory_make("osssink", "osssink");
g_object_set(G_OBJECT(src), "location", argv[1], NULL);
g_object_set(G_OBJECT(osssink), "fragment", 0x00180008, NULL);

10
gst/playondemand/gstplayondemand.c
View file

@ -65,7 +65,7 @@ play_on_demand_sink_factory (void)
static GstPadTemplate *template = NULL;
if (!template) {
template = gst_padtemplate_new
template = gst_pad_template_new
("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
gst_caps_append(gst_caps_new ("sink_int", "audio/raw",
GST_AUDIO_INT_PAD_TEMPLATE_PROPS),
@ -82,7 +82,7 @@ play_on_demand_src_factory (void)
static GstPadTemplate *template = NULL;
if (!template)
template = gst_padtemplate_new
template = gst_pad_template_new
("src", GST_PAD_SRC, GST_PAD_ALWAYS,
gst_caps_append (gst_caps_new ("src_float", "audio/raw",
GST_AUDIO_FLOAT_MONO_PAD_TEMPLATE_PROPS),
@ -408,13 +408,13 @@ plugin_init (GModule *module, GstPlugin *plugin)
{
GstElementFactory *factory;
factory = gst_elementfactory_new("playondemand",
factory = gst_element_factory_new("playondemand",
GST_TYPE_PLAYONDEMAND,
&play_on_demand_details);
g_return_val_if_fail(factory != NULL, FALSE);
gst_elementfactory_add_padtemplate(factory, play_on_demand_src_factory());
gst_elementfactory_add_padtemplate(factory, play_on_demand_sink_factory());
gst_element_factory_add_pad_template(factory, play_on_demand_src_factory());
gst_element_factory_add_pad_template(factory, play_on_demand_sink_factory());
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE(factory));

4
gst/rtjpeg/gstrtjpeg.c
View file

@ -40,13 +40,13 @@ plugin_init (GModule *module, GstPlugin *plugin)
conversion utilities");
/* create an elementfactory for the rtjpegenc element */
enc = gst_elementfactory_new("rtjpegenc",GST_TYPE_RTJPEGENC,
enc = gst_element_factory_new("rtjpegenc",GST_TYPE_RTJPEGENC,
&gst_rtjpegenc_details);
g_return_val_if_fail(enc != NULL, FALSE);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (enc));
/* create an elementfactory for the rtjpegdec element */
dec = gst_elementfactory_new("rtjpegdec",GST_TYPE_RTJPEGDEC,
dec = gst_element_factory_new("rtjpegdec",GST_TYPE_RTJPEGDEC,
&gst_rtjpegdec_details);
g_return_val_if_fail(dec != NULL, FALSE);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (dec));

14
gst/smooth/gstsmooth.c
View file

@ -45,7 +45,7 @@ enum {
ARG_LUM_ONLY
};
GST_PADTEMPLATE_FACTORY (smooth_src_factory,
GST_PAD_TEMPLATE_FACTORY (smooth_src_factory,
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
@ -56,7 +56,7 @@ GST_PADTEMPLATE_FACTORY (smooth_src_factory,
)
)
GST_PADTEMPLATE_FACTORY (smooth_sink_factory,
GST_PAD_TEMPLATE_FACTORY (smooth_sink_factory,
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
@ -147,13 +147,13 @@ static void
gst_smooth_init (GstSmooth *smooth)
{
smooth->sinkpad = gst_pad_new_from_template (
GST_PADTEMPLATE_GET (smooth_sink_factory), "sink");
GST_PAD_TEMPLATE_GET (smooth_sink_factory), "sink");
gst_pad_set_connect_function (smooth->sinkpad, gst_smooth_sinkconnect);
gst_pad_set_chain_function (smooth->sinkpad, gst_smooth_chain);
gst_element_add_pad (GST_ELEMENT (smooth), smooth->sinkpad);
smooth->srcpad = gst_pad_new_from_template (
GST_PADTEMPLATE_GET (smooth_src_factory), "src");
GST_PAD_TEMPLATE_GET (smooth_src_factory), "src");
gst_element_add_pad (GST_ELEMENT (smooth), smooth->srcpad);
smooth->active = TRUE;
@ -322,12 +322,12 @@ plugin_init (GModule *module, GstPlugin *plugin)
{
GstElementFactory *factory;
factory = gst_elementfactory_new("smooth",GST_TYPE_SMOOTH,
factory = gst_element_factory_new("smooth",GST_TYPE_SMOOTH,
&smooth_details);
g_return_val_if_fail(factory != NULL, FALSE);
gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (smooth_sink_factory));
gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (smooth_src_factory));
gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (smooth_sink_factory));
gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (smooth_src_factory));
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));

8
gst/smoothwave/demo-osssrc.c
View file

@ -24,14 +24,14 @@ int main(int argc,char *argv[]) {
bin = gst_bin_new("bin");
srcfactory = gst_elementfactory_find("audiosrc");
srcfactory = gst_element_factory_find("audiosrc");
g_return_val_if_fail(srcfactory != NULL, -1);
wavefactory = gst_elementfactory_find("smoothwave");
wavefactory = gst_element_factory_find("smoothwave");
g_return_val_if_fail(wavefactory != NULL, -1);
src = gst_elementfactory_create(srcfactory,"src");
src = gst_element_factory_create(srcfactory,"src");
gtk_object_set(GTK_OBJECT(src),"bytes_per_read",(gulong)2048,NULL);
wave = gst_elementfactory_create(wavefactory,"wave");
wave = gst_element_factory_create(wavefactory,"wave");
gtk_object_set(GTK_OBJECT(wave),"width",256,"height",100,NULL);

2
gst/smoothwave/gstsmoothwave.c
View file

@ -284,7 +284,7 @@ plugin_init (GModule *module, GstPlugin *plugin)
GstElementFactory *factory;
/* create an elementfactory for the smoothwave element */
factory = gst_elementfactory_new("smoothwave",GST_TYPE_SMOOTHWAVE,
factory = gst_element_factory_new("smoothwave",GST_TYPE_SMOOTHWAVE,
&gst_smoothwave_details);
g_return_val_if_fail(factory != NULL, FALSE);

8
gst/spectrum/demo-osssrc.c
View file

@ -25,12 +25,12 @@ int main(int argc,char *argv[]) {
bin = gst_bin_new("bin");
srcfactory = gst_elementfactory_find("osssrc");
spectrumfactory = gst_elementfactory_find("gstspectrum");
srcfactory = gst_element_factory_find("osssrc");
spectrumfactory = gst_element_factory_find("gstspectrum");
src = gst_elementfactory_create(srcfactory,"src");
src = gst_element_factory_create(srcfactory,"src");
gtk_object_set(GTK_OBJECT(src),"bytes_per_read",(gulong)1024,NULL);
spectrum = gst_elementfactory_create(spectrumfactory,"spectrum");
spectrum = gst_element_factory_create(spectrumfactory,"spectrum");
gtk_object_set(GTK_OBJECT(spectrum),"width",256,NULL);

2
gst/spectrum/gstspectrum.c
View file

@ -192,7 +192,7 @@ plugin_init (GModule *module, GstPlugin *plugin)
GstElementFactory *factory;
/* create an elementfactory for the spectrum element */
factory = gst_elementfactory_new ("spectrum",GST_TYPE_SPECTRUM,
factory = gst_element_factory_new ("spectrum",GST_TYPE_SPECTRUM,
&gst_spectrum_details);
g_return_val_if_fail (factory != NULL, FALSE);

10
gst/speed/demo-mp3.c
View file

@ -36,11 +36,11 @@ int main(int argc, char **argv)
gtk_signal_connect(GTK_OBJECT(button), "clicked", gtk_main_quit, NULL);
gtk_widget_show(button);
filesrc = gst_elementfactory_make("filesrc", "filesrc");
mad = gst_elementfactory_make("mad", "mad");
stereo2mono = gst_elementfactory_make("stereo2mono", "stereo2mono");
speed = gst_elementfactory_make("speed", "speed");
osssink = gst_elementfactory_make("osssink", "osssink");
filesrc = gst_element_factory_make("filesrc", "filesrc");
mad = gst_element_factory_make("mad", "mad");
stereo2mono = gst_element_factory_make("stereo2mono", "stereo2mono");
speed = gst_element_factory_make("speed", "speed");
osssink = gst_element_factory_make("osssink", "osssink");
gtk_object_set(GTK_OBJECT(osssink), "fragment", 0x00180008, NULL);
gtk_signal_connect(GTK_OBJECT(gtk_range_get_adjustment(GTK_RANGE(hscale))),

10
gst/speed/gstspeed.c
View file

@ -58,7 +58,7 @@ speed_sink_factory (void)
static GstPadTemplate *template = NULL;
if (!template) {
template = gst_padtemplate_new
template = gst_pad_template_new
("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
gst_caps_append(gst_caps_new ("sink_int", "audio/raw",
GST_AUDIO_INT_MONO_PAD_TEMPLATE_PROPS),
@ -75,7 +75,7 @@ speed_src_factory (void)
static GstPadTemplate *template = NULL;
if (!template)
template = gst_padtemplate_new
template = gst_pad_template_new
("src", GST_PAD_SRC, GST_PAD_ALWAYS,
gst_caps_append (gst_caps_new ("src_float", "audio/raw",
GST_AUDIO_FLOAT_MONO_PAD_TEMPLATE_PROPS),
@ -326,12 +326,12 @@ plugin_init (GModule *module, GstPlugin *plugin)
{
GstElementFactory *factory;
factory = gst_elementfactory_new("speed",GST_TYPE_SPEED,
factory = gst_element_factory_new("speed",GST_TYPE_SPEED,
&speed_details);
g_return_val_if_fail(factory != NULL, FALSE);
gst_elementfactory_add_padtemplate (factory, speed_src_factory ());
gst_elementfactory_add_padtemplate (factory, speed_sink_factory ());
gst_element_factory_add_pad_template (factory, speed_src_factory ());
gst_element_factory_add_pad_template (factory, speed_sink_factory ());
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));

2
gst/stereo/gststereo.c
View file

@ -209,7 +209,7 @@ plugin_init (GModule *module, GstPlugin *plugin)
{
GstElementFactory *factory;
factory = gst_elementfactory_new("stereo",GST_TYPE_STEREO,
factory = gst_element_factory_new("stereo",GST_TYPE_STEREO,
&stereo_details);
g_return_val_if_fail(factory != NULL, FALSE);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));

18
gst/y4m/gsty4mencode.c
View file

@ -41,7 +41,7 @@ enum {
ARG_0
};
GST_PADTEMPLATE_FACTORY (lavencode_src_factory,
GST_PAD_TEMPLATE_FACTORY (lavencode_src_factory,
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
@ -52,7 +52,7 @@ GST_PADTEMPLATE_FACTORY (lavencode_src_factory,
)
)
GST_PADTEMPLATE_FACTORY (lavencode_sink_factory,
GST_PAD_TEMPLATE_FACTORY (lavencode_sink_factory,
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
@ -135,13 +135,13 @@ static void
gst_lavencode_init (GstLavEncode *filter)
{
filter->sinkpad = gst_pad_new_from_template(
GST_PADTEMPLATE_GET (lavencode_sink_factory), "sink");
GST_PAD_TEMPLATE_GET (lavencode_sink_factory), "sink");
gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
gst_pad_set_chain_function (filter->sinkpad, gst_lavencode_chain);
gst_pad_set_connect_function (filter->sinkpad, gst_lavencode_sinkconnect);
filter->srcpad = gst_pad_new_from_template(
GST_PADTEMPLATE_GET (lavencode_src_factory), "src");
GST_PAD_TEMPLATE_GET (lavencode_src_factory), "src");
gst_element_add_pad (GST_ELEMENT (filter), filter->srcpad);
filter->init = TRUE;
@ -240,14 +240,14 @@ plugin_init (GModule *module, GstPlugin *plugin)
{
GstElementFactory *factory;
factory = gst_elementfactory_new("lavencode",GST_TYPE_LAVENCODE,
factory = gst_element_factory_new("lavencode",GST_TYPE_LAVENCODE,
&lavencode_details);
g_return_val_if_fail(factory != NULL, FALSE);
gst_elementfactory_add_padtemplate (factory,
GST_PADTEMPLATE_GET (lavencode_src_factory));
gst_elementfactory_add_padtemplate (factory,
GST_PADTEMPLATE_GET (lavencode_sink_factory));
gst_element_factory_add_pad_template (factory,
GST_PAD_TEMPLATE_GET (lavencode_src_factory));
gst_element_factory_add_pad_template (factory,
GST_PAD_TEMPLATE_GET (lavencode_sink_factory));
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));

4
sys/dxr3/gstdxr3.c
View file

@ -16,10 +16,10 @@ plugin_init (GModule *module, GstPlugin *plugin)
{
GstElementFactory *video_factory;
video_factory = gst_elementfactory_new("dxr3videosink", GST_TYPE_DXR3_VIDEO_SINK, &dxr3_video_sink_details);
video_factory = gst_element_factory_new("dxr3videosink", GST_TYPE_DXR3_VIDEO_SINK, &dxr3_video_sink_details);
g_return_val_if_fail(video_factory != NULL, FALSE);
gst_elementfactory_add_padtemplate (video_factory, GST_PADTEMPLATE_GET (dxr3_video_sink_factory));
gst_element_factory_add_pad_template (video_factory, GST_PAD_TEMPLATE_GET (dxr3_video_sink_factory));
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (video_factory));

2
sys/dxr3/gstdxr3videosink.c
View file

@ -176,7 +176,7 @@ static void
gst_dxr3_video_sink_init(GstDxr3VideoSink *dxr3_video_sink)
{
dxr3_video_sink->sinkpad = gst_pad_new_from_template (
GST_PADTEMPLATE_GET (dxr3_video_sink_factory), "video_sink");
GST_PAD_TEMPLATE_GET (dxr3_video_sink_factory), "video_sink");
gst_pad_set_chain_function(dxr3_video_sink->sinkpad, gst_dxr3_video_sink_chain);
gst_element_add_pad(GST_ELEMENT(dxr3_video_sink),dxr3_video_sink->sinkpad);

2
sys/dxr3/gstdxr3videosink.h
View file

@ -69,7 +69,7 @@ struct _GstDxr3VideoSinkClass {
GType gst_dxr3_video_sink_get_type(void);
GST_PADTEMPLATE_FACTORY (dxr3_video_sink_factory,
GST_PAD_TEMPLATE_FACTORY (dxr3_video_sink_factory,
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,

10
sys/qcam/gstqcamsrc.c
View file

@ -54,7 +54,7 @@ gst_qcamsrc_details =
#define DEF_PORT 0x378
#define DEF_AUTOEXP AE_NONE
GST_PADTEMPLATE_FACTORY (gst_qcamsrc_src_factory,
GST_PAD_TEMPLATE_FACTORY (gst_qcamsrc_src_factory,
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
@ -201,7 +201,7 @@ static void
gst_qcamsrc_init (GstQCamSrc *qcamsrc)
{
qcamsrc->srcpad = gst_pad_new_from_template (
GST_PADTEMPLATE_GET (gst_qcamsrc_src_factory), "src");
GST_PAD_TEMPLATE_GET (gst_qcamsrc_src_factory), "src");
gst_element_add_pad(GST_ELEMENT(qcamsrc),qcamsrc->srcpad);
gst_pad_set_get_function (qcamsrc->srcpad,gst_qcamsrc_get);
@ -423,12 +423,12 @@ plugin_init (GModule *module, GstPlugin *plugin)
GstElementFactory *factory;
/* create an elementfactory for the qcamsrcparse element */
factory = gst_elementfactory_new("qcamsrc",GST_TYPE_QCAMSRC,
factory = gst_element_factory_new("qcamsrc",GST_TYPE_QCAMSRC,
&gst_qcamsrc_details);
g_return_val_if_fail(factory != NULL, FALSE);
gst_elementfactory_add_padtemplate (factory,
GST_PADTEMPLATE_GET (gst_qcamsrc_src_factory));
gst_element_factory_add_pad_template (factory,
GST_PAD_TEMPLATE_GET (gst_qcamsrc_src_factory));
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));

2
sys/vcd/vcdsrc.c
View file

@ -380,7 +380,7 @@ plugin_init (GModule *module, GstPlugin *plugin)
GstElementFactory *factory;
/* create an elementfactory for the vcdsrc element */
factory = gst_elementfactory_new("vcdsrc",GST_TYPE_VCDSRC,
factory = gst_element_factory_new("vcdsrc",GST_TYPE_VCDSRC,
&vcdsrc_details);
g_return_val_if_fail(factory != NULL, FALSE);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));