mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 11:41:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

Lots of plugins fixes where the parentage macros were replaced with the correct gst_*_get_parent.

Browse source 
Original commit message from CVS:
Lots of plugins fixes where the parentage macros were replaced with the
correct gst_*_get_parent.
Updated the example.
'gstreamer' now is the doc type instead of GST-Pipeline
This commit is contained in:
Wim Taymans 2001-01-29 23:50:29 +00:00
parent a03cb2b8a2
commit eaeadf52e3
5 changed files with 44 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
examples/plugins/example.c
View file

@ -47,8 +47,8 @@ static GstPadFactory sink_factory = {
GST_PAD_FACTORY_CAPS(
"example_sink", /* the name of the caps */
"unknown/unknown", /* the mime type of the caps */
"something", GST_PROPS_INT (1), /* a property */
"foo", GST_PROPS_BOOLEAN (TRUE) /* another property */
"something", GST_PROPS_INT (1), /* a property */
"foo", GST_PROPS_BOOLEAN (TRUE) /* another property */
),
NULL
};
@ -65,13 +65,13 @@ static GstPadFactory src_factory = {
};
static void gst_example_class_init (GstExampleClass *klass);
static void gst_example_init (GstExample *example);
static void gst_example_class_init (GstExampleClass *klass);
static void gst_example_init (GstExample *example);
static void gst_example_chain (GstPad *pad, GstBuffer *buf);
static void gst_example_chain (GstPad *pad, GstBuffer *buf);
static void gst_example_set_arg (GtkObject *object,GtkArg *arg,guint id);
static void gst_example_get_arg (GtkObject *object,GtkArg *arg,guint id);
static void gst_example_set_arg (GtkObject *object,GtkArg *arg,guint id);
static void gst_example_get_arg (GtkObject *object,GtkArg *arg,guint id);
GstPadTemplate *src_template, *sink_template;
@ -79,7 +79,7 @@ static GstElementClass *parent_class = NULL;
//static guint gst_example_signals[LAST_SIGNAL] = { 0 };
GtkType
gst_example_get_type(void)
gst_example_get_type(void)
{
static GtkType example_type = 0;
@ -99,8 +99,8 @@ gst_example_get_type(void)
return example_type;
}
static void
gst_example_class_init (GstExampleClass *klass)
static void
gst_example_class_init (GstExampleClass *klass)
{
GtkObjectClass *gtkobject_class;
GstElementClass *gstelement_class;
@ -113,12 +113,12 @@ gst_example_class_init (GstExampleClass *klass)
gtk_object_add_arg_type("GstExample::active", GTK_TYPE_INT,
GTK_ARG_READWRITE, ARG_ACTIVE);
gtkobject_class->set_arg = gst_example_set_arg;
gtkobject_class->set_arg = gst_example_set_arg;
gtkobject_class->get_arg = gst_example_get_arg;
}
static void
gst_example_init(GstExample *example)
static void
gst_example_init(GstExample *example)
{
example->sinkpad = gst_pad_new_from_template (sink_template, "sink");
gst_element_add_pad(GST_ELEMENT(example),example->sinkpad);
@ -130,8 +130,8 @@ gst_example_init(GstExample *example)
example->active = FALSE;
}
static void
gst_example_chain (GstPad *pad, GstBuffer *buf)
static void
gst_example_chain (GstPad *pad, GstBuffer *buf)
{
GstExample *example;
@ -152,8 +152,8 @@ gst_example_chain (GstPad *pad, GstBuffer *buf)
gst_pad_push(example->srcpad,buf);
}
static void
gst_example_set_arg (GtkObject *object,GtkArg *arg,guint id)
static void
gst_example_set_arg (GtkObject *object,GtkArg *arg,guint id)
{
GstExample *example;
@ -171,8 +171,8 @@ gst_example_set_arg (GtkObject *object,GtkArg *arg,guint id)
}
}
static void
gst_example_get_arg (GtkObject *object,GtkArg *arg,guint id)
static void
gst_example_get_arg (GtkObject *object,GtkArg *arg,guint id)
{
GstExample *example;
@ -191,7 +191,7 @@ gst_example_get_arg (GtkObject *object,GtkArg *arg,guint id)
}
GstPlugin*
plugin_init (GModule *module)
plugin_init (GModule *module)
{
GstPlugin *plugin;
GstElementFactory *factory;

1
examples/plugins/example.h
View file

@ -30,6 +30,7 @@ extern "C" {
/* Definition of structure storing data for this element. */
typedef struct _GstExample GstExample;
struct _GstExample {
GstElement element;

4
gst/gstxml.c
View file

@ -121,7 +121,7 @@ gst_xml_write (GstElement *element)
xmlNewGlobalNs (doc, "http://gstreamer.net/gst-core/1.0/", "gst");
ns = xmlNewNs (doc->xmlRootNode, "http://gstreamer.net/gst-core/1.0/", "gst");
doc->xmlRootNode = xmlNewDocNode (doc, ns, "GST-Pipeline", NULL);
doc->xmlRootNode = xmlNewDocNode (doc, ns, "gstreamer", NULL);
elementnode = xmlNewChild (doc->xmlRootNode, NULL, "element", NULL);
@ -146,7 +146,7 @@ gst_xml_real_parse (GstXML *xml, xmlDocPtr doc, const guchar *root)
g_warning("gstxml: document of wrong type, core namespace not found\n");
return FALSE;
}
if (strcmp(cur->name, "GST-Pipeline")) {
if (strcmp(cur->name, "gstreamer")) {
g_warning("gstxml: XML file is in wrong format\n");
return FALSE;
}

40
tests/old/examples/plugins/example.c
View file

@ -47,8 +47,8 @@ static GstPadFactory sink_factory = {
GST_PAD_FACTORY_CAPS(
"example_sink", /* the name of the caps */
"unknown/unknown", /* the mime type of the caps */
"something", GST_PROPS_INT (1), /* a property */
"foo", GST_PROPS_BOOLEAN (TRUE) /* another property */
"something", GST_PROPS_INT (1), /* a property */
"foo", GST_PROPS_BOOLEAN (TRUE) /* another property */
),
NULL
};
@ -65,13 +65,13 @@ static GstPadFactory src_factory = {
};
static void gst_example_class_init (GstExampleClass *klass);
static void gst_example_init (GstExample *example);
static void gst_example_class_init (GstExampleClass *klass);
static void gst_example_init (GstExample *example);
static void gst_example_chain (GstPad *pad, GstBuffer *buf);
static void gst_example_chain (GstPad *pad, GstBuffer *buf);
static void gst_example_set_arg (GtkObject *object,GtkArg *arg,guint id);
static void gst_example_get_arg (GtkObject *object,GtkArg *arg,guint id);
static void gst_example_set_arg (GtkObject *object,GtkArg *arg,guint id);
static void gst_example_get_arg (GtkObject *object,GtkArg *arg,guint id);
GstPadTemplate *src_template, *sink_template;
@ -79,7 +79,7 @@ static GstElementClass *parent_class = NULL;
//static guint gst_example_signals[LAST_SIGNAL] = { 0 };
GtkType
gst_example_get_type(void)
gst_example_get_type(void)
{
static GtkType example_type = 0;
@ -99,8 +99,8 @@ gst_example_get_type(void)
return example_type;
}
static void
gst_example_class_init (GstExampleClass *klass)
static void
gst_example_class_init (GstExampleClass *klass)
{
GtkObjectClass *gtkobject_class;
GstElementClass *gstelement_class;
@ -113,12 +113,12 @@ gst_example_class_init (GstExampleClass *klass)
gtk_object_add_arg_type("GstExample::active", GTK_TYPE_INT,
GTK_ARG_READWRITE, ARG_ACTIVE);
gtkobject_class->set_arg = gst_example_set_arg;
gtkobject_class->set_arg = gst_example_set_arg;
gtkobject_class->get_arg = gst_example_get_arg;
}
static void
gst_example_init(GstExample *example)
static void
gst_example_init(GstExample *example)
{
example->sinkpad = gst_pad_new_from_template (sink_template, "sink");
gst_element_add_pad(GST_ELEMENT(example),example->sinkpad);
@ -130,8 +130,8 @@ gst_example_init(GstExample *example)
example->active = FALSE;
}
static void
gst_example_chain (GstPad *pad, GstBuffer *buf)
static void
gst_example_chain (GstPad *pad, GstBuffer *buf)
{
GstExample *example;
@ -152,8 +152,8 @@ gst_example_chain (GstPad *pad, GstBuffer *buf)
gst_pad_push(example->srcpad,buf);
}
static void
gst_example_set_arg (GtkObject *object,GtkArg *arg,guint id)
static void
gst_example_set_arg (GtkObject *object,GtkArg *arg,guint id)
{
GstExample *example;
@ -171,8 +171,8 @@ gst_example_set_arg (GtkObject *object,GtkArg *arg,guint id)
}
}
static void
gst_example_get_arg (GtkObject *object,GtkArg *arg,guint id)
static void
gst_example_get_arg (GtkObject *object,GtkArg *arg,guint id)
{
GstExample *example;
@ -191,7 +191,7 @@ gst_example_get_arg (GtkObject *object,GtkArg *arg,guint id)
}
GstPlugin*
plugin_init (GModule *module)
plugin_init (GModule *module)
{
GstPlugin *plugin;
GstElementFactory *factory;

1
tests/old/examples/plugins/example.h
View file

@ -30,6 +30,7 @@ extern "C" {
/* Definition of structure storing data for this element. */
typedef struct _GstExample GstExample;
struct _GstExample {
GstElement element;