From 4e298c064152564cc1a1eea26a1faf5f23c30406 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 1 Mar 2004 23:38:27 +0000 Subject: [PATCH] attach global instead of local registry to GST_REGISTRY Original commit message from CVS: attach global instead of local registry to GST_REGISTRY --- ChangeLog | 10 ++++++++++ gst/gst.c | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8410e977d1..e86c10dc0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-03-02 Thomas Vander Stichele + + * gst/gst.c: (init_post): + change so that GST_REGISTRY now is where the global registry gets + saved, since that is where plugins now get attached to first, and + spilled over to the user registry. Note that in the case of using + GST_REGISTRY env var, we don't want to affect any real registries + beyond the one given by this var, and thus we don't set a user + registry to spill to. So make sure GST_REGISTRY is writable. + 2004-03-01 David Schleef * AUTHORS: Added some names. Add yourself if you're missing. diff --git a/gst/gst.c b/gst/gst.c index 870e33ccb3..dbdd5c49f5 100644 --- a/gst/gst.c +++ b/gst/gst.c @@ -551,7 +551,7 @@ init_post (void) if (!_gst_registry_fixed) { /* don't override command-line options */ if (g_getenv ("GST_REGISTRY")) { - g_object_set (_user_registry, "location", g_getenv ("GST_REGISTRY"), NULL); + g_object_set (_global_registry, "location", g_getenv ("GST_REGISTRY"), NULL); _gst_registry_fixed = TRUE; } } @@ -560,7 +560,7 @@ init_post (void) gst_registry_pool_add (_global_registry, 100); gst_registry_pool_add (_user_registry, 50); } else { - gst_registry_pool_add (_user_registry, 50); + gst_registry_pool_add (_global_registry, 100); } if (_gst_registry_auto_load) {