First take at updating to 0.10.22

2024-12-20 23:36:38 +00:00 · 2009-04-04 14:18:34 +02:00 · 2009-04-04 14:18:34 +02:00 · ba8f8562b5
commit ba8f8562b5
parent 862ce03f8c
8 changed files with 1086 additions and 256 deletions
--- a/configure.ac
+++ b/configure.ac
@ -92,14 +92,14 @@ AC_SUBST(GTKSHARP_REQUIRED_VERSION)
 PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)

 ## glib-sharp dependancy
-GLIBSHARP_REQUIRED_VERSION=2.4.0
+GLIBSHARP_REQUIRED_VERSION=2.13.90
 PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-2.0 >= $GLIBSHARP_REQUIRED_VERSION)
 AC_SUBST(GLIBSHARP_LIBS)

 ## probably should make gstreamer-plugins optional
 ## but generating conditionally the source is not really possible
-GSTREAMER_REQUIRED_VERSION=0.10.3
-GSTREAMER_PLUGINS_REQUIRED_VERSION=0.10.3
+GSTREAMER_REQUIRED_VERSION=0.10.22
+GSTREAMER_PLUGINS_REQUIRED_VERSION=0.10.22
 AC_SUBST(GSTREAMER_REQUIRED_VERSION)
 AC_SUBST(GSTREAMER_PLUGINS_REQUIRED_VERSION)
 PKG_CHECK_MODULES(GST,
--- a/gstreamer-sharp/Gstreamer.metadata
+++ b/gstreamer-sharp/Gstreamer.metadata
@ -30,6 +30,9 @@
  <attr path="/api/namespace/object[@name='Bin']/field[@name='Children']" name="hidden">1</attr>

  <attr path="/api/namespace/object[@name='Bin']/method[@name='Add']" name="hidden">1</attr> 
+  <attr path="/api/namespace/object[@name='ParamSpecFraction']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@name='ParamSpecMiniObject']" name="hidden">1</attr>
+  <attr path="/api/namespace/class[@name='Param']" name="hidden">1</attr>


  <attr path="/api/namespace/object[@name='Element']/signal[@name='NoMorePads']" name="name">HasNoMorePads</attr>
@ -84,8 +87,10 @@
  <attr path="/api/namespace/object[@name='Pad']/field[@cname='queryfunc']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@name='Pad']/field[@cname='intlinkfunc']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@name='Pad']/field[@cname='bufferallocfunc']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@name='Pad']/field[@cname='iterintlinkfunc']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@name='Message']/method[@name='ParseWarning']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@name='Message']/method[@name='ParseError']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@name='Message']/method[@name='ParseInfo']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@name='Object']/method[@name='DefaultError']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@name='Plugin']/method[@name='LoadFile']" name="hidden">1</attr>
  <attr path="/api/namespace/boxed[@name='Structure']" name="opaque">true</attr>
@ -100,6 +105,7 @@
  <attr path="/api/namespace/struct[@name='Iterator']/field[@name='Free']" name="hidden">1</attr>
  <attr path="/api/namespace/enum[@name='MessageType']" name="parent">uint</attr>
  <attr path="/api/namespace/enum[@name='MessageType']/member[@name='Unknown']" name="value">0U</attr>
+  <attr path="/api/namespace/enum[@name='MessageType']/member[@name='Any']" name="value">0xffffffff</attr>
  <!-- Gross hack to remove items added by badly parsed GstEventType enum -->
  <remove-node path="/api/namespace/enum[@name='EventType']/member[@name='0_']" />
  <remove-node path="/api/namespace/enum[@name='EventType']/member[@name='Flag']" />
@ -126,6 +132,7 @@
  <attr path="/api/namespace/enum[@name='EventType']/member[@cname='_GST_EVENT_QOS']" name="value">241</attr>
  <attr path="/api/namespace/enum[@name='EventType']/member[@cname='_GST_EVENT_SEEK']" name="value">257</attr>
  <attr path="/api/namespace/enum[@name='EventType']/member[@cname='_GST_EVENT_NAVIGATION']" name="value">273</attr>
+  <attr path="/api/namespace/enum[@name='EventType']/member[@cname='_GST_EVENT_LATENCY']" name="value">289</attr>
  <attr path="/api/namespace/enum[@name='EventType']/member[@cname='_GST_EVENT_CUSTOM_UPSTREAM']" name="value">513</attr>
  <attr path="/api/namespace/enum[@name='EventType']/member[@cname='_GST_EVENT_CUSTOM_DOWNSTREAM']" name="value">518</attr>
  <attr path="/api/namespace/enum[@name='EventType']/member[@cname='_GST_EVENT_CUSTOM_DOWNSTREAM_OOB']" name="value">514</attr>
@ -141,12 +148,15 @@
  <attr path="/api/namespace/enum[@name='EventType']/member[@cname='_GST_EVENT_QOS']" name="name">Qos</attr>
  <attr path="/api/namespace/enum[@name='EventType']/member[@cname='_GST_EVENT_SEEK']" name="name">Seek</attr>
  <attr path="/api/namespace/enum[@name='EventType']/member[@cname='_GST_EVENT_NAVIGATION']" name="name">Navigation</attr>
+  <attr path="/api/namespace/enum[@name='EventType']/member[@cname='_GST_EVENT_LATENCY']" name="name">Latency</attr>
  <attr path="/api/namespace/enum[@name='EventType']/member[@cname='_GST_EVENT_CUSTOM_UPSTREAM']" name="name">Upstream</attr>
  <attr path="/api/namespace/enum[@name='EventType']/member[@cname='_GST_EVENT_CUSTOM_DOWNSTREAM']" name="name">Downstream</attr>
  <attr path="/api/namespace/enum[@name='EventType']/member[@cname='_GST_EVENT_CUSTOM_DOWNSTREAM_OOB']" name="name">DownstreamOob</attr>
  <attr path="/api/namespace/enum[@name='EventType']/member[@cname='_GST_EVENT_CUSTOM_BOTH']" name="name">Both</attr>
  <attr path="/api/namespace/enum[@name='EventType']/member[@cname='_GST_EVENT_CUSTOM_BOTH_OOB']" name="name">BothOob</attr>
  <attr path="/api/namespace/enum[@name='ObjectFlags']/member[@cname='GST_OBJECT_FLAG_LAST']" name="name">Last</attr>
+  <attr path="/api/namespace/enum[@name='ElementFlags']/member[@cname='GST_ELEMENT_FLAG_LAST']" name="name">Last</attr>
+  <attr path="/api/namespace/enum[@name='BinFlags']/member[@cname='GST_BIN_FLAG_LAST']" name="value">ElementFlags.Last &lt;&lt; 5</attr>
  <attr path="/api/namespace/enum[@name='BufferFlag']/member[@cname='GST_BUFFER_FLAG_READONLY']" name="value">MiniObjectFlags.Readonly</attr>
  <attr path="/api/namespace/enum[@name='BufferFlag']/member[@cname='GST_BUFFER_FLAG_PREROLL']" name="value">MiniObjectFlags.Last &lt;&lt; 0</attr>
  <attr path="/api/namespace/enum[@name='BufferFlag']/member[@cname='GST_BUFFER_FLAG_DISCONT']" name="value">MiniObjectFlags.Last &lt;&lt; 1</attr>
@ -154,6 +164,7 @@
  <attr path="/api/namespace/enum[@name='BufferFlag']/member[@cname='GST_BUFFER_FLAG_GAP']" name="value">MiniObjectFlags.Last &lt;&lt; 3</attr>
  <attr path="/api/namespace/enum[@name='BufferFlag']/member[@cname='GST_BUFFER_FLAG_DELTA_UNIT']" name="value">MiniObjectFlags.Last &lt;&lt; 4</attr>
  <attr path="/api/namespace/enum[@name='BufferFlag']/member[@cname='GST_BUFFER_FLAG_LAST']" name="value">MiniObjectFlags.Last &lt;&lt; 8</attr>
+  <attr path="/api/namespace/enum[@name='BusFlags']/member[@cname='GST_BUS_FLAG_LAST']" name="name">Last</attr>
  <attr path="/api/namespace/enum[@name='BusFlags']/member[@cname='GST_BUS_FLUSHING']" name="value">MiniObjectFlags.Last &lt;&lt; 0</attr>
  <attr path="/api/namespace/enum[@name='BusFlags']/member[@cname='GST_BUS_FLAG_LAST']" name="value">MiniObjectFlags.Last &lt;&lt; 1</attr>
  <attr path="/api/namespace/enum[@name='ClockFlags']/member[@cname='GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC']" name="value">MiniObjectFlags.Last &lt;&lt; 0</attr>
@ -167,14 +178,18 @@
  <attr path="/api/namespace/enum[@name='ElementFlags']/member[@cname='GST_ELEMENT_IS_SINK']" name="value">ObjectFlags.Last &lt;&lt; 1</attr>
  <attr path="/api/namespace/enum[@name='ElementFlags']/member[@cname='GST_ELEMENT_UNPARENTING']" name="value">ObjectFlags.Last &lt;&lt; 2</attr>
  <attr path="/api/namespace/enum[@name='ElementFlags']/member[@cname='GST_ELEMENT_FLAG_LAST']" name="value">ObjectFlags.Last &lt;&lt; 16</attr>
+  <attr path="/api/namespace/enum[@name='IndexFlags']/member[@cname='GST_INDEX_FLAG_LAST']" name="name">Last</attr>
  <attr path="/api/namespace/enum[@name='IndexFlags']/member[@cname='GST_INDEX_WRITABLE']" name="value">ObjectFlags.Last &lt;&lt; 0</attr>
  <attr path="/api/namespace/enum[@name='IndexFlags']/member[@cname='GST_INDEX_READABLE']" name="value">ObjectFlags.Last &lt;&lt; 1</attr>
  <attr path="/api/namespace/enum[@name='IndexFlags']/member[@cname='GST_INDEX_FLAG_LAST']" name="value">ObjectFlags.Last &lt;&lt; 8</attr>
+  <attr path="/api/namespace/enum[@name='PadFlags']/member[@cname='GST_PAD_FLAG_LAST']" name="name">Last</attr>
  <attr path="/api/namespace/enum[@name='PadFlags']/member[@cname='GST_PAD_BLOCKED']" name="value">ObjectFlags.Last &lt;&lt; 0</attr>
  <attr path="/api/namespace/enum[@name='PadFlags']/member[@cname='GST_PAD_FLUSHING']" name="value">ObjectFlags.Last &lt;&lt; 1</attr>
  <attr path="/api/namespace/enum[@name='PadFlags']/member[@cname='GST_PAD_IN_GETCAPS']" name="value">ObjectFlags.Last &lt;&lt; 2</attr>
  <attr path="/api/namespace/enum[@name='PadFlags']/member[@cname='GST_PAD_IN_SETCAPS']" name="value">ObjectFlags.Last &lt;&lt; 3</attr>
+  <attr path="/api/namespace/enum[@name='PadFlags']/member[@cname='GST_PAD_BLOCKING']" name="value">ObjectFlags.Last &lt;&lt; 4</attr>
  <attr path="/api/namespace/enum[@name='PadFlags']/member[@cname='GST_PAD_FLAG_LAST']" name="value">ObjectFlags.Last &lt;&lt; 8</attr>
+  <attr path="/api/namespace/enum[@name='PadTemplateFlags']/member[@cname='GST_PAD_TEMPLATE_FLAG_LAST']" name="name">Last</attr>
  <attr path="/api/namespace/enum[@name='PadTemplateFlags']/member[@cname='GST_PAD_TEMPLATE_FIXED']" name="value">ObjectFlags.Last &lt;&lt; 0</attr>
  <attr path="/api/namespace/enum[@name='PadTemplateFlags']/member[@cname='GST_PAD_TEMPLATE_FLAG_LAST']" name="value">ObjectFlags.Last &lt;&lt; 4</attr>
  <attr path="/api/namespace/enum[@name='PipelineFlags']/member[@cname='GST_PIPELINE_FLAG_FIXED_CLOCK']" name="value">BinFlags.Last &lt;&lt; 0</attr>
--- a/gstreamer-sharp/Makefile.am
+++ b/gstreamer-sharp/Makefile.am
@ -15,7 +15,7 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll
 gapidir = $(datadir)/gapi
 gapi_DATA = $(APIS)

-glue_includes="gst/gstbin.h gst/gstpipeline.h gst/gstsegment.h"
+glue_includes="gst/gst.h"

 CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs glue/generated.c $(API) $(KEYFILE)
 DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs
--- a/gstreamer-sharp/Message.custom
+++ b/gstreamer-sharp/Message.custom
@ -1,12 +1,12 @@

-    [DllImport("gstreamersharpglue-0.10")]
-    private extern static IntPtr gstsharp_message_parse_error(IntPtr raw);
-
-    public void ParseError(out string error)
-    {
-        IntPtr err = gstsharp_message_parse_error(Handle);
-        error = GLib.Marshaller.PtrToStringGFree(err);
-    }
+	[DllImport("gstreamersharpglue-0.10")]
+	private extern static IntPtr gstsharp_message_parse_error(IntPtr raw);
+	
+	public void ParseError(out string error)
+	{
+		IntPtr err = gstsharp_message_parse_error(Handle);
+		error = GLib.Marshaller.PtrToStringGFree(err);
+	}

 	[DllImport("gstreamersharpglue-0.10")]
 	private extern static IntPtr gstsharp_message_error_new();
--- a/gstreamer-sharp/gstreamer-api.raw
+++ b/gstreamer-sharp/gstreamer-api.raw
--- a/source/Makefile.am
+++ b/source/Makefile.am
@ -1,4 +1,3 @@
-EXTRA_DIST = gstreamer-parsable.diff
 MAINTAINERCLEANFILES = Makefile.in

 BASE_PATH="http://gstreamer.freedesktop.org/src"
@ -6,7 +5,6 @@ BASE_PATH="http://gstreamer.freedesktop.org/src"
 update-source:
 	wget -O - $(BASE_PATH)/gstreamer/gstreamer-$(GSTREAMER_REQUIRED_VERSION).tar.gz | tar xz
 	wget -O - $(BASE_PATH)/gst-plugins-base/gst-plugins-base-$(GSTREAMER_REQUIRED_VERSION).tar.gz | tar xz
-	patch -p0 < gstreamer-parsable.diff

 api:
 	$(GAPI_PARSER) gstreamer-sharp-source.xml
--- a/source/gstreamer-parsable.diff
+++ b/source/gstreamer-parsable.diff
@ -1,137 +0,0 @@
-diff -aur gstreamer-0.10.3-orig/gst/gstbin.h gstreamer-0.10.3/gst/gstbin.h
--- gstreamer-0.10.3-orig/gst/gstbin.h	2006-01-26 04:38:23.000000000 -0800
-+++ gstreamer-0.10.3/gst/gstbin.h	2006-02-18 22:11:00.000000000 -0800
-@@ -49,7 +49,7 @@
-  */
- typedef enum {
-   /* padding */
-  GST_BIN_FLAG_LAST		= (GST_ELEMENT_FLAG_LAST << 5)
-+  GST_BIN_FLAG_LAST		= GST_ELEMENT_FLAG_LAST << 5
- } GstBinFlags;
- 
- typedef struct _GstBin GstBin;
-diff -aur gstreamer-0.10.3-orig/gst/gstbus.h gstreamer-0.10.3/gst/gstbus.h
--- gstreamer-0.10.3-orig/gst/gstbus.h	2006-01-21 06:07:10.000000000 -0800
-+++ gstreamer-0.10.3/gst/gstbus.h	2006-02-18 22:11:27.000000000 -0800
-@@ -47,9 +47,9 @@
-  * The standard flags that a bus may have.
-  */
- typedef enum {
-  GST_BUS_FLUSHING      = (GST_OBJECT_FLAG_LAST << 0),
-+  GST_BUS_FLUSHING      = GST_OBJECT_FLAG_LAST << 0,
-   /* padding */
-  GST_BUS_FLAG_LAST     = (GST_OBJECT_FLAG_LAST << 1)
-+  GST_BUS_FLAG_LAST     = GST_OBJECT_FLAG_LAST << 1
- } GstBusFlags;
- 
- /**
-diff -aur gstreamer-0.10.3-orig/gst/gstelement.h gstreamer-0.10.3/gst/gstelement.h
--- gstreamer-0.10.3-orig/gst/gstelement.h	2005-11-29 10:57:59.000000000 -0800
-+++ gstreamer-0.10.3/gst/gstelement.h	2006-02-18 22:25:06.000000000 -0800
-@@ -425,7 +425,6 @@
- {
-   GstObjectClass         parent_class;
- 
-  /*< public >*/
-   /* the element details */
-   GstElementDetails	 details;
- 
-@@ -437,13 +436,11 @@
-   gint                   numpadtemplates;
-   guint32                pad_templ_cookie;
- 
-  /*< private >*/
-   /* signal callbacks */
-   void (*pad_added)	(GstElement *element, GstPad *pad);
-   void (*pad_removed)	(GstElement *element, GstPad *pad);
-   void (*no_more_pads)	(GstElement *element);
- 
-  /*< public >*/
-   /* virtual methods for subclasses */
- 
-   /* request/release pads */
-@@ -452,7 +449,7 @@
- 
-   /* state changes */
-   GstStateChangeReturn (*get_state)		(GstElement * element, GstState * state,
-						 GstState * pending, GstClockTime timeout);
-+			       		 GstState * pending, GstClockTime timeout);
-   GstStateChangeReturn (*set_state)		(GstElement *element, GstState state);
-   GstStateChangeReturn (*change_state)		(GstElement *element, GstStateChange transition);
- 
-@@ -473,7 +470,6 @@
-   const GstQueryType*	(*get_query_types)	(GstElement *element);
-   gboolean		(*query)		(GstElement *element, GstQuery *query);
- 
-  /*< private >*/
-   gpointer _gst_reserved[GST_PADDING];
- };
- 
-diff -aur gstreamer-0.10.3-orig/gst/gstindex.h gstreamer-0.10.3/gst/gstindex.h
--- gstreamer-0.10.3-orig/gst/gstindex.h	2006-01-19 00:38:56.000000000 -0800
-+++ gstreamer-0.10.3/gst/gstindex.h	2006-02-18 22:11:57.000000000 -0800
-@@ -149,11 +149,11 @@
-  */
- typedef enum {
-   GST_ASSOCIATION_FLAG_NONE 	  = 0,
-  GST_ASSOCIATION_FLAG_KEY_UNIT   = (1 << 0),
-  GST_ASSOCIATION_FLAG_DELTA_UNIT = (1 << 1),
-+  GST_ASSOCIATION_FLAG_KEY_UNIT   = 1 << 0,
-+  GST_ASSOCIATION_FLAG_DELTA_UNIT = 1 << 1,
- 
-   /* new flags should start here */
-  GST_ASSOCIATION_FLAG_LAST	= (1 << 8)
-+  GST_ASSOCIATION_FLAG_LAST	= 1 << 8
- } GstAssocFlags;
- 
- /**
-@@ -294,10 +294,10 @@
-  * Flags for this index
-  */
- typedef enum {
-  GST_INDEX_WRITABLE    = (GST_OBJECT_FLAG_LAST << 0),
-  GST_INDEX_READABLE    = (GST_OBJECT_FLAG_LAST << 1),
-+  GST_INDEX_WRITABLE    = GST_OBJECT_FLAG_LAST << 0,
-+  GST_INDEX_READABLE    = GST_OBJECT_FLAG_LAST << 1,
- 
-  GST_INDEX_FLAG_LAST   = (GST_OBJECT_FLAG_LAST << 8)
-+  GST_INDEX_FLAG_LAST   = GST_OBJECT_FLAG_LAST << 8
- } GstIndexFlags;
- 
- /**
-diff -aur gstreamer-0.10.3-orig/gst/gstpad.h gstreamer-0.10.3/gst/gstpad.h
--- gstreamer-0.10.3-orig/gst/gstpad.h	2005-12-07 05:08:28.000000000 -0800
-+++ gstreamer-0.10.3/gst/gstpad.h	2006-02-18 22:12:29.000000000 -0800
-@@ -416,12 +416,12 @@
-  * Pad state flags
-  */
- typedef enum {
-  GST_PAD_BLOCKED       = (GST_OBJECT_FLAG_LAST << 0),
-  GST_PAD_FLUSHING      = (GST_OBJECT_FLAG_LAST << 1),
-  GST_PAD_IN_GETCAPS    = (GST_OBJECT_FLAG_LAST << 2),
-  GST_PAD_IN_SETCAPS    = (GST_OBJECT_FLAG_LAST << 3),
-+  GST_PAD_BLOCKED       = GST_OBJECT_FLAG_LAST << 0,
-+  GST_PAD_FLUSHING      = GST_OBJECT_FLAG_LAST << 1,
-+  GST_PAD_IN_GETCAPS    = GST_OBJECT_FLAG_LAST << 2,
-+  GST_PAD_IN_SETCAPS    = GST_OBJECT_FLAG_LAST << 3,
-   /* padding */
-  GST_PAD_FLAG_LAST     = (GST_OBJECT_FLAG_LAST << 8)
-+  GST_PAD_FLAG_LAST     = GST_OBJECT_FLAG_LAST << 8
- } GstPadFlags;
- 
- /* FIXME: this awful circular dependency need to be resolved properly (see padtemplate.h) */
-diff -aur gstreamer-0.10.3-orig/gst/gstpadtemplate.h gstreamer-0.10.3/gst/gstpadtemplate.h
--- gstreamer-0.10.3-orig/gst/gstpadtemplate.h	2005-12-21 08:13:56.000000000 -0800
-+++ gstreamer-0.10.3/gst/gstpadtemplate.h	2006-02-18 22:12:50.000000000 -0800
-@@ -103,9 +103,9 @@
-  * Flags for the padtemplate
-  */
- typedef enum {
-  GST_PAD_TEMPLATE_FIXED        = (GST_OBJECT_FLAG_LAST << 0),
-+  GST_PAD_TEMPLATE_FIXED        = GST_OBJECT_FLAG_LAST << 0,
-   /* padding */
-  GST_PAD_TEMPLATE_FLAG_LAST    = (GST_OBJECT_FLAG_LAST << 4)
-+  GST_PAD_TEMPLATE_FLAG_LAST    = GST_OBJECT_FLAG_LAST << 4
- } GstPadTemplateFlags;
- 
- /**
--- a/source/gstreamer-sharp-source.xml
+++ b/source/gstreamer-sharp-source.xml
@ -9,9 +9,10 @@
 -->	
    <library name="gstreamer-0.10.dll">
      <namespace name="Gst">
-        <dir>gstreamer-0.10.3/gst</dir>
-        <exclude>gstreamer-0.10.3/gst/gstinterface.h</exclude>
-        <exclude>gstreamer-0.10.3/gst/gsturi.h</exclude>
+        <dir>gstreamer-0.10.22/gst</dir>
+        <exclude>gstreamer-0.10.22/gst/gstinterface.h</exclude>
+        <exclude>gstreamer-0.10.22/gst/gsturi.h</exclude>
+        <exclude>gstreamer-0.10.22/gst/gstpreset.h</exclude>
      </namespace>
 	</library>
  </api>