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

gst/gst.c (init_post): remove hard-coded 0.9 location for registries/plugins with a MAJORMINOR one.

Browse source 
Original commit message from CVS:
2005-12-05  Andy Wingo  <wingo@pobox.com>

patch by: Thomas Vander Stichele  <thomas at apestaart dot org>

* gst/gst.c (init_post): remove hard-coded 0.9 location for
registries/plugins with a MAJORMINOR one.
(plugin_desc): Rename library from gstcoreleements to
staticelements. Fixes #323222.
This commit is contained in:
Thomas Vander Stichele 2005-12-05 09:53:54 +00:00 committed by Andy Wingo
parent 93f79f0c96
commit 9def80ce05
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2005-12-05 Andy Wingo <wingo@pobox.com>
patch by: Thomas Vander Stichele <thomas at apestaart dot org>
* gst/gst.c (init_post): remove hard-coded 0.9 location for
registries/plugins with a MAJORMINOR one.
(plugin_desc): Rename library from gstcoreleements to
staticelements. Fixes #323222.
2005-12-05 Tim-Philipp Müller <tim at centricular dot net> 2005-12-05 Tim-Philipp Müller <tim at centricular dot net>
* libs/gst/base/gstcollectpads.c: (gst_collect_pads_base_init): * libs/gst/base/gstcollectpads.c: (gst_collect_pads_base_init):

8
gst/gst.c
View file

@ -516,8 +516,8 @@ gst_register_core_elements (GstPlugin * plugin)
static GstPluginDesc plugin_desc = { static GstPluginDesc plugin_desc = {
GST_VERSION_MAJOR, GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
"gstcoreelements", "staticelements",
"core elements of the GStreamer library", "core elements linked into the GStreamer library",
gst_register_core_elements, gst_register_core_elements,
VERSION, VERSION,
GST_LICENSE, GST_LICENSE,
@ -589,7 +589,7 @@ init_post (void)
registry_file = g_strdup (g_getenv ("GST_REGISTRY")); registry_file = g_strdup (g_getenv ("GST_REGISTRY"));
if (registry_file == NULL) { if (registry_file == NULL) {
registry_file = g_build_filename (g_get_home_dir (), registry_file = g_build_filename (g_get_home_dir (),
".gstreamer-0.9", "registry.xml", NULL); ".gstreamer-" GST_MAJORMINOR, "registry.xml", NULL);
} }
GST_DEBUG ("Reading registry cache"); GST_DEBUG ("Reading registry cache");
gst_registry_xml_read_cache (default_registry, registry_file); gst_registry_xml_read_cache (default_registry, registry_file);
@ -623,7 +623,7 @@ init_post (void)
/* plugins in the user's home directory take precedence over /* plugins in the user's home directory take precedence over
* system-installed ones */ * system-installed ones */
home_plugins = g_build_filename (g_get_home_dir (), home_plugins = g_build_filename (g_get_home_dir (),
".gstreamer-0.9", "plugins", NULL); ".gstreamer-" GST_MAJORMINOR, "plugins", NULL);
gst_registry_scan_path (default_registry, home_plugins); gst_registry_scan_path (default_registry, home_plugins);
g_free (home_plugins); g_free (home_plugins);