[vala] gstreamer: Enable all the enum methods/constants after vapigen was fixed



commit a0fee9d0f5f512c04800d4795553e14c20c3052f
Author: Sebastian Dröge <sebastian droege collabora co uk>
Date:   Thu Apr 8 10:14:46 2010 +0200

    gstreamer: Enable all the enum methods/constants after vapigen was fixed

 vapi/gstreamer-0.10.vapi                           |   18 +++++++++++++++++-
 .../gstreamer-0.10/gstreamer-0.10-custom.vala      |   19 +++++--------------
 2 files changed, 22 insertions(+), 15 deletions(-)
---
diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi
index ba8287b..ed4a608 100644
--- a/vapi/gstreamer-0.10.vapi
+++ b/vapi/gstreamer-0.10.vapi
@@ -1809,6 +1809,9 @@ namespace Gst {
 		CUSTOM_DOWNSTREAM_OOB,
 		CUSTOM_BOTH,
 		CUSTOM_BOTH_OOB;
+		public Gst.EventTypeFlags get_flags ();
+		public GLib.Quark to_quark ();
+		public unowned string get_name ();
 		[CCode (cname = "gst_event_type_get_name")]
 		public unowned string to_string ();
 	}
@@ -1842,8 +1845,13 @@ namespace Gst {
 		TIME,
 		BUFFERS,
 		PERCENT;
+		public Gst.FormatDefinition get_details ();
+		public GLib.Quark to_quark ();
+		public unowned string get_name ();
 		[CCode (cname = "gst_format_get_name")]
 		public unowned string to_string ();
+		public const int64 PERCENT_MAX;
+		public const int64 PERCENT_SCALE;
 	}
 	[CCode (cprefix = "GST_INDEX_", cheader_filename = "gst/gst.h")]
 	public enum IndexCertainty {
@@ -2098,6 +2106,8 @@ namespace Gst {
 		READY,
 		PAUSED,
 		PLAYING;
+		[CCode (cname = "GST_STATE_GET_NEXT")]
+		public Gst.State get_next (Gst.State pending);
 		[CCode (cname = "gst_element_state_get_name")]
 		public unowned string to_string ();
 	}
@@ -2108,7 +2118,13 @@ namespace Gst {
 		PAUSED_TO_PLAYING,
 		PLAYING_TO_PAUSED,
 		PAUSED_TO_READY,
-		READY_TO_NULL
+		READY_TO_NULL;
+		[CCode (cname = "GST_STATE_TRANSITION")]
+		public static Gst.StateChange transition (Gst.State cur, Gst.State next);
+		[CCode (cname = "GST_STATE_TRANSITION_CURRENT")]
+		public static Gst.State transition_current ();
+		[CCode (cname = "GST_STATE_TRANSITION_NEXT")]
+		public static Gst.State transition_next ();
 	}
 	[CCode (cprefix = "GST_STATE_CHANGE_", cheader_filename = "gst/gst.h")]
 	public enum StateChangeReturn {
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 c11b154..fd712f9 100644
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10-custom.vala
@@ -62,10 +62,8 @@ namespace Gst {
 		public static GLib.Quark type_to_quark (Gst.EventType type);
 	}
 
-#if 0
-	// FIXME: This can't be parsed by vapigen, see bug #614543
 	public enum EventType {
-		;
+		SOME_RANDOM_VALUE_FOR_VAPIGEN;
 		[CCode (cname = "gst_event_type_get_flags")]
 		public Gst.EventTypeFlags get_flags ();
 		[CCode (cname = "gst_event_type_to_quark")]
@@ -73,14 +71,11 @@ namespace Gst {
 		[CCode (cname = "gst_event_type_get_name")]
 		public unowned string get_name ();
 	}
-#endif
 
-#if 0
-	// FIXME: This can't be parsed by vapigen
 	public enum Format {
-		;
+		SOME_RANDOM_VALUE_FOR_VAPIGEN;
 		[CCode (cname = "gst_format_get_details")]
-		public unowned FormatDefination get_details ();
+		public unowned FormatDefinition get_details ();
 		[CCode (cname = "gst_format_to_quark")]
 		public GLib.Quark to_quark ();
 		[CCode (cname = "gst_format_get_name")]
@@ -96,7 +91,6 @@ namespace Gst {
 		[CCode (cname = "GST_FORMAT_PERCENT_SCALE")]
 		public const int64 PERCENT_SCALE;
 	}
-#endif
 
 	public interface ImplementsInterface : Gst.Element {
 		public unowned Gst.Element? cast (GLib.Type type);
@@ -288,16 +282,14 @@ namespace Gst {
 		public Structure.id_empty (GLib.Quark quark);
 	}
 
-#if 0
-	// FIXME: vapigen can't extend enums, see EventType
 	public enum State {
-		;
+		SOME_RANDOM_VALUE_FOR_VAPIGEN;
 		[CCode (cname = "GST_STATE_GET_NEXT")]
 		public State get_next (State pending);
 	}
 
 	public enum StateChange {
-		;
+		SOME_RANDOM_VALUE_FOR_VAPIGEN;
 		[CCode (cname = "GST_STATE_TRANSITION")]
 		public static StateChange transition (State cur, State next);
 		[CCode (cname = "GST_STATE_TRANSITION_CURRENT")]
@@ -305,7 +297,6 @@ namespace Gst {
 		[CCode (cname = "GST_STATE_TRANSITION_NEXT")]
 		public static State transition_next ();
 	}
-#endif
 
 	[Compact]
 	public class DebugCategory {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]