mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-05-18 00:12:46 +00:00
Code Issues Projects Releases Wiki Activity

more registry fixes

Browse source 
Original commit message from CVS:
more registry fixes
This commit is contained in:
Thomas Vander Stichele 2002-04-12 18:50:48 +00:00
parent 4013bb45d6
commit 98611ba214
3 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
DEVEL
View file

@ -1,9 +1,11 @@
Development Notes and Random Wisdom
* in libs like dparams, include the respective dparam headers with
#include "dparams.h"
instead of
#include <gst/libs/control/dparams.h>
because the latter will, if the include flags are set that way, first look
for the installed headers instead of the newest one, which is in your source
dir.
#include "dparams.h"
instead of
#include <gst/libs/control/dparams.h>
because the latter will, if the include flags are set that way, first look
for the installed headers instead of the newest one, which is in your source
dir.
* When doing releases, please follow the guidelines in docs

10
gst/gstplugin.c
View file

@ -64,7 +64,6 @@ void
_gst_plugin_initialize (void)
{
GList *gst_plugin_default_paths = NULL;
struct stat stat_buf;
#ifndef GST_DISABLE_REGISTRY
GstRegistryRead *gst_reg;
gchar *gst_registry;
@ -107,12 +106,19 @@ _gst_plugin_initialize (void)
if (_gst_init_registry_write)
{
/* delete it before writing */
GST_INFO (GST_CAT_PLUGIN_LOADING, " Removing registry %s if it exists", gst_registry);
unlink (gst_registry);
}
if (stat (gst_registry, &stat_buf) == 0)
if (g_file_test (gst_registry, G_FILE_TEST_EXISTS))
{
doc = xmlParseFile (gst_registry);
GST_INFO (GST_CAT_PLUGIN_LOADING, " Reading registry from %s", gst_registry);
}
else
{
GST_INFO (GST_CAT_PLUGIN_LOADING, " Not reading registry", gst_registry);
doc = NULL;
}
if (!doc ||
!doc->xmlRootNode ||

5
gst/gstregistry.c
View file

@ -124,6 +124,11 @@ gst_registry_read_get ()
{
gchar *homedir = (gchar *) g_get_home_dir ();
gst_reg->local_reg = g_strjoin ("/", homedir, LOCAL_REGISTRY_FILE, NULL);
if (g_file_test (gst_reg->local_reg, G_FILE_TEST_EXISTS) == FALSE)
{
/* it does not exist, so don't read from it */
g_free (gst_reg->local_reg);
}
gst_reg->global_reg = g_strdup (GLOBAL_REGISTRY_FILE);
}
return gst_reg;