[gstreamermm: 73/167] removed some entries in enum patch(patch for glibmm enum.pl here: https://bug705113.bugzilla-attachm

From: Murray Cumming <murrayc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gstreamermm: 73/167] removed some entries in enum patch(patch for glibmm enum.pl here: https://bug705113.bugzilla-attachm
Date: Tue, 3 Sep 2013 19:25:12 +0000 (UTC)
commit da62211ec0f3e840bd4e1e1ba0f890c400fc1ab4
Author: Marcin Kolny at Flytronic <marcin kolny flytronic pl>
Date:   Tue Jul 30 11:04:13 2013 +0200

    removed some entries in enum patch(patch for glibmm enum.pl here: 
https://bug705113.bugzilla-attachments.gnome.org/attachment.cgi?id=250423)

 gstreamer/src/event.hg             |   43 ++-------
 gstreamer/src/gst_enums.defs       |  120 ++++++++++++++++++++++++
 gstreamer/src/gst_enums.defs.patch |  179 +-----------------------------------
 gstreamer/src/query.hg             |   30 ++-----
 4 files changed, 135 insertions(+), 237 deletions(-)
---
diff --git a/gstreamer/src/event.hg b/gstreamer/src/event.hg
index 3e154ec..86dafb7 100644
--- a/gstreamer/src/event.hg
+++ b/gstreamer/src/event.hg
@@ -42,46 +42,17 @@ namespace Glib
 namespace Gst
 {
 
-_WRAP_ENUM_DOCS_ONLY(EventType, GstEventType)
-enum EventType
-{
-  EVENT_UNKNOWN = GST_EVENT_UNKNOWN,
-  /* bidirectional events */
-  EVENT_FLUSH_START = GST_EVENT_FLUSH_START,
-  EVENT_FLUSH_STOP = GST_EVENT_FLUSH_STOP,
-  /* downstream serialized events */
-  EVENT_STREAM_START = GST_EVENT_STREAM_START,
-  EVENT_CAPS = GST_EVENT_CAPS,
-  EVENT_SEGMENT = GST_EVENT_SEGMENT,
-  EVENT_TAG = GST_EVENT_TAG,
-  EVENT_BUFFERSIZE = GST_EVENT_BUFFERSIZE,
-  EVENT_SINK_MESSAGE = GST_EVENT_SINK_MESSAGE,
-  EVENT_EOS = GST_EVENT_EOS,
-  EVENT_TOC = GST_EVENT_TOC,
-  //EVENT_CONTEXT = GST_EVENT_CONTEXT,
-  /* non-sticky downstream serialized */
-  EVENT_SEGMENT_DONE = GST_EVENT_SEGMENT_DONE,
-  EVENT_GAP = GST_EVENT_GAP,
-  /* upstream events */
-  EVENT_QOS = GST_EVENT_QOS,
-  EVENT_SEEK = GST_EVENT_SEEK,
-  EVENT_NAVIGATION = GST_EVENT_NAVIGATION,
-  EVENT_LATENCY = GST_EVENT_LATENCY,
-  EVENT_STEP = GST_EVENT_STEP,
-  EVENT_RECONFIGURE = GST_EVENT_RECONFIGURE,
-  EVENT_TOC_SELECT = GST_EVENT_TOC_SELECT,
-  /* custom events start here */
-  EVENT_CUSTOM_UPSTREAM = GST_EVENT_CUSTOM_UPSTREAM,
-  EVENT_CUSTOM_DOWNSTREAM = GST_EVENT_CUSTOM_DOWNSTREAM,
-  EVENT_CUSTOM_DOWNSTREAM_OOB = GST_EVENT_CUSTOM_DOWNSTREAM_OOB,
-  EVENT_CUSTOM_DOWNSTREAM_STICKY = GST_EVENT_CUSTOM_DOWNSTREAM_STICKY,
-  EVENT_CUSTOM_BOTH = GST_EVENT_CUSTOM_BOTH,
-  EVENT_CUSTOM_BOTH_OOB = GST_EVENT_CUSTOM_BOTH_OOB
-};
+#define GST_EVENT_MAKE_TYPE(num,flags) \
+    (((num) << GST_EVENT_NUM_SHIFT) | (flags))
 
+#define FLAG(name) GST_EVENT_TYPE_##name
+
+_WRAP_ENUM(EventType, GstEventType)
 _WRAP_ENUM(EventTypeFlags, GstEventTypeFlags)
 _WRAP_ENUM(QOSType, GstQOSType)
 
+#undef FLAG
+
 class Message;
 class Structure;
 class TagList;
diff --git a/gstreamer/src/gst_enums.defs b/gstreamer/src/gst_enums.defs
index 6b5a513..ae9fcdc 100644
--- a/gstreamer/src/gst_enums.defs
+++ b/gstreamer/src/gst_enums.defs
@@ -547,6 +547,79 @@
 
 ;; Original typedef:
 ;; typedef enum {
+;;   GST_EVENT_UNKNOWN               = GST_EVENT_MAKE_TYPE (0, 0),
+;; 
+;;   /* bidirectional events */
+;;   GST_EVENT_FLUSH_START           = GST_EVENT_MAKE_TYPE (10, FLAG(BOTH)),
+;;   GST_EVENT_FLUSH_STOP            = GST_EVENT_MAKE_TYPE (20, FLAG(BOTH) | FLAG(SERIALIZED)),
+;; 
+;;   /* downstream serialized events */
+;;   GST_EVENT_STREAM_START          = GST_EVENT_MAKE_TYPE (40, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY)),
+;;   GST_EVENT_CAPS                  = GST_EVENT_MAKE_TYPE (50, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY)),
+;;   GST_EVENT_SEGMENT               = GST_EVENT_MAKE_TYPE (70, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY)),
+;;   GST_EVENT_TAG                   = GST_EVENT_MAKE_TYPE (80, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY) | FLAG(STICKY_MULTI)),
+;;   GST_EVENT_BUFFERSIZE            = GST_EVENT_MAKE_TYPE (90, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY)),
+;;   GST_EVENT_SINK_MESSAGE          = GST_EVENT_MAKE_TYPE (100, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY) | FLAG(STICKY_MULTI)),
+;;   GST_EVENT_EOS                   = GST_EVENT_MAKE_TYPE (110, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY)),
+;;   GST_EVENT_TOC                   = GST_EVENT_MAKE_TYPE (120, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY) | FLAG(STICKY_MULTI)),
+;; 
+;;   /* non-sticky downstream serialized */
+;;   GST_EVENT_SEGMENT_DONE          = GST_EVENT_MAKE_TYPE (150, FLAG(DOWNSTREAM) | FLAG(SERIALIZED)),
+;;   GST_EVENT_GAP                   = GST_EVENT_MAKE_TYPE (160, FLAG(DOWNSTREAM) | FLAG(SERIALIZED)),
+;; 
+;;   /* upstream events */
+;;   GST_EVENT_QOS                   = GST_EVENT_MAKE_TYPE (190, FLAG(UPSTREAM)),
+;;   GST_EVENT_SEEK                  = GST_EVENT_MAKE_TYPE (200, FLAG(UPSTREAM)),
+;;   GST_EVENT_NAVIGATION            = GST_EVENT_MAKE_TYPE (210, FLAG(UPSTREAM)),
+;;   GST_EVENT_LATENCY               = GST_EVENT_MAKE_TYPE (220, FLAG(UPSTREAM)),
+;;   GST_EVENT_STEP                  = GST_EVENT_MAKE_TYPE (230, FLAG(UPSTREAM)),
+;;   GST_EVENT_RECONFIGURE           = GST_EVENT_MAKE_TYPE (240, FLAG(UPSTREAM)),
+;;   GST_EVENT_TOC_SELECT            = GST_EVENT_MAKE_TYPE (250, FLAG(UPSTREAM)),
+;; 
+;;   /* custom events start here */
+;;   GST_EVENT_CUSTOM_UPSTREAM          = GST_EVENT_MAKE_TYPE (270, FLAG(UPSTREAM)),
+;;   GST_EVENT_CUSTOM_DOWNSTREAM        = GST_EVENT_MAKE_TYPE (280, FLAG(DOWNSTREAM) | FLAG(SERIALIZED)),
+;;   GST_EVENT_CUSTOM_DOWNSTREAM_OOB    = GST_EVENT_MAKE_TYPE (290, FLAG(DOWNSTREAM)),
+;;   GST_EVENT_CUSTOM_DOWNSTREAM_STICKY = GST_EVENT_MAKE_TYPE (300, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY) | FLAG(STICKY_MULTI)),
+;;   GST_EVENT_CUSTOM_BOTH              = GST_EVENT_MAKE_TYPE (310, FLAG(BOTH) | FLAG(SERIALIZED)),
+;;   GST_EVENT_CUSTOM_BOTH_OOB          = GST_EVENT_MAKE_TYPE (320, FLAG(BOTH))
+;; } GstEventType;
+
+(define-flags-extended EventType
+  (in-module "Gst")
+  (c-name "GstEventType")
+  (values
+    '("unknown" "GST_EVENT_UNKNOWN" "GST_EVENT_MAKE_TYPE (0,  0)")
+    '("flush-start" "GST_EVENT_FLUSH_START" "GST_EVENT_MAKE_TYPE (10,  FLAG(BOTH))")
+    '("flush-stop" "GST_EVENT_FLUSH_STOP" "GST_EVENT_MAKE_TYPE (20,  FLAG(BOTH) | FLAG(SERIALIZED))")
+    '("stream-start" "GST_EVENT_STREAM_START" "GST_EVENT_MAKE_TYPE (40,  FLAG(DOWNSTREAM) | FLAG(SERIALIZED) 
| FLAG(STICKY))")
+    '("caps" "GST_EVENT_CAPS" "GST_EVENT_MAKE_TYPE (50,  FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY))")
+    '("segment" "GST_EVENT_SEGMENT" "GST_EVENT_MAKE_TYPE (70,  FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY))")
+    '("tag" "GST_EVENT_TAG" "GST_EVENT_MAKE_TYPE (80,  FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY) | 
FLAG(STICKY_MULTI))")
+    '("buffersize" "GST_EVENT_BUFFERSIZE" "GST_EVENT_MAKE_TYPE (90,  FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY))")
+    '("sink-message" "GST_EVENT_SINK_MESSAGE" "GST_EVENT_MAKE_TYPE (100,  FLAG(DOWNSTREAM) | 
FLAG(SERIALIZED) | FLAG(STICKY) | FLAG(STICKY_MULTI))")
+    '("eos" "GST_EVENT_EOS" "GST_EVENT_MAKE_TYPE (110,  FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY))")
+    '("toc" "GST_EVENT_TOC" "GST_EVENT_MAKE_TYPE (120,  FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY) | 
FLAG(STICKY_MULTI))")
+    '("segment-done" "GST_EVENT_SEGMENT_DONE" "GST_EVENT_MAKE_TYPE (150,  FLAG(DOWNSTREAM) | 
FLAG(SERIALIZED))")
+    '("gap" "GST_EVENT_GAP" "GST_EVENT_MAKE_TYPE (160,  FLAG(DOWNSTREAM) | FLAG(SERIALIZED))")
+    '("qos" "GST_EVENT_QOS" "GST_EVENT_MAKE_TYPE (190,  FLAG(UPSTREAM))")
+    '("seek" "GST_EVENT_SEEK" "GST_EVENT_MAKE_TYPE (200,  FLAG(UPSTREAM))")
+    '("navigation" "GST_EVENT_NAVIGATION" "GST_EVENT_MAKE_TYPE (210,  FLAG(UPSTREAM))")
+    '("latency" "GST_EVENT_LATENCY" "GST_EVENT_MAKE_TYPE (220,  FLAG(UPSTREAM))")
+    '("step" "GST_EVENT_STEP" "GST_EVENT_MAKE_TYPE (230,  FLAG(UPSTREAM))")
+    '("reconfigure" "GST_EVENT_RECONFIGURE" "GST_EVENT_MAKE_TYPE (240,  FLAG(UPSTREAM))")
+    '("toc-select" "GST_EVENT_TOC_SELECT" "GST_EVENT_MAKE_TYPE (250,  FLAG(UPSTREAM))")
+    '("custom-upstream" "GST_EVENT_CUSTOM_UPSTREAM" "GST_EVENT_MAKE_TYPE (270,  FLAG(UPSTREAM))")
+    '("custom-downstream" "GST_EVENT_CUSTOM_DOWNSTREAM" "GST_EVENT_MAKE_TYPE (280,  FLAG(DOWNSTREAM) | 
FLAG(SERIALIZED))")
+    '("custom-downstream-oob" "GST_EVENT_CUSTOM_DOWNSTREAM_OOB" "GST_EVENT_MAKE_TYPE (290,  
FLAG(DOWNSTREAM))")
+    '("custom-downstream-sticky" "GST_EVENT_CUSTOM_DOWNSTREAM_STICKY" "GST_EVENT_MAKE_TYPE (300,  
FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | FLAG(STICKY) | FLAG(STICKY_MULTI))")
+    '("custom-both" "GST_EVENT_CUSTOM_BOTH" "GST_EVENT_MAKE_TYPE (310,  FLAG(BOTH) | FLAG(SERIALIZED))")
+    '("custom-both-oob" "GST_EVENT_CUSTOM_BOTH_OOB" "GST_EVENT_MAKE_TYPE (320,  FLAG(BOTH))")
+  )
+)
+
+;; Original typedef:
+;; typedef enum {
 ;;   GST_QOS_TYPE_OVERFLOW        = 0,
 ;;   GST_QOS_TYPE_UNDERFLOW       = 1,
 ;;   GST_QOS_TYPE_THROTTLE        = 2
@@ -1748,6 +1821,53 @@
 
 ;; Original typedef:
 ;; typedef enum {
+;;   GST_QUERY_UNKNOWN      = GST_QUERY_MAKE_TYPE (0, 0),
+;;   GST_QUERY_POSITION     = GST_QUERY_MAKE_TYPE (10, FLAG(BOTH)),
+;;   GST_QUERY_DURATION     = GST_QUERY_MAKE_TYPE (20, FLAG(BOTH)),
+;;   GST_QUERY_LATENCY      = GST_QUERY_MAKE_TYPE (30, FLAG(BOTH)),
+;;   GST_QUERY_JITTER       = GST_QUERY_MAKE_TYPE (40, FLAG(BOTH)),
+;;   GST_QUERY_RATE         = GST_QUERY_MAKE_TYPE (50, FLAG(BOTH)),
+;;   GST_QUERY_SEEKING      = GST_QUERY_MAKE_TYPE (60, FLAG(BOTH)),
+;;   GST_QUERY_SEGMENT      = GST_QUERY_MAKE_TYPE (70, FLAG(BOTH)),
+;;   GST_QUERY_CONVERT      = GST_QUERY_MAKE_TYPE (80, FLAG(BOTH)),
+;;   GST_QUERY_FORMATS      = GST_QUERY_MAKE_TYPE (90, FLAG(BOTH)),
+;;   GST_QUERY_BUFFERING    = GST_QUERY_MAKE_TYPE (110, FLAG(BOTH)),
+;;   GST_QUERY_CUSTOM       = GST_QUERY_MAKE_TYPE (120, FLAG(BOTH)),
+;;   GST_QUERY_URI          = GST_QUERY_MAKE_TYPE (130, FLAG(BOTH)),
+;;   GST_QUERY_ALLOCATION   = GST_QUERY_MAKE_TYPE (140, FLAG(DOWNSTREAM) | FLAG(SERIALIZED)),
+;;   GST_QUERY_SCHEDULING   = GST_QUERY_MAKE_TYPE (150, FLAG(UPSTREAM)),
+;;   GST_QUERY_ACCEPT_CAPS  = GST_QUERY_MAKE_TYPE (160, FLAG(BOTH)),
+;;   GST_QUERY_CAPS         = GST_QUERY_MAKE_TYPE (170, FLAG(BOTH)),
+;;   GST_QUERY_DRAIN        = GST_QUERY_MAKE_TYPE (180, FLAG(DOWNSTREAM) | FLAG(SERIALIZED))
+;; } GstQueryType;
+
+(define-flags-extended QueryType
+  (in-module "Gst")
+  (c-name "GstQueryType")
+  (values
+    '("unknown" "GST_QUERY_UNKNOWN" "GST_QUERY_MAKE_TYPE (0,  0)")
+    '("position" "GST_QUERY_POSITION" "GST_QUERY_MAKE_TYPE (10,  FLAG(BOTH))")
+    '("duration" "GST_QUERY_DURATION" "GST_QUERY_MAKE_TYPE (20,  FLAG(BOTH))")
+    '("latency" "GST_QUERY_LATENCY" "GST_QUERY_MAKE_TYPE (30,  FLAG(BOTH))")
+    '("jitter" "GST_QUERY_JITTER" "GST_QUERY_MAKE_TYPE (40,  FLAG(BOTH))")
+    '("rate" "GST_QUERY_RATE" "GST_QUERY_MAKE_TYPE (50,  FLAG(BOTH))")
+    '("seeking" "GST_QUERY_SEEKING" "GST_QUERY_MAKE_TYPE (60,  FLAG(BOTH))")
+    '("segment" "GST_QUERY_SEGMENT" "GST_QUERY_MAKE_TYPE (70,  FLAG(BOTH))")
+    '("convert" "GST_QUERY_CONVERT" "GST_QUERY_MAKE_TYPE (80,  FLAG(BOTH))")
+    '("formats" "GST_QUERY_FORMATS" "GST_QUERY_MAKE_TYPE (90,  FLAG(BOTH))")
+    '("buffering" "GST_QUERY_BUFFERING" "GST_QUERY_MAKE_TYPE (110,  FLAG(BOTH))")
+    '("custom" "GST_QUERY_CUSTOM" "GST_QUERY_MAKE_TYPE (120,  FLAG(BOTH))")
+    '("uri" "GST_QUERY_URI" "GST_QUERY_MAKE_TYPE (130,  FLAG(BOTH))")
+    '("allocation" "GST_QUERY_ALLOCATION" "GST_QUERY_MAKE_TYPE (140,  FLAG(DOWNSTREAM) | FLAG(SERIALIZED))")
+    '("scheduling" "GST_QUERY_SCHEDULING" "GST_QUERY_MAKE_TYPE (150,  FLAG(UPSTREAM))")
+    '("accept-caps" "GST_QUERY_ACCEPT_CAPS" "GST_QUERY_MAKE_TYPE (160,  FLAG(BOTH))")
+    '("caps" "GST_QUERY_CAPS" "GST_QUERY_MAKE_TYPE (170,  FLAG(BOTH))")
+    '("drain" "GST_QUERY_DRAIN" "GST_QUERY_MAKE_TYPE (180,  FLAG(DOWNSTREAM) | FLAG(SERIALIZED))")
+  )
+)
+
+;; Original typedef:
+;; typedef enum {
 ;;   GST_BUFFERING_STREAM,
 ;;   GST_BUFFERING_DOWNLOAD,
 ;;   GST_BUFFERING_TIMESHIFT,
diff --git a/gstreamer/src/gst_enums.defs.patch b/gstreamer/src/gst_enums.defs.patch
index a5ef7bb..15f10d6 100644
--- a/gstreamer/src/gst_enums.defs.patch
+++ b/gstreamer/src/gst_enums.defs.patch
@@ -6,184 +6,7 @@
  ;; From gstallocator.h
  
  ;; Original typedef:
-@@ -547,105 +549,6 @@
- 
- ;; Original typedef:
- ;; typedef enum {
--;;   GST_EVENT_UNKNOWN               = GST_EVENT_MAKE_TYPE (0, 0),
--;; 
--;;   /* bidirectional events */
--;;   GST_EVENT_FLUSH_START           = GST_EVENT_MAKE_TYPE (10, FLAG(BOTH)),
--;;   GST_EVENT_FLUSH_STOP            = GST_EVENT_MAKE_TYPE (20, FLAG(BOTH) | FLAG(SERIALIZED)),
--;; 
--;;   /* downstream serialized events */
--;;   GST_EVENT_STREAM_START          = GST_EVENT_MAKE_TYPE (40, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY)),
--;;   GST_EVENT_CAPS                  = GST_EVENT_MAKE_TYPE (50, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY)),
--;;   GST_EVENT_SEGMENT               = GST_EVENT_MAKE_TYPE (70, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY)),
--;;   GST_EVENT_TAG                   = GST_EVENT_MAKE_TYPE (80, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY) | FLAG(STICKY_MULTI)),
--;;   GST_EVENT_BUFFERSIZE            = GST_EVENT_MAKE_TYPE (90, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY)),
--;;   GST_EVENT_SINK_MESSAGE          = GST_EVENT_MAKE_TYPE (100, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY) | FLAG(STICKY_MULTI)),
--;;   GST_EVENT_EOS                   = GST_EVENT_MAKE_TYPE (110, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY)),
--;;   GST_EVENT_TOC                   = GST_EVENT_MAKE_TYPE (120, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY) | FLAG(STICKY_MULTI)),
--;; 
--;;   /* non-sticky downstream serialized */
--;;   GST_EVENT_SEGMENT_DONE          = GST_EVENT_MAKE_TYPE (150, FLAG(DOWNSTREAM) | FLAG(SERIALIZED)),
--;;   GST_EVENT_GAP                   = GST_EVENT_MAKE_TYPE (160, FLAG(DOWNSTREAM) | FLAG(SERIALIZED)),
--;; 
--;;   /* upstream events */
--;;   GST_EVENT_QOS                   = GST_EVENT_MAKE_TYPE (190, FLAG(UPSTREAM)),
--;;   GST_EVENT_SEEK                  = GST_EVENT_MAKE_TYPE (200, FLAG(UPSTREAM)),
--;;   GST_EVENT_NAVIGATION            = GST_EVENT_MAKE_TYPE (210, FLAG(UPSTREAM)),
--;;   GST_EVENT_LATENCY               = GST_EVENT_MAKE_TYPE (220, FLAG(UPSTREAM)),
--;;   GST_EVENT_STEP                  = GST_EVENT_MAKE_TYPE (230, FLAG(UPSTREAM)),
--;;   GST_EVENT_RECONFIGURE           = GST_EVENT_MAKE_TYPE (240, FLAG(UPSTREAM)),
--;;   GST_EVENT_TOC_SELECT            = GST_EVENT_MAKE_TYPE (250, FLAG(UPSTREAM)),
--;; 
--;;   /* custom events start here */
--;;   GST_EVENT_CUSTOM_UPSTREAM          = GST_EVENT_MAKE_TYPE (270, FLAG(UPSTREAM)),
--;;   GST_EVENT_CUSTOM_DOWNSTREAM        = GST_EVENT_MAKE_TYPE (280, FLAG(DOWNSTREAM) | FLAG(SERIALIZED)),
--;;   GST_EVENT_CUSTOM_DOWNSTREAM_OOB    = GST_EVENT_MAKE_TYPE (290, FLAG(DOWNSTREAM)),
--;;   GST_EVENT_CUSTOM_DOWNSTREAM_STICKY = GST_EVENT_MAKE_TYPE (300, FLAG(DOWNSTREAM) | FLAG(SERIALIZED) | 
FLAG(STICKY) | FLAG(STICKY_MULTI)),
--;;   GST_EVENT_CUSTOM_BOTH              = GST_EVENT_MAKE_TYPE (310, FLAG(BOTH) | FLAG(SERIALIZED)),
--;;   GST_EVENT_CUSTOM_BOTH_OOB          = GST_EVENT_MAKE_TYPE (320, FLAG(BOTH))
--;; } GstEventType;
--
--(define-flags-extended EventType
--  (in-module "Gst")
--  (c-name "GstEventType")
--  (values
--    '("gst-event-unknown" "GST_EVENT_UNKNOWN" "GST_EVENT_MAKE_TYPE (0")
--    '("0)" "0)" "(GST_EVENT_MAKE_TYPE (0) + 1")
--    '("gst-event-flush-start" "GST_EVENT_FLUSH_START" "GST_EVENT_MAKE_TYPE (10")
--    '("flag(both))" "FLAG(BOTH))" "(GST_EVENT_MAKE_TYPE (10) + 1")
--    '("gst-event-flush-stop" "GST_EVENT_FLUSH_STOP" "GST_EVENT_MAKE_TYPE (20")
--    '("flag(both)" "FLAG(BOTH)" "| FLAG(SERIALIZED))")
--    '("gst-event-stream-start" "GST_EVENT_STREAM_START" "GST_EVENT_MAKE_TYPE (40")
--    '("flag(downstream)" "FLAG(DOWNSTREAM)" "| FLAG(SERIALIZED) | FLAG(STICKY))")
--    '("gst-event-caps" "GST_EVENT_CAPS" "GST_EVENT_MAKE_TYPE (50")
--    '("flag(downstream)" "FLAG(DOWNSTREAM)" "| FLAG(SERIALIZED) | FLAG(STICKY))")
--    '("gst-event-segment" "GST_EVENT_SEGMENT" "GST_EVENT_MAKE_TYPE (70")
--    '("flag(downstream)" "FLAG(DOWNSTREAM)" "| FLAG(SERIALIZED) | FLAG(STICKY))")
--    '("gst-event-tag" "GST_EVENT_TAG" "GST_EVENT_MAKE_TYPE (80")
--    '("flag(downstream)" "FLAG(DOWNSTREAM)" "| FLAG(SERIALIZED) | FLAG(STICKY) | FLAG(STICKY_MULTI))")
--    '("gst-event-buffersize" "GST_EVENT_BUFFERSIZE" "GST_EVENT_MAKE_TYPE (90")
--    '("flag(downstream)" "FLAG(DOWNSTREAM)" "| FLAG(SERIALIZED) | FLAG(STICKY))")
--    '("gst-event-sink-message" "GST_EVENT_SINK_MESSAGE" "GST_EVENT_MAKE_TYPE (100")
--    '("flag(downstream)" "FLAG(DOWNSTREAM)" "| FLAG(SERIALIZED) | FLAG(STICKY) | FLAG(STICKY_MULTI))")
--    '("gst-event-eos" "GST_EVENT_EOS" "GST_EVENT_MAKE_TYPE (110")
--    '("flag(downstream)" "FLAG(DOWNSTREAM)" "| FLAG(SERIALIZED) | FLAG(STICKY))")
--    '("gst-event-toc" "GST_EVENT_TOC" "GST_EVENT_MAKE_TYPE (120")
--    '("flag(downstream)" "FLAG(DOWNSTREAM)" "| FLAG(SERIALIZED) | FLAG(STICKY) | FLAG(STICKY_MULTI))")
--    '("gst-event-segment-done" "GST_EVENT_SEGMENT_DONE" "GST_EVENT_MAKE_TYPE (150")
--    '("flag(downstream)" "FLAG(DOWNSTREAM)" "| FLAG(SERIALIZED))")
--    '("gst-event-gap" "GST_EVENT_GAP" "GST_EVENT_MAKE_TYPE (160")
--    '("flag(downstream)" "FLAG(DOWNSTREAM)" "| FLAG(SERIALIZED))")
--    '("gst-event-qos" "GST_EVENT_QOS" "GST_EVENT_MAKE_TYPE (190")
--    '("flag(upstream))" "FLAG(UPSTREAM))" "(GST_EVENT_MAKE_TYPE (190) + 1")
--    '("gst-event-seek" "GST_EVENT_SEEK" "GST_EVENT_MAKE_TYPE (200")
--    '("flag(upstream))" "FLAG(UPSTREAM))" "(GST_EVENT_MAKE_TYPE (200) + 1")
--    '("gst-event-navigation" "GST_EVENT_NAVIGATION" "GST_EVENT_MAKE_TYPE (210")
--    '("flag(upstream))" "FLAG(UPSTREAM))" "(GST_EVENT_MAKE_TYPE (210) + 1")
--    '("gst-event-latency" "GST_EVENT_LATENCY" "GST_EVENT_MAKE_TYPE (220")
--    '("flag(upstream))" "FLAG(UPSTREAM))" "(GST_EVENT_MAKE_TYPE (220) + 1")
--    '("gst-event-step" "GST_EVENT_STEP" "GST_EVENT_MAKE_TYPE (230")
--    '("flag(upstream))" "FLAG(UPSTREAM))" "(GST_EVENT_MAKE_TYPE (230) + 1")
--    '("gst-event-reconfigure" "GST_EVENT_RECONFIGURE" "GST_EVENT_MAKE_TYPE (240")
--    '("flag(upstream))" "FLAG(UPSTREAM))" "(GST_EVENT_MAKE_TYPE (240) + 1")
--    '("gst-event-toc-select" "GST_EVENT_TOC_SELECT" "GST_EVENT_MAKE_TYPE (250")
--    '("flag(upstream))" "FLAG(UPSTREAM))" "(GST_EVENT_MAKE_TYPE (250) + 1")
--    '("gst-event-custom-upstream" "GST_EVENT_CUSTOM_UPSTREAM" "GST_EVENT_MAKE_TYPE (270")
--    '("flag(upstream))" "FLAG(UPSTREAM))" "(GST_EVENT_MAKE_TYPE (270) + 1")
--    '("gst-event-custom-downstream" "GST_EVENT_CUSTOM_DOWNSTREAM" "GST_EVENT_MAKE_TYPE (280")
--    '("flag(downstream)" "FLAG(DOWNSTREAM)" "| FLAG(SERIALIZED))")
--    '("gst-event-custom-downstream-oob" "GST_EVENT_CUSTOM_DOWNSTREAM_OOB" "GST_EVENT_MAKE_TYPE (290")
--    '("flag(downstream))" "FLAG(DOWNSTREAM))" "(GST_EVENT_MAKE_TYPE (290) + 1")
--    '("gst-event-custom-downstream-sticky" "GST_EVENT_CUSTOM_DOWNSTREAM_STICKY" "GST_EVENT_MAKE_TYPE (300")
--    '("flag(downstream)" "FLAG(DOWNSTREAM)" "| FLAG(SERIALIZED) | FLAG(STICKY) | FLAG(STICKY_MULTI))")
--    '("gst-event-custom-both" "GST_EVENT_CUSTOM_BOTH" "GST_EVENT_MAKE_TYPE (310")
--    '("flag(both)" "FLAG(BOTH)" "| FLAG(SERIALIZED))")
--    '("gst-event-custom-both-oob" "GST_EVENT_CUSTOM_BOTH_OOB" "GST_EVENT_MAKE_TYPE (320")
--    '("flag(both))" "FLAG(BOTH))" "(GST_EVENT_MAKE_TYPE (320) + 1")
--  )
--)
--
--;; Original typedef:
--;; typedef enum {
- ;;   GST_QOS_TYPE_OVERFLOW        = 0,
- ;;   GST_QOS_TYPE_UNDERFLOW       = 1,
- ;;   GST_QOS_TYPE_THROTTLE        = 2
-@@ -1889,71 +1789,6 @@
- 
- ;; Original typedef:
- ;; typedef enum {
--;;   GST_QUERY_UNKNOWN      = GST_QUERY_MAKE_TYPE (0, 0),
--;;   GST_QUERY_POSITION     = GST_QUERY_MAKE_TYPE (10, FLAG(BOTH)),
--;;   GST_QUERY_DURATION     = GST_QUERY_MAKE_TYPE (20, FLAG(BOTH)),
--;;   GST_QUERY_LATENCY      = GST_QUERY_MAKE_TYPE (30, FLAG(BOTH)),
--;;   GST_QUERY_JITTER       = GST_QUERY_MAKE_TYPE (40, FLAG(BOTH)),
--;;   GST_QUERY_RATE         = GST_QUERY_MAKE_TYPE (50, FLAG(BOTH)),
--;;   GST_QUERY_SEEKING      = GST_QUERY_MAKE_TYPE (60, FLAG(BOTH)),
--;;   GST_QUERY_SEGMENT      = GST_QUERY_MAKE_TYPE (70, FLAG(BOTH)),
--;;   GST_QUERY_CONVERT      = GST_QUERY_MAKE_TYPE (80, FLAG(BOTH)),
--;;   GST_QUERY_FORMATS      = GST_QUERY_MAKE_TYPE (90, FLAG(BOTH)),
--;;   GST_QUERY_BUFFERING    = GST_QUERY_MAKE_TYPE (110, FLAG(BOTH)),
--;;   GST_QUERY_CUSTOM       = GST_QUERY_MAKE_TYPE (120, FLAG(BOTH)),
--;;   GST_QUERY_URI          = GST_QUERY_MAKE_TYPE (130, FLAG(BOTH)),
--;;   GST_QUERY_ALLOCATION   = GST_QUERY_MAKE_TYPE (140, FLAG(DOWNSTREAM) | FLAG(SERIALIZED)),
--;;   GST_QUERY_SCHEDULING   = GST_QUERY_MAKE_TYPE (150, FLAG(UPSTREAM)),
--;;   GST_QUERY_ACCEPT_CAPS  = GST_QUERY_MAKE_TYPE (160, FLAG(BOTH)),
--;;   GST_QUERY_CAPS         = GST_QUERY_MAKE_TYPE (170, FLAG(BOTH)),
--;;   GST_QUERY_DRAIN        = GST_QUERY_MAKE_TYPE (180, FLAG(DOWNSTREAM) | FLAG(SERIALIZED))
--;; } GstQueryType;
--
--(define-enum-extended QueryType
--  (in-module "Gst")
--  (c-name "GstQueryType")
--  (values
--    '("gst-query-unknown" "GST_QUERY_UNKNOWN" "GST_QUERY_MAKE_TYPE (0")
--    '("0)" "0)" "(GST_QUERY_MAKE_TYPE (0) + 1")
--    '("gst-query-position" "GST_QUERY_POSITION" "GST_QUERY_MAKE_TYPE (10")
--    '("flag(both))" "FLAG(BOTH))" "(GST_QUERY_MAKE_TYPE (10) + 1")
--    '("gst-query-duration" "GST_QUERY_DURATION" "GST_QUERY_MAKE_TYPE (20")
--    '("flag(both))" "FLAG(BOTH))" "(GST_QUERY_MAKE_TYPE (20) + 1")
--    '("gst-query-latency" "GST_QUERY_LATENCY" "GST_QUERY_MAKE_TYPE (30")
--    '("flag(both))" "FLAG(BOTH))" "(GST_QUERY_MAKE_TYPE (30) + 1")
--    '("gst-query-jitter" "GST_QUERY_JITTER" "GST_QUERY_MAKE_TYPE (40")
--    '("flag(both))" "FLAG(BOTH))" "(GST_QUERY_MAKE_TYPE (40) + 1")
--    '("gst-query-rate" "GST_QUERY_RATE" "GST_QUERY_MAKE_TYPE (50")
--    '("flag(both))" "FLAG(BOTH))" "(GST_QUERY_MAKE_TYPE (50) + 1")
--    '("gst-query-seeking" "GST_QUERY_SEEKING" "GST_QUERY_MAKE_TYPE (60")
--    '("flag(both))" "FLAG(BOTH))" "(GST_QUERY_MAKE_TYPE (60) + 1")
--    '("gst-query-segment" "GST_QUERY_SEGMENT" "GST_QUERY_MAKE_TYPE (70")
--    '("flag(both))" "FLAG(BOTH))" "(GST_QUERY_MAKE_TYPE (70) + 1")
--    '("gst-query-convert" "GST_QUERY_CONVERT" "GST_QUERY_MAKE_TYPE (80")
--    '("flag(both))" "FLAG(BOTH))" "(GST_QUERY_MAKE_TYPE (80) + 1")
--    '("gst-query-formats" "GST_QUERY_FORMATS" "GST_QUERY_MAKE_TYPE (90")
--    '("flag(both))" "FLAG(BOTH))" "(GST_QUERY_MAKE_TYPE (90) + 1")
--    '("gst-query-buffering" "GST_QUERY_BUFFERING" "GST_QUERY_MAKE_TYPE (110")
--    '("flag(both))" "FLAG(BOTH))" "(GST_QUERY_MAKE_TYPE (110) + 1")
--    '("gst-query-custom" "GST_QUERY_CUSTOM" "GST_QUERY_MAKE_TYPE (120")
--    '("flag(both))" "FLAG(BOTH))" "(GST_QUERY_MAKE_TYPE (120) + 1")
--    '("gst-query-uri" "GST_QUERY_URI" "GST_QUERY_MAKE_TYPE (130")
--    '("flag(both))" "FLAG(BOTH))" "(GST_QUERY_MAKE_TYPE (130) + 1")
--    '("gst-query-allocation" "GST_QUERY_ALLOCATION" "GST_QUERY_MAKE_TYPE (140")
--    '("flag(downstream)" "FLAG(DOWNSTREAM)" "| FLAG(SERIALIZED))")
--    '("gst-query-scheduling" "GST_QUERY_SCHEDULING" "GST_QUERY_MAKE_TYPE (150")
--    '("flag(upstream))" "FLAG(UPSTREAM))" "(GST_QUERY_MAKE_TYPE (150) + 1")
--    '("gst-query-accept-caps" "GST_QUERY_ACCEPT_CAPS" "GST_QUERY_MAKE_TYPE (160")
--    '("flag(both))" "FLAG(BOTH))" "(GST_QUERY_MAKE_TYPE (160) + 1")
--    '("gst-query-caps" "GST_QUERY_CAPS" "GST_QUERY_MAKE_TYPE (170")
--    '("flag(both))" "FLAG(BOTH))" "(GST_QUERY_MAKE_TYPE (170) + 1")
--    '("gst-query-drain" "GST_QUERY_DRAIN" "GST_QUERY_MAKE_TYPE (180")
--    '("flag(downstream)" "FLAG(DOWNSTREAM)" "| FLAG(SERIALIZED))")
--  )
--)
--
--;; Original typedef:
--;; typedef enum {
- ;;   GST_BUFFERING_STREAM,
- ;;   GST_BUFFERING_DOWNLOAD,
- ;;   GST_BUFFERING_TIMESHIFT,
+
 @@ -2548,13 +2380,13 @@
    (in-module "Gst")
    (c-name "GstFakeSinkStateError")
diff --git a/gstreamer/src/query.hg b/gstreamer/src/query.hg
index 01a83e3..e9ea808 100644
--- a/gstreamer/src/query.hg
+++ b/gstreamer/src/query.hg
@@ -41,31 +41,15 @@ namespace Glib
 namespace Gst
 {
 
+#define GST_QUERY_MAKE_TYPE(num,flags) \
+    (((num) << GST_QUERY_NUM_SHIFT) | (flags))
+
+#define FLAG(name) GST_QUERY_TYPE_##name
+
 _WRAP_ENUM(BufferingMode, GstBufferingMode)
+_WRAP_ENUM(QueryType, GstQueryType)
 
-_WRAP_ENUM_DOCS_ONLY(QueryType, GstQueryType)
-/* this enum must be wrapped manually since automatic generator (enum.pl) doesn't handle commas properly*/
-enum QueryType
-{
-  QUERY_UNKNOWN = GST_QUERY_UNKNOWN,
-  QUERY_POSITION = GST_QUERY_POSITION,
-  QUERY_DURATION = GST_QUERY_DURATION,
-  QUERY_LATENCY = GST_QUERY_LATENCY,
-  QUERY_JITTER = GST_QUERY_JITTER,
-  QUERY_RATE = GST_QUERY_RATE,
-  QUERY_SEEKING = GST_QUERY_SEEKING,
-  QUERY_SEGMENT = GST_QUERY_SEGMENT,
-  QUERY_CONVERT = GST_QUERY_CONVERT,
-  QUERY_FORMATS = GST_QUERY_FORMATS,
-  QUERY_BUFFERING = GST_QUERY_BUFFERING,
-  QUERY_CUSTOM = GST_QUERY_CUSTOM,
-  QUERY_URI = GST_QUERY_URI,
-  QUERY_ALLOCATION = GST_QUERY_ALLOCATION,
-  QUERY_SCHEDULING = GST_QUERY_SCHEDULING,
-  QUERY_ACCEPT_CAPS = GST_QUERY_ACCEPT_CAPS,
-  QUERY_CAPS = GST_QUERY_CAPS,
-  QUERY_DRAIN = GST_QUERY_DRAIN
-};
+#undef FLAG
 
 namespace Enums
 {
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]