From 83e76dd47d995975e79fd440576d5dd6dfba65a3 Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Fri, 20 Oct 2006 11:33:01 +0000
Subject: [PATCH] gst/gst-0.10.10.ignore: Added symbols added in 0.10.10

Original commit message from CVS:
* gst/gst-0.10.10.ignore:
Added symbols added in 0.10.10
* gst/gst-0.10.6.ignore:
gst_dp_packetizer_new() addition
* gst/gst.defs:
Updated API for 0.10.10 symbols
* gst/gstmodule.c: (init_gst):
Added GST_TAG_EXTENDED_COMMENT which appeared in 0.10.10
* gst/libs.defs:
Added gst_dp_packetizer_new() which was added in 0.10.6. It still won't
work because GstDPPacketizer is a pointer. It needs to have a GBoxed
definition in order to be used properly within gst-python.
Also added controller-related additions
---
 ChangeLog              | 16 ++++++++++++++++
 gst/gst-0.10.10.ignore |  6 ++++++
 gst/gst-0.10.6.ignore  |  1 +
 gst/gst.defs           | 27 +++++++++++++++++++++++++++
 gst/gstmodule.c        |  3 +++
 gst/libs.defs          | 30 ++++++++++++++++++++++++++++--
 6 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b8fbc6f81a..8f0e956c42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2006-10-20  Edward Hervey  <edward@fluendo.com>
+
+	* gst/gst-0.10.10.ignore:
+	Added symbols added in 0.10.10
+	* gst/gst-0.10.6.ignore:
+	gst_dp_packetizer_new() addition
+	* gst/gst.defs:
+	Updated API for 0.10.10 symbols
+	* gst/gstmodule.c: (init_gst):
+	Added GST_TAG_EXTENDED_COMMENT which appeared in 0.10.10
+	* gst/libs.defs:
+	Added gst_dp_packetizer_new() which was added in 0.10.6. It still won't
+	work because GstDPPacketizer is a pointer. It needs to have a GBoxed
+	definition in order to be used properly within gst-python.
+	Also added controller-related additions
+
 2006-10-20  Edward Hervey  <edward@fluendo.com>
 
 	* configure.ac:
diff --git a/gst/gst-0.10.10.ignore b/gst/gst-0.10.10.ignore
index d9e4b1dc7c..2c90f6f4cc 100644
--- a/gst/gst-0.10.10.ignore
+++ b/gst/gst-0.10.10.ignore
@@ -4,4 +4,10 @@ ignore
    gst_segtrap_set_enabled
    gst_ghost_pad_new_from_template
    gst_ghost_pad_new_no_target_from_template
+   gst_object_set_control_rate
+   gst_object_get_control_rate
+   gst_caps_merge
+   gst_caps_merge_structure
+   GstClock__do_wait_jitter
+   GstClock__proxy_do_wait_jitter
 %%
diff --git a/gst/gst-0.10.6.ignore b/gst/gst-0.10.6.ignore
index 63c8507885..87c0f25352 100644
--- a/gst/gst-0.10.6.ignore
+++ b/gst/gst-0.10.6.ignore
@@ -4,4 +4,5 @@ ignore
   gst_event_parse_new_segment_full
   gst_segment_set_newsegment_full
   gst_adapter_take_buffer
+  gst_dp_packetizer_new
 %%
diff --git a/gst/gst.defs b/gst/gst.defs
index 6ba15fb4b4..4248e56c4f 100644
--- a/gst/gst.defs
+++ b/gst/gst.defs
@@ -711,6 +711,24 @@
   )
 )
 
+(define-method merge
+  (of-object "GstCaps")
+  (c-name "gst_caps_merge")
+  (return-type "none")
+  (parameters
+   '("GstCaps*" "caps2")
+  )
+)
+
+(define-method merge_structure
+  (of-object "GstCaps")
+  (c-name "gst_caps_merge_structure")
+  (return-type "none")
+  (parameters
+   '("GstStructure*" "structure")
+  )
+)
+
 (define-function caps_load_thyself
   (c-name "gst_caps_load_thyself")
   (return-type "GstCaps*")
@@ -936,6 +954,15 @@
   )
 )
 
+(define-virtual wait_jitter
+  (of-object "GstClock")
+  (return-type "GstClockReturn")
+  (parameters
+   '("GstClockEntry*" "entry")
+   '("GstClockTimeDiff*" "jitter")
+  )
+)
+
 (define-virtual wait_async
   (of-object "GstClock")
   (return-type "GstClockReturn")
diff --git a/gst/gstmodule.c b/gst/gstmodule.c
index d8ae652828..ee2582b76a 100644
--- a/gst/gstmodule.c
+++ b/gst/gstmodule.c
@@ -249,6 +249,9 @@ init_gst (void)
      PyModule_AddStringConstant (m, "TAG_IMAGE", GST_TAG_IMAGE);
 #if ((GST_VERSION_MICRO >= 7) || (GST_VERSION_MICRO == 6 && GST_VERSION_NANO > 0 ))
      PyModule_AddStringConstant (m, "TAG_PREVIEW_IMAGE", GST_TAG_PREVIEW_IMAGE);
+#if ((GST_VERSION_MICRO >= 10) || (GST_VERSION_MICRO == 9 && GST_VERSION_NANO > 0 ))
+     PyModule_AddStringConstant (m, "TAG_EXTENDED_COMMENT", GST_TAG_EXTENDED_COMMENT);
+#endif
 #endif
 #endif
 
diff --git a/gst/libs.defs b/gst/libs.defs
index 7b92f37e8f..e6d99f9543 100644
--- a/gst/libs.defs
+++ b/gst/libs.defs
@@ -286,7 +286,24 @@
   )
 )
 
-(define-function controller_init
+(define-function object_get_control_rate
+  (c-name "gst_object_get_control_rate")
+  (return-type "guint")
+  (parameters
+    '("GObject*" "object")
+  )
+)
+
+(define-function object_set_control_rate
+  (c-name "gst_object_set_control_rate")
+  (return-type "none")
+  (parameters
+    '("GObject*" "object")
+    '("guint" "control_rate")
+  )
+)
+
+(define-function gst_controller_init
   (c-name "gst_controller_init")
   (return-type "gboolean")
   (parameters
@@ -304,7 +321,16 @@
   (return-type "none")
 )
 
-(define-function dp_crc
+(define-function dp_packetizer_new
+  (c-name "gst_dp_packetizer_new")
+  (is-constructor-of "GstDpPacketizer")
+  (return-type "GstDPPacketizer*")
+  (parameters
+    '("GstDPVersion" "version")
+  )
+)
+
+(define-function gst_dp_crc
   (c-name "gst_dp_crc")
   (return-type "guint16")
   (parameters