+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:
-Subproject commit 081a00a5e25d069b15bb7f6092c8f951462cd8eb
+Subproject commit e02bd43fe6b9e45536eccbf5b7a5f9eae62030fd
[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 ***
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 *****************************************************/
*/
@GST_DISABLE_REGISTRY_DEFINE@
-@GST_USING_BINARY_REGISTRY_DEFINE@
-
/**
* GST_DISABLE_XML:
*
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 */
}
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;
+}
/* DOES NOT WORK */
/* #undef GST_DISABLE_REGISTRY */
-/* #undef GST_USING_BINARY_REGISTRY */
-
/* DOES NOT WORK */
/* #undef GST_DISABLE_ENUMTYPES */