pad: Put all of the probe types in the enum so they work with bindings

https://bugzilla.gnome.org/show_bug.cgi?id=688804

diff --git a/gst/gstpad.h b/gst/gstpad.h
index 0378b5abbb25a183c10b894d7c76c7ecd16747f3..c3f78f9b2eb180f526fab4abc34e919076b893a6 100644 (file)
--- a/gst/gstpad.h
+++ b/gst/gstpad.h
@@ -469,24 +469,30 @@ typedef enum
   GST_PAD_PROBE_TYPE_QUERY_UPSTREAM   = (1 << 10),
   /* flags to select scheduling mode */
   GST_PAD_PROBE_TYPE_PUSH             = (1 << 12),
-  GST_PAD_PROBE_TYPE_PULL             = (1 << 13)
+  GST_PAD_PROBE_TYPE_PULL             = (1 << 13),
+
+  /* flag combinations */
+  GST_PAD_PROBE_TYPE_BLOCKING         = (GST_PAD_PROBE_TYPE_IDLE |
+      GST_PAD_PROBE_TYPE_BLOCK),
+  GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM = (GST_PAD_PROBE_TYPE_BUFFER |
+      GST_PAD_PROBE_TYPE_BUFFER_LIST | GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM),
+  GST_PAD_PROBE_TYPE_DATA_UPSTREAM  = (GST_PAD_PROBE_TYPE_EVENT_UPSTREAM),
+  GST_PAD_PROBE_TYPE_DATA_BOTH      = (GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM |
+      GST_PAD_PROBE_TYPE_DATA_UPSTREAM),
+  GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM = (GST_PAD_PROBE_TYPE_BLOCK |
+      GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM),
+  GST_PAD_PROBE_TYPE_BLOCK_UPSTREAM = (GST_PAD_PROBE_TYPE_BLOCK |
+      GST_PAD_PROBE_TYPE_DATA_UPSTREAM),
+  GST_PAD_PROBE_TYPE_EVENT_BOTH     = (GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM |
+      GST_PAD_PROBE_TYPE_EVENT_UPSTREAM),
+  GST_PAD_PROBE_TYPE_QUERY_BOTH     = (GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM |
+      GST_PAD_PROBE_TYPE_QUERY_UPSTREAM),
+  GST_PAD_PROBE_TYPE_ALL_BOTH       = (GST_PAD_PROBE_TYPE_DATA_BOTH |
+      GST_PAD_PROBE_TYPE_QUERY_BOTH),
+  GST_PAD_PROBE_TYPE_SCHEDULING     = (GST_PAD_PROBE_TYPE_PUSH |
+      GST_PAD_PROBE_TYPE_PULL)
 } GstPadProbeType;
 
-#define GST_PAD_PROBE_TYPE_BLOCKING         (GST_PAD_PROBE_TYPE_IDLE | GST_PAD_PROBE_TYPE_BLOCK)
-#define GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM (GST_PAD_PROBE_TYPE_BLOCK | GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM)
-#define GST_PAD_PROBE_TYPE_BLOCK_UPSTREAM   (GST_PAD_PROBE_TYPE_BLOCK | GST_PAD_PROBE_TYPE_DATA_UPSTREAM)
-#define GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM  (GST_PAD_PROBE_TYPE_BUFFER | GST_PAD_PROBE_TYPE_BUFFER_LIST | \
-                                             GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM)
-#define GST_PAD_PROBE_TYPE_DATA_UPSTREAM    (GST_PAD_PROBE_TYPE_EVENT_UPSTREAM)
-#define GST_PAD_PROBE_TYPE_DATA_BOTH        (GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM | \
-                                             GST_PAD_PROBE_TYPE_DATA_UPSTREAM)
-#define GST_PAD_PROBE_TYPE_EVENT_BOTH       (GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM | \
-                                             GST_PAD_PROBE_TYPE_EVENT_UPSTREAM)
-#define GST_PAD_PROBE_TYPE_QUERY_BOTH       (GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM | \
-                                             GST_PAD_PROBE_TYPE_QUERY_UPSTREAM)
-#define GST_PAD_PROBE_TYPE_ALL_BOTH         (GST_PAD_PROBE_TYPE_DATA_BOTH | \
-                                             GST_PAD_PROBE_TYPE_QUERY_BOTH)
-#define GST_PAD_PROBE_TYPE_SCHEDULING       (GST_PAD_PROBE_TYPE_PUSH | GST_PAD_PROBE_TYPE_PULL)
 
 /**
  * GstPadProbeReturn: