From 82769bcae982c7953921915dfc11396d0c45af97 Mon Sep 17 00:00:00 2001
From: Richard Boulton <richard@tartarus.org>
Date: Thu, 18 Jan 2001 15:29:46 +0000
Subject: [PATCH] Some more fixes for libxml.

Original commit message from CVS:
Some more fixes for libxml.
Also, some code formatting changes in esdsink, some further fixes to
vumeter, and some work on synaesthesia to make it closer to working
(it doesn't fully work yet, though. :( )
---
 tests/caps.c       | 12 ++++++------
 tests/padfactory.c |  8 ++++----
 tests/props.c      |  8 ++++----
 tests/registry.c   |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/caps.c b/tests/caps.c
index bbd4d1ab0d..df8147eeed 100644
--- a/tests/caps.c
+++ b/tests/caps.c
@@ -66,28 +66,28 @@ int main(int argc,char *argv[])
   xmlNodePtr parent;
 
   doc = xmlNewDoc ("1.0");
-  doc->root = xmlNewDocNode (doc, NULL, "Capabilities", NULL);
+  doc->xmlRootNode = xmlNewDocNode (doc, NULL, "Capabilities", NULL);
 
   _gst_type_initialize ();
 
   sinkcaps = gst_caps_register (&mpeg2dec_sink_caps);
-  parent = xmlNewChild (doc->root, NULL, "Capabilities1", NULL);
+  parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities1", NULL);
   gst_caps_save_thyself (sinkcaps, parent);
 
   rawcaps  = gst_caps_register (&mpeg2dec_src_caps);
-  parent = xmlNewChild (doc->root, NULL, "Capabilities2", NULL);
+  parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities2", NULL);
   gst_caps_save_thyself (rawcaps, parent);
 
   rawcaps2  = gst_caps_register (&raw_sink_caps);
-  parent = xmlNewChild (doc->root, NULL, "Capabilities3", NULL);
+  parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities3", NULL);
   gst_caps_save_thyself (rawcaps2, parent);
 
   mp1parsecaps  = gst_caps_register (&mp1parse_src_caps);
-  parent = xmlNewChild (doc->root, NULL, "Capabilities4", NULL);
+  parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities4", NULL);
   gst_caps_save_thyself (mp1parsecaps, parent);
 
   rawcaps3  = gst_caps_register (&raw2_sink_caps);
-  parent = xmlNewChild (doc->root, NULL, "Capabilities5", NULL);
+  parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities5", NULL);
   gst_caps_save_thyself (rawcaps3, parent);
 
   xmlDocDump(stdout, doc);
diff --git a/tests/padfactory.c b/tests/padfactory.c
index 4125a9eddf..3fcb210556 100644
--- a/tests/padfactory.c
+++ b/tests/padfactory.c
@@ -63,20 +63,20 @@ int main(int argc,char *argv[])
   xmlNodePtr parent;
 
   doc = xmlNewDoc ("1.0");
-  doc->root = xmlNewDocNode (doc, NULL, "Capabilities", NULL);
+  doc->xmlRootNode = xmlNewDocNode (doc, NULL, "Capabilities", NULL);
 
   _gst_type_initialize ();
 
   sinkcaps = gst_caps_register (&mpeg2dec_sink_caps);
-  parent = xmlNewChild (doc->root, NULL, "Capabilities1", NULL);
+  parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities1", NULL);
   gst_caps_save_thyself (sinkcaps, parent);
 
   rawcaps  = gst_caps_register (&mpeg2dec_src_caps);
-  parent = xmlNewChild (doc->root, NULL, "Capabilities2", NULL);
+  parent = xmlNewChild (doc->xmlRootNode, NULL, "Capabilities2", NULL);
   gst_caps_save_thyself (rawcaps, parent);
 
   temp = gst_padtemplate_new (&pad_caps);
-  parent = xmlNewChild (doc->root, NULL, "Padtemplate", NULL);
+  parent = xmlNewChild (doc->xmlRootNode, NULL, "Padtemplate", NULL);
   gst_padtemplate_save_thyself (temp, parent);
 
   xmlDocDump(stdout, doc);
diff --git a/tests/props.c b/tests/props.c
index a6d6728bc0..e948741acd 100644
--- a/tests/props.c
+++ b/tests/props.c
@@ -29,16 +29,16 @@ int main(int argc,char *argv[])
   gint i;
 
   doc = xmlNewDoc ("1.0");
-  doc->root = xmlNewDocNode (doc, NULL, "Properties", NULL);
+  doc->xmlRootNode = xmlNewDocNode (doc, NULL, "Properties", NULL);
 
   _gst_type_initialize ();
 
   sinkprops = gst_props_register (mpeg2dec_sink_props);
-  parent = xmlNewChild (doc->root, NULL, "Props1", NULL);
+  parent = xmlNewChild (doc->xmlRootNode, NULL, "Props1", NULL);
   gst_props_save_thyself (sinkprops, parent);
 
   rawprops  = gst_props_register (mpeg2dec_src_props);
-  parent = xmlNewChild (doc->root, NULL, "Props2", NULL);
+  parent = xmlNewChild (doc->xmlRootNode, NULL, "Props2", NULL);
   gst_props_save_thyself (rawprops, parent);
 
   i=argc;
@@ -57,7 +57,7 @@ int main(int argc,char *argv[])
 			             NULL));
   }
 
-  parent = xmlNewChild (doc->root, NULL, "Props3", NULL);
+  parent = xmlNewChild (doc->xmlRootNode, NULL, "Props3", NULL);
   gst_props_save_thyself (testprops, parent);
 
   xmlDocDump(stdout, doc);
diff --git a/tests/registry.c b/tests/registry.c
index 81de368cdc..804df82302 100644
--- a/tests/registry.c
+++ b/tests/registry.c
@@ -42,13 +42,13 @@ dump_factory (gchar *name)
     xmlDocPtr doc;
 
     doc = xmlNewDoc ("1.0");
-    doc->root = xmlNewDocNode (doc, NULL, "templates", NULL);
+    doc->xmlRootNode = xmlNewDocNode (doc, NULL, "templates", NULL);
 
     while (padtemplates) {
       xmlNodePtr parent;
       GstPadTemplate *template = (GstPadTemplate *) padtemplates->data;
 
-      parent = xmlNewChild (doc->root, NULL, "template", NULL);
+      parent = xmlNewChild (doc->xmlRootNode, NULL, "template", NULL);
 
       gst_padtemplate_save_thyself (template, parent);