From c6554049dec7f0fe628062224066523c5a80c1a3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 6 Jan 2010 19:19:40 +0000 Subject: [PATCH] registry: deprecate useless gst_registry_xml_{read|write}_cache() The only reason these two functions are still around is that at some point in the past they were in a public header, so we can't really remove them now even though they should have been private all along (and aren't really particularly useful). Since these are just empty stubs now that do nothing but return FALSE and will be removed in 0.11 anyway, we may just as well deprecate them formally. --- docs/gst/gstreamer-sections.txt | 4 ++-- gst/gstregistry.h | 6 +++++- gst/gstregistrybinary.c | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt index 5fa9d21..3f593f8 100644 --- a/docs/gst/gstreamer-sections.txt +++ b/docs/gst/gstreamer-sections.txt @@ -1964,8 +1964,6 @@ gst_registry_add_path gst_registry_scan_path gst_registry_binary_read_cache gst_registry_binary_write_cache -gst_registry_xml_read_cache -gst_registry_xml_write_cache gst_registry_lookup gst_registry_remove_feature gst_registry_add_feature @@ -1994,6 +1992,8 @@ GST_MAGIC_BINARY_VERSION_STR GST_MAGIC_BINARY_VERSION_LEN gst_registry_get_type GstRegistryPrivate +gst_registry_xml_read_cache +gst_registry_xml_write_cache diff --git a/gst/gstregistry.h b/gst/gstregistry.h index dee501b..2f38dcd 100644 --- a/gst/gstregistry.h +++ b/gst/gstregistry.h @@ -115,9 +115,13 @@ GstPluginFeature* gst_registry_find_feature (GstRegistry *registry, const gchar 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) */ +/* These are only here because at some point they were in a public header + * (even though they should have been private) and we can't really remove + * them now (FIXME: 0.11). They don't do anything other than return FALSE. */ +#ifndef GST_DISABLE_DEPRECATED 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 */ diff --git a/gst/gstregistrybinary.c b/gst/gstregistrybinary.c index e9df4fe..e7c41cf 100644 --- a/gst/gstregistrybinary.c +++ b/gst/gstregistrybinary.c @@ -608,6 +608,7 @@ Error: return res; } +#ifndef GST_REMOVE_DEPRECATED /* FIXME 0.11: these symbols are here for backwards compatibility and should * be removed or made private */ gboolean @@ -621,3 +622,4 @@ gst_registry_xml_write_cache (GstRegistry * registry, const char *location) { return FALSE; } +#endif /* GST_REMOVE_DEPRECATED */ -- 2.7.4