diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2012-11-23 12:47:25 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2012-11-23 12:47:25 +0000 |
| commit | 32f96b922b56a0facdc55d8d21518d7994c8236d (patch) | |
| tree | 809da24920485b0e880d651cb8700726c1c32572 | |
| parent | fba984c3506882993065356eeef322df077d14f1 (diff) | |
pad: don't use parenthesis for ORed pad probe flag enums
glib-mkenum doesn't like them for some reason.
https://bugzilla.gnome.org/show_bug.cgi?id=688804
| -rw-r--r-- | gst/gstpad.h | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/gst/gstpad.h b/gst/gstpad.h index bc95b508d..284a7d462 100644 --- a/gst/gstpad.h +++ b/gst/gstpad.h @@ -472,25 +472,16 @@ typedef enum 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) + 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; |