2008-03-06  Stefan Kost  <ensonic@users.sf.net>

	* configure.ac:
	* gst/gst_private.h:
	* gst/gstregistry.h:
	* gst/gstregistrybinary.c:

Index: configure.ac
===================================================================
RCS file: /cvs/gstreamer/gstreamer/configure.ac,v
retrieving revision 1.530
diff -u -p -u -3 -r1.530 configure.ac
--- configure.ac	4 Mar 2008 00:14:51 -0000	1.530
+++ configure.ac	6 Mar 2008 14:35:25 -0000
@@ -195,8 +195,6 @@ 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])
Index: gst/gst_private.h
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gst_private.h,v
retrieving revision 1.38
diff -u -p -u -3 -r1.38 gst_private.h
--- gst/gst_private.h	10 Jan 2008 15:55:32 -0000	1.38
+++ gst/gst_private.h	6 Mar 2008 14:35:36 -0000
@@ -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 *****************************************************/
 
Index: gst/gstregistry.h
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstregistry.h,v
retrieving revision 1.41
diff -u -p -u -3 -r1.41 gstregistry.h
--- gst/gstregistry.h	3 Mar 2008 14:43:26 -0000	1.41
+++ gst/gstregistry.h	6 Mar 2008 14:35:46 -0000
@@ -111,13 +111,8 @@ GstPlugin * 		gst_registry_lookup 		(Gst
 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 */
 
Index: gst/gstregistrybinary.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstregistrybinary.c,v
retrieving revision 1.18
diff -u -p -u -3 -r1.18 gstregistrybinary.c
--- gst/gstregistrybinary.c	3 Mar 2008 18:42:04 -0000	1.18
+++ gst/gstregistrybinary.c	6 Mar 2008 14:35:56 -0000
@@ -977,3 +977,19 @@ 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;
+}
+
