diff options
Diffstat (limited to 'gst')
-rw-r--r-- | gst/chart/gstchart.c | 10 | ||||
-rw-r--r-- | gst/deinterlace/gstdeinterlace.c | 14 | ||||
-rw-r--r-- | gst/flx/gstflxdec.c | 24 | ||||
-rw-r--r-- | gst/modplug/gstmodplug.cc | 14 | ||||
-rw-r--r-- | gst/mpeg1sys/gstmpeg1systemencode.c | 20 | ||||
-rw-r--r-- | gst/mpeg1videoparse/gstmp1videoparse.c | 10 | ||||
-rw-r--r-- | gst/mpeg2sub/gstmpeg2subt.c | 2 | ||||
-rw-r--r-- | gst/mpegaudioparse/gstmp3types.c | 10 | ||||
-rw-r--r-- | gst/mpegaudioparse/gstmpegaudioparse.c | 10 | ||||
-rw-r--r-- | gst/passthrough/gstpassthrough.c | 10 | ||||
-rw-r--r-- | gst/playondemand/demo-mp3.c | 8 | ||||
-rw-r--r-- | gst/playondemand/gstplayondemand.c | 10 | ||||
-rw-r--r-- | gst/rtjpeg/gstrtjpeg.c | 4 | ||||
-rw-r--r-- | gst/smooth/gstsmooth.c | 14 | ||||
-rw-r--r-- | gst/smoothwave/demo-osssrc.c | 8 | ||||
-rw-r--r-- | gst/smoothwave/gstsmoothwave.c | 2 | ||||
-rw-r--r-- | gst/spectrum/demo-osssrc.c | 8 | ||||
-rw-r--r-- | gst/spectrum/gstspectrum.c | 2 | ||||
-rw-r--r-- | gst/speed/demo-mp3.c | 10 | ||||
-rw-r--r-- | gst/speed/gstspeed.c | 10 | ||||
-rw-r--r-- | gst/stereo/gststereo.c | 2 | ||||
-rw-r--r-- | gst/y4m/gsty4mencode.c | 18 |
22 files changed, 110 insertions, 110 deletions
diff --git a/gst/chart/gstchart.c b/gst/chart/gstchart.c index 9474b4b1..268c92c3 100644 --- a/gst/chart/gstchart.c +++ b/gst/chart/gstchart.c @@ -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)); diff --git a/gst/deinterlace/gstdeinterlace.c b/gst/deinterlace/gstdeinterlace.c index ab716f35..12f85126 100644 --- a/gst/deinterlace/gstdeinterlace.c +++ b/gst/deinterlace/gstdeinterlace.c @@ -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)); diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c index eeeb9c5a..8aeb5532 100644 --- a/gst/flx/gstflxdec.c +++ b/gst/flx/gstflxdec.c @@ -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; diff --git a/gst/modplug/gstmodplug.cc b/gst/modplug/gstmodplug.cc index 5c1b50bf..da3061d5 100644 --- a/gst/modplug/gstmodplug.cc +++ b/gst/modplug/gstmodplug.cc @@ -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)); diff --git a/gst/mpeg1sys/gstmpeg1systemencode.c b/gst/mpeg1sys/gstmpeg1systemencode.c index a995791c..ebd38666 100644 --- a/gst/mpeg1sys/gstmpeg1systemencode.c +++ b/gst/mpeg1sys/gstmpeg1systemencode.c @@ -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)); diff --git a/gst/mpeg1videoparse/gstmp1videoparse.c b/gst/mpeg1videoparse/gstmp1videoparse.c index ce4fddb6..ea608208 100644 --- a/gst/mpeg1videoparse/gstmp1videoparse.c +++ b/gst/mpeg1videoparse/gstmp1videoparse.c @@ -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)); diff --git a/gst/mpeg2sub/gstmpeg2subt.c b/gst/mpeg2sub/gstmpeg2subt.c index f111e5aa..29cad3d9 100644 --- a/gst/mpeg2sub/gstmpeg2subt.c +++ b/gst/mpeg2sub/gstmpeg2subt.c @@ -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); diff --git a/gst/mpegaudioparse/gstmp3types.c b/gst/mpegaudioparse/gstmp3types.c index 670cfba7..5d9823e4 100644 --- a/gst/mpegaudioparse/gstmp3types.c +++ b/gst/mpegaudioparse/gstmp3types.c @@ -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++; } diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c index 23e632ac..151aec0c 100644 --- a/gst/mpegaudioparse/gstmpegaudioparse.c +++ b/gst/mpegaudioparse/gstmpegaudioparse.c @@ -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)); diff --git a/gst/passthrough/gstpassthrough.c b/gst/passthrough/gstpassthrough.c index 9cbd4e56..8f6f42ae 100644 --- a/gst/passthrough/gstpassthrough.c +++ b/gst/passthrough/gstpassthrough.c @@ -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)); diff --git a/gst/playondemand/demo-mp3.c b/gst/playondemand/demo-mp3.c index af5df0a4..e218011f 100644 --- a/gst/playondemand/demo-mp3.c +++ b/gst/playondemand/demo-mp3.c @@ -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); diff --git a/gst/playondemand/gstplayondemand.c b/gst/playondemand/gstplayondemand.c index ab236c46..300f9664 100644 --- a/gst/playondemand/gstplayondemand.c +++ b/gst/playondemand/gstplayondemand.c @@ -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)); diff --git a/gst/rtjpeg/gstrtjpeg.c b/gst/rtjpeg/gstrtjpeg.c index 1a4a4363..649658f8 100644 --- a/gst/rtjpeg/gstrtjpeg.c +++ b/gst/rtjpeg/gstrtjpeg.c @@ -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)); diff --git a/gst/smooth/gstsmooth.c b/gst/smooth/gstsmooth.c index 9741b5b6..69871230 100644 --- a/gst/smooth/gstsmooth.c +++ b/gst/smooth/gstsmooth.c @@ -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)); diff --git a/gst/smoothwave/demo-osssrc.c b/gst/smoothwave/demo-osssrc.c index 6f5ee57a..4807a3a4 100644 --- a/gst/smoothwave/demo-osssrc.c +++ b/gst/smoothwave/demo-osssrc.c @@ -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); diff --git a/gst/smoothwave/gstsmoothwave.c b/gst/smoothwave/gstsmoothwave.c index 48d32c4b..7f2246f3 100644 --- a/gst/smoothwave/gstsmoothwave.c +++ b/gst/smoothwave/gstsmoothwave.c @@ -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); diff --git a/gst/spectrum/demo-osssrc.c b/gst/spectrum/demo-osssrc.c index e3f6552c..397b559b 100644 --- a/gst/spectrum/demo-osssrc.c +++ b/gst/spectrum/demo-osssrc.c @@ -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); diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c index f8461a5c..8c84ee55 100644 --- a/gst/spectrum/gstspectrum.c +++ b/gst/spectrum/gstspectrum.c @@ -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); diff --git a/gst/speed/demo-mp3.c b/gst/speed/demo-mp3.c index 586ac9f1..31f15da9 100644 --- a/gst/speed/demo-mp3.c +++ b/gst/speed/demo-mp3.c @@ -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))), diff --git a/gst/speed/gstspeed.c b/gst/speed/gstspeed.c index f97dcf3c..fc737e92 100644 --- a/gst/speed/gstspeed.c +++ b/gst/speed/gstspeed.c @@ -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)); diff --git a/gst/stereo/gststereo.c b/gst/stereo/gststereo.c index 05d98c12..6b243db0 100644 --- a/gst/stereo/gststereo.c +++ b/gst/stereo/gststereo.c @@ -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)); diff --git a/gst/y4m/gsty4mencode.c b/gst/y4m/gsty4mencode.c index 9e99dc5e..f691212d 100644 --- a/gst/y4m/gsty4mencode.c +++ b/gst/y4m/gsty4mencode.c @@ -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)); |