mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 19:51:11 +00:00
Lots of plugins fixes where the parentage macros were replaced with the correct gst_*_get_parent.
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:
parent
a03cb2b8a2
commit
eaeadf52e3
5 changed files with 44 additions and 42 deletions
|
@ -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;
|
||||
|
||||
|
|
|
@ -30,6 +30,7 @@ extern "C" {
|
|||
|
||||
/* Definition of structure storing data for this element. */
|
||||
typedef struct _GstExample GstExample;
|
||||
|
||||
struct _GstExample {
|
||||
GstElement element;
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -30,6 +30,7 @@ extern "C" {
|
|||
|
||||
/* Definition of structure storing data for this element. */
|
||||
typedef struct _GstExample GstExample;
|
||||
|
||||
struct _GstExample {
|
||||
GstElement element;
|
||||
|
||||
|
|
Loading…
Reference in a new issue