From b5976339e2958d7c8862274bbb0b7d3d717af292 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Tue, 7 Jun 2011 13:38:35 +0200
Subject: [PATCH] event: move some more defines on top

---
 gst/gstevent.h | 54 ++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/gst/gstevent.h b/gst/gstevent.h
index 0e22b3ce57..1956792d44 100644
--- a/gst/gstevent.h
+++ b/gst/gstevent.h
@@ -27,33 +27,6 @@
 
 typedef struct _GstEvent GstEvent;
 
-#include <gst/gstminiobject.h>
-#include <gst/gstformat.h>
-#include <gst/gstobject.h>
-#include <gst/gstclock.h>
-#include <gst/gststructure.h>
-#include <gst/gsttaglist.h>
-#include <gst/gstsegment.h>
-#include <gst/gstsegment.h>
-#include <gst/gstmessage.h>
-
-G_BEGIN_DECLS
-
-extern GType _gst_event_type;
-
-
-#define GST_TYPE_EVENT                  (_gst_event_type)
-#define GST_IS_EVENT(obj)               (GST_IS_MINI_OBJECT_TYPE (obj, GST_TYPE_EVENT))
-#define GST_EVENT_CAST(obj)             ((GstEvent *)(obj))
-#define GST_EVENT(obj)                  (GST_EVENT_CAST(obj))
-
-/**
- * GST_EVENT_TRACE_NAME:
- *
- * The name used for memory allocation tracing
- */
-#define GST_EVENT_TRACE_NAME    "GstEvent"
-
 /**
  * GstEventTypeFlags:
  * @GST_EVENT_TYPE_UPSTREAM:   Set if the event can travel upstream.
@@ -99,7 +72,6 @@ typedef enum {
 
 #define FLAG(name) GST_EVENT_TYPE_##name
 
-
 #define GST_EVENT_STICKY_IDX_TYPE(type)  (((type) >> GST_EVENT_STICKY_SHIFT) & 0xf)
 #define GST_EVENT_STICKY_IDX(ev)         GST_EVENT_STICKY_IDX_TYPE(GST_EVENT_TYPE(ev))
 
@@ -184,6 +156,32 @@ typedef enum {
 } GstEventType;
 #undef FLAG
 
+#include <gst/gstminiobject.h>
+#include <gst/gstformat.h>
+#include <gst/gstobject.h>
+#include <gst/gstclock.h>
+#include <gst/gststructure.h>
+#include <gst/gsttaglist.h>
+#include <gst/gstsegment.h>
+#include <gst/gstsegment.h>
+#include <gst/gstmessage.h>
+
+G_BEGIN_DECLS
+
+extern GType _gst_event_type;
+
+#define GST_TYPE_EVENT                  (_gst_event_type)
+#define GST_IS_EVENT(obj)               (GST_IS_MINI_OBJECT_TYPE (obj, GST_TYPE_EVENT))
+#define GST_EVENT_CAST(obj)             ((GstEvent *)(obj))
+#define GST_EVENT(obj)                  (GST_EVENT_CAST(obj))
+
+/**
+ * GST_EVENT_TRACE_NAME:
+ *
+ * The name used for memory allocation tracing
+ */
+#define GST_EVENT_TRACE_NAME    "GstEvent"
+
 /**
  * GST_EVENT_TYPE:
  * @event: the event to query