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
This commit is contained in:
Tim-Philipp Müller 2012-11-23 12:47:25 +00:00
parent fba984c350
commit 32f96b922b

View file

@ -472,25 +472,16 @@ typedef enum
GST_PAD_PROBE_TYPE_PULL = (1 << 13), GST_PAD_PROBE_TYPE_PULL = (1 << 13),
/* flag combinations */ /* flag combinations */
GST_PAD_PROBE_TYPE_BLOCKING = (GST_PAD_PROBE_TYPE_IDLE | GST_PAD_PROBE_TYPE_BLOCKING = GST_PAD_PROBE_TYPE_IDLE | GST_PAD_PROBE_TYPE_BLOCK,
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_DOWNSTREAM = (GST_PAD_PROBE_TYPE_BUFFER | GST_PAD_PROBE_TYPE_DATA_UPSTREAM = GST_PAD_PROBE_TYPE_EVENT_UPSTREAM,
GST_PAD_PROBE_TYPE_BUFFER_LIST | GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM), GST_PAD_PROBE_TYPE_DATA_BOTH = GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM | GST_PAD_PROBE_TYPE_DATA_UPSTREAM,
GST_PAD_PROBE_TYPE_DATA_UPSTREAM = (GST_PAD_PROBE_TYPE_EVENT_UPSTREAM), GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM = GST_PAD_PROBE_TYPE_BLOCK | GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM,
GST_PAD_PROBE_TYPE_DATA_BOTH = (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_DATA_UPSTREAM), GST_PAD_PROBE_TYPE_EVENT_BOTH = GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM | GST_PAD_PROBE_TYPE_EVENT_UPSTREAM,
GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM = (GST_PAD_PROBE_TYPE_BLOCK | GST_PAD_PROBE_TYPE_QUERY_BOTH = GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM | GST_PAD_PROBE_TYPE_QUERY_UPSTREAM,
GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM), GST_PAD_PROBE_TYPE_ALL_BOTH = GST_PAD_PROBE_TYPE_DATA_BOTH | GST_PAD_PROBE_TYPE_QUERY_BOTH,
GST_PAD_PROBE_TYPE_BLOCK_UPSTREAM = (GST_PAD_PROBE_TYPE_BLOCK | GST_PAD_PROBE_TYPE_SCHEDULING = GST_PAD_PROBE_TYPE_PUSH | GST_PAD_PROBE_TYPE_PULL
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; } GstPadProbeType;