set env properly; fixes for new API

Original commit message from CVS:
set env properly; fixes for new API

diff --git a/ChangeLog b/ChangeLog
index bd8d49c..c462be6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-09-20  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * gst-xmlinspect.py:
+       * gstdoc-scangobj:
+         some fixes for new API
+       * gtk-doc-plugins.mak:
+         set environment properly
+
 2005-09-17  David Schleef  <ds@schleef.org>
 
        * gtk-doc-plugins.mak: Use new environment variables.

diff --git a/gst-xmlinspect.py b/gst-xmlinspect.py
index 1d96b44..c05589b 100644 (file)
--- a/gst-xmlinspect.py
+++ b/gst-xmlinspect.py
@@ -112,7 +112,8 @@ def main():
     if len(sys.argv) > 2:
         os.chdir(sys.argv[2])
 
-    all = gst.registry_pool_plugin_list()
+    registry = gst.registry_get_default()
+    all = registry.get_plugin_list()
     for plugin in all:
         if plugin.get_source() != source:
             continue

diff --git a/gstdoc-scangobj b/gstdoc-scangobj
index 45079d8..b0fd63d 100755 (executable)
--- a/gstdoc-scangobj
+++ b/gstdoc-scangobj
@@ -146,16 +146,19 @@ get_object_types (void)
     while (plugins) {
       GList *features;
       GstPlugin *plugin;
-      gchar *source;
+      const gchar *source;
 
       plugin = (GstPlugin *) (plugins->data);
       plugins = g_list_next (plugins);
-      source = gst_plugin_get_source(plugin);
+      source = gst_plugin_get_source (plugin);
+      g_print ("source: %s\\n", source);
       if (!source || strcmp (gst_plugin_get_source (plugin), "$SOURCE") != 0) {
         continue;
       }
 
-      features = gst_plugin_get_feature_list (plugin);
+      features =
+          gst_registry_get_feature_list_by_plugin (gst_registry_get_default (),
+          plugin->desc.name);
       while (features) {
         GstPluginFeature *feature;
         feature = GST_PLUGIN_FEATURE (features->data);

diff --git a/gtk-doc-plugins.mak b/gtk-doc-plugins.mak
index d48508b..d51c9e4 100644 (file)
--- a/gtk-doc-plugins.mak
+++ b/gtk-doc-plugins.mak
@@ -93,8 +93,7 @@ scanobj-build.stamp: $(SCANOBJ_DEPS) $(basefiles)
                cp $(srcdir)/$$f . ;                                    \
            done;                                                       \
        else                                                            \
-           GST_PLUGIN_SYSTEM_PATH=`cd $(top_builddir) && pwd`          \
-           GST_PLUGIN_PATH=                                            \
+           $(INSPECT_ENVIRONMENT)                                      \
            CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)"                         \
            CFLAGS="-g $(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)"               \
            $(GST_DOC_SCANOBJ) --type-init-func="gst_init(NULL,NULL)"   \
@@ -110,7 +109,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(SCANOBJ_FILES_O): scan-build.stamp
 # only look at the plugins in this module when building inspect .xml stuff
 INSPECT_REGISTRY=$(top_builddir)/docs/plugins/inspect-registry.xml
 INSPECT_ENVIRONMENT=\
-        GST_PLUGIN_PATH_ONLY=yes \
+        GST_PLUGIN_SYSTEM_PATH= \
         GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext \
         GST_REGISTRY=$(INSPECT_REGISTRY)