Multiarch backward comaptibility.

[glsdk/gstreamer0-10.git] / gst / gstregistry.c

diff --git a/gst/gstregistry.c b/gst/gstregistry.c
index 0878a00a2a0aa5b02868e09c48d469113b89268c..79745353b7ec4ae907e6245e6285fb994ff0eec0 100644 (file)
--- a/gst/gstregistry.c
+++ b/gst/gstregistry.c
@@ -1127,11 +1127,12 @@ gst_registry_scan_plugin_file (GstRegistryScanContext * context,
     gst_object_unref (newplugin);
     changed = TRUE;
   }
-
+#ifndef GST_DISABLE_REGISTRY
   if (!__registry_reuse_plugin_scanner) {
     clear_scan_context (context);
     context->helper_state = REGISTRY_SCAN_HELPER_NOT_STARTED;
   }
+#endif
 
   return changed;
 }
@@ -1553,7 +1554,7 @@ scan_and_update_registry (GstRegistry * default_registry,
    * path, and the plugins installed in the user's home directory */
   plugin_path = g_getenv ("GST_PLUGIN_SYSTEM_PATH");
   if (plugin_path == NULL) {
-    char *home_plugins;
+    char *home_plugins, *backwards_compat_plugins;
 
     GST_DEBUG ("GST_PLUGIN_SYSTEM_PATH not set");
 
@@ -1569,6 +1570,13 @@ scan_and_update_registry (GstRegistry * default_registry,
     GST_DEBUG ("scanning main plugins %s", PLUGINDIR);
     changed |= gst_registry_scan_path_internal (&context, PLUGINDIR);
 
+    /* finally, look in the /usr/lib backwards-compatibility path. */
+    backwards_compat_plugins = g_build_filename ("/usr/lib",
+        "gstreamer-" GST_MAJORMINOR, NULL);
+    GST_DEBUG ("scanning plugins %s", backwards_compat_plugins);
+    changed |= gst_registry_scan_path_internal (&context, backwards_compat_plugins);
+    g_free (backwards_compat_plugins);
+
 #ifdef G_OS_WIN32
     {
       char *base_dir;