From 39250a956e1dfc010fe9f9d93ca1e2c3a343cdca Mon Sep 17 00:00:00 2001
From: Michael Smith <msmith@xiph.org>
Date: Fri, 16 Sep 2005 12:18:10 +0000
Subject: [PATCH] Update gstdoc-scangobj to reflect registry/plugin API
 changes.

Original commit message from CVS:
Update gstdoc-scangobj to reflect registry/plugin API changes.
---
 ChangeLog       |  5 +++++
 gstdoc-scangobj | 12 +++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4ceef76..d838ce2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-16  Michael Smith <msmith@fluendo.com>
+
+	* gstdoc-scangobj:
+	  Make the scanobj code reflect registry/plugin API changes
+
 2005-09-15  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gtk-doc-plugins.mak:
diff --git a/gstdoc-scangobj b/gstdoc-scangobj
index e6b5b98..45079d8 100755
--- a/gstdoc-scangobj
+++ b/gstdoc-scangobj
@@ -140,16 +140,18 @@ get_object_types (void)
 
     gint i = 0;
 
-    /* get the number of types from the registry */
-    plugins = gst_registry_pool_plugin_list ();
+    /* get the list of plugins from the registry */
+    plugins = gst_registry_get_plugin_list (gst_registry_get_default());
 
     while (plugins) {
       GList *features;
       GstPlugin *plugin;
+      gchar *source;
 
       plugin = (GstPlugin *) (plugins->data);
       plugins = g_list_next (plugins);
-      if (strcmp (gst_plugin_get_source (plugin), "$SOURCE") != 0) {
+      source = gst_plugin_get_source(plugin);
+      if (!source || strcmp (gst_plugin_get_source (plugin), "$SOURCE") != 0) {
         continue;
       }
 
@@ -157,7 +159,7 @@ get_object_types (void)
       while (features) {
         GstPluginFeature *feature;
         feature = GST_PLUGIN_FEATURE (features->data);
-        if (!gst_plugin_feature_ensure_loaded (feature)) {
+        if (!gst_plugin_feature_load (feature)) {
           g_warning ("Could not load plugin feature %s",
                      gst_plugin_feature_get_name (feature));
         }
@@ -1488,7 +1490,7 @@ close OUTPUT;
 
 $CC = $ENV{CC} ? $ENV{CC} : "gcc";
 $LD = $ENV{LD} ? $ENV{LD} : $CC;
-$CFLAGS = $ENV{CFLAGS} ? $ENV{CFLAGS} : "";
+$CFLAGS = $ENV{CFLAGS} ? "$ENV{CFLAGS} -Wall -g" : "-Wall -g";
 $LDFLAGS = $ENV{LDFLAGS} ? $ENV{LDFLAGS} : "";
 
 my $o_file;
-- 
2.7.4