Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / gst / gstconfig.h.in

diff --git a/gst/gstconfig.h.in b/gst/gstconfig.h.in
index c3c8b13..771a9e7 100644 (file)
--- a/gst/gstconfig.h.in
+++ b/gst/gstconfig.h.in
@@ -37,7 +37,7 @@
  *
  * If a subsystem is disabled in GStreamer, a value is defined in
  * <gst/gst.h>. You can check this if you do subsystem-specific stuff.
- * <example>
+ * <example id="example-gstconfig">
  * <title>Doing subsystem specific things</title>
  * <programlisting>
  * &hash;ifndef GST_DISABLE_GST_DEBUG
@@ -59,10 +59,7 @@
 #define GST_DISABLE_TRACE 1
 #define GST_DISABLE_ALLOC_TRACE 1
 #define GST_DISABLE_REGISTRY 1
-#define GST_DISABLE_ENUMTYPES 1
-#define GST_DISABLE_INDEX 1
 #define GST_DISABLE_PLUGIN 1
-#define GST_DISABLE_URI 1
 #define GST_DISABLE_XML 1
 #define GST_DISABLE_LOADSAVE_REGISTRY 1
 #define GST_HAVE_GLIB_2_8 1
@@ -70,7 +67,7 @@
 
 /***** default padding of structures *****/
 #define GST_PADDING            4
-#define GST_PADDING_INIT       {0}
+#define GST_PADDING_INIT       { NULL }
 
 /***** padding for very extensible base classes *****/
 #define GST_PADDING_LARGE      20
@@ -120,7 +117,7 @@
  *
  * Configures the use of the plugin registry.
  * If one disables this, required plugins need to be loaded and registered
- * manualy
+ * manually
  */
 @GST_DISABLE_REGISTRY_DEFINE@
 
@@ -133,18 +130,8 @@
 @GST_DISABLE_XML_DEFINE@
 
 /* FIXME: test and document these! */
-/* Configure the use of glib enumtypes (useful for introspection)
- * see http://bugzilla.gnome.org/show_bug.cgi?id=342564
- */
-@GST_DISABLE_ENUMTYPES_DEFINE@
-/* Configure the use of indizies for seeking
- * (not used in plugins right now)
- */
-@GST_DISABLE_INDEX_DEFINE@
 /* Configures the use of external plugins */
 @GST_DISABLE_PLUGIN_DEFINE@
-/* Configures the use of uri-handlers */
-@GST_DISABLE_URI_DEFINE@
 
 /* printf extension format */
 /**
@@ -169,6 +156,34 @@
  * header files so we know whether we can use G_GNUC_PRINTF or not */
 @GST_USING_PRINTF_EXTENSION_DEFINE@
 
+/* GST_DISABLE_PRINTF_EXTENSION:
+ *
+ * Define this to debug your debug log messages and make gcc spew warnings
+ * if printf format string and arguments don't match up (this is usually
+ * not the case when libc and gcc are used because printf format warnings
+ * have to be disabled when the printf extension mechanism is in use).
+ *
+ * Note that using this option disables 'pretty logging' of GStreamer objects
+ * like caps, tags, structures, events, pads etc., so that only their address
+ * will be printed in the log.
+ *
+ * This define only disables use of the special registered printf format
+ * extensions in the code compiled with it defined. It does not stop
+ * GStreamer from registering these extensions in the first place if it
+ * was compiled against a libc that supports this.
+ *
+ * (not official API)
+ */
+/* If GLib is not using the system printf, we can't use the registered
+ * extensions because the GLib-internal printf won't know how to parse them */
+#if defined(GST_DISABLE_PRINTF_EXTENSION) || !defined(GLIB_USING_SYSTEM_PRINTF)
+  #undef GST_PTR_FORMAT
+  #define GST_PTR_FORMAT "p"
+  #undef GST_SEGMENT_FORMAT
+  #define GST_SEGMENT_FORMAT "p"
+  #undef GST_USING_PRINTF_EXTENSION
+#endif
+
 /* whether or not the CPU supports unaligned access */
 @GST_HAVE_UNALIGNED_ACCESS_DEFINE@
 
@@ -181,7 +196,6 @@
 /* FIXME: move include to where we need it */
 /*#if (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) )*/
 #ifndef GST_DISABLE_XML
-# include <libxml/parser.h>
 #else
   /* FIXME: 0.11 (replace by GST_DISABLE_XML) */
 # define GST_DISABLE_LOADSAVE_REGISTRY