From: Zeeshan Ali (Khattak) <zeeshanak@gnome.org>
Date: Fri, 18 Jun 2010 15:22:47 +0000 (+0300)
Subject: gststreamer-0.10: Revert some changes
X-Git-Tag: 0.9.2~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=79a59e6ba59774a046c99f07bd5c983aa6656605;p=thirdparty%2Fvala.git

gststreamer-0.10: Revert some changes

The following fields were transformed to methods to make them
read-only for vala as they are macros for C:

* Gst.Message.type
* Gst.Message.src
* Gst.Event.type
* Gst.Event.src

Reverting this change as it breaks the build for rygel (and any app using
these APIs from vala 0.8.x) and its not so important anyways.
---

diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi
index 7f33f3bc2..288ba4b53 100644
--- a/vapi/gstreamer-0.10.vapi
+++ b/vapi/gstreamer-0.10.vapi
@@ -463,7 +463,9 @@ namespace Gst {
 	}
 	[CCode (ref_function = "gst_event_ref", unref_function = "gst_event_unref", cheader_filename = "gst/gst.h")]
 	public class Event : Gst.MiniObject {
+		public weak Gst.Object src;
 		public uint64 timestamp;
+		public Gst.EventType type;
 		[CCode (has_construct_function = false)]
 		public Event.buffer_size (Gst.Format format, int64 minsize, int64 maxsize, bool @async);
 		public Gst.Event copy ();
@@ -510,14 +512,10 @@ namespace Gst {
 		public void set_seqnum (uint32 seqnum);
 		[CCode (has_construct_function = false)]
 		public Event.sink_message (owned Gst.Message msg);
-		[CCode (cname = "GST_EVENT_SRC")]
-		public unowned Gst.Object src ();
 		[CCode (has_construct_function = false)]
 		public Event.step (Gst.Format format, uint64 amount, double rate, bool flush, bool intermediate);
 		[CCode (has_construct_function = false)]
 		public Event.tag (owned Gst.TagList taglist);
-		[CCode (cname = "GST_EVENT_TYPE")]
-		public Gst.EventType type ();
 		public static Gst.EventTypeFlags type_get_flags (Gst.EventType type);
 		public static unowned string type_get_name (Gst.EventType type);
 		public static GLib.Quark type_to_quark (Gst.EventType type);
@@ -627,7 +625,9 @@ namespace Gst {
 	}
 	[CCode (ref_function = "gst_message_ref", unref_function = "gst_message_unref", cheader_filename = "gst/gst.h")]
 	public class Message : Gst.MiniObject {
+		public weak Gst.Object src;
 		public uint64 timestamp;
+		public Gst.MessageType type;
 		[CCode (has_construct_function = false)]
 		public Message.application (Gst.Object src, owned Gst.Structure? structure);
 		[CCode (has_construct_function = false)]
@@ -692,8 +692,6 @@ namespace Gst {
 		public void set_buffering_stats (Gst.BufferingMode mode, int avg_in, int avg_out, int64 buffering_left);
 		public void set_seqnum (uint32 seqnum);
 		public void set_stream_status_object (ref unowned Gst.Value? object);
-		[CCode (cname = "GST_MESSAGE_SRC")]
-		public unowned Gst.Object src ();
 		[CCode (has_construct_function = false)]
 		public Message.state_changed (Gst.Object src, Gst.State oldstate, Gst.State newstate, Gst.State pending);
 		[CCode (has_construct_function = false)]
@@ -710,8 +708,6 @@ namespace Gst {
 		public Message.tag (Gst.Object src, Gst.TagList tag_list);
 		[CCode (has_construct_function = false)]
 		public Message.tag_full (Gst.Object src, Gst.Pad pad, Gst.TagList tag_list);
-		[CCode (cname = "GST_MESSAGE_TYPE")]
-		public Gst.MessageType type ();
 		public static GLib.Quark type_to_quark (Gst.MessageType type);
 		public void unref ();
 		[CCode (has_construct_function = false)]
diff --git a/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala b/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
index f2cfc4f87..dcae8498e 100644
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
@@ -47,10 +47,6 @@ namespace Gst {
 		public static void replace (ref Event? oldobj, Event? newobj);
         	public Event copy ();
 
-		[CCode (cname = "GST_EVENT_SRC")]
-		public unowned Gst.Object src ();
-		[CCode (cname = "GST_EVENT_TYPE")]
-		public EventType type ();
 		[CCode (cname = "GST_EVENT_IS_UPSTREAM")]
 		public bool is_upstream ();
 		[CCode (cname = "GST_EVENT_IS_DOWNSTREAM")]
@@ -284,11 +280,6 @@ namespace Gst {
 		public void unref ();
         	public Message copy ();
 
-		[CCode (cname = "GST_MESSAGE_TYPE")]
-		public Gst.MessageType type ();
-		[CCode (cname = "GST_MESSAGE_SRC")]
-		public unowned Gst.Object src ();
-
 		// Deprecated, real method is in MessageType
 		public static GLib.Quark type_to_quark (Gst.MessageType type);
 	}
diff --git a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
index b0d29ec16..a8131a5c6 100644
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
@@ -176,8 +176,6 @@ GstEvent base_class="GstMiniObject"
 GstEvent.mini_object hidden="1"
 GstEvent.abidata hidden="1"
 GstEvent.structure hidden="1"
-GstEvent.src hidden="1"
-GstEvent.type hidden="1"
 GstEventClass hidden="1"
 GstEventType to_string="gst_event_type_get_name"
 gst_event_type_get_flags hidden="1"
@@ -250,9 +248,7 @@ GstMessage.mini_object hidden="1"
 GstMessage.abidata hidden="1"
 GstMessage.cond hidden="1"
 GstMessage.lock hidden="1"
-GstMessage.src hidden="1"
 GstMessage.structure hidden="1"
-GstMessage.type hidden="1"
 GstMessageClass hidden="1"
 gst_message_make_writable hidden="1"
 gst_message_get_structure nullable="1"