mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-22 09:41:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

Move registry backend API to private headers where we can. Add fixme-0.11 comments for the others. Add stubs for the ...

Browse source 
Original commit message from CVS:
* configure.ac:
* gst/gst_private.h:
* gst/gstconfig.h.in:
* gst/gstregistry.h:
* gst/gstregistrybinary.c:
* win32/common/gstconfig.h:
Move registry backend API to private headers where we can. Add
fixme-0.11 comments for the others. Add stubs for the xml backend when
using the binary to ensure they functions exists (they should not be
used though). Fixes #520756.
This commit is contained in:
Stefan Kost 2008-03-07 11:12:59 +00:00
parent 78d19978ac
commit 3c9dda6df9
8 changed files with 40 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2008-03-07 Stefan Kost <ensonic@users.sf.net>
* configure.ac:
* gst/gst_private.h:
* gst/gstconfig.h.in:
* gst/gstregistry.h:
* gst/gstregistrybinary.c:
* win32/common/gstconfig.h:
Move registry backend API to private headers where we can. Add
fixme-0.11 comments for the others. Add stubs for the xml backend when
using the binary to ensure they functions exists (they should not be
used though). Fixes #520756.
2008-03-04 Jan Schmidt <jan.schmidt@sun.com>
* configure.ac:

2
common

@ -1 +1 @@
Subproject commit 081a00a5e25d069b15bb7f6092c8f951462cd8eb
Subproject commit e02bd43fe6b9e45536eccbf5b7a5f9eae62030fd

5
configure.ac
View file

@ -195,16 +195,11 @@ AC_ARG_ENABLE(binary-registry,
[USE_BINARY_REGISTRY=no]) dnl Default value
if test "x$USE_BINARY_REGISTRY" = xyes; then
dnl for gstconfig.h:
GST_USING_BINARY_REGISTRY_DEFINE="#define GST_USING_BINARY_REGISTRY"
dnl for config.h:
AC_DEFINE(USE_BINARY_REGISTRY, 1,
[Define if we should use binary registry instead xml registry])
else
GST_USING_BINARY_REGISTRY_DEFINE="#undef GST_USING_BINARY_REGISTRY"
fi
AM_CONDITIONAL(USE_BINARY_REGISTRY, test "x$USE_BINARY_REGISTRY" = "xyes")
AC_SUBST(GST_USING_BINARY_REGISTRY_DEFINE)
dnl *** checks for platform ***

11
gst/gst_private.h
View file

@ -72,6 +72,17 @@ void _priv_gst_registry_cleanup (void);
gboolean priv_gst_structure_append_to_gstring (const GstStructure * structure,
GString * s);
/* registry cache backends */
/* FIXME 0.11: use priv_ prefix */
#ifdef USE_BINARY_REGISTRY
gboolean gst_registry_binary_read_cache (GstRegistry * registry, const char *location);
gboolean gst_registry_binary_write_cache (GstRegistry * registry, const char *location);
/* FIXME 0.11: this is in registry.h for backwards compatibility
#else
gboolean gst_registry_xml_read_cache (GstRegistry * registry, const char *location);
gboolean gst_registry_xml_write_cache (GstRegistry * registry, const char *location);
*/
#endif
/*** debugging categories *****************************************************/

2
gst/gstconfig.h.in
View file

@ -124,8 +124,6 @@
*/
@GST_DISABLE_REGISTRY_DEFINE@
@GST_USING_BINARY_REGISTRY_DEFINE@
/**
* GST_DISABLE_XML:
*

5
gst/gstregistry.h
View file

@ -111,13 +111,8 @@ GstPlugin * gst_registry_lookup (GstRegistry *registry, const char *filename
GstPluginFeature * gst_registry_lookup_feature (GstRegistry *registry, const char *name);
/* FIXME 0.11: do we really want to export these? (If yes, we should add a GError argument) */
#ifdef GST_USING_BINARY_REGISTRY
gboolean gst_registry_binary_read_cache (GstRegistry * registry, const char *location);
gboolean gst_registry_binary_write_cache (GstRegistry * registry, const char *location);
#else
gboolean gst_registry_xml_read_cache (GstRegistry * registry, const char *location);
gboolean gst_registry_xml_write_cache (GstRegistry * registry, const char *location);
#endif
/* convinience defines for the default registry */

15
gst/gstregistrybinary.c
View file

@ -977,3 +977,18 @@ Error:
}
return res;
}
/* FIXME 0.11: these are here for backwards compatibility */
gboolean
gst_registry_xml_read_cache (GstRegistry * registry, const char *location)
{
return FALSE;
}
gboolean
gst_registry_xml_write_cache (GstRegistry * registry, const char *location)
{
return FALSE;
}

2
win32/common/gstconfig.h
View file

@ -94,8 +94,6 @@
/* DOES NOT WORK */
/* #undef GST_DISABLE_REGISTRY */
/* #undef GST_USING_BINARY_REGISTRY */
/* DOES NOT WORK */
/* #undef GST_DISABLE_ENUMTYPES */