Wrap new API added in gstreamer-0.10.23. Partially fixes #578848

configure.ac

@@ -160,6 +160,13 @@ then
     IGNORE_GST_0_10_22=""
   fi
 
+  if test $GST_MINOR_VERSION -lt "23"
+  then
+    IGNORE_GST_0_10_23="gst-0.10.23.ignore"
+  else
+    IGNORE_GST_0_10_23=""
+  fi
+
   dnl plugins base
   if test $GST_PB_MINOR_VERSION -lt "14"
   then
@@ -199,6 +206,7 @@ else
   IGNORE_GST_0_10_20=""
   IGNORE_GST_0_10_21=""
   IGNORE_GST_0_10_22=""
+  IGNORE_GST_0_10_23=""
   IGNORE_GST_PB_0_10_14=""
   IGNORE_GST_PB_0_10_16=""
   IGNORE_GST_PB_0_10_18=""
@@ -216,6 +224,7 @@ AC_SUBST(IGNORE_GST_0_10_18)
 AC_SUBST(IGNORE_GST_0_10_20)
 AC_SUBST(IGNORE_GST_0_10_21)
 AC_SUBST(IGNORE_GST_0_10_22)
+AC_SUBST(IGNORE_GST_0_10_23)
 AC_SUBST(IGNORE_GST_PB_0_10_14)
 AC_SUBST(IGNORE_GST_PB_0_10_16)
 AC_SUBST(IGNORE_GST_PB_0_10_18)

gst/Makefile.am

@@ -33,6 +33,7 @@ versioned_overrides = \
 	gst-0.10.20.ignore 	\
 	gst-0.10.21.ignore 	\
 	gst-0.10.22.ignore 	\
+	gst-0.10.23.ignore 	\
 	gst-pb-0.10.14.ignore	\
 	gst-pb-0.10.16.ignore	\
 	gst-pb-0.10.18.ignore	\

gst/base.defs

@@ -974,6 +974,15 @@
   )
 )
 
+(define-function type_find_helper_for_extension
+  (c-name "gst_type_find_helper_for_extension")
+  (return-type "GstCaps*")
+  (parameters
+   '("GstObject*" "obj")
+   '("const-gchar*" "extension")
+  )
+)
+
 ;; From gstdataqueue.h
 
 (define-function gst_data_queue_get_type

gst/gst-0.10.23.ignore

@@ -0,0 +1,20 @@
+%%
+ignore
+	gst_debug_construct_win_color
+	gst_message_new_request_state
+	gst_message_parse_request_state
+	gst_util_array_binary_search
+	gst_poll_new_timer
+	gst_poll_write_control
+	gst_poll_read_control
+	gst_tag_list_get_buffer
+	gst_tag_list_get_buffer_index
+	gst_fixme
+	gst_memdump
+	gst_object_fixme
+	gst_object_memdump
+	gst_type_find_helper_for_extension
+%%
+ignore-type
+	GstSearchMode
+%%

gst/gst-extrafuncs.defs

@@ -67,6 +67,22 @@
    )
 )
 
+(define-function fixme
+  (c-name "gst_fixme")
+  (return-type "none")
+  (parameters
+   '("gchar *" "msg")
+  )
+)
+
+(define-function memdump
+  (c-name "gst_memdump")
+  (return-type "none")
+  (parameters
+   '("gchar *" "msg")
+  )
+)
+
 ;; OBJECT DEBUGGING FUNCTIONS FROM PYTHON
 ;; The c functions don't actually exist
 
@@ -114,3 +130,21 @@
    '("gchar *" "msg")
    )
 )
+
+(define-method fixme
+  (of-object "GstObject")
+  (c-name "gst_object_fixme")
+  (return-type "none")
+  (parameters
+   '("gchar *" "msg")
+   )
+)
+
+(define-method memdump
+  (of-object "GstObject")
+  (c-name "gst_object_memdump")
+  (return-type "none")
+  (parameters
+   '("gchar *" "msg")
+   )
+)

gst/gst-types.defs

@@ -349,6 +349,9 @@
     '("in-caps" "GST_BUFFER_FLAG_IN_CAPS")
     '("gap" "GST_BUFFER_FLAG_GAP")
     '("delta-unit" "GST_BUFFER_FLAG_DELTA_UNIT")
+    '("media1" "GST_BUFFER_FLAG_MEDIA1")
+    '("media2" "GST_BUFFER_FLAG_MEDIA2")
+    '("media3" "GST_BUFFER_FLAG_MEDIA3")
     '("last" "GST_BUFFER_FLAG_LAST")
   )
 )
@@ -459,6 +462,18 @@
   )
 )
 
+(define-flags ParamFlags
+  (in-module "Gst")
+  (c-name "GstParamFlags")
+  (values
+    '("controllable" "GST_PARAM_CONTROLLABLE")
+    '("mutable-ready" "GST_PARAM_MUTABLE_READY")
+    '("mutable-paused" "GST_PARAM_MUTABLE_PAUSED")
+    '("mutable-playing" "GST_PARAM_MUTABLE_PLAYING")
+    '("user-shift" "GST_PARAM_USER_SHIFT")
+  )
+)
+
 (define-enum CoreError
   (in-module "Gst")
   (c-name "GstCoreError")
@@ -697,6 +712,8 @@
     '("info" "GST_LEVEL_INFO")
     '("debug" "GST_LEVEL_DEBUG")
     '("log" "GST_LEVEL_LOG")
+    '("fixme" "GST_LEVEL_FIXME")
+    '("memdump" "GST_LEVEL_MEMDUMP")
     '("count" "GST_LEVEL_COUNT")
   )
 )
@@ -778,6 +795,7 @@
     '("latency" "GST_MESSAGE_LATENCY")
     '("async-start" "GST_MESSAGE_ASYNC_START")
     '("async-done" "GST_MESSAGE_ASYNC_DONE")
+    '("request-state" "GST_MESSAGE_REQUEST_STATE")
     '("any" "GST_MESSAGE_ANY")
   )
 )
@@ -1115,6 +1133,17 @@
   )
 )
 
+(define-enum SearchMode
+  (in-module "Gst")
+  (c-name "GstSearchMode")
+  (gtype-id "GST_TYPE_SEARCH_MODE")
+  (values
+    '("exact" "GST_SEARCH_MODE_EXACT")
+    '("before" "GST_SEARCH_MODE_BEFORE")
+    '("after" "GST_SEARCH_MODE_AFTER")
+  )
+)
+
 (define-interface URIHandler
    (in-module "Gst")
    (c-name "GstURIHandler")

gst/gst.defs

@@ -2849,6 +2849,14 @@
   )
 )
 
+(define-function debug_construct_win_color
+  (c-name "gst_debug_construct_win_color")
+  (return-type "gint")
+  (parameters
+    '("guint" "colorinfo")
+  )
+)
+
 (define-function debug_remove_log_function
   (c-name "gst_debug_remove_log_function")
   (return-type "guint")
@@ -3255,6 +3263,25 @@
   )
 )
 
+(define-function message_new_request_state
+  (c-name "gst_message_new_request_state")
+  (return-type "GstMessage*")
+  (caller-owns-return #t)
+  (parameters
+    '("GstObject*" "src")
+    '("GstState" "state")
+  )
+)
+
+(define-method parse_request_state
+  (of-object "GstMessage")
+  (c-name "gst_message_parse_request_state")
+  (return-type "none")
+  (parameters
+    '("GstState*" "state")
+  )
+)
+
 (define-function message_new_custom
   (c-name "gst_message_new_custom")
   (return-type "GstMessage*")
@@ -4414,6 +4441,20 @@
   (return-type "GstClockTime")
 )
 
+(define-function util_array_binary_search
+  (c-name "gst_util_array_binary_search")
+  (return-type "gpointer")
+  (parameters
+    '("gpointer" "array")
+    '("guint" "num_elements")
+    '("gsize" "element_size")
+    '("GCompareDataFunc" "search_func")
+    '("GstSearchMode" "mode")
+    '("gconstpointer" "search_data")
+    '("gpointer" "user_data")
+  )
+)
+
 (define-function pad_load_and_link
   (c-name "gst_pad_load_and_link")
   (return-type "none")
@@ -4845,6 +4886,12 @@
   )
 )
 
+(define-function poll_new_timer
+  (c-name "gst_poll_new_timer")
+  (caller-owns-return #t)
+  (return-type "GstPoll*")
+)
+
 (define-method free
   (of-object "GstPoll")
   (c-name "gst_poll_free")
@@ -4973,6 +5020,18 @@
   )
 )
 
+(define-method write_control
+  (of-object "GstPoll")
+  (c-name "gst_poll_write_control")
+  (return-type "gboolean")
+)
+
+(define-method read_control
+  (of-object "GstPoll")
+  (c-name "gst_poll_read_control")
+  (return-type "gboolean")
+)
+
 ;; From gstpreset.h
 
 (define-function gst_preset_get_type
@@ -6738,6 +6797,26 @@
   )
 )
 
+(define-method get_buffer
+  (of-object "GstTagList")
+  (c-name "gst_tag_list_get_buffer")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "tag")
+    '("GstBuffer**" "value")
+  )
+)
+
+(define-method get_buffer_index
+  (of-object "GstTagList")
+  (c-name "gst_tag_list_get_buffer_index")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "tag")
+    '("guint" "index")
+    '("GstBuffer**" "value")
+  )
+)
 
 ;; From ../gstreamer/gst/gsttaginterface.h
 

gst/gst.override

@@ -802,6 +802,20 @@ _wrap_gst_error (PyObject *whatever, PyObject *string)
 {
     return pygst_debug_log (whatever, string, GST_LEVEL_ERROR, FALSE);
 }
+%%
+override gst_fixme args
+static PyObject *
+_wrap_gst_fixme (PyObject *whatever, PyObject *string)
+{
+    return pygst_debug_log (whatever, string, GST_LEVEL_FIXME, FALSE);
+}
+%%
+override gst_memdump args
+static PyObject *
+_wrap_gst_memdump (PyObject *whatever, PyObject *string)
+{
+    return pygst_debug_log (whatever, string, GST_LEVEL_MEMDUMP, FALSE);
+}
 
 %%
 override gst_object_log args
@@ -839,6 +853,20 @@ _wrap_gst_object_error (PyObject *whatever, PyObject *string)
     return pygst_debug_log (whatever, string, GST_LEVEL_ERROR, TRUE);
 }
 %%
+override gst_object_fixme args
+static PyObject *
+_wrap_gst_object_fixme (PyObject *whatever, PyObject *string)
+{
+    return pygst_debug_log (whatever, string, GST_LEVEL_FIXME, TRUE);
+}
+%%
+override gst_object_memdump args
+static PyObject *
+_wrap_gst_object_memdump (PyObject *whatever, PyObject *string)
+{
+    return pygst_debug_log (whatever, string, GST_LEVEL_MEMDUMP, TRUE);
+}
+%%
 override GST_TIME_ARGS kwargs
 static PyObject *
 _wrap_GST_TIME_ARGS(PyObject *self, PyObject *args, PyObject *kwargs)

gst/gstmodule.c

@@ -139,9 +139,10 @@ init_gst (void)
   }
 
   /* Initialize debugging category */
-     GST_DEBUG_CATEGORY_INIT (pygst_debug, "pygst", 0, "GStreamer python bindings");
+  GST_DEBUG_CATEGORY_INIT (pygst_debug, "pygst", 0,
-     GST_DEBUG_CATEGORY_INIT (python_debug, "python", 
+      "GStreamer python bindings");
-         GST_DEBUG_FG_GREEN, "python code using gst-python");
+  GST_DEBUG_CATEGORY_INIT (python_debug, "python", GST_DEBUG_FG_GREEN,
+      "python code using gst-python");
 
   pygobject_register_sinkfunc (GST_TYPE_OBJECT, sink_gstobject);
 
@@ -165,8 +166,10 @@ init_gst (void)
   PyModule_AddIntConstant (m, "MSECOND", GST_MSECOND);
   PyModule_AddIntConstant (m, "NSECOND", GST_NSECOND);
 
-     PyModule_AddObject(m, "CLOCK_TIME_NONE", PyLong_FromUnsignedLongLong(GST_CLOCK_TIME_NONE));
+  PyModule_AddObject (m, "CLOCK_TIME_NONE",
-     PyModule_AddObject(m, "BUFFER_OFFSET_NONE", PyLong_FromUnsignedLongLong(GST_BUFFER_OFFSET_NONE));
+      PyLong_FromUnsignedLongLong (GST_CLOCK_TIME_NONE));
+  PyModule_AddObject (m, "BUFFER_OFFSET_NONE",
+      PyLong_FromUnsignedLongLong (GST_BUFFER_OFFSET_NONE));
 
   pygst_exceptions_register_classes (d);
 
@@ -176,8 +179,7 @@ init_gst (void)
   pygstminiobject_register_class (d, "GstMiniObject", GST_TYPE_MINI_OBJECT,
       &PyGstMiniObject_Type, NULL);
   pyg_register_boxed_custom (GST_TYPE_MINI_OBJECT,
-			       pygstminiobject_from_gvalue,
+      pygstminiobject_from_gvalue, pygstminiobject_to_gvalue);
-			       pygstminiobject_to_gvalue);
 
   pygst_register_classes (d);
   pygst_add_constants (m, "GST_");
@@ -199,8 +201,10 @@ init_gst (void)
   PyModule_AddStringConstant (m, "TAG_COMMENT", GST_TAG_COMMENT);
   PyModule_AddStringConstant (m, "TAG_TRACK_NUMBER", GST_TAG_TRACK_NUMBER);
   PyModule_AddStringConstant (m, "TAG_TRACK_COUNT", GST_TAG_TRACK_COUNT);
-     PyModule_AddStringConstant (m, "TAG_ALBUM_VOLUME_NUMBER", GST_TAG_ALBUM_VOLUME_NUMBER);
+  PyModule_AddStringConstant (m, "TAG_ALBUM_VOLUME_NUMBER",
-     PyModule_AddStringConstant (m, "TAG_ALBUM_VOLUME_COUNT", GST_TAG_ALBUM_VOLUME_COUNT);
+      GST_TAG_ALBUM_VOLUME_NUMBER);
+  PyModule_AddStringConstant (m, "TAG_ALBUM_VOLUME_COUNT",
+      GST_TAG_ALBUM_VOLUME_COUNT);
   PyModule_AddStringConstant (m, "TAG_LOCATION", GST_TAG_LOCATION);
   PyModule_AddStringConstant (m, "TAG_DESCRIPTION", GST_TAG_DESCRIPTION);
   PyModule_AddStringConstant (m, "TAG_VERSION", GST_TAG_VERSION);
@@ -215,12 +219,16 @@ init_gst (void)
   PyModule_AddStringConstant (m, "TAG_VIDEO_CODEC", GST_TAG_VIDEO_CODEC);
   PyModule_AddStringConstant (m, "TAG_AUDIO_CODEC", GST_TAG_AUDIO_CODEC);
   PyModule_AddStringConstant (m, "TAG_BITRATE", GST_TAG_BITRATE);
-     PyModule_AddStringConstant (m, "TAG_NOMINAL_BITRATE", GST_TAG_NOMINAL_BITRATE);
+  PyModule_AddStringConstant (m, "TAG_NOMINAL_BITRATE",
-     PyModule_AddStringConstant (m, "TAG_MINIMUM_BITRATE", GST_TAG_MINIMUM_BITRATE);
+      GST_TAG_NOMINAL_BITRATE);
-     PyModule_AddStringConstant (m, "TAG_MAXIMUM_BITRATE", GST_TAG_MAXIMUM_BITRATE);
+  PyModule_AddStringConstant (m, "TAG_MINIMUM_BITRATE",
+      GST_TAG_MINIMUM_BITRATE);
+  PyModule_AddStringConstant (m, "TAG_MAXIMUM_BITRATE",
+      GST_TAG_MAXIMUM_BITRATE);
   PyModule_AddStringConstant (m, "TAG_SERIAL", GST_TAG_SERIAL);
   PyModule_AddStringConstant (m, "TAG_ENCODER", GST_TAG_ENCODER);
-     PyModule_AddStringConstant (m, "TAG_ENCODER_VERSION", GST_TAG_ENCODER_VERSION);
+  PyModule_AddStringConstant (m, "TAG_ENCODER_VERSION",
+      GST_TAG_ENCODER_VERSION);
   PyModule_AddStringConstant (m, "TAG_TRACK_GAIN", GST_TAG_TRACK_GAIN);
   PyModule_AddStringConstant (m, "TAG_TRACK_PEAK", GST_TAG_TRACK_PEAK);
   PyModule_AddStringConstant (m, "TAG_ALBUM_GAIN", GST_TAG_ALBUM_GAIN);
@@ -232,24 +240,34 @@ init_gst (void)
 #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);
+  PyModule_AddStringConstant (m, "TAG_EXTENDED_COMMENT",
+      GST_TAG_EXTENDED_COMMENT);
 #if ((GST_VERSION_MICRO >= 14) || (GST_VERSION_MICRO == 13 && GST_VERSION_NANO > 0))
   PyModule_AddStringConstant (m, "TAG_LICENSE_URI", GST_TAG_LICENSE_URI);
 #if ((GST_VERSION_MICRO >= 15) || (GST_VERSION_MICRO == 14 && GST_VERSION_NANO > 0))
   PyModule_AddStringConstant (m, "TAG_COMPOSER", GST_TAG_COMPOSER);
-     PyModule_AddStringConstant (m, "TAG_ARTIST_SORTNAME", GST_TAG_ARTIST_SORTNAME);
+  PyModule_AddStringConstant (m, "TAG_ARTIST_SORTNAME",
+      GST_TAG_ARTIST_SORTNAME);
   PyModule_AddStringConstant (m, "TAG_ALBUM_SORTNAME", GST_TAG_ALBUM_SORTNAME);
   PyModule_AddStringConstant (m, "TAG_TITLE_SORTNAME", GST_TAG_TITLE_SORTNAME);
+#if ((GST_VERSION_MICRO >= 23) || (GST_VERSION_MICRO == 22 && GST_VERSION_NANO > 0))
+  PyModule_AddStringConstant (m, "TAG_SUBTITLE_CODEC", GST_TAG_SUBTITLE_CODEC);
+  PyModule_AddStringConstant (m, "TAG_HOMEPAGE", GST_TAG_HOMEPAGE);
+#endif
 #endif
 #endif
 #endif
 #endif
 #endif
 
-     PyModule_AddStringConstant (m, "LIBRARY_ERROR", (gchar *) g_quark_to_string(GST_LIBRARY_ERROR));
+  PyModule_AddStringConstant (m, "LIBRARY_ERROR",
-     PyModule_AddStringConstant (m, "RESOURCE_ERROR",(gchar *)  g_quark_to_string(GST_RESOURCE_ERROR));
+      (gchar *) g_quark_to_string (GST_LIBRARY_ERROR));
-     PyModule_AddStringConstant (m, "CORE_ERROR", (gchar *) g_quark_to_string(GST_CORE_ERROR));
+  PyModule_AddStringConstant (m, "RESOURCE_ERROR",
-     PyModule_AddStringConstant (m, "STREAM_ERROR", (gchar *) g_quark_to_string(GST_STREAM_ERROR));
+      (gchar *) g_quark_to_string (GST_RESOURCE_ERROR));
+  PyModule_AddStringConstant (m, "CORE_ERROR",
+      (gchar *) g_quark_to_string (GST_CORE_ERROR));
+  PyModule_AddStringConstant (m, "STREAM_ERROR",
+      (gchar *) g_quark_to_string (GST_STREAM_ERROR));
 
   if (PyErr_Occurred ()) {
     Py_FatalError ("can't initialize module gst");

gst/gstversion.override.in

@@ -11,5 +11,6 @@ include
 @IGNORE_GST_0_10_20@
 @IGNORE_GST_0_10_21@
 @IGNORE_GST_0_10_22@
+@IGNORE_GST_0_10_23@
 @IGNORE_GST_LOADSAVE@
 %%

gst/libs.defs

@@ -32,14 +32,6 @@
 
 ;; Enumerations and flags ...
 
-(define-flags ParamFlags
-  (in-module "Gst")
-  (c-name "GstParamFlags")
-  (values
-    '("controllable" "GST_PARAM_CONTROLLABLE")
-  )
-)
-
 (define-enum InterpolateMode
   (in-module "Gst")
   (c-name "GstInterpolateMode")