diff options
Diffstat (limited to 'gst/avi')
-rw-r--r-- | gst/avi/audiocodecs.c | 4 | ||||
-rw-r--r-- | gst/avi/gstaviaudiodecoder.c | 10 | ||||
-rw-r--r-- | gst/avi/gstavidemux.c | 32 | ||||
-rw-r--r-- | gst/avi/gstavimux.c | 20 | ||||
-rw-r--r-- | gst/avi/gstcdxaparse.c | 24 |
5 files changed, 45 insertions, 45 deletions
diff --git a/gst/avi/audiocodecs.c b/gst/avi/audiocodecs.c index 05c8862c..c734957e 100644 --- a/gst/avi/audiocodecs.c +++ b/gst/avi/audiocodecs.c @@ -83,9 +83,9 @@ static GstPad *gst_avi_decoder_get_audio_srcpad_MPEG(GstAviDecoder *avi_decoder, GstElement *parse_audio, *decode; GstPad *srcpad, *sinkpad, *newpad; - parse_audio = gst_elementfactory_make("mp3parse", "parse_audio"); + parse_audio = gst_element_factory_make("mp3parse", "parse_audio"); g_return_val_if_fail(parse_audio != NULL, NULL); - decode = gst_elementfactory_make("mpg123", "decode_audio"); + decode = gst_element_factory_make("mpg123", "decode_audio"); g_return_val_if_fail(decode != NULL, NULL); gst_element_set_state(GST_ELEMENT(gst_object_get_parent(GST_OBJECT(avi_decoder))), GST_STATE_PAUSED); diff --git a/gst/avi/gstaviaudiodecoder.c b/gst/avi/gstaviaudiodecoder.c index 38a6b853..d3b09b1f 100644 --- a/gst/avi/gstaviaudiodecoder.c +++ b/gst/avi/gstaviaudiodecoder.c @@ -47,7 +47,7 @@ enum { /* FILL ME */ }; -GST_PADTEMPLATE_FACTORY (sink_templ, +GST_PAD_TEMPLATE_FACTORY (sink_templ, "sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -58,7 +58,7 @@ GST_PADTEMPLATE_FACTORY (sink_templ, ) ) -GST_PADTEMPLATE_FACTORY (src_audio_templ, +GST_PAD_TEMPLATE_FACTORY (src_audio_templ, "src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -174,12 +174,12 @@ plugin_init (GModule *module, GstPlugin *plugin) GstElementFactory *factory; /* create an elementfactory for the avi_audio_decoder element */ - factory = gst_elementfactory_new ("aviaudiodecoder",GST_TYPE_AVI_AUDIO_DECODER, + factory = gst_element_factory_new ("aviaudiodecoder",GST_TYPE_AVI_AUDIO_DECODER, &gst_avi_audio_decoder_details); g_return_val_if_fail (factory != NULL, FALSE); - gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (sink_templ)); - gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (src_audio_templ)); + gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (sink_templ)); + gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (src_audio_templ)); gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory)); diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 8023e971..f6ffc792 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -35,14 +35,14 @@ static GstElementDetails gst_avi_demux_details = { "(C) 1999", }; -static GstCaps* avi_typefind (GstBuffer *buf, gpointer private); +static GstCaps* avi_type_find (GstBuffer *buf, gpointer private); /* typefactory for 'avi' */ static GstTypeDefinition avidefinition = { "avidemux_video/avi", "video/avi", ".avi", - avi_typefind, + avi_type_find, }; /* AviDemux signals and args */ @@ -60,7 +60,7 @@ enum { /* FILL ME */ }; -GST_PADTEMPLATE_FACTORY (sink_templ, +GST_PAD_TEMPLATE_FACTORY (sink_templ, "sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -71,7 +71,7 @@ GST_PADTEMPLATE_FACTORY (sink_templ, ) ) -GST_PADTEMPLATE_FACTORY (src_video_templ, +GST_PAD_TEMPLATE_FACTORY (src_video_templ, "video_[00-32]", GST_PAD_SRC, GST_PAD_SOMETIMES, @@ -114,7 +114,7 @@ GST_PADTEMPLATE_FACTORY (src_video_templ, ) ) -GST_PADTEMPLATE_FACTORY (src_audio_templ, +GST_PAD_TEMPLATE_FACTORY (src_audio_templ, "audio_[00-32]", GST_PAD_SRC, GST_PAD_SOMETIMES, @@ -225,7 +225,7 @@ gst_avi_demux_init (GstAviDemux *avi_demux) GST_FLAG_SET (avi_demux, GST_ELEMENT_EVENT_AWARE); avi_demux->sinkpad = gst_pad_new_from_template ( - GST_PADTEMPLATE_GET (sink_templ), "sink"); + GST_PAD_TEMPLATE_GET (sink_templ), "sink"); gst_element_add_pad (GST_ELEMENT (avi_demux), avi_demux->sinkpad); gst_element_set_loop_function (GST_ELEMENT (avi_demux), gst_avi_demux_loop); @@ -252,7 +252,7 @@ gst_avi_demux_init (GstAviDemux *avi_demux) } static GstCaps* -avi_typefind (GstBuffer *buf, +avi_type_find (GstBuffer *buf, gpointer private) { gchar *data = GST_BUFFER_DATA (buf); @@ -265,7 +265,7 @@ avi_typefind (GstBuffer *buf, if (GUINT32_FROM_LE (((guint32 *)data)[2]) != GST_RIFF_RIFF_AVI) return NULL; - new = GST_CAPS_NEW ("avi_typefind", + new = GST_CAPS_NEW ("avi_type_find", "video/avi", "format", GST_PROPS_STRING ("AVI")); @@ -379,7 +379,7 @@ gst_avi_demux_strf_vids (GstAviDemux *avi_demux) GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: imp_colors %d", GUINT32_FROM_LE (strf->imp_colors)); srcpad = gst_pad_new_from_template ( - GST_PADTEMPLATE_GET (src_video_templ), g_strdup_printf ("video_%02d", + GST_PAD_TEMPLATE_GET (src_video_templ), g_strdup_printf ("video_%02d", avi_demux->num_video_pads)); capslist = gst_caps_append(NULL, GST_CAPS_NEW ( @@ -458,7 +458,7 @@ gst_avi_demux_strf_auds (GstAviDemux *avi_demux) GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: size %d", GUINT16_FROM_LE (strf->size)); srcpad = gst_pad_new_from_template ( - GST_PADTEMPLATE_GET (src_audio_templ), g_strdup_printf ("audio_%02d", + GST_PAD_TEMPLATE_GET (src_audio_templ), g_strdup_printf ("audio_%02d", avi_demux->num_audio_pads)); capslist = gst_caps_append(NULL, GST_CAPS_NEW ( @@ -529,7 +529,7 @@ gst_avi_demux_strf_iavs (GstAviDemux *avi_demux) GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: DVReserved2 %08x", GUINT32_FROM_LE (strf->DVReserved2)); srcpad = gst_pad_new_from_template ( - GST_PADTEMPLATE_GET (src_video_templ), g_strdup_printf ("video_%02d", + GST_PAD_TEMPLATE_GET (src_video_templ), g_strdup_printf ("video_%02d", avi_demux->num_video_pads)); capslist = gst_caps_append(NULL, GST_CAPS_NEW ( @@ -945,15 +945,15 @@ plugin_init (GModule *module, GstPlugin *plugin) } /* create an elementfactory for the avi_demux element */ - factory = gst_elementfactory_new ("avidemux",GST_TYPE_AVI_DEMUX, + factory = gst_element_factory_new ("avidemux",GST_TYPE_AVI_DEMUX, &gst_avi_demux_details); g_return_val_if_fail (factory != NULL, FALSE); - gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (src_audio_templ)); - gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (src_video_templ)); - gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (sink_templ)); + gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (src_audio_templ)); + gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (src_video_templ)); + gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (sink_templ)); - type = gst_typefactory_new (&avidefinition); + type = gst_type_factory_new (&avidefinition); gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (type)); gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory)); diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index bb3eada6..36d568e5 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -65,7 +65,7 @@ enum { ARG_FRAMERATE, }; -GST_PADTEMPLATE_FACTORY (src_factory, +GST_PAD_TEMPLATE_FACTORY (src_factory, "src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -76,7 +76,7 @@ GST_PADTEMPLATE_FACTORY (src_factory, ) ) -GST_PADTEMPLATE_FACTORY (video_sink_factory, +GST_PAD_TEMPLATE_FACTORY (video_sink_factory, "video_%d", GST_PAD_SINK, GST_PAD_REQUEST, @@ -123,7 +123,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, @@ -238,7 +238,7 @@ gst_avimux_init (GstAviMux *avimux) { gint i; avimux->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 (avimux), avimux->srcpad); GST_FLAG_SET (GST_ELEMENT(avimux), GST_ELEMENT_EVENT_AWARE); @@ -429,7 +429,7 @@ gst_avimux_request_new_pad (GstElement *element, avimux = GST_AVIMUX (element); - if (templ == GST_PADTEMPLATE_GET (audio_sink_factory)) { + if (templ == GST_PAD_TEMPLATE_GET (audio_sink_factory)) { g_return_val_if_fail(avimux->num_audio_pads == 0 /*< MAX_NUM_AUDIO_PADS*/, NULL); name = g_strdup_printf ("audio_%02d", avimux->num_audio_pads); newpad = gst_pad_new_from_template (templ, name); @@ -438,7 +438,7 @@ gst_avimux_request_new_pad (GstElement *element, avimux->audiosinkpad[avimux->num_audio_pads] = newpad; avimux->num_audio_pads++; } - else if (templ == GST_PADTEMPLATE_GET (video_sink_factory)) { + else if (templ == GST_PAD_TEMPLATE_GET (video_sink_factory)) { g_return_val_if_fail(avimux->num_video_pads == 0 /*< MAX_NUM_VIDEO_PADS*/, NULL); name = g_strdup_printf ("video_%02d", avimux->num_video_pads); newpad = gst_pad_new_from_template (templ, name); @@ -1111,13 +1111,13 @@ plugin_init (GModule *module, GstPlugin *plugin) #endif /* create an elementfactory for the avimux element */ - factory = gst_elementfactory_new ("avimux", GST_TYPE_AVIMUX, + factory = gst_element_factory_new ("avimux", GST_TYPE_AVIMUX, &gst_avimux_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/avi/gstcdxaparse.c b/gst/avi/gstcdxaparse.c index ead5854b..5d26e45a 100644 --- a/gst/avi/gstcdxaparse.c +++ b/gst/avi/gstcdxaparse.c @@ -46,14 +46,14 @@ static GstElementDetails gst_cdxa_parse_details = { "(C) 2002", }; -static GstCaps* cdxa_typefind (GstBuffer *buf, gpointer private); +static GstCaps* cdxa_type_find (GstBuffer *buf, gpointer private); /* typefactory for 'cdxa' */ static GstTypeDefinition cdxadefinition = { "cdxaparse_video/avi", "video/avi", ".dat", - cdxa_typefind, + cdxa_type_find, }; /* CDXAParse signals and args */ @@ -67,7 +67,7 @@ enum { /* FILL ME */ }; -GST_PADTEMPLATE_FACTORY (sink_templ, +GST_PAD_TEMPLATE_FACTORY (sink_templ, "sink", GST_PAD_SINK, GST_PAD_ALWAYS, @@ -78,7 +78,7 @@ GST_PADTEMPLATE_FACTORY (sink_templ, ) ) -GST_PADTEMPLATE_FACTORY (src_templ, +GST_PAD_TEMPLATE_FACTORY (src_templ, "src", GST_PAD_SRC, GST_PAD_ALWAYS, @@ -144,11 +144,11 @@ gst_cdxa_parse_init (GstCDXAParse *cdxa_parse) GST_FLAG_SET (cdxa_parse, GST_ELEMENT_EVENT_AWARE); cdxa_parse->sinkpad = gst_pad_new_from_template ( - GST_PADTEMPLATE_GET (sink_templ), "sink"); + GST_PAD_TEMPLATE_GET (sink_templ), "sink"); gst_element_add_pad (GST_ELEMENT (cdxa_parse), cdxa_parse->sinkpad); cdxa_parse->srcpad = gst_pad_new_from_template ( - GST_PADTEMPLATE_GET (src_templ), "src"); + GST_PAD_TEMPLATE_GET (src_templ), "src"); gst_element_add_pad (GST_ELEMENT (cdxa_parse), cdxa_parse->srcpad); gst_element_set_loop_function (GST_ELEMENT (cdxa_parse), gst_cdxa_parse_loop); @@ -156,7 +156,7 @@ gst_cdxa_parse_init (GstCDXAParse *cdxa_parse) } static GstCaps* -cdxa_typefind (GstBuffer *buf, +cdxa_type_find (GstBuffer *buf, gpointer private) { gchar *data = GST_BUFFER_DATA (buf); @@ -169,7 +169,7 @@ cdxa_typefind (GstBuffer *buf, if (GUINT32_FROM_LE (((guint32 *)data)[2]) != GST_RIFF_RIFF_CDXA) return NULL; - new = GST_CAPS_NEW ("cdxa_typefind", + new = GST_CAPS_NEW ("cdxa_type_find", "video/avi", "RIFF", GST_PROPS_STRING ("CDXA")); @@ -339,14 +339,14 @@ plugin_init (GModule *module, GstPlugin *plugin) } /* create an elementfactory for the cdxa_parse element */ - factory = gst_elementfactory_new ("cdxaparse", GST_TYPE_CDXA_PARSE, + factory = gst_element_factory_new ("cdxaparse", GST_TYPE_CDXA_PARSE, &gst_cdxa_parse_details); g_return_val_if_fail (factory != NULL, FALSE); - gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (src_templ)); - gst_elementfactory_add_padtemplate (factory, GST_PADTEMPLATE_GET (sink_templ)); + gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (src_templ)); + gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (sink_templ)); - type = gst_typefactory_new (&cdxadefinition); + type = gst_type_factory_new (&cdxadefinition); gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (type)); gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory)); |